[gnome-pilot] Update Simplified Chinese translation.

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-pilot] Update Simplified Chinese translation.
Date: Sat, 31 Jul 2010 01:20:59 +0000 (UTC)
commit be0f3a368bc309a8aabe0d70392e1397e89b6739
Author: Aron Xu <aronxu gnome org>
Date:   Sat Jul 31 09:20:45 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po |  864 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 467 insertions(+), 397 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d05ea4f..1315730 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,17 +1,19 @@
 # Simplified Chinese translation to gnome-pilot
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-pilot package.
 # Sun L10N Simplified Chinese Team, 2003.
 #   QA: Wang Jian <lark linux net cn>, 2003.
 # Aron Xu <happyaron xu gmail com>, 2009.
+# du baodao <centerpoint 139 com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-pilot\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-03 11:52+0000\n"
-"PO-Revision-Date: 2009-07-29 19:52+0000\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"Project-Id-Version: gnome-pilot master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"pilot&component=general\n"
+"POT-Creation-Date: 2010-06-16 19:25+0000\n"
+"PO-Revision-Date: 2010-07-31 09:19+0800\n"
+"Last-Translator: du baodao <centerpoint 139 com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,85 +31,81 @@ msgstr "å??æ¥ä½ å?¨ PalmOS è®¾å¤?ä¸?ç??è®¾å¤?"
 msgid "Utility"
 msgstr "å·¥å?·ç¨?åº?"
 
-#: ../applet/pilot-applet.glade.h:1 ../capplet/gpilotd-capplet.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../applet/pilot-applet.glade.h:2
+#: ../applet/pilot-applet.ui.h:1
 msgid "Choose PDA"
 msgstr "é??æ?© PDA"
 
-#: ../applet/pilot-applet.glade.h:3
+#: ../applet/pilot-applet.ui.h:2
 msgid "GNOME PilotSync Properties"
 msgstr "GNOME PilotSync å±?æ?§"
 
-#: ../applet/pilot-applet.glade.h:4
+#: ../applet/pilot-applet.ui.h:3
 msgid "Restore PDA"
 msgstr "æ?¢å¤? PDA"
 
-#: ../applet/pilot-applet.glade.h:5
+#: ../applet/pilot-applet.ui.h:4
 msgid "_Directory"
 msgstr "æ??ä»¶å¤¹(_D)"
 
-#: ../applet/pilot-applet.glade.h:6
+#: ../applet/pilot-applet.ui.h:5
 msgid "_Display notices"
 msgstr "æ?¾ç¤ºé??ç?¥(_D)"
 
-#: ../applet/pilot-applet.glade.h:7
+#: ../applet/pilot-applet.ui.h:6
 msgid "_Execute when clicked"
 msgstr "ç?¹å?»æ?¶æ?§è¡?(_E)"
 
-#: ../applet/pilot-applet.glade.h:8
+#: ../applet/pilot-applet.ui.h:7
 msgid "_PDA ID"
 msgstr "PDA ID(_P)"
 
-#: ../applet/pilot-applet.glade.h:9
+#: ../applet/pilot-applet.ui.h:8
 msgid "_Sync cradle"
-msgstr ""
+msgstr "å??æ¥åº?åº§(_S)"
 
-#: ../applet/pilot-applet.glade.h:10
+#: ../applet/pilot-applet.ui.h:9
 msgid "gnome-pilot progress"
 msgstr "gnome-pilot è¿?åº¦"
 
-#: ../applet/pilot.c:169
+#: ../applet/pilot.c:185
 #, c-format
 msgid "%s Synchronizing"
 msgstr "%s æ£å?¨å??æ¥"
 
-#: ../applet/pilot.c:174
+#: ../applet/pilot.c:190
 msgid "Database %v of %u"
 msgstr "%u ç??æ?°æ?®åº? %v"
 
-#: ../applet/pilot.c:268
+#: ../applet/pilot.c:284
 #, c-format
 msgid "Request %ld has been completed\n"
 msgstr "è¯·æ±? %ld å·²å®?æ??\n"
 
-#: ../applet/pilot.c:290
+#: ../applet/pilot.c:306
 #, c-format
 msgid "%s Synchronizing : %s"
 msgstr "%s æ£å?¨å??æ¥ï¼?%s"
 
-#: ../applet/pilot.c:295
+#: ../applet/pilot.c:311
 #, c-format
 msgid "%s: Started\n"
 msgstr "%sï¼?å·²å¼?å§?\n"
 
-#: ../applet/pilot.c:310
+#: ../applet/pilot.c:326
 #, c-format
 msgid "%s Finished : %s"
 msgstr "%s å·²å®?æ??ï¼?%s"
 
-#: ../applet/pilot.c:315
+#: ../applet/pilot.c:331
 #, c-format
 msgid "%s: Ended\n"
 msgstr "%sï¼?å·²ç»?æ??\n"
 
-#: ../applet/pilot.c:341
+#: ../applet/pilot.c:357
 msgid "%v of %u records"
 msgstr "ç¬¬ %u æ?¡è®°å½?ï¼?å?± %v æ?¡"
 
-#: ../applet/pilot.c:420
+#: ../applet/pilot.c:437
 msgid ""
 "PDA is currently synchronizing.\n"
 "Please wait for it to finish."
@@ -115,11 +113,11 @@ msgstr ""
 "PDA å½?å??æ£å?¨è¿?è¡?å??æ¥ã??\n"
 "è¯·ç?å¾?å??æ¥å®?æ??ã??"
 
-#: ../applet/pilot.c:423
+#: ../applet/pilot.c:440
 msgid "Not connected. Please restart daemon."
 msgstr "æ²¡æ??è¿?æ?¥ã??è¯·é??æ?°å?¯å?¨å®?æ?¤è¿?ç¨?ã??"
 
-#: ../applet/pilot.c:425
+#: ../applet/pilot.c:443
 msgid ""
 "Not connected to gpilotd.\n"
 "Please restart daemon."
@@ -127,38 +125,33 @@ msgstr ""
 "æ²¡æ??è¿?æ?¥å?° gpilotdã??\n"
 "è¯·é??æ?°å?¯å?¨å®?æ?¤è¿?ç¨?ã??"
 
-#: ../applet/pilot.c:453
+#: ../applet/pilot.c:472
 msgid "gnome-pilot applet"
 msgstr "gnome-pilot å°?ç¨?åº?"
 
-#: ../applet/pilot.c:455
+#: ../applet/pilot.c:474
 msgid "Copyright 2000-2006 Free Software Foundation, Inc."
 msgstr "Copyright 2000-2006 è?ªç?±è½¯ä»¶å?ºé??ä¼?ã??"
 
-#: ../applet/pilot.c:456
+#: ../applet/pilot.c:475
 msgid "A PalmOS PDA monitor.\n"
 msgstr "PalmOS PDA ç??è§?å?¨.\n"
 
-#: ../applet/pilot.c:553 ../applet/pilot.c:579
+#: ../applet/pilot.c:573 ../applet/pilot.c:600
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "æ?¾ç¤ºå¸®å?©ï¼?%sæ?¶å?ºé??"
 
-#: ../applet/pilot.c:617
-#, c-format
-msgid "cancelling %d"
-msgstr "æ£å?¨å??æ¶? %d"
-
-#: ../applet/pilot.c:669
+#: ../applet/pilot.c:686
 #, c-format
 msgid "Restoring %s"
 msgstr "æ£å?¨æ?¢å¤? %s"
 
-#: ../applet/pilot.c:711
+#: ../applet/pilot.c:729
 msgid "No directory to restore from."
 msgstr "æ²¡æ??å?¯ä»¥ä»?å?¶æ?¢å¤?ç??ç?®å½?ã??"
 
-#: ../applet/pilot.c:719
+#: ../applet/pilot.c:741
 msgid ""
 "Press synchronize on the cradle to restore\n"
 " or cancel the operation."
@@ -166,11 +159,16 @@ msgstr ""
 "è¯·æ??åº?åº§ä¸?ç??å??æ¥æ??é?®è¿?è¡?æ?¢å¤?\n"
 "æ??è??å??æ¶?è¯¥æ??ä½?ã??"
 
-#: ../applet/pilot.c:728
+#: ../applet/pilot.c:747
+#, c-format
+msgid "cancelling %d"
+msgstr "æ£å?¨å??æ¶? %d"
+
+#: ../applet/pilot.c:752
 msgid "Restore request failed"
 msgstr "æ?¢å¤?è¯·æ±?å¤±è´¥"
 
-#: ../applet/pilot.c:766
+#: ../applet/pilot.c:793
 msgid ""
 "PDA sync is currently in progress.\n"
 "Are you sure you want to restart daemon?"
@@ -178,91 +176,87 @@ msgstr ""
 "PDA å??æ¥æ£å?¨è¿?è¡?ã??\n"
 "æ?¨ç¡®ä¿¡æ?¨å¸?æ??é??æ?°å?¯å?¨å®?æ?¤è¿?ç¨?ï¼?"
 
-#: ../applet/pilot.c:776 ../applet/pilot.c:1351
+#: ../applet/pilot.c:806 ../applet/pilot.c:1377
 msgid "Trying to connect to the GnomePilot Daemon"
 msgstr "å°?è¯?è¿?æ?¥å?° GnomePilot å®?æ?¤è¿?ç¨?"
 
-#: ../applet/pilot.c:792
+#: ../applet/pilot.c:823
 msgid "There's no last sync on record."
 msgstr "è®°å½?ä¸?æ²¡æ??æ??å??ä¸?æ¬¡å??æ¥ã??"
 
 #. ensure the label strings are extracted by intltool.  This list of
 #. * strings should match the list in the menu_template below
-#. 
-#: ../applet/pilot.c:815
+#.
+#: ../applet/pilot.c:846
 msgid "Restore..."
 msgstr "æ?¢å¤?..."
 
-#: ../applet/pilot.c:815
+#: ../applet/pilot.c:846
 msgid "Restart"
 msgstr "é??æ?°å?¯å?¨"
 
-#: ../applet/pilot.c:815
+#: ../applet/pilot.c:846
 msgid "Last log..."
 msgstr "æ??å??ç??æ?¥å¿?..."
 
-#: ../applet/pilot.c:816
+#: ../applet/pilot.c:847
 msgid "Preferences..."
 msgstr "é¦?é??é¡¹..."
 
-#: ../applet/pilot.c:816
+#: ../applet/pilot.c:847
 msgid "Help"
 msgstr "å¸®å?©"
 
-#: ../applet/pilot.c:816
+#: ../applet/pilot.c:847
 msgid "About"
 msgstr "å?³äº?"
 
-#: ../applet/pilot.c:838
+#: ../applet/pilot.c:869
 msgid "Continue"
 msgstr "ç»§ç»"
 
-#: ../applet/pilot.c:840
+#: ../applet/pilot.c:871
 msgid "Pause Daemon"
 msgstr "æ??å??å®?æ?¤è¿?ç¨?"
 
-#: ../applet/pilot.c:860
+#: ../applet/pilot.c:891
 msgid "Daemon paused..."
 msgstr "å®?æ?¤ç¨?åº?å·²æ??å??..."
 
-#: ../applet/pilot.c:867 ../applet/pilot.c:1021
+#: ../applet/pilot.c:898 ../applet/pilot.c:1052
 msgid "Ready to synchronize"
 msgstr "å??æ¥å??å¤?å°±ç»ª"
 
-#: ../applet/pilot.c:1002
+#: ../applet/pilot.c:1033
 msgid "Not connected. Restart daemon to reconnect"
 msgstr "æ²¡æ??è¿?æ?¥ã??è¯·é??æ?°å?¯å?¨å®?æ?¤è¿?ç¨?ä»¥é??æ?°è¿?æ?¥"
 
