[gnome-pilot] Updated Russian translation

[Yuri Myasoedov <ymyasoedov src gnome org>]

commit 12d0db33849dfa3b1da47c475127d731ba82e21f
Author: Yulia Poyarko <ypoyarko redhat com>
Date:   Mon Jul 18 20:54:15 2011 +0400

    Updated Russian translation

 po/ru.po | 2271 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1148 insertions(+), 1123 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 2ff1a64..ffe517c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,208 +1,267 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Valek Filippov <frob df ru>, 2000.
 #
+# Valek Filippov <frob df ru>, 2000.
+# Yulia <ypoyarko redhat com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: Gnome-pilot\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-26 22:03-0400\n"
-"PO-Revision-Date: 2001-03-13 16:04+03:00\n"
-"Last-Translator: Valek Filippov <frob df ru>\n"
-"Language-Team: Russian <ru li org>\n"
+"Project-Id-Version: gnome-pilot.master.ru\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-03-21 01:05+0000\n"
+"PO-Revision-Date: 2011-07-18 20:51+0300\n"
+"Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
+"Language-Team: Russian <gnome-cyr gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: applet/GNOME_PilotApplet.server.in.in.h:1
-msgid "Utility"
-msgstr ""
-
-#: applet/pilot-applet.glade.h:1 capplet/gpilotd-capplet.glade.h:1
-msgid "*"
-msgstr ""
-
-#: applet/pilot-applet.glade.h:2
-msgid "Choose Pilot"
-msgstr "ÐÑÐÑÐÑÑ Pilot"
+#: ../applet/pilot-applet.ui.h:1
+msgid "Choose PDA"
+msgstr "ÐÑÐÑÐÑÑ ÐÐÐ"
 
-#: applet/pilot-applet.glade.h:3
-msgid "Directory"
-msgstr "ÐÐÑÐÐÐÐ"
+#: ../applet/pilot-applet.ui.h:2
+msgid "GNOME PilotSync Properties"
+msgstr "ÐÐÐÐÑÑÐÐ GNOME PilotSync"
 
-#: applet/pilot-applet.glade.h:4
-msgid "Display notices"
-msgstr "ÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÑÐÐÐÐÐÐÑ"
+#: ../applet/pilot-applet.ui.h:3
+msgid "Restore PDA"
+msgstr "ÐÐÑÑÑÐÐÐÐÐÑÑ ÐÐÐ"
 
-#: applet/pilot-applet.glade.h:5
-msgid "Execute when clicked"
-msgstr "ÐÑÐÐÐÐÐÑÑ ÐÑÐ ÑÐÐÑÐÐ"
+#: ../applet/pilot-applet.ui.h:4
+msgid "_Directory"
+msgstr "_ÐÐÑÐÐÐÐ"
 
-#: applet/pilot-applet.glade.h:6
-msgid "GNOME PilotSync Properties"
-msgstr "ÐÐÐÐÑÑÐÐ GNOME PilotSync"
+#: ../applet/pilot-applet.ui.h:5
+msgid "_Display notices"
+msgstr "_ÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÑÐÐÐÐÐÐÑ"
 
-#: applet/pilot-applet.glade.h:7
-msgid "Pilot ID"
-msgstr "Pilot ID"
+#: ../applet/pilot-applet.ui.h:6
+msgid "_Execute when clicked"
+msgstr "_ÐÑÐÐÐÐÐÑÑ ÐÐ ÑÐÐÑÐÑ"
 
-#: applet/pilot-applet.glade.h:8
-msgid "Restore Pilot"
-msgstr "ÐÐÑÑÑÐÐÐÐÐÑÑ Pilot"
+#: ../applet/pilot-applet.ui.h:7
+msgid "_PDA ID"
+msgstr "_ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÐ"
 
-#: applet/pilot-applet.glade.h:9
-msgid "Sync cradle"
-msgstr "ÐÐÐÑÑÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÐÑÐÑ"
+#: ../applet/pilot-applet.ui.h:8
+msgid "_Sync cradle"
+msgstr "_ÐÐÐÑÑÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÑ"
 
-#: applet/pilot-applet.glade.h:10
-#, fuzzy
+#: ../applet/pilot-applet.ui.h:9
 msgid "gnome-pilot progress"
-msgstr "GNOME-Pilot ÐÑÐÐÑÐÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐ"
-
-#: applet/pilot.c:135
-msgid "Synchronizing..."
-msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ..."
+msgstr "ÐÑÐÐÑÐÑÑ gnome-pilot"
 
-#: applet/pilot.c:163
+#: ../applet/pilot.c:186
 #, c-format
 msgid "%s Synchronizing"
-msgstr "%s ÐÐÐÑÑÐÐÐÐÐÑÐÑ..."
+msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ %s..."
 
-#: applet/pilot.c:168
-msgid "Database %v of %u"
-msgstr ""
+#: ../applet/pilot.c:191
+#| msgid "_Settings..."
+msgid "Connecting..."
+msgstr "ÐÐÐÐÐÐÐÐÐÐ..."
 
-#: applet/pilot.c:187 applet/pilot.c:716 applet/pilot.c:868
+#: ../applet/pilot.c:209
+#: ../applet/pilot.c:907
+#: ../applet/pilot.c:1051
 msgid "Ready to synchronize"
 msgstr "ÐÐÑÐÐ Ð ÑÐÐÑÑÐÐÐÐÐÑÐÐ"
 
-#: applet/pilot.c:207
+#: ../applet/pilot.c:290
 #, c-format
 msgid "Request %ld has been completed\n"
-msgstr "ÐÐÐÑÐÑ %ld ÐÑÐ ÐÐÐÐÑÑÐÐ\n"
+msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÑÐ %ld ÐÐÐÐÑÑÐÐÐ\n"
 
-#: applet/pilot.c:228
+#: ../applet/pilot.c:312
 #, c-format
 msgid "%s Synchronizing : %s"
 msgstr "%s ÐÐÐÑÑÐÐÐÐÐÑÐÑ: %s"
 
-#: applet/pilot.c:233
+#: ../applet/pilot.c:317
 #, c-format
 msgid "%s: Started\n"
-msgstr "%s: ÐÐÐÑÑÐÐÐ\n"
+msgstr "%s: ÐÐÐÑÑÐÐÐ\n"
 
-#: applet/pilot.c:247
+#: ../applet/pilot.c:332
 #, c-format
 msgid "%s Finished : %s"
-msgstr "%s: ÐÐÐÐÑÑÐÐÐ: %s"
+msgstr "%s: ÐÐÐÐÑÑÐÐÐ: %s"
 
-#: applet/pilot.c:252
+#: ../applet/pilot.c:337
 #, c-format
 msgid "%s: Ended\n"
-msgstr "%s: ÐÐÐÐÐÑÐÐÐ\n"
+msgstr "%s: ÐÐÐÐÐÑÐÐÐ\n"
 
-#: applet/pilot.c:277
-msgid "%v of %u records"
-msgstr ""
+#: ../applet/pilot.c:362
+#, c-format
+#| msgid "%v of %u records"
+msgid "%d of %d records"
+msgstr "%d ÐÐ %d ÐÐÐÐÑÐÐ"
+
+#: ../applet/pilot.c:382
+#, c-format
+#| msgid "Database %v of %u"
+msgid "Database %d of %d"
+msgstr "ÐÐÐÐ ÐÐÐÐÑÑ %d ÐÐ %d"
 
-#: applet/pilot.c:353
+#: ../applet/pilot.c:443
 msgid ""
-"Pilot is currently synchronizing.\n"
+"PDA is currently synchronizing.\n"
 "Please wait for it to finish."
 msgstr ""
-"Ð ÐÐÑÑÐÑÑÐÐ ÐÐÐÐÐÑ ÐÑÐÐÑÑÐÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ.\n"
-"ÐÐÐÐÐÑÐÑÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐÑ."
+"ÐÑÐÐÐÐÑÐÑÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐ.\n"
+"ÐÐÐÐÐÑÐÑÑÐ, ÐÐÐÐÐÑÐÑÑ ÐÐÐÐÑÑÐÐÐÑ."
 
-#: applet/pilot.c:356
+#: ../applet/pilot.c:448
 msgid "Not connected. Please restart daemon."
-msgstr "ÐÐ ÐÑÐÑÐÐÐÐÐÐÐ. ÐÐÐÐÐÑÐÑÑÐ ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐ."
+msgstr "ÐÐ ÐÐÐÐÐÑÑÐÐ. ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÑÐÑÐÐÑ."
 
-#: applet/pilot.c:358
+#: ../applet/pilot.c:452
 msgid ""
 "Not connected to gpilotd.\n"
 "Please restart daemon."
 msgstr ""
-"ÐÐ ÐÑÐÑÐÐÐÐÐÐÐ Ð gpilotd.\n"
-"ÐÐÐÐÐÑÐÑÑÐ ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐ."
+"ÐÐ ÐÐÐÐÐÑÑÐÐ Ð gpilotd.\n"
+"ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÑÐÑÐÐÑ."
 
-#: applet/pilot.c:373
-#, fuzzy
+#: ../applet/pilot.c:481
 msgid "gnome-pilot applet"
-msgstr "ÐÐÐÐÐÑ Gnome Pilot"
+msgstr "ÐÐÐÐÐÑ gnome-pilot"
 
-#: applet/pilot.c:375
-#, fuzzy
-msgid "Copyright 2000-2003 Free Software Foundation, Inc."
-msgstr "(C) 2000 ÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ"
+#: ../applet/pilot.c:483
+msgid "Copyright 2000-2006 Free Software Foundation, Inc."
+msgstr "(C) 2000-2006 ÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ"
 
-#: applet/pilot.c:376
-#, fuzzy
-msgid "A dnd and gui monitor for gpilotd.\n"
-msgstr ""
-"ÐÑÐÑÐÑÐÑÐÐÑ ÐÐÐÐÐÑÐÐ ÐÐÑ gpilotd.\n"
-"ÐÐÑÐÑÐÑÐ Web-ÑÑÑÐÐÐÑÑ http://www.gnome.org/gnome-pilot";
+#: ../applet/pilot.c:484
+msgid "A PalmOS PDA monitor.\n"
+msgstr "ÐÐÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐÐÐÑÐÑÐÐ PalmOS.\n"
 
-#: applet/pilot.c:472
+#: ../applet/pilot.c:582
+#: ../applet/pilot.c:609
 #, c-format
-msgid "cancelling %d"
-msgstr "ÐÑÐÐÐÐ %d"
+msgid "There was an error displaying help: %s"
+msgstr "ÐÑÐÐÐÐ ÐÑÐ ÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐÐ: %s"
 
-#: applet/pilot.c:524
+#: ../applet/pilot.c:695
 #, c-format
 msgid "Restoring %s"
 msgstr "ÐÐÑÑÑÐÐÐÐÐÐÐÐÐ %s"
 
-#: applet/pilot.c:566
+#: ../applet/pilot.c:738
 msgid "No directory to restore from."
 msgstr "ÐÐÑ ÐÐÑÐÐÐÐÐ ÐÐÑ ÐÐÑÑÑÐÐÐÐÐÐÐÐÑ."
 
-#: applet/pilot.c:574
+#: ../applet/pilot.c:750
 msgid ""
 "Press synchronize on the cradle to restore\n"
 " or cancel the operation."
 msgstr ""
-"ÐÐÐÐÐÑÐ \"ÐÐÐÑÑÐÐÐÐÐÐÐÑÑ\" ÐÐ ÐÐÐÑÐÐÐÑÐÐ ÐÐÑ ÐÐÑÑÑÐÐÐÐÐÐÐÐÑ\n"
+"ÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑ ÐÐÑÑÑÐÐÐÐÐÐÐÐÑ\n"
 "ÐÐÐ ÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ."
 
-#: applet/pilot.c:583
+#: ../applet/pilot.c:756
+#, c-format
+msgid "cancelling %d"
+msgstr "ÐÑÐÐÐÐ %d"
+
+#: ../applet/pilot.c:761
 msgid "Restore request failed"
 msgstr "ÐÐÐÑÐÑ ÐÐÑÑÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÑÑ"
 
-#: applet/pilot.c:621
+#: ../applet/pilot.c:802
 msgid ""
-"Pilot sync is currently in progress.\n"
+"PDA sync is currently in progress.\n"
 "Are you sure you want to restart daemon?"
 msgstr ""
-"Ð ÐÐÑÑÐÑÑÐÐ ÐÐÐÐÐÑ ÐÑÐÐÑÑÐÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ Pilot.\n"
-"ÐÑ ÐÐÐÑÑÐÐÑÐÐÑÐÐ ÑÐÑÐÑÐ ÐÐÑÐÐÐÐÑÑÑÐÑÑ ÐÐÐÐÐÐ?"
+"ÐÑÐÐÐÐÑÐÑÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐ.\n"
+"ÐÑ ÐÐÐÑÑÐÐÑÐÐÑÐÐ ÑÐÑÐÑÐ ÐÐÑÐÐÐÐÑÑÑÐÑÑ ÑÐÑÐÐÑ?"
 
-#: applet/pilot.c:631 applet/pilot.c:1160
+#: ../applet/pilot.c:817
+#: ../applet/pilot.c:1371
 msgid "Trying to connect to the GnomePilot Daemon"
 msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÐÑÑÐÐÐÑ Ð ÐÐÐÐÐÑ GnomePilot"
 
-#: applet/pilot.c:647
+#: ../applet/pilot.c:834
 msgid "There's no last sync on record."
-msgstr ""
+msgstr "ÐÐÑ ÑÐÐÐÐÐÐÐ Ð ÐÐÑÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ."
+
+#: ../applet/pilot.c:839
+#| msgid "Restore..."
+msgid "_Restore"
+msgstr "_ÐÐÑÑÑÐÐÐÐÐÑÑ"
+
+#: ../applet/pilot.c:840
+msgid "_Pause/Resume"
+msgstr "_ÐÑÐÐÑÑÐÐÐÐÐÑÑ/ÐÐÐÐÐÐÐÐÐÑÑ"
+
+#: ../applet/pilot.c:841
+#| msgid "Restart"
+msgid "R_estart"
+msgstr "_ÐÐÑÐÐÐÐÑÑÑÐÑÑ"
+
+#: ../applet/pilot.c:842
+msgid "_Log"
+msgstr "_ÐÑÑÐÐÐ"
+
+#: ../applet/pilot.c:843
+msgid "_Props"
+msgstr "_ÐÐÐÐÑÑÐÐ"
+
+#: ../applet/pilot.c:844
+#| msgid "Help"
+msgid "_Help"
+msgstr "_ÐÐÑÐÐÐÐ"
+
+#: ../applet/pilot.c:845
+#| msgid "About"
+msgid "_About"
+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:856
+msgid "Restore..."
+msgstr "ÐÐÑÑÑÐÐÐÐÐÐÐÐÐ..."
+
+#: ../applet/pilot.c:856
+msgid "Restart"
+msgstr "ÐÐÑÐÐÐÐÑÑÑÐÑÑ"
+
+#: ../applet/pilot.c:856
+msgid "Last log..."
+msgstr "ÐÐÑÐÐÐÐÐÐ ÐÑÑÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ..."
+
+#: ../applet/pilot.c:857
+msgid "Preferences..."
+msgstr "ÐÐÐÐÑÑÐÐ..."
+
+#: ../applet/pilot.c:857
+msgid "Help"
+msgstr "ÐÐÑÐÐÐÐ"
+
+#: ../applet/pilot.c:857
+msgid "About"
+msgstr "Ð ÐÑÐÐÑÐÐÐÐ..."
 
-#: applet/pilot.c:687
-#, fuzzy
+#: ../applet/pilot.c:870
 msgid "Continue"
-msgstr "ÐÑÐÐÐÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑ"
 
-#: applet/pilot.c:689
-#, fuzzy
+#: ../applet/pilot.c:872
 msgid "Pause Daemon"
-msgstr "ÐÑÐÐÑÑÐÐÐÐÐÑÑ ÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÑÑÐÐÐÐÐÑÑ ÑÐÑÐÐÑ"
 
-#: applet/pilot.c:709
-#, fuzzy
+#: ../applet/pilot.c:898
 msgid "Daemon paused..."
-msgstr "ÐÐÐÐÐ ÐÑÐÐÑÑÐÐÐÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÑÑÐÐÐÐÐÐÐÐ..."
 
-#: applet/pilot.c:849
+#: ../applet/pilot.c:1039
 msgid "Not connected. Restart daemon to reconnect"
-msgstr "ÐÐ ÐÑÐÑÐÐÐÐÐÐÐ. ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐ ÐÐÑ ÐÐÐÑÐÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐ ÐÐÐÐÐÑÑÐÐ. ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÑÐÑÐÐÑ ÐÐÑ ÐÐÐÐÐÑÑÐÐÐÑ"
 
