[gnome-pilot] Updated Japanese translation



commit 426cc50718e55ff81888ec615a6c2ca08892927e
Author: Jiro Matsuzawa <jmatsuzawa src gnome org>
Date:   Wed Jan 11 22:44:59 2012 +0900

    Updated Japanese translation

 po/ja.po | 1283 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 794 insertions(+), 489 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index e6cad5b..ed1a1c4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,110 +6,122 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-pilot HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 00:30+0900\n"
-"PO-Revision-Date: 2005-04-11 23:58+0900\n"
-"Last-Translator:  Takao Fujiwara <Takao Fujiwara Sun COM>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"pilot&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-05 20:46+0000\n"
+"PO-Revision-Date: 2012-01-11 22:44+0900\n"
+"Last-Translator: Jiro Matsuzawa <jmatsuzawa src gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-# SUN REVIEWED
-#: ../applet/GNOME_PilotApplet.server.in.in.h:1
-msgid "Pilot Applet"
-msgstr "Pilot ããããã"
-
-#: ../applet/GNOME_PilotApplet.server.in.in.h:2
+#: ../applet/pilot-applet.ui.h:1
 #, fuzzy
-msgid "Synchronize your data on PalmOS devices"
-msgstr "PalmOS ãããããèåãèããã"
-
-#: ../applet/GNOME_PilotApplet.server.in.in.h:3
-msgid "Utility"
-msgstr "ããããããã"
+msgid "Choose PDA"
+msgstr "ããããããéæ"
 
-#: ../applet/pilot-applet.glade.h:1 ../capplet/gpilotd-capplet.glade.h:1
-msgid "*"
-msgstr "*"
+#: ../applet/pilot-applet.ui.h:2
+msgid "GNOME PilotSync Properties"
+msgstr "GNOME ãããããããããèå"
 
-#: ../applet/pilot-applet.glade.h:2
+#: ../applet/pilot-applet.ui.h:3
 #, fuzzy
-msgid "Choose PDA"
-msgstr "ããããããéæ"
+msgid "Restore PDA"
+msgstr "ããããããååããã"
 
-#: ../applet/pilot-applet.glade.h:3
-msgid "Directory"
-msgstr "ãããã"
+#: ../applet/pilot-applet.ui.h:4
+#, fuzzy
+#| msgid "Directory"
+msgid "_Directory"
+msgstr "ããããã"
 
-#: ../applet/pilot-applet.glade.h:4
-msgid "Display notices"
+#: ../applet/pilot-applet.ui.h:5
+#, fuzzy
+#| msgid "Display notices"
+msgid "_Display notices"
 msgstr "èåãèçãã"
 
-#: ../applet/pilot-applet.glade.h:5
-msgid "Execute when clicked"
+#: ../applet/pilot-applet.ui.h:6
+#, fuzzy
+#| msgid "Execute when clicked"
+msgid "_Execute when clicked"
 msgstr "ããããæãèåãããã"
 
-#: ../applet/pilot-applet.glade.h:6
-msgid "GNOME PilotSync Properties"
-msgstr "GNOME ãããããããããèå"
-
-#: ../applet/pilot-applet.glade.h:7
-msgid "PDA ID"
-msgstr ""
-
-#: ../applet/pilot-applet.glade.h:8
+#
+# COMMUNITY MESSAGE
+# COMMUNITY FUZZY
+# SUN CHANGED MESSAGE
+# SUN LING REVIEWED
+# SUN TECH REVIEWED
+#: ../applet/pilot-applet.ui.h:7
 #, fuzzy
-msgid "Restore PDA"
-msgstr "ããããããååããã"
+msgid "_PDA ID"
+msgstr "ID(_I)"
 
-#: ../applet/pilot-applet.glade.h:9
-msgid "Sync cradle"
+#: ../applet/pilot-applet.ui.h:8
+#, fuzzy
+#| msgid "Sync cradle"
+msgid "_Sync cradle"
 msgstr "åæããããã"
 
-#: ../applet/pilot-applet.glade.h:10
+#: ../applet/pilot-applet.ui.h:9
 msgid "gnome-pilot progress"
 msgstr "GNOME ããããããéèçæ"
 
-#: ../applet/pilot.c:168
+#: ../applet/pilot.c:186
 #, c-format
 msgid "%s Synchronizing"
 msgstr "%s ãåæä"
 
-#: ../applet/pilot.c:173
-msgid "Database %v of %u"
-msgstr "ãããããã %v / %u"
+#: ../applet/pilot.c:191
+#, fuzzy
+#| msgid "Settings..."
+msgid "Connecting..."
+msgstr "èå..."
+
+#: ../applet/pilot.c:209 ../applet/pilot.c:907 ../applet/pilot.c:1051
+msgid "Ready to synchronize"
+msgstr "ããããåæãããã"
 
-#: ../applet/pilot.c:267
+#: ../applet/pilot.c:290
 #, c-format
 msgid "Request %ld has been completed\n"
 msgstr "èæ %ld ãåäãããã\n"
 
-#: ../applet/pilot.c:289
+#: ../applet/pilot.c:312
 #, c-format
 msgid "%s Synchronizing : %s"
 msgstr "%s ãåæä : %s"
 
-#: ../applet/pilot.c:294
+#: ../applet/pilot.c:317
 #, c-format
 msgid "%s: Started\n"
 msgstr "%s: éå\n"
 
-#: ../applet/pilot.c:309
+#: ../applet/pilot.c:332
 #, c-format
 msgid "%s Finished : %s"
 msgstr "%s ãçä : %s"
 
-#: ../applet/pilot.c:314
+#: ../applet/pilot.c:337
 #, c-format
 msgid "%s: Ended\n"
 msgstr "%s: åä\n"
 
-#: ../applet/pilot.c:340
-msgid "%v of %u records"
+#: ../applet/pilot.c:362
+#, fuzzy, c-format
+#| msgid "%v of %u records"
+msgid "%d of %d records"
 msgstr "%v / %u åãããã"
 
-#: ../applet/pilot.c:419
+#: ../applet/pilot.c:382
+#, fuzzy, c-format
+#| msgid "Database %v of %u"
+msgid "Database %d of %d"
+msgstr "ãããããã %v / %u"
+
+#: ../applet/pilot.c:443
 #, fuzzy
 msgid ""
 "PDA is currently synchronizing.\n"
@@ -118,11 +130,11 @@ msgstr ""
 "åæäãããçäãããã\n"
 "ãããããåãäããã"
 
-#: ../applet/pilot.c:422
+#: ../applet/pilot.c:448
 msgid "Not connected. Please restart daemon."
 msgstr "æçãããããããããããããåèåããäããã"
 
-#: ../applet/pilot.c:424
+#: ../applet/pilot.c:452
 msgid ""
 "Not connected to gpilotd.\n"
 "Please restart daemon."
@@ -130,41 +142,36 @@ msgstr ""
 "ãããããæçããããããããã\n"
 "ãããããåèåããäããã"
 
-#: ../applet/pilot.c:442
+#: ../applet/pilot.c:481
 msgid "gnome-pilot applet"
 msgstr "GNOME ããããããããããã"
 
-#: ../applet/pilot.c:444
+#: ../applet/pilot.c:483
 #, fuzzy
 msgid "Copyright 2000-2006 Free Software Foundation, Inc."
 msgstr "Copyright 2000-2005 Free Software Foundation, Inc."
 
 # SUN REVIEWED
-#: ../applet/pilot.c:445
+#: ../applet/pilot.c:484
 #, fuzzy
 msgid "A PalmOS PDA monitor.\n"
 msgstr "PDA ãããã"
 
-#: ../applet/pilot.c:541 ../applet/pilot.c:567
+#: ../applet/pilot.c:582 ../applet/pilot.c:609
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "ããããèçããéãããããççãããã: %s"
 
-#: ../applet/pilot.c:605
-#, c-format
-msgid "cancelling %d"
-msgstr "%d ããããããä"
-
-#: ../applet/pilot.c:657
+#: ../applet/pilot.c:695
 #, c-format
 msgid "Restoring %s"
 msgstr "%s ãååä"
 
-#: ../applet/pilot.c:699
+#: ../applet/pilot.c:738
 msgid "No directory to restore from."
-msgstr "ååããããããããããããã"
+msgstr "ååãããããããããããããã"
 
-#: ../applet/pilot.c:707
+#: ../applet/pilot.c:750
 msgid ""
 "Press synchronize on the cradle to restore\n"
 " or cancel the operation."
@@ -172,11 +179,16 @@ msgstr ""
 "ããããããããããæããåæãéåãããã\n"
 "[ããããã] ãåçãäæããããã"
 
-#: ../applet/pilot.c:716
+#: ../applet/pilot.c:756
+#, c-format
+msgid "cancelling %d"
+msgstr "%d ããããããä"
+
+#: ../applet/pilot.c:761
 msgid "Restore request failed"
 msgstr "ååãåæãããã"
 
-#: ../applet/pilot.c:754
+#: ../applet/pilot.c:802
 #, fuzzy
 msgid ""
 "PDA sync is currently in progress.\n"
@@ -185,71 +197,108 @@ msgstr ""
 "ããããåæäããã\n"
 "æåããããããåèåããããããããããï"
 
-#: ../applet/pilot.c:764 ../applet/pilot.c:1340
+#: ../applet/pilot.c:817 ../applet/pilot.c:1371
 msgid "Trying to connect to the GnomePilot Daemon"
 msgstr "GNOME ãããããããããããæçäãã"
 
-#: ../applet/pilot.c:780
+#: ../applet/pilot.c:834
 msgid "There's no last sync on record."
 msgstr "ããããæåãåæããããããã"
 
 #
 # SUN REVIEWED