-#: ../applet/pilot.c:1186
+#: ../applet/pilot.c:1210
 #, c-format
 msgid "Execution of %s failed"
 msgstr "æ?§è¡? %s å¤±è´¥"
 
-#. 
+#.
 #. if (strstr (file_type (ptr),"text")) {
 #. if (file_size (ptr)>properties.text_limit)
 #. g_message ("installing textfile as Doc (not implemented)");
 #. else
 #. g_message ("installing textfile as Memo (not implemented)");
 #. }
-#. 
-#: ../applet/pilot.c:1312
+#.
+#: ../applet/pilot.c:1336
 #, c-format
 msgid "installing \"%s\" to \"%s\""
 msgstr "æ£å?¨å°?â??%sâ??å®?è£?å?°â??%sâ??"
 
-#: ../applet/pilot.c:1322
+#: ../applet/pilot.c:1346
 msgid "unknown dnd type"
 msgstr "æ?ªç?¥ dnd ç±»å??"
 
-#: ../applet/pilot.c:1330
+#: ../applet/pilot.c:1354
 msgid "destroy gpilot-applet"
 msgstr "å??æ¢ gpilot-applet"
 
-#: ../applet/pilot.c:1410
-msgid "Cannot find pilot-applet.glade"
-msgstr "æ? æ³?æ?¾å?° pilot-applet.glade"
-
 #: ../applet/pilot.schemas.in.h:1
 msgid "Command to execute when the applet is clicked"
 msgstr "å??å?»å°?ç¨?åº?æ?¶æ?§è¡?ç??å?½ä»¤"
@@ -271,112 +265,111 @@ msgstr "å??å?»å°?ç¨?åº?æ?¶æ?§è¡?ç??å?½ä»¤"
 msgid "Display notices in popup windows"
 msgstr "å?¨å¼¹å?ºçª?å?£ä¸æ?¾ç¤ºé??ç?¥"
 
-#: ../capplet/gnome-pilot-capplet.c:215 ../capplet/gpilotd-capplet.glade.h:89
+#: ../capplet/gnome-pilot-capplet.c:228 ../capplet/gpilotd-capplet.ui.h:76
 msgid "gnome-pilot Settings"
 msgstr "gnome-pilot è®¾ç½®"
 
-#: ../capplet/gnome-pilot-capplet.c:383 ../capplet/gnome-pilot-capplet.c:463
+#: ../capplet/gnome-pilot-capplet.c:394 ../capplet/gnome-pilot-capplet.c:470
 msgid "Name"
 msgstr "å§?å??"
 
-#: ../capplet/gnome-pilot-capplet.c:385 ../utils/gpilotd-client.c:44
+#: ../capplet/gnome-pilot-capplet.c:396 ../utils/gpilotd-client.c:44
 msgid "ID"
 msgstr "ID"
 
-#: ../capplet/gnome-pilot-capplet.c:387
+#: ../capplet/gnome-pilot-capplet.c:398
 msgid "Owner"
 msgstr "æ??æ??è??"
 
-#: ../capplet/gnome-pilot-capplet.c:465
+#: ../capplet/gnome-pilot-capplet.c:472
 msgid "Type"
 msgstr "ç±»å??"
 
-#: ../capplet/gnome-pilot-capplet.c:571
+#: ../capplet/gnome-pilot-capplet.c:574
 msgid "Conduit"
 msgstr "å¯¼ç®¡"
 
-#: ../capplet/gnome-pilot-capplet.c:573
+#: ../capplet/gnome-pilot-capplet.c:576
 msgid "Sync Action"
 msgstr "å??æ¥æ??ä½?"
 
-#: ../capplet/gnome-pilot-capplet.c:783
+#: ../capplet/gnome-pilot-capplet.c:790
 #, c-format
 msgid "Are you sure you want to delete PDA `%s'?"
 msgstr "æ?¨ç¡®ä¿¡æ?¨å¸?æ??å? é?¤PDA %sï¼?"
 
-#: ../capplet/gnome-pilot-capplet.c:807
+#: ../capplet/gnome-pilot-capplet.c:814
 msgid "_Edit this PDA..."
 msgstr "ç¼?è¾?æ¤PDA(_E)..."
 
-#: ../capplet/gnome-pilot-capplet.c:808
+#: ../capplet/gnome-pilot-capplet.c:815
 msgid "Edit the currently selected PDA"
 msgstr "ç¼?è¾?å½?å??é??æ?©ç?? PDA"
 
-#: ../capplet/gnome-pilot-capplet.c:810
+#: ../capplet/gnome-pilot-capplet.c:816
 msgid "_Delete this PDA"
 msgstr "å? é?¤æ¤PDA(_E)"
 
-#: ../capplet/gnome-pilot-capplet.c:811
+#: ../capplet/gnome-pilot-capplet.c:817
 msgid "Delete the currently selected PDA"
 msgstr "å? é?¤å½?å??é??æ?©ç?? PDA"
 
-#: ../capplet/gnome-pilot-capplet.c:944
+#: ../capplet/gnome-pilot-capplet.c:969
 #, c-format
 msgid "Are you sure you want to delete %s device?"
 msgstr "æ?¨ç¡®ä¿¡æ?¨å¸?æ??å? é?¤ %s è®¾å¤?ï¼?"
 
-#: ../capplet/gnome-pilot-capplet.c:965
+#: ../capplet/gnome-pilot-capplet.c:990
 msgid "_Edit this device..."
 msgstr "ç¼?è¾?æ¤è®¾å¤?(_E)..."
 
-#: ../capplet/gnome-pilot-capplet.c:966
+#: ../capplet/gnome-pilot-capplet.c:991
 msgid "Edit the currently selected device"
 msgstr "ç¼?è¾?å½?å??é??æ?©ç??è®¾å¤?"
 
-#: ../capplet/gnome-pilot-capplet.c:968
+#: ../capplet/gnome-pilot-capplet.c:992
 msgid "_Delete this device"
 msgstr "å? é?¤æ¤è®¾å¤?(_D)"
 
-#: ../capplet/gnome-pilot-capplet.c:969
+#: ../capplet/gnome-pilot-capplet.c:993
 msgid "Delete the currently selected device"
 msgstr "å? é?¤å½?å??é??æ?©ç??è®¾å¤?"
 
-#: ../capplet/gnome-pilot-capplet.c:1131
+#: ../capplet/gnome-pilot-capplet.c:1177
 #, c-format
 msgid "Unable to instantiate %s conduit."
 msgstr "æ? æ³?å®?ä¾?å?? %s å¯¼ç®¡ã??"
 
-#: ../capplet/gnome-pilot-capplet.c:1171
+#: ../capplet/gnome-pilot-capplet.c:1217
 msgid "_Enable this conduit"
 msgstr "å?¯ç?¨æ¤å¯¼ç®¡(_E)"
 
-#: ../capplet/gnome-pilot-capplet.c:1172
+#: ../capplet/gnome-pilot-capplet.c:1218
 msgid "Disable the currently selected conduit"
 msgstr "ç¦?ç?¨å½?å??é??æ?©ç??å¯¼ç®¡"
 
-#: ../capplet/gnome-pilot-capplet.c:1174
+#: ../capplet/gnome-pilot-capplet.c:1219
 msgid "_Disable this conduit"
 msgstr "ç¦?ç?¨æ¤å¯¼ç®¡(_D)"
 
-#: ../capplet/gnome-pilot-capplet.c:1175
+#: ../capplet/gnome-pilot-capplet.c:1220
 msgid "Enable the currently selected conduit"
 msgstr "å?¯ç?¨å½?å??é??æ?©ç??å¯¼ç®¡"
 
-#: ../capplet/gnome-pilot-capplet.c:1180 ../capplet/gpilotd-capplet.glade.h:85
+#: ../capplet/gnome-pilot-capplet.c:1221 ../capplet/gpilotd-capplet.ui.h:72
 msgid "_Settings..."
 msgstr "è®¾ç½®(_S)..."
 
-#: ../capplet/gnome-pilot-capplet.c:1181
+#: ../capplet/gnome-pilot-capplet.c:1222
 msgid "Modify the currently selected conduit's settings"
 msgstr "ä¿®æ?¹å½?å??é??æ?©ç??å¯¼ç®¡ç??è®¾ç½®"
 
 #. < 0) {
-#: ../capplet/gnome-pilot-cdialog.c:210
-msgid ""
-"Unable to create PDA settings window. Incorrect conduit configuration."
+#: ../capplet/gnome-pilot-cdialog.c:205
+msgid "Unable to create PDA settings window. Incorrect conduit configuration."
 msgstr "æ? æ³?å??å»º PDA è®¾ç½®çª?å?£ã??ç®¡é??é??ç½®ä¸?æ£ç¡®ã??"
 
-#: ../capplet/gnome-pilot-druid.c:488
+#: ../capplet/gnome-pilot-assistant.c:518
 msgid ""
 "Setup did not complete and settings will not\n"
 "be saved. Are you sure you want to quit?"
@@ -384,7 +377,7 @@ msgstr ""
 "è®¾ç½®æ?ªå®?æ??ä¸?ä¸?ä¼?ä¿?å?è®¾ç½®ã??\n"
 "æ?¨ç¡®ä¿¡è¦?é??å?ºï¼?"
 
-#: ../capplet/gnome-pilot-druid.c:611
+#: ../capplet/gnome-pilot-assistant.c:737
 #, c-format
 msgid ""
 "About to send the following data to the PDA.\n"
@@ -397,7 +390,7 @@ msgstr ""
 "IDï¼?%d\n"
 "è¯·å°? PDA æ?¾ç½®äº? %s (%s) ä¸ï¼?ç?¶å??æ?? HotSync æ??é?®ã??"
 
-#: ../capplet/gnome-pilot-druid.c:636
+#: ../capplet/gnome-pilot-assistant.c:762
 #, c-format
 msgid ""
 "About to retrieve Owner Name and ID from the PDA.\n"
@@ -406,11 +399,11 @@ msgstr ""
 "å?³å°?ä»? PDA æ£?ç´¢ç?¨æ?·å??å?? IDã??\n"
 "è¯·å°? PDA æ?¾ç½®äº? %s (%s) ä¸ï¼?ç?¶å??æ?? HotSync æ??é?®ã??"
 
-#: ../capplet/gnome-pilot-druid.c:652
+#: ../capplet/gnome-pilot-assistant.c:778
 msgid "Failed sending request to gpilotd"
 msgstr "å°?è¯·æ±?å??é??å?° gpilotd å¤±è´¥"
 
-#: ../capplet/gnome-pilot-druid.c:803
+#: ../capplet/gnome-pilot-assistant.c:948
 #, c-format
 msgid ""
 "Successfully retrieved Owner Name and ID from PDA.\n"
@@ -421,57 +414,37 @@ msgstr ""
 "ç?¨æ?·å??ï¼?%s\n"
 "PDA IDï¼?%d"
 
-#: ../capplet/gnome-pilot-pdialog.c:432
+#: ../capplet/gnome-pilot-pdialog.c:460
 #, c-format
 msgid ""
 "Please put PDA in %s (%s) and press HotSync button or cancel the operation."
 msgstr "è¯·å°? PDA æ?¾ç½®äº? %s (%s) ä¸ï¼?ç?¶å??æ?? HotSync æ??é?®æ??è??å??æ¶?è¯¥æ??ä½?ã??"
 
-#: ../capplet/gnome-pilot-pdialog.c:467
+#: ../capplet/gnome-pilot-pdialog.c:495
 msgid "The request to get PDA ID failed"
 msgstr "è?·å??PDA ID ç??è¯·æ±?å¤±è´¥"
 