-#: applet/pilot.c:1041
+#: ../applet/pilot.c:1210
 #, c-format
 msgid "Execution of %s failed"
 msgstr "ÐÑÐÐÐÐÐÐÐÐ %s ÐÐ ÑÐÐÐÐÑÑ"
@@ -215,272 +274,241 @@ msgstr "ÐÑÐÐÐÐÐÐÐÐ %s ÐÐ ÑÐÐÐÐÑÑ"
 #. g_message ("installing textfile as Memo (not implemented)");
 #. }
 #.
-#: applet/pilot.c:1118
-#, fuzzy, c-format
+#: ../applet/pilot.c:1336
+#, c-format
 msgid "installing \"%s\" to \"%s\""
-msgstr "ÑÑÑÐÐÐÐÐÐ \"%s\""
+msgstr "ÑÑÑÐÐÐÐÐÐ Â%s РÂ%sÂ"
 
-#: applet/pilot.c:1129
+#: ../applet/pilot.c:1346
 msgid "unknown dnd type"
 msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÑÐÐ dnd"
 
-#: applet/pilot.c:1137
-#, fuzzy
+#: ../applet/pilot.c:1354
 msgid "destroy gpilot-applet"
-msgstr "ÑÐÐÑÑÐÐÐÑÑ pilot_applet"
+msgstr "ÑÐÐÑÑÐÐÐÑÑ gpilot-applet"
 
-#: applet/pilot.c:1224
-msgid "Cannot find pilot-applet.glade"
-msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐ pilot-applet.glade"
-
-#: applet/pilot.schemas.in.h:1
+#: ../applet/pilot.schemas.in.h:1
 msgid "Command to execute when the applet is clicked"
-msgstr ""
+msgstr "ÐÐÐÐÐÐÐ, ÐÐÐÑÑÐÐÐÐÐÑ ÐÐ ÑÐÐÑÐÑ ÐÐ ÐÐÐÐÐÑÐ"
 
-#: applet/pilot.schemas.in.h:2
-#, fuzzy
+#: ../applet/pilot.schemas.in.h:2
 msgid "Display notices in popup windows"
-msgstr "ÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÑÐÐÐÐÐÐÑ"
+msgstr "ÐÑÐÐÑÐÑÐÐÐÐÐÐÑ Ð ÐÐÐÐÐ ÐÐÐÐ"
 
-#: capplet/gnome-pilot-capplet.c:211 capplet/gpilotd-capplet.glade.h:47
-msgid "Pilot Settings"
-msgstr "ÐÐÑÑÑÐÐÐÐ Pilot"
+#: ../capplet/gnome-pilot-capplet.c:228
+#: ../capplet/gpilotd-capplet.ui.h:76
+msgid "gnome-pilot Settings"
+msgstr "ÐÐÑÑÑÐÐÐÐ gnome-pilot"
 
-#: capplet/gnome-pilot-capplet.c:378 capplet/gnome-pilot-capplet.c:460
-#: capplet/gpilotd-capplet.glade.h:38
+#: ../capplet/gnome-pilot-capplet.c:395
+#: ../capplet/gnome-pilot-capplet.c:471
 msgid "Name"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
-#: capplet/gnome-pilot-capplet.c:380 capplet/gpilotd-capplet.glade.h:34
-#: 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:382
-msgid "UserName"
-msgstr "ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ"
-
-#: capplet/gnome-pilot-capplet.c:462 capplet/gpilotd-capplet.glade.h:49
-msgid "Port"
-msgstr "ÐÐÑÑ"
+#: ../capplet/gnome-pilot-capplet.c:399
+msgid "Owner"
+msgstr "ÐÐÐÑÐÐÐÐÑÐÐÑ"
 
-#: capplet/gnome-pilot-capplet.c:464 capplet/gpilotd-capplet.glade.h:55
-msgid "Speed"
-msgstr "ÐÐÐÑÐÑÑÑ"
-
-#: capplet/gnome-pilot-capplet.c:466 capplet/gpilotd-capplet.glade.h:60
+#: ../capplet/gnome-pilot-capplet.c:473
 msgid "Type"
 msgstr "ÐÐÐ"
 
-#: capplet/gnome-pilot-capplet.c:572
+#: ../capplet/gnome-pilot-capplet.c:575
 msgid "Conduit"
 msgstr "ÐÐÐÐÑÐÑ"
 
-#: capplet/gnome-pilot-capplet.c:574
+#: ../capplet/gnome-pilot-capplet.c:577
 msgid "Sync Action"
-msgstr "ÐÐÐÑÑÐÐÐÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑ"
+msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ"
 
-#: capplet/gnome-pilot-capplet.c:775
+#: ../capplet/gnome-pilot-capplet.c:791
 #, c-format
-msgid "Are you sure you want to delete %s pilot?"
-msgstr "ÐÑ ÑÐÐÑÐÐÑ, ÑÑÐ ÑÐÑÐÑÐ ÑÐÐÐÐÑÑ pilot %s?"
+msgid "Are you sure you want to delete PDA `%s'?"
+msgstr "ÐÑ ÐÐÐÑÑÐÐÑÐÐÑÐÐ ÑÐÑÐÑÐ ÑÐÐÐÐÑÑ ÐÐÐ Â%sÂ?"
 
-#: capplet/gnome-pilot-capplet.c:799
-msgid "_Edit this pilot..."
-msgstr "ÐÑÐÐÐÐ ÑÑÐÐÐ Pilot..."
+#: ../capplet/gnome-pilot-capplet.c:815
+msgid "_Edit this PDA..."
+msgstr "_ÐÐÐÐÐÐÑÑ ÐÐÐ..."
 
-#: capplet/gnome-pilot-capplet.c:800
-msgid "Edit the currently selected pilot"
-msgstr "ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐÐ Pilot"
+#: ../capplet/gnome-pilot-capplet.c:816
+msgid "Edit the currently selected PDA"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÐ ÐÐÐ"
 
-#: capplet/gnome-pilot-capplet.c:802
-msgid "_Delete this pilot"
-msgstr "ÐÐÐÐÐÑÑ ÑÑÐÑ Pilot"
+#: ../capplet/gnome-pilot-capplet.c:817
+msgid "_Delete this PDA"
+msgstr "_ÐÐÐÐÐÑÑ ÑÑÐÑ ÐÐÐ"
 
-#: capplet/gnome-pilot-capplet.c:803
-msgid "Delete the currently selected pilot"
-msgstr "ÐÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÐ Pilot"
+#: ../capplet/gnome-pilot-capplet.c:818
+msgid "Delete the currently selected PDA"
+msgstr "ÐÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÐ ÐÐÐ"
 
-#: capplet/gnome-pilot-capplet.c:938
-#, fuzzy, c-format
+#: ../capplet/gnome-pilot-capplet.c:970
+#, c-format
 msgid "Are you sure you want to delete %s device?"
-msgstr "ÐÑ ÑÐÐÑÐÐÑ, ÑÑÐ ÑÐÑÐÑÐ ÑÐÐÐÐÑÑ pilot %s?"
+msgstr "ÐÑ ÐÐÐÑÑÐÐÑÐÐÑÐÐ ÑÐÑÐÑÐ ÑÐÐÐÐÑÑ ÑÑÑÑÐÐÑÑÐÐ %s?"
 
-#: capplet/gnome-pilot-capplet.c:959
+#: ../capplet/gnome-pilot-capplet.c:991
 msgid "_Edit this device..."
-msgstr "ÐÑÐÐÐÐ ÑÑÐÐÐ ÑÑÑÑÐÐÑÑÐÐ..."
+msgstr "_ÐÐÐÐÐÐÑÑ ÑÑÐ ÑÑÑÑÐÐÑÑÐÐ..."
 
-#: capplet/gnome-pilot-capplet.c:960
+#: ../capplet/gnome-pilot-capplet.c:992
 msgid "Edit the currently selected device"
-msgstr "ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐÐ ÑÑÑÑÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÑÐÑÐÐÐÐÐ ÑÑÑÑÐÐÑÑÐÐ"
 
-#: capplet/gnome-pilot-capplet.c:962
+#: ../capplet/gnome-pilot-capplet.c:993
 msgid "_Delete this device"
-msgstr "ÐÐÐÐÐÑÑ ÑÑÐ ÑÑÑÑÐÐÑÑÐÐ"
+msgstr "_ÐÐÐÐÐÑÑ ÑÑÐ ÑÑÑÑÐÐÑÑÐÐ"
 
-#: capplet/gnome-pilot-capplet.c:963
+#: ../capplet/gnome-pilot-capplet.c:994
 msgid "Delete the currently selected device"
 msgstr "ÐÐÐÐÐÑÑ ÐÑÐÑÐÐÐÐÐ ÑÑÑÑÐÐÑÑÐÐ"
 
-#: capplet/gnome-pilot-capplet.c:1125
+#: ../capplet/gnome-pilot-capplet.c:1178
 #, c-format
 msgid "Unable to instantiate %s conduit."
-msgstr ""
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑ %s."
 
-#: capplet/gnome-pilot-capplet.c:1165
+#: ../capplet/gnome-pilot-capplet.c:1218
 msgid "_Enable this conduit"
-msgstr "ÐÐÐÑÑÐÑÑ ÑÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑ"
+msgstr "_ÐÐÐÑÑÐÑÑ ÑÑÐÑ ÐÐÐÐÑÐÑ"
 
-#: capplet/gnome-pilot-capplet.c:1166
+#: ../capplet/gnome-pilot-capplet.c:1219
 msgid "Disable the currently selected conduit"
 msgstr "ÐÑÐÐÑÑÐÑÑ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑ"
 
-#: capplet/gnome-pilot-capplet.c:1168
+#: ../capplet/gnome-pilot-capplet.c:1220
 msgid "_Disable this conduit"
-msgstr "ÐÑÐÐÑÑÐÑÑ ÑÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑ"
+msgstr "Ð_ÑÐÐÑÑÐÑÑ ÑÑÐÑ ÐÐÐÐÑÐÑ"
 
-#: capplet/gnome-pilot-capplet.c:1169
+#: ../capplet/gnome-pilot-capplet.c:1221
 msgid "Enable the currently selected conduit"
 msgstr "ÐÐÐÑÑÐÑÑ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑ"
 
-#: capplet/gnome-pilot-capplet.c:1174
+#: ../capplet/gnome-pilot-capplet.c:1222
+#: ../capplet/gpilotd-capplet.ui.h:72
 msgid "_Settings..."
-msgstr "ÐÑÑÐÐÐÐÐÐ..."
+msgstr "_ÐÐÑÑÑÐÐÐÐ..."
 
-#: capplet/gnome-pilot-capplet.c:1175
+#: ../capplet/gnome-pilot-capplet.c:1223
 msgid "Modify the currently selected conduit's settings"
-msgstr "ÐÐÐÐÐÐÑÑ ÑÑÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ"
 
 #. < 0) {
-#: capplet/gnome-pilot-cdialog.c:209
-msgid ""
-"Unable to create pilot settings window. Incorrect conduit configuration."
-msgstr ""
-"ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐ ÑÑÑÐÐÐÐÐÐ pilot. ÐÐÐÑÐÐÐÐÑÐÐÑ ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ."
+#: ../capplet/gnome-pilot-cdialog.c:204
+msgid "Unable to create PDA settings window. Incorrect conduit configuration."
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐ ÐÐÑÑÑÐÐÐ ÐÐÐ. ÐÐÐÐÑÐÐÑ ÐÐÐÑÐÐÑÑÐÑÐÑ ÐÐÐÐÑÐÑÐ."
 
-#: capplet/gnome-pilot-druid.c:411
+#: ../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?"
 msgstr ""
-"ÐÑÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐÐ Ð ÐÐÑÑÑÐÐÐÐ ÐÐ ÐÑÐÑÑ\n"
-"ÑÐÑÑÐÐÐÐÑ. ÐÑ ÑÐÐÑÐÐÑ, ÑÑÐ ÑÐÑÐÑÐ ÐÑÐÑÐ?"
+"ÐÐÐÑÐÐÑÑÐÑÐÑ ÐÐ ÐÐÐÐÑÑÐÐÐ Ð ÐÐÑÑÑÐÐÐÐ ÐÐ ÐÑÐÑÑ\n"
+"ÑÐÑÑÐÐÐÐÑ. ÐÑ ÐÐÐÑÑÐÐÑÐÐÑÐÐ ÑÐÑÐÑÐ ÐÑÐÑÐ?"
 
-#: capplet/gnome-pilot-druid.c:503
+#: ../capplet/gnome-pilot-assistant.c:723
 #, c-format
 msgid ""
-"About to send the following data to the pilot.\n"
-"UserName: %s\n"
-"ID: %d\n"
-"Please put pilot in %s (%s) and press HotSync button."
+"About to send the following data to the PDA.\n"
+"Owner Name: %s\n"
+"PDA ID: %d\n"
+"Please put PDA in %s (%s) and press HotSync button."
 msgstr ""
-"ÐÐÑ ÐÐÑÐÐÐÑÐ ÑÐÐÐÑÑÑÐÑ ÐÐÐÐÑÑ Ð pilot.\n"
+"ÐÐÐÐÑÑÑÐÐ ÐÐÐÐÑÐ ÐÑÐÑÑ ÐÐÑÐÐÐÐÑ ÐÐÐ\n"
 "ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ: %s\n"
-"ID: %d\n"
-"ÐÐÐÐÐÑÐÑÑÐ ÐÐÑÑÐÐÑÑÐ pilot Ð %s (%s) Ð ÐÐÐÐÐÑÐ ÐÐÐÐÐÑ \"HotSync\"."
+"ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÐ: %d\n"
+"ÐÐÐÐÐÑÐÑÑÐ, ÐÐÑÑÐÐÑÑÐ ÐÐÐ Ð %s (%s) Ð ÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÂHotSyncÂ."
+
+#: ../capplet/gnome-pilot-assistant.c:744
+#: ../capplet/gnome-pilot-assistant.c:765
+msgid "Failed sending request to gpilotd"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÐÐÐÑÐÑ Ð gpilotd"
 
-#. do get_from_pilot
-#: capplet/gnome-pilot-druid.c:525
+#: ../capplet/gnome-pilot-assistant.c:752
 #, c-format
 msgid ""
-"About to retrieve UserName and ID from the pilot.\n"
-"Please put pilot in %s (%s) and press HotSync button."
+"About to retrieve Owner Name and ID from the PDA.\n"
+"Please put PDA in %s (%s) and press HotSync button."
 msgstr ""
-"ÐÐÑ ÐÐÑÑÑÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ Ð ID ÐÐ pilot\n"
-"ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÑÐÑÐ pilot Ð %s (%s) Ð ÐÐÐÐÐÑÐ ÐÐÐÐÐÑ HotSync."
-
-#: capplet/gnome-pilot-druid.c:538
-msgid "Failed sending request to gpilotd"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÑÑ ÐÐÐÑÐÑ Ð gpilotd"
+"ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ Ð ÐÐÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐ\n"
+"ÐÐÐÐÑÑÐÑÐ ÑÑÑÑÐÐÑÑÐÐ Ð %s (%s) Ð ÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÂHotSyncÂ."
 
-#: capplet/gnome-pilot-druid.c:669
+#: ../capplet/gnome-pilot-assistant.c:936
 #, c-format
 msgid ""
-"Successfully retrieved UserName and ID from pilot.\n"
-"UserName: %s\n"
-"ID: %d"
+"Successfully retrieved Owner Name and ID from PDA.\n"
+"Owner Name: %s\n"
+"PDA ID: %d"
 msgstr ""
-"ÐÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ Ð ID ÐÐ pilot.\n"
+"ÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ Ð ID ÐÐ ÐÐÐ.\n"
 "ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ: %s\n"
-"ID: %d"
+"ÐÐÐÐÑÐÑÐÐÐÑÐÑ: %d"
 
-#: capplet/gnome-pilot-pdialog.c:371
+#: ../capplet/gnome-pilot-pdialog.c:438
 #, c-format
+msgid "Please put PDA in %s (%s) and press HotSync button or cancel the operation."
+msgstr "ÐÑÑÐÐÑÑÐ ÐÐÐ Ð %s (%s), ÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÂHotSync ÐÐÐ ÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ."
+
+#: ../capplet/gnome-pilot-pdialog.c:473
+msgid "The request to get PDA ID failed"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÐ"
+
+#: ../capplet/gnome-pilot-pdialog.c:512
+msgid "The request to set PDA ID failed"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÑÐÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÐ"
+
+#: ../capplet/gpilotd-capplet.ui.h:1
+msgid "<b>Conduit Actions</b>"
+msgstr "<b>ÐÐÐÑÑÐÐÑ ÐÐÐÐÑÐÑÐ</b>"
+
+#: ../capplet/gpilotd-capplet.ui.h:2
+msgid "<b>Conduit Settings</b>"
+msgstr "<b>ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ</b>"
+
+#: ../capplet/gpilotd-capplet.ui.h:3
+msgid "<b>PDA Attributes</b>"
+msgstr "<b>ÐÑÑÐÐÑÑÑ ÐÐÐ</b>"
+
+#: ../capplet/gpilotd-capplet.ui.h:4
+msgid "<b>PDA Identification</b>"
+msgstr "<b>ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÐ</b>"
+
+#: ../capplet/gpilotd-capplet.ui.h:5
 msgid ""