+#: ../applet/pilot.c:839
+#, fuzzy
+#| msgid "Restore..."
+msgid "_Restore"
+msgstr "åå..."
+
+#: ../applet/pilot.c:840
+msgid "_Pause/Resume"
+msgstr ""
+
+#
+# SUN REVIEWED
+#: ../applet/pilot.c:841
+#, fuzzy
+#| msgid "Restart"
+msgid "R_estart"
+msgstr "åèå"
+
+#: ../applet/pilot.c:842
+msgid "_Log"
+msgstr ""
+
+#: ../applet/pilot.c:843
+msgid "_Props"
+msgstr ""
+
+# SUN REVIEWED
+#: ../applet/pilot.c:844
+#, fuzzy
+#| msgid "Help"
+msgid "_Help"
+msgstr "ããã"
+
+# SUN REVIEWED
+#: ../applet/pilot.c:845
+#, fuzzy
+msgid "_About"
+msgstr "ãããããæå..."
+
+#
+# SUN REVIEWED
 #. ensure the label strings are extracted by intltool.  This list of
 #. * strings should match the list in the menu_template below
 #.
-#: ../applet/pilot.c:803
+#: ../applet/pilot.c:856
 msgid "Restore..."
 msgstr "åå..."
 
 #
 # SUN REVIEWED
-#: ../applet/pilot.c:803
+#: ../applet/pilot.c:856
 msgid "Restart"
 msgstr "åèå"
 
 # SUN REVIEWED
-#: ../applet/pilot.c:803
+#: ../applet/pilot.c:856
 msgid "Last log..."
 msgstr "ååããã..."
 
 # SUN REVIEWED
-#: ../applet/pilot.c:804
+#: ../applet/pilot.c:857
 msgid "Preferences..."
 msgstr "èå..."
 
 # SUN REVIEWED
-#: ../applet/pilot.c:804
+#: ../applet/pilot.c:857
 msgid "Help"
 msgstr "ããã"
 
 # SUN REVIEWED
-#: ../applet/pilot.c:804
+#: ../applet/pilot.c:857
 #, fuzzy
 msgid "About"
 msgstr "ãããããæå..."
 
-#: ../applet/pilot.c:826
+#: ../applet/pilot.c:870
 msgid "Continue"
 msgstr "çè"
 
-#: ../applet/pilot.c:828
+#: ../applet/pilot.c:872
 msgid "Pause Daemon"
 msgstr "ãããããäæåæ"
 
-#: ../applet/pilot.c:848
+#: ../applet/pilot.c:898
 msgid "Daemon paused..."
 msgstr "ãããããäæåæä..."
 
-#: ../applet/pilot.c:855 ../applet/pilot.c:1009
-msgid "Ready to synchronize"
-msgstr "ããããåæãããã"
-
-#: ../applet/pilot.c:990
+#: ../applet/pilot.c:1039
 msgid "Not connected. Restart daemon to reconnect"
 msgstr "æçããããããããåæçãããããããåèåãããã"
 
-#: ../applet/pilot.c:1174
+#: ../applet/pilot.c:1210
 #, c-format
 msgid "Execution of %s failed"
 msgstr "%s ãåèãåæãããã"
@@ -262,23 +311,19 @@ msgstr "%s ãåèãåæãããã"
 #. g_message ("installing textfile as Memo (not implemented)");
 #. }
 #.
-#: ../applet/pilot.c:1300
+#: ../applet/pilot.c:1336
 #, c-format
 msgid "installing \"%s\" to \"%s\""
 msgstr "\"%s\" -> \"%s\" ãããããããä"
 
-#: ../applet/pilot.c:1310
+#: ../applet/pilot.c:1346
 msgid "unknown dnd type"
 msgstr "äæãããããïãããããããã"
 
-#: ../applet/pilot.c:1318
+#: ../applet/pilot.c:1354
 msgid "destroy gpilot-applet"
 msgstr "gpilot-applet ãååçä"
 
-#: ../applet/pilot.c:1403
-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 "ããããããããããããããåèããããããããã"
@@ -287,118 +332,118 @@ msgstr "ããããããããããããããåèãããããããã
 msgid "Display notices in popup windows"
 msgstr "ãããããããããããããèåãèçãããã"
 
-#: ../capplet/gnome-pilot-capplet.c:212 ../capplet/gpilotd-capplet.glade.h:84
+#: ../capplet/gnome-pilot-capplet.c:228 ../capplet/gpilotd-capplet.ui.h:76
 #, fuzzy
 msgid "gnome-pilot Settings"
 msgstr "GNOME ããããããèå"
 
-#: ../capplet/gnome-pilot-capplet.c:380 ../capplet/gnome-pilot-capplet.c:460
+#: ../capplet/gnome-pilot-capplet.c:395 ../capplet/gnome-pilot-capplet.c:471
 msgid "Name"
 msgstr "åå"
 
-#: ../capplet/gnome-pilot-capplet.c:382 ../utils/gpilotd-client.c:44
+#: ../capplet/gnome-pilot-capplet.c:397 ../utils/gpilotd-client.c:43
 msgid "ID"
 msgstr "ID"
 
-#: ../capplet/gnome-pilot-capplet.c:384
+#: ../capplet/gnome-pilot-capplet.c:399
 msgid "Owner"
 msgstr ""
 
-#: ../capplet/gnome-pilot-capplet.c:462
+#: ../capplet/gnome-pilot-capplet.c:473
 msgid "Type"
 msgstr "æçãçé"
 
-#: ../capplet/gnome-pilot-capplet.c:568
+#: ../capplet/gnome-pilot-capplet.c:575
 msgid "Conduit"
 msgstr "ããããã"
 
-#: ../capplet/gnome-pilot-capplet.c:570
+#: ../capplet/gnome-pilot-capplet.c:577
 msgid "Sync Action"
 msgstr "åæãåä"
 
-#: ../capplet/gnome-pilot-capplet.c:780
+#: ../capplet/gnome-pilot-capplet.c:791
 #, fuzzy, c-format
 msgid "Are you sure you want to delete PDA `%s'?"
 msgstr "æåãããããã %s ãåéããããï"
 
-#: ../capplet/gnome-pilot-capplet.c:804
+#: ../capplet/gnome-pilot-capplet.c:815
 #, fuzzy
 msgid "_Edit this PDA..."
 msgstr "ããããããçé(_E)..."
 
-#: ../capplet/gnome-pilot-capplet.c:805
+#: ../capplet/gnome-pilot-capplet.c:816
 #, fuzzy
 msgid "Edit the currently selected PDA"
 msgstr "æåãããããããããçéããã"
 
-#: ../capplet/gnome-pilot-capplet.c:807
+#: ../capplet/gnome-pilot-capplet.c:817
 #, fuzzy
 msgid "_Delete this PDA"
 msgstr "ããããããåé(_D)"
 
-#: ../capplet/gnome-pilot-capplet.c:808
+#: ../capplet/gnome-pilot-capplet.c:818
 #, fuzzy
 msgid "Delete the currently selected PDA"
 msgstr "æåãããããããããåéããã"
 
-#: ../capplet/gnome-pilot-capplet.c:941
+#: ../capplet/gnome-pilot-capplet.c:970
 #, c-format
 msgid "Are you sure you want to delete %s device?"
 msgstr "æåããããã %s ãåéããããï"
 
-#: ../capplet/gnome-pilot-capplet.c:962
+#: ../capplet/gnome-pilot-capplet.c:991
 msgid "_Edit this device..."
 msgstr "ãããããçé(_E)..."
 
-#: ../capplet/gnome-pilot-capplet.c:963
+#: ../capplet/gnome-pilot-capplet.c:992
 msgid "Edit the currently selected device"
 msgstr "æåããããããããçéããã"
 
-#: ../capplet/gnome-pilot-capplet.c:965
+#: ../capplet/gnome-pilot-capplet.c:993
 msgid "_Delete this device"
 msgstr "ãããããåé(_D)"
 
-#: ../capplet/gnome-pilot-capplet.c:966
+#: ../capplet/gnome-pilot-capplet.c:994
 msgid "Delete the currently selected device"
 msgstr "æåããããããããåéããã"
 
-#: ../capplet/gnome-pilot-capplet.c:1128
+#: ../capplet/gnome-pilot-capplet.c:1178
 #, c-format
 msgid "Unable to instantiate %s conduit."
 msgstr "%s ããããããåäåãããããã"
 
-#: ../capplet/gnome-pilot-capplet.c:1168
+#: ../capplet/gnome-pilot-capplet.c:1218
 msgid "_Enable this conduit"
 msgstr "ããããããæåå(_E)"
 
-#: ../capplet/gnome-pilot-capplet.c:1169
+#: ../capplet/gnome-pilot-capplet.c:1219
 msgid "Disable the currently selected conduit"
 msgstr "æåãããããããããçåãããã"
 
-#: ../capplet/gnome-pilot-capplet.c:1171
+#: ../capplet/gnome-pilot-capplet.c:1220
 msgid "_Disable this conduit"
 msgstr "ããããããçåå(_D)"
 
-#: ../capplet/gnome-pilot-capplet.c:1172
+#: ../capplet/gnome-pilot-capplet.c:1221
 msgid "Enable the currently selected conduit"
 msgstr "æåãããããããããæåãããã"
 
-#: ../capplet/gnome-pilot-capplet.c:1177
+#: ../capplet/gnome-pilot-capplet.c:1222 ../capplet/gpilotd-capplet.ui.h:72
 msgid "_Settings..."
 msgstr "èå(_S)..."
 
-#: ../capplet/gnome-pilot-capplet.c:1178
+#: ../capplet/gnome-pilot-capplet.c:1223
 msgid "Modify the currently selected conduit's settings"
 msgstr "æåãããããããããèåãèããã"
 
 #. < 0) {
-#: ../capplet/gnome-pilot-cdialog.c:207
+#: ../capplet/gnome-pilot-cdialog.c:204
 #, fuzzy
 msgid "Unable to create PDA settings window. Incorrect conduit configuration."
 msgstr ""
 "ãããããèåããããããçæãããããããããããèåãæãããããããã"
 
-#: ../capplet/gnome-pilot-druid.c:448
+#: ../capplet/gnome-pilot-assistant.c:504
 msgid ""
 "Setup did not complete and settings will not\n"
 "be saved. Are you sure you want to quit?"