-#: ../capplet/gnome-pilot-pdialog.c:511
+#: ../capplet/gnome-pilot-pdialog.c:539
 msgid "The request to set PDA ID failed"
 msgstr "è®¾ç½® PDA id ç??è¯·æ±?å¤±è´¥"
 
-#: ../capplet/gpilotd-capplet.glade.h:2
-msgid "/dev/pilot"
-msgstr "/dev/pilot"
-
-#: ../capplet/gpilotd-capplet.glade.h:3
-msgid "/dev/ttyS0"
-msgstr "/dev/ttyS0"
-
-#: ../capplet/gpilotd-capplet.glade.h:4
-msgid "/dev/ttyS1"
-msgstr "/dev/ttyS1"
-
-#: ../capplet/gpilotd-capplet.glade.h:5
-msgid "/dev/ttyUSB0"
-msgstr "/dev/ttyUSB0"
-
-#: ../capplet/gpilotd-capplet.glade.h:6
-msgid "/dev/ttyUSB1"
-msgstr "/dev/ttyUSB1"
-
-#: ../capplet/gpilotd-capplet.glade.h:7
+#: ../capplet/gpilotd-capplet.ui.h:1
 msgid "<b>Conduit Actions</b>"
 msgstr "<b>ç®¡é??å?¨ä½?</b>"
 
-#: ../capplet/gpilotd-capplet.glade.h:8
+#: ../capplet/gpilotd-capplet.ui.h:2
 msgid "<b>Conduit Settings</b>"
 msgstr "<b>ç®¡é??è®¾ç½®</b>"
 
-#: ../capplet/gpilotd-capplet.glade.h:9
+#: ../capplet/gpilotd-capplet.ui.h:3
 msgid "<b>PDA Attributes</b>"
 msgstr "<b>PDA å±?æ?§</b>"
 
-#: ../capplet/gpilotd-capplet.glade.h:10
+#: ../capplet/gpilotd-capplet.ui.h:4
 msgid "<b>PDA Identification</b>"
 msgstr "<b>PDA èº«ä»½éª?è¯?</b>"
 
-#: ../capplet/gpilotd-capplet.glade.h:11
+#: ../capplet/gpilotd-capplet.ui.h:5
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Which device should be used for this "
 "operation?</span>\n"
@@ -481,39 +454,32 @@ msgid ""
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">å?ªä¸ªè®¾å¤?åº?å½?å?¨æ¤æ??ä½?ä¸è¢«ä½¿ç?¨ï¼?</span>\n"
 "\n"
-"æ?¢ç?¶ä½ æ?¥æ??è¶?è¿?ä¸?ä¸ªä¸ºè¿?ä¸ªç?µè??è®¾å®?ç??è¿?æ?¥è®¾å¤?ï¼?ä½ é??è¦?æ ?è¯?å?ºå?ªä¸ªæ?¯å?¨è¿?ä¸ªæ??ä½?ä¸ä½¿ç?¨ç??ã??"
-
-#: ../capplet/gpilotd-capplet.glade.h:14
-msgid "BIG5"
-msgstr "BIG5"
+"æ?¢ç?¶ä½ æ?¥æ??è¶?è¿?ä¸?ä¸ªä¸ºè¿?ä¸ªç?µè??è®¾å®?ç??è¿?æ?¥è®¾å¤?ï¼?ä½ é??è¦?æ ?è¯?å?ºå?ªä¸ªæ?¯å?¨è¿?ä¸ªæ??ä½?ä¸ä½¿"
+"ç?¨ç??ã??"
 
-#: ../capplet/gpilotd-capplet.glade.h:15
-msgid "CP1252"
-msgstr "CP1252"
-
-#: ../capplet/gpilotd-capplet.glade.h:16
+#: ../capplet/gpilotd-capplet.ui.h:8
 msgid "C_harset of PDA:"
 msgstr "PDA å?ç¬¦é??ï¼?"
 
-#: ../capplet/gpilotd-capplet.glade.h:17
+#: ../capplet/gpilotd-capplet.ui.h:9
 msgid "C_onduits"
-msgstr ""
+msgstr "ç®¡é??(_O)"
 
-#: ../capplet/gpilotd-capplet.glade.h:18
+#: ../capplet/gpilotd-capplet.ui.h:10
 msgid "Choose Device"
 msgstr "é??æ?©è®¾å¤?"
 
-#: ../capplet/gpilotd-capplet.glade.h:19
+#: ../capplet/gpilotd-capplet.ui.h:11
 msgid ""
 "Choose this option if you have used sync software before, even on another "
 "computer"
 msgstr "é??æ?©è¿?ä¸ªé??é¡¹ï¼?å¦?æ??ä½ ä»¥å??å·²ç»?ä½¿ç?¨äº?å??æ¥è½¯ä»¶ï¼?ç??è?³å?¨å?«ç??ç?µè??ä¸?"
 
-#: ../capplet/gpilotd-capplet.glade.h:20
+#: ../capplet/gpilotd-capplet.ui.h:12
 msgid "Conduit Settings"
 msgstr "ç®¡é??è®¾ç½®"
 
-#: ../capplet/gpilotd-capplet.glade.h:21
+#: ../capplet/gpilotd-capplet.ui.h:13
 msgid ""
 "Congratulations, gnome-pilot is configured!\n"
 "\n"
@@ -531,135 +497,114 @@ msgstr ""
 "é??è¿?å°? PilotLink å°?ç¨?åº?æ·»å? å?°æ?¨ç??é?¢æ?¿ä¸ï¼?\n"
 "æ?¨å?¯ä»¥å¯¹ gnome-pilot ç??å??æ¥è¿?è¡?ç??è§?ã??"
 
-#: ../capplet/gpilotd-capplet.glade.h:28
+#: ../capplet/gpilotd-capplet.ui.h:20
 msgid "D_isable"
 msgstr "ç¦?ç?¨(_I)"
 
-#: ../capplet/gpilotd-capplet.glade.h:29
+#: ../capplet/gpilotd-capplet.ui.h:21
 msgid "De_vices"
 msgstr "è®¾å¤?(_V)"
 
-#: ../capplet/gpilotd-capplet.glade.h:30
+#: ../capplet/gpilotd-capplet.ui.h:22
 msgid "Description:"
 msgstr "æ??è¿°:"
 
-#: ../capplet/gpilotd-capplet.glade.h:31
+#: ../capplet/gpilotd-capplet.ui.h:23
 msgid "Device Settings"
 msgstr "è®¾å¤?è®¾ç½®"
 
-#: ../capplet/gpilotd-capplet.glade.h:32
+#: ../capplet/gpilotd-capplet.ui.h:24
 msgid "Device:"
 msgstr "è®¾å¤?:"
 
-#: ../capplet/gpilotd-capplet.glade.h:33 ../capplet/util.c:74
-#: ../capplet/util.c:438
-msgid "Disabled"
-msgstr "å·²ç¦?ç?¨"
-
-#: ../capplet/gpilotd-capplet.glade.h:34
+#: ../capplet/gpilotd-capplet.ui.h:25
 msgid "Enter Owner Name you want stored on your PDA"
 msgstr "è¾?å?¥è¦?å?å?¨å?¨æ?¨ç??PDAä¸?ç??ç?¨æ?·å??"
 
-#: ../capplet/gpilotd-capplet.glade.h:35
-msgid "GB18030"
-msgstr "GB18030"
-
-#: ../capplet/gpilotd-capplet.glade.h:36
-msgid "GBK"
-msgstr "GBK"
-
-#: ../capplet/gpilotd-capplet.glade.h:37
+#: ../capplet/gpilotd-capplet.ui.h:26
 msgid "Get the Owner's name and ID from the PDA"
 msgstr "ä»? PDA ä¸?è?·å¾?ä¸»äººç??å??ç§°å?? ID"
 
-#: ../capplet/gpilotd-capplet.glade.h:38
+#: ../capplet/gpilotd-capplet.ui.h:27
 msgid "I_rDA"
 msgstr "I_rDA"
 
-#: ../capplet/gpilotd-capplet.glade.h:39
+#: ../capplet/gpilotd-capplet.ui.h:28
 msgid "Initial Sync"
 msgstr "èµ·å§?å??æ¥"
 
-#: ../capplet/gpilotd-capplet.glade.h:40
+#: ../capplet/gpilotd-capplet.ui.h:29
 msgid "Net_work"
 msgstr "ç½?ç»?(_w)"
 
-#: ../capplet/gpilotd-capplet.glade.h:41 ../capplet/util.c:115
-msgid "None"
-msgstr "æ? "
-
-#: ../capplet/gpilotd-capplet.glade.h:42
+#: ../capplet/gpilotd-capplet.ui.h:30
 msgid "O_wner:"
 msgstr "æ??æ??è??(_w):"
 
-#: ../capplet/gpilotd-capplet.glade.h:43
+#: ../capplet/gpilotd-capplet.ui.h:31
 msgid "Owner Name and ID to set on the PDA"
 msgstr "è®¾ç½®å?¨ PDA ä¸?ç??ç?¨æ?·å??å?? ID"
 
-#: ../capplet/gpilotd-capplet.glade.h:44
+#: ../capplet/gpilotd-capplet.ui.h:32
 msgid "Owner:"
 msgstr "æ??æ??è??"
 
-#: ../capplet/gpilotd-capplet.glade.h:45
+#: ../capplet/gpilotd-capplet.ui.h:33
 msgid "PDA Attributes"
 msgstr "PDA å±?æ?§"
 
-#: ../capplet/gpilotd-capplet.glade.h:46
+#: ../capplet/gpilotd-capplet.ui.h:34
 msgid "PDA Identification"
 msgstr "PDA èº«ä»½éª?è¯?"
 
-#: ../capplet/gpilotd-capplet.glade.h:47
+#: ../capplet/gpilotd-capplet.ui.h:35
 msgid "PDA Settings"
 msgstr "PDA è®¾ç½®"
 
-#: ../capplet/gpilotd-capplet.glade.h:48
+#: ../capplet/gpilotd-capplet.ui.h:36
 msgid "P_DA:"
 msgstr "PDA(_D)ï¼?"
 
-#: ../capplet/gpilotd-capplet.glade.h:49
-msgid "Port"
-msgstr "ç«¯å?£"
+#: ../capplet/gpilotd-capplet.ui.h:37
+msgid "Please fix the following problem..."
+msgstr "è¯·ä¿®å¤?ä¸?å??é?®é¢?..."
 
-#: ../capplet/gpilotd-capplet.glade.h:50
+#: ../capplet/gpilotd-capplet.ui.h:38
 msgid "S_peed:"
 msgstr "é??åº¦(_P)ï¼?"
 
-#: ../capplet/gpilotd-capplet.glade.h:51
+#: ../capplet/gpilotd-capplet.ui.h:39
 msgid ""
 "Send the Owner's name and ID to the PDA, overwriting any existing identity"
 msgstr "å??é??æ??æ??è??ç??å§?å??å??IDå?°PDAï¼?è¦?ç??å·²æ??ä¿¡æ?¯"
 
-#: ../capplet/gpilotd-capplet.glade.h:52
-msgid "Set the character set used on your PDA."
-msgstr "è®¾å¤?æ?¨ PDA ä¸?ä½¿ç?¨ç??å?ç¬¦é??ã??"
-
-#: ../capplet/gpilotd-capplet.glade.h:53
+#: ../capplet/gpilotd-capplet.ui.h:40
 msgid "Set the root directory for all PDA files to be stored."
 msgstr "ä¸ºæ??æ??è¦?å?å?¨ç?? PDA æ??ä»¶è®¾ç½®æ ¹ç?®å½?ã??"
 
