[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, 15 Jan 2011 07:52:44 +0000 (UTC)
commit b7f3623d9c9cb06657abd4909f72742d482c2d1d
Author: Yinghua Wang <wantinghard gmail com>
Date:   Sat Jan 15 07:52:32 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po |  538 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 315 insertions(+), 223 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1315730..8a6616c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,9 +11,9 @@ msgstr ""
 "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"
+"POT-Creation-Date: 2011-01-03 15:45+0000\n"
+"PO-Revision-Date: 2011-01-15 15:51+0800\n"
+"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,45 +67,59 @@ msgstr "å??æ¥åº?åº§(_S)"
 msgid "gnome-pilot progress"
 msgstr "gnome-pilot è¿?åº¦"
 
-#: ../applet/pilot.c:185
+#: ../applet/pilot.c:153
+msgid "Synchronizing..."
+msgstr "æ£å?¨å??æ¥..."
+
+#: ../applet/pilot.c:186
 #, c-format
 msgid "%s Synchronizing"
 msgstr "%s æ£å?¨å??æ¥"
 
-#: ../applet/pilot.c:190
-msgid "Database %v of %u"
-msgstr "%u ç??æ?°æ?®åº? %v"
+#: ../applet/pilot.c:191
+msgid "Connecting..."
+msgstr "æ£å?¨è¿?æ?¥..."
+
+#: ../applet/pilot.c:211 ../applet/pilot.c:915 ../applet/pilot.c:1059
+msgid "Ready to synchronize"
+msgstr "å??æ¥å??å¤?å°±ç»ª"
 
-#: ../applet/pilot.c:284
+#: ../applet/pilot.c:292
 #, c-format
 msgid "Request %ld has been completed\n"
 msgstr "è¯·æ±? %ld å·²å®?æ??\n"
 
-#: ../applet/pilot.c:306
+#: ../applet/pilot.c:314
 #, c-format
 msgid "%s Synchronizing : %s"
 msgstr "%s æ£å?¨å??æ¥ï¼?%s"
 
-#: ../applet/pilot.c:311
+#: ../applet/pilot.c:319
 #, c-format
 msgid "%s: Started\n"
 msgstr "%sï¼?å·²å¼?å§?\n"
 
-#: ../applet/pilot.c:326
+#: ../applet/pilot.c:334
 #, c-format
 msgid "%s Finished : %s"
 msgstr "%s å·²å®?æ??ï¼?%s"
 
-#: ../applet/pilot.c:331
+#: ../applet/pilot.c:339
 #, c-format
 msgid "%s: Ended\n"
 msgstr "%sï¼?å·²ç»?æ??\n"
 
-#: ../applet/pilot.c:357
-msgid "%v of %u records"
-msgstr "ç¬¬ %u æ?¡è®°å½?ï¼?å?± %v æ?¡"
+#: ../applet/pilot.c:364
+#, c-format
+msgid "%d of %d records"
+msgstr "ç¬¬ %d æ?¡è®°å½?ï¼?å?± %d æ?¡"
+
+#: ../applet/pilot.c:384
+#, c-format
+msgid "Database %d of %d"
+msgstr "ç¬¬ %d ä¸ªæ?°æ?®åº?ï¼?å?± %d ä¸ª"
 
-#: ../applet/pilot.c:437
+#: ../applet/pilot.c:445
 msgid ""
 "PDA is currently synchronizing.\n"
 "Please wait for it to finish."
@@ -113,11 +127,11 @@ msgstr ""
 "PDA å½?å??æ£å?¨è¿?è¡?å??æ¥ã??\n"
 "è¯·ç?å¾?å??æ¥å®?æ??ã??"
 
-#: ../applet/pilot.c:440
+#: ../applet/pilot.c:450
 msgid "Not connected. Please restart daemon."
 msgstr "æ²¡æ??è¿?æ?¥ã??è¯·é??æ?°å?¯å?¨å®?æ?¤è¿?ç¨?ã??"
 
-#: ../applet/pilot.c:443
+#: ../applet/pilot.c:454
 msgid ""
 "Not connected to gpilotd.\n"
 "Please restart daemon."
@@ -125,33 +139,33 @@ msgstr ""
 "æ²¡æ??è¿?æ?¥å?° gpilotdã??\n"
 "è¯·é??æ?°å?¯å?¨å®?æ?¤è¿?ç¨?ã??"
 
-#: ../applet/pilot.c:472
+#: ../applet/pilot.c:484
 msgid "gnome-pilot applet"
 msgstr "gnome-pilot å°?ç¨?åº?"
 
-#: ../applet/pilot.c:474
+#: ../applet/pilot.c:486
 msgid "Copyright 2000-2006 Free Software Foundation, Inc."
 msgstr "Copyright 2000-2006 è?ªç?±è½¯ä»¶å?ºé??ä¼?ã??"
 
-#: ../applet/pilot.c:475
+#: ../applet/pilot.c:487
 msgid "A PalmOS PDA monitor.\n"
 msgstr "PalmOS PDA ç??è§?å?¨.\n"
 
-#: ../applet/pilot.c:573 ../applet/pilot.c:600
+#: ../applet/pilot.c:585 ../applet/pilot.c:612
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "æ?¾ç¤ºå¸®å?©ï¼?%sæ?¶å?ºé??"
 
-#: ../applet/pilot.c:686
+#: ../applet/pilot.c:698
 #, c-format
 msgid "Restoring %s"
 msgstr "æ£å?¨æ?¢å¤? %s"
 
-#: ../applet/pilot.c:729
+#: ../applet/pilot.c:741
 msgid "No directory to restore from."
 msgstr "æ²¡æ??å?¯ä»¥ä»?å?¶æ?¢å¤?ç??ç?®å½?ã??"
 
-#: ../applet/pilot.c:741
+#: ../applet/pilot.c:753
 msgid ""
 "Press synchronize on the cradle to restore\n"
 " or cancel the operation."
@@ -159,16 +173,16 @@ msgstr ""
 "è¯·æ??åº?åº§ä¸?ç??å??æ¥æ??é?®è¿?è¡?æ?¢å¤?\n"
 "æ??è??å??æ¶?è¯¥æ??ä½?ã??"
 
-#: ../applet/pilot.c:747
+#: ../applet/pilot.c:759
 #, c-format
 msgid "cancelling %d"
 msgstr "æ£å?¨å??æ¶? %d"
 
-#: ../applet/pilot.c:752
+#: ../applet/pilot.c:764
 msgid "Restore request failed"
 msgstr "æ?¢å¤?è¯·æ±?å¤±è´¥"
 
-#: ../applet/pilot.c:793
+#: ../applet/pilot.c:805
 msgid ""
 "PDA sync is currently in progress.\n"
 "Are you sure you want to restart daemon?"
@@ -176,62 +190,58 @@ msgstr ""
 "PDA å??æ¥æ£å?¨è¿?è¡?ã??\n"
 "æ?¨ç¡®ä¿¡æ?¨å¸?æ??é??æ?°å?¯å?¨å®?æ?¤è¿?ç¨?ï¼?"
 
-#: ../applet/pilot.c:806 ../applet/pilot.c:1377
+#: ../applet/pilot.c:820 ../applet/pilot.c:1379
 msgid "Trying to connect to the GnomePilot Daemon"
 msgstr "å°?è¯?è¿?æ?¥å?° GnomePilot å®?æ?¤è¿?ç¨?"
 
-#: ../applet/pilot.c:823
+#: ../applet/pilot.c:837
 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:846
+#: ../applet/pilot.c:860
 msgid "Restore..."
 msgstr "æ?¢å¤?..."
 
-#: ../applet/pilot.c:846
+#: ../applet/pilot.c:860
 msgid "Restart"
 msgstr "é??æ?°å?¯å?¨"
 
-#: ../applet/pilot.c:846
+#: ../applet/pilot.c:860
 msgid "Last log..."
 msgstr "æ??å??ç??æ?¥å¿?..."
 
-#: ../applet/pilot.c:847
+#: ../applet/pilot.c:861
 msgid "Preferences..."
 msgstr "é¦?é??é¡¹..."
 
-#: ../applet/pilot.c:847
+#: ../applet/pilot.c:861
 msgid "Help"
 msgstr "å¸®å?©"
 
-#: ../applet/pilot.c:847
+#: ../applet/pilot.c:861
 msgid "About"
 msgstr "å?³äº?"
 
-#: ../applet/pilot.c:869
+#: ../applet/pilot.c:883
 msgid "Continue"
 msgstr "ç»§ç»"
 
-#: ../applet/pilot.c:871
+#: ../applet/pilot.c:885
 msgid "Pause Daemon"
 msgstr "æ??å??å®?æ?¤è¿?ç¨?"
 
-#: ../applet/pilot.c:891
+#: ../applet/pilot.c:906
 msgid "Daemon paused..."
 msgstr "å®?æ?¤ç¨?åº?å·²æ??å??..."
 
-#: ../applet/pilot.c:898 ../applet/pilot.c:1052
-msgid "Ready to synchronize"
-msgstr "å??æ¥å??å¤?å°±ç»ª"
-
-#: ../applet/pilot.c:1033
+#: ../applet/pilot.c:1047
 msgid "Not connected. Restart daemon to reconnect"
 msgstr "æ²¡æ??è¿?æ?¥ã??è¯·é??æ?°å?¯å?¨å®?æ?¤è¿?ç¨?ä»¥é??æ?°è¿?æ?¥"
 
-#: ../applet/pilot.c:1210
+#: ../applet/pilot.c:1218
 #, c-format
 msgid "Execution of %s failed"
 msgstr "æ?§è¡? %s å¤±è´¥"
@@ -244,16 +254,16 @@ msgstr "æ?§è¡? %s å¤±è´¥"
 #. g_message ("installing textfile as Memo (not implemented)");
 #. }
 #.
-#: ../applet/pilot.c:1336
+#: ../applet/pilot.c:1344
 #, c-format
 msgid "installing \"%s\" to \"%s\""
 msgstr "æ£å?¨å°?â??%sâ??å®?è£?å?°â??%sâ??"
 
-#: ../applet/pilot.c:1346
+#: ../applet/pilot.c:1354
 msgid "unknown dnd type"
 msgstr "æ?ªç?¥ dnd ç±»å??"
 
-#: ../applet/pilot.c:1354
+#: ../applet/pilot.c:1362
 msgid "destroy gpilot-applet"
 msgstr "å??æ¢ gpilot-applet"
 
@@ -273,7 +283,7 @@ msgstr "gnome-pilot è®¾ç½®"
 msgid "Name"
 msgstr "å§?å??"
 
-#: ../capplet/gnome-pilot-capplet.c:396 ../utils/gpilotd-client.c:44
+#: ../capplet/gnome-pilot-capplet.c:396 ../utils/gpilotd-client.c:43
 msgid "ID"
 msgstr "ID"
 
@@ -365,11 +375,11 @@ msgid "Modify the currently selected conduit's settings"
 msgstr "ä¿®æ?¹å½?å??é??æ?©ç??å¯¼ç®¡ç??è®¾ç½®"
 
 #. < 0) {
-#: ../capplet/gnome-pilot-cdialog.c:205
+#: ../capplet/gnome-pilot-cdialog.c:204
 msgid "Unable to create PDA settings window. Incorrect conduit configuration."
 msgstr "æ? æ³?å??å»º PDA è®¾ç½®çª?å?£ã??ç®¡é??é??ç½®ä¸?æ£ç¡®ã??"
 
-#: ../capplet/gnome-pilot-assistant.c:518
+#: ../capplet/gnome-pilot-assistant.c:519
 msgid ""
 "Setup did not complete and settings will not\n"
 "be saved. Are you sure you want to quit?"
@@ -377,7 +387,7 @@ msgstr ""
 "è®¾ç½®æ?ªå®?æ??ä¸?ä¸?ä¼?ä¿?å?è®¾ç½®ã??\n"
 "æ?¨ç¡®ä¿¡è¦?é??å?ºï¼?"
 
-#: ../capplet/gnome-pilot-assistant.c:737
+#: ../capplet/gnome-pilot-assistant.c:738
 #, c-format
 msgid ""
 "About to send the following data to the PDA.\n"
@@ -390,7 +400,12 @@ msgstr ""
 "IDï¼?%d\n"
 "è¯·å°? PDA æ?¾ç½®äº? %s (%s) ä¸ï¼?ç?¶å??æ?? HotSync æ??é?®ã??"
 
-#: ../capplet/gnome-pilot-assistant.c:762
+#: ../capplet/gnome-pilot-assistant.c:759
+#: ../capplet/gnome-pilot-assistant.c:780
+msgid "Failed sending request to gpilotd"
+msgstr "å°?è¯·æ±?å??é??å?° gpilotd å¤±è´¥"
+
+#: ../capplet/gnome-pilot-assistant.c:767
 #, c-format
 msgid ""
 "About to retrieve Owner Name and ID from the PDA.\n"
@@ -399,11 +414,7 @@ msgstr ""
 "å?³å°?ä»? PDA æ£?ç´¢ç?¨æ?·å??å?? IDã??\n"
 "è¯·å°? PDA æ?¾ç½®äº? %s (%s) ä¸ï¼?ç?¶å??æ?? HotSync æ??é?®ã??"
 
-#: ../capplet/gnome-pilot-assistant.c:778
-msgid "Failed sending request to gpilotd"
-msgstr "å°?è¯·æ±?å??é??å?° gpilotd å¤±è´¥"
-
-#: ../capplet/gnome-pilot-assistant.c:948
+#: ../capplet/gnome-pilot-assistant.c:953
 #, c-format
 msgid ""
 "Successfully retrieved Owner Name and ID from PDA.\n"
@@ -710,23 +721,23 @@ msgstr "_USB"
 msgid "_Yes, I've used sync software with this PDA before."
 msgstr "æ?¯ç??ï¼?æ??ä»¥å??å¯¹æ¤PDA ä½¿ç?¨è¿?å??æ¥è½¯ä»¶ã??"
 
-#: ../capplet/gpilotd-control-applet.c:89
+#: ../capplet/gpilotd-control-applet.c:84
 msgid " - configure gnome-pilot settings"
 msgstr "- gnome-pilot è®¾ç½®"
 
-#: ../capplet/gpilotd-control-applet.c:91
-#: ../capplet/gpilotd-control-applet.c:100
+#: ../capplet/gpilotd-control-applet.c:86
+#: ../capplet/gpilotd-control-applet.c:95
 #, c-format
 msgid "Error initializing gpilotd capplet : %s"
 msgstr "å??å§?å?? gpilotd capplet æ?¶å??ç??é??è¯¯ï¼?%s"
 
-#: ../capplet/gpilotd-control-applet.c:106
-#: ../capplet/gpilotd-control-applet.c:107
+#: ../capplet/gpilotd-control-applet.c:101
+#: ../capplet/gpilotd-control-applet.c:102
 msgid "Error loading PDA state, aborting"
 msgstr "è½½å?¥ PDA ç?¶æ??æ?¶å??ç??é??è¯¯ï¼?æ£å?¨ç»?æ¢"
 
-#: ../capplet/gpilotd-control-applet.c:114
-#: ../capplet/gpilotd-control-applet.c:115
+#: ../capplet/gpilotd-control-applet.c:109
+#: ../capplet/gpilotd-control-applet.c:110
 msgid "Cannot connect to the GnomePilot Daemon"
 msgstr "æ? æ³?è¿?æ?¥å?° GnomePilot å®?æ?¤è¿?ç¨?"
 
@@ -778,11 +789,11 @@ msgstr "æ? æ³?è½½å?¥å?¼ gpilotd/%s/name: %s"
 msgid "Unable load key gpilotd/%s/pilotid: %s"
 msgstr "æ? æ³?è½½å?¥å?¼ gpilotd/%s/pilotid: %s"
 
-#: ../capplet/util.c:123 ../capplet/util.c:512
+#: ../capplet/util.c:123 ../capplet/util.c:517
 msgid "Disabled"
 msgstr "å·²ç¦?ç?¨"
 
-#: ../capplet/util.c:129 ../capplet/util.c:514
+#: ../capplet/util.c:129 ../capplet/util.c:519
 msgid "Enabled"
 msgstr "å·²å?¯ç?¨"
 
@@ -790,55 +801,55 @@ msgstr "å·²å?¯ç?¨"
 msgid "None"
 msgstr "æ? "
 
-#: ../capplet/util.c:310
+#: ../capplet/util.c:315
 msgid "You must have at least one device setup"
 msgstr "æ?¨å¿?é¡»è?³å°?è®¾ç½®ä¸?ä¸ªè®¾å¤?"
 
-#: ../capplet/util.c:485
+#: ../capplet/util.c:490
 msgid "Synchronize"
 msgstr "å??æ¥"
 
-#: ../capplet/util.c:486
+#: ../capplet/util.c:491
 msgid "Copy from PDA"
 msgstr "ä»? PDA å¤?å?¶"
 
-#: ../capplet/util.c:487
+#: ../capplet/util.c:492
 msgid "Copy to PDA"
 msgstr "å¤?å?¶å?° PDA"
 
-#: ../capplet/util.c:488
+#: ../capplet/util.c:493
 msgid "Merge from PDA"
 msgstr "ä»? PDA å??å¹¶"
 
-#: ../capplet/util.c:489
+#: ../capplet/util.c:494
 msgid "Merge to PDA"
 msgstr "å??å¹¶å?° PDA"
 
-#: ../capplet/util.c:492
+#: ../capplet/util.c:497
 msgid "Use conduit settings"
 msgstr "ä½¿ç?¨ç®¡é??è®¾ç½®"
 
-#: ../capplet/util.c:500
+#: ../capplet/util.c:505
 msgid "USB"
 msgstr "USB"
 
-#: ../capplet/util.c:501
+#: ../capplet/util.c:506
 msgid "IrDA"
 msgstr "IrDA"
 
-#: ../capplet/util.c:502
+#: ../capplet/util.c:507
 msgid "Network"
 msgstr "ç½?ç»?"
 
-#: ../capplet/util.c:503
+#: ../capplet/util.c:508
 msgid "Bluetooth"
 msgstr "è??ç??"
 
-#: ../capplet/util.c:504
+#: ../capplet/util.c:509
 msgid "Serial"
 msgstr "åº?å??"
 
-#: ../capplet/util.c:551
+#: ../capplet/util.c:556
 msgid ""
 "The specified base directory exists but has the wrong permissions.\n"
 "Please fix or choose another directory"
@@ -846,7 +857,7 @@ msgstr ""
 "æ??å®?ç??å?ºç?®å½?å?å?¨ï¼?ä½?æ??é??ä¸?æ£ç¡®ã??\n"
 "è¯·ä¿®æ?¹æ??é??æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../capplet/util.c:556
+#: ../capplet/util.c:561
 msgid ""
 "The specified base directory exists but is not a directory.\n"
 "Please make it a directory or choose another directory"
@@ -854,7 +865,7 @@ msgstr ""
 "æ??å®?ç??å?ºç?®å½?å?å?¨ï¼?ä½?å?¶å®?å®?ä¸?æ?¯ç?®å½?ã??\n"
 "è¯·å°?å?¶å??ä¸ºç?®å½?æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../capplet/util.c:563
+#: ../capplet/util.c:568
 msgid ""
 "It wasn't possible to create the specified base directory.\n"
 "Please verify the permitions on the specified path or choose another "
@@ -863,7 +874,7 @@ msgstr ""
 "æ? æ³?å??å»ºæ??å®?ç??å?ºç?®å½?ã??\n"
 "è¯·æ£?æ?¥æ??å®?è·¯å¾?ä¸?ç??æ??é??ï¼?æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../capplet/util.c:568
+#: ../capplet/util.c:573
 msgid ""
 "The path specified for the base directory is invalid.\n"
 "Please choose another directory"
@@ -871,7 +882,7 @@ msgstr ""
 "ä¸ºå?ºç?®å½?æ??å®?ç??è·¯å¾?æ? æ??ã??\n"
 "è¯·é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../capplet/util.c:595
+#: ../capplet/util.c:600
 #, c-format
 msgid ""
 "`%s' is not a valid character set identifier.\n"
@@ -880,19 +891,19 @@ msgstr ""
 "`%s' ä¸?æ?¯æ??æ??ç??å?ç¬¦é??æ ?è¯?ã??\n"
 "è¯·è¾?å?¥ä¸?ä¸ªæ??æ??ç??æ ?è¯?æ??ä»?å?¯ç?¨é??é¡¹ä¸é??æ?©ã??"
 
-#: ../capplet/util.c:718
+#: ../capplet/util.c:723
 msgid "Device 'usb:' is only valid for devices of type USB"
 msgstr "è®¾å¤? 'usb:' å?ªå¯¹ USB è®¾å¤?ç±»å??æ??æ??"
 
-#: ../capplet/util.c:727
+#: ../capplet/util.c:732
 msgid "Read/Write permissions failed on"
 msgstr "è¯»å??/å??å?¥æ??é??å¤±è´¥"
 
-#: ../capplet/util.c:729
+#: ../capplet/util.c:734
 msgid "Check the permissions on the device and retry"
 msgstr "æ£?æ?¥è®¾å¤?ä¸?ç??æ??é??å¹¶é??è¯?"
 
-#: ../capplet/util.c:742 ../gpilotd/gpilotd.c:1349
+#: ../capplet/util.c:747 ../gpilotd/gpilot-daemon.c:1479
 #, c-format
 msgid ""
 "Failed to find directory %s or read file %s.  Check that usbfs or sysfs is "
@@ -952,35 +963,35 @@ msgstr "æ£å?¨æ?¶é??æ?¢å¤?ä¿¡æ?¯..."
 msgid "_Backup directory:"
 msgstr "å¤?ä»½æ??ä»¶å¤¹(_B)ï¼?"
 
-#: ../conduits/backup/backup_conduit.c:904
+#: ../conduits/backup/backup_conduit.c:905
 msgid "Backup directory"
 msgstr "å¤?ä»½ç?®å½?"
 
-#: ../conduits/backup/backup_conduit.c:906
+#: ../conduits/backup/backup_conduit.c:907
 msgid "O_nly backup changed bases"
 msgstr "ä»?å¤?ä»½æ?´æ?¹ç??æ?°æ?®åº?(_N)"
 
-#: ../conduits/backup/backup_conduit.c:916
+#: ../conduits/backup/backup_conduit.c:917
 msgid "Only backup changed bases"
 msgstr "ä»?å¤?ä»½æ?´æ?¹ç??æ?°æ?®åº?"
 
-#: ../conduits/backup/backup_conduit.c:918
+#: ../conduits/backup/backup_conduit.c:919
 msgid "_Remove local base if deleted on pilot"
 msgstr "å¦?æ??å?¨ pilot ä¸?å? é?¤ï¼?å??å? é?¤æ?¬å?°æ?°æ?®åº?(_R)"
 
-#: ../conduits/backup/backup_conduit.c:928
+#: ../conduits/backup/backup_conduit.c:929
 msgid "Remove local base if deleted on pilot"
 msgstr "å¦?æ??å?¨ pilot ä¸?å? é?¤ï¼?è¯·å? é?¤æ?¬å?°æ?°æ?®åº?"
 
-#: ../conduits/backup/backup_conduit.c:930
+#: ../conduits/backup/backup_conduit.c:931
 msgid "# of old backups to _keep"
 msgstr "# é??è¦?ä¿?å?ç??æ?§å¤?ä»½"
 
-#: ../conduits/backup/backup_conduit.c:941
+#: ../conduits/backup/backup_conduit.c:942
 msgid "# of old backups to keep"
 msgstr "è¦?ä¿?ç??ç??æ?§ç??å¤?ä»½ç??æ?°é??"
 
-#: ../conduits/backup/backup_conduit.c:979
+#: ../conduits/backup/backup_conduit.c:980
 msgid ""
 "The specified backup directory exists but has the wrong permissions.\n"
 "Please fix or choose another directory"
@@ -988,7 +999,7 @@ msgstr ""
 "æ??å®?ç??å¤?ä»½ç?®å½?å?å?¨ï¼?ä½?æ??é??ä¸?æ£ç¡®ã??\n"
 "è¯·ä¿®æ?¹æ??é??æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../conduits/backup/backup_conduit.c:984
+#: ../conduits/backup/backup_conduit.c:985
 msgid ""
 "The specified backup directory exists but is not a directory.\n"
 "Please make it a directory or choose another directory"
@@ -996,7 +1007,7 @@ msgstr ""
 "æ??å®?ç??å¤?ä»½ç?®å½?å?å?¨ï¼?ä½?å?¶å®?å®?ä¸?æ?¯ç?®å½?ã??\n"
 "è¯·å°?å?¶å??ä¸ºç?®å½?æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../conduits/backup/backup_conduit.c:991
+#: ../conduits/backup/backup_conduit.c:992
 msgid ""
 "It wasn't possible to create the specified backup directory.\n"
 "Please verify the permissions on the specified path or choose another "
@@ -1005,7 +1016,7 @@ msgstr ""
 "æ? æ³?å??å»ºæ??å®?ç??å¤?ä»½ç?®å½?ã??\n"
 "è¯·æ£?æ?¥æ??å®?è·¯å¾?ä¸?ç??æ??é??ï¼?æ??é??æ?©å?¦ä¸?ç?®å½?"
 
-#: ../conduits/backup/backup_conduit.c:996
+#: ../conduits/backup/backup_conduit.c:997
 msgid ""
 "The path specified for the backup directory is invalid.\n"
 "Please choose another directory"
@@ -1013,6 +1024,74 @@ msgstr ""
 "ä¸ºå¤?ä»½ç?®å½?æ??å®?ç??è·¯å¾?æ? æ??ã??\n"
 "è¯·é??æ?©å?¦ä¸?ç?®å½?"
 
+#: ../conduits/evolution-data-server/address-conduit.c:593
+msgid "Default Sync Address:"
+msgstr "é»?è®¤å??æ¥å?°å??ï¼?"
+
+#: ../conduits/evolution-data-server/address-conduit.c:1636
+#: ../conduits/evolution-data-server/address-conduit.c:1637
+msgid "Could not load address book"
+msgstr "æ? æ³?è½½å?¥å?°å??è??"
+
+#: ../conduits/evolution-data-server/address-conduit.c:1714
+#: ../conduits/evolution-data-server/address-conduit.c:1717
+msgid "Could not read pilot's Address application block"
+msgstr "æ? æ³?è¯»å?? pilot ç??å?°å??åº?ç?¨ç¨?åº?å??"
+
+#: ../conduits/evolution-data-server/calendar-conduit.c:250
+msgid "Split Multi-Day Events:"
+msgstr "å??å?²å¤?å¤©äº?ä»¶ï¼?"
+
+#: ../conduits/evolution-data-server/calendar-conduit.c:1538
+#: ../conduits/evolution-data-server/calendar-conduit.c:1539
+#: ../conduits/evolution-data-server/memo-conduit.c:826
+#: ../conduits/evolution-data-server/memo-conduit.c:827
+#: ../conduits/evolution-data-server/todo-conduit.c:1027
+#: ../conduits/evolution-data-server/todo-conduit.c:1028
+msgid "Could not start evolution-data-server"
+msgstr "æ? æ³?å?¯å?¨ evolution-data-server"
+
+#: ../conduits/evolution-data-server/calendar-conduit.c:1646
+#: ../conduits/evolution-data-server/calendar-conduit.c:1649
+msgid "Could not read pilot's Calendar application block"
+msgstr "æ? æ³?è¯»å?? pilot ç??æ?¥å??åº?ç?¨ç¨?åº?å??"
+
+#: ../conduits/evolution-data-server/e-pilot-settings.c:95
+msgid "Sync with:"
+msgstr "å??æ¥ç?®æ ?ï¼?"
+
+#: ../conduits/evolution-data-server/e-pilot-settings.c:103
+msgid "Sync Private Records:"
+msgstr "å??æ¥é??ç§?è®°å½?ï¼?"
+
+#: ../conduits/evolution-data-server/e-pilot-settings.c:112
+msgid "Sync Categories:"
+msgstr "å??æ¥å??ç±»ï¼?"
+
+#: ../conduits/evolution-data-server/memo-conduit.c:920
+#: ../conduits/evolution-data-server/memo-conduit.c:923
+msgid "Could not read pilot's Memo application block"
+msgstr "æ? æ³?è¯»å?? pilot ç??å¤?å¿?åº?ç?¨ç¨?åº?å??"
+
+#: ../conduits/evolution-data-server/memo-conduit.c:967
+#: ../conduits/evolution-data-server/memo-conduit.c:970
+msgid "Could not write pilot's Memo application block"
+msgstr "æ? æ³?å??å?¥ pilot ç??å¤?å¿?åº?ç?¨ç¨?åº?å??"
+
+#: ../conduits/evolution-data-server/todo-conduit.c:227
+msgid "Default Priority:"
+msgstr "é»?è®¤ä¼?å??çº§ï¼?"
+
+#: ../conduits/evolution-data-server/todo-conduit.c:1111
+#: ../conduits/evolution-data-server/todo-conduit.c:1114
+msgid "Could not read pilot's ToDo application block"
+msgstr "æ? æ³?è¯»å?? pilot ç??å¾?å??åº?ç?¨ç¨?åº?å??"
+
+#: ../conduits/evolution-data-server/todo-conduit.c:1156
+#: ../conduits/evolution-data-server/todo-conduit.c:1159
+msgid "Could not write pilot's ToDo application block"
+msgstr "æ? æ³?å??å?¥ pilot ç??å¾?å??åº?ç?¨ç¨?åº?å??"
+
 #: ../conduits/file/file_conduit.c:243 ../conduits/file/file_conduit.c:253
 #, c-format
 msgid "Install of %s failed"
@@ -1028,53 +1107,55 @@ msgstr "æ£å?¨ä»? %2$s å®?è£? %1$s..."
 msgid "Installing %s..."
 msgstr "æ£å?¨å®?è£? %s..."
 
-#: ../conduits/file/gpilot_install_file.c:46
+#: ../conduits/file/gpilot_install_file.c:41
 msgid "Install immediately"
 msgstr "ç«?å?³å®?è£?"
 
-#: ../conduits/file/gpilot_install_file.c:47
+#: ../conduits/file/gpilot_install_file.c:42
 msgid "Install delayed"
 msgstr "å®?è£?å»¶è¿?"
 
-#: ../conduits/file/gpilot_install_file.c:48
+#: ../conduits/file/gpilot_install_file.c:43
 msgid "PDA to install to"
 msgstr "è¦?å®?è£?ç?? PDA"
 
-#: ../conduits/file/gpilot_install_file.c:48
+#: ../conduits/file/gpilot_install_file.c:43
 msgid "PDA"
 msgstr "PDA"
 
-#: ../conduits/file/gpilot_install_file.c:49
+#: ../conduits/file/gpilot_install_file.c:44
 msgid "[FILE...]"
 msgstr "[æ??ä»¶...]"
 
-#: ../conduits/file/gpilot_install_file.c:49
+#: ../conduits/file/gpilot_install_file.c:44
 msgid "list of files"
 msgstr "æ??ä»¶å??è¡¨"
 
-#: ../conduits/file/gpilot_install_file.c:107
-msgid "Error initializing gpilotd"
-msgstr "å??å§?å?? gpilotd æ?¶å??ç??é??è¯¯"
+#: ../conduits/file/gpilot_install_file.c:97 ../utils/gpilotd-client.c:466
+#: ../utils/gpilotdcm-client.c:107
+#, c-format
+msgid "Error parsing commandline arguments: %s"
+msgstr "è§£æ??å?½ä»¤è¡?é??é¡¹å?ºé??ï¼?%s"
 
-#: ../conduits/file/gpilot_install_file.c:122
-#: ../conduits/file/gpilot_install_file.c:123
+#: ../conduits/file/gpilot_install_file.c:113
+#: ../conduits/file/gpilot_install_file.c:114
 msgid "Unable to get PDA names"
 msgstr "æ? æ³?è?·å?? PDA å??ç§°"
 
-#: ../conduits/file/gpilot_install_file.c:158
+#: ../conduits/file/gpilot_install_file.c:149
 msgid "Following files failed :\n"
 msgstr "ä»¥ä¸?æ??ä»¶å¤±è´¥ï¼?\n"
 
-#: ../conduits/file/gpilot_install_file.c:170
+#: ../conduits/file/gpilot_install_file.c:161
 #, c-format
 msgid "Installing to %s:\n"
 msgstr "æ£å?¨å®?è£?å?° %sï¼?\n"
 
-#: ../conduits/file/gpilot_install_file.c:191
+#: ../conduits/file/gpilot_install_file.c:182
 msgid "No files to install"
 msgstr "æ²¡æ??è¦?å®?è£?ç??æ??ä»¶"
 
-#: ../conduits/file/gpilot_install_file.c:194
+#: ../conduits/file/gpilot_install_file.c:185
 msgid ""
 "Press synchronize on the cradle to install\n"
 " or cancel the operation."
@@ -1082,10 +1163,6 @@ msgstr ""
 "æ??åº?åº§ä¸?ç??å??æ¥è¿?è¡?å®?è£?\n"
 "æ??è??å??æ¶?è¯¥æ??ä½?ã??"
 
-#: ../gpilotd/GNOME_Pilot_Daemon.server.in.in.h:1
-msgid "Gnome-Pilot daemon"
-msgstr "Gnome-Pilot å®?æ?¤è¿?ç¨?"
-
 #: ../gpilotd/gnome-pilot-conduit-management.gob:684
 msgid "module loading not supported, fatal!"
 msgstr "ä¸?æ?¯æ??æ¨¡å??è½½å?¥ï¼?è?´å?½é??è¯¯ï¼?"
@@ -1115,48 +1192,48 @@ msgstr "å?æ¡£å??æ?´æ?¹å?²çª?ï¼?æ?¬å?°è®°å½?å??é??å?° PDA\n"
 msgid "archive and change conflict, PDA record saved locally\n"
 msgstr "å?æ¡£å??æ?´æ?¹å?²çª?ï¼?å?¨æ?¬å?°ä¿?å? PDA è®°å½?\n"
 
-#: ../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
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:459
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:534
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:599
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:628
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:657
 msgid "Conduits initialization failed, aborting operation"
 msgstr "ç®¡é??å??å§?å??å¤±è´¥ï¼?æ£å?¨ç»?æ¢æ??ä½?"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:437
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:472
 msgid "Unable to delete all records in PDA database, aborting operation."
 msgstr "æ? æ³?å?¨ PDA æ?°æ?®åº?ä¸å? é?¤æ??æ??è®°å½?ï¼?æ£å?¨ç»?æ¢æ??ä½?ã??"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:448
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1026
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:483
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1077
 msgid "Conduit did not return a record"
 msgstr "ç®¡é??æ²¡æ??è¿?å??è®°å½?"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:505
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:540
 msgid "Unable to delete all records in local database, aborting operation."
 msgstr "æ? æ³?å?¨æ?¬å?°æ?°æ?®åº?ä¸å? é?¤æ??æ??è®°å½?ï¼?æ£å?¨ç»?æ¢æ??ä½?ã??"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1431
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1482
 msgid "Error in conduit, newly added record could not be found"
 msgstr "ç®¡é??ä¸æ??é??è¯¯ï¼?æ? æ³?æ?¾å?°æ?°æ·»å? ç??è®°å½?"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:487
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:517
 msgid "Copy to PDA failed!"
 msgstr "å¤?å?¶å?° PDA å¤±è´¥ï¼?"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:511
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:541
 msgid "Copy from PDA failed!"
 msgstr "ä»? PDA å¤?å?¶å¤±è´¥ï¼?"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:535
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:565
 msgid "Merge to PDA failed!"
 msgstr "å??å¹¶å?° PDA å¤±è´¥ï¼?"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:559
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:589
 msgid "Merge from PDA failed!"
 msgstr "ä»?  PDA å??å¹¶å¤±è´¥ï¼?"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:614
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:644
 msgid "Synchronization failed!"
 msgstr "å??æ¥å¤±è´¥ï¼?"
 
@@ -1225,16 +1302,16 @@ msgstr ""
 "è¯·è¿?è¡? gpilotd-control-applet(ä½¿ç?¨ gnomecc)\n"
 "æ?¥é??ç½® gnome-pilotã??"
 
-#: ../gpilotd/gnome-pilot-structures.c:786 ../gpilotd/gpilotd.c:694
+#: ../gpilotd/gnome-pilot-structures.c:786 ../gpilotd/gpilot-daemon.c:1039
 #, c-format
 msgid "No pilot_charset specified.  Using `%s'."
 msgstr "æ²¡æ??æ??å®? pilot_charset ã??ä½¿ç?¨ `%s'ã??"
 
-#: ../gpilotd/gpilotd.c:240
+#: ../gpilotd/gpilot-daemon.c:584
 msgid "Unable to bind to PDA"
 msgstr "æ? æ³?ç»?å®?å?° PDA"
 
-#: ../gpilotd/gpilotd.c:381
+#: ../gpilotd/gpilot-daemon.c:724
 #, c-format
 msgid ""
 "Failed to connect using device `%s', on port `%s'.  Check your "
@@ -1246,7 +1323,7 @@ msgstr ""
 "åº?â??usb:â??æ?¥å??æ¥ï¼?ä½?æ?¯å?´è£?è½½äº?æ?§é£?æ ¼ç??â??visorâ??å??æ ¸æ¨¡å??ã??æ?¨å?¯è?½é??è¦?é??æ?©ä¸?"
 "ä¸ªâ??ttyUSB...â??è®¾å¤?ã??"
 
-#: ../gpilotd/gpilotd.c:396
+#: ../gpilotd/gpilot-daemon.c:739
 #, c-format
 msgid ""
 "Failed to connect using device `%s', on port `%s'.  Check your "
@@ -1258,18 +1335,18 @@ msgstr ""
 "åº?å??â??ttyUSBâ??æ?¥å??æ¥ï¼?ä½?æ?¯å?´æ²¡æ??è£?è½½ USB åº?å??â??visorâ??å??æ ¸æ¨¡å??ã??æ?¨å?¯è?½é??è¦?é??æ?©ä¸?"
 "ä¸ªâ??usb:â??è®¾å¤?ã??"
 
-#: ../gpilotd/gpilotd.c:487
+#: ../gpilotd/gpilot-daemon.c:832
 #, c-format
 msgid "Unknown PDA, no userID/username match %ld"
 msgstr "æ?ªç?¥ PDAï¼?æ²¡æ??ç?¨æ?·ID/ç?¨æ?·å??å?¹é?? %ld"
 
-#: ../gpilotd/gpilotd.c:494
+#: ../gpilotd/gpilot-daemon.c:839
 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:499
+#: ../gpilotd/gpilot-daemon.c:844
 #, c-format
 msgid ""
 "Unknown PDA - no PDA matches ID %ld\n"
@@ -1278,64 +1355,64 @@ msgstr ""
 "æ?ªç?¥ PDA - æ²¡æ?? PDA å?¹é?? ID %ld\n"
 "è¯·ç?¨ gnomecc æ?¥è®¾ç½® PDA ç?? ID"
 
-#: ../gpilotd/gpilotd.c:523
+#: ../gpilotd/gpilot-daemon.c:868
 #, c-format
 msgid "Device %s has %d events"
 msgstr "è®¾å¤? %s æ?? %d ä¸ªäº?ä»¶"
 
-#: ../gpilotd/gpilotd.c:536
+#: ../gpilotd/gpilot-daemon.c:881
 msgid "Setting userinfo..."
 msgstr "æ£å?¨è®¾ç½®ç?¨æ?·ä¿¡æ?¯..."
 
-#: ../gpilotd/gpilotd.c:541
+#: ../gpilotd/gpilot-daemon.c:886
 msgid "Sync continues"
 msgstr "å??æ¥ç»§ç»"
 
-#: ../gpilotd/gpilotd.c:560
+#: ../gpilotd/gpilot-daemon.c:905
 msgid "Getting userinfo..."
 msgstr "æ£å?¨è?·å??ç?¨æ?·ä¿¡æ?¯..."
 
-#: ../gpilotd/gpilotd.c:622
+#: ../gpilotd/gpilot-daemon.c:967
 msgid "NetSync request detected, synchronizing PDA"
 msgstr "æ£?æµ?å?° NetSync è¯·æ±?ï¼?å??æ¥ PDA"
 
-#: ../gpilotd/gpilotd.c:624
+#: ../gpilotd/gpilot-daemon.c:969
 msgid "Bluetooth request detected, synchronizing PDA"
 msgstr "æ£?æµ?å?°è??ç??è¯·æ±?ï¼?æ£å?¨å??æ¥ PDA"
 
-#: ../gpilotd/gpilotd.c:626
+#: ../gpilotd/gpilot-daemon.c:971
 msgid "HotSync button pressed, synchronizing PDA"
 msgstr "æ??ä¸? HotSync æ??é?®ï¼?å??æ¥ PDA"
 
-#: ../gpilotd/gpilotd.c:628
+#: ../gpilotd/gpilot-daemon.c:973
 #, c-format
 msgid "PDA ID is %ld, name is %s, owner is %s"
 msgstr "PDA ID ä¸º %ldï¼?å??ç§°ä¸º %sï¼?æ??æ??è??ä¸º %s"
 
-#: ../gpilotd/gpilotd.c:638
+#: ../gpilotd/gpilot-daemon.c:983
 #, c-format
 msgid "On host %s\n"
 msgstr "å?¨ä¸»æ?º %s ä¸?\n"
 
-#: ../gpilotd/gpilotd.c:640
+#: ../gpilotd/gpilot-daemon.c:985
 #, c-format
 msgid "On host %d\n"
 msgstr "å?¨ä¸»æ?º %d ä¸?\n"
 
-#: ../gpilotd/gpilotd.c:659
+#: ../gpilotd/gpilot-daemon.c:1004
 msgid "Synchronization ended"
 msgstr "å??æ¥ç»?æ??"
 
-#: ../gpilotd/gpilotd.c:662
+#: ../gpilotd/gpilot-daemon.c:1007
 msgid "Synchronization ended early"
 msgstr "å??æ¥è¿?æ?©ç»?æ??"
 
-#: ../gpilotd/gpilotd.c:708
+#: ../gpilotd/gpilot-daemon.c:1053
 #, c-format
 msgid "`%s' is not a recognised iconv charset, using `%s' instead."
 msgstr "%s ä¸?æ?¯å?¯è¯?å?«ç?? iconv å?ç¬¦ï¼?ä½¿ç?¨ %s ä»£æ?¿ã??"
 
-#: ../gpilotd/gpilotd.c:731
+#: ../gpilotd/gpilot-daemon.c:1076
 #, c-format
 msgid ""
 "The base directory %s is invalid.\n"
@@ -1344,7 +1421,7 @@ msgstr ""
 "å?ºç?®å½? %s æ? æ??ã??\n"
 "è¯·è¿?è¡?ä¿®æ£ï¼?æ??è??ä½¿ç?¨ gnomecc é??æ?©å?¦ä¸?ç?®å½?ã??"
 
-#: ../gpilotd/gpilotd.c:744
+#: ../gpilotd/gpilot-daemon.c:1089
 #, c-format
 msgid ""
 "Unknown PDA - no PDA matches ID %ld\n"
@@ -1354,64 +1431,72 @@ msgstr ""
 "è¯·ç?¨ gnomecc æ?¥è®¾ç½® PDA ç?? ID"
 
 #. no ? drop connection then
-#: ../gpilotd/gpilotd.c:795
+#: ../gpilotd/gpilot-daemon.c:1221
 msgid "An error occurred while getting the PDA's system data"
 msgstr "è?·å?? PDA ç??ç³»ç»?æ?°æ?®æ?¶å??ç??é??è¯¯"
 
 #. no ? drop connection then
-#: ../gpilotd/gpilotd.c:804
+#: ../gpilotd/gpilot-daemon.c:1228
 msgid "An error occurred while getting the PDA's user data"
 msgstr "è?·å?? PDA ç??ç?¨æ?·æ?°æ?®æ?¶å??ç??é??è¯¯"
 
-#: ../gpilotd/gpilotd.c:809
+#: ../gpilotd/gpilot-daemon.c:1233
 #, c-format
 msgid "Completed events for device %s (%s)"
 msgstr "è®¾å¤? %s (%s) ç??å·²å®?æ??äº?ä»¶"
 
-#: ../gpilotd/gpilotd.c:870
+#: ../gpilotd/gpilot-daemon.c:1298
 #, c-format
 msgid "Woke on %s"
 msgstr "å?¨ %s ä¸?å?¤é??"
 
-#: ../gpilotd/gpilotd.c:951
+#: ../gpilotd/gpilot-daemon.c:1379
 #, c-format
 msgid "Woke on network: %s"
 msgstr "ç½?ç»?å?¤é??ï¼?%s"
 
-#: ../gpilotd/gpilotd.c:1521
+#: ../gpilotd/gpilot-daemon.c:1649
 #, c-format
 msgid "Watching %s (network)"
 msgstr "ç??è§? %s (ç½?ç»?)"
 
-#: ../gpilotd/gpilotd.c:1523
+#: ../gpilotd/gpilot-daemon.c:1651
 #, c-format
 msgid "Watching %s (bluetooth)"
 msgstr "ç??è§? %s (è??ç??)"
 
-#: ../gpilotd/gpilotd.c:1525
+#: ../gpilotd/gpilot-daemon.c:1653
 #, c-format
 msgid "Watching %s (%s)"
 msgstr "ç??è§? %s (%s)"
 
-#: ../gpilotd/gpilotd.c:1539
+#: ../gpilotd/gpilot-daemon.c:1785
+msgid "Shutting down devices"
+msgstr "å?³é?è®¾å¤?"
+
+#: ../gpilotd/gpilot-daemon.c:1787
+msgid "Rereading configuration..."
+msgstr "æ£å?¨é??æ?°è¯»å??é??ç½®..."
+
+#: ../gpilotd/gpilot-daemon.c:2694
+msgid "(unknown DB)"
+msgstr "(æ?ªç?¥æ?°æ?®åº?)"
+
+#: ../gpilotd/gpilotd.c:54
 msgid "Exiting (caught SIGTERM)..."
 msgstr "æ£å?¨é??å?º(æ??è?· SIGTERM)..."
 
-#: ../gpilotd/gpilotd.c:1548
+#: ../gpilotd/gpilotd.c:62
 msgid "Exiting (caught SIGINT)..."
 msgstr "æ£å?¨é??å?º(æ??è?· SIGINT)..."
 
-#: ../gpilotd/gpilotd.c:1580
+#: ../gpilotd/gpilotd.c:93
 msgid "Unable to create file installation queue directory"
 msgstr "æ? æ³?å??å»ºæ??ä»¶å®?è£?é??å??ç?®å½?"
 
-#: ../gpilotd/gpilotd.c:1630
-msgid "Shutting down devices"
-msgstr "å?³é?è®¾å¤?"
-
-#: ../gpilotd/gpilotd.c:1632
-msgid "Rereading configuration..."
-msgstr "æ£å?¨é??æ?°è¯»å??é??ç½®..."
+#: ../gpilotd/gpilotd.c:209
+msgid "gpilotd already running; exiting ...\n"
+msgstr "gpilotd å·²ç»?è¿?è¡?ï¼?æ£å?¨é??å?º...\n"
 
 #: ../gpilotd/manager.c:270
 msgid "non-backup conduit in backup conduit list"
@@ -1495,18 +1580,14 @@ msgstr "æ£å?¨å°?id/æ??æ??è?? è®¾ç½®ä¸º %d/%s..."
 #. message every time
 #: ../gpilotd/manager.c:817
 #, c-format
-msgid "Conduit %s requested, but not found"
-msgstr "è¯·æ±?ç®¡é?? %sï¼?ä½?æ?ªæ?¾å?°"
+msgid "Conduit %s requested, but not found.  Is it enabled?"
+msgstr "è¯·æ±?ç®¡é?? %sï¼?ä½?æ?ªæ?¾å?°ã??æ?¨å?¯ç?¨å®?äº?å??ï¼?"
 
 #: ../gpilotd/manager.c:827
 #, c-format
 msgid "Conduit %s cannot be requested"
 msgstr "æ? æ³?è¯·æ±?ç®¡é?? %s"
 
-#: ../gpilotd/orbit_daemon_glue.c:1748
-msgid "(unknown DB)"
-msgstr "(æ?ªç?¥æ?°æ?®åº?)"
-
 #: ../gpilotd/queue_io.c:104
 msgid "Error in queue, non-existing entry"
 msgstr "é??å??ä¸æ??é??è¯¯ï¼?ä¸?å?å?¨ç??æ?¡ç?®"
@@ -1516,103 +1597,103 @@ msgstr "é??å??ä¸æ??é??è¯¯ï¼?ä¸?å?å?¨ç??æ?¡ç?®"
 msgid "fault: no request found for PDA %d, request %d"
 msgstr "é??è¯¯ï¼?æ²¡æ??æ?¾å?° PDA %d ç??è¯·æ±?ï¼?è¯·æ±? %d"
 
-#: ../utils/gpilotd-client.c:39
+#: ../utils/gpilotd-client.c:38
 msgid "Get System Info"
 msgstr "è?·å??ç³»ç»?ä¿¡æ?¯"
 
-#: ../utils/gpilotd-client.c:40
+#: ../utils/gpilotd-client.c:39
 msgid "Pause daemon"
 msgstr "æ??å??å®?æ?¤è¿?ç¨?"
 
-#: ../utils/gpilotd-client.c:41
+#: ../utils/gpilotd-client.c:40
 msgid "Unpause daemon"
 msgstr "å??æ¶?æ??å??å®?æ?¤è¿?ç¨?"
 
-#: ../utils/gpilotd-client.c:42
+#: ../utils/gpilotd-client.c:41
 msgid "Restart daemon"
 msgstr "é??æ?°å?¯å?¨å®?æ?¤è¿?ç¨?"
 
-#: ../utils/gpilotd-client.c:43
+#: ../utils/gpilotd-client.c:42
 msgid "Set user id and name"
 msgstr "è®¾ç½®ç?¨æ?· id å??å??ç§°"
 
-#: ../utils/gpilotd-client.c:44
+#: ../utils/gpilotd-client.c:43
 msgid "ID for the PDA"
 msgstr "PDA ç?? ID"
 
-#: ../utils/gpilotd-client.c:45
+#: ../utils/gpilotd-client.c:44
 msgid "Install file"
 msgstr "å®?è£?æ??ä»¶"
 
-#: ../utils/gpilotd-client.c:45
+#: ../utils/gpilotd-client.c:44
 msgid "FILE"
 msgstr "æ??ä»¶"
 
-#: ../utils/gpilotd-client.c:46
+#: ../utils/gpilotd-client.c:45
 msgid "Restore directory"
 msgstr "æ?¢å¤?ç?®å½?"
 
-#: ../utils/gpilotd-client.c:46
+#: ../utils/gpilotd-client.c:45
 msgid "DIRECTORY"
 msgstr "ç?®å½?"
 
-#: ../utils/gpilotd-client.c:47
+#: ../utils/gpilotd-client.c:46
 msgid "Run conduit"
 msgstr "è¿?è¡?ç®¡é??"
 
-#: ../utils/gpilotd-client.c:47 ../utils/gpilotdcm-client.c:28
+#: ../utils/gpilotd-client.c:46 ../utils/gpilotdcm-client.c:26
 msgid "CONDUIT"
 msgstr "ç®¡é??"
 
-#: ../utils/gpilotd-client.c:48
+#: ../utils/gpilotd-client.c:47
 msgid "Username to set"
 msgstr "è¦?è®¾ç½®ç??ç?¨æ?·å??"
 
-#: ../utils/gpilotd-client.c:48
+#: ../utils/gpilotd-client.c:47
 msgid "USERNAME"
 msgstr "ç?¨æ?·å??"
 
-#: ../utils/gpilotd-client.c:49
-msgid "Monitor the specified PDA's actions"
-msgstr "ç??è§?æ??å®?ç?? PDA æ??ä½?"
-
-#: ../utils/gpilotd-client.c:50
+#: ../utils/gpilotd-client.c:48
 msgid "Monitor all PDAs"
 msgstr "ç??è§?æ??æ??ç?? PDA"
 
-#: ../utils/gpilotd-client.c:51
+#: ../utils/gpilotd-client.c:49
 msgid "list PDAs by login (all for all pilots)"
 msgstr "æ??ç?»å½?å??å?º PDA (å?¨é?¨)"
 
-#: ../utils/gpilotd-client.c:51
+#: ../utils/gpilotd-client.c:49
 msgid "LOGIN"
 msgstr "ç?»å½?"
 
-#: ../utils/gpilotd-client.c:52
+#: ../utils/gpilotd-client.c:50
 msgid "Specify PDA to operate on (defaults to MyPDA)"
 msgstr "æ??å®?è¦?æ??ä½?ç?? PDA (é»?è®¤ä¸º MyPDA)"
 
-#: ../utils/gpilotd-client.c:52
+#: ../utils/gpilotd-client.c:50
 msgid "PILOTNAME"
 msgstr "PILOT å??ç§°"
 
-#: ../utils/gpilotd-client.c:53
+#: ../utils/gpilotd-client.c:51
 msgid "Specify a cradle to operate on (defaults to Cradle0)"
 msgstr "æ??å®?è¦?æ??ä½?ç??åº?åº§(é»?è®¤ä¸º Cradle0)"
 
-#: ../utils/gpilotd-client.c:53
+#: ../utils/gpilotd-client.c:51
 msgid "CRADLENAME"
 msgstr "åº?åº§å??ç§°"
 
+#: ../utils/gpilotd-client.c:52
+msgid "List users"
+msgstr "å??å?ºç?¨æ?·"
+
+#: ../utils/gpilotd-client.c:53
+msgid "List cradles"
+msgstr "å??å?ºåº?åº§"
+
 #: ../utils/gpilotd-client.c:54
 msgid "List the specified PDA's bases"
 msgstr "å??å?ºæ??å®?ç?? PDA ç??æ?°æ?®åº?"
 
-#: ../utils/gpilotd-client.c:365
-msgid "Error initializing gpilotd-client"
-msgstr "å??å§?å?? gpilotd-client æ?¶å??ç??é??è¯¯"
-
-#: ../utils/gpilotd-client.c:369 ../utils/gpilotdcm-client.c:118
+#: ../utils/gpilotd-client.c:472 ../utils/gpilotdcm-client.c:113
 #, c-format
 msgid ""
 "\n"
@@ -1625,53 +1706,64 @@ msgstr ""
 "è¿?æ?¯ä¸?ä¸ªç?¨äº? gnome-pilot å??ç??æ??é?¨å??ç??å·¥å?·ã??\n"
 "é?¤é??æ?¨ç¡®å®?äº?è§£æ?¨æ??ä½?ç??æ??ä½?ï¼?å?¦å??ä¸?è¦?ä½¿ç?¨æ¤å·¥å?·ã??"
 
-#: ../utils/gpilotdcm-client.c:27
+#: ../utils/gpilotdcm-client.c:25
 msgid "lists available conduits"
 msgstr "å??å?ºå?¯ç?¨ç??ç®¡é??"
 
-#: ../utils/gpilotdcm-client.c:28
+#: ../utils/gpilotdcm-client.c:26
 msgid "conduit to operate on"
 msgstr "è¦?æ??ä½?ç??ç®¡é??"
 
-#: ../utils/gpilotdcm-client.c:29
+#: ../utils/gpilotdcm-client.c:27
 msgid "list all attributes"
 msgstr "å??å?ºæ??æ??å±?æ?§"
 
-#: ../utils/gpilotdcm-client.c:30
+#: ../utils/gpilotdcm-client.c:28
 msgid "specify PDA to operate on"
 msgstr "æ??å®?è¦?æ??ä½?ç?? PDA"
 
-#: ../utils/gpilotdcm-client.c:30
+#: ../utils/gpilotdcm-client.c:28
 msgid "PDA_ID"
 msgstr "PDA_ID"
 
-#: ../utils/gpilotdcm-client.c:31
+#: ../utils/gpilotdcm-client.c:29
 msgid "list attributes"
 msgstr "å??å?ºå±?æ?§"
 
-#: ../utils/gpilotdcm-client.c:32
+#: ../utils/gpilotdcm-client.c:30
 msgid "list available conduits and their state"
 msgstr "å??å?ºå?¯ç?¨ç??ç®¡é??å??å?¶ç?¶æ??"
 
-#: ../utils/gpilotdcm-client.c:33
+#: ../utils/gpilotdcm-client.c:31
 msgid "enable specified conduit"
 msgstr "å?¯ç?¨æ??å®?ç??ç®¡é??"
 
-#: ../utils/gpilotdcm-client.c:34
+#: ../utils/gpilotdcm-client.c:32
 msgid "disable specified conduit"
 msgstr "ç¦?ç?¨æ??å®?ç??ç®¡é??"
 
-#: ../utils/gpilotdcm-client.c:35
+#: ../utils/gpilotdcm-client.c:33
 msgid "enable, and set firstsync to slow"
 msgstr "å?¯ç?¨ï¼?å¹¶è®¾ç½® firstsync ä»¥å??é??"
 
-#: ../utils/gpilotdcm-client.c:36
+#: ../utils/gpilotdcm-client.c:34
 msgid "instantiate and destroy the conduit"
 msgstr "å®?ä¾?å??å¹¶ç ´å??ç®¡é??"
 
-#: ../utils/gpilotdcm-client.c:114
-msgid "Error initializing gpilotdcm-client"
-msgstr "å??å§?å?? gpilotdcm-client æ?¶å??ç??é??è¯¯"
+#~ msgid "Error initializing gpilotd"
+#~ msgstr "å??å§?å?? gpilotd æ?¶å??ç??é??è¯¯"
+
+#~ msgid "Gnome-Pilot daemon"
+#~ msgstr "Gnome-Pilot å®?æ?¤è¿?ç¨?"
+
+#~ msgid "Monitor the specified PDA's actions"
+#~ msgstr "ç??è§?æ??å®?ç?? PDA æ??ä½?"
+
+#~ msgid "Error initializing gpilotd-client"
+#~ msgstr "å??å§?å?? gpilotd-client æ?¶å??ç??é??è¯¯"
+
+#~ msgid "Error initializing gpilotdcm-client"
+#~ msgstr "å??å§?å?? gpilotdcm-client æ?¶å??ç??é??è¯¯"
 
 #~ msgid "*"
 #~ msgstr "*"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]