@@ -406,7 +451,7 @@ msgstr ""
 "èåãåäãããããããããããäåãããããã\n"
 "æåãçäããããããããããï"
 
-#: ../capplet/gnome-pilot-druid.c:566
+#: ../capplet/gnome-pilot-assistant.c:723
 #, fuzzy, c-format
 msgid ""
 "About to send the following data to the PDA.\n"
@@ -415,35 +460,36 @@ msgid ""
 "Please put PDA in %s (%s) and press HotSync button."
 msgstr ""
 "æãããããããããããéäããæåãæããããã\n"
-"ãããå: %s\n"
+"ããããå: %s\n"
 "ID: %d\n"
 "ãããããã %s (%s) ãæçãã HotSync ããããæããäããã"
 
-#: ../capplet/gnome-pilot-druid.c:590
+#: ../capplet/gnome-pilot-assistant.c:744
+#: ../capplet/gnome-pilot-assistant.c:765
+msgid "Failed sending request to gpilotd"
+msgstr "ãããããããããããéäãåæãããã"
+
+#: ../capplet/gnome-pilot-assistant.c:752
 #, fuzzy, c-format
 msgid ""
 "About to retrieve Owner Name and ID from the PDA.\n"
 "Please put PDA in %s (%s) and press HotSync button."
 msgstr ""
-"ãããåã ID ããããããããååããæåãæããããã\n"
+"ããããåã ID ããããããããååããæåãæããããã\n"
 "ãããããã %s (%s) ãæçãã[HotSync] ããããæããäããã"
 
-#: ../capplet/gnome-pilot-druid.c:605
-msgid "Failed sending request to gpilotd"
-msgstr "ãããããããããããéäãåæãããã"
-
-#: ../capplet/gnome-pilot-druid.c:736
+#: ../capplet/gnome-pilot-assistant.c:936
 #, fuzzy, c-format
 msgid ""
 "Successfully retrieved Owner Name and ID from PDA.\n"
 "Owner Name: %s\n"
 "PDA ID: %d"
 msgstr ""
-"ããããããããããåã ID ãååãåäããããã\n"
-"ãããå: %s\n"
+"ãããããããããããåã ID ãååãåäããããã\n"
+"ããããå: %s\n"
 "ID: %d"
 
-#: ../capplet/gnome-pilot-pdialog.c:395
+#: ../capplet/gnome-pilot-pdialog.c:438
 #, fuzzy, c-format
 msgid ""
 "Please put PDA in %s (%s) and press HotSync button or cancel the operation."
@@ -451,59 +497,37 @@ msgstr ""
 "ãããããã %s (%s) ãçãã HotSync ããããããåãæãããããæããäã"
 "ãã"
 
-#: ../capplet/gnome-pilot-pdialog.c:430
+#: ../capplet/gnome-pilot-pdialog.c:473
 #, fuzzy
 msgid "The request to get PDA ID failed"
 msgstr "ãããããID ãååãåæãããã"
 
-#: ../capplet/gnome-pilot-pdialog.c:470
+#: ../capplet/gnome-pilot-pdialog.c:512
 #, fuzzy
 msgid "The request to set PDA ID failed"
 msgstr "ããããã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
-#, fuzzy
-msgid "/dev/ttyUSB0"
-msgstr "/dev/ttyS0"
-
-#: ../capplet/gpilotd-capplet.glade.h:6
-#, fuzzy
-msgid "/dev/ttyUSB1"
-msgstr "/dev/ttyS1"
-
-#: ../capplet/gpilotd-capplet.glade.h:7
+#: ../capplet/gpilotd-capplet.ui.h:1
 #, fuzzy
 msgid "<b>Conduit Actions</b>"
 msgstr "ããããããæä"
 
-#: ../capplet/gpilotd-capplet.glade.h:8
+#: ../capplet/gpilotd-capplet.ui.h:2
 #, fuzzy
 msgid "<b>Conduit Settings</b>"
 msgstr "ããããããèå"
 
-#: ../capplet/gpilotd-capplet.glade.h:9
+#: ../capplet/gpilotd-capplet.ui.h:3
 #, fuzzy
 msgid "<b>PDA Attributes</b>"
 msgstr "ããããããåæ"
 
-#: ../capplet/gpilotd-capplet.glade.h:10
+#: ../capplet/gpilotd-capplet.ui.h:4
 #, fuzzy
 msgid "<b>PDA Identification</b>"
 msgstr "ããããããèåæå"
 
-#: ../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"
@@ -512,29 +536,38 @@ msgid ""
 "need to identify which one is to be used for this operation."
 msgstr ""
 
-#: ../capplet/gpilotd-capplet.glade.h:14
-msgid "Add..."
-msgstr "èå..."
+#
+# COMMUNITY MESSAGE
+# COMMUNITY FUZZY
+# SUN CHANGED MESSAGE
+# SUN LING REVIEWED
+# SUN TECH REVIEWED
+#: ../capplet/gpilotd-capplet.ui.h:8
+#, fuzzy
+msgid "C_harset of PDA:"
+msgstr "ãããããããåå(_G)"
+
+#: ../capplet/gpilotd-capplet.ui.h:9
+#, fuzzy
+#| msgid "Conduits"
+msgid "C_onduits"
+msgstr "ããããã"
 
-#: ../capplet/gpilotd-capplet.glade.h:15
+#: ../capplet/gpilotd-capplet.ui.h:10
 msgid "Choose Device"
 msgstr "ãããããéæ"
 
-#: ../capplet/gpilotd-capplet.glade.h:16
+#: ../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:17
+#: ../capplet/gpilotd-capplet.ui.h:12
 msgid "Conduit Settings"
 msgstr "ããããããèå"
 
-#: ../capplet/gpilotd-capplet.glade.h:18
-msgid "Conduits"
-msgstr "ããããã"
-
-#: ../capplet/gpilotd-capplet.glade.h:19
+#: ../capplet/gpilotd-capplet.ui.h:13
 msgid ""
 "Congratulations, gnome-pilot is configured!\n"
 "\n"
@@ -554,147 +587,122 @@ msgstr ""
 "ãããããããããããããããããããèåããã\n"
 "GNOME ããããããåæãçèãããããããããã"
 
-#: ../capplet/gpilotd-capplet.glade.h:26
-msgid "Delete"
-msgstr "åé"
+#: ../capplet/gpilotd-capplet.ui.h:20
+#, fuzzy
+#| msgid "Disable"
+msgid "D_isable"
+msgstr "çå"
+
+#: ../capplet/gpilotd-capplet.ui.h:21
+#, fuzzy
+#| msgid "Devices"
+msgid "De_vices"
+msgstr "ãããã"
 
-#: ../capplet/gpilotd-capplet.glade.h:27
+#: ../capplet/gpilotd-capplet.ui.h:22
 #, fuzzy
 msgid "Description:"
 msgstr "ããããããããããã"
 
-#: ../capplet/gpilotd-capplet.glade.h:28
+#: ../capplet/gpilotd-capplet.ui.h:23
 msgid "Device Settings"
 msgstr "ãããããèå"
 
-#: ../capplet/gpilotd-capplet.glade.h:29
+#: ../capplet/gpilotd-capplet.ui.h:24
 #, fuzzy
 msgid "Device:"
 msgstr "ãããã"
 
-#: ../capplet/gpilotd-capplet.glade.h:30
-msgid "Devices"
-msgstr "ãããã"
-
-#: ../capplet/gpilotd-capplet.glade.h:31
-msgid "Disable"
-msgstr "çå"
-
-#: ../capplet/gpilotd-capplet.glade.h:32 ../capplet/util.c:73
-#: ../capplet/util.c:419
-msgid "Disabled"
-msgstr "çå"
-
-#: ../capplet/gpilotd-capplet.glade.h:33
-msgid "Edit..."
-msgstr "çé..."
-
-#: ../capplet/gpilotd-capplet.glade.h:34
-msgid "Enable"
-msgstr "æå"
-
-#: ../capplet/gpilotd-capplet.glade.h:35
+#: ../capplet/gpilotd-capplet.ui.h:25
 #, fuzzy
 msgid "Enter Owner Name you want stored on your PDA"
-msgstr "ããããããäåãããããåãååããäãã"
+msgstr "ããããããäåããããããåãååããäãã"
 
-#: ../capplet/gpilotd-capplet.glade.h:36
+#: ../capplet/gpilotd-capplet.ui.h:26
 msgid "Get the Owner's name and ID from the PDA"
 msgstr ""
 
-#: ../capplet/gpilotd-capplet.glade.h:37
+#: ../capplet/gpilotd-capplet.ui.h:27
 #, fuzzy
 msgid "I_rDA"
 msgstr "IrDA"
 
-#: ../capplet/gpilotd-capplet.glade.h:38
+#: ../capplet/gpilotd-capplet.ui.h:28
 msgid "Initial Sync"
 msgstr "æåãåæ"
 
-#: ../capplet/gpilotd-capplet.glade.h:39
-#, fuzzy
-msgid "Ir_DA"
-msgstr "IrDA"
-
 #
 # COMMUNITY MESSAGE
 # COMMUNITY FUZZY
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../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:114
-msgid "None"
-msgstr "ãã"
-
-#: ../capplet/gpilotd-capplet.glade.h:42
+#: ../capplet/gpilotd-capplet.ui.h:30
 msgid "O_wner:"
 msgstr ""
 
-#: ../capplet/gpilotd-capplet.glade.h:43
+#: ../capplet/gpilotd-capplet.ui.h:31
 #, fuzzy
 msgid "Owner Name and ID to set on the PDA"
-msgstr "ããããããããããããããåã ID"
+msgstr "ãããããããããããããããåã 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
 #, fuzzy
 msgid "PDA Attributes"
 msgstr "ããããããåæ"
 
-#: ../capplet/gpilotd-capplet.glade.h:46
+#: ../capplet/gpilotd-capplet.ui.h:34
 #, fuzzy
 msgid "PDA Identification"
 msgstr "ããããããèåæå"
 