-#: ../capplet/gpilotd-capplet.glade.h:54
+#: ../capplet/gpilotd-capplet.ui.h:41
 msgid "Success"
 msgstr "æ??å??"
 
-#: ../capplet/gpilotd-capplet.glade.h:55
+#: ../capplet/gpilotd-capplet.ui.h:42
 msgid "The name for your PDA.  It is only used for identification."
 msgstr "æ?¨ç??PDA ç??å??ç§°ã??ä»?ç?¨äº?èº«ä»½éª?è¯?ã??"
 
-#: ../capplet/gpilotd-capplet.glade.h:56
+#: ../capplet/gpilotd-capplet.ui.h:43
 msgid ""
 "This integer ID identifies your PDA and must be unique between different "
 "PDAs that you use."
 msgstr "æ¤æ?´æ?° ID ç?¨äº?æ ?è¯?æ?¨ç?? PDAï¼?å?¨æ?¨æ??ç?¨ç??ä¸?å?? PDA ä¹?é?´å¿?é¡»å?¯ä¸?ã??"
 
-#: ../capplet/gpilotd-capplet.glade.h:57
+#: ../capplet/gpilotd-capplet.ui.h:44
 msgid "Ti_meout:"
 msgstr "è¶?æ?¶(_m)"
 
-#: ../capplet/gpilotd-capplet.glade.h:58
+#: ../capplet/gpilotd-capplet.ui.h:45
 msgid "Welcome to gnome-pilot!"
 msgstr "æ¬¢è¿?ä½¿ç?¨ gnome-pilotï¼?"
 
-#: ../capplet/gpilotd-capplet.glade.h:59
+#: ../capplet/gpilotd-capplet.ui.h:46
 msgid ""
 "You seem to be running gnome-pilot for the first time.\n"
 "The following steps will setup gnome-pilot for syncing. \n"
@@ -677,116 +622,114 @@ msgstr ""
 "æ??â??ç»§ç»â??å?¯ç»§ç»è¿?è¡?ä¸?ä¸?æ¥ã??\n"
 "æ??â??å??æ¶?â??å°?é??å?ºã??"
 
-#: ../capplet/gpilotd-capplet.glade.h:66
+#: ../capplet/gpilotd-capplet.ui.h:53
 msgid "_Action:"
 msgstr "å?¨ä½?(_A)ï¼?"
 
-#: ../capplet/gpilotd-capplet.glade.h:67
+#: ../capplet/gpilotd-capplet.ui.h:54
 msgid "_Add..."
 msgstr "æ·»å? (_A)..."
 
-#: ../capplet/gpilotd-capplet.glade.h:68
+#: ../capplet/gpilotd-capplet.ui.h:55
 msgid "_Bluetooth"
 msgstr "è??ç??(_B)"
 
-#: ../capplet/gpilotd-capplet.glade.h:69
+#: ../capplet/gpilotd-capplet.ui.h:56
 msgid "_Delete"
 msgstr "å? é?¤(_D)"
 
-#: ../capplet/gpilotd-capplet.glade.h:70
+#: ../capplet/gpilotd-capplet.ui.h:57
 msgid "_Device:"
 msgstr "è®¾å¤?(_D)ï¼?"
 
-#: ../capplet/gpilotd-capplet.glade.h:71
+#: ../capplet/gpilotd-capplet.ui.h:58
 msgid "_Edit..."
 msgstr "ç¼?è¾?(_E)..."
 
-#: ../capplet/gpilotd-capplet.glade.h:72
+#: ../capplet/gpilotd-capplet.ui.h:59
 msgid "_Enable"
 msgstr "å?¯ç?¨(_E)"
 
-#: ../capplet/gpilotd-capplet.glade.h:73
+#: ../capplet/gpilotd-capplet.ui.h:60
 msgid "_Get from PDA"
 msgstr "ä»?PDAè?·å??(_G)"
 
-#: ../capplet/gpilotd-capplet.glade.h:74
+#: ../capplet/gpilotd-capplet.ui.h:61
 msgid "_IrDA"
 msgstr "_IrDA"
 
-#: ../capplet/gpilotd-capplet.glade.h:75
+#: ../capplet/gpilotd-capplet.ui.h:62
 msgid "_Local folder:"
 msgstr "æ?¬å?°æ??ä»¶å¤¹(_L):"
 
-#: ../capplet/gpilotd-capplet.glade.h:76
+#: ../capplet/gpilotd-capplet.ui.h:63
 msgid "_Name of PDA:"
 msgstr "PDAå??ç§°(_N)"
 
-#: ../capplet/gpilotd-capplet.glade.h:77
+#: ../capplet/gpilotd-capplet.ui.h:64
 msgid "_Name:"
 msgstr "å??ç§°(_N):"
 
-#: ../capplet/gpilotd-capplet.glade.h:78
+#: ../capplet/gpilotd-capplet.ui.h:65
 msgid "_No, I've never used sync software with this PDA before."
 msgstr "ä¸?ï¼?ä»¥å??æ??ä»?æ?ªå¯¹æ¤PDA ä½¿ç?¨è¿?å??æ¥è½¯ä»¶ã??"
 
-#: ../capplet/gpilotd-capplet.glade.h:79
+#: ../capplet/gpilotd-capplet.ui.h:66
 msgid "_One time action:"
 msgstr "ä¸?æ¬¡æ??ä½?ï¼?"
 
-#: ../capplet/gpilotd-capplet.glade.h:80
+#: ../capplet/gpilotd-capplet.ui.h:67
 msgid "_Owner:"
 msgstr "æ??æ??è??(_O)ï¼?"
 
-#: ../capplet/gpilotd-capplet.glade.h:81
+#: ../capplet/gpilotd-capplet.ui.h:68
 msgid "_PDA ID:"
 msgstr "_PDA ID:"
 
-#: ../capplet/gpilotd-capplet.glade.h:82
+#: ../capplet/gpilotd-capplet.ui.h:69
 msgid "_PDAs"
 msgstr "PDA(_P)"
 
-#: ../capplet/gpilotd-capplet.glade.h:83
+#: ../capplet/gpilotd-capplet.ui.h:70
 msgid "_Send to PDA"
 msgstr "å??é??å?° PDA"
 
-#: ../capplet/gpilotd-capplet.glade.h:84
+#: ../capplet/gpilotd-capplet.ui.h:71
 msgid "_Serial"
 msgstr "ä¸²å?£(_S)"
 
-#: ../capplet/gpilotd-capplet.glade.h:86
+#: ../capplet/gpilotd-capplet.ui.h:73
 msgid "_Type:"
 msgstr "ç±»å??(_T)"
 
-#: ../capplet/gpilotd-capplet.glade.h:87
+#: ../capplet/gpilotd-capplet.ui.h:74
 msgid "_USB"
 msgstr "_USB"
 
-#: ../capplet/gpilotd-capplet.glade.h:88
+#: ../capplet/gpilotd-capplet.ui.h:75
 msgid "_Yes, I've used sync software with this PDA before."
 msgstr "æ?¯ç??ï¼?æ??ä»¥å??å¯¹æ¤PDA ä½¿ç?¨è¿?å??æ¥è½¯ä»¶ã??"
 
-#: ../capplet/gpilotd-control-applet.c:81
-msgid "Start druid only"
-msgstr "ä»?å?¯å?¨ druid"
+#: ../capplet/gpilotd-control-applet.c:89
+msgid " - configure gnome-pilot settings"
+msgstr "- gnome-pilot è®¾ç½®"
 
-#: ../capplet/gpilotd-control-applet.c:103
-msgid "Error initializing gpilotd capplet"
-msgstr "å??å§?å?? gpilotd capplet æ?¶å??ç??é??è¯¯"
+#: ../capplet/gpilotd-control-applet.c:91
+#: ../capplet/gpilotd-control-applet.c:100
+#, c-format
+msgid "Error initializing gpilotd capplet : %s"
+msgstr "å??å§?å?? gpilotd capplet æ?¶å??ç??é??è¯¯ï¼?%s"
 
-#: ../capplet/gpilotd-control-applet.c:114
-#: ../capplet/gpilotd-control-applet.c:115
+#: ../capplet/gpilotd-control-applet.c:106
+#: ../capplet/gpilotd-control-applet.c:107
 msgid "Error loading PDA state, aborting"
 msgstr "è½½å?¥ PDA ç?¶æ??æ?¶å??ç??é??è¯¯ï¼?æ£å?¨ç»?æ¢"
 
-#: ../capplet/gpilotd-control-applet.c:122
-#: ../capplet/gpilotd-control-applet.c:123
+#: ../capplet/gpilotd-control-applet.c:114
+#: ../capplet/gpilotd-control-applet.c:115
 msgid "Cannot connect to the GnomePilot Daemon"
 msgstr "æ? æ³?è¿?æ?¥å?° GnomePilot å®?æ?¤è¿?ç¨?"
 
-#: ../capplet/gpilotd-control-applet.c:132
-msgid "Cannot run druid if PDAs or devices already configured"
-msgstr "å¦?æ??PDA æ??åº?åº§å·²é??ç½®ï¼?å??æ? æ³?è¿?è¡? druid"
-
 #: ../capplet/gpilotd-control-applet.desktop.in.in.h:1
 msgid "Configure PalmOS devices"
 msgstr "é??ç½® PalmOS è®¾å¤?"
@@ -795,59 +738,107 @@ msgstr "é??ç½® PalmOS è®¾å¤?"
 msgid "PalmOS Devices"
 msgstr "PalmOS è®¾å¤?"
 
-#: ../capplet/util.c:81 ../capplet/util.c:440
+#: ../capplet/pilot.c:118
+#, c-format
+msgid "Unable load key gpilotd/General/sync_PC_Id: %s"
+msgstr "æ? æ³?è½½å?¥å?¼ gpilotd/General/sync_PC_Id: %s"
+
+#: ../capplet/pilot.c:132
+#, c-format
+msgid "Unable load key gpilotd/General/progress_stepping: %s"
+msgstr "æ? æ³?è½½å?¥å?¼ gpilotd/General/progress_stepping: %s"
+
+#: ../capplet/pilot.c:166
+#, c-format
+msgid "Unable load key gpilotd/%s/type: %s"
+msgstr "æ? æ³?è½½å?¥å?¼ gpilotd/%s/type: %s"
+
+#: ../capplet/pilot.c:188
+#, c-format
+msgid "Unable load key gpilotd/%s/name: iDevice, %s"
+msgstr "æ? æ³?è½½å?¥å?¼ gpilotd/%s/name: iDevice, %s"
+
+#: ../capplet/pilot.c:206
+#, c-format
+msgid "Unable load key gpilotd/%s/speed: %s"
+msgstr "æ? æ³?è½½å?¥å?¼ gpilotd/%s/speed: %s"
+
+#: ../capplet/pilot.c:215
+#, c-format
+msgid "Unable load key gpilotd/%s/timeout: %s"
+msgstr "æ? æ³?è½½å?¥å?¼ gpilotd/%s/timeout: %s"
+
+#: ../capplet/pilot.c:257
+#, c-format
+msgid "Unable load key gpilotd/%s/name: %s"
+msgstr "æ? æ³?è½½å?¥å?¼ gpilotd/%s/name: %s"
+
+#: ../capplet/pilot.c:267
+#, c-format
+msgid "Unable load key gpilotd/%s/pilotid: %s"
+msgstr "æ? æ³?è½½å?¥å?¼ gpilotd/%s/pilotid: %s"
+
+#: ../capplet/util.c:123 ../capplet/util.c:512
+msgid "Disabled"
+msgstr "å·²ç¦?ç?¨"
+
+#: ../capplet/util.c:129 ../capplet/util.c:514
 msgid "Enabled"
 msgstr "å·²å?¯ç?¨"
 