-"Please put pilot in %s (%s) and press HotSync button or cancel the operation."
+"<span weight=\"bold\" size=\"larger\">Which device should be used for this operation?</span>\n"
+"\n"
+"Since you have more than one connection device defined for this computer you need to identify which one is to be used for this operation."
 msgstr ""
-"ÐÐÐÐÐÑÐÑÑÐ, ÐÑÑÐÐÑÑÐ pilot Ð %s (%s) Ð ÐÐÐÐÐÑÐ ÐÐÐÐÐÑ HotSync ÐÐÐ ÐÑÐÐÐÐÑÐ "
-"ÐÐÐÑÑÐÐÐ."
-
-#: capplet/gnome-pilot-pdialog.c:407
-msgid "The request to get pilot id failed"
-msgstr "ÐÐÐÑÐÑ ÐÐ ÐÐÐÑÑÐÐÐÐ pilot id ÐÐ ÑÐÐÐÑÑ"
-
-#: capplet/gnome-pilot-pdialog.c:446
-msgid "The request to set pilot id failed"
-msgstr "ÐÐÐÑÐÑ ÐÐ ÑÑÑÐÐÐÐÐÑ pilot id ÐÐ ÑÐÐÐÑÑ"
-
-#: capplet/gpilotd-capplet.glade.h:2
-msgid "/dev/pilot"
-msgstr "/dev/pilot"
-
-#: capplet/gpilotd-capplet.glade.h:3
-#, fuzzy
-msgid "/dev/ttyS0"
-msgstr "/dev/pilot"
-
-#: capplet/gpilotd-capplet.glade.h:4
-#, fuzzy
-msgid "/dev/ttyS1"
-msgstr "/dev/pilot"
-
-#: capplet/gpilotd-capplet.glade.h:5
-#, fuzzy
-msgid "/dev/ttyS2"
-msgstr "/dev/pilot"
-
-#: capplet/gpilotd-capplet.glade.h:6
-#, fuzzy
-msgid "/dev/ttyS3"
-msgstr "/dev/pilot"
-
-#: capplet/gpilotd-capplet.glade.h:7
-#, fuzzy
-msgid "/dev/ttyqe"
-msgstr "/dev/pilot"
-
-#: capplet/gpilotd-capplet.glade.h:8
-#, fuzzy
-msgid "Action:"
-msgstr "ÐÐÐÑÑÐÐÐÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑ"
-
-#: capplet/gpilotd-capplet.glade.h:9
-msgid "Add..."
-msgstr "ÐÐÐÐÐÐÑÑ..."
-
-#: capplet/gpilotd-capplet.glade.h:10
+"<span weight=\"bold\" size=\"larger\">ÐÐÐÐÐ ÑÑÑÑÐÐÑÑÐÐ ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÑ ÑÑÐÐÐ ÐÐÐÑÑÐÐÑ?</span>\n"
+"\n"
+"ÐÐÑ ÑÑÐÐÐ ÐÐÐÐÑÑÑÐÑÐ ÐÐÑÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÐ ÑÑÑÑÐÐÑÑÐ ÐÐÐÐÐÑÑÐÐÐÑ. ÐÑÐÐÑÐÑÐ ÑÑÑÑÐÐÑÑÐÐ, ÐÐÑÐÑÐÐ ÑÐÐÐÑÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÑ ÑÑÐÐÐ ÐÐÐÑÑÐÐÑ."
+
+#: ../capplet/gpilotd-capplet.ui.h:8
+msgid "C_harset of PDA:"
+msgstr "ÐÐ_ÐÐÑÐÐÐÐ ÐÐÐ:"
+
+#: ../capplet/gpilotd-capplet.ui.h:9
+msgid "C_onduits"
+msgstr "_ÐÐÐÐÑÐÑÑ"
+
+#: ../capplet/gpilotd-capplet.ui.h:10
 msgid "Choose Device"
 msgstr "ÐÑÐÑÐÑÑ ÑÑÑÑÐÐÑÑÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:11
-#, fuzzy
-msgid "Conduit Actions"
-msgstr "ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐ"
+#: ../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:12
-msgid "Conduit Description"
-msgstr "ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÑÐ"
-
-#: capplet/gpilotd-capplet.glade.h:13
+#: ../capplet/gpilotd-capplet.ui.h:12
 msgid "Conduit Settings"
 msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ"
 
-#: capplet/gpilotd-capplet.glade.h:14
-#, fuzzy
-msgid "Conduits"
-msgstr "ÐÐÐÐÑÐÑ"
-
-#: capplet/gpilotd-capplet.glade.h:15
+#: ../capplet/gpilotd-capplet.ui.h:13
 msgid ""
 "Congratulations, gnome-pilot is configured!\n"
 "\n"
@@ -490,261 +518,361 @@ msgid ""
 "You can monitor syncing of gnome-pilot by adding \n"
 "PilotLink applet to your panel."
 msgstr ""
+"ÐÐÐÐÑÐÐÐÑÐÐ, ÐÐÑÑÑÐÐÐÐ gnome-pilot ÑÑÐÐÑÐÐ ÐÐÐÐÑÑÐÐÐ.\n"
+"\n"
+"ÐÐÑÐÐÐÑÑÑ ÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑ ÂPilotLink РÂÐÐÐÐÑÐÑÑ РÑÐÐÑÑÐ ÑÐÑÐÐÐÐÐÐÑ.\n"
+"\n"
+"ÐÐÑ ÐÐÐÐÑÐÐÐÐÑ ÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐ gnome-pilot ÐÐÐÐÐÑÑÐ ÐÐÐÐÐÑ PilotLink Ð ÐÐÐÐÑÑÑ ÑÐÐÐÐÐÐÐÐÐÐ."
+
+#: ../capplet/gpilotd-capplet.ui.h:20
+msgid "D_isable"
+msgstr "Ð_ÑÐÐÑÑÐÑÑ"
 
-#: capplet/gpilotd-capplet.glade.h:22
-msgid "Cradle Settings"
-msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐÐÑÐÐÐÑÐÐ"
+#: ../capplet/gpilotd-capplet.ui.h:21
+msgid "De_vices"
+msgstr "_ÐÑÑÑÐÐÑÑÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:23
-msgid "Delete"
-msgstr "ÑÐÐÐÐÑÑ"
+#: ../capplet/gpilotd-capplet.ui.h:22
+msgid "Description:"
+msgstr "ÐÐÐÑÐÐÐÐ:"
 
-#: capplet/gpilotd-capplet.glade.h:24
+#: ../capplet/gpilotd-capplet.ui.h:23
 msgid "Device Settings"
 msgstr "ÐÐÑÑÑÐÐÐÐ ÑÑÑÑÐÐÑÑÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:25
-msgid "Devices"
-msgstr "ÐÑÑÑÐÐÑÑÐÐ"
+#: ../capplet/gpilotd-capplet.ui.h:24
+msgid "Device:"
+msgstr "ÐÑÑÑÐÐÑÑÐÐ:"
 
-#: capplet/gpilotd-capplet.glade.h:26
-msgid "Disable"
-msgstr "ÐÑÐÐÑÑÐÐÐ"
+#: ../capplet/gpilotd-capplet.ui.h:25
+msgid "Enter Owner Name you want stored on your PDA"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ ÐÐÑ ÑÐÑÑÐÐÐÐÐÑ Ð ÐÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:27 capplet/util.c:88 capplet/util.c:418
-msgid "Disabled"
-msgstr "ÐÑÐÐÑÑÐÐÐ"
+#: ../capplet/gpilotd-capplet.ui.h:26
+msgid "Get the Owner's name and ID from the PDA"
+msgstr "ÐÐÐÑÑÐÑÑ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ Ð ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ ÐÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:28
-msgid "Edit..."
-msgstr "ÐÑÐÐÐÐ..."
+#: ../capplet/gpilotd-capplet.ui.h:27
+msgid "I_rDA"
+msgstr "I_rDA"
 
-#: capplet/gpilotd-capplet.glade.h:29
-msgid "Enable"
-msgstr "ÐÐÐÑÑÐÐÐ"
+#: ../capplet/gpilotd-capplet.ui.h:28
+msgid "Initial Sync"
+msgstr "ÐÐÑÐÐÐÐÑÐÐÑÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ"
 
-#: capplet/gpilotd-capplet.glade.h:30
-msgid "Enter user name you want stored on your pilot"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ, ÐÐÑÐÑÐÐ ÐÑ ÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑÑ Ð ÐÐÑÐÐ pilot"
+#: ../capplet/gpilotd-capplet.ui.h:29
+msgid "Net_work"
+msgstr "_ÐÐÑÑ"
 
-#: capplet/gpilotd-capplet.glade.h:31
-msgid "Get User Name and ID from existing pilot that was used before."
-msgstr ""
-"ÐÐÐÑÑÐÑÑ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ Ð ID Ñ ÑÑÑÐÑÑÐÑÑÑÐÐÐ pilot, ÐÑÐÐÐÑÐÐÐÐÐÑÐÐÐÑÑ "
-"ÑÐÐÐÐ."
+#: ../capplet/gpilotd-capplet.ui.h:30
+msgid "O_wner:"
+msgstr "_ÐÐÐÑÐÐÐÐÑÐÐÑ:"
 
-#: capplet/gpilotd-capplet.glade.h:32
-msgid "Get from pilot"
-msgstr "ÐÐÐÑÑÐÑÑ ÐÐ Pilot"
+#: ../capplet/gpilotd-capplet.ui.h:31
+msgid "Owner Name and ID to set on the PDA"
+msgstr "ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ Ð ID ÐÐÑ ÐÐÑÑÑÐÐÐÐ Ð ÐÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:33
-msgid "Gnome Pilot Settings"
-msgstr "ÐÐÑÑÑÐÐÐÐ Gnome Pilot"
+#: ../capplet/gpilotd-capplet.ui.h:32
+msgid "Owner:"
+msgstr "ÐÐÐÑÐÐÐÐÑÐÐÑ:"
 
-#: capplet/gpilotd-capplet.glade.h:35
-msgid "Initial Sync"
-msgstr "ÐÐÑÐÐÐÐÑÐÐÑÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ"
+#: ../capplet/gpilotd-capplet.ui.h:33
+msgid "PDA Attributes"
+msgstr "ÐÑÑÐÐÑÑÑ ÐÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:36 capplet/util.c:408
-msgid "IrDA"
-msgstr "IrDA"
+#: ../capplet/gpilotd-capplet.ui.h:34
+msgid "PDA Identification"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:37
-msgid "Local basedir"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐ"
+#: ../capplet/gpilotd-capplet.ui.h:35
+msgid "PDA Settings"
+msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:39 capplet/util.c:409
-msgid "Network"
-msgstr "ÐÐÑÑ"
+#: ../capplet/gpilotd-capplet.ui.h:36
+msgid "P_DA:"
+msgstr "_ÐÐÐ:"
 
-#: capplet/gpilotd-capplet.glade.h:40
-msgid "No, I've never used sync software with this pilot before."
-msgstr ""
-"ÐÐÑ, Ñ ÐÐÐÐÐÐÐ ÑÐÐÑÑÐ ÐÐ ÐÑÐÐÐÑÐÐÐÐÐ ÐÑÐÐÑÐÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐ Ñ ÑÑÐÐ pilot."
+#: ../capplet/gpilotd-capplet.ui.h:37
+msgid "Please fix the following problem..."
+msgstr "ÐÑÐÑÐÐÑÑÐ ÑÐÐÐÑÑÑÐÐ ÐÑÐÐÐÐÐÑ..."
 
-#: capplet/gpilotd-capplet.glade.h:41 capplet/util.c:129
-msgid "None"
+#: ../capplet/gpilotd-capplet.ui.h:38
+msgid "S_peed:"
+msgstr "_ÐÐÐÑÐÑÑÑ:"
+
+#: ../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.ui.h:40
+msgid "Set the root directory for all PDA files to be stored."
+msgstr "ÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐ ÐÐÑÐÐÐÐ ÐÐÑ ÑÐÑÑÐÐÐÐÐÑ ÑÐÐÐÐÐ ÐÐÐ."
+
+#: ../capplet/gpilotd-capplet.ui.h:41
+msgid "Success"
+msgstr "ÐÑÐÐÑÐÐ"
+
+#: ../capplet/gpilotd-capplet.ui.h:42
+msgid "The name for your PDA.  It is only used for identification."
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐÐ. ÐÑÐÐÐÑÐÑÐÑÑÑ ÑÐÐÑÐÐ ÐÐÑ ÐÐÐÐÑÐÑÐÐÐÑÐÐ."
+
+#: ../capplet/gpilotd-capplet.ui.h:43
+msgid "This integer ID identifies your PDA and must be unique between different PDAs that you use."
+msgstr "ÐÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑ ÐÐÐÐÑÐÑÐÐÐÑÐÐ ÐÐÐ."
+
+#: ../capplet/gpilotd-capplet.ui.h:44
+msgid "Ti_meout:"
+msgstr "_ÐÐÐÐÐÑÑ:"
+
+#: ../capplet/gpilotd-capplet.ui.h:45
+msgid "Welcome to gnome-pilot!"
+msgstr "ÐÐÐÑÐ ÐÐÐÐÐÐÐÐÑÑ Ð gnome-pilot"
+
+#: ../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"
+"You can always change any options later from\n"
+"PilotLink panel in Gnome Control Center.\n"
+"\n"
+"Press 'Forward' to continue.\n"
+"Press 'Cancel' to exit."
 msgstr ""
+"ÐÐÑÐÐÐ, ÐÑ ÐÐÐÑÑÑÐÐÐ gnome-pilot Ð ÐÐÑÐÑÐ ÑÐÐ.\n"
+"ÐÐÐÐÑÑÑÐÐ ÑÐÐÐ ÐÐÑÑÑÐÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ Ñ ÐÐÐÐÑÑÑ gnome-pilot.\n"
+"ÐÐÑÐÐÐÑÑÑ ÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÐÐÐÐÐ ÐÐ\n"
+"ÐÐÐÐÐÐ ÂPilotLink РÑÐÐÑÑÐ ÑÐÑÐÐÐÐÐÐÑ Gnome.\n"
+"\n"
+"ÐÐÐÐÐÑÐ ÂÐÐÐÐÐÂ ÐÐÑ ÐÑÐÐÐÐÐÐÐÐÑ.\n"
+"ÐÐÐÐÐÑÐ ÂÐÑÐÐÐÐÂ ÐÐÑ ÐÑÑÐÐÐ."
 
-#: capplet/gpilotd-capplet.glade.h:42
-#, fuzzy
-msgid "One Time Action:"
-msgstr "ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐ"
+#: ../capplet/gpilotd-capplet.ui.h:53
+msgid "_Action:"
+msgstr "_ÐÐÐÑÑÐÐÐ:"
 
-#: capplet/gpilotd-capplet.glade.h:43
-msgid "Pilot Attributes"
-msgstr "ÐÑÑÑÐÐÑÑÑ Pilot"
+#: ../capplet/gpilotd-capplet.ui.h:54
+msgid "_Add..."
+msgstr "_ÐÐÐÐÐÐÑÑ..."
 
-#: capplet/gpilotd-capplet.glade.h:44
-msgid "Pilot Identification"
-msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ Pilot"
+#: ../capplet/gpilotd-capplet.ui.h:55
+msgid "_Bluetooth"
+msgstr "_Bluetooth"
 
-#: capplet/gpilotd-capplet.glade.h:45
-msgid "Pilot Name"
-msgstr "ÐÐÐÐÐÐÐÐ Pilot"
+#: ../capplet/gpilotd-capplet.ui.h:56
+msgid "_Delete"
+msgstr "_ÐÐÐÐÐÑÑ"
 
-#: capplet/gpilotd-capplet.glade.h:46
-msgid "Pilot Name:"
-msgstr "ÐÐÐÐÐÐÐÐ Pilot:"
+#: ../capplet/gpilotd-capplet.ui.h:57
+msgid "_Device:"
+msgstr "_ÐÑÑÑÐÐÑÑÐÐ:"
 