-#: ../capplet/gpilotd-capplet.glade.h:47
+#: ../capplet/gpilotd-capplet.ui.h:35
 #, fuzzy
 msgid "PDA Settings"
 msgstr "ããããããèå"
 
-#: ../capplet/gpilotd-capplet.glade.h:48
-msgid "PDA:"
-msgstr ""
+#: ../capplet/gpilotd-capplet.ui.h:36
+#, fuzzy
+msgid "P_DA:"
+msgstr "IrDA"
 
-#: ../capplet/gpilotd-capplet.glade.h:49
-msgid "PDAs"
+#: ../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
 #, fuzzy
 msgid "S_peed:"
 msgstr "éå"
 
-#: ../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 ""
 
-#: ../capplet/gpilotd-capplet.glade.h:52
+#: ../capplet/gpilotd-capplet.ui.h:40
 #, fuzzy
 msgid "Set the root directory for all PDA files to be stored."
-msgstr "ãããããééããããããåãæçããèããããããããããäãã"
+msgstr "ãããããééããããããåãæçããèãããããããããããäãã"
 
-#: ../capplet/gpilotd-capplet.glade.h:53
-msgid "Settings..."
-msgstr "èå..."
-
-#: ../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
 #, fuzzy
 msgid "The name for your PDA.  It is only used for identification."
 msgstr "ããããããååãããäããããããããèåãããããäçãããã"
 
-#: ../capplet/gpilotd-capplet.glade.h:56
+#: ../capplet/gpilotd-capplet.ui.h:43
 #, fuzzy
 msgid ""
 "This integer ID identifies your PDA and must be unique between different "
@@ -703,16 +711,16 @@ msgstr ""
 "ãã ID ããäããããããããèåããããããäãããããããååããããã"
 "éèãããæåãããäãã"
 
-#: ../capplet/gpilotd-capplet.glade.h:57
+#: ../capplet/gpilotd-capplet.ui.h:44
 #, fuzzy
 msgid "Ti_meout:"
 msgstr "ãããããã"
 
-#: ../capplet/gpilotd-capplet.glade.h:58
+#: ../capplet/gpilotd-capplet.ui.h:45
 msgid "Welcome to gnome-pilot!"
 msgstr "GNOME ããããããããããï"
 
-#: ../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"
@@ -737,7 +745,7 @@ msgstr ""
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../capplet/gpilotd-capplet.glade.h:66
+#: ../capplet/gpilotd-capplet.ui.h:53
 msgid "_Action:"
 msgstr "æä(_A):"
 
@@ -747,11 +755,15 @@ msgstr "æä(_A):"
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../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 ""
+
+#: ../capplet/gpilotd-capplet.ui.h:56
 #, fuzzy
 msgid "_Delete"
 msgstr "åé"
@@ -762,7 +774,7 @@ msgstr "åé"
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../capplet/gpilotd-capplet.glade.h:69
+#: ../capplet/gpilotd-capplet.ui.h:57
 #, fuzzy
 msgid "_Device:"
 msgstr "ãããã(_D)"
@@ -773,33 +785,45 @@ msgstr "ãããã(_D)"
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../capplet/gpilotd-capplet.glade.h:70
+#: ../capplet/gpilotd-capplet.ui.h:58
 msgid "_Edit..."
 msgstr "çé(_E)..."
 
+#: ../capplet/gpilotd-capplet.ui.h:59
+#, fuzzy
+#| msgid "Enable"
+msgid "_Enable"
+msgstr "æå"
+
 #
 # COMMUNITY MESSAGE
 # COMMUNITY FUZZY
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../capplet/gpilotd-capplet.glade.h:71
+#: ../capplet/gpilotd-capplet.ui.h:60
 #, fuzzy
 msgid "_Get from PDA"
 msgstr "ãããããããåå(_G)"
 
+#: ../capplet/gpilotd-capplet.ui.h:61
+#, fuzzy
+#| msgid "IrDA"
+msgid "_IrDA"
+msgstr "IrDA"
+
 #
 # COMMUNITY MESSAGE
 # COMMUNITY FUZZY
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../capplet/gpilotd-capplet.glade.h:72
+#: ../capplet/gpilotd-capplet.ui.h:62
 #, fuzzy
 msgid "_Local folder:"
 msgstr "ããããããããããããã(_L)"
 
-#: ../capplet/gpilotd-capplet.glade.h:73
+#: ../capplet/gpilotd-capplet.ui.h:63
 msgid "_Name of PDA:"
 msgstr ""
 
@@ -809,7 +833,7 @@ msgstr ""
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../capplet/gpilotd-capplet.glade.h:74
+#: ../capplet/gpilotd-capplet.ui.h:64
 #, fuzzy
 msgid "_Name:"
 msgstr "åå(_N)"
@@ -820,7 +844,7 @@ msgstr "åå(_N)"
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../capplet/gpilotd-capplet.glade.h:75
+#: ../capplet/gpilotd-capplet.ui.h:65
 #, fuzzy
 msgid "_No, I've never used sync software with this PDA before."
 msgstr "ããããããããããããåæãèãããåããããã(_N)"
@@ -831,36 +855,41 @@ msgstr "ããããããããããããåæãèãããåãããã
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../capplet/gpilotd-capplet.glade.h:76
+#: ../capplet/gpilotd-capplet.ui.h:66
 #, fuzzy
 msgid "_One time action:"
 msgstr "äåãããæä(_O):"
 
-#: ../capplet/gpilotd-capplet.glade.h:77
+#: ../capplet/gpilotd-capplet.ui.h:67
 msgid "_Owner:"
 msgstr ""
 
-#: ../capplet/gpilotd-capplet.glade.h:78
+#: ../capplet/gpilotd-capplet.ui.h:68
 msgid "_PDA ID:"
 msgstr ""
 
+#: ../capplet/gpilotd-capplet.ui.h:69
+#, fuzzy
+msgid "_PDAs"
+msgstr "IrDA"
+
 #
 # COMMUNITY MESSAGE
 # COMMUNITY FUZZY
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../capplet/gpilotd-capplet.glade.h:79
+#: ../capplet/gpilotd-capplet.ui.h:70
 #, fuzzy
 msgid "_Send to PDA"
 msgstr "ããããããéä(_S)"
 
-#: ../capplet/gpilotd-capplet.glade.h:80
+#: ../capplet/gpilotd-capplet.ui.h:71
 #, fuzzy
 msgid "_Serial"
 msgstr "ãããã"
 
-#: ../capplet/gpilotd-capplet.glade.h:81
+#: ../capplet/gpilotd-capplet.ui.h:73
 #, fuzzy
 msgid "_Type:"
 msgstr "æçãçé"
@@ -871,7 +900,7 @@ msgstr "æçãçé"
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../capplet/gpilotd-capplet.glade.h:82
+#: ../capplet/gpilotd-capplet.ui.h:74
 msgid "_USB"
 msgstr "USB(_U)"
 
@@ -881,37 +910,34 @@ msgstr "USB(_U)"
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../capplet/gpilotd-capplet.glade.h:83
+#: ../capplet/gpilotd-capplet.ui.h:75
 #, fuzzy
 msgid "_Yes, I've used sync software with this PDA before."
 msgstr "ãããããããããããçããäåãåæãèããããããããããã(_Y)"
 
-#: ../capplet/gpilotd-control-applet.c:81
-msgid "Start druid only"
-msgstr "ãããããããèå"
+#: ../capplet/gpilotd-control-applet.c:84
+#, fuzzy
+msgid " - configure gnome-pilot settings"
+msgstr "GNOME ããããããèå"
 
-#: ../capplet/gpilotd-control-applet.c:103
-msgid "Error initializing gpilotd capplet"
+#: ../capplet/gpilotd-control-applet.c:86
+#: ../capplet/gpilotd-control-applet.c:95
+#, fuzzy, c-format
+#| msgid "Error initializing gpilotd capplet"
+msgid "Error initializing gpilotd capplet : %s"
 msgstr "ããããããããããããããããåæåãåæãããã"
 
-#: ../capplet/gpilotd-control-applet.c:114
-#: ../capplet/gpilotd-control-applet.c:115
+#: ../capplet/gpilotd-control-applet.c:101
+#: ../capplet/gpilotd-control-applet.c:102
 #, fuzzy
 msgid "Error loading PDA state, aborting"
 msgstr "ããããããæåãèãåãããããååçäããã"
 
-#: ../capplet/gpilotd-control-applet.c:122
-#: ../capplet/gpilotd-control-applet.c:123
+#: ../capplet/gpilotd-control-applet.c:109
+#: ../capplet/gpilotd-control-applet.c:110
 msgid "Cannot connect to the GnomePilot Daemon"
 msgstr "ããããããããããæçããããã"
 
-#: ../capplet/gpilotd-control-applet.c:132
-#, fuzzy
-msgid "Cannot run druid if PDAs or devices already configured"
-msgstr ""
-"ããããããããããããããæãèåãããããååãããããããèåãããã"
-"ãã"
-
 #: ../capplet/gpilotd-control-applet.desktop.in.in.h:1
 msgid "Configure PalmOS devices"
 msgstr "PalmOS ãããããèåãèããã"
@@ -920,167 +946,256 @@ msgstr "PalmOS ãããããèåãèããã"
 msgid "PalmOS Devices"
 msgstr "PalmOS ããããã"
 
-#: ../capplet/util.c:80 ../capplet/util.c:421
+#: ../capplet/pilot.c:116
+#, c-format
+msgid "Unable load key gpilotd/General/sync_PC_Id: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:130
+#, c-format
+msgid "Unable load key gpilotd/General/progress_stepping: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:164
+#, c-format
+msgid "Unable load key gpilotd/%s/type: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:186
+#, c-format
+msgid "Unable load key gpilotd/%s/name: iDevice, %s"
+msgstr ""
+
+#: ../capplet/pilot.c:204
+#, c-format
+msgid "Unable load key gpilotd/%s/speed: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:213
+#, c-format
+msgid "Unable load key gpilotd/%s/timeout: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:254
+#, c-format
+msgid "Unable load key gpilotd/%s/name: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:264
+#, c-format
+msgid "Unable load key gpilotd/%s/pilotid: %s"
+msgstr ""
+
+#: ../capplet/util.c:123 ../capplet/util.c:513
+msgid "Disabled"
+msgstr "çå"
+
+#: ../capplet/util.c:129 ../capplet/util.c:515
 msgid "Enabled"
 msgstr "æå"
 