-#: ../capplet/util.c:238
+#: ../capplet/util.c:180
+msgid "None"
+msgstr "æ? "
+
+#: ../capplet/util.c:310
 msgid "You must have at least one device setup"
 msgstr "æ?¨å¿?é¡»è?³å°?è®¾ç½®ä¸?ä¸ªè®¾å¤?"
 
-#: ../capplet/util.c:411
+#: ../capplet/util.c:485
 msgid "Synchronize"
 msgstr "å??æ¥"
 
-#: ../capplet/util.c:412
+#: ../capplet/util.c:486
 msgid "Copy from PDA"
 msgstr "ä»? PDA å¤?å?¶"
 
-#: ../capplet/util.c:413
+#: ../capplet/util.c:487
 msgid "Copy to PDA"
 msgstr "å¤?å?¶å?° PDA"
 
-#: ../capplet/util.c:414
+#: ../capplet/util.c:488
 msgid "Merge from PDA"
 msgstr "ä»? PDA å??å¹¶"
 
-#: ../capplet/util.c:415
+#: ../capplet/util.c:489
 msgid "Merge to PDA"
 msgstr "å??å¹¶å?° PDA"
 
-#: ../capplet/util.c:418
+#: ../capplet/util.c:492
 msgid "Use conduit settings"
 msgstr "ä½¿ç?¨ç®¡é??è®¾ç½®"
 
-#: ../capplet/util.c:426
+#: ../capplet/util.c:500
 msgid "USB"
 msgstr "USB"
 
-#: ../capplet/util.c:427
+#: ../capplet/util.c:501
 msgid "IrDA"
 msgstr "IrDA"
 
-#: ../capplet/util.c:428
+#: ../capplet/util.c:502
 msgid "Network"
 msgstr "ç½?ç»?"
 
-#: ../capplet/util.c:429
+#: ../capplet/util.c:503
 msgid "Bluetooth"
 msgstr "è??ç??"
 
-#: ../capplet/util.c:430
+#: ../capplet/util.c:504
 msgid "Serial"
 msgstr "åº?å??"
 
-#: ../capplet/util.c:478
+#: ../capplet/util.c:551
 msgid ""
 "The specified base directory exists but has the wrong permissions.\n"
 "Please fix or choose another directory"
@@ -855,7 +846,7 @@ msgstr ""
 "æ??å®?ç??å?ºç?®å½?å?å?¨ï¼?ä½?æ??é??ä¸?æ£ç¡®ã??\n"
 "è¯·ä¿®æ?¹æ??é??æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../capplet/util.c:483
+#: ../capplet/util.c:556
 msgid ""
 "The specified base directory exists but is not a directory.\n"
 "Please make it a directory or choose another directory"
@@ -863,7 +854,7 @@ msgstr ""
 "æ??å®?ç??å?ºç?®å½?å?å?¨ï¼?ä½?å?¶å®?å®?ä¸?æ?¯ç?®å½?ã??\n"
 "è¯·å°?å?¶å??ä¸ºç?®å½?æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../capplet/util.c:490
+#: ../capplet/util.c:563
 msgid ""
 "It wasn't possible to create the specified base directory.\n"
 "Please verify the permitions on the specified path or choose another "
@@ -872,7 +863,7 @@ msgstr ""
 "æ? æ³?å??å»ºæ??å®?ç??å?ºç?®å½?ã??\n"
 "è¯·æ£?æ?¥æ??å®?è·¯å¾?ä¸?ç??æ??é??ï¼?æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../capplet/util.c:495
+#: ../capplet/util.c:568
 msgid ""
 "The path specified for the base directory is invalid.\n"
 "Please choose another directory"
@@ -880,104 +871,116 @@ msgstr ""
 "ä¸ºå?ºç?®å½?æ??å®?ç??è·¯å¾?æ? æ??ã??\n"
 "è¯·é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../capplet/util.c:523
+#: ../capplet/util.c:595
 #, c-format
 msgid ""
-"`%s' is not a valid character set identifier.  Please enter a valid "
-"identifier or select from the available options."
-msgstr "`%s' ä¸?æ?¯æ??æ??ç??å?ç¬¦é??æ ?è¯?ã??è¯·è¾?å?¥ä¸?ä¸ªæ??æ??ç??æ ?è¯?æ??ä»?å?¯ç?¨é??é¡¹ä¸é??æ?©ã??"
+"`%s' is not a valid character set identifier.\n"
+"Please enter a valid identifier or select from the available options."
+msgstr ""
+"`%s' ä¸?æ?¯æ??æ??ç??å?ç¬¦é??æ ?è¯?ã??\n"
+"è¯·è¾?å?¥ä¸?ä¸ªæ??æ??ç??æ ?è¯?æ??ä»?å?¯ç?¨é??é¡¹ä¸é??æ?©ã??"
 
-#: ../capplet/util.c:647
+#: ../capplet/util.c:718
 msgid "Device 'usb:' is only valid for devices of type USB"
 msgstr "è®¾å¤? 'usb:' å?ªå¯¹ USB è®¾å¤?ç±»å??æ??æ??"
 
-#: ../capplet/util.c:658
+#: ../capplet/util.c:727
 msgid "Read/Write permissions failed on"
 msgstr "è¯»å??/å??å?¥æ??é??å¤±è´¥"
 
-#: ../capplet/util.c:660
+#: ../capplet/util.c:729
 msgid "Check the permissions on the device and retry"
 msgstr "æ£?æ?¥è®¾å¤?ä¸?ç??æ??é??å¹¶é??è¯?"
 
-#: ../capplet/util.c:675 ../gpilotd/gpilotd.c:1342
+#: ../capplet/util.c:742 ../gpilotd/gpilotd.c:1349
 #, c-format
 msgid ""
 "Failed to find directory %s or read file %s.  Check that usbfs or sysfs is "
 "mounted."
 msgstr "æ?¥æ?¾ç?®å½? %s æ??è??è¯»å??æ??ä»¶ %s å¤±è´¥ã??æ£?æ?¥ usbfs æ??è?? sysfs æ?¯å?¦è¢«å? è½½ã??"
 
-#: ../conduits/backup/backup_conduit.c:243
+#: ../conduits/backup/backup_conduit.c:111
+#, c-format
+msgid "Unable load key backup-conduit/%s/updated_only: %s"
+msgstr "æ? æ³?è½½å?¥å?¼ backup-conduit/%s/updated_only: %s"
+
+#: ../conduits/backup/backup_conduit.c:119
+#, c-format
+msgid "Unable load key backup-conduit/%s/remove_deleted: %s"
+msgstr "æ? æ³?è½½å?¥å?¼ backup-conduit/%s/remove_deleted: %s"
+
+#: ../conduits/backup/backup_conduit.c:266
 msgid "Checking for removed databases"
 msgstr "æ£?æ?¥å·²å? é?¤ç??æ?°æ?®åº?"
 
 #. I18N note: this is printed when renaming a file %s
-#: ../conduits/backup/backup_conduit.c:250
+#: ../conduits/backup/backup_conduit.c:274
 #, c-format
 msgid "Renaming %s"
 msgstr "é??å?½å?? %s"
 
 #. I18N note: this message follow a "Renaming %s". The
 #. %s is a file name
-#: ../conduits/backup/backup_conduit.c:257
+#: ../conduits/backup/backup_conduit.c:282
 #, c-format
 msgid "to %s"
 msgstr "ä¸º %s"
 
-#: ../conduits/backup/backup_conduit.c:435
-#: ../conduits/backup/backup_conduit.c:439
+#: ../conduits/backup/backup_conduit.c:461
+#: ../conduits/backup/backup_conduit.c:465
 #, c-format
 msgid "%s not modified since last sync"
 msgstr "è?ªä»?ä¸?ä¸?æ¬¡å??æ¥ä»¥æ?¥ %s å¹¶æ?ªä¿®æ?¹"
 
-#: ../conduits/backup/backup_conduit.c:451
-#: ../conduits/backup/backup_conduit.c:453
+#: ../conduits/backup/backup_conduit.c:477
+#: ../conduits/backup/backup_conduit.c:479
 #, c-format
 msgid "Making backup of %s"
 msgstr "å??å»º %s ç??å¤?ä»½"
 
-#: ../conduits/backup/backup_conduit.c:460
-#: ../conduits/backup/backup_conduit.c:462
+#: ../conduits/backup/backup_conduit.c:486
+#: ../conduits/backup/backup_conduit.c:488
 #, c-format
 msgid "Could not create backup file %s"
 msgstr "æ? æ³?å??å»ºå¤?ä»½æ??ä»¶ %s"
 
-#: ../conduits/backup/backup_conduit.c:736
+#: ../conduits/backup/backup_conduit.c:764
 msgid "Collecting restore information..."
 msgstr "æ£å?¨æ?¶é??æ?¢å¤?ä¿¡æ?¯..."
 
-#: ../conduits/backup/backup_conduit.c:860
+#: ../conduits/backup/backup_conduit.c:891
 msgid "_Backup directory:"
 msgstr "å¤?ä»½æ??ä»¶å¤¹(_B)ï¼?"
 
-#: ../conduits/backup/backup_conduit.c:873
+#: ../conduits/backup/backup_conduit.c:904
 msgid "Backup directory"
 msgstr "å¤?ä»½ç?®å½?"
 
-#: ../conduits/backup/backup_conduit.c:875
+#: ../conduits/backup/backup_conduit.c:906
 msgid "O_nly backup changed bases"
-msgstr ""
+msgstr "ä»?å¤?ä»½æ?´æ?¹ç??æ?°æ?®åº?(_N)"
 
-#: ../conduits/backup/backup_conduit.c:885
+#: ../conduits/backup/backup_conduit.c:916
 msgid "Only backup changed bases"
 msgstr "ä»?å¤?ä»½æ?´æ?¹ç??æ?°æ?®åº?"
 
-#: ../conduits/backup/backup_conduit.c:887
+#: ../conduits/backup/backup_conduit.c:918
 msgid "_Remove local base if deleted on pilot"
-msgstr ""
+msgstr "å¦?æ??å?¨ pilot ä¸?å? é?¤ï¼?å??å? é?¤æ?¬å?°æ?°æ?®åº?(_R)"
 
-#: ../conduits/backup/backup_conduit.c:897
+#: ../conduits/backup/backup_conduit.c:928
 msgid "Remove local base if deleted on pilot"
 msgstr "å¦?æ??å?¨ pilot ä¸?å? é?¤ï¼?è¯·å? é?¤æ?¬å?°æ?°æ?®åº?"
 
-#: ../conduits/backup/backup_conduit.c:899
+#: ../conduits/backup/backup_conduit.c:930
 msgid "# of old backups to _keep"
-msgstr ""
+msgstr "# é??è¦?ä¿?å?ç??æ?§å¤?ä»½"
 
-#: ../conduits/backup/backup_conduit.c:910
+#: ../conduits/backup/backup_conduit.c:941
 msgid "# of old backups to keep"
 msgstr "è¦?ä¿?ç??ç??æ?§ç??å¤?ä»½ç??æ?°é??"
 
-#: ../conduits/backup/backup_conduit.c:948
+#: ../conduits/backup/backup_conduit.c:979
 msgid ""
 "The specified backup directory exists but has the wrong permissions.\n"
 "Please fix or choose another directory"
@@ -985,7 +988,7 @@ msgstr ""
 "æ??å®?ç??å¤?ä»½ç?®å½?å?å?¨ï¼?ä½?æ??é??ä¸?æ£ç¡®ã??\n"
 "è¯·ä¿®æ?¹æ??é??æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../conduits/backup/backup_conduit.c:953