-#: capplet/gpilotd-capplet.glade.h:48
-msgid "Pilots"
-msgstr "Pilot"
+#: ../capplet/gpilotd-capplet.ui.h:58
+msgid "_Edit..."
+msgstr "_ÐÑÐÐÐÐ..."
 
-#: capplet/gpilotd-capplet.glade.h:50
-msgid "Send to pilot"
-msgstr "ÐÐÑÐÐÑÑ Ð Pilot"
+#: ../capplet/gpilotd-capplet.ui.h:59
+msgid "_Enable"
+msgstr "_ÐÐÐÑÑÐÑÑ"
 
-#: capplet/gpilotd-capplet.glade.h:51 capplet/util.c:410
-msgid "Serial"
-msgstr "ÐÐÑÐÐÐÐÐÐÑÐÐÑÐÑÐ"
+#: ../capplet/gpilotd-capplet.ui.h:60
+msgid "_Get from PDA"
+msgstr "_ÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:52
-msgid "Set User Name and ID to a new pilot."
-msgstr "ÐÑÑÐÐÐÐÐÑÑ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ Ð ID ÐÐÑ ÐÐÐÐÐÐ pilot."
+#: ../capplet/gpilotd-capplet.ui.h:61
+msgid "_IrDA"
+msgstr "_IrDA"
 
-#: capplet/gpilotd-capplet.glade.h:53
-msgid "Set the root directory for all pilot files to be stored."
-msgstr "ÐÑÑÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐÐ ÐÐÑÐÐÐÐ ÐÐÑ ÑÐÑÑÐÐÐÐÐÑ ÐÑÐÑ ÑÐÐÐÐÐ pilot."
+#: ../capplet/gpilotd-capplet.ui.h:62
+msgid "_Local folder:"
+msgstr "_ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÐ:"
 
-#: capplet/gpilotd-capplet.glade.h:54
-msgid "Settings..."
-msgstr "ÐÑÑÐÐÐÐÐÐ..."
+#: ../capplet/gpilotd-capplet.ui.h:63
+msgid "_Name of PDA:"
+msgstr "_ÐÐÑ ÐÐÐ:"
 
-#: capplet/gpilotd-capplet.glade.h:56
-msgid "Success"
-msgstr "ÐÑÐÐÑÐÐ"
+#: ../capplet/gpilotd-capplet.ui.h:64
+msgid "_Name:"
+msgstr "_ÐÐÑ:"
 
-#: capplet/gpilotd-capplet.glade.h:57
-msgid "The name for your pilot. It is only used for identification."
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑ ÐÐÑÐÐÐ Pilot. ÐÑÐÐÐÑÐÑÐÑÑÑ ÑÐÐÑÐÐ ÐÐÑ ÐÐÐÐÑÐÑÐÐÐÑÐÐ."
+#: ../capplet/gpilotd-capplet.ui.h:65
+msgid "_No, I've never used sync software with this PDA before."
+msgstr "_ÐÐÑ, Ñ ÑÐÐÑÑÐ ÐÐ ÐÑÐÐÐÑÐÐÐÐÐ ÐÑÐÐÑÐÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐ Ñ ÑÑÐÐ ÐÐÐ."
 
-#: capplet/gpilotd-capplet.glade.h:58
-msgid ""
-"This integer ID identifies your pilot and must be unique between different "
-"pilots that you use."
-msgstr ""
-"ÐÑÐÑ ÑÐÐÐÑÐÑÐÐÐÐÑÐ ID ÐÐÑÐÐÐÐÑÐÑ ÐÐÑ pilot Ð ÐÐÐÐÐÐ ÐÑÑÑ ÑÐÐÐÐÐÑÐÑÐ ÐÐÑ ÐÑÐÑ "
-"ÐÑÐÐÐÑÐÑÐÐÑÑ ÐÐÐÐ ÑÑÑÑÐÐÑÑÐ pilot."
+#: ../capplet/gpilotd-capplet.ui.h:66
+msgid "_One time action:"
+msgstr "_ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ:"
 
-#: capplet/gpilotd-capplet.glade.h:59
-msgid "Timeout"
-msgstr "ÐÐÐÐÐÑÑ"
+#: ../capplet/gpilotd-capplet.ui.h:67
+msgid "_Owner:"
+msgstr "_ÐÐÐÑÐÐÐÐÑÐÐÑ:"
 
-#: capplet/gpilotd-capplet.glade.h:61 capplet/util.c:407
-msgid "USB"
-msgstr ""
+#: ../capplet/gpilotd-capplet.ui.h:68
+msgid "_PDA ID:"
+msgstr "ID _ÐÐÐ:"
 
-#: capplet/gpilotd-capplet.glade.h:62
-msgid "User Name"
-msgstr "ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ"
+#: ../capplet/gpilotd-capplet.ui.h:69
+msgid "_PDAs"
+msgstr "_ÐÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:63
-msgid "User Name and ID to set on the Pilot"
-msgstr "ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ Ð ID ÐÐÑ ÑÑÑÐÐÐÐÐÐ Ð Pilot."
+#: ../capplet/gpilotd-capplet.ui.h:70
+msgid "_Send to PDA"
+msgstr "Ð_ÑÐÑÐÐÐÑÑ Ð ÐÐÐ"
 
-#: capplet/gpilotd-capplet.glade.h:64
-msgid "User Name:"
-msgstr "ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ:"
+#: ../capplet/gpilotd-capplet.ui.h:71
+msgid "_Serial"
+msgstr "_ÐÐÑÐÐÐÐÐÐÑÐÐÑÐÑÐ"
 
-#: capplet/gpilotd-capplet.glade.h:65
-msgid "Welcome to gnome-pilot!"
-msgstr "ÐÐÐÑÐ ÐÐÐÐÐÐÐÐÑÑ Ð gnome-pilot!"
+#: ../capplet/gpilotd-capplet.ui.h:73
+msgid "_Type:"
+msgstr "_ÐÐÐ:"
 
-#: capplet/gpilotd-capplet.glade.h:66
-msgid "Yes, I've used sync software with this pilot before."
-msgstr "ÐÐ, Ñ ÐÑÐÐÐÑÐÐÐÐÐ ÑÐÐÑÑÐ ÐÑÐÐÑÐÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ Ñ ÑÑÐÐ pilot."
+#: ../capplet/gpilotd-capplet.ui.h:74
+msgid "_USB"
+msgstr "_USB"
 
-#: capplet/gpilotd-capplet.glade.h:67
-#, fuzzy
-msgid ""
-"You seem to be running gnome-pilot for the first time.\n"
-"The following steps will setup gnome-pilot for syncing. \n"
-"You can always change any options later from\n"
-"PilotLink panel in Gnome Control Center.\n"
-"\n"
-"Press 'Forward' to continue.\n"
-"Press 'Cancel' to exit."
-msgstr ""
-"ÐÐÐÐÐÐ ÐÑ ÐÐÐÑÑÑÐÐÐ gnome-pilot Ð ÐÐÑÐÑÐ ÑÐÐ.\n"
-"ÐÐÐÐÑÑÑÐÐ ÑÐÐÐ ÑÑÑÐÐÐÐÑÑ gnome-pilot ÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐ.\n"
-"ÐÑ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÑ ÐÑÐÑÐ ÐÐÑÐÐÐÑÑÑ ÐÐÐÐÐÐÐ ÐÐ\n"
-"ÐÐÐÐÐÐ PilotLink Ð ÐÐÐÑÑÐ ÑÐÑÐÐÐÐÐÐÑ Gnome.\n"
-"\n"
-"ÐÐÐÐÐÑÐ \"ÐÐÐÐÐ...\" ÐÐÑ ÐÑÐÐÐÐÐÐÐÐÑ.\n"
-"ÐÐÐÐÐÑÐ \"ÐÑÐÐÐÐ\" ÐÐÑ ÑÑÑÐÐÐÐÐÐ ÐÑÑÑÐÑÑ."
+#: ../capplet/gpilotd-capplet.ui.h:75
+msgid "_Yes, I've used sync software with this PDA before."
+msgstr "_ÐÐ, Ñ ÐÑÐÐÐÑÐÐÐÐÐ ÑÐÐÑÑÐ ÐÑÐÐÑÐÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐ Ñ ÑÑÐÐ ÐÐÐ."
 
-#: capplet/gpilotd-control-applet.c:81
-msgid "Start druid only"
-msgstr "ÐÐÐÑÑÑÐÑÑ ÑÐÐÑÐÐ druid"
+#: ../capplet/gpilotd-control-applet.c:84
+msgid " - configure gnome-pilot settings"
+msgstr "&mdash; ÑÐÑÐÐÐÐÐÐÐ ÐÐÑÑÑÐÐÐÐÐÐ gnome-pilot"
 
-#: capplet/gpilotd-control-applet.c:103
-msgid "Error initializing gpilotd capplet"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÑÐÐÐÐÐÐÑÐÐ gpilotd capplet"
+#: ../capplet/gpilotd-control-applet.c:86
+#: ../capplet/gpilotd-control-applet.c:95
+#, c-format
+msgid "Error initializing gpilotd capplet : %s"
+msgstr "ÐÑÐÐÐÐ ÐÐÐÑÐÐÐÐÐÐÑÐÐ ÑÐÑÐÐÐÑÑÑÐÐÐ ÐÐÐÐÐÑÐ gpilotd: %s"
 
-#: capplet/gpilotd-control-applet.c:114 capplet/gpilotd-control-applet.c:115
-msgid "Error loading pilot state, aborting"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÑÑÐÐÐ ÑÐÑÑÐÑÐÐÑ Pilot, ÐÑÐÑÐÐÐÐ"
+#: ../capplet/gpilotd-control-applet.c:101
+#: ../capplet/gpilotd-control-applet.c:102
+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 "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð ÐÐÐÐÐÑ GnomePilot"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð ÑÐÑÐÐÐ GnomePilot"
 
-#: capplet/gpilotd-control-applet.c:132
-msgid "Cannot run druid if pilots or cradles already configured"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÑÐÑÑ druid ÐÑÐÐ pilot ÐÐÐ ÐÐÐÑÐÐÐÑÐÐ ÑÐÐ ÐÐÑÑÑÐÐÐÑ"
-
-#: capplet/gpilotd-control-applet.desktop.in.h:1
+#: ../capplet/gpilotd-control-applet.desktop.in.in.h:1
 msgid "Configure PalmOS devices"
-msgstr ""
+msgstr "ÐÐÑÑÑÐÐÑÑ ÑÑÑÑÐÐÑÑÐÐ PalmOS"
 
-#: capplet/gpilotd-control-applet.desktop.in.h:2
-#, fuzzy
+#: ../capplet/gpilotd-control-applet.desktop.in.in.h:2
 msgid "PalmOS Devices"
-msgstr "Pilot ID"
+msgstr "ÐÑÑÑÐÐÑÑÐÐ PalmOS"
 
-#. Default to 57600
-#: capplet/util.c:36 capplet/util.c:399
-msgid "Use conduit settings"
-msgstr "ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ"
+#: ../capplet/pilot.c:116
+#, c-format
+msgid "Unable load key gpilotd/General/sync_PC_Id: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÑÑ gpilotd/General/sync_PC_Id: %s"
 
-#: capplet/util.c:37 capplet/util.c:392
-msgid "Synchronize"
-msgstr "ÐÐÐÑÑÐÐÐÐÐÐÐÑÑ"
+#: ../capplet/pilot.c:130
+#, c-format
+msgid "Unable load key gpilotd/General/progress_stepping: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÑÑ gpilotd/General/progress_stepping: %s"
 
-#: capplet/util.c:38 capplet/util.c:393
-msgid "Copy from pilot"
-msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÐÐ Pilot"
+#: ../capplet/pilot.c:164
+#, c-format
+msgid "Unable load key gpilotd/%s/type: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÑÑ gpilotd/%s/type: %s"
 
-#: capplet/util.c:39 capplet/util.c:394
-msgid "Copy to pilot"
-msgstr "ÐÐÐÐÐÑÐÐÐÑÑ Ð Pilot"
+#: ../capplet/pilot.c:186
+#, c-format
+msgid "Unable load key gpilotd/%s/name: iDevice, %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÑÑ gpilotd/%s/name: iDevice, %s"
 
-#: capplet/util.c:40 capplet/util.c:395
-msgid "Merge from pilot"
-msgstr "ÐÐÑÐÐÐÐÐÑÑ Ñ Pilot"
+#: ../capplet/pilot.c:204
+#, c-format
+msgid "Unable load key gpilotd/%s/speed: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÑÑ gpilotd/%s/speed: %s"
 
-#: capplet/util.c:41 capplet/util.c:396
-msgid "Merge to pilot"
-msgstr "ÐÐÑÐÐÐÐÐÑÑ Ð Pilot"
+#: ../capplet/pilot.c:213
+#, c-format
+msgid "Unable load key gpilotd/%s/timeout: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÑÑ gpilotd/%s/timeout: %s"
 
-#: capplet/util.c:95 capplet/util.c:420
+#: ../capplet/pilot.c:254
+#, c-format
+msgid "Unable load key gpilotd/%s/name: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÑÑ gpilotd/%s/name: %s"
+
+#: ../capplet/pilot.c:264
+#, c-format
+msgid "Unable load key gpilotd/%s/pilotid: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÑÑ gpilotd/%s/pilotid: %s"
+
+#: ../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:234
+#: ../capplet/util.c:180
+msgid "None"
+msgstr "ÐÐÑ"
+
+#: ../capplet/util.c:315
 msgid "You must have at least one device setup"
-msgstr "Ð ÐÐÑ ÐÐÐÐÐÐ ÐÑÑÑ ÑÑÑÐÐÐÐÐÐÐÐ ÑÐÑÑ ÐÑ ÐÐÐÐ ÑÑÑÑÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÐ ÐÑÑÑ ÐÐÑÑÑÐÐÐÐ ÑÐÑÑ ÐÑ ÐÐÐÐ ÑÑÑÑÐÐÑÑÐÐ"
+
+#: ../capplet/util.c:486
+msgid "Synchronize"
+msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÐÐÑÑ"
+
+#: ../capplet/util.c:487
+msgid "Copy from PDA"
+msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÐÐ ÐÐÐ"
 
-#: capplet/util.c:458
+#: ../capplet/util.c:488
+msgid "Copy to PDA"
+msgstr "ÐÐÐÐÐÑÐÐÐÑÑ Ð ÐÐÐ"
+
+#: ../capplet/util.c:489
+msgid "Merge from PDA"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÐ ÐÐÐ"
+
+#: ../capplet/util.c:490
+msgid "Merge to PDA"
+msgstr "ÐÐÐÐÐÐÑÑ Ð ÐÐÐ"
+
+#: ../capplet/util.c:493
+msgid "Use conduit settings"
+msgstr "ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ"
+
+#: ../capplet/util.c:501
+msgid "USB"
+msgstr "USB"
+
+#: ../capplet/util.c:502
+msgid "IrDA"
+msgstr "IrDA"
+
+#: ../capplet/util.c:503
+msgid "Network"
+msgstr "ÐÐÑÑ"
+
+#: ../capplet/util.c:504
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: ../capplet/util.c:505
+msgid "Serial"
+msgstr "ÐÐÑÐÐÐÐÐÐÑÐÐÑÐÑÐ"
+
+#: ../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:463
+#: ../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"
@@ -752,808 +880,825 @@ msgstr ""
 "ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐ ÑÑÑÐÑÑÐÑÐÑ, ÐÐ ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÐÐÐÐÐÐ.\n"
 "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐ ÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐ."
 
-#: capplet/util.c:470
+#: ../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"
+"Please verify the permitions on the specified path or choose another directory"
 msgstr ""
-"ÐÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐ.\n"
-"ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÐ ÐÑÑÐ ÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐ "
+"ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐ.\n"
+"ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐ ÐÐÑÑÑÐÐ ÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐ ÐÐÑÐÐÐÐ."
 
-#: capplet/util.c:475
+#: ../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:577
+#: ../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 ""
+"`%s' ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÐÑÑÑÐÐÑÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑÐÐ.\n"
+"ÐÐÐÐÐÑÐ ÐÐÐÑÑÑÐÐÑÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÐ ÐÑÐÐÑÐÑÐ ÐÐ ÐÐÑÑÑÐÐÑÑ ÐÐÑÐÐÐÑÑÐÐ."
+
+#: ../capplet/util.c:706
+msgid "Device 'usb:' is only valid for devices of type USB"
+msgstr "Âusb:Â ÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐÐÑÑ ÑÐÐÑÐÐ ÐÐÑ ÑÑÑÑÐÐÑÑÐ USB"
+
+#: ../capplet/util.c:714
 msgid "Read/Write permissions failed on"