-#: ../capplet/util.c:224
+#: ../capplet/util.c:180
+msgid "None"
+msgstr "ãã"
+
+#: ../capplet/util.c:315
 msgid "You must have at least one device setup"
 msgstr "åããããäãääããããããèåããåèããããã"
 
-#: ../capplet/util.c:393
+#: ../capplet/util.c:486
 msgid "Synchronize"
 msgstr "åæ"
 
-#: ../capplet/util.c:394
+#: ../capplet/util.c:487
 #, fuzzy
 msgid "Copy from PDA"
 msgstr "ãããããããããã"
 
-#: ../capplet/util.c:395
+#: ../capplet/util.c:488
 #, fuzzy
 msgid "Copy to PDA"
 msgstr "ããããããããã"
 
-#: ../capplet/util.c:396
+#: ../capplet/util.c:489
 #, fuzzy
 msgid "Merge from PDA"
 msgstr "ãããããããçå"
 
-#: ../capplet/util.c:397
+#: ../capplet/util.c:490
 #, fuzzy
 msgid "Merge to PDA"
 msgstr "ããããããçå"
 
-#: ../capplet/util.c:400
+#: ../capplet/util.c:493
 msgid "Use conduit settings"
 msgstr "çåãèåãäçãã"
 
-#: ../capplet/util.c:408
+#: ../capplet/util.c:501
 msgid "USB"
 msgstr "USB"
 
-#: ../capplet/util.c:409
+#: ../capplet/util.c:502
 msgid "IrDA"
 msgstr "IrDA"
 
-#: ../capplet/util.c:410
+#: ../capplet/util.c:503
 msgid "Network"
 msgstr "ãããããã"
 
-#: ../capplet/util.c:411
+#: ../capplet/util.c:504
+msgid "Bluetooth"
+msgstr ""
+
+#: ../capplet/util.c:505
 msgid "Serial"
 msgstr "ãããã"
 
-#: ../capplet/util.c:459
+#: ../capplet/util.c:552
 msgid ""
 "The specified base directory exists but has the wrong permissions.\n"
 "Please fix or choose another directory"
 msgstr ""
-"æåãããããããååãããããããããããããæãããããããã\n"
-"äæãããäããããããåæããäããã"
+"æåããããããããååãããããããããããããæãããããããã\n"
+"äæãããäãããããããåæããäããã"
 
-#: ../capplet/util.c:464
+#: ../capplet/util.c:557
 msgid ""
 "The specified base directory exists but is not a directory.\n"
 "Please make it a directory or choose another directory"
 msgstr ""
-"æåãããããããååãããããããããããããããããã\n"
-"ãããããäæãããäããããããåæããäããã"
+"æåãããããããååããããããããããããããããããã\n"
+"ããããããäæãããäãããããããåæããäããã"
 
-#: ../capplet/util.c:471
+#: ../capplet/util.c:564
 msgid ""
 "It wasn't possible to create the specified base directory.\n"
 "Please verify the permitions on the specified path or choose another "
 "directory"
 msgstr ""
-"æåãããããããäæããããããããããã\n"
-"ããããããããäæãããäããããããåæããäããã"
+"æåããããããããäæããããããããããã\n"
+"ããããããããäæãããäãããããããåæããäããã"
 
-#: ../capplet/util.c:476
+#: ../capplet/util.c:569
 msgid ""
 "The path specified for the base directory is invalid.\n"
 "Please choose another directory"
 msgstr ""
-"æåãããããããæãããããããã\n"
-"äããããããåæããäããã"
+"æåããããããããæãããããããã\n"
+"äãããããããåæããäããã"
+
+#: ../capplet/util.c:593
+#, c-format
+msgid ""
+"`%s' is not a valid character set identifier.\n"
+"Please enter a valid identifier or select from the available options."
+msgstr ""
 
-#: ../capplet/util.c:583
+#: ../capplet/util.c:706
 msgid "Device 'usb:' is only valid for devices of type USB"
 msgstr ""
 
-#: ../capplet/util.c:594
+#: ../capplet/util.c:714
 msgid "Read/Write permissions failed on"
 msgstr "èã/æããããããæãäæãã"
 
-#: ../capplet/util.c:596
+#: ../capplet/util.c:716
 msgid "Check the permissions on the device and retry"
 msgstr "ãããããããããæãçèããããçããäããã"
 
-#: ../capplet/util.c:610 ../gpilotd/gpilotd.c:1286
+#: ../capplet/util.c:728 ../gpilotd/gpilot-daemon.c:1261
 #, c-format
 msgid ""
 "Failed to find directory %s or read file %s.  Check that usbfs or sysfs is "
 "mounted."
 msgstr ""
 
-#: ../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 ""
+
+#: ../conduits/backup/backup_conduit.c:119
+#, c-format
+msgid "Unable load key backup-conduit/%s/remove_deleted: %s"
+msgstr ""
+
+#: ../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:457
+#: ../conduits/backup/backup_conduit.c:461
 #, 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:473
+#: ../conduits/backup/backup_conduit.c:475
 #, 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:482
+#: ../conduits/backup/backup_conduit.c:484
 #, c-format
 msgid "Could not create backup file %s"
 msgstr "ãããããããããã %s ãäãããã"
 
-#: ../conduits/backup/backup_conduit.c:733
+#: ../conduits/backup/backup_conduit.c:684
 msgid "Collecting restore information..."
 msgstr "ããããæåãåéä..."
 
-#: ../conduits/backup/backup_conduit.c:856
+#: ../conduits/backup/backup_conduit.c:811
 #, fuzzy
-msgid "Backup directory:"
-msgstr "ããããããããããã"
+msgid "_Backup directory:"
+msgstr "ãããããããããããã"
 
-#: ../conduits/backup/backup_conduit.c:867
+#: ../conduits/backup/backup_conduit.c:825
 #, fuzzy
-msgid "Only backup changed bases:"
+msgid "Backup directory"
+msgstr "ãããããããããããã"
+
+#: ../conduits/backup/backup_conduit.c:827
+#, fuzzy
+msgid "O_nly backup changed bases"
+msgstr "åæãããããããããäåãã"
+
+#: ../conduits/backup/backup_conduit.c:837
+#, fuzzy
+msgid "Only backup changed bases"
 msgstr "åæãããããããããäåãã"
 
-#: ../conduits/backup/backup_conduit.c:875
+#: ../conduits/backup/backup_conduit.c:839
+#, fuzzy
+msgid "_Remove local base if deleted on pilot"
+msgstr "ããããããåéãããããããããããããããåéãã"
+
+#: ../conduits/backup/backup_conduit.c:849
+#, fuzzy
+msgid "Remove local base if deleted on pilot"
+msgstr "ããããããåéãããããããããããããããåéãã"
+
+#: ../conduits/backup/backup_conduit.c:851
 #, fuzzy
-msgid "Remove local base if deleted on PDA:"
-msgstr "ããããããåéããããããããããããããåéãã"
+msgid "# of old backups to _keep"
+msgstr "# äæãããããåããããããã"
 
-#: ../conduits/backup/backup_conduit.c:883
+#: ../conduits/backup/backup_conduit.c:862
 #, fuzzy
-msgid "# of old backups to keep:"
+msgid "# of old backups to keep"
 msgstr "# äæãããããåããããããã"
 
 #
@@ -1089,7 +1204,7 @@ msgstr "# äæãããããåããããããã"
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../conduits/backup/backup_conduit.c:928
+#: ../conduits/backup/backup_conduit.c:900
 msgid ""
 "The specified backup directory exists but has the wrong permissions.\n"
 "Please fix or choose another directory"
@@ -1103,7 +1218,7 @@ msgstr ""
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../conduits/backup/backup_conduit.c:933
+#: ../conduits/backup/backup_conduit.c:905
 msgid ""
 "The specified backup directory exists but is not a directory.\n"
 "Please make it a directory or choose another directory"
@@ -1117,7 +1232,7 @@ msgstr ""
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../conduits/backup/backup_conduit.c:940
+#: ../conduits/backup/backup_conduit.c:912
 msgid ""
 "It wasn't possible to create the specified backup directory.\n"
 "Please verify the permissions on the specified path or choose another "
@@ -1132,7 +1247,7 @@ msgstr ""
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../conduits/backup/backup_conduit.c:945
+#: ../conduits/backup/backup_conduit.c:917
 msgid ""
 "The path specified for the backup directory is invalid.\n"
 "Please choose another directory"
@@ -1140,6 +1255,76 @@ msgstr ""
 "ãããããããããããããããæåãããããæãããããããã\n"
 "ããããããããããåæããããããã"
 