+#: ../conduits/backup/backup_conduit.c:984
 msgid ""
 "The specified backup directory exists but is not a directory.\n"
 "Please make it a directory or choose another directory"
@@ -993,7 +996,7 @@ msgstr ""
 "æ??å®?ç??å¤?ä»½ç?®å½?å?å?¨ï¼?ä½?å?¶å®?å®?ä¸?æ?¯ç?®å½?ã??\n"
 "è¯·å°?å?¶å??ä¸ºç?®å½?æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../conduits/backup/backup_conduit.c:960
+#: ../conduits/backup/backup_conduit.c:991
 msgid ""
 "It wasn't possible to create the specified backup directory.\n"
 "Please verify the permissions on the specified path or choose another "
@@ -1002,7 +1005,7 @@ msgstr ""
 "æ? æ³?å??å»ºæ??å®?ç??å¤?ä»½ç?®å½?ã??\n"
 "è¯·æ£?æ?¥æ??å®?è·¯å¾?ä¸?ç??æ??é??ï¼?æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../conduits/backup/backup_conduit.c:965
+#: ../conduits/backup/backup_conduit.c:996
 msgid ""
 "The path specified for the backup directory is invalid.\n"
 "Please choose another directory"
@@ -1025,24 +1028,36 @@ msgstr "æ£å?¨ä»? %2$s å®?è£? %1$s..."
 msgid "Installing %s..."
 msgstr "æ£å?¨å®?è£? %s..."
 
-#: ../conduits/file/gpilot_install_file.c:44
+#: ../conduits/file/gpilot_install_file.c:46
 msgid "Install immediately"
 msgstr "ç«?å?³å®?è£?"
 
-#: ../conduits/file/gpilot_install_file.c:45
+#: ../conduits/file/gpilot_install_file.c:47
 msgid "Install delayed"
 msgstr "å®?è£?å»¶è¿?"
 
-#: ../conduits/file/gpilot_install_file.c:46
+#: ../conduits/file/gpilot_install_file.c:48
 msgid "PDA to install to"
 msgstr "è¦?å®?è£?ç?? PDA"
 
-#: ../conduits/file/gpilot_install_file.c:46
+#: ../conduits/file/gpilot_install_file.c:48
 msgid "PDA"
 msgstr "PDA"
 
-#: ../conduits/file/gpilot_install_file.c:118
-#: ../conduits/file/gpilot_install_file.c:119
+#: ../conduits/file/gpilot_install_file.c:49
+msgid "[FILE...]"
+msgstr "[æ??ä»¶...]"
+
+#: ../conduits/file/gpilot_install_file.c:49
+msgid "list of files"
+msgstr "æ??ä»¶å??è¡¨"
+
+#: ../conduits/file/gpilot_install_file.c:107
+msgid "Error initializing gpilotd"
+msgstr "å??å§?å?? gpilotd æ?¶å??ç??é??è¯¯"
+
+#: ../conduits/file/gpilot_install_file.c:122
+#: ../conduits/file/gpilot_install_file.c:123
 msgid "Unable to get PDA names"
 msgstr "æ? æ³?è?·å?? PDA å??ç§°"
 
@@ -1071,57 +1086,57 @@ msgstr ""
 msgid "Gnome-Pilot daemon"
 msgstr "Gnome-Pilot å®?æ?¤è¿?ç¨?"
 
-#: ../gpilotd/gnome-pilot-conduit-management.gob:686
+#: ../gpilotd/gnome-pilot-conduit-management.gob:684
 msgid "module loading not supported, fatal!"
 msgstr "ä¸?æ?¯æ??æ¨¡å??è½½å?¥ï¼?è?´å?½é??è¯¯ï¼?"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:136
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:137
 msgid "deleted PDA record modified locally, not deleting\n"
 msgstr "å? é?¤ç?? PDA è®°å½?å?¨æ?¬å?°ä¿®æ?¹è¿?ï¼?æ²¡æ??å? é?¤\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:137
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:138
 msgid "deleted local record modified on PDA, not deleting\n"
 msgstr "å? é?¤ç??æ?¬å?°è®°å½?å?¨ PDA ä¸?ä¿®æ?¹è¿?ï¼?æ²¡æ??å? é?¤\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:138
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:142
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:139
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:143
 msgid "merge conflict, PDA and local record swapped\n"
 msgstr "å??å¹¶å?²çª?ï¼?PDA ä¸?æ?¬å?°è®°å½?äº¤æ?¢\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:139
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:140
 msgid "archive and change conflict, PDA and local record swapped\n"
 msgstr "å?æ¡£å??æ?´æ?¹å?²çª?ï¼?PDA ä¸?æ?¬å?°è®°å½?äº¤æ?¢\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:140
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:141
 msgid "archive and change conflict, local record sent to PDA\n"
 msgstr "å?æ¡£å??æ?´æ?¹å?²çª?ï¼?æ?¬å?°è®°å½?å??é??å?° PDA\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:141
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:142
 msgid "archive and change conflict, PDA record saved locally\n"
 msgstr "å?æ¡£å??æ?´æ?¹å?²çª?ï¼?å?¨æ?¬å?°ä¿?å? PDA è®°å½?\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:423
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:498
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:563
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:592
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:621
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:424
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:499
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:564
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:593
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:622
 msgid "Conduits initialization failed, aborting operation"
 msgstr "ç®¡é??å??å§?å??å¤±è´¥ï¼?æ£å?¨ç»?æ¢æ??ä½?"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:436
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:437
 msgid "Unable to delete all records in PDA database, aborting operation."
 msgstr "æ? æ³?å?¨ PDA æ?°æ?®åº?ä¸å? é?¤æ??æ??è®°å½?ï¼?æ£å?¨ç»?æ¢æ??ä½?ã??"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:447
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1025
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:448
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1026
 msgid "Conduit did not return a record"
 msgstr "ç®¡é??æ²¡æ??è¿?å??è®°å½?"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:504
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:505
 msgid "Unable to delete all records in local database, aborting operation."
 msgstr "æ? æ³?å?¨æ?¬å?°æ?°æ?®åº?ä¸å? é?¤æ??æ??è®°å½?ï¼?æ£å?¨ç»?æ¢æ??ä½?ã??"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1430
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1431
 msgid "Error in conduit, newly added record could not be found"
 msgstr "ç®¡é??ä¸æ??é??è¯¯ï¼?æ? æ³?æ?¾å?°æ?°æ·»å? ç??è®°å½?"
 
@@ -1145,12 +1160,12 @@ msgstr "ä»?  PDA å??å¹¶å¤±è´¥ï¼?"
 msgid "Synchronization failed!"
 msgstr "å??æ¥å¤±è´¥ï¼?"
 
-#: ../gpilotd/gnome-pilot-structures.c:286
+#: ../gpilotd/gnome-pilot-structures.c:296
 #, c-format
 msgid "Could not open device %s (%s): reason: \"%s\"."
 msgstr "æ? æ³?æ??å¼?è®¾å¤? %s (%s)ï¼?å??å? ï¼?â??%sâ??ã??"
 
-#: ../gpilotd/gnome-pilot-structures.c:290
+#: ../gpilotd/gnome-pilot-structures.c:300
 #, c-format
 msgid ""
 "GnomePilot could not open device %s (%s).\n"
@@ -1159,30 +1174,30 @@ msgstr ""
 "GnomePilot æ? æ³?æ??å¼?è®¾å¤? %s (%s)ã??\n"
 "å??å? ï¼?â??%sâ??ã??"
 
-#: ../gpilotd/gnome-pilot-structures.c:449
+#: ../gpilotd/gnome-pilot-structures.c:459
 #, c-format
 msgid ""
 "Bluetooth Device [%s]: Unable to bind socket: err %d (check pilot-link was "
 "compiled with bluetooth support)"
-msgstr ""
+msgstr "è??ç??è®¾å¤?[%s]ï¼?æ? æ³?ç»?å®?ç«¯å?£ï¼?é??è¯¯ %d (æ£?æ?¥ pilot-link ç¼?è¯?è¿?äº?è??ç??æ?¯æ??)"
 
-#: ../gpilotd/gnome-pilot-structures.c:459
+#: ../gpilotd/gnome-pilot-structures.c:469
 #, c-format
 msgid "Device [%s, %s]: Unable to bind socket: err %d"
-msgstr ""
+msgstr "è®¾å¤? [%s, %s]ï¼?æ? æ³?ç»?å®?ç«¯å?£ï¼?é??è¯¯ %d"
 
-#: ../gpilotd/gnome-pilot-structures.c:539
-#: ../gpilotd/gnome-pilot-structures.c:590
-#: ../gpilotd/gnome-pilot-structures.c:620
-#: ../gpilotd/gnome-pilot-structures.c:648
+#: ../gpilotd/gnome-pilot-structures.c:549
+#: ../gpilotd/gnome-pilot-structures.c:602
+#: ../gpilotd/gnome-pilot-structures.c:633
+#: ../gpilotd/gnome-pilot-structures.c:661
 msgid "Unknown device type"
 msgstr "æ?ªç?¥è®¾å¤?ç±»å??"
 
-#: ../gpilotd/gnome-pilot-structures.c:663
+#: ../gpilotd/gnome-pilot-structures.c:679
 msgid "Number of devices is configured to 0"
 msgstr "è®¾å¤?æ?°é??é??ç½®ä¸º 0"
 
-#: ../gpilotd/gnome-pilot-structures.c:665
+#: ../gpilotd/gnome-pilot-structures.c:681
 msgid ""
 "No devices configured.\n"
 "Please run gpilotd-control-applet (use gnomecc)\n"
@@ -1192,15 +1207,15 @@ msgstr ""
 "è¯·è¿?è¡? gpilotd-control-applet(ä½¿ç?¨ gnomecc)\n"
 "æ?¥é??ç½® gnome-pilotã??"
 
-#: ../gpilotd/gnome-pilot-structures.c:686
+#: ../gpilotd/gnome-pilot-structures.c:702
 msgid "No accessible devices available"
 msgstr "æ²¡æ??å?¯è®¿é?®ç??è®¾å¤?"
 
-#: ../gpilotd/gnome-pilot-structures.c:701
+#: ../gpilotd/gnome-pilot-structures.c:721
 msgid "Number of PDAs is configured to 0"
 msgstr "PDA ç??æ?°é??é??ç½®ä¸º 0"
 
-#: ../gpilotd/gnome-pilot-structures.c:703
+#: ../gpilotd/gnome-pilot-structures.c:723
 msgid ""
 "No PDAs configured.\n"
 "Please run gpilotd-control-applet (use gnomecc)\n"
@@ -1210,16 +1225,16 @@ msgstr ""
 "è¯·è¿?è¡? gpilotd-control-applet(ä½¿ç?¨ gnomecc)\n"
 "æ?¥é??ç½® gnome-pilotã??"
 
-#: ../gpilotd/gnome-pilot-structures.c:764 ../gpilotd/gpilotd.c:687
+#: ../gpilotd/gnome-pilot-structures.c:786 ../gpilotd/gpilotd.c:694
 #, c-format
 msgid "No pilot_charset specified.  Using `%s'."
-msgstr ""
+msgstr "æ²¡æ??æ??å®? pilot_charset ã??ä½¿ç?¨ `%s'ã??"
 
-#: ../gpilotd/gpilotd.c:236
+#: ../gpilotd/gpilotd.c:240
 msgid "Unable to bind to PDA"
 msgstr "æ? æ³?ç»?å®?å?° PDA"
 
-#: ../gpilotd/gpilotd.c:374
+#: ../gpilotd/gpilotd.c:381
 #, c-format
 msgid ""
 "Failed to connect using device `%s', on port `%s'.  Check your "