-msgstr "ÐÑÐÐÐ ÐÐ ÑÑÐÐÐÐ/ÐÐÐÐÑÑ ÐÐÐÐÑÐÑ ÐÐÑ"
+msgstr "ÐÑÐÐÐÐ ÐÑÐÐ ÑÑÐÐÐÑ/ÐÐÐÐÑÐ ÐÐÑ"
 
-#: capplet/util.c:579
+#: ../capplet/util.c:716
 msgid "Check the permissions on the device and retry"
-msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐ Ð ÐÐÐÑÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐ ÐÐÑÑÑÐÐ Ð ÑÑÑÑÐÐÑÑÐÑ Ð ÐÐÐÑÐÑÐÑÐ ÐÐÐÑÑÐÑ"
 
-#: conduits/backup/backup_conduit.c:236
+#: ../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 "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÐÐÑÐÐÐÐ %s ÐÐÐ ÐÑÐÐÐÐÐÑÑ ÑÑÐÐÐÐ ÑÐÐÐÐ %s. ÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÑÑÐÐÐÐ usbfs ÐÐÐ sysfs."
+
+#: ../conduits/backup/backup_conduit.c:111
+#, c-format
+msgid "Unable load key backup-conduit/%s/updated_only: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÑÑ backup-conduit/%s/updated_only: %s"
+
+#: ../conduits/backup/backup_conduit.c:119
+#, c-format
+msgid "Unable load key backup-conduit/%s/remove_deleted: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÑÑ backup-conduit/%s/remove_deleted: %s"
+
+#: ../conduits/backup/backup_conduit.c:266
 msgid "Checking for removed databases"
-msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐÐÐÐÐÑ ÐÐÐ ÐÐÐÐÑÑ"
+msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐÐÑÐÐÑÑ ÐÐÐ ÐÐÐÐÑÑ"
 
 #. I18N note: this is printed when renaming a file %s
-#: conduits/backup/backup_conduit.c:243
+#: ../conduits/backup/backup_conduit.c:274
 #, c-format
 msgid "Renaming %s"
-msgstr "ÐÐÑÐÐÐÐÐÐÐÐÐÐÐ %s"
+msgstr "%s ÐÑÐÐÑ ÐÐÑÐÐÐÐÐÐÐÐÐ"
 
 #. I18N note: this message follow a "Renaming %s". The
 #. %s is a file name
-#: conduits/backup/backup_conduit.c:250
+#: ../conduits/backup/backup_conduit.c:282
 #, c-format
 msgid "to %s"
 msgstr "Ð %s"
 
-#: conduits/backup/backup_conduit.c:422 conduits/backup/backup_conduit.c:426
+#: ../conduits/backup/backup_conduit.c:457
+#: ../conduits/backup/backup_conduit.c:461
 #, c-format
 msgid "%s not modified since last sync"
-msgstr "%s ÐÐ ÐÑÐ ÐÐÐÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ"
+msgstr "%s ÐÐ ÐÐÐÐÐÑÐÑÑ ÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ"
 
-#: conduits/backup/backup_conduit.c:438 conduits/backup/backup_conduit.c:440
+#: ../conduits/backup/backup_conduit.c:473
+#: ../conduits/backup/backup_conduit.c:475
 #, c-format
 msgid "Making backup of %s"
-msgstr "ÐÐÐÐÑÐÐÑÐÐÐÐÐÐ %s"
+msgstr "ÐÑÐÐÐÐÑÐÑÑÑ ÑÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÐ %s"
 
-#: conduits/backup/backup_conduit.c:447 conduits/backup/backup_conduit.c:449
+#: ../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:646
+#: ../conduits/backup/backup_conduit.c:684
 msgid "Collecting restore information..."
-msgstr ""
+msgstr "ÐÐÐÑ ÐÐÑÐÑÐÐÑÐÐ ÐÐÑ ÐÐÑÑÑÐÐÐÐÐÐÐÐÑ..."
 
-#: conduits/backup/backup_conduit.c:770
+#: ../conduits/backup/backup_conduit.c:811
+msgid "_Backup directory:"
+msgstr "_ÐÐÐÐÑÐÐÑÐ ÐÐÑÐÐÐÐ:"
+
+#: ../conduits/backup/backup_conduit.c:825
 msgid "Backup directory"
 msgstr "ÐÐÐÐÑÐÐÑÐ ÐÐÑÐÐÐÐ"
 
-#: conduits/backup/backup_conduit.c:780
+#: ../conduits/backup/backup_conduit.c:827
+msgid "O_nly backup changed bases"
+msgstr "_ÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÑÐ ÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑ ÐÐÐÐÐÑÐÐÑÑ ÐÐÐ"
+
+#: ../conduits/backup/backup_conduit.c:837
 msgid "Only backup changed bases"
-msgstr "ÐÐÐÑÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÑÐ ÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑ ÐÐÐÐÐÑÐÐÑÑ ÐÐÐ"
+
+#: ../conduits/backup/backup_conduit.c:839
+msgid "_Remove local base if deleted on pilot"
+msgstr "_ÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐÑÑ ÐÐÐÑ ÐÑÐ ÑÐÐÐÐÐÐÐ Ð ÐÐÐ"
 
-#: conduits/backup/backup_conduit.c:787
+#: ../conduits/backup/backup_conduit.c:849
 msgid "Remove local base if deleted on pilot"
-msgstr "ÐÐÐÐÑÑÑ ÐÐÐÐÐÑÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐ Ð pilot"
+msgstr "ÐÐÐÐÑÑÑ ÐÐÐÐÐÑÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐ Ð ÐÐÐ"
 
-#: conduits/backup/backup_conduit.c:794
+#: ../conduits/backup/backup_conduit.c:851
+msgid "# of old backups to _keep"
+msgstr "_ÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÑÑ ÐÐÐÐÐ"
+
+#: ../conduits/backup/backup_conduit.c:862
 msgid "# of old backups to keep"
-msgstr "ÑÐÑÐÐ ÑÐÑÑÐÐÑÐÐÑÑ ÑÐÐÐÑÐÐÑÑ ÐÐÐÐÐ"
+msgstr "ÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÑÑ ÐÐÐÐÐ"
+
+#: ../conduits/backup/backup_conduit.c:900
+msgid ""
+"The specified backup directory exists but has the wrong permissions.\n"
+"Please fix or choose another directory"
+msgstr ""
+"ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐÑÐÐÐÐÐÑ ÑÑÑÐÑÑÐÑÐÑ, ÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐÑÑÑÐÐ ÐÐÐÐÑÐÑ.\n"
+"ÐÑÐÑÐÐÑÑÐ ÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐ ÐÐÑÐÐÐÐ."
+
+#: ../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"
+msgstr ""
+"ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐÑÐÐÐÐÐÑ ÑÑÑÐÑÑÐÑÐÑ, ÐÐ ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÐÐÐÐÐÐ.\n"
+"ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐ ÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐ."
+
+#: ../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 directory"
+msgstr ""
+"ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐÑÐÐÐÐÐÑ.\n"
+"ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐ ÐÐÑÑÑÐÐ ÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐ ÐÐÑÐÐÐÐ."
+
+#: ../conduits/backup/backup_conduit.c:917
+msgid ""
+"The path specified for the backup directory is invalid.\n"
+"Please choose another directory"
+msgstr ""
+"ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÑÑÑ Ð ÑÐÐÐÑÐÐÐÐÑ ÐÐÑÐÐÐÐÑ.\n"
+"ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐ ÐÐÑÐÐÐÐ"
 
-#: conduits/file/file_conduit.c:240 conduits/file/file_conduit.c:250
-#, fuzzy, c-format
+#: ../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 "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÐÑÑ evolution-data-server"
+
+#: ../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
+#| 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"
-msgstr "ÐÑÑÐÐÐÐÐÐ %s ÐÐ ÑÐÐÐÐÑÑ"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÑÐÐÐÐÐÑÑ %s"
 
-#: conduits/file/file_conduit.c:287
+#: ../conduits/file/file_conduit.c:290
 #, c-format
 msgid "Installing %s from %s..."
 msgstr "ÐÑÑÐÐÐÐÐÐ %s c %s..."
 
-#: conduits/file/file_conduit.c:289
+#: ../conduits/file/file_conduit.c:292
 #, c-format
 msgid "Installing %s..."
 msgstr "ÐÑÑÐÐÐÐÐÐ %s..."
 
-#: conduits/file/gpilot_install_file.c:44
+#: ../conduits/file/gpilot_install_file.c:41
 msgid "Install immediately"
-msgstr "ÐÑÑÐÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐ"
+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
-msgid "Pilot to install to"
-msgstr "ÐÐÐÐÑ ÐÐÑ ÑÑÑÐÐÐÐÐÐ"
+#: ../conduits/file/gpilot_install_file.c:43
+msgid "PDA to install to"
+msgstr "ÐÐÐ ÐÐÑ ÑÑÑÐÐÐÐÐÐ"
+
+#: ../conduits/file/gpilot_install_file.c:43
+msgid "PDA"
+msgstr "ÐÐÐ"
 
-#: conduits/file/gpilot_install_file.c:46
-msgid "PILOT"
-msgstr "ÐÐÐÐÑ"
+#: ../conduits/file/gpilot_install_file.c:44
+msgid "[FILE...]"
+msgstr "[ÐÐÐÐ...]"
 
-#: conduits/file/gpilot_install_file.c:118
-#: conduits/file/gpilot_install_file.c:119
-msgid "Unable to get pilot names"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÑ Pilot"
+#: ../conduits/file/gpilot_install_file.c:44
+msgid "list of files"
+msgstr "ÑÐÐÑÐÐ ÑÐÐÐÐÐ"
 
-#: conduits/file/gpilot_install_file.c:158
+#: ../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:113
+#: ../conduits/file/gpilot_install_file.c:114
+msgid "Unable to get PDA names"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÐ ÐÐÐ"
+
+#: ../conduits/file/gpilot_install_file.c:149
 msgid "Following files failed :\n"
-msgstr "ÐÐÐÐÑÑÑÐÐ ÑÐÐÐÑ ÐÐÐÑÐÐÐÐÐÑ:\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"
+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."
 msgstr ""
-"ÐÐÐÐÐÑÐ \"ÐÐÐÑÑÐÐÐÐÐÐÐÑÑ\" ÐÐ ÐÐÐÑÐÐÐÑÐÐ, ÑÑÐÐÑ ÑÑÑÐÐÐÐÐÑÑ\n"
+"ÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑ ÑÑÑÐÐÐÐÐÐ\n"
 "ÐÐÐ ÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ."
 
-#: gpilot-fileman/fileman.c:29 gpilot-fileman/fileman.c:646
-#, fuzzy
-msgid "Gnome Pilot File Manager"
-msgstr "ÐÐÑÑÑÐÐÐÐ Gnome Pilot"
-
-#: gpilot-fileman/fileman.c:31
-msgid "Copyright Manish and Neil Vachharajani (C) 1998"
-msgstr ""
-
-#: gpilot-fileman/fileman.c:34
-msgid ""
-"Manages files and applications on your Palm Pilot\n"
-"Palm Pilot is a Registered trademark of 3com Inc."
-msgstr ""
-
-#: gpilot-fileman/fileman.c:71
-#, fuzzy
-msgid "Really quit Gnome Pilot File Manager?"
-msgstr "ÐÐÑÑÑÐÐÐÐ Gnome Pilot"
-
-#: gpilot-fileman/fileman.c:173
-msgid "Hmm, this shouldn't happen, not enough filenames\n"
-msgstr ""
-
-#: gpilot-fileman/fileman.c:207 gpilot-fileman/fileman.c:366
-#, fuzzy
-msgid "Aborting..."
-msgstr "Ð ÐÑÐÐÑÐÐÐÐ..."
-
-#: gpilot-fileman/fileman.c:244
-#, fuzzy
-msgid "No files to install!!"
-msgstr "ÐÐÑ ÑÐÐÐÐÐ ÐÐÑ ÑÑÑÐÐÐÐÐÐ"
-
-#: gpilot-fileman/fileman.c:252
-#, fuzzy
-msgid "Install Progress"
-msgstr "ÐÑÑÐÐÐÐÐÑÑ ÑÐÐÐ"
-
-#: gpilot-fileman/fileman.c:256
-#, fuzzy
-msgid "Installing... "
-msgstr "ÐÑÑÐÐÐÐÐÐ %s..."
-
-#: gpilot-fileman/fileman.c:311 gpilot-fileman/fileman.c:476
-msgid "Press the Hot Sync button on your pilot now!"
-msgstr ""
-
-#: gpilot-fileman/fileman.c:442
-#, fuzzy
-msgid "Unable to open or create chosen name as a directory!"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÑÑ ÐÐÑÐÐÐÐ ÐÐÑÑÐÐÑÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐ ÑÐÐÐÐ"
-
-#: gpilot-fileman/fileman.c:452
-msgid "Chosen backup location is not a directory!"
-msgstr ""
-
-#: gpilot-fileman/fileman.c:463
-#, fuzzy
-msgid "Backup Progress"
-msgstr "ÐÐÐÐÑÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#: gpilot-fileman/fileman.c:465
-msgid "Backing up... "
-msgstr ""
-
-#: gpilot-fileman/fileman.c:484
-#, fuzzy
-msgid "Unable to open status pipe"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÐÐÑÑÑÑ Ñ Pilot"
-
-#: gpilot-fileman/fileman.c:495
-#, fuzzy
-msgid "Unable to open message pipe"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÑ Pilot"
-
-#: gpilot-fileman/fileman.c:506
-msgid "Unable to fork"
-msgstr ""
-
-#: gpilot-fileman/fileman.c:573
-#, fuzzy
-msgid "Backup Directory"
-msgstr "ÐÐÐÐÑÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#: gpilot-fileman/fileman.c:591
-#, fuzzy
-msgid "About"
-msgstr "Ð ÐÑÐÐÑÐÐÐÐ..."
-
-#: gpilot-fileman/fileman.c:591
-msgid "About the gpilot-fileman"
-msgstr ""
-
-#: gpilot-fileman/fileman.c:602
-#, fuzzy
-msgid "Install Files"
-msgstr "ÐÑÑÐÐÐÐÐÑÑ ÑÐÐÐ"
-
-#: gpilot-fileman/fileman.c:602
-msgid "Installs selected files to the connected Pilot"
-msgstr ""
-
-#: gpilot-fileman/fileman.c:608
-#, fuzzy
-msgid "Backup Pilot"
-msgstr "ÐÐÐÐÑÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#: gpilot-fileman/fileman.c:608
-msgid "Back's up selected files from the connected Pilot"
-msgstr ""
-
-#: gpilot-fileman/fileman.c:615
-#, fuzzy
-msgid "Properties"
-msgstr "ÐÐÐÐÑÑÐÐ..."
-
-#: gpilot-fileman/fileman.c:615
-#, fuzzy
-msgid "Properties for the Gnome Pilot File Manager"
-msgstr "ÐÐÑÑÑÐÐÐÐ Gnome Pilot"
-
-#: gpilot-fileman/fileman.c:623
-msgid "Quit"
-msgstr ""
-
-#: gpilot-fileman/fileman.c:623
-msgid "Quits the application"
-msgstr ""
-
-#: gpilot-fileman/fileman.c:631
-msgid "File"
-msgstr ""
-
-#: gpilot-fileman/fileman.c:632
-msgid "Help"
-msgstr ""
-
-#: gpilot-fileman/multifile.c:286
-msgid "Add ->"
-msgstr ""
-
-#: gpilot-fileman/multifile.c:287
-msgid "<- Remove"
-msgstr ""
-
-#: gpilot-fileman/multifile.c:288
-msgid "<- Remove All"
-msgstr ""
-
-#: gpilot-fileman/multifile.c:330
-msgid "Selected Files"
-msgstr ""
-
-#: gpilot-fileman/pilotfunc.c:88
-#, fuzzy
-msgid "Unable to bind to pilot\n"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÐÐÑÑÑÑ Ñ Pilot"
-
-#: gpilot-fileman/pilotfunc.c:113
-msgid "Exiting on cancel"
-msgstr ""
-
-#: gpilot-fileman/pilotfunc.c:119
-#, fuzzy, c-format
-msgid "Unable to open '%s'!"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÐÐÑÑÑÑ Ñ Pilot"
-
-#: gpilot-fileman/pilotfunc.c:124
-#, fuzzy, c-format
-msgid "Install failed %s."
-msgstr "ÐÑÑÐÐÐÐÐÑÑ ÑÐÐÐ"
-
-#: gpilot-fileman/pilotfunc.c:211
-msgid "Exiting on cancel, all data NOT backed up."
-msgstr ""
-
-#: gpilot-fileman/pilotfunc.c:246
-msgid "Failed, unable to create file\n"
-msgstr ""
-
-#: gpilot-fileman/pilotfunc.c:254
-msgid "Failed, unable to back up database\n"
-msgstr ""
+#: ../gpilotd/gnome-pilot-conduit-management.gob:683
+msgid "module loading not supported, fatal!"
+msgstr "ÐÐÐÑÑÐÐÐ ÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ!"
 