+#: ../conduits/evolution-data-server/address-conduit.c:593
+msgid "Default Sync Address:"
+msgstr ""
+
+#: ../conduits/evolution-data-server/address-conduit.c:1594
+#: ../conduits/evolution-data-server/address-conduit.c:1595
+msgid "Could not load address book"
+msgstr ""
+
+#: ../conduits/evolution-data-server/address-conduit.c:1666
+#: ../conduits/evolution-data-server/address-conduit.c:1669
+msgid "Could not read pilot's Address application block"
+msgstr ""
+
+#: ../conduits/evolution-data-server/calendar-conduit.c:250
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: ../conduits/evolution-data-server/calendar-conduit.c:1496
+#: ../conduits/evolution-data-server/calendar-conduit.c:1497
+#: ../conduits/evolution-data-server/memo-conduit.c:787
+#: ../conduits/evolution-data-server/memo-conduit.c:788
+#: ../conduits/evolution-data-server/todo-conduit.c:990
+#: ../conduits/evolution-data-server/todo-conduit.c:991
+msgid "Could not start evolution-data-server"
+msgstr ""
+
+#: ../conduits/evolution-data-server/calendar-conduit.c:1598
+#: ../conduits/evolution-data-server/calendar-conduit.c:1601
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: ../conduits/evolution-data-server/e-pilot-settings.c:96
+msgid "Sync with:"
+msgstr ""
+
+#: ../conduits/evolution-data-server/e-pilot-settings.c:104
+msgid "Sync Private Records:"
+msgstr ""
+
+#: ../conduits/evolution-data-server/e-pilot-settings.c:113
+#, fuzzy
+#| msgid "Sync continues"
+msgid "Sync Categories:"
+msgstr "åæãçè"
+
+#: ../conduits/evolution-data-server/memo-conduit.c:875
+#: ../conduits/evolution-data-server/memo-conduit.c:878
+msgid "Could not read pilot's Memo application block"
+msgstr ""
+
+#: ../conduits/evolution-data-server/memo-conduit.c:918
+#: ../conduits/evolution-data-server/memo-conduit.c:921
+msgid "Could not write pilot's Memo application block"
+msgstr ""
+
+#: ../conduits/evolution-data-server/todo-conduit.c:227
+msgid "Default Priority:"
+msgstr ""
+
+#: ../conduits/evolution-data-server/todo-conduit.c:1068
+#: ../conduits/evolution-data-server/todo-conduit.c:1071
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: ../conduits/evolution-data-server/todo-conduit.c:1111
+#: ../conduits/evolution-data-server/todo-conduit.c:1114
+msgid "Could not write pilot's ToDo application block"
+msgstr ""
+
 #: ../conduits/file/file_conduit.c:243 ../conduits/file/file_conduit.c:253
 #, c-format
 msgid "Install of %s failed"
@@ -1155,43 +1340,61 @@ msgstr "%2$s ãã %1$s ãããããããä..."
 msgid "Installing %s..."
 msgstr "%s ãããããããä..."
 
-#: ../conduits/file/gpilot_install_file.c:44
+#: ../conduits/file/gpilot_install_file.c:41
 msgid "Install immediately"
 msgstr "çãããããããããã"
 
-#: ../conduits/file/gpilot_install_file.c:45
+#: ../conduits/file/gpilot_install_file.c:42
 msgid "Install delayed"
 msgstr "ããããããããããã"
 
-#: ../conduits/file/gpilot_install_file.c:46
+#: ../conduits/file/gpilot_install_file.c:43
 #, fuzzy
 msgid "PDA to install to"
 msgstr "ãããããããããããã"
 
-#: ../conduits/file/gpilot_install_file.c:46
+#: ../conduits/file/gpilot_install_file.c:43
 msgid "PDA"
 msgstr ""
 
-#: ../conduits/file/gpilot_install_file.c:118
-#: ../conduits/file/gpilot_install_file.c:119
+#: ../conduits/file/gpilot_install_file.c:44
+#, fuzzy
+#| msgid "FILE"
+msgid "[FILE...]"
+msgstr "FILE"
+
+#: ../conduits/file/gpilot_install_file.c:44
+#, fuzzy
+#| msgid "Install of %s failed"
+msgid "list of files"
+msgstr "%s ããããããããåæãããã"
+
+#: ../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 ""
+
+#: ../conduits/file/gpilot_install_file.c:113
+#: ../conduits/file/gpilot_install_file.c:114
 #, fuzzy
 msgid "Unable to get PDA names"
 msgstr "ããããããååãååããããã"
 
-#: ../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."
@@ -1199,106 +1402,106 @@ msgstr ""
 "ãããããã HotSync ãæããéåãããã\n"
 "ãããããããããåçãäæããããã"
 
-#: ../gpilotd/GNOME_Pilot_Daemon.server.in.in.h:1
-msgid "Gnome-Pilot daemon"
-msgstr "GNOME ãããããããããã"
+#: ../gpilotd/gnome-pilot-conduit-management.gob:683
+msgid "module loading not supported, fatal!"
+msgstr "ããããããããããããããããããèåçããããããï"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:136
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:135
 #, fuzzy
 msgid "deleted PDA record modified locally, not deleting\n"
 msgstr "ãããããåæããããããããããããåéããããããåéããããã\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:137
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:136
 #, fuzzy
 msgid "deleted local record modified on PDA, not deleting\n"
 msgstr ""
 "ãããããäãåæããããããããããããåéããããããåéããããã\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:138
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:142
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:137
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:141
 #, fuzzy
 msgid "merge conflict, PDA and local record swapped\n"
 msgstr ""
 "çåæãéèãççããããããããããããããããããããããæããããã\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:139
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:138
 #, fuzzy
 msgid "archive and change conflict, PDA and local record swapped\n"
 msgstr ""
 "ããããããåæçæãéèãããããããããããããããããããããããæã"
 "ãããã\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:140
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:139
 #, fuzzy
 msgid "archive and change conflict, local record sent to PDA\n"
 msgstr ""
 "ããããããåæçæãéèãããããããããããããããããããããéããã"
 "ãã\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:141
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:140
 #, fuzzy
 msgid "archive and change conflict, PDA record saved locally\n"
 msgstr ""
 "ããããããåæçæãéèãããããããããããããããããããããäåãã"
 "ããã\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:457
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:532
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:593
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:622
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:651
 msgid "Conduits initialization failed, aborting operation"
 msgstr "ããããããåæåãåæãããããåçãäæãããã"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:436
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:470
 #, fuzzy
 msgid "Unable to delete all records in PDA database, aborting operation."
 msgstr "ãããããããããããããããããåéããããããåçãçäãããã"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:447
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1025
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:481
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1071
 msgid "Conduit did not return a record"
 msgstr "ããããããããããèããããããã"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:504
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:538
 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:1472
 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
 #, fuzzy
 msgid "Copy to PDA failed!"
 msgstr "ãããããããããããåæããããï"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:511
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:541
 #, fuzzy
 msgid "Copy from PDA failed!"
 msgstr "ããããããããããããåæããããï"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:535
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:565
 #, fuzzy
 msgid "Merge to PDA failed!"
 msgstr "ãããããããçåãåæããããï"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:559
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:589
 #, fuzzy
 msgid "Merge from PDA failed!"
 msgstr "ããããããããçåãåæããããï"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:614
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:644
 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"
@@ -1307,18 +1510,30 @@ msgstr ""
 "ãããã %s (%s) ãéããããã\n"
 "çç: \"%s\""
 
-#: ../gpilotd/gnome-pilot-structures.c:517
-#: ../gpilotd/gnome-pilot-structures.c:566
-#: ../gpilotd/gnome-pilot-structures.c:594
+#: ../gpilotd/gnome-pilot-structures.c:446
+#, c-format
+msgid ""
+"Bluetooth Device [%s]: Unable to bind socket: err %d (check pilot-link was "
+"compiled with bluetooth support)"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:456
+#, c-format
+msgid "Device [%s, %s]: Unable to bind socket: err %d"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:536
+#: ../gpilotd/gnome-pilot-structures.c:589
 #: ../gpilotd/gnome-pilot-structures.c:620
+#: ../gpilotd/gnome-pilot-structures.c:648
 msgid "Unknown device type"
 msgstr "äæããããã(çé)"
 
-#: ../gpilotd/gnome-pilot-structures.c:635
+#: ../gpilotd/gnome-pilot-structures.c:666
 msgid "Number of devices is configured to 0"
 msgstr "ãããããæã 0 ãèåãããããã"
 
-#: ../gpilotd/gnome-pilot-structures.c:637
+#: ../gpilotd/gnome-pilot-structures.c:668
 #, fuzzy
 msgid ""
 "No devices configured.\n"
@@ -1329,16 +1544,16 @@ msgstr ""
 "GNOME ããããããèåãèãããã gpilotd-control-applet\n"
 "ãèåããã (ããããããããããããããã)ã"
 
-#: ../gpilotd/gnome-pilot-structures.c:658
+#: ../gpilotd/gnome-pilot-structures.c:689
 msgid "No accessible devices available"
 msgstr "åçåèããããããããããã"
 
-#: ../gpilotd/gnome-pilot-structures.c:673
+#: ../gpilotd/gnome-pilot-structures.c:708
 #, fuzzy
 msgid "Number of PDAs is configured to 0"
 msgstr "ããããããæã 0 ãèåãããããã"
 
-#: ../gpilotd/gnome-pilot-structures.c:675
+#: ../gpilotd/gnome-pilot-structures.c:710
 #, fuzzy
 msgid ""
 "No PDAs configured.\n"
@@ -1349,12 +1564,17 @@ msgstr ""
 "gpilotd-control-applet (ããããããããããããã)\n"
 "ãèåããèåãèããäããã"
 
-#: ../gpilotd/gpilotd.c:233
+#: ../gpilotd/gnome-pilot-structures.c:772 ../gpilotd/gpilot-daemon.c:822
+#, c-format
+msgid "No pilot_charset specified.  Using `%s'."
+msgstr ""
+
+#: ../gpilotd/gpilot-daemon.c:373
 #, fuzzy
 msgid "Unable to bind to PDA"
 msgstr "ããããããæçããããã"
 
-#: ../gpilotd/gpilotd.c:369
+#: ../gpilotd/gpilot-daemon.c:503
 #, c-format
 msgid ""
 "Failed to connect using device `%s', on port `%s'.  Check your "
@@ -1363,7 +1583,7 @@ msgid ""
 "`ttyUSB...' device."
 msgstr ""
 
-#: ../gpilotd/gpilotd.c:384
+#: ../gpilotd/gpilot-daemon.c:518
 #, c-format
 msgid ""
 "Failed to connect using device `%s', on port `%s'.  Check your "
@@ -1372,19 +1592,19 @@ msgid ""
 "a `usb:' device."
 msgstr ""
 