@@ -1228,9 +1243,10 @@ msgid ""
 "`ttyUSB...' device."
 msgstr ""
 "ä½¿ç?¨è®¾å¤?â??%sâ??å?¨ç«¯å?£â??%sâ??è¿?æ?¥å¤±è´¥ã??è¯·æ£?æ?¥æ?¨ç??é??ç½®ï¼?å? ä¸ºæ?¨è¯·æ±?ä½¿ç?¨äº?æ?°é£?æ ¼ç?? USB "
-"åº?â??usb:â??æ?¥å??æ¥ï¼?ä½?æ?¯å?´è£?è½½äº?æ?§é£?æ ¼ç??â??visorâ??å??æ ¸æ¨¡å??ã??æ?¨å?¯è?½é??è¦?é??æ?©ä¸?ä¸ªâ??ttyUSB...â??è®¾å¤?ã??"
+"åº?â??usb:â??æ?¥å??æ¥ï¼?ä½?æ?¯å?´è£?è½½äº?æ?§é£?æ ¼ç??â??visorâ??å??æ ¸æ¨¡å??ã??æ?¨å?¯è?½é??è¦?é??æ?©ä¸?"
+"ä¸ªâ??ttyUSB...â??è®¾å¤?ã??"
 
-#: ../gpilotd/gpilotd.c:389
+#: ../gpilotd/gpilotd.c:396
 #, c-format
 msgid ""
 "Failed to connect using device `%s', on port `%s'.  Check your "
@@ -1238,21 +1254,22 @@ msgid ""
 "not have the usbserial `visor' kernel module loaded.  You may need to select "
 "a `usb:' device."
 msgstr ""
-"ä½¿ç?¨è®¾å¤?â??%sâ??å?¨ç«¯å?£â??%sâ??è¿?æ?¥å¤±è´¥ã??è¯·æ£?æ?¥æ?¨ç??é??ç½®ï¼?å? ä¸ºæ?¨è¯·æ±?ä½¿ç?¨äº?æ?§é£?æ ¼ç?? USB åº?å??â??ttyUSBâ??æ?¥å??æ¥ï¼?ä½?æ?¯å?´æ²¡æ??è£?è½½ USB "
-"åº?å??â??visorâ??å??æ ¸æ¨¡å??ã??æ?¨å?¯è?½é??è¦?é??æ?©ä¸?ä¸ªâ??usb:â??è®¾å¤?ã??"
+"ä½¿ç?¨è®¾å¤?â??%sâ??å?¨ç«¯å?£â??%sâ??è¿?æ?¥å¤±è´¥ã??è¯·æ£?æ?¥æ?¨ç??é??ç½®ï¼?å? ä¸ºæ?¨è¯·æ±?ä½¿ç?¨äº?æ?§é£?æ ¼ç?? USB "
+"åº?å??â??ttyUSBâ??æ?¥å??æ¥ï¼?ä½?æ?¯å?´æ²¡æ??è£?è½½ USB åº?å??â??visorâ??å??æ ¸æ¨¡å??ã??æ?¨å?¯è?½é??è¦?é??æ?©ä¸?"
+"ä¸ªâ??usb:â??è®¾å¤?ã??"
 
-#: ../gpilotd/gpilotd.c:480
+#: ../gpilotd/gpilotd.c:487
 #, c-format
 msgid "Unknown PDA, no userID/username match %ld"
 msgstr "æ?ªç?¥ PDAï¼?æ²¡æ??ç?¨æ?·ID/ç?¨æ?·å??å?¹é?? %ld"
 
-#: ../gpilotd/gpilotd.c:487
+#: ../gpilotd/gpilotd.c:494
 msgid "Use gnomecc to configure PDA"
 msgstr "ä½¿ç?¨ gnomecc é??ç½® PDA"
 
 #. FIXME: here we should offer to create a profile for the pilot,
 #. bug # 8218
-#: ../gpilotd/gpilotd.c:492
+#: ../gpilotd/gpilotd.c:499
 #, c-format
 msgid ""
 "Unknown PDA - no PDA matches ID %ld\n"
@@ -1261,64 +1278,64 @@ msgstr ""
 "æ?ªç?¥ PDA - æ²¡æ?? PDA å?¹é?? ID %ld\n"
 "è¯·ç?¨ gnomecc æ?¥è®¾ç½® PDA ç?? ID"
 
-#: ../gpilotd/gpilotd.c:516
+#: ../gpilotd/gpilotd.c:523
 #, c-format
 msgid "Device %s has %d events"
 msgstr "è®¾å¤? %s æ?? %d ä¸ªäº?ä»¶"
 
-#: ../gpilotd/gpilotd.c:529
+#: ../gpilotd/gpilotd.c:536
 msgid "Setting userinfo..."
 msgstr "æ£å?¨è®¾ç½®ç?¨æ?·ä¿¡æ?¯..."
 
-#: ../gpilotd/gpilotd.c:534
+#: ../gpilotd/gpilotd.c:541
 msgid "Sync continues"
 msgstr "å??æ¥ç»§ç»"
 
-#: ../gpilotd/gpilotd.c:553
+#: ../gpilotd/gpilotd.c:560
 msgid "Getting userinfo..."
 msgstr "æ£å?¨è?·å??ç?¨æ?·ä¿¡æ?¯..."
 
-#: ../gpilotd/gpilotd.c:615
+#: ../gpilotd/gpilotd.c:622
 msgid "NetSync request detected, synchronizing PDA"
 msgstr "æ£?æµ?å?° NetSync è¯·æ±?ï¼?å??æ¥ PDA"
 
-#: ../gpilotd/gpilotd.c:617
+#: ../gpilotd/gpilotd.c:624
 msgid "Bluetooth request detected, synchronizing PDA"
 msgstr "æ£?æµ?å?°è??ç??è¯·æ±?ï¼?æ£å?¨å??æ¥ PDA"
 
-#: ../gpilotd/gpilotd.c:619
+#: ../gpilotd/gpilotd.c:626
 msgid "HotSync button pressed, synchronizing PDA"
 msgstr "æ??ä¸? HotSync æ??é?®ï¼?å??æ¥ PDA"
 
-#: ../gpilotd/gpilotd.c:621
+#: ../gpilotd/gpilotd.c:628
 #, c-format
 msgid "PDA ID is %ld, name is %s, owner is %s"
 msgstr "PDA ID ä¸º %ldï¼?å??ç§°ä¸º %sï¼?æ??æ??è??ä¸º %s"
 
-#: ../gpilotd/gpilotd.c:631
+#: ../gpilotd/gpilotd.c:638
 #, c-format
 msgid "On host %s\n"
 msgstr "å?¨ä¸»æ?º %s ä¸?\n"
 
-#: ../gpilotd/gpilotd.c:633
+#: ../gpilotd/gpilotd.c:640
 #, c-format
 msgid "On host %d\n"
 msgstr "å?¨ä¸»æ?º %d ä¸?\n"
 
-#: ../gpilotd/gpilotd.c:652
+#: ../gpilotd/gpilotd.c:659
 msgid "Synchronization ended"
 msgstr "å??æ¥ç»?æ??"
 
-#: ../gpilotd/gpilotd.c:655
+#: ../gpilotd/gpilotd.c:662
 msgid "Synchronization ended early"
 msgstr "å??æ¥è¿?æ?©ç»?æ??"
 
-#: ../gpilotd/gpilotd.c:701
+#: ../gpilotd/gpilotd.c:708
 #, c-format
 msgid "`%s' is not a recognised iconv charset, using `%s' instead."
-msgstr ""
+msgstr "%s ä¸?æ?¯å?¯è¯?å?«ç?? iconv å?ç¬¦ï¼?ä½¿ç?¨ %s ä»£æ?¿ã??"
 
-#: ../gpilotd/gpilotd.c:724
+#: ../gpilotd/gpilotd.c:731
 #, c-format
 msgid ""
 "The base directory %s is invalid.\n"
@@ -1327,7 +1344,7 @@ msgstr ""
 "å?ºç?®å½? %s æ? æ??ã??\n"
 "è¯·è¿?è¡?ä¿®æ£ï¼?æ??è??ä½¿ç?¨ gnomecc é??æ?©å?¦ä¸?ç?®å½?ã??"
 
-#: ../gpilotd/gpilotd.c:737
+#: ../gpilotd/gpilotd.c:744
 #, c-format
 msgid ""
 "Unknown PDA - no PDA matches ID %ld\n"
@@ -1337,164 +1354,164 @@ msgstr ""
 "è¯·ç?¨ gnomecc æ?¥è®¾ç½® PDA ç?? ID"
 
 #. no ? drop connection then
-#: ../gpilotd/gpilotd.c:788
+#: ../gpilotd/gpilotd.c:795
 msgid "An error occurred while getting the PDA's system data"
 msgstr "è?·å?? PDA ç??ç³»ç»?æ?°æ?®æ?¶å??ç??é??è¯¯"
 
 #. no ? drop connection then
-#: ../gpilotd/gpilotd.c:797
+#: ../gpilotd/gpilotd.c:804
 msgid "An error occurred while getting the PDA's user data"
 msgstr "è?·å?? PDA ç??ç?¨æ?·æ?°æ?®æ?¶å??ç??é??è¯¯"
 
-#: ../gpilotd/gpilotd.c:802
+#: ../gpilotd/gpilotd.c:809
 #, c-format
 msgid "Completed events for device %s (%s)"
 msgstr "è®¾å¤? %s (%s) ç??å·²å®?æ??äº?ä»¶"
 
-#: ../gpilotd/gpilotd.c:863
+#: ../gpilotd/gpilotd.c:870
 #, c-format
 msgid "Woke on %s"
 msgstr "å?¨ %s ä¸?å?¤é??"
 
-#: ../gpilotd/gpilotd.c:944
+#: ../gpilotd/gpilotd.c:951
 #, c-format
 msgid "Woke on network: %s"
 msgstr "ç½?ç»?å?¤é??ï¼?%s"
 
-#: ../gpilotd/gpilotd.c:1514
+#: ../gpilotd/gpilotd.c:1521
 #, c-format
 msgid "Watching %s (network)"
-msgstr "æ£?æµ? %s (ç½?ç»?)"
+msgstr "ç??è§? %s (ç½?ç»?)"
 
-#: ../gpilotd/gpilotd.c:1516
+#: ../gpilotd/gpilotd.c:1523
 #, c-format
 msgid "Watching %s (bluetooth)"
-msgstr ""
+msgstr "ç??è§? %s (è??ç??)"
 
-#: ../gpilotd/gpilotd.c:1518
+#: ../gpilotd/gpilotd.c:1525
 #, c-format
 msgid "Watching %s (%s)"
 msgstr "ç??è§? %s (%s)"
 
-#: ../gpilotd/gpilotd.c:1532
+#: ../gpilotd/gpilotd.c:1539
 msgid "Exiting (caught SIGTERM)..."
 msgstr "æ£å?¨é??å?º(æ??è?· SIGTERM)..."
 
-#: ../gpilotd/gpilotd.c:1541
+#: ../gpilotd/gpilotd.c:1548
 msgid "Exiting (caught SIGINT)..."
 msgstr "æ£å?¨é??å?º(æ??è?· SIGINT)..."
 
-#: ../gpilotd/gpilotd.c:1573
+#: ../gpilotd/gpilotd.c:1580
 msgid "Unable to create file installation queue directory"
 msgstr "æ? æ³?å??å»ºæ??ä»¶å®?è£?é??å??ç?®å½?"
 
-#: ../gpilotd/gpilotd.c:1623
+#: ../gpilotd/gpilotd.c:1630
 msgid "Shutting down devices"
 msgstr "å?³é?è®¾å¤?"
 