-#: gpilot-fileman/preferences.c:82
-#, fuzzy
-msgid "Pilot Device"
-msgstr "Pilot ID"
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:135
+msgid "deleted PDA record modified locally, not deleting\n"
+msgstr "ÑÐÐÐÑÐÐÐÑ ÐÐÐÐÑÑ ÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐ. ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÑ\n"
 
-#: gpilot-fileman/preferences.c:89
-msgid "Confirm on quit"
-msgstr ""
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:136
+msgid "deleted local record modified on PDA, not deleting\n"
+msgstr "ÑÐÐÐÑÐÐÐÑ ÐÐÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐ Ð ÐÐÐ. ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÑ\n"
 
-#: gpilot-fileman/preferences.c:118
-#, fuzzy
-msgid "General"
-msgstr "ÐÐÑÐÐÐÐÐÐÑÐÐÑÐÑÐ"
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:137
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:141
+msgid "merge conflict, PDA and local record swapped\n"
+msgstr "ÐÐÐÑÐÐÐÑ ÐÐÑÐÐÐÐÐÐÐÑ. ÐÐÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐÑÐ Ð ÐÐÐ.\n"
 
-#: gpilotd/GNOME_Pilot_Daemon.server.in.in.h:1
-#, fuzzy
-msgid "Gnome-Pilot daemon"
-msgstr "ÐÐÑÑÑÐÐÐÐ Gnome Pilot"
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:138
+msgid "archive and change conflict, PDA and local record swapped\n"
+msgstr "ÐÐÐÑÐÐÐÑ ÐÑÑÐÐÐÑÐÐÐÐÐÑ Ð ÐÐÐÐÐÐÐÐÑ. ÐÐÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐÑÐ Ð ÐÐÐ.\n"
 
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:63
-msgid "deleted pilot record modified locally, not deleting\n"
-msgstr ""
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:139
+msgid "archive and change conflict, local record sent to PDA\n"
+msgstr "ÐÐÐÑÐÐÐÑ ÐÑÑÐÐÐÑÐÐÐÐÐÑ Ð ÐÐÐÐÐÐÐÐÑ. ÐÐÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐ ÐÐÐ.\n"
 
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:64
-msgid "deleted local record modified on pilot, not deleting\n"
-msgstr ""
-
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:65
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:69
-msgid "merge conflict, pilot and local record swapped\n"
-msgstr ""
-
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:66
-msgid "archive and change conflict, pilot and local record swapped\n"
-msgstr ""
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:140
+msgid "archive and change conflict, PDA record saved locally\n"
+msgstr "ÐÐÐÑÐÐÐÑ ÐÑÑÐÐÐÑÐÐÐÐÐÑ Ð ÐÐÐÐÐÐÐÐÑ. ÐÐÐÐÑÑ ÐÐÐ ÑÐÑÑÐÐÐÐÐ ÐÐÐÐÐÑÐÐ.\n"
 
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:67
-msgid "archive and change conflict, local record sent to pilot\n"
-msgstr ""
-
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:68
-msgid "archive and change conflict, pilot record saved locally\n"
-msgstr ""
-
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:350
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:425
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:486
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:515
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:544
+#: ../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 "ÐÐÐÑÐÐÐÐÐÐÑÐÑ ÐÐÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÑÑ, ÐÐÐÑÐÑÐÑ ÐÑÐÑÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÐÐÐÑÐÑ ÐÐÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÑÑ, ÐÐÐÑÐÑÐÑ ÐÑÐÑÐÐÐÐ"
 
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:363
-msgid "Unable to delete all records in pilot database, aborting operation."
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÑÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÐÐÐÐÑÑ Pilot, ÐÐÐÑÐÑÐÑ ÐÑÐÑÐÐÐÐ."
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:470
+msgid "Unable to delete all records in PDA database, aborting operation."
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÑÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐ, ÐÐÐÑÐÑÐÑ ÐÑÐÑÐÐÐÐ."
 
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:374
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:948
+#: ../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:431
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:538
 msgid "Unable to delete all records in local database, aborting operation."
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÑÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÐÐÐÐÑÑ Pilot, ÐÐÐÑÐÑÐÑ ÐÑÐÑÐÐÐÐ."
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÑÐ ÐÐÐÐÑÐ Ð ÐÐÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÑ, ÐÐÐÑÐÑÐÑ ÐÑÐÑÐÐÐÐ."
 
-#: gpilotd/gnome-pilot-conduit-standard-abs.c:1349
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1472
 msgid "Error in conduit, newly added record could not be found"
-msgstr "ÐÑÐÐÐÐ Ð ÐÐÐÐÑÐÑÐ, ÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÑ ÐÐÐÐÑÑ ÐÐ ÐÐÐÐÑ ÐÑÑÑ ÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐ Ð ÐÐÐÐÑÐÑÐ: ÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÑ ÐÐÐÐÑÑ ÐÐ ÐÐÐÐÑ ÐÑÑÑ ÐÐÐÐÐÐÐ"
 
-#: gpilotd/gnome-pilot-conduit-sync-abs.c:487
-msgid "Copy to pilot failed!"
-msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ Ð Pilot!"
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:517
+msgid "Copy to PDA failed!"
+msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ Ð ÐÐÐ"
 
-#: gpilotd/gnome-pilot-conduit-sync-abs.c:511
-msgid "Copy from pilot failed!"
-msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ ÐÐ Pilot!"
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:541
+msgid "Copy from PDA failed!"
+msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ ÐÐ ÐÐÐ"
 
-#: gpilotd/gnome-pilot-conduit-sync-abs.c:535
-msgid "Merge to pilot failed!"
-msgstr "ÐÐÐÐ ÐÐÑÐÐÐÐÐÐÐÑ Ð Pilot!"
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:565
+msgid "Merge to PDA failed!"
+msgstr "ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÐÑ Ð ÐÐÐ"
 
-#: gpilotd/gnome-pilot-conduit-sync-abs.c:559
-msgid "Merge from pilot failed!"
-msgstr "ÐÐÐÐ ÐÐÑÐÐÐÐÐÐÐÑ ÐÐ Pilot!"
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:589
+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 "ÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ!"
+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\"."
+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"
 "Reason: \"%s\"."
 msgstr ""
 "GnomePilot ÐÐ ÑÐÐÐ ÐÑÐÑÑÑÑ ÑÑÑÑÐÐÑÑÐÐ %s (%s).\n"
-"ÐÑÐÑÐÐÐ: \"%s\""
+"ÐÑÐÑÐÐÐ: Â%sÂ."
+
+#: ../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 "ÐÑÑÑÐÐÑÑÐÐ Bluetooth [%s]: ÐÑÐÐÐÐ ÑÐÐÐÑÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐ: %d (ÑÐÐÐÐÑÐÑÑ, ÑÑÐ pilot-link ÑÐÐÐÐÐÐÐÑÐÐÐÐ Ñ ÐÐÐÐÐÑÐÐÐÐ Bluetooth)"
 
-#: gpilotd/gnome-pilot-structures.c:665 gpilotd/gnome-pilot-structures.c:716
-#: gpilotd/gnome-pilot-structures.c:744 gpilotd/gnome-pilot-structures.c:770
+#: ../gpilotd/gnome-pilot-structures.c:456
+#, c-format
+msgid "Device [%s, %s]: Unable to bind socket: err %d"
+msgstr "ÐÑÑÑÐÐÑÑÐÐ [%s, %s]: ÐÑÐÐÐÐ ÑÐÐÐÑÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐ: %d"
+
+#: ../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:785
+#: ../gpilotd/gnome-pilot-structures.c:666
 msgid "Number of devices is configured to 0"
-msgstr "ÐÐÑÐÐ ÑÑÑÑÐÐÑÑÐ ÑÐÐÐÑÐÐÑÑÐÑÐÐÐÐÐ ÐÐÐ 0"
+msgstr "ÐÐÑÐÐ ÑÑÑÑÐÐÑÑÐ ÐÐÑÐÐÐÐÐÐÐ ÐÐÐ 0"
 
-#: gpilotd/gnome-pilot-structures.c:787
+#: ../gpilotd/gnome-pilot-structures.c:668
 msgid ""
-"No cradles configure.\n"
+"No devices configured.\n"
 "Please run gpilotd-control-applet (use gnomecc)\n"
 "to configure gnome-pilot."
 msgstr ""
-"ÐÐÑ ÐÐÑÑÑÐÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐÐ.\n"
-"ÐÐÐÐÐÑÐÑÑÐ ÐÐÐÑÑÑÐÑÐ gpilotd-control-applet (ÐÑÐÐÐÑÐÑÑ gnomecc)\n"
-"ÑÑÐÐÑ ÐÐÑÑÑÐÐÑÑ gnome-pilot."
+"ÐÑÑÑÐÐÑÑÐÐ ÐÐ ÐÐÑÑÑÐÐÐÑ.\n"
+"ÐÐÑ ÐÐÑÑÑÐÐÐÐ gnome-pilot ÐÐÐÑÑÑÐÑÐ gpilotd-control-applet\n"
+"(ÐÑÐÐÐÑÐÑÑ gnomecc)."
 
-#: gpilotd/gnome-pilot-structures.c:808
+#: ../gpilotd/gnome-pilot-structures.c:689
 msgid "No accessible devices available"
-msgstr "ÐÐÑ ÐÐÐÑÐÐÑÑÐÑ ÐÐÑÑÑÐÐÑÑ ÑÑÑÑÐÐÑÑÐ"
+msgstr "ÐÐÑ ÐÐÑÑÑÐÐÑÑ ÑÑÑÑÐÐÑÑÐ"
 
-#: gpilotd/gnome-pilot-structures.c:823
-msgid "Number of pilots is configured to 0"
-msgstr "ÐÐÑÐÐ pilot ÑÐÐÐÑÐÐÑÑÐÑÐÐÐÐÐ ÐÐÐ 0"
+#: ../gpilotd/gnome-pilot-structures.c:708
+msgid "Number of PDAs is configured to 0"
+msgstr "ÐÐÑÐÐ ÐÐÐ-ÑÑÑÑÐÐÑÑÐ ÐÐÑÐÐÐÐÐÐÐ ÐÐÐ 0"
 
-#: gpilotd/gnome-pilot-structures.c:825
+#: ../gpilotd/gnome-pilot-structures.c:710
 msgid ""
-"No pilots configured.\n"
+"No PDAs configured.\n"
 "Please run gpilotd-control-applet (use gnomecc)\n"
 "to configure gnome-pilot."
 msgstr ""
-"ÐÐÑ ÑÐÐÐÑÐÐÑÑÐÑÐÐÐÐÐÑÑ pilot.\n"
-"ÐÐÐÐÐÑÐÑÑÐ ÐÐÐÑÑÑÐÑÐ gpilotd-control-applet (ÐÑÐÐÐÑÐÑÑ gnomecc)\n"
-"ÑÑÐÐÑ ÑÐÐÐÑÐÐÑÑÐÑÐÐÐÑÑ gnome-pilot."
+"ÐÐÑ ÐÐÑÑÑÐÐÐÐÑÑ ÐÐÐ.\n"
+"ÐÐÑ ÐÐÑÑÑÐÐÐÐ gnome-pilot ÐÐÐÑÑÑÐÑÐ gpilotd-control-applet\n"
+"(ÐÑÐÐÐÑÐÑÑ gnomecc)."
+
+#: ../gpilotd/gnome-pilot-structures.c:772
+#: ../gpilotd/gpilot-daemon.c:822
+#, c-format
+msgid "No pilot_charset specified.  Using `%s'."
+msgstr "ÐÐ ÐÐÐÐÐ pilot_charset. ÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑÑÑ Â%sÂ."
 
-#: gpilotd/gpilotd.c:173
-msgid "Unable to bind to pilot"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÐÐÑÑÑÑ Ñ Pilot"
+#: ../gpilotd/gpilot-daemon.c:373
+msgid "Unable to bind to PDA"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÑÑÐÐÐÑÑ ÐÐÐ"
 
-#: gpilotd/gpilotd.c:329
+#: ../gpilotd/gpilot-daemon.c:503
 #, c-format
-msgid "Unknown pilot, no userID/username match %ld"
-msgstr "ÐÐÐÐÐÐÑÑÐÑÐ Pilot, ÐÐÑ ID/ÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ ÑÐÐÐÐÐÐÑÑÐÐÐ Ñ %ld"
+msgid "Failed to connect using device `%s', on port `%s'.  Check your configuration, as you requested new-style libusb `usb:' syncing, but have the old-style `visor' kernel module loaded.  You may need to select a `ttyUSB...' device."
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ñ ÐÐÐÐÑÑÑ ÑÑÑÑÐÐÑÑÐÐ Â%s ÑÐÑÐÐ ÐÐÑÑ Â%sÂ. ÐÑÐÐÐÑÑÑÐ ÐÐÑÑÑÐÐÐÐ, ÑÐÐ ÐÐÐ ÐÑ ÐÐÐÑÐÑÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÑ libusb Âusb:Â, Ð ÑÐ ÐÑÐÐÑ ÐÐÐ ÐÐÐÑÑÐÐÐ ÑÑÐÑÑÐ ÐÐÐÑÐÑ ÑÐÑÐ ÂvisorÂ. ÐÐÐÐÐÐÐÐ, ÐÐÐÐ ÐÑÐÑÐÑÑ ÑÑÑÑÐÐÑÑÐÐ ÂttyUSBÂ."
 
-#: gpilotd/gpilotd.c:336
-msgid "Use gnomecc to configure pilot"
-msgstr ""
+#: ../gpilotd/gpilot-daemon.c:518
+#, c-format
+msgid "Failed to connect using device `%s', on port `%s'.  Check your configuration, as you requested old-style usbserial `ttyUSB' syncing, but do not have the usbserial `visor' kernel module loaded.  You may need to select a `usb:' device."
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ñ ÐÐÐÐÑÑÑ ÑÑÑÑÐÐÑÑÐÐ Â%s ÑÐÑÐÐ ÐÐÑÑ Â%sÂ. ÐÑÐÐÐÑÑÑÐ ÐÐÑÑÑÐÐÐÐ, ÑÐÐ ÐÐÐ ÐÑ ÐÐÐÑÐÑÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÑ usbserial ÂttyUSBÂ, Ð ÑÐ ÐÑÐÐÑ ÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐÐÑÐÑ ÑÐÑÐ Âvisor ÐÐ ÐÐÐÑÑÐÐÐ. ÐÐÐÐÐÐÐÐ, ÐÐÐÐ ÐÑÐÑÐÑÑ ÑÑÑÑÐÐÑÑÐÐ Âusb:Â."
+
+#: ../gpilotd/gpilot-daemon.c:608
+#, c-format
+msgid "Unknown PDA, no userID/username match %ld"
+msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐ, ÐÐÑ ID ÐÐÐ ÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ, ÑÐÐÐÐÐÐÑÑÐÐÐ Ñ %ld"
+
+#: ../gpilotd/gpilot-daemon.c:615
+msgid "Use gnomecc to configure PDA"
+msgstr "ÐÑÐÐÐÑÐÑÐÑÐ gnomecc ÐÐÑ ÐÐÑÑÑÐÐÐÐ ÐÐÐ"
 
 #. FIXME: here we should offer to create a profile for the pilot,
 #. bug # 8218
-#: gpilotd/gpilotd.c:341 gpilotd/gpilotd.c:546
+#: ../gpilotd/gpilot-daemon.c:620
 #, c-format
 msgid ""
-"Unknown pilot - no pilots matches ID %ld\n"
-"Use gnomecc to set pilot's ID"
+"Unknown PDA - no PDA matches ID %ld\n"
+"Use gnomecc to configure gnome-pilot"
 msgstr ""
-"ÐÐÐÐÐÐÑÑÐÑÐ pilot - ÐÐÑ ÐÐÐÐÑÐÐ Ñ ID ÑÐÐÐÐÐÐÑÑÐÐ Ñ %ld\n"
-"ÐÑÐÐÐÑÐÑÐÑÐ gnomecc ÑÑÐÐÑ ÑÑÑÐÐÐÐÐÑÑ pilot ID"
+"ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐ: ÐÐ ÑÐÐÑÐÐÑÑÑÐÑÐÑ ÐÐÐÐÑÐÑÐÐÐÑÐÑÑ %ld\n"
+"ÐÑÐÐÐÑÐÑÐÑÐ gnomecc ÐÐÑ ÐÐÑÑÑÐÐÐÐ gnome-pilot"
 