-#: ../gpilotd/gpilotd.c:475
+#: ../gpilotd/gpilot-daemon.c:608
 #, fuzzy, c-format
 msgid "Unknown PDA, no userID/username match %ld"
-msgstr "äæãããããããããID ããããã %ld ãäèãããã"
+msgstr "äæãããããããããID ãããããã %ld ãäèãããã"
 
-#: ../gpilotd/gpilotd.c:482
+#: ../gpilotd/gpilot-daemon.c:615
 #, fuzzy
 msgid "Use gnomecc to configure PDA"
 msgstr "ããããããèåããååããããããããããããäçããäãã"
 
 #. FIXME: here we should offer to create a profile for the pilot,
 #. bug # 8218
-#: ../gpilotd/gpilotd.c:487
+#: ../gpilotd/gpilot-daemon.c:620
 #, fuzzy, c-format
 msgid ""
 "Unknown PDA - no PDA matches ID %ld\n"
@@ -1393,66 +1613,76 @@ msgstr ""
 "äæãããããã - ID %ld ãããããããããããããããããã\n"
 "ããããããããããããããããã ID ãèåããäããã"
 
-#: ../gpilotd/gpilotd.c:511
+#: ../gpilotd/gpilot-daemon.c:645
 #, fuzzy, c-format
 msgid "Device %s has %d events"
 msgstr "ããããã %s ã %d åããããããããããã"
 
-#: ../gpilotd/gpilotd.c:524
+#: ../gpilotd/gpilot-daemon.c:658
 msgid "Setting userinfo..."
-msgstr "ãããæåãèåä..."
+msgstr "ããããæåãèåä..."
 
-#: ../gpilotd/gpilotd.c:529
+#: ../gpilotd/gpilot-daemon.c:670
 msgid "Sync continues"
 msgstr "åæãçè"
 
-#: ../gpilotd/gpilotd.c:548
+#: ../gpilotd/gpilot-daemon.c:689
 msgid "Getting userinfo..."
-msgstr "ããããæåãååä..."
+msgstr "ãããããæåãååä..."
 
-#: ../gpilotd/gpilotd.c:610
+#: ../gpilotd/gpilot-daemon.c:751
 #, fuzzy
 msgid "NetSync request detected, synchronizing PDA"
 msgstr "NetSync èæãèãããããããããããããåæããã"
 
-#: ../gpilotd/gpilotd.c:612
+#: ../gpilotd/gpilot-daemon.c:753
+#, fuzzy
+msgid "Bluetooth request detected, synchronizing PDA"
+msgstr "NetSync èæãèãããããããããããããåæããã"
+
+#: ../gpilotd/gpilot-daemon.c:755
 #, fuzzy
 msgid "HotSync button pressed, synchronizing PDA"
 msgstr "HostSync ããããåæãéåãããã"
 
-#: ../gpilotd/gpilotd.c:614
+#: ../gpilotd/gpilot-daemon.c:757
 #, fuzzy, c-format
 msgid "PDA ID is %ld, name is %s, owner is %s"
 msgstr "ãããããã ID ã %ldãååã %sãææèã %s ããã"
 
-#: ../gpilotd/gpilotd.c:624
+#: ../gpilotd/gpilot-daemon.c:767
 #, c-format
 msgid "On host %s\n"
 msgstr "ããã %s ä\n"
 
-#: ../gpilotd/gpilotd.c:626
+#: ../gpilotd/gpilot-daemon.c:769
 #, c-format
 msgid "On host %d\n"
 msgstr "ããã %d ä\n"
 
-#: ../gpilotd/gpilotd.c:645
+#: ../gpilotd/gpilot-daemon.c:788
 msgid "Synchronization ended"
 msgstr "åæãçäããããã"
 
-#: ../gpilotd/gpilotd.c:648
+#: ../gpilotd/gpilot-daemon.c:791
 msgid "Synchronization ended early"
 msgstr "æãããæåãåæ"
 
-#: ../gpilotd/gpilotd.c:680
+#: ../gpilotd/gpilot-daemon.c:836
+#, c-format
+msgid "`%s' is not a recognised iconv charset, using `%s' instead."
+msgstr ""
+
+#: ../gpilotd/gpilot-daemon.c:858
 #, c-format
 msgid ""
 "The base directory %s is invalid.\n"
 "Please fix it or use gnomecc to choose another directory."
 msgstr ""
-"ååãããã %s ãæãããããããã\n"
-"äæãããããããããããããããããããåããããããéæããäããã"
+"ååããããã %s ãæãããããããã\n"
+"äæãããããããããããããããããããåãããããããéæããäããã"
 
-#: ../gpilotd/gpilotd.c:693
+#: ../gpilotd/gpilot-daemon.c:871
 #, fuzzy, c-format
 msgid ""
 "Unknown PDA - no PDA matches ID %ld\n"
@@ -1462,268 +1692,280 @@ msgstr ""
 "ããããããããããããããããã ID ãèåããäããã"
 
 #. no ? drop connection then
-#: ../gpilotd/gpilotd.c:744
+#: ../gpilotd/gpilot-daemon.c:1003
 #, fuzzy
 msgid "An error occurred while getting the PDA's system data"
 msgstr "ããããããããããæåãååããéãããããççãããã"
 
 #. no ? drop connection then
-#: ../gpilotd/gpilotd.c:753
+#: ../gpilotd/gpilot-daemon.c:1010
 #, fuzzy
 msgid "An error occurred while getting the PDA's user data"
-msgstr "ãããããããããæåãååããéãããããççãããã"
+msgstr "ããããããããããæåãååããéãããããççãããã"
 
-#: ../gpilotd/gpilotd.c:758
+#: ../gpilotd/gpilot-daemon.c:1015
 #, fuzzy, c-format
 msgid "Completed events for device %s (%s)"
 msgstr "ããããã %s (%s) ããããããåäãããã"
 
-#: ../gpilotd/gpilotd.c:817
+#: ../gpilotd/gpilot-daemon.c:1080
 #, c-format
 msgid "Woke on %s"
 msgstr "%s ãèåããããã"
 
-#: ../gpilotd/gpilotd.c:898
+#: ../gpilotd/gpilot-daemon.c:1161
 #, fuzzy, c-format
 msgid "Woke on network: %s"
 msgstr "%s ãèåããããã"
 
-#: ../gpilotd/gpilotd.c:1448
+#: ../gpilotd/gpilot-daemon.c:1431
 #, fuzzy, c-format
 msgid "Watching %s (network)"
 msgstr "%s (%s) ãçèäããã"
 
-#: ../gpilotd/gpilotd.c:1450
+#: ../gpilotd/gpilot-daemon.c:1433
+#, fuzzy, c-format
+msgid "Watching %s (bluetooth)"
+msgstr "%s (%s) ãçèäããã"
+
+#: ../gpilotd/gpilot-daemon.c:1435
 #, c-format
 msgid "Watching %s (%s)"
 msgstr "%s (%s) ãçèäããã"
 
-#: ../gpilotd/gpilotd.c:1464
+#: ../gpilotd/gpilot-daemon.c:1567
+msgid "Shutting down devices"
+msgstr "ããããã shutdown ãããã"
+
+#: ../gpilotd/gpilot-daemon.c:1569
+msgid "Rereading configuration..."
+msgstr "èåãåèãèãä..."
+
+#: ../gpilotd/gpilot-daemon.c:2482
+msgid "(unknown DB)"
+msgstr "(äæã DB)"
+
+#: ../gpilotd/gpilotd.c:54
 msgid "Exiting (caught SIGTERM)..."
 msgstr "çäãããã(SIGTERM ãçç)..."
 
-#: ../gpilotd/gpilotd.c:1473
+#: ../gpilotd/gpilotd.c:62
 msgid "Exiting (caught SIGINT)..."
 msgstr "çäãããã(SIGINT ãçç)..."
 
-#: ../gpilotd/gpilotd.c:1505
+#: ../gpilotd/gpilotd.c:93
 msgid "Unable to create file installation queue directory"
-msgstr "ããããããåããããããçæãããããã"
-
-#: ../gpilotd/gpilotd.c:1555
-msgid "Shutting down devices"
-msgstr "ããããã shutdown ãããã"
+msgstr "ããããããåãããããããçæãããããã"
 
-#: ../gpilotd/gpilotd.c:1557
-msgid "Rereading configuration..."
-msgstr "èåãåèãèãä..."
+#: ../gpilotd/gpilotd.c:209
+msgid "gpilotd already running; exiting ...\n"
+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:420
 #, c-format
 msgid "Synchronizing %s\n"
 msgstr "%s ãåæäããã\n"
 
-#: ../gpilotd/manager.c:446
+#: ../gpilotd/manager.c:439
 #, fuzzy, c-format
 msgid "Copy to PDA %s\n"
 msgstr "ããããã %s ãããã\n"
 
-#: ../gpilotd/manager.c:464
+#: ../gpilotd/manager.c:457
 #, fuzzy, c-format
 msgid "Copy from PDA %s\n"
 msgstr "ããããã %s ããããã\n"
 
-#: ../gpilotd/manager.c:482
+#: ../gpilotd/manager.c:475
 #, fuzzy, c-format
 msgid "Merge to PDA %s\n"
 msgstr "ããããã %s ãçå\n"
 
-#: ../gpilotd/manager.c:500
+#: ../gpilotd/manager.c:493
 #, fuzzy, c-format
 msgid "Merge from PDA %s\n"
 msgstr "ããããã %s ããçå\n"
 
-#: ../gpilotd/manager.c:528
+#: ../gpilotd/manager.c:521
 #, c-format
 msgid "Conduit %s's first synchronization..."
 msgstr "ããããã %s ãæåãåæãã..."
 
-#: ../gpilotd/manager.c:552
+#: ../gpilotd/manager.c:545
 #, c-format
 msgid "unknown syncing action (%d = %s).\n"
 msgstr "äæãåæåäãã (%d = %s).\n"
 