-#: ../gpilotd/gpilotd.c:1625
+#: ../gpilotd/gpilotd.c:1632
 msgid "Rereading configuration..."
 msgstr "æ£å?¨é??æ?°è¯»å??é??ç½®..."
 
-#: ../gpilotd/manager.c:269
+#: ../gpilotd/manager.c:270
 msgid "non-backup conduit in backup conduit list"
 msgstr "å¤?ä»½ç®¡é??å??è¡¨ä¸ç??é??å¤?ä»½ç®¡é??"
 
-#: ../gpilotd/manager.c:277
+#: ../gpilotd/manager.c:278
 #, c-format
 msgid "%s backed up\n"
 msgstr "%s å·²å¤?ä»½\n"
 
-#: ../gpilotd/manager.c:279
+#: ../gpilotd/manager.c:280
 #, c-format
 msgid "%s backup failed\n"
 msgstr "%s å¤?ä»½å¤±è´¥\n"
 
-#: ../gpilotd/manager.c:305
+#: ../gpilotd/manager.c:306
 msgid "Collecting synchronization info..."
 msgstr "æ£å?¨æ?¶é??å??æ¥ä¿¡æ?¯..."
 
-#: ../gpilotd/manager.c:427
+#: ../gpilotd/manager.c:428
 #, c-format
 msgid "Synchronizing %s\n"
 msgstr "æ£å?¨å??æ¥ %s\n"
 
-#: ../gpilotd/manager.c:446
+#: ../gpilotd/manager.c:447
 #, c-format
 msgid "Copy to PDA %s\n"
 msgstr "å¤?å?¶å?° PDA %s\n"
 
-#: ../gpilotd/manager.c:464
+#: ../gpilotd/manager.c:465
 #, c-format
 msgid "Copy from PDA %s\n"
 msgstr "ä»? PDA %s å¤?å?¶\n"
 
-#: ../gpilotd/manager.c:482
+#: ../gpilotd/manager.c:483
 #, c-format
 msgid "Merge to PDA %s\n"
 msgstr "å??å¹¶å?° PDA %s\n"
 
-#: ../gpilotd/manager.c:500
+#: ../gpilotd/manager.c:501
 #, c-format
 msgid "Merge from PDA %s\n"
 msgstr "ä»? PDA %s å??å¹¶\n"
 
-#: ../gpilotd/manager.c:528
+#: ../gpilotd/manager.c:529
 #, c-format
 msgid "Conduit %s's first synchronization..."
 msgstr "ç®¡é?? %s ç??ç¬¬ä¸?ä¸ªå??æ¥..."
 
-#: ../gpilotd/manager.c:552
+#: ../gpilotd/manager.c:553
 #, c-format
 msgid "unknown syncing action (%d = %s).\n"
 msgstr "æ?ªç?¥å??æ¥æ??ä½? (%d = %s)ã??\n"
 
-#: ../gpilotd/manager.c:678
+#: ../gpilotd/manager.c:679
 #, c-format
 msgid "Instantiating %d conduits..."
 msgstr "æ£å?¨å®?ä¾?å?? %d ä¸ªç®¡é??..."
 
-#: ../gpilotd/manager.c:683 ../gpilotd/manager.c:684
+#: ../gpilotd/manager.c:684 ../gpilotd/manager.c:685
 #, c-format
 msgid "Unknown conduit \"%s\" in configure!"
 msgstr "é??ç½®ä¸ç??æ?ªç?¥ç®¡é??â??%sâ??ï¼?"
 
-#: ../gpilotd/manager.c:693
+#: ../gpilotd/manager.c:694
 #, c-format
 msgid "Loading conduit \"%s\" failed!"
 msgstr "è½½å?¥ç®¡é??â??%sâ??å¤±è´¥ï¼?"
 
-#: ../gpilotd/manager.c:694
+#: ../gpilotd/manager.c:695
 #, c-format
 msgid "Loading conduit \"%s\" failed!\n"
 msgstr "è½½å?¥ç®¡é??â??%sâ??å¤±è´¥ï¼?\n"
 
-#: ../gpilotd/manager.c:783
+#: ../gpilotd/manager.c:785
 #, c-format
 msgid "Setting id/owner to %d/%s..."
 msgstr "æ£å?¨å°?id/æ??æ??è?? è®¾ç½®ä¸º %d/%s..."
 
 #. FIXME: remove the bloody request, or the user will get this
 #. message every time
-#: ../gpilotd/manager.c:815
+#: ../gpilotd/manager.c:817
 #, c-format
 msgid "Conduit %s requested, but not found"
 msgstr "è¯·æ±?ç®¡é?? %sï¼?ä½?æ?ªæ?¾å?°"
 
-#: ../gpilotd/manager.c:825
+#: ../gpilotd/manager.c:827
 #, c-format
 msgid "Conduit %s cannot be requested"
 msgstr "æ? æ³?è¯·æ±?ç®¡é?? %s"
 
-#: ../gpilotd/orbit_daemon_glue.c:1747
+#: ../gpilotd/orbit_daemon_glue.c:1748
 msgid "(unknown DB)"
 msgstr "(æ?ªç?¥æ?°æ?®åº?)"
 
-#: ../gpilotd/queue_io.c:96
+#: ../gpilotd/queue_io.c:104
 msgid "Error in queue, non-existing entry"
 msgstr "é??å??ä¸æ??é??è¯¯ï¼?ä¸?å?å?¨ç??æ?¡ç?®"
 
-#: ../gpilotd/queue_io.c:436
+#: ../gpilotd/queue_io.c:454
 #, c-format
 msgid "fault: no request found for PDA %d, request %d"
 msgstr "é??è¯¯ï¼?æ²¡æ??æ?¾å?° PDA %d ç??è¯·æ±?ï¼?è¯·æ±? %d"
@@ -1543,7 +1560,7 @@ msgstr "ç?®å½?"
 msgid "Run conduit"
 msgstr "è¿?è¡?ç®¡é??"
 
-#: ../utils/gpilotd-client.c:47 ../utils/gpilotdcm-client.c:27
+#: ../utils/gpilotd-client.c:47 ../utils/gpilotdcm-client.c:28
 msgid "CONDUIT"
 msgstr "ç®¡é??"
 
@@ -1589,9 +1606,13 @@ msgstr "åº?åº§å??ç§°"
 
 #: ../utils/gpilotd-client.c:54
 msgid "List the specified PDA's bases"
-msgstr ""
+msgstr "å??å?ºæ??å®?ç?? PDA ç??æ?°æ?®åº?"
 
-#: ../utils/gpilotd-client.c:359 ../utils/gpilotdcm-client.c:106
+#: ../utils/gpilotd-client.c:365
+msgid "Error initializing gpilotd-client"
+msgstr "å??å§?å?? gpilotd-client æ?¶å??ç??é??è¯¯"
+
+#: ../utils/gpilotd-client.c:369 ../utils/gpilotdcm-client.c:118
 #, c-format
 msgid ""
 "\n"
@@ -1604,50 +1625,99 @@ msgstr ""
 "è¿?æ?¯ä¸?ä¸ªç?¨äº? gnome-pilot å??ç??æ??é?¨å??ç??å·¥å?·ã??\n"
 "é?¤é??æ?¨ç¡®å®?äº?è§£æ?¨æ??ä½?ç??æ??ä½?ï¼?å?¦å??ä¸?è¦?ä½¿ç?¨æ¤å·¥å?·ã??"
 
-#: ../utils/gpilotdcm-client.c:26
+#: ../utils/gpilotdcm-client.c:27
 msgid "lists available conduits"
 msgstr "å??å?ºå?¯ç?¨ç??ç®¡é??"
 
-#: ../utils/gpilotdcm-client.c:27
+#: ../utils/gpilotdcm-client.c:28
 msgid "conduit to operate on"
 msgstr "è¦?æ??ä½?ç??ç®¡é??"
 
-#: ../utils/gpilotdcm-client.c:28
+#: ../utils/gpilotdcm-client.c:29
 msgid "list all attributes"
 msgstr "å??å?ºæ??æ??å±?æ?§"
 
-#: ../utils/gpilotdcm-client.c:29
+#: ../utils/gpilotdcm-client.c:30
 msgid "specify PDA to operate on"
 msgstr "æ??å®?è¦?æ??ä½?ç?? PDA"
 
-#: ../utils/gpilotdcm-client.c:29
+#: ../utils/gpilotdcm-client.c:30
 msgid "PDA_ID"
 msgstr "PDA_ID"
 
-#: ../utils/gpilotdcm-client.c:30
+#: ../utils/gpilotdcm-client.c:31
 msgid "list attributes"
 msgstr "å??å?ºå±?æ?§"
 
-#: ../utils/gpilotdcm-client.c:31
+#: ../utils/gpilotdcm-client.c:32
 msgid "list available conduits and their state"
 msgstr "å??å?ºå?¯ç?¨ç??ç®¡é??å??å?¶ç?¶æ??"
 
-#: ../utils/gpilotdcm-client.c:32
+#: ../utils/gpilotdcm-client.c:33
 msgid "enable specified conduit"
 msgstr "å?¯ç?¨æ??å®?ç??ç®¡é??"
 
-#: ../utils/gpilotdcm-client.c:33
+#: ../utils/gpilotdcm-client.c:34
 msgid "disable specified conduit"
 msgstr "ç¦?ç?¨æ??å®?ç??ç®¡é??"
 
-#: ../utils/gpilotdcm-client.c:34
+#: ../utils/gpilotdcm-client.c:35
 msgid "enable, and set firstsync to slow"
 msgstr "å?¯ç?¨ï¼?å¹¶è®¾ç½® firstsync ä»¥å??é??"
 
-#: ../utils/gpilotdcm-client.c:35
+#: ../utils/gpilotdcm-client.c:36
 msgid "instantiate and destroy the conduit"
 msgstr "å®?ä¾?å??å¹¶ç ´å??ç®¡é??"
 
+#: ../utils/gpilotdcm-client.c:114
+msgid "Error initializing gpilotdcm-client"
+msgstr "å??å§?å?? gpilotdcm-client æ?¶å??ç??é??è¯¯"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "Cannot find pilot-applet.glade"
+#~ msgstr "æ? æ³?æ?¾å?° pilot-applet.glade"
+
+#~ msgid "/dev/pilot"
+#~ msgstr "/dev/pilot"
+
+#~ msgid "/dev/ttyS0"
+#~ msgstr "/dev/ttyS0"
+
+#~ msgid "/dev/ttyS1"
+#~ msgstr "/dev/ttyS1"
+
+#~ msgid "/dev/ttyUSB0"
+#~ msgstr "/dev/ttyUSB0"
+
+#~ msgid "/dev/ttyUSB1"
+#~ msgstr "/dev/ttyUSB1"
+
+#~ msgid "BIG5"
+#~ msgstr "BIG5"
+
+#~ msgid "CP1252"
+#~ msgstr "CP1252"
+
+#~ msgid "GB18030"
+#~ msgstr "GB18030"
+
+#~ msgid "GBK"
+#~ msgstr "GBK"
+
+#~ msgid "Port"
+#~ msgstr "ç«¯å?£"
+
+#~ msgid "Set the character set used on your PDA."
+#~ msgstr "è®¾å¤?æ?¨ PDA ä¸?ä½¿ç?¨ç??å?ç¬¦é??ã??"
+
+#~ msgid "Start druid only"
+#~ msgstr "ä»?å?¯å?¨ druid"
+
+#~ msgid "Cannot run druid if PDAs or devices already configured"
+#~ msgstr "å¦?æ??PDA æ??åº?åº§å·²é??ç½®ï¼?å??æ? æ³?è¿?è¡? druid"
+
 #~ msgid "Watching %s (%s, %s)"
 #~ msgstr "ç??è§? %s (%s, %s)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]