-#: gpilotd/gpilotd.c:365
+#: ../gpilotd/gpilot-daemon.c:645
 #, c-format
-msgid "Cradle %s has %d events"
-msgstr "ÐÐÐÑÐÐÐÑÐÐ %s ÐÐÐÐÑ %d ÑÐÐÑÑÐÐ"
+msgid "Device %s has %d events"
+msgstr "ÐÑÑÑÐÐÑÑÐÐ %s ÐÐÐÐÑ %d ÑÐÐÑÑÐÐ"
 
-#: gpilotd/gpilotd.c:377
+#: ../gpilotd/gpilot-daemon.c:658
 msgid "Setting userinfo..."
-msgstr "ÐÑÑÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ..."
+msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ..."
 
-#: gpilotd/gpilotd.c:382
+#: ../gpilotd/gpilot-daemon.c:670
 msgid "Sync continues"
 msgstr "ÐÑÐÐÐÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ"
 
-#: gpilotd/gpilotd.c:401
+#: ../gpilotd/gpilot-daemon.c:689
 msgid "Getting userinfo..."
 msgstr "ÐÐÐÑÑÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ..."
 
-#: gpilotd/gpilotd.c:463
-msgid "NetSync request detected, synchronizing pilot"
-msgstr "ÐÐÐÐÑÑÐÐÐ ÐÐÐÑÐÑ \"NetSync\", ÑÐÐÑÑÐÐÐÐÐÑÐÑ pilot"
+#: ../gpilotd/gpilot-daemon.c:751
+msgid "NetSync request detected, synchronizing PDA"
+msgstr "ÐÐÐÐÑÑÐÐÐ ÐÐÐÑÐÑ NetSync. ÐÑÐÐÐÐÑÐÑÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐ"
 
-#: gpilotd/gpilotd.c:465
-msgid "HotSync button pressed, synchronizing pilot"
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐ \"HotSync\", ÑÐÐÑÑÐÐÐÐÐÑÐÑ pilot"
+#: ../gpilotd/gpilot-daemon.c:753
+msgid "Bluetooth request detected, synchronizing PDA"
+msgstr "ÐÐÐÐÑÑÐÐÐ ÐÐÐÑÐÑ Bluetooth. ÐÑÐÐÐÐÑÐÑÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐ"
 
-#: gpilotd/gpilotd.c:467
+#: ../gpilotd/gpilot-daemon.c:755
+msgid "HotSync button pressed, synchronizing PDA"
+msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐ ÂHotSyncÂ. ÐÑÐÐÐÐÑÐÑÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐ"
+
+#: ../gpilotd/gpilot-daemon.c:757
 #, c-format
-msgid "Pilot ID is %ld, name is %s, owner is %s"
-msgstr "Pilot ID - %ld, ÐÐÐÐÐÐÐÐ - %s, ÐÐÐÐÐÐÐÑ - %s"
+msgid "PDA ID is %ld, name is %s, owner is %s"
+msgstr "ÐÐÐ ID &mdash; %ld, ÐÐÐÐÐÐÐÐ &mdash; %s, ÐÐÐÑÐÐÐÐÑÐÐÑ &mdash; %s"
 
-#: gpilotd/gpilotd.c:477
+#: ../gpilotd/gpilot-daemon.c:767
 #, c-format
 msgid "On host %s\n"
 msgstr "ÐÐ ÑÐÑÑ %s\n"
 
-#: gpilotd/gpilotd.c:479
+#: ../gpilotd/gpilot-daemon.c:769
 #, c-format
 msgid "On host %d\n"
 msgstr "ÐÐ ÑÐÑÑ %d\n"
 
-#: gpilotd/gpilotd.c:498
+#: ../gpilotd/gpilot-daemon.c:788
 msgid "Synchronization ended"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐÐÐÑÐÐÐ"
 
-#: gpilotd/gpilotd.c:501
+#: ../gpilotd/gpilot-daemon.c:791
 msgid "Synchronization ended early"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐÐÐÑÐÐÐÑÑ ÑÐÐÐ"
 
-#: gpilotd/gpilotd.c:533
+#: ../gpilotd/gpilot-daemon.c:836
+#, c-format
+msgid "`%s' is not a recognised iconv charset, using `%s' instead."
+msgstr "ÐÐ ÑÐÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐ iconv: Â%sÂ. ÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑÑÑ Â%sÂ."
+
+#: ../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"
-"ÐÑÐÑÐÐÑÑÐ ÐÐÐ ÐÐÐ ÐÑÐÐÐÑÐÑÐÑÐ gnomecc ÑÑÐÐÑ ÐÑÐÑÐÑÑ ÐÑÑÐÐÐ ÐÐÑÐÐÐÐ."
+"ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐ %s.\n"
+"ÐÑÐÑÐÐÑÑÐ ÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐ ÐÐÑÐÐÐÐ Ñ ÐÐÐÐÑÑÑ gnomecc."
+
+#: ../gpilotd/gpilot-daemon.c:871
+#, c-format
+msgid ""
+"Unknown PDA - no PDA matches ID %ld\n"
+"Use gpilotd-control-applet to set PDA's ID"
+msgstr ""
+"ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐ &mdash; ÐÐÑ ÐÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑÐÐ %ld\n"
+"ÐÐÑÑÑÐÐÑÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ Ñ ÐÐÐÐÑÑÑ gpilotd-control-applet"
 
 #. no ? drop connection then
-#: gpilotd/gpilotd.c:598
-#, fuzzy
-msgid "An error occured while getting the pilot's system data"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐÑÐÐÐÐÑÐÐÑ Pilot"
+#: ../gpilotd/gpilot-daemon.c:1003
+msgid "An error occurred while getting the PDA's system data"
+msgstr "ÐÑÐÐÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐ ÑÐÑÑÐÐÐÑÑ ÐÐÐÐÑÑ ÐÐÐ"
 
 #. no ? drop connection then
-#: gpilotd/gpilotd.c:603
-msgid "An error occured while getting the pilot's user data"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐÑÐÐÐÐÑÐÐÑ Pilot"
+#: ../gpilotd/gpilot-daemon.c:1010
+msgid "An error occurred while getting the PDA's user data"
+msgstr "ÐÑÐÐÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐÑÐÐÐÐÑÐÐÑ ÐÐÐ"
 
-#: gpilotd/gpilotd.c:608
+#: ../gpilotd/gpilot-daemon.c:1015
 #, c-format
-msgid "Completed events for cradle %s (%s)"
-msgstr "ÐÐÐÐÑÑÐÐÐÑÐ ÑÐÐÑÑÐÑ ÐÐÑ ÐÐÐÑÐÐÐÑÐÐ %s (%s)"
+msgid "Completed events for device %s (%s)"
+msgstr "ÐÐÐÐÑÑÐÐÑ ÑÐÐÑÑÐÑ ÐÐÑ ÑÑÑÑÐÐÑÑÐÐ %s (%s)"
 
-#: gpilotd/gpilotd.c:656 gpilotd/gpilotd.c:740
+#: ../gpilotd/gpilot-daemon.c:1080
 #, c-format
 msgid "Woke on %s"
 msgstr "ÐÑÐÐÑÐÐÐÐÐÐ Ð %s"
 
-#: gpilotd/gpilotd.c:977
-#, fuzzy, c-format
-msgid "Watching %s (%s, %s)"
-msgstr "ÐÐÐÑÑÐ %s (%s)"
+#: ../gpilotd/gpilot-daemon.c:1161
+#, c-format
+msgid "Woke on network: %s"
+msgstr "ÐÑÐÐÑÐÐÐÐÐÐ Ð ÑÐÑÐ: %s"
 
-#: gpilotd/gpilotd.c:979
+#: ../gpilotd/gpilot-daemon.c:1431
+#, c-format
+msgid "Watching %s (network)"
+msgstr "ÐÐÐÐÑÐÐÐÐÐ ÐÐ %s (ÑÐÑÑ)"
+
+#: ../gpilotd/gpilot-daemon.c:1433
+#, c-format
+msgid "Watching %s (bluetooth)"
+msgstr "ÐÐÐÐÑÐÐÐÐÐ ÐÐ %s (bluetooth)"
+
+#: ../gpilotd/gpilot-daemon.c:1435
 #, c-format
 msgid "Watching %s (%s)"
-msgstr "ÐÐÐÑÑÐ %s (%s)"
+msgstr "ÐÐÐÐÑÐÐÐÐÐ ÐÐ %s (%s)"
+
+#: ../gpilotd/gpilot-daemon.c:1567
+msgid "Shutting down devices"
+msgstr "ÐÑÐÐÑÑÐÐÐÐ ÑÑÑÑÐÐÑÑÐ"
 
-#: gpilotd/gpilotd.c:992
+#: ../gpilotd/gpilot-daemon.c:1569
+msgid "Rereading configuration..."
+msgstr "ÐÐÐÑÐÑÐÐÐ ÑÑÐÐÐÐ ÐÐÐÑÐÐÑÑÐÑÐÐ..."
+
+#: ../gpilotd/gpilot-daemon.c:2482
+msgid "(unknown DB)"
+msgstr "(ÐÐÐÐÐÐÑÑÐÐÑ ÐÐÐÐ ÐÐÐÐÑÑ)"
+
+#: ../gpilotd/gpilotd.c:54
 msgid "Exiting (caught SIGTERM)..."
 msgstr "ÐÐÐÐÑÑÐÐÐÐ (ÐÐÐÑÑÐÐ SIGTERM)..."
 
-#: gpilotd/gpilotd.c:1000
+#: ../gpilotd/gpilotd.c:62
 msgid "Exiting (caught SIGINT)..."
 msgstr "ÐÐÐÐÑÑÐÐÐÐ (ÐÐÐÑÑÐÐ SIGINT)..."
 
-#: gpilotd/gpilotd.c:1055
-#, c-format
-msgid "Unable to open or create file %s with read/write privs"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐ %s Ñ ÐÑÐÐÐÐÐ ÐÐ ÑÑÐÐÐÐ/ÐÐÐÐÑÑ"
-
-#: gpilotd/gpilotd.c:1061
-#, c-format
-msgid "Unable to find home directory for uid %d"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÐÐÐ ÐÐÑ UID %d"
-
-#: gpilotd/gpilotd.c:1065
+#: ../gpilotd/gpilotd.c:93
 msgid "Unable to create file installation queue directory"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÑÑ ÐÐÑÐÐÐÐ ÐÐÑÑÐÐÑÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐ ÑÐÐÐÐ"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐ ÐÑÐÑÐÐÐ ÑÑÑÐÐÐÐÐÐ ÑÐÐÐÐÐ"
 
-#: gpilotd/gpilotd.c:1090
-msgid "Shutting down devices"
-msgstr "ÐÑÐÐÑÑÐÐÐÐ ÑÑÑÑÐÐÑÑÐ"
+#: ../gpilotd/gpilotd.c:209
+msgid "gpilotd already running; exiting ...\n"
+msgstr "gpilotd ÑÐÐ ÐÐÐÑÑÐÐ; ÐÑÑÐÐ ...\n"
 
-#: gpilotd/gpilotd.c:1092
-msgid "Rereading configuration..."
-msgstr "ÐÐÑÐÑÐÑÑÐÐÐÐÐ ÐÐÐÑÐÐÑÑÐÑÐÐ..."
-
-#: gpilotd/manager.c:265
+#: ../gpilotd/manager.c:270
 msgid "non-backup conduit in backup conduit list"
-msgstr "ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑÐÐÐÐÐÐÐÐÑ Ð ÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐÑÑÑÐÐÐÐÐÐÐÐÑ"
+msgstr "Ð ÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐ ÑÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ ÐÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑ ÐÑÑÐÐÐÐ ÑÐÐÐ"
 
-#: gpilotd/manager.c:273
+#: ../gpilotd/manager.c:278
 #, c-format
 msgid "%s backed up\n"
-msgstr ""
+msgstr "ÐÐÐÐÑÐÐÐÑ ÐÐÐÐÑ %s ÑÐÐÐÐÐÐ\n"
 
-#: gpilotd/manager.c:275
-#, fuzzy, c-format
+#: ../gpilotd/manager.c:280
+#, c-format
 msgid "%s backup failed\n"
-msgstr "ÐÐÐÐÑÐÐÑÐÐÐÐÐÐ %s ÐÐ ÑÐÐÐÐÑÑ!"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐÑÐÐÑÑ ÐÐÐÐÑ %s\n"
 
-#: gpilotd/manager.c:300
-#, fuzzy
+#: ../gpilotd/manager.c:306
 msgid "Collecting synchronization info..."
-msgstr "ÐÐÐÐÑÐÑ %s ÐÐÑÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ..."
+msgstr "ÐÑÐÐÐÐÑÐÑÑÑ ÑÐÐÑ ÑÐÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ..."
 
-#: gpilotd/manager.c:408
+#: ../gpilotd/manager.c:420
 #, c-format
 msgid "Synchronizing %s\n"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ %s\n"
 
-#: gpilotd/manager.c:427
-#, fuzzy, c-format
-msgid "Copy to pilot %s\n"
-msgstr "ÐÐÐÐÐÑÐÐÐÑÑ Ð Pilot"
+#: ../gpilotd/manager.c:439
+#, c-format
+msgid "Copy to PDA %s\n"
+msgstr "ÐÐÐÐÐÑÐÐÐÑÑ Ð ÐÐÐ %s\n"
 
-#: gpilotd/manager.c:445
-#, fuzzy, c-format
-msgid "Copy from pilot %s\n"
-msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÐÐ Pilot"
+#: ../gpilotd/manager.c:457
+#, c-format
+msgid "Copy from PDA %s\n"
+msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÐÐ ÐÐÐ %s\n"
 
-#: gpilotd/manager.c:463
-#, fuzzy, c-format
-msgid "Merge to pilot %s\n"
-msgstr "ÐÐÑÐÐÐÐÐÑÑ Ð Pilot"
+#: ../gpilotd/manager.c:475
+#, c-format
+msgid "Merge to PDA %s\n"
+msgstr "ÐÐÐÐÐÐÑÑ Ð ÐÐÐ %s\n"
 
-#: gpilotd/manager.c:481
-#, fuzzy, c-format
-msgid "Merge from pilot %s\n"
-msgstr "ÐÐÑÐÐÐÐÐÑÑ Ñ Pilot"
+#: ../gpilotd/manager.c:493
+#, c-format
+msgid "Merge from PDA %s\n"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÐ ÐÐÐ %s\n"
 
-#: gpilotd/manager.c:509
+#: ../gpilotd/manager.c:521
 #, c-format
 msgid "Conduit %s's first synchronization..."
-msgstr "ÐÐÐÐÑÐÑ %s ÐÐÑÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ..."
+msgstr "ÐÐÑÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐÐÑÐÑÐ %s..."
 
-#: gpilotd/manager.c:533
+#: ../gpilotd/manager.c:545
 #, c-format
 msgid "unknown syncing action (%d = %s).\n"
-msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÑÐÐÑÑÐÐÐÐÑÑÑÐÐ ÐÐÐÑÑÐÐÐ (%d = %s).\n"
+msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÑÑÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ (%d = %s).\n"
 
-#: gpilotd/manager.c:659
+#: ../gpilotd/manager.c:671
 #, c-format
 msgid "Instantiating %d conduits..."
-msgstr "ÐÑÑÐÐÐÐÐÐ %d ÐÐÐÐÑÐÑÐÐ..."
+msgstr "ÐÐÐÐÐÐÐÐ %d ÐÐÐÐÑÐÑÐÐ..."
 
-#: gpilotd/manager.c:664 gpilotd/manager.c:665
+#: ../gpilotd/manager.c:676
+#: ../gpilotd/manager.c:677
 #, c-format
 msgid "Unknown conduit \"%s\" in configure!"
-msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÑ \"%s\" Ð ÐÐÑÑÑÐÐÐÐÑ!"
+msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÑ Â%s РÐÐÑÑÑÐÐÐÐÑ!"
 
-#: gpilotd/manager.c:674
+#: ../gpilotd/manager.c:686
 #, c-format
 msgid "Loading conduit \"%s\" failed!"
-msgstr "ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐ \"%s\" ÐÐ ÑÐÐÐÐÑÑ!"
+msgstr "ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐ Â%s ÐÐ ÑÐÐÐÐÑÑ!"
 
-#: gpilotd/manager.c:675
+#: ../gpilotd/manager.c:687
 #, c-format
 msgid "Loading conduit \"%s\" failed!\n"
-msgstr "ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐ \\\"%s\\\" ÐÐ ÑÐÐÐÐÑÑ!\n"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÐÐÑÐÑ Â%sÂ!\n"
 