-#: ../gpilotd/manager.c:678
+#: ../gpilotd/manager.c:671
 #, c-format
 msgid "Instantiating %d conduits..."
 msgstr "%d åãããããããåäåããããã..."
 
-#: ../gpilotd/manager.c:683 ../gpilotd/manager.c:684
+#: ../gpilotd/manager.c:676 ../gpilotd/manager.c:677
 #, c-format
 msgid "Unknown conduit \"%s\" in configure!"
 msgstr "èåãäãäæãããããã \"%s\" ãããããï"
 
-#: ../gpilotd/manager.c:693
+#: ../gpilotd/manager.c:686
 #, c-format
 msgid "Loading conduit \"%s\" failed!"
 msgstr "ããããã \"%s\" ãèãèããåæããããï"
 
-#: ../gpilotd/manager.c:694
+#: ../gpilotd/manager.c:687
 #, c-format
 msgid "Loading conduit \"%s\" failed!\n"
 msgstr "ããããã \"%s\" ãèãèããåæããããï\n"
 
-#: ../gpilotd/manager.c:783
+#: ../gpilotd/manager.c:777
 #, fuzzy, c-format
 msgid "Setting id/owner to %d/%s..."
-msgstr "ããã/ID ã %d/%s ãèåä..."
+msgstr "ãããã/ID ã %d/%s ãèåä..."
 
 #. FIXME: remove the bloody request, or the user will get this
 #. message every time
-#: ../gpilotd/manager.c:815
-#, c-format
-msgid "Conduit %s requested, but not found"
+#: ../gpilotd/manager.c:809
+#, fuzzy, c-format
+#| msgid "Conduit %s requested, but not found"
+msgid "Conduit %s requested, but not found.  Is it enabled?"
 msgstr "ããããã %s ãèãããããã"
 
-#: ../gpilotd/manager.c:825
+#: ../gpilotd/manager.c:819
 #, c-format
 msgid "Conduit %s cannot be requested"
 msgstr "ããããã %s ãäçããããã"
 
-#: ../gpilotd/orbit_daemon_glue.c:1747
-msgid "(unknown DB)"
-msgstr "(äæã DB)"
-
-#: ../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
 #, fuzzy, c-format
 msgid "fault: no request found for PDA %d, request %d"
 msgstr "ããã: ããããã %d çãèæããããããã(ããããã %d)"
 
-#: ../libgpilotdCM/gnome-pilot-conduit-management.gob:686
-msgid "module loading not supported, fatal!"
-msgstr "ããããããããããããããããããèåçããããããï"
-
-#: ../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 ããããåãããã"
+msgstr "ãããã ID ãããããåãããã"
 
-#: ../utils/gpilotd-client.c:44
+#: ../utils/gpilotd-client.c:43
 #, fuzzy
 msgid "ID for the PDA"
 msgstr "ãããããçã 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 "FILE"
 
-#: ../utils/gpilotd-client.c:46
+#: ../utils/gpilotd-client.c:45
 msgid "Restore directory"
-msgstr "ååãããããã"
+msgstr "ååããããããã"
 
-#: ../utils/gpilotd-client.c:46
+#: ../utils/gpilotd-client.c:45
 msgid "DIRECTORY"
 msgstr "DIRECTORY"
 
-#: ../utils/gpilotd-client.c:47
+#: ../utils/gpilotd-client.c:46
 msgid "Run conduit"
 msgstr "ããããããèå"
 
-#: ../utils/gpilotd-client.c:47 ../utils/gpilotdcm-client.c:27
+#: ../utils/gpilotd-client.c:46 ../utils/gpilotdcm-client.c:26
 msgid "CONDUIT"
 msgstr "CONDUIT"
 
-#: ../utils/gpilotd-client.c:48
+#: ../utils/gpilotd-client.c:47
 msgid "Username to set"
-msgstr "ããããããããå"
+msgstr "ãããããããããå"
 
-#: ../utils/gpilotd-client.c:48
+#: ../utils/gpilotd-client.c:47
 msgid "USERNAME"
 msgstr "USERNAME"
 
-#: ../utils/gpilotd-client.c:49
-#, fuzzy
-msgid "Monitor the specified PDA's actions"
-msgstr "æåããããããããåäãçè"
-
-#: ../utils/gpilotd-client.c:50
+#: ../utils/gpilotd-client.c:48
 #, fuzzy
 msgid "Monitor all PDAs"
 msgstr "åããããããããçè"
 
-#: ../utils/gpilotd-client.c:51
+#: ../utils/gpilotd-client.c:49
 #, fuzzy
 msgid "list PDAs by login (all for all pilots)"
 msgstr "ãããããããããããããäèèç (åããããããããåè)"
 
-#: ../utils/gpilotd-client.c:51
+#: ../utils/gpilotd-client.c:49
 msgid "LOGIN"
 msgstr "LOGIN"
 
-#: ../utils/gpilotd-client.c:52
+#: ../utils/gpilotd-client.c:50
 #, fuzzy
 msgid "Specify PDA to operate on (defaults to MyPDA)"
 msgstr "æäããããããããæå (ãããããã MyPilot)"
 
-#: ../utils/gpilotd-client.c:52
+#: ../utils/gpilotd-client.c:50
 msgid "PILOTNAME"
 msgstr "PILOTNAME"
 
-#: ../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 "CRADLENAME"
 
+#: ../utils/gpilotd-client.c:52
+msgid "List users"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:53
+#, fuzzy
+#| msgid "Sync cradle"
+msgid "List cradles"
+msgstr "åæããããã"
+
 #: ../utils/gpilotd-client.c:54
 #, fuzzy
-msgid "List the specifed PDA's bases"
+msgid "List the specified PDA's bases"
 msgstr "æåãããããããããããäèèç"
 
-#: ../utils/gpilotd-client.c:359 ../utils/gpilotdcm-client.c:106
+#: ../utils/gpilotd-client.c:472 ../utils/gpilotdcm-client.c:113
+#, c-format
 msgid ""
 "\n"
 "BEWARE!!\n"
@@ -1735,19 +1977,19 @@ msgstr ""
 "ããã GNOME ããããããããããããåãããããããäãããã\n"
 "äããããåããããååããããããããäããããäããã"
 
-#: ../utils/gpilotdcm-client.c:26
+#: ../utils/gpilotdcm-client.c:25
 msgid "lists available conduits"
 msgstr "æåãããããããäèèç"
 
-#: ../utils/gpilotdcm-client.c:27
+#: ../utils/gpilotdcm-client.c:26
 msgid "conduit to operate on"
 msgstr "æäããããããã"
 
-#: ../utils/gpilotdcm-client.c:28
+#: ../utils/gpilotdcm-client.c:27
 msgid "list all attributes"
 msgstr "åããåæãäèèç"
 
-#: ../utils/gpilotdcm-client.c:29
+#: ../utils/gpilotdcm-client.c:28
 #, fuzzy
 msgid "specify PDA to operate on"
 msgstr "æäããããããããæå"
@@ -1758,35 +2000,98 @@ msgstr "æäããããããããæå"
 # SUN CHANGED MESSAGE
 # SUN LING REVIEWED
 # SUN TECH REVIEWED
-#: ../utils/gpilotdcm-client.c:29
+#: ../utils/gpilotdcm-client.c:28
 #, fuzzy
 msgid "PDA_ID"
 msgstr "ID(_I)"
 
-#: ../utils/gpilotdcm-client.c:30
+#: ../utils/gpilotdcm-client.c:29
 msgid "list attributes"
 msgstr "åæãäèèç"
 
-#: ../utils/gpilotdcm-client.c:31
+#: ../utils/gpilotdcm-client.c:30
 msgid "list available conduits and their state"
 msgstr "æåãããããããçæãäèèç"
 
-#: ../utils/gpilotdcm-client.c:32
+#: ../utils/gpilotdcm-client.c:31
 msgid "enable specified conduit"
 msgstr "æåããããããããæå"
 
-#: ../utils/gpilotdcm-client.c:33
+#: ../utils/gpilotdcm-client.c:32
 msgid "disable specified conduit"
 msgstr "æåããããããããçå"
 
-#: ../utils/gpilotdcm-client.c:34
+#: ../utils/gpilotdcm-client.c:33
 msgid "enable, and set firstsync to slow"
 msgstr "æåããããããããåæåæããäãã"
 
-#: ../utils/gpilotdcm-client.c:35
+#: ../utils/gpilotdcm-client.c:34
 msgid "instantiate and destroy the conduit"
 msgstr "ããããããåäåãèæ"
 
+# SUN REVIEWED
+#~ msgid "Pilot Applet"
+#~ msgstr "Pilot ããããã"
+
+#, fuzzy
+#~ msgid "Synchronize your data on PalmOS devices"
+#~ msgstr "PalmOS ãããããèåãèããã"
+
+#~ msgid "Utility"
+#~ msgstr "ããããããã"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "/dev/ttyUSB0"
+#~ msgstr "/dev/ttyS0"
+
+#, fuzzy
+#~ msgid "/dev/ttyUSB1"
+#~ msgstr "/dev/ttyS1"
+
+#~ msgid "Add..."
+#~ msgstr "èå..."
+
+#~ msgid "Delete"
+#~ msgstr "åé"
+
+#~ msgid "Edit..."
+#~ msgstr "çé..."
+
+#, fuzzy
+#~ msgid "Ir_DA"
+#~ msgstr "IrDA"
+
+#~ msgid "Start druid only"
+#~ msgstr "ãããããããèå"
+
+#, fuzzy
+#~ msgid "Cannot run druid if PDAs or devices already configured"
+#~ msgstr ""
+#~ "ããããããããããããããæãèåãããããååãããããããèåããã"
+#~ "ããã"
+
+#~ msgid "Gnome-Pilot daemon"
+#~ msgstr "GNOME ãããããããããã"
+
+#, fuzzy
+#~ msgid "Monitor the specified PDA's actions"
+#~ msgstr "æåããããããããåäãçè"
+
 #~ msgid "Pilot ID"
 #~ msgstr "ãããããID"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]