-#: gpilotd/manager.c:764
-#, fuzzy, c-format
-msgid "Setting user/id to %d/%s..."
-msgstr "ÐÑÑÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ..."
+#: ../gpilotd/manager.c:777
+#, c-format
+msgid "Setting id/owner to %d/%s..."
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ Ð ÐÐÐÑÐÐÐÐÑÐÐÑ ÐÑÐÑÑ ÐÐÑÐÐÐÐÐÐÑ ÐÐÐ %d/%s..."
 
 #. FIXME: remove the bloody request, or the user will get this
 #. message every time
-#: gpilotd/manager.c:796
+#: ../gpilotd/manager.c:809
 #, c-format
-msgid "Conduit %s requested, but not found"
-msgstr "ÐÐÐÐÑÐÑ %s ÐÐÐÑÐÑÐÐ, ÐÐ ÐÐ ÐÐÐÐÐÐ"
+#| msgid "Conduit %s requested, but not found"
+msgid "Conduit %s requested, but not found.  Is it enabled?"
+msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐÐÑÐÑ %s , ÐÐ ÐÐ ÐÐ ÐÐÐÐÐÐ. ÐÑÐÐÐÑÑÑÐ, ÐÐÐÑÑÑÐ ÐÐ ÐÐ?"
 
-#: gpilotd/manager.c:806
+#: ../gpilotd/manager.c:819
 #, c-format
 msgid "Conduit %s cannot be requested"
 msgstr "ÐÐÐÐÑÐÑ %s ÐÐ ÐÐÐÐÑ ÐÑÑÑ ÐÐÐÑÐÑÐÐ"
 
-#: gpilotd/orbit_daemon_glue.c:1753
-msgid "(unknown DB)"
-msgstr "(ÐÐÐÐÐÐÑÑÐÐÑ ÐÐÐÐ ÐÐÐÐÑÑ)"
-
-#: gpilotd/queue_io.c:96
+#: ../gpilotd/queue_io.c:104
 msgid "Error in queue, non-existing entry"
-msgstr ""
+msgstr "ÐÑÐÐÐÐ Ð ÐÑÐÑÐÐÐ: ÐÐÑÑÑÐÑÑÐÑÑÑÐÑ ÐÐÐÐÑÑ."
 
-#: gpilotd/queue_io.c:436
+#: ../gpilotd/queue_io.c:454
 #, c-format
-msgid "fault: no request found for pilot %d, request %d"
-msgstr "ÑÐÐÐ: ÐÐ ÐÐÐÐÐÐ ÐÐÐÑÐÑ ÐÐÑ Pilot %d, ÐÐÐÑÐÑ %d"
-
-#: libgpilotdCM/gnome-pilot-conduit-management.gob:656
-msgid "module loading not supported, fatal!"
-msgstr "ÐÐÐÑÑÐÐÐ ÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ!"
+msgid "fault: no request found for PDA %d, request %d"
+msgstr "ÐÑÐÐÐÐ: ÐÐ ÐÐÐÐÐÐ ÐÐÐÑÐÑ ÐÐÑ ÐÐÐ %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 "ÐÑÐÐÑÑÐÐÐÐÐÑÑ ÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÑÑÐÐÐÐÐÑÑ ÑÐÑÐÐÑ"
 
-#: utils/gpilotd-client.c:41
+#: ../utils/gpilotd-client.c:40
 msgid "Unpause daemon"
-msgstr "ÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÑÑ ÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÑÑ ÑÐÑÐÐÑ"
 
-#: utils/gpilotd-client.c:42
+#: ../utils/gpilotd-client.c:41
 msgid "Restart daemon"
-msgstr "ÐÐÑÐÐÐÐÑÑÑÐÑÑ ÐÐÐÐÐÐ"
+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
-msgid "ID for the pilot"
-msgstr "ID ÐÐÑ Pilot"
+#: ../utils/gpilotd-client.c:43
+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 "ÐÐÐÐ"
 
-#: 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:27
+#: ../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 pilots actions"
-msgstr "ÐÑÑÐÐÐÐÐÐÑÑ ÑÐÐÐÐÐÐÑÐ ÐÐÐÑÑÐÐÑ Pilot"
-
-#: utils/gpilotd-client.c:50
-msgid "Monitor all pilots"
-msgstr "ÐÑÑÐÐÐÐÐÐÑÑ ÐÑÐ Pilot"
+#: ../utils/gpilotd-client.c:48
+msgid "Monitor all PDAs"
+msgstr "ÐÑÑÐÐÐÐÐÐÑÑ ÐÑÐ ÐÐÐ"
 
-#: utils/gpilotd-client.c:51
-msgid "list pilots by login (all for all pilots)"
-msgstr "ÑÐÐÑÐÐ Pilot ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÐ (ÐÑÐ ÐÐÑ ÐÑÐÑ pilot)"
+#: ../utils/gpilotd-client.c:49
+msgid "list PDAs by login (all for all pilots)"
+msgstr "ÑÐÐÑÐÐ ÐÐÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÐ (ÐÑÐ ÐÐÑ ÐÑÐÑ ÐÐÐ)"
 
-#: utils/gpilotd-client.c:51
+#: ../utils/gpilotd-client.c:49
 msgid "LOGIN"
 msgstr "ÐÐÐ.ÐÐÐ"
 
-#: utils/gpilotd-client.c:52
-msgid "Specify pilot to operate on (defaults to MyPilot)"
-msgstr "ÐÐÐÐÐÑÑ Pilot ÐÐÑ ÑÐÐÐÑÑ (ÐÐ ÑÐÐÐÑÐÐÐÑ MyPilot)"
+#: ../utils/gpilotd-client.c:50
+msgid "Specify PDA to operate on (defaults to MyPDA)"
+msgstr "ÐÐÐÐÐÑÑ ÐÐÐ ÐÐÑ ÑÐÐÐÑÑ (ÐÐ ÑÐÐÐÑÐÐÐÑ MyPDA)"
 
-#: utils/gpilotd-client.c:52
+#: ../utils/gpilotd-client.c:50
 msgid "PILOTNAME"
-msgstr "ÐÐÐ PILOT"
+msgstr "ÐÐÐ ÐÐÐ"
 
-#: utils/gpilotd-client.c:53
+#: ../utils/gpilotd-client.c:51
 msgid "Specify a cradle to operate on (defaults to Cradle0)"
-msgstr "ÐÐÐÐÐÑÑ ÐÐÐÑÐÐÐÑÐÑ ÐÐÑ ÑÐÐÐÑÑ (ÐÐ ÑÐÐÐÑÐÐÐÑ Cradle0)"
+msgstr "ÐÐÐÐÐÑÑ ÐÐÐÑ ÐÐÑ ÑÐÐÐÑÑ (ÐÐ ÑÐÐÐÑÐÐÐÑ Cradle0)"
 
-#: utils/gpilotd-client.c:53
+#: ../utils/gpilotd-client.c:51
 msgid "CRADLENAME"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐ"
+
+#: ../utils/gpilotd-client.c:52
+msgid "List users"
+msgstr "ÐÐÐÐÐÐÑÑ ÑÐÐÑÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÐ"
 
-#: utils/gpilotd-client.c:54
-msgid "List the specifed pilot's bases"
-msgstr "ÐÐÐÑÐÐ ÑÐÐÐÐÐÐÑÑ ÐÐÐ Pilot"
+#: ../utils/gpilotd-client.c:53
+msgid "List cradles"
+msgstr "ÐÐÐÐÐÐÑÑ ÑÐÐÑÐÐ ÐÐÐ"
 
-#: utils/gpilotd-client.c:360 utils/gpilotdcm-client.c:106
+#: ../utils/gpilotd-client.c:54
+msgid "List the specified PDA's bases"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÐÐÑ ÐÐÑ ÑÐÐÐÐÐÐÐÐÐ ÐÐÐ"
+
+#: ../utils/gpilotd-client.c:472
+#: ../utils/gpilotdcm-client.c:113
+#, c-format
 msgid ""
 "\n"
 "BEWARE!!\n"
@@ -1561,171 +1706,51 @@ msgid ""
 "Unless you know what you're doing, don't use this tool."
 msgstr ""
 "\n"
-"ÐÐÐÐÐÐÐÐ!!!\n"
-"ÐÑÐ ÐÐÑÑÑÑÐÐÐÑ ÐÐÑ ÐÐÑÐÐÐÐÐÐÐÑÑ ÑÐÑÑÐÐ ÐÐÐÐÑÐ gnome-pilot.\n"
-"ÐÑÐÐ ÐÑ ÐÐ ÐÐÐÐÑÐ, ÑÑÐ ÐÐÐÐÐÑÐ, ÐÐ ÐÑÐÐÐÑÐÑÐÑÐ ÑÑÐÑ ÐÐÑÑÑÑÐÐÐÑ."
+"ÐÐÐÐÐÐÐÐ!\n"
+"ÐÑÐ ÐÐÑÑÑÑÐÐÐÑ ÐÐÑ ÐÐÑÑÑÐÐ Ð ÐÐÑÐÐÐÐÑÐÐÑÐ ÑÑÐÐÑÐÑÐ ÐÐÐÐÑÐ gnome-pilot.\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 "ÑÐÐÑÐÐ ÐÑÐÑ ÐÑÑÑÐÐÑÑÐÐ"
+msgstr "ÑÐÐÑÐÐ ÐÑÐÑ ÐÑÑÐÐÑÑÐÐ"
 
-#: utils/gpilotdcm-client.c:29
-msgid "specify pilot to operate on"
-msgstr "ÑÐÐÐÐÑÑ ÐÐÐÐÑ ÐÐÑ ÑÐÐÐÑÑ"
+#: ../utils/gpilotdcm-client.c:28
+msgid "specify PDA to operate on"
+msgstr "ÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐ ÐÐÑ ÑÐÐÐÑÑ"
 
-#: utils/gpilotdcm-client.c:29
-msgid "PILOTID"
-msgstr "PILOTID"
+#: ../utils/gpilotdcm-client.c:28
+msgid "PDA_ID"
+msgstr "PDA_ID"
 
-#: utils/gpilotdcm-client.c:30
+#: ../utils/gpilotdcm-client.c:29
 msgid "list attributes"
-msgstr "ÑÐÐÑÐÐ ÐÑÑÑÐÐÑÑÐÐ"
+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 "ÐÐÐÑÑÐÑÑ, Ð ÑÑÑÐÐÐÐÐÑÑ ÐÐÑÐÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ Ð \"ÐÐÐÐÐÐÐÐ\""
+msgstr "ÐÐÐÑÑÐÑÑ Ð ÑÑÑÐÐÐÐÐÑÑ ÐÐÑÐÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ Ð ÂÐÐÐÐÐÐÐÐÂ"
 
-#: utils/gpilotdcm-client.c:35
+#: ../utils/gpilotdcm-client.c:34
 msgid "instantiate and destroy the conduit"
-msgstr ""
-
-#~ msgid "Could not examine the port for"
-#~ msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÑÑ ÐÐÑÑ ÐÐÑ"
-
-#~ msgid "The port should point to a USB serial port"
-#~ msgstr "ÐÐÑÑ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÑÑ ÐÐ USB ÐÐÑÐÐÐÐÐÐÑÐÐÑÐÑÐ ÐÐÑÑ"
-
-#~ msgid "The port should be a character special device but isn't for"
-#~ msgstr "ÐÐÑÑ ÐÐÐÐÐÐ ÐÑÑÑ ÑÐÐÑÐÐÐÑÐÑÐ ÑÐÐÐÐÐÑÐÑÐ ÑÑÑÑÐÐÑÑÐÐÐ, ÐÐ ÐÐ ÐÐÑ"
-
-#~ msgid "Sync Type"
-#~ msgstr "ÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ"
-
-#~ msgid "Advanced"
-#~ msgstr "ÐÐÐÐÐÐÐÑÐÐÑÐÑÐ"
-
-#~ msgid "Sync PCId"
-#~ msgstr "Sync PCId"
-
-#~ msgid "Copying to pilot..."
-#~ msgstr "ÐÐÐÐÑÐÐÐÐÐÐ Ð Pilot..."
-
-#~ msgid "Copying from pilot..."
-#~ msgstr "ÐÐÐÐÑÐÐÐÐÐÐ ÐÐ Pilot..."
-
-#~ msgid "Merging to pilot..."
-#~ msgstr "ÐÐÑÐÐÐÐÐÐÐÐ Ð Pilot..."
-
-#~ msgid "Merging from pilot..."
-#~ msgstr "ÐÐÑÐÐÐÐÐÐÐÐ ÐÐ Pilot..."
-
-#~ msgid "Using conduit settings for sync..."
-#~ msgstr "ÐÑÐÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÑÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐ..."
-
-#~ msgid "Restore..."
-#~ msgstr "ÐÐÑÑÑÐÐÐÐÐÐÐÐÐ..."
-
-#~ msgid "Last sync log..."
-#~ msgstr "ÐÐÑÐÐÐÐÐÐ ÑÐÐÐ ÑÐÐÐÑÑÑÐÑÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ..."
-
-#~ msgid "Conduit Settings..."
-#~ msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ..."
-
-#~ msgid "Pilot Link Settings..."
-#~ msgstr "ÐÐÑÑÑÐÐÐÐ ÑÐÑÐÐ Pilot..."
-
-#~ msgid "Properties..."
-#~ msgstr "ÐÐÐÐÑÑÐÐ..."
-
-#~ msgid "%P %%"
-#~ msgstr "%P %%"
-
-#~ msgid "Applet options"
-#~ msgstr "ÐÐÑÐÐÐÑÑÑ ÐÐÐÐÐÑÐ"
-
-#~ msgid "saving session"
-#~ msgstr "ÑÐÑÑÐÐÐÐÐÐ ÑÐÐÐÑÐ"
-
-#~ msgid "Resume daemon"
-#~ msgstr "ÐÐÐÐÐÐÐÐÐÑÑ ÑÐÐÐÑÑ ÐÐÐÐÐÐ"
-
-#~ msgid "About..."
-#~ msgstr "Ð ÐÑÐÐÑÐÐÐÐ..."
-
-#~ msgid "Can't create applet!\n"
-#~ msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑ!\n"
-
-#~ msgid "The gnome-pilot daemon is already running"
-#~ msgstr "ÐÐÐÐÐ GnomePilot ÑÐÐ ÐÐÐÑÑÐÐ"
-
-#~ msgid "Gnome Pilot Conduits"
-#~ msgstr "ÐÐÐÐÑÐÑ Gnome Pilot"
-
-#~ msgid "Handspring USB"
-#~ msgstr "USB"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid ""
-#~ "/dev/pilot\n"
-#~ "/dev/ttyS0\n"
-#~ "/dev/ttyS1\n"
-#~ "/dev/ttyS2\n"
-#~ "/dev/ttyS3\n"
-#~ "/dev/ttyqe\n"
-#~ msgstr ""
-#~ "/dev/pilot\n"
-#~ "/dev/ttyS0\n"
-#~ "/dev/ttyS1\n"
-#~ "/dev/ttyS2\n"
-#~ "/dev/ttyS3\n"
-#~ "/dev/ttyqe\n"
-
-#~ msgid ""
-#~ "/dev/pilot\n"
-#~ "/dev/ttyS0\n"
-#~ "/dev/ttyS1\n"
-#~ "/dev/ttyS2\n"
-#~ "/dev/ttyS3\n"
-#~ msgstr ""
-#~ "/dev/pilot\n"
-#~ "/dev/ttyS0\n"
-#~ "/dev/ttyS1\n"
-#~ "/dev/ttyS2\n"
-#~ "/dev/ttyS3\n"
-
-#~ msgid "Disabled\n"
-#~ msgstr "ÐÑÐÐÑÑÐÐÐ\n"
-
-#~ msgid "Restoring %s from %s... "
-#~ msgstr "ÐÐÑÑÑÐÐÐÐÐÐÐÐÐ %s ÐÐ %s..."
-
-#~ msgid "Restore of %s failed"
-#~ msgstr "ÐÐÑÑÑÐÐÐÐÐÐÐÐÐ %s ÐÐ ÑÐÐÐÐÑÑ"
-
-#~ msgid "Listening on %s (%s)"
-#~ msgstr "ÐÑÐÑÐÑÑÐÐÐÐÐÐ %s (%s)"
+msgstr "ÑÐÐÐÐÑÑ ÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑ"
 
-#~ msgid "%s this request.type == %d is not a install/restore"
-#~ msgstr "%s ÑÐÐ ÑÑÐÐÐ ÐÐÐÑÐÑÐ == %d ÐÐ ÑÐÐÑÐÑÑÑ ÑÑÑÐÐÐÐÐÐÐ/ÐÐÑÑÑÐÐÐÐÐÐÐÐÐÐ"