[gnome-pilot] Updated Norwegian bokmål translation.

From: Kjartan Maraas <kmaraas src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-pilot] Updated Norwegian bokmål translation.
Date: Sat, 30 Oct 2010 11:33:39 +0000 (UTC)
commit 6b00a03625d0afac864c02e7b73b025271eb93e2
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sat Oct 30 13:33:33 2010 +0200

    Updated Norwegian bokmÃ¥l translation.

 po/nb.po |  994 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 545 insertions(+), 449 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index dd3e982..8ac4016 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,15 +1,16 @@
 # Norwegian translation of gnome-pilot (bokmÃ¥l dialect).
 # Copyright (C) 1999,2000 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas gnome org>, 1999,2008.
+# Kjartan Maraas <kmaraas gnome org>, 1999,2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-pilot 1.x\n"
+"Project-Id-Version: gnome-pilot 2.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-09 11:36+0200\n"
-"PO-Revision-Date: 2008-06-09 11:44+0200\n"
+"POT-Creation-Date: 2010-10-30 13:28+0200\n"
+"PO-Revision-Date: 2010-10-30 13:33+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian <i18n-nb lister ping uio no>\n"
+"Language: no\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,85 +27,95 @@ msgstr "Synkroniser dine data pÃ¥ PalmOS-enheter"
 msgid "Utility"
 msgstr "VerktÃ¸y"
 
-#: ../applet/pilot-applet.glade.h:1 ../capplet/gpilotd-capplet.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../applet/pilot-applet.glade.h:2
+#: ../applet/pilot-applet.ui.h:1
 msgid "Choose PDA"
 msgstr "Velg PDA"
 
-#: ../applet/pilot-applet.glade.h:3
+#: ../applet/pilot-applet.ui.h:2
 msgid "GNOME PilotSync Properties"
 msgstr "GNOME Pilotsynk egenskaper"
 
-#: ../applet/pilot-applet.glade.h:4
+#: ../applet/pilot-applet.ui.h:3
 msgid "Restore PDA"
 msgstr "Gjenopprett PDA"
 
-#: ../applet/pilot-applet.glade.h:5
+#: ../applet/pilot-applet.ui.h:4
 msgid "_Directory"
 msgstr "_Katalog"
 
-#: ../applet/pilot-applet.glade.h:6
+#: ../applet/pilot-applet.ui.h:5
 msgid "_Display notices"
 msgstr "_Vis meldinger"
 
-#: ../applet/pilot-applet.glade.h:7
+#: ../applet/pilot-applet.ui.h:6
 msgid "_Execute when clicked"
 msgstr "K_jÃ¸r ved museklikk"
 
-#: ../applet/pilot-applet.glade.h:8
+#: ../applet/pilot-applet.ui.h:7
 msgid "_PDA ID"
 msgstr "__PDA-ID"
 
-#: ../applet/pilot-applet.glade.h:9
+#: ../applet/pilot-applet.ui.h:8
 msgid "_Sync cradle"
 msgstr "_Synk dokk"
 
-#: ../applet/pilot-applet.glade.h:10
+#: ../applet/pilot-applet.ui.h:9
 msgid "gnome-pilot progress"
 msgstr "gnome-pilot fremgang"
 
-#: ../applet/pilot.c:168
+#: ../applet/pilot.c:153
+msgid "Synchronizing..."
+msgstr "Synkroniserer..."
+
+#: ../applet/pilot.c:186
 #, c-format
 msgid "%s Synchronizing"
 msgstr "%s synkroniserer"
 
-#: ../applet/pilot.c:173
-msgid "Database %v of %u"
-msgstr "Database %v av %u"
+#: ../applet/pilot.c:191
+msgid "Connecting..."
+msgstr "Kobler til..."
+
+#: ../applet/pilot.c:211 ../applet/pilot.c:915 ../applet/pilot.c:1059
+msgid "Ready to synchronize"
+msgstr "Klar for synkronisering"
 
-#: ../applet/pilot.c:267
+#: ../applet/pilot.c:292
 #, c-format
 msgid "Request %ld has been completed\n"
 msgstr "ForespÃ¸rsel %ld er fullfÃ¸rt\n"
 
-#: ../applet/pilot.c:289
+#: ../applet/pilot.c:314
 #, c-format
 msgid "%s Synchronizing : %s"
 msgstr "%s synkroniserer : %s"
 
-#: ../applet/pilot.c:294
+#: ../applet/pilot.c:319
 #, c-format
 msgid "%s: Started\n"
 msgstr "%s: Startet\n"
 
-#: ../applet/pilot.c:309
+#: ../applet/pilot.c:334
 #, c-format
 msgid "%s Finished : %s"
 msgstr "%s fullfÃ¸rt : %s"
 
-#: ../applet/pilot.c:314
+#: ../applet/pilot.c:339
 #, c-format
 msgid "%s: Ended\n"
 msgstr "%s: Avsluttet\n"
 
-#: ../applet/pilot.c:340
-msgid "%v of %u records"
-msgstr "%v av %u poster"
+#: ../applet/pilot.c:364
+#, c-format
+msgid "%d of %d records"
+msgstr "%d av %d poster"
 
-#: ../applet/pilot.c:419
+#: ../applet/pilot.c:384
+#, c-format
+msgid "Database %d of %d"
+msgstr "Database %d av %d"
+
+#: ../applet/pilot.c:445
 msgid ""
 "PDA is currently synchronizing.\n"
 "Please wait for it to finish."
@@ -112,11 +123,11 @@ msgstr ""
 "PDAen synkroniseres.\n"
 "Vennligst vent til den er ferdig."
 
-#: ../applet/pilot.c:422
+#: ../applet/pilot.c:450
 msgid "Not connected. Please restart daemon."
 msgstr "Ikke tilkoblet. Vennligst start daemon pÃ¥ nytt."
 
-#: ../applet/pilot.c:424
+#: ../applet/pilot.c:454
 msgid ""
 "Not connected to gpilotd.\n"
 "Please restart daemon."
@@ -124,38 +135,33 @@ msgstr ""
 "Ikke koblet til gpilotd.\n"
 "Vennligst start daemonen pÃ¥ nytt"
 
-#: ../applet/pilot.c:442
+#: ../applet/pilot.c:484
 msgid "gnome-pilot applet"
 msgstr "gnome-pilot applet"
 
-#: ../applet/pilot.c:444
+#: ../applet/pilot.c:486
 msgid "Copyright 2000-2006 Free Software Foundation, Inc."
 msgstr "Opphavsrett 2000-2006 Free Software Foundation, Inc."
 
-#: ../applet/pilot.c:445
+#: ../applet/pilot.c:487
 msgid "A PalmOS PDA monitor.\n"
 msgstr "OvervÃ¥king av PalmOS PDAer.\n"
 
-#: ../applet/pilot.c:541 ../applet/pilot.c:567
+#: ../applet/pilot.c:585 ../applet/pilot.c:612
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "Det oppsto en feil ved visning av hjelp: %s"
 
-#: ../applet/pilot.c:605
-#, c-format
-msgid "cancelling %d"
-msgstr "avbryter %d"
-
-#: ../applet/pilot.c:657
+#: ../applet/pilot.c:698
 #, c-format
 msgid "Restoring %s"
 msgstr "Gjenoppretter %s"
 
-#: ../applet/pilot.c:699
+#: ../applet/pilot.c:741
 msgid "No directory to restore from."
 msgstr "Ingen katalog Ã¥ gjenopprettes fra."
 
-#: ../applet/pilot.c:707
+#: ../applet/pilot.c:753
 msgid ""
 "Press synchronize on the cradle to restore\n"
 " or cancel the operation."
@@ -163,11 +169,16 @@ msgstr ""
 "Trykk synkroniser pÃ¥ dokken for Ã¥ gjenopprette\n"
 " eller avbryt operasjonen."
 
-#: ../applet/pilot.c:716
+#: ../applet/pilot.c:759
+#, c-format
+msgid "cancelling %d"
+msgstr "avbryter %d"
+
+#: ../applet/pilot.c:764
 msgid "Restore request failed"
 msgstr "ForespÃ¸rsel om gjenoppretting feilet"
 
-#: ../applet/pilot.c:754
+#: ../applet/pilot.c:805
 msgid ""
 "PDA sync is currently in progress.\n"
 "Are you sure you want to restart daemon?"
@@ -175,62 +186,58 @@ msgstr ""
 "Synkronisering av PDA pÃ¥gÃ¥r.\n"
 "Er du sikker pÃ¥ at du vil starte tjenesten pÃ¥ nytt?"
 
-#: ../applet/pilot.c:764 ../applet/pilot.c:1340
+#: ../applet/pilot.c:820 ../applet/pilot.c:1379
 msgid "Trying to connect to the GnomePilot Daemon"
 msgstr "PrÃ¸ver Ã¥ koble til GnomePilot daemonen"
 
-#: ../applet/pilot.c:780
+#: ../applet/pilot.c:837
 msgid "There's no last sync on record."
 msgstr "Finnes ikke informasjon om forrige synk."
 
 #. 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:860
 msgid "Restore..."
 msgstr "Gjenopprett..."
 
-#: ../applet/pilot.c:803
+#: ../applet/pilot.c:860
 msgid "Restart"
 msgstr "Start pÃ¥ nytt"
 
-#: ../applet/pilot.c:803
+#: ../applet/pilot.c:860
 msgid "Last log..."
 msgstr "Siste logg..."
 
-#: ../applet/pilot.c:804
+#: ../applet/pilot.c:861
 msgid "Preferences..."
 msgstr "Brukervalg..."
 
-#: ../applet/pilot.c:804
+#: ../applet/pilot.c:861
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../applet/pilot.c:804
+#: ../applet/pilot.c:861
 msgid "About"
 msgstr "Om"
 
-#: ../applet/pilot.c:826
+#: ../applet/pilot.c:883
 msgid "Continue"
 msgstr "Fortsett"
 
-#: ../applet/pilot.c:828
+#: ../applet/pilot.c:885
 msgid "Pause Daemon"
 msgstr "Pause daemon"
 
-#: ../applet/pilot.c:848
+#: ../applet/pilot.c:906
 msgid "Daemon paused..."
 msgstr "Daemon stoppet..."
 
-#: ../applet/pilot.c:855 ../applet/pilot.c:1009
-msgid "Ready to synchronize"
-msgstr "Klar for synkronisering"
-
-#: ../applet/pilot.c:990
+#: ../applet/pilot.c:1047
 msgid "Not connected. Restart daemon to reconnect"
 msgstr "Ikke tilkoblet. Start daemonen pÃ¥ nytt for Ã¥ koble til igjen"
 
-#: ../applet/pilot.c:1174
+#: ../applet/pilot.c:1218
 #, c-format
 msgid "Execution of %s failed"
 msgstr "KjÃ¸ring av %s feilet"
@@ -243,23 +250,19 @@ msgstr "KjÃ¸ring av %s feilet"
 #. g_message ("installing textfile as Memo (not implemented)");
 #. }
 #.
-#: ../applet/pilot.c:1300
+#: ../applet/pilot.c:1344
 #, c-format
 msgid "installing \"%s\" to \"%s\""
 msgstr "installerer \"%s\" til \"%s\""
 
-#: ../applet/pilot.c:1310
+#: ../applet/pilot.c:1354
 msgid "unknown dnd type"
 msgstr "ukjent dnd-type"
 
-#: ../applet/pilot.c:1318
+#: ../applet/pilot.c:1362
 msgid "destroy gpilot-applet"
 msgstr "Ã¸delegg pilot-applet"
 
-#: ../applet/pilot.c:1403
-msgid "Cannot find pilot-applet.glade"
-msgstr "Kan ikke finne pilot-applet.glade"
-
 #: ../applet/pilot.schemas.in.h:1
 msgid "Command to execute when the applet is clicked"
 msgstr "Kommando som skal kjÃ¸res nÃ¥r man klikker pÃ¥ appleten"
@@ -268,111 +271,113 @@ msgstr "Kommando som skal kjÃ¸res nÃ¥r man klikker pÃ¥ appleten"
 msgid "Display notices in popup windows"
 msgstr "Vis meldinger i nye vinduer"
 
-#: ../capplet/gnome-pilot-capplet.c:215 ../capplet/gpilotd-capplet.glade.h:89
+#: ../capplet/gnome-pilot-capplet.c:228 ../capplet/gpilotd-capplet.ui.h:76
 msgid "gnome-pilot Settings"
 msgstr "Innstillinger for gnome-pilot"
 
-#: ../capplet/gnome-pilot-capplet.c:383 ../capplet/gnome-pilot-capplet.c:463
+#: ../capplet/gnome-pilot-capplet.c:394 ../capplet/gnome-pilot-capplet.c:470
 msgid "Name"
 msgstr "Navn"
 
-#: ../capplet/gnome-pilot-capplet.c:385 ../utils/gpilotd-client.c:44
+#: ../capplet/gnome-pilot-capplet.c:396 ../utils/gpilotd-client.c:43
 msgid "ID"
 msgstr "ID"
 
-#: ../capplet/gnome-pilot-capplet.c:387
+#: ../capplet/gnome-pilot-capplet.c:398
 msgid "Owner"
 msgstr "Eier"
 
-#: ../capplet/gnome-pilot-capplet.c:465
+#: ../capplet/gnome-pilot-capplet.c:472
 msgid "Type"
 msgstr "Type"
 
-#: ../capplet/gnome-pilot-capplet.c:571
+#: ../capplet/gnome-pilot-capplet.c:574
 msgid "Conduit"
 msgstr "Komponent"
 
-#: ../capplet/gnome-pilot-capplet.c:573
+#: ../capplet/gnome-pilot-capplet.c:576
 msgid "Sync Action"
 msgstr "Synkroniseringshandling"
 
-#: ../capplet/gnome-pilot-capplet.c:783
+#: ../capplet/gnome-pilot-capplet.c:790
 #, c-format
 msgid "Are you sure you want to delete PDA `%s'?"
 msgstr "Er du sikker pÃ¥ at du vil slette PDA Â«%sÂ»?"
 
-#: ../capplet/gnome-pilot-capplet.c:807
+#: ../capplet/gnome-pilot-capplet.c:814
 msgid "_Edit this PDA..."
 msgstr "R_ediger denne PDAen..."
 
-#: ../capplet/gnome-pilot-capplet.c:808
+#: ../capplet/gnome-pilot-capplet.c:815
 msgid "Edit the currently selected PDA"
 msgstr "Rediger valgt PDA"
 
-#: ../capplet/gnome-pilot-capplet.c:810
+#: ../capplet/gnome-pilot-capplet.c:816
 msgid "_Delete this PDA"
 msgstr "_Slett denne PDAen"
 
-#: ../capplet/gnome-pilot-capplet.c:811
+#: ../capplet/gnome-pilot-capplet.c:817
 msgid "Delete the currently selected PDA"
 msgstr "Slett valgt PDA"
 
-#: ../capplet/gnome-pilot-capplet.c:944
+#: ../capplet/gnome-pilot-capplet.c:969
 #, c-format
 msgid "Are you sure you want to delete %s device?"
 msgstr "Er du sikker pÃ¥ at du vil slette enhet %s?"
 
-#: ../capplet/gnome-pilot-capplet.c:965
+#: ../capplet/gnome-pilot-capplet.c:990
 msgid "_Edit this device..."
 msgstr "R_ediger denne enheten..."
 
-#: ../capplet/gnome-pilot-capplet.c:966
+#: ../capplet/gnome-pilot-capplet.c:991
 msgid "Edit the currently selected device"
 msgstr "Rediger valgt pilot"
 
-#: ../capplet/gnome-pilot-capplet.c:968
+#: ../capplet/gnome-pilot-capplet.c:992
 msgid "_Delete this device"
 msgstr "_Slett denne enheten"
 
-#: ../capplet/gnome-pilot-capplet.c:969
+#: ../capplet/gnome-pilot-capplet.c:993
 msgid "Delete the currently selected device"
 msgstr "Slett valgt enhet"
 
-#: ../capplet/gnome-pilot-capplet.c:1131
+#: ../capplet/gnome-pilot-capplet.c:1177
 #, c-format
 msgid "Unable to instantiate %s conduit."
 msgstr "Kunne ikke instantierer komponent %s."
 
-#: ../capplet/gnome-pilot-capplet.c:1171
+#: ../capplet/gnome-pilot-capplet.c:1217
 msgid "_Enable this conduit"
 msgstr "Aktiv_er denne komponenten"
 
-#: ../capplet/gnome-pilot-capplet.c:1172
+#: ../capplet/gnome-pilot-capplet.c:1218
 msgid "Disable the currently selected conduit"
 msgstr "Deaktivert valgt conduit"
 
-#: ../capplet/gnome-pilot-capplet.c:1174
+#: ../capplet/gnome-pilot-capplet.c:1219
 msgid "_Disable this conduit"
 msgstr "Deaktiver denne komponenten"
 
-#: ../capplet/gnome-pilot-capplet.c:1175
+#: ../capplet/gnome-pilot-capplet.c:1220
 msgid "Enable the currently selected conduit"
 msgstr "Aktiver valgt komponent"
 
-#: ../capplet/gnome-pilot-capplet.c:1180 ../capplet/gpilotd-capplet.glade.h:85
+#: ../capplet/gnome-pilot-capplet.c:1221 ../capplet/gpilotd-capplet.ui.h:72
 msgid "_Settings..."
 msgstr "Inn_stillinger..."
 
-#: ../capplet/gnome-pilot-capplet.c:1181
+#: ../capplet/gnome-pilot-capplet.c:1222
 msgid "Modify the currently selected conduit's settings"
 msgstr "Endre innstillinger for valgt komponent"
 
 #. < 0) {
-#: ../capplet/gnome-pilot-cdialog.c:210
+#: ../capplet/gnome-pilot-cdialog.c:204
 msgid "Unable to create PDA settings window. Incorrect conduit configuration."
-msgstr "Kunne ikke opprette vindu for PDA-innstillinger. Feil konfigurasjon av komponent."
+msgstr ""
+"Kunne ikke opprette vindu for PDA-innstillinger. Feil konfigurasjon av "
+"komponent."
 
-#: ../capplet/gnome-pilot-druid.c:488
+#: ../capplet/gnome-pilot-assistant.c:519
 msgid ""
 "Setup did not complete and settings will not\n"
 "be saved. Are you sure you want to quit?"
@@ -380,7 +385,7 @@ msgstr ""
 "Oppsettet ble ikke fullfÃ¸rt og innstillingene vil ikke\n"
 "bli lagret. Er du sikker pÃ¥ at du vil avslutte?"
 
-#: ../capplet/gnome-pilot-druid.c:611
+#: ../capplet/gnome-pilot-assistant.c:738
 #, c-format
 msgid ""
 "About to send the following data to the PDA.\n"
@@ -393,7 +398,12 @@ msgstr ""
 "PDA ID: %d\n"
 "Vennligst sett PDAen i %s (%s) og trykk pÃ¥ HotSync knappen."
 
-#: ../capplet/gnome-pilot-druid.c:636
+#: ../capplet/gnome-pilot-assistant.c:759
+#: ../capplet/gnome-pilot-assistant.c:780
+msgid "Failed sending request to gpilotd"
+msgstr "Feil under sending av forespÃ¸rsel til gpilotd"
+
+#: ../capplet/gnome-pilot-assistant.c:767
 #, c-format
 msgid ""
 "About to retrieve Owner Name and ID from the PDA.\n"
@@ -402,11 +412,7 @@ msgstr ""
 "I ferd med Ã¥ hente Navn pÃ¥ eier og ID fra PDA.\n"
 "Vennligst sett PDAen i %s (%s) og trykk pÃ¥ HotSync knappen."
 
-#: ../capplet/gnome-pilot-druid.c:652
-msgid "Failed sending request to gpilotd"
-msgstr "Feil under sending av forespÃ¸rsel til gpilotd"
-
-#: ../capplet/gnome-pilot-druid.c:803
+#: ../capplet/gnome-pilot-assistant.c:953
 #, c-format
 msgid ""
 "Successfully retrieved Owner Name and ID from PDA.\n"
@@ -417,57 +423,39 @@ msgstr ""
 "Navn pÃ¥ eier: %s\n"
 "ID: %d"
 
-#: ../capplet/gnome-pilot-pdialog.c:432
+#: ../capplet/gnome-pilot-pdialog.c:460
 #, c-format
 msgid ""
 "Please put PDA in %s (%s) and press HotSync button or cancel the operation."
-msgstr "Vennligst sett PDAen i %s (%s) og trykk pÃ¥ HotSync-knappen eller avbryt operasjonen."
+msgstr ""
+"Vennligst sett PDAen i %s (%s) og trykk pÃ¥ HotSync-knappen eller avbryt "
+"operasjonen."
 
-#: ../capplet/gnome-pilot-pdialog.c:467
+#: ../capplet/gnome-pilot-pdialog.c:495
 msgid "The request to get PDA ID failed"
 msgstr "ForespÃ¸rselen om Ã¥ hente PDA-ID feilet"
 
-#: ../capplet/gnome-pilot-pdialog.c:511
+#: ../capplet/gnome-pilot-pdialog.c:539
 msgid "The request to set PDA ID failed"
 msgstr "ForespÃ¸rsel om Ã¥ sette PDA-ID feilet"
 
-#: ../capplet/gpilotd-capplet.glade.h:2
-msgid "/dev/pilot"
-msgstr "/dev/pilot"
-
-#: ../capplet/gpilotd-capplet.glade.h:3
-msgid "/dev/ttyS0"
-msgstr "/dev/ttyS0"
-
-#: ../capplet/gpilotd-capplet.glade.h:4
-msgid "/dev/ttyS1"
-msgstr "/dev/ttyS1"
-
-#: ../capplet/gpilotd-capplet.glade.h:5
-msgid "/dev/ttyUSB0"
-msgstr "/dev/ttyUSB0"
-
-#: ../capplet/gpilotd-capplet.glade.h:6
-msgid "/dev/ttyUSB1"
-msgstr "/dev/ttyUSB1"
-
-#: ../capplet/gpilotd-capplet.glade.h:7
+#: ../capplet/gpilotd-capplet.ui.h:1
 msgid "<b>Conduit Actions</b>"
 msgstr "<b>Handlinger for komponent</b>"
 
-#: ../capplet/gpilotd-capplet.glade.h:8
+#: ../capplet/gpilotd-capplet.ui.h:2
 msgid "<b>Conduit Settings</b>"
 msgstr "<b>Instillinger for komponent</b>"
 
-#: ../capplet/gpilotd-capplet.glade.h:9
+#: ../capplet/gpilotd-capplet.ui.h:3
 msgid "<b>PDA Attributes</b>"
 msgstr "<b>Attributter for PDA</b>"
 
-#: ../capplet/gpilotd-capplet.glade.h:10
+#: ../capplet/gpilotd-capplet.ui.h:4
 msgid "<b>PDA Identification</b>"
 msgstr "<b>PDA identifikasjon</b>"
 
-#: ../capplet/gpilotd-capplet.glade.h:11
+#: ../capplet/gpilotd-capplet.ui.h:5
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Which device should be used for this "
 "operation?</span>\n"
@@ -476,37 +464,31 @@ msgid ""
 "need to identify which one is to be used for this operation."
 msgstr ""
 
-#: ../capplet/gpilotd-capplet.glade.h:14
-msgid "BIG5"
-msgstr "BIG5"
-
-#: ../capplet/gpilotd-capplet.glade.h:15
-msgid "CP1252"
-msgstr "CP1252"
-
-#: ../capplet/gpilotd-capplet.glade.h:16
+#: ../capplet/gpilotd-capplet.ui.h:8
 msgid "C_harset of PDA:"
 msgstr "_Tegnsett pÃ¥ PDA:"
 
-#: ../capplet/gpilotd-capplet.glade.h:17
+#: ../capplet/gpilotd-capplet.ui.h:9
 msgid "C_onduits"
 msgstr "K_omponenter"
 
-#: ../capplet/gpilotd-capplet.glade.h:18
+#: ../capplet/gpilotd-capplet.ui.h:10
 msgid "Choose Device"
 msgstr "Velg enhet"
 
-#: ../capplet/gpilotd-capplet.glade.h:19
+#: ../capplet/gpilotd-capplet.ui.h:11
 msgid ""
 "Choose this option if you have used sync software before, even on another "
 "computer"
-msgstr "Velg dette alternativet hvis du har brukt synkroniseringsprogrammer fÃ¸r, selv pÃ¥ en annen datamaskin"
+msgstr ""
+"Velg dette alternativet hvis du har brukt synkroniseringsprogrammer fÃ¸r, "
+"selv pÃ¥ en annen datamaskin"
 
-#: ../capplet/gpilotd-capplet.glade.h:20
+#: ../capplet/gpilotd-capplet.ui.h:12
 msgid "Conduit Settings"
 msgstr "Instillinger for komponent"
 
-#: ../capplet/gpilotd-capplet.glade.h:21
+#: ../capplet/gpilotd-capplet.ui.h:13
 msgid ""
 "Congratulations, gnome-pilot is configured!\n"
 "\n"
@@ -524,121 +506,101 @@ msgstr ""
 "Du kan overvÃ¥ke synkronisering av gnome-pilot ved\n"
 "Ã¥ legge til PilotLink-appleten pÃ¥ panelet."
 
-#: ../capplet/gpilotd-capplet.glade.h:28
+#: ../capplet/gpilotd-capplet.ui.h:20
 msgid "D_isable"
 msgstr "Deakt_iver"
 
-#: ../capplet/gpilotd-capplet.glade.h:29
+#: ../capplet/gpilotd-capplet.ui.h:21
 msgid "De_vices"
 msgstr "E_nheter"
 
-#: ../capplet/gpilotd-capplet.glade.h:30
+#: ../capplet/gpilotd-capplet.ui.h:22
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../capplet/gpilotd-capplet.glade.h:31
+#: ../capplet/gpilotd-capplet.ui.h:23
 msgid "Device Settings"
 msgstr "Enhetsinnstillinger"
 
-#: ../capplet/gpilotd-capplet.glade.h:32
+#: ../capplet/gpilotd-capplet.ui.h:24
 msgid "Device:"
 msgstr "Enhet:"
 
-#: ../capplet/gpilotd-capplet.glade.h:33 ../capplet/util.c:74
-#: ../capplet/util.c:438
-msgid "Disabled"
-msgstr "SlÃ¥tt av"
-
-#: ../capplet/gpilotd-capplet.glade.h:34
+#: ../capplet/gpilotd-capplet.ui.h:25
 msgid "Enter Owner Name you want stored on your PDA"
 msgstr "Skriv inn eiernavn som skal lagres pÃ¥ PDAen"
 
-#: ../capplet/gpilotd-capplet.glade.h:35
-msgid "GB18030"
-msgstr "GB18030"
-
-#: ../capplet/gpilotd-capplet.glade.h:36
-msgid "GBK"
-msgstr "GBK"
-
-#: ../capplet/gpilotd-capplet.glade.h:37
+#: ../capplet/gpilotd-capplet.ui.h:26
 msgid "Get the Owner's name and ID from the PDA"
 msgstr "Hent navn pÃ¥ eier og ID fra PDAen"
 
-#: ../capplet/gpilotd-capplet.glade.h:38
+#: ../capplet/gpilotd-capplet.ui.h:27
 msgid "I_rDA"
 msgstr "I_rDA"
 
-#: ../capplet/gpilotd-capplet.glade.h:39
+#: ../capplet/gpilotd-capplet.ui.h:28
 msgid "Initial Sync"
 msgstr "FÃ¸rste synkronisering"
 
-#: ../capplet/gpilotd-capplet.glade.h:40
+#: ../capplet/gpilotd-capplet.ui.h:29
 msgid "Net_work"
 msgstr "Nett_verk"
 
-#: ../capplet/gpilotd-capplet.glade.h:41 ../capplet/util.c:115
-msgid "None"
-msgstr "Ingen"
-
-#: ../capplet/gpilotd-capplet.glade.h:42
+#: ../capplet/gpilotd-capplet.ui.h:30
 msgid "O_wner:"
 msgstr "E_ier:"
 
-#: ../capplet/gpilotd-capplet.glade.h:43
+#: ../capplet/gpilotd-capplet.ui.h:31
 msgid "Owner Name and ID to set on the PDA"
 msgstr "Navn pÃ¥ eier og ID som skal settes pÃ¥ PDAen"
 
-#: ../capplet/gpilotd-capplet.glade.h:44
+#: ../capplet/gpilotd-capplet.ui.h:32
 msgid "Owner:"
 msgstr "Eier:"
 
-#: ../capplet/gpilotd-capplet.glade.h:45
+#: ../capplet/gpilotd-capplet.ui.h:33
 msgid "PDA Attributes"
 msgstr "Attributter for PDA"
 
-#: ../capplet/gpilotd-capplet.glade.h:46
+#: ../capplet/gpilotd-capplet.ui.h:34
 msgid "PDA Identification"
 msgstr "PDA-identifikasjon"
 
-#: ../capplet/gpilotd-capplet.glade.h:47
+#: ../capplet/gpilotd-capplet.ui.h:35
 msgid "PDA Settings"
 msgstr "Innstillinger for PDA"
 
-#: ../capplet/gpilotd-capplet.glade.h:48
+#: ../capplet/gpilotd-capplet.ui.h:36
 msgid "P_DA:"
 msgstr "P_DA:"
 
-#: ../capplet/gpilotd-capplet.glade.h:49
-msgid "Port"
-msgstr "Port"
+#: ../capplet/gpilotd-capplet.ui.h:37
+msgid "Please fix the following problem..."
+msgstr ""
 
-#: ../capplet/gpilotd-capplet.glade.h:50
+#: ../capplet/gpilotd-capplet.ui.h:38
 msgid "S_peed:"
 msgstr "Hasti_ghet:"
 
-#: ../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 "Sender navn pÃ¥ eier og ID til PDAen. Overskriver eksisterende identitet"
-
-#: ../capplet/gpilotd-capplet.glade.h:52
-msgid "Set the character set used on your PDA."
-msgstr "Sett tegnsett som skal brukes pÃ¥ din PDA."
+msgstr ""
+"Sender navn pÃ¥ eier og ID til PDAen. Overskriver eksisterende identitet"
 
-#: ../capplet/gpilotd-capplet.glade.h:53
+#: ../capplet/gpilotd-capplet.ui.h:40
 msgid "Set the root directory for all PDA files to be stored."
 msgstr "Sett rotkatalog for lagring av alle filer pÃ¥ PDA."
 
-#: ../capplet/gpilotd-capplet.glade.h:54
+#: ../capplet/gpilotd-capplet.ui.h:41
 msgid "Success"
 msgstr "Suksess"
 
-#: ../capplet/gpilotd-capplet.glade.h:55
+#: ../capplet/gpilotd-capplet.ui.h:42
 msgid "The name for your PDA.  It is only used for identification."
 msgstr "Navnet pÃ¥ din PDA. Det brukes kun for identifikasjon."
 
-#: ../capplet/gpilotd-capplet.glade.h:56
+#: ../capplet/gpilotd-capplet.ui.h:43
 msgid ""
 "This integer ID identifies your PDA and must be unique between different "
 "PDAs that you use."
@@ -646,15 +608,15 @@ msgstr ""
 "Denne heltalls-IDen identifiserer din PDA og mÃ¥ vÃ¦re unik pÃ¥ forskjellige "
 "PDAer du bruker."
 
-#: ../capplet/gpilotd-capplet.glade.h:57
+#: ../capplet/gpilotd-capplet.ui.h:44
 msgid "Ti_meout:"
 msgstr "Ti_dsavbrudd:"
 
-#: ../capplet/gpilotd-capplet.glade.h:58
+#: ../capplet/gpilotd-capplet.ui.h:45
 msgid "Welcome to gnome-pilot!"
 msgstr "Velkommen til gnome-pilot!"
 
-#: ../capplet/gpilotd-capplet.glade.h:59
+#: ../capplet/gpilotd-capplet.ui.h:46
 msgid ""
 "You seem to be running gnome-pilot for the first time.\n"
 "The following steps will setup gnome-pilot for syncing. \n"
@@ -672,119 +634,117 @@ msgstr ""
 "Trykk Â«NesteÂ» for Ã¥ fortsette.\n"
 "Trykk Â«AvbrytÂ» for Ã¥ avslutte."
 
-#: ../capplet/gpilotd-capplet.glade.h:66
+#: ../capplet/gpilotd-capplet.ui.h:53
 msgid "_Action:"
 msgstr "H_andling:"
 
-#: ../capplet/gpilotd-capplet.glade.h:67
+#: ../capplet/gpilotd-capplet.ui.h:54
 msgid "_Add..."
 msgstr "_Legg til..."
 
-#: ../capplet/gpilotd-capplet.glade.h:68
+#: ../capplet/gpilotd-capplet.ui.h:55
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: ../capplet/gpilotd-capplet.glade.h:69
+#: ../capplet/gpilotd-capplet.ui.h:56
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../capplet/gpilotd-capplet.glade.h:70
+#: ../capplet/gpilotd-capplet.ui.h:57
 msgid "_Device:"
 msgstr "_Enhet:"
 
-#: ../capplet/gpilotd-capplet.glade.h:71
+#: ../capplet/gpilotd-capplet.ui.h:58
 msgid "_Edit..."
 msgstr "R_ediger..."
 
-#: ../capplet/gpilotd-capplet.glade.h:72
+#: ../capplet/gpilotd-capplet.ui.h:59
 msgid "_Enable"
 msgstr "Aktiv_er"
 
-#: ../capplet/gpilotd-capplet.glade.h:73
+#: ../capplet/gpilotd-capplet.ui.h:60
 msgid "_Get from PDA"
 msgstr "_Hent fra PDA"
 
-#: ../capplet/gpilotd-capplet.glade.h:74
+#: ../capplet/gpilotd-capplet.ui.h:61
 msgid "_IrDA"
 msgstr "_IrDA"
 
-#: ../capplet/gpilotd-capplet.glade.h:75
+#: ../capplet/gpilotd-capplet.ui.h:62
 msgid "_Local folder:"
 msgstr "_Lokal mappe:"
 
-#: ../capplet/gpilotd-capplet.glade.h:76
+#: ../capplet/gpilotd-capplet.ui.h:63
 msgid "_Name of PDA:"
 msgstr "_Navn pÃ¥ PDA:"
 
-#: ../capplet/gpilotd-capplet.glade.h:77
+#: ../capplet/gpilotd-capplet.ui.h:64
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../capplet/gpilotd-capplet.glade.h:78
+#: ../capplet/gpilotd-capplet.ui.h:65
 msgid "_No, I've never used sync software with this PDA before."
 msgstr ""
 "_Nei, jeg har aldri brukt synkroniseringsprogramvare med denne PDAen "
 "tidligere."
 
-#: ../capplet/gpilotd-capplet.glade.h:79
+#: ../capplet/gpilotd-capplet.ui.h:66
 msgid "_One time action:"
 msgstr "_Engangshandling:"
 
-#: ../capplet/gpilotd-capplet.glade.h:80
+#: ../capplet/gpilotd-capplet.ui.h:67
 msgid "_Owner:"
 msgstr "E_ier:"
 
-#: ../capplet/gpilotd-capplet.glade.h:81
+#: ../capplet/gpilotd-capplet.ui.h:68
 msgid "_PDA ID:"
 msgstr "_PDA-ID:"
 
-#: ../capplet/gpilotd-capplet.glade.h:82
+#: ../capplet/gpilotd-capplet.ui.h:69
 msgid "_PDAs"
 msgstr "_PDAer"
 
-#: ../capplet/gpilotd-capplet.glade.h:83
+#: ../capplet/gpilotd-capplet.ui.h:70
 msgid "_Send to PDA"
 msgstr "_Send til PDA"
 
-#: ../capplet/gpilotd-capplet.glade.h:84
+#: ../capplet/gpilotd-capplet.ui.h:71
 msgid "_Serial"
 msgstr "_Seriell"
 
-#: ../capplet/gpilotd-capplet.glade.h:86
+#: ../capplet/gpilotd-capplet.ui.h:73
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../capplet/gpilotd-capplet.glade.h:87
+#: ../capplet/gpilotd-capplet.ui.h:74
 msgid "_USB"
 msgstr "_USB"
 
-#: ../capplet/gpilotd-capplet.glade.h:88
+#: ../capplet/gpilotd-capplet.ui.h:75
 msgid "_Yes, I've used sync software with this PDA before."
 msgstr ""
 "_Ja, jeg har brukt synkroniseringsprogrammvare med denne PDAen tidligere."
 
-#: ../capplet/gpilotd-control-applet.c:81
-msgid "Start druid only"
-msgstr "Start kun druide"
+#: ../capplet/gpilotd-control-applet.c:84
+msgid " - configure gnome-pilot settings"
+msgstr " - konfigurer innstillinger for gnome-pilot"
 
-#: ../capplet/gpilotd-control-applet.c:103
-msgid "Error initializing gpilotd capplet"
-msgstr "Feil under initialisering av gpilotd cappleten"
+#: ../capplet/gpilotd-control-applet.c:86
+#: ../capplet/gpilotd-control-applet.c:95
+#, c-format
+msgid "Error initializing gpilotd capplet : %s"
+msgstr "Feil under initialisering av gpilotd cappleten : %s"
 
-#: ../capplet/gpilotd-control-applet.c:114
-#: ../capplet/gpilotd-control-applet.c:115
+#: ../capplet/gpilotd-control-applet.c:101
+#: ../capplet/gpilotd-control-applet.c:102
 msgid "Error loading PDA state, aborting"
 msgstr "Feil under lasting av tilstandsdata for PDA, avbryter"
 
-#: ../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 "Kan ikke koble til GnomePilot daemon"
 
-#: ../capplet/gpilotd-control-applet.c:132
-msgid "Cannot run druid if PDAs or devices already configured"
-msgstr "Kan ikke kjÃ¸re veiviser hvis PDAer eller enheter allerede er konfigurert"
-
 #: ../capplet/gpilotd-control-applet.desktop.in.in.h:1
 msgid "Configure PalmOS devices"
 msgstr "Konfigurer PalmOS-enheter"
@@ -793,59 +753,107 @@ msgstr "Konfigurer PalmOS-enheter"
 msgid "PalmOS Devices"
 msgstr "PalmOS-enheter"
 
-#: ../capplet/util.c:81 ../capplet/util.c:440
+#: ../capplet/pilot.c:118
+#, c-format
+msgid "Unable load key gpilotd/General/sync_PC_Id: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:132
+#, c-format
+msgid "Unable load key gpilotd/General/progress_stepping: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:166
+#, c-format
+msgid "Unable load key gpilotd/%s/type: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:188
+#, c-format
+msgid "Unable load key gpilotd/%s/name: iDevice, %s"
+msgstr ""
+
+#: ../capplet/pilot.c:206
+#, c-format
+msgid "Unable load key gpilotd/%s/speed: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:215
+#, c-format
+msgid "Unable load key gpilotd/%s/timeout: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:257
+#, c-format
+msgid "Unable load key gpilotd/%s/name: %s"
+msgstr ""
+
+#: ../capplet/pilot.c:267
+#, c-format
+msgid "Unable load key gpilotd/%s/pilotid: %s"
+msgstr ""
+
+#: ../capplet/util.c:123 ../capplet/util.c:517
+msgid "Disabled"
+msgstr "SlÃ¥tt av"
+
+#: ../capplet/util.c:129 ../capplet/util.c:519
 msgid "Enabled"
 msgstr "SlÃ¥tt pÃ¥"
 
-#: ../capplet/util.c:238
+#: ../capplet/util.c:180
+msgid "None"
+msgstr "Ingen"
+
+#: ../capplet/util.c:315
 msgid "You must have at least one device setup"
 msgstr "Du mÃ¥ ha satt opp minst en enhet"
 
-#: ../capplet/util.c:411
+#: ../capplet/util.c:490
 msgid "Synchronize"
 msgstr "Synkroniser"
 
-#: ../capplet/util.c:412
+#: ../capplet/util.c:491
 msgid "Copy from PDA"
 msgstr "Kopier fra PDA"
 
-#: ../capplet/util.c:413
+#: ../capplet/util.c:492
 msgid "Copy to PDA"
 msgstr "Kopier til PDA"
 
-#: ../capplet/util.c:414
+#: ../capplet/util.c:493
 msgid "Merge from PDA"
 msgstr "Flett fra PDA"
 
-#: ../capplet/util.c:415
+#: ../capplet/util.c:494
 msgid "Merge to PDA"
 msgstr "Flett til PDA"
 
-#: ../capplet/util.c:418
+#: ../capplet/util.c:497
 msgid "Use conduit settings"
 msgstr "Bruk conduit instillinger"
 
-#: ../capplet/util.c:426
+#: ../capplet/util.c:505
 msgid "USB"
 msgstr "USB"
 
-#: ../capplet/util.c:427
+#: ../capplet/util.c:506
 msgid "IrDA"
 msgstr "IrDA"
 
-#: ../capplet/util.c:428
+#: ../capplet/util.c:507
 msgid "Network"
 msgstr "Nettverk"
 
-#: ../capplet/util.c:429
+#: ../capplet/util.c:508
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../capplet/util.c:430
+#: ../capplet/util.c:509
 msgid "Serial"
 msgstr "Seriell"
 
-#: ../capplet/util.c:478
+#: ../capplet/util.c:556
 msgid ""
 "The specified base directory exists but has the wrong permissions.\n"
 "Please fix or choose another directory"
@@ -853,7 +861,7 @@ msgstr ""
 "Den spesifiserte basekatalogen eksisterer, men den har gale rettigheter.\n"
 "Vennligst rett opp dette eller velg en annen katalog"
 
-#: ../capplet/util.c:483
+#: ../capplet/util.c:561
 msgid ""
 "The specified base directory exists but is not a directory.\n"
 "Please make it a directory or choose another directory"
@@ -861,7 +869,7 @@ msgstr ""
 "Den spesifiserte basekatalogen eksisterer, men er ikke en katalog.\n"
 "Vennligst gjÃ¸r den om til en katalog eller velg en annen katalog"
 
-#: ../capplet/util.c:490
+#: ../capplet/util.c:568
 msgid ""
 "It wasn't possible to create the specified base directory.\n"
 "Please verify the permitions on the specified path or choose another "
@@ -871,7 +879,7 @@ msgstr ""
 "Vennligst verifiser rettighetene pÃ¥ den spesifiserte stien eller velg en "
 "annen katalog"
 
-#: ../capplet/util.c:495
+#: ../capplet/util.c:573
 msgid ""
 "The path specified for the base directory is invalid.\n"
 "Please choose another directory"
@@ -879,106 +887,116 @@ msgstr ""
 "Spesifisert sti for basekatalogen er ugyldig.\n"
 "Vennligst velg en annen katalog"
 
-#: ../capplet/util.c:523
+#: ../capplet/util.c:600
 #, c-format
 msgid ""
-"`%s' is not a valid character set identifier.  Please enter a valid "
-"identifier or select from the available options."
-msgstr "Â«%sÂ» er ikke en gyldig identifikator for et tegnsett. Vennligst oppgi en gyldig identifikator eller velg fra tilgjengelige alternativer."
+"`%s' is not a valid character set identifier.\n"
+"Please enter a valid identifier or select from the available options."
+msgstr ""
+"Â«%sÂ» er ikke en gyldig identifikator for et tegnsett.\n"
+"Vennligst oppgi en gyldig identifikator eller velg fra tilgjengelige alternativer."
 
-#: ../capplet/util.c:647
+#: ../capplet/util.c:723
 msgid "Device 'usb:' is only valid for devices of type USB"
 msgstr "Enhet Â«usb:Â» er kun gyldig for enheter av type USB"
 
-#: ../capplet/util.c:658
+#: ../capplet/util.c:732
 msgid "Read/Write permissions failed on"
 msgstr "Lese-/skrive-rettigheter feilet for"
 
-#: ../capplet/util.c:660
+#: ../capplet/util.c:734
 msgid "Check the permissions on the device and retry"
 msgstr "Sjekk rettighetene pÃ¥ enheten og prÃ¸v igjen"
 
-#: ../capplet/util.c:675 ../gpilotd/gpilotd.c:1332
+#: ../capplet/util.c:747 ../gpilotd/gpilot-daemon.c:1408
 #, 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 "Sjekker for fjernede databaser"
 
 #. 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 "Endrer navn pÃ¥ %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 "til %s"
 
-#: ../conduits/backup/backup_conduit.c:435
-#: ../conduits/backup/backup_conduit.c:439
+#: ../conduits/backup/backup_conduit.c:461
+#: ../conduits/backup/backup_conduit.c:465
 #, c-format
 msgid "%s not modified since last sync"
 msgstr "%s er ikke endret siden forrige synkronisering"
 
-#: ../conduits/backup/backup_conduit.c:451
-#: ../conduits/backup/backup_conduit.c:453
+#: ../conduits/backup/backup_conduit.c:477
+#: ../conduits/backup/backup_conduit.c:479
 #, c-format
 msgid "Making backup of %s"
 msgstr "Lager sikkerhetskopi av %s"
 
-#: ../conduits/backup/backup_conduit.c:460
-#: ../conduits/backup/backup_conduit.c:462
+#: ../conduits/backup/backup_conduit.c:486
+#: ../conduits/backup/backup_conduit.c:488
 #, c-format
 msgid "Could not create backup file %s"
 msgstr "Kunne ikke opprette sikkerhetskopi %s"
 
-#: ../conduits/backup/backup_conduit.c:736
+#: ../conduits/backup/backup_conduit.c:764
 msgid "Collecting restore information..."
 msgstr "Samler gjenopprettingsinformasjon..."
 
-#: ../conduits/backup/backup_conduit.c:860
+#: ../conduits/backup/backup_conduit.c:891
 msgid "_Backup directory:"
 msgstr "_Katalog for sikkerhetskopi:"
 
-#: ../conduits/backup/backup_conduit.c:873
+#: ../conduits/backup/backup_conduit.c:905
 msgid "Backup directory"
 msgstr "Katalog for sikkerhetskopi"
 
-#: ../conduits/backup/backup_conduit.c:875
-#, fuzzy
+#: ../conduits/backup/backup_conduit.c:907
 msgid "O_nly backup changed bases"
-msgstr "Bare sikkerhetskopier endrede baser:"
+msgstr "Bare sikkerhetskopier e_ndrede baser"
 
-#: ../conduits/backup/backup_conduit.c:885
-#, fuzzy
+#: ../conduits/backup/backup_conduit.c:917
 msgid "Only backup changed bases"
-msgstr "Bare sikkerhetskopier endrede baser:"
+msgstr "Bare sikkerhetskopier endrede baser"
 
-#: ../conduits/backup/backup_conduit.c:887
+#: ../conduits/backup/backup_conduit.c:919
 msgid "_Remove local base if deleted on pilot"
 msgstr "Fje_rn lokal base hvis den slettes pÃ¥ PDA"
 
-#: ../conduits/backup/backup_conduit.c:897
+#: ../conduits/backup/backup_conduit.c:929
 msgid "Remove local base if deleted on pilot"
 msgstr "Fjern lokal base hvis den slettes pÃ¥ PDA"
 
-#: ../conduits/backup/backup_conduit.c:899
+#: ../conduits/backup/backup_conduit.c:931
 msgid "# of old backups to _keep"
 msgstr "antall gamle si_kkerhetskopier som skal beholdes"
 
-#: ../conduits/backup/backup_conduit.c:910
+#: ../conduits/backup/backup_conduit.c:942
 msgid "# of old backups to keep"
 msgstr "antall gamle sikkerhetskopier som skal beholdes"
 
-#: ../conduits/backup/backup_conduit.c:948
+#: ../conduits/backup/backup_conduit.c:980
 #, fuzzy
 msgid ""
 "The specified backup directory exists but has the wrong permissions.\n"
@@ -987,7 +1005,7 @@ msgstr ""
 "Den spesifiserte basekatalogen eksisterer, men den har gale rettigheter.\n"
 "Vennligst rett opp dette eller velg en annen katalog"
 
-#: ../conduits/backup/backup_conduit.c:953
+#: ../conduits/backup/backup_conduit.c:985
 #, fuzzy
 msgid ""
 "The specified backup directory exists but is not a directory.\n"
@@ -996,7 +1014,7 @@ msgstr ""
 "Den spesifiserte basekatalogen eksisterer, men er ikke en katalog.\n"
 "Vennligst gjÃ¸r den om til en katalog eller velg en annen katalog"
 
-#: ../conduits/backup/backup_conduit.c:960
+#: ../conduits/backup/backup_conduit.c:992
 #, fuzzy
 msgid ""
 "It wasn't possible to create the specified backup directory.\n"
@@ -1007,7 +1025,7 @@ msgstr ""
 "Vennligst verifiser rettighetene pÃ¥ den spesifiserte stien eller velg en "
 "annen katalog"
 
-#: ../conduits/backup/backup_conduit.c:965
+#: ../conduits/backup/backup_conduit.c:997
 #, fuzzy
 msgid ""
 "The path specified for the backup directory is invalid.\n"
@@ -1016,6 +1034,74 @@ msgstr ""
 "Spesifisert sti for basekatalogen er ugyldig.\n"
 "Vennligst velg en annen katalog"
 
+#: ../conduits/evolution-data-server/address-conduit.c:593
+msgid "Default Sync Address:"
+msgstr ""
+
+#: ../conduits/evolution-data-server/address-conduit.c:1636
+#: ../conduits/evolution-data-server/address-conduit.c:1637
+msgid "Could not load address book"
+msgstr "Kunne ikke laste adressebok"
+
+#: ../conduits/evolution-data-server/address-conduit.c:1714
+#: ../conduits/evolution-data-server/address-conduit.c:1717
+msgid "Could not read pilot's Address application block"
+msgstr ""
+
+#: ../conduits/evolution-data-server/calendar-conduit.c:250
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: ../conduits/evolution-data-server/calendar-conduit.c:1538
+#: ../conduits/evolution-data-server/calendar-conduit.c:1539
+#: ../conduits/evolution-data-server/memo-conduit.c:826
+#: ../conduits/evolution-data-server/memo-conduit.c:827
+#: ../conduits/evolution-data-server/todo-conduit.c:1027
+#: ../conduits/evolution-data-server/todo-conduit.c:1028
+msgid "Could not start evolution-data-server"
+msgstr ""
+
+#: ../conduits/evolution-data-server/calendar-conduit.c:1646
+#: ../conduits/evolution-data-server/calendar-conduit.c:1649
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: ../conduits/evolution-data-server/e-pilot-settings.c:95
+msgid "Sync with:"
+msgstr "Synkroniser med:"
+
+#: ../conduits/evolution-data-server/e-pilot-settings.c:103
+msgid "Sync Private Records:"
+msgstr "Synkroniser private poster:"
+
+#: ../conduits/evolution-data-server/e-pilot-settings.c:112
+msgid "Sync Categories:"
+msgstr "Kategorier for synkronisering:"
+
+#: ../conduits/evolution-data-server/memo-conduit.c:920
+#: ../conduits/evolution-data-server/memo-conduit.c:923
+msgid "Could not read pilot's Memo application block"
+msgstr ""
+
+#: ../conduits/evolution-data-server/memo-conduit.c:967
+#: ../conduits/evolution-data-server/memo-conduit.c:970
+msgid "Could not write pilot's Memo application block"
+msgstr ""
+
+#: ../conduits/evolution-data-server/todo-conduit.c:227
+msgid "Default Priority:"
+msgstr "Forvalgt prioritet:"
+
+#: ../conduits/evolution-data-server/todo-conduit.c:1111
+#: ../conduits/evolution-data-server/todo-conduit.c:1114
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: ../conduits/evolution-data-server/todo-conduit.c:1156
+#: ../conduits/evolution-data-server/todo-conduit.c:1159
+msgid "Could not write pilot's ToDo application block"
+msgstr ""
+
 #: ../conduits/file/file_conduit.c:243 ../conduits/file/file_conduit.c:253
 #, c-format
 msgid "Install of %s failed"
@@ -1031,41 +1117,55 @@ msgstr "Installerer %s fra %s..."
 msgid "Installing %s..."
 msgstr "Installerer %s..."
 
-#: ../conduits/file/gpilot_install_file.c:44
+#: ../conduits/file/gpilot_install_file.c:41
 msgid "Install immediately"
 msgstr "Installer med Ã©n gang"
 
-#: ../conduits/file/gpilot_install_file.c:45
+#: ../conduits/file/gpilot_install_file.c:42
 msgid "Install delayed"
 msgstr "Installasjon utsatt"
 
-#: ../conduits/file/gpilot_install_file.c:46
+#: ../conduits/file/gpilot_install_file.c:43
 msgid "PDA to install to"
 msgstr "PDA det skal installeres til"
 
-#: ../conduits/file/gpilot_install_file.c:46
+#: ../conduits/file/gpilot_install_file.c:43
 msgid "PDA"
 msgstr "PDA"
 
-#: ../conduits/file/gpilot_install_file.c:118
-#: ../conduits/file/gpilot_install_file.c:119
+#: ../conduits/file/gpilot_install_file.c:44
+msgid "[FILE...]"
+msgstr "[FIL...]"
+
+#: ../conduits/file/gpilot_install_file.c:44
+msgid "list of files"
+msgstr "liste med filer"
+
+#: ../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
 msgid "Unable to get PDA names"
 msgstr "Kan ikke hente navn for PDAer"
 
-#: ../conduits/file/gpilot_install_file.c:158
+#: ../conduits/file/gpilot_install_file.c:149
 msgid "Following files failed :\n"
 msgstr "FÃ¸lg filer feilet :\n"
 
-#: ../conduits/file/gpilot_install_file.c:170
+#: ../conduits/file/gpilot_install_file.c:161
 #, c-format
 msgid "Installing to %s:\n"
 msgstr "Installerer til %s:\n"
 
-#: ../conduits/file/gpilot_install_file.c:191
+#: ../conduits/file/gpilot_install_file.c:182
 msgid "No files to install"
 msgstr "Ingen filer Ã¥ installere!!"
 
-#: ../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."
@@ -1073,93 +1173,93 @@ msgstr ""
 "Trykk synkroniser pÃ¥ docken for Ã¥ installere\n"
 " eller avbryt operasjonen."
 
-#: ../gpilotd/GNOME_Pilot_Daemon.server.in.in.h:1
-msgid "Gnome-Pilot daemon"
-msgstr "Gnome-Pilot daemon"
+#: ../gpilotd/gnome-pilot-conduit-management.gob:684
+msgid "module loading not supported, fatal!"
+msgstr "lasting av moduler er ikke stÃ¸ttet, fatal!"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:136
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:137
 msgid "deleted PDA record modified locally, not deleting\n"
 msgstr "slettet PDA-oppfÃ¸ring endret lokalt, blir ikke slettet\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:137
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:138
 msgid "deleted local record modified on PDA, not deleting\n"
 msgstr "slettet lokal oppfÃ¸ring endret pÃ¥ PDA. Blir ikke slettet\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:138
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:142
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:139
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:143
 #, fuzzy
 msgid "merge conflict, PDA and local record swapped\n"
 msgstr "konflikt ved fletting, lokal post og post pÃ¥ pilot byttet om\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:139
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:140
 #, fuzzy
 msgid "archive and change conflict, PDA and local record swapped\n"
 msgstr "arkiv og endringskonflikt, lokal post byttet om med post pÃ¥ pilot\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:140
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:141
 #, fuzzy
 msgid "archive and change conflict, local record sent to PDA\n"
 msgstr "konflikt ved arkiv og endring, lokal post sendt til pilot\n"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:141
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:142
 #, fuzzy
 msgid "archive and change conflict, PDA record saved locally\n"
 msgstr "konflikt med arkiv og endring, post pÃ¥ pilot lagret lokalt\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:459
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:534
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:599
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:628
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:657
 msgid "Conduits initialization failed, aborting operation"
 msgstr "Initialisering av conduit feilet, avbryter operasjonen"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:436
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:472
 #, fuzzy
 msgid "Unable to delete all records in PDA database, aborting operation."
 msgstr ""
 "Kan ikke slette alle oppfÃ¸ringer i pilot databasen, avbryter operasjonen."
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:447
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1025
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:483
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1077
 msgid "Conduit did not return a record"
 msgstr "Conduiten hentet ikke en oppfÃ¸ring"
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:504
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:540
 msgid "Unable to delete all records in local database, aborting operation."
 msgstr ""
 "Kan ikke slette alle oppfÃ¸ringer i lokal database, avbryter operasjonen."
 
-#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1430
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1482
 msgid "Error in conduit, newly added record could not be found"
 msgstr "Feil i conduit, nylig tillagt oppfÃ¸ring kan ikke finnes"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:487
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:517
 msgid "Copy to PDA failed!"
 msgstr "Kopiering til PDA feilet!"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:511
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:541
 msgid "Copy from PDA failed!"
 msgstr "Kopiering fra PDA feilet!"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:535
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:565
 msgid "Merge to PDA failed!"
 msgstr "Fletting til PDA feilet!"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:559
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:589
 msgid "Merge from PDA failed!"
 msgstr "Fletting fra PDA feilet!"
 
-#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:614
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:644
 msgid "Synchronization failed!"
 msgstr "Synkronisering feilet!"
 
-#: ../gpilotd/gnome-pilot-structures.c:286
+#: ../gpilotd/gnome-pilot-structures.c:296
 #, c-format
 msgid "Could not open device %s (%s): reason: \"%s\"."
 msgstr "Kunne ikke Ã¥pne enhet %s (%s): Ã¥rsak: \"%s\"."
 
-#: ../gpilotd/gnome-pilot-structures.c:290
+#: ../gpilotd/gnome-pilot-structures.c:300
 #, c-format
 msgid ""
 "GnomePilot could not open device %s (%s).\n"
@@ -1168,30 +1268,30 @@ msgstr ""
 "GnomePilot kunne ikke Ã¥pne enhet %s (%s).\n"
 "Ã?rsak: \"%s\"."
 
-#: ../gpilotd/gnome-pilot-structures.c:449
+#: ../gpilotd/gnome-pilot-structures.c:459
 #, c-format
 msgid ""
 "Bluetooth Device [%s]: Unable to bind socket: err %d (check pilot-link was "
 "compiled with bluetooth support)"
 msgstr ""
 
-#: ../gpilotd/gnome-pilot-structures.c:459
+#: ../gpilotd/gnome-pilot-structures.c:469
 #, c-format
 msgid "Device [%s, %s]: Unable to bind socket: err %d"
 msgstr "Enhet [%s, %s]: Kan ikke binde til plugg: err %d"
 
-#: ../gpilotd/gnome-pilot-structures.c:539
-#: ../gpilotd/gnome-pilot-structures.c:590
-#: ../gpilotd/gnome-pilot-structures.c:620
-#: ../gpilotd/gnome-pilot-structures.c:648
+#: ../gpilotd/gnome-pilot-structures.c:549
+#: ../gpilotd/gnome-pilot-structures.c:602
+#: ../gpilotd/gnome-pilot-structures.c:633
+#: ../gpilotd/gnome-pilot-structures.c:661
 msgid "Unknown device type"
 msgstr "Ukjent enhetstype"
 
-#: ../gpilotd/gnome-pilot-structures.c:663
+#: ../gpilotd/gnome-pilot-structures.c:679
 msgid "Number of devices is configured to 0"
 msgstr "Antall enheter er satt til 0"
 
-#: ../gpilotd/gnome-pilot-structures.c:665
+#: ../gpilotd/gnome-pilot-structures.c:681
 msgid ""
 "No devices configured.\n"
 "Please run gpilotd-control-applet (use gnomecc)\n"
@@ -1201,15 +1301,15 @@ msgstr ""
 "Vennligst kjÃ¸r gpilotd-control-applet (bruk gnomecc)\n"
 "til Ã¥ konfigurere gnome-pilot."
 
-#: ../gpilotd/gnome-pilot-structures.c:686
+#: ../gpilotd/gnome-pilot-structures.c:702
 msgid "No accessible devices available"
 msgstr "Ingen enheter tilgjengelig"
 
-#: ../gpilotd/gnome-pilot-structures.c:701
+#: ../gpilotd/gnome-pilot-structures.c:721
 msgid "Number of PDAs is configured to 0"
 msgstr "Antall PDAer er satt til 0"
 
-#: ../gpilotd/gnome-pilot-structures.c:703
+#: ../gpilotd/gnome-pilot-structures.c:723
 msgid ""
 "No PDAs configured.\n"
 "Please run gpilotd-control-applet (use gnomecc)\n"
@@ -1219,16 +1319,16 @@ msgstr ""
 "Vennligst kjÃ¸r gpilotd-control-applet (bruk gnomecc)\n"
 "for Ã¥ konfigurere gnome-pilot."
 
-#: ../gpilotd/gnome-pilot-structures.c:764 ../gpilotd/gpilotd.c:687
+#: ../gpilotd/gnome-pilot-structures.c:786 ../gpilotd/gpilot-daemon.c:968
 #, c-format
 msgid "No pilot_charset specified.  Using `%s'."
 msgstr "pilot_charset ikke oppgitt. Bruker Â«%sÂ»."
 
-#: ../gpilotd/gpilotd.c:236
+#: ../gpilotd/gpilot-daemon.c:513
 msgid "Unable to bind to PDA"
 msgstr "Kan ikke koble til PDAen"
 
-#: ../gpilotd/gpilotd.c:374
+#: ../gpilotd/gpilot-daemon.c:653
 #, c-format
 msgid ""
 "Failed to connect using device `%s', on port `%s'.  Check your "
@@ -1237,7 +1337,7 @@ msgid ""
 "`ttyUSB...' device."
 msgstr ""
 
-#: ../gpilotd/gpilotd.c:389
+#: ../gpilotd/gpilot-daemon.c:668
 #, c-format
 msgid ""
 "Failed to connect using device `%s', on port `%s'.  Check your "
@@ -1246,18 +1346,18 @@ msgid ""
 "a `usb:' device."
 msgstr ""
 
-#: ../gpilotd/gpilotd.c:480
+#: ../gpilotd/gpilot-daemon.c:761
 #, c-format
 msgid "Unknown PDA, no userID/username match %ld"
 msgstr "Ukjent PDA, ingen bruker-ID/brukernavn passer %ld"
 
-#: ../gpilotd/gpilotd.c:487
+#: ../gpilotd/gpilot-daemon.c:768
 msgid "Use gnomecc to configure PDA"
 msgstr "Bruk gnomecc til Ã¥ konfigurere PDAen"
 
 #. FIXME: here we should offer to create a profile for the pilot,
 #. bug # 8218
-#: ../gpilotd/gpilotd.c:492
+#: ../gpilotd/gpilot-daemon.c:773
 #, c-format
 msgid ""
 "Unknown PDA - no PDA matches ID %ld\n"
@@ -1266,64 +1366,64 @@ msgstr ""
 "Ukjent PDA - ingen PDA har ID %ld\n"
 "Bruk gnomecc til Ã¥ konfigurere gnome-pilot"
 
-#: ../gpilotd/gpilotd.c:516
+#: ../gpilotd/gpilot-daemon.c:797
 #, c-format
 msgid "Device %s has %d events"
 msgstr "Enhet %s har %d hendelser"
 
-#: ../gpilotd/gpilotd.c:529
+#: ../gpilotd/gpilot-daemon.c:810
 msgid "Setting userinfo..."
 msgstr "Setter brukerinfo..."
 
-#: ../gpilotd/gpilotd.c:534
+#: ../gpilotd/gpilot-daemon.c:815
 msgid "Sync continues"
 msgstr "Synkronisering fortsetter"
 
-#: ../gpilotd/gpilotd.c:553
+#: ../gpilotd/gpilot-daemon.c:834
 msgid "Getting userinfo..."
 msgstr "Henter brukerinfo..."
 
-#: ../gpilotd/gpilotd.c:615
+#: ../gpilotd/gpilot-daemon.c:896
 msgid "NetSync request detected, synchronizing PDA"
 msgstr "Nettsynk-forespÃ¸sel oppdaget, synkroniserer PDA"
 
-#: ../gpilotd/gpilotd.c:617
+#: ../gpilotd/gpilot-daemon.c:898
 msgid "Bluetooth request detected, synchronizing PDA"
 msgstr "Bluetooth-forespÃ¸sel oppdaget, synkroniserer PDA"
 
-#: ../gpilotd/gpilotd.c:619
+#: ../gpilotd/gpilot-daemon.c:900
 msgid "HotSync button pressed, synchronizing PDA"
 msgstr "HotSync-knappen trykket, synkroniserer PDA"
 
-#: ../gpilotd/gpilotd.c:621
+#: ../gpilotd/gpilot-daemon.c:902
 #, c-format
 msgid "PDA ID is %ld, name is %s, owner is %s"
 msgstr "PDA ID er %ld, navn er %s, eier er %s"
 
-#: ../gpilotd/gpilotd.c:631
+#: ../gpilotd/gpilot-daemon.c:912
 #, c-format
 msgid "On host %s\n"
 msgstr "PÃ¥ vert %s\n"
 
-#: ../gpilotd/gpilotd.c:633
+#: ../gpilotd/gpilot-daemon.c:914
 #, c-format
 msgid "On host %d\n"
 msgstr "PÃ¥ vert %d\n"
 
-#: ../gpilotd/gpilotd.c:652
+#: ../gpilotd/gpilot-daemon.c:933
 msgid "Synchronization ended"
 msgstr "Synkronisering avsluttet"
 
-#: ../gpilotd/gpilotd.c:655
+#: ../gpilotd/gpilot-daemon.c:936
 msgid "Synchronization ended early"
 msgstr "Synkronisering avsluttet tidlig"
 
-#: ../gpilotd/gpilotd.c:701
+#: ../gpilotd/gpilot-daemon.c:982
 #, c-format
 msgid "`%s' is not a recognised iconv charset, using `%s' instead."
 msgstr ""
 
-#: ../gpilotd/gpilotd.c:724
+#: ../gpilotd/gpilot-daemon.c:1005
 #, c-format
 msgid ""
 "The base directory %s is invalid.\n"
@@ -1332,7 +1432,7 @@ msgstr ""
 "Basekatalogen %s er ugyldig.\n"
 "Vennligst rett dette opp eller bruk gnomecc til Ã¥ velge en annen katalog."
 
-#: ../gpilotd/gpilotd.c:737
+#: ../gpilotd/gpilot-daemon.c:1018
 #, c-format
 msgid ""
 "Unknown PDA - no PDA matches ID %ld\n"
@@ -1342,268 +1442,272 @@ msgstr ""
 "Bruk gpilotd-control-applet til Ã¥ sette PDAens ID"
 
 #. no ? drop connection then
-#: ../gpilotd/gpilotd.c:788
+#: ../gpilotd/gpilot-daemon.c:1150
 msgid "An error occurred while getting the PDA's system data"
 msgstr "En feil oppstod under henting systemdata fra PDA"
 
 #. no ? drop connection then
-#: ../gpilotd/gpilotd.c:797
+#: ../gpilotd/gpilot-daemon.c:1157
 msgid "An error occurred while getting the PDA's user data"
 msgstr "En feil oppstod under henting av brukers data fra PDA"
 
-#: ../gpilotd/gpilotd.c:802
+#: ../gpilotd/gpilot-daemon.c:1162
 #, c-format
 msgid "Completed events for device %s (%s)"
 msgstr "FullfÃ¸rte hendelser for enhet %s (%s)"
 
-#: ../gpilotd/gpilotd.c:863
+#: ../gpilotd/gpilot-daemon.c:1227
 #, c-format
 msgid "Woke on %s"
 msgstr "VÃ¥knet pÃ¥ %s"
 
-#: ../gpilotd/gpilotd.c:944
+#: ../gpilotd/gpilot-daemon.c:1308
 #, c-format
 msgid "Woke on network: %s"
 msgstr "VÃ¥knet pÃ¥ nettver: %s"
 
-#: ../gpilotd/gpilotd.c:1504
+#: ../gpilotd/gpilot-daemon.c:1578
 #, c-format
 msgid "Watching %s (network)"
 msgstr "OvervÃ¥ker %s (nettverk)"
 
-#: ../gpilotd/gpilotd.c:1506
+#: ../gpilotd/gpilot-daemon.c:1580
 #, c-format
 msgid "Watching %s (bluetooth)"
 msgstr "OvervÃ¥ker %s (bluetooth)"
 
-#: ../gpilotd/gpilotd.c:1508
+#: ../gpilotd/gpilot-daemon.c:1582
 #, c-format
 msgid "Watching %s (%s)"
 msgstr "OvervÃ¥ker %s (%s)"
 
-#: ../gpilotd/gpilotd.c:1522
+#: ../gpilotd/gpilot-daemon.c:1714
+msgid "Shutting down devices"
+msgstr "Stenger ned enheter"
+
+#: ../gpilotd/gpilot-daemon.c:1716
+msgid "Rereading configuration..."
+msgstr "Gjenleser konfigurasjonen..."
+
+#: ../gpilotd/gpilot-daemon.c:2623
+msgid "(unknown DB)"
+msgstr "(ukjent DB)"
+
+#: ../gpilotd/gpilotd.c:54
 msgid "Exiting (caught SIGTERM)..."
 msgstr "Avslutter (mottok SIGTERM)..."
 
-#: ../gpilotd/gpilotd.c:1531
+#: ../gpilotd/gpilotd.c:62
 msgid "Exiting (caught SIGINT)..."
 msgstr "Avslutter (mottok SIGINT)..."
 
-#: ../gpilotd/gpilotd.c:1563
+#: ../gpilotd/gpilotd.c:93
 msgid "Unable to create file installation queue directory"
 msgstr "Kunne ikke opprette kÃ¸katalog for filinstallasjon"
 
-#: ../gpilotd/gpilotd.c:1613
-msgid "Shutting down devices"
-msgstr "Stenger ned enheter"
-
-#: ../gpilotd/gpilotd.c:1615
-msgid "Rereading configuration..."
-msgstr "Gjenleser konfigurasjonen..."
+#: ../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 "feil conduit i listen over conduiter for sikkerhetskopiering"
 
-#: ../gpilotd/manager.c:277
+#: ../gpilotd/manager.c:278
 #, c-format
 msgid "%s backed up\n"
 msgstr "%s sikkerhetskopiert\n"
 
-#: ../gpilotd/manager.c:279
+#: ../gpilotd/manager.c:280
 #, c-format
 msgid "%s backup failed\n"
 msgstr ""
 "%s sikkerhetskopiering feilet\n"
 "\n"
 
-#: ../gpilotd/manager.c:305
+#: ../gpilotd/manager.c:306
 msgid "Collecting synchronization info..."
 msgstr "Samler synkroniseringsinformasjon..."
 
-#: ../gpilotd/manager.c:427
+#: ../gpilotd/manager.c:428
 #, c-format
 msgid "Synchronizing %s\n"
 msgstr "Synkroniserer %s\n"
 
-#: ../gpilotd/manager.c:446
+#: ../gpilotd/manager.c:447
 #, c-format
 msgid "Copy to PDA %s\n"
 msgstr "Kopier til PDA %s\n"
 
-#: ../gpilotd/manager.c:464
+#: ../gpilotd/manager.c:465
 #, c-format
 msgid "Copy from PDA %s\n"
 msgstr "Kopier fra PDA %s\n"
 
-#: ../gpilotd/manager.c:482
+#: ../gpilotd/manager.c:483
 #, c-format
 msgid "Merge to PDA %s\n"
 msgstr "Flett til PDA %s\n"
 
-#: ../gpilotd/manager.c:500
+#: ../gpilotd/manager.c:501
 #, c-format
 msgid "Merge from PDA %s\n"
 msgstr "Flett fra PDA %s\n"
 
-#: ../gpilotd/manager.c:528
+#: ../gpilotd/manager.c:529
 #, c-format
 msgid "Conduit %s's first synchronization..."
 msgstr "FÃ¸rste synkronisering for conduit %s"
 
-#: ../gpilotd/manager.c:552
+#: ../gpilotd/manager.c:553
 #, c-format
 msgid "unknown syncing action (%d = %s).\n"
 msgstr "ukjent synkroniseringshandling (%d = %s).\n"
 
-#: ../gpilotd/manager.c:678
+#: ../gpilotd/manager.c:679
 #, c-format
 msgid "Instantiating %d conduits..."
 msgstr "Instantierer %d conduiter..."
 
-#: ../gpilotd/manager.c:683 ../gpilotd/manager.c:684
+#: ../gpilotd/manager.c:684 ../gpilotd/manager.c:685
 #, c-format
 msgid "Unknown conduit \"%s\" in configure!"
 msgstr "Ukjent conduit \"%s\" i konfigurasjon!"
 
-#: ../gpilotd/manager.c:693
+#: ../gpilotd/manager.c:694
 #, c-format
 msgid "Loading conduit \"%s\" failed!"
 msgstr "Lasting av conduit \"%s\" feilet!"
 
-#: ../gpilotd/manager.c:694
+#: ../gpilotd/manager.c:695
 #, c-format
 msgid "Loading conduit \"%s\" failed!\n"
 msgstr "Lasting av conduit \"%s\" feilet!\n"
 
-#: ../gpilotd/manager.c:783
+#: ../gpilotd/manager.c:785
 #, c-format
 msgid "Setting id/owner to %d/%s..."
 msgstr "Setter id/eier til %d/%s..."
 
 #. FIXME: remove the bloody request, or the user will get this
 #. message every time
-#: ../gpilotd/manager.c:815
+#: ../gpilotd/manager.c:817
 #, c-format
-msgid "Conduit %s requested, but not found"
-msgstr "Conduit %s forespurt, men ikke funnet"
+msgid "Conduit %s requested, but not found.  Is it enabled?"
+msgstr "Conduit %s forespurt, men ikke funnet. Er den slÃ¥tt pÃ¥?"
 
-#: ../gpilotd/manager.c:825
+#: ../gpilotd/manager.c:827
 #, c-format
 msgid "Conduit %s cannot be requested"
 msgstr "Conduit %s kan ikke forespÃ¸rres"
 
-#: ../gpilotd/orbit_daemon_glue.c:1747
-msgid "(unknown DB)"
-msgstr "(ukjent DB)"
-
-#: ../gpilotd/queue_io.c:96
+#: ../gpilotd/queue_io.c:104
 msgid "Error in queue, non-existing entry"
 msgstr "Feil i kÃ¸en, ikke-eksisterende oppfÃ¸ring"
 
-#: ../gpilotd/queue_io.c:436
+#: ../gpilotd/queue_io.c:454
 #, c-format
 msgid "fault: no request found for PDA %d, request %d"
 msgstr "feil: ingen forespÃ¸rsel funnet for PDA %d, forespÃ¸rsel %d"
 
-#: ../libgpilotdCM/gnome-pilot-conduit-management.gob:686
-msgid "module loading not supported, fatal!"
-msgstr "lasting av moduler er ikke stÃ¸ttet, fatal!"
-
-#: ../utils/gpilotd-client.c:39
+#: ../utils/gpilotd-client.c:38
 msgid "Get System Info"
 msgstr "Hent systeminfo"
 
-#: ../utils/gpilotd-client.c:40
+#: ../utils/gpilotd-client.c:39
 msgid "Pause daemon"
 msgstr "Pause daemon"
 
-#: ../utils/gpilotd-client.c:41
+#: ../utils/gpilotd-client.c:40
 msgid "Unpause daemon"
 msgstr "Vekk daemon"
 
-#: ../utils/gpilotd-client.c:42
+#: ../utils/gpilotd-client.c:41
 msgid "Restart daemon"
 msgstr "Start daemon pÃ¥ nytt"
 
-#: ../utils/gpilotd-client.c:43
+#: ../utils/gpilotd-client.c:42
 msgid "Set user id and name"
 msgstr "Sett bruker-id og navn"
 
-#: ../utils/gpilotd-client.c:44
+#: ../utils/gpilotd-client.c:43
 msgid "ID for the PDA"
 msgstr "ID for PDA"
 
-#: ../utils/gpilotd-client.c:45
+#: ../utils/gpilotd-client.c:44
 msgid "Install file"
 msgstr "Installer fil"
 
-#: ../utils/gpilotd-client.c:45
+#: ../utils/gpilotd-client.c:44
 msgid "FILE"
 msgstr "FIL"
 
-#: ../utils/gpilotd-client.c:46
+#: ../utils/gpilotd-client.c:45
 msgid "Restore directory"
 msgstr "Gjenopprett katalog"
 
-#: ../utils/gpilotd-client.c:46
+#: ../utils/gpilotd-client.c:45
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
-#: ../utils/gpilotd-client.c:47
+#: ../utils/gpilotd-client.c:46
 msgid "Run conduit"
 msgstr "KjÃ¸r conduit"
 
-#: ../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 "Brukernavn som skal brukes"
 
-#: ../utils/gpilotd-client.c:48
+#: ../utils/gpilotd-client.c:47
 msgid "USERNAME"
 msgstr "BRUKERNAVN"
 
-#: ../utils/gpilotd-client.c:49
-msgid "Monitor the specified PDA's actions"
-msgstr "OvervÃ¥k handlinger for oppgitt PDA"
-
-#: ../utils/gpilotd-client.c:50
+#: ../utils/gpilotd-client.c:48
 msgid "Monitor all PDAs"
 msgstr "OvervÃ¥k alle PDAer"
 
-#: ../utils/gpilotd-client.c:51
+#: ../utils/gpilotd-client.c:49
 msgid "list PDAs by login (all for all pilots)"
 msgstr "Vis PDAer etter innlogging (alt for alle piloter)"
 
-#: ../utils/gpilotd-client.c:51
+#: ../utils/gpilotd-client.c:49
 msgid "LOGIN"
 msgstr "LOGIN"
 
-#: ../utils/gpilotd-client.c:52
+#: ../utils/gpilotd-client.c:50
 msgid "Specify PDA to operate on (defaults to MyPDA)"
 msgstr "Oppgi PDA som skal benyttes (standardverdi er MyPDA)"
 
-#: ../utils/gpilotd-client.c:52
+#: ../utils/gpilotd-client.c:50
 msgid "PILOTNAME"
 msgstr "PILOTNAVN"
 
-#: ../utils/gpilotd-client.c:53
+#: ../utils/gpilotd-client.c:51
 msgid "Specify a cradle to operate on (defaults to Cradle0)"
 msgstr "Spesifiser en dokk det skal opereres pÃ¥ (standardverdi er Cradle0)"
 
-#: ../utils/gpilotd-client.c:53
+#: ../utils/gpilotd-client.c:51
 msgid "CRADLENAME"
 msgstr "DOKKNAVN"
 
+#: ../utils/gpilotd-client.c:52
+msgid "List users"
+msgstr "Vis brukere"
+
+#: ../utils/gpilotd-client.c:53
+msgid "List cradles"
+msgstr ""
+
 #: ../utils/gpilotd-client.c:54
 #, fuzzy
 msgid "List the specified PDA's bases"
 msgstr "Vis oppgitt PDA's baser"
 
-#: ../utils/gpilotd-client.c:359 ../utils/gpilotdcm-client.c:106
+#: ../utils/gpilotd-client.c:472 ../utils/gpilotdcm-client.c:113
 #, c-format
 msgid ""
 "\n"
@@ -1616,54 +1720,46 @@ msgstr ""
 "Dette er et verktÃ¸y for spesifikke deler av gnome-pilot pakken.\n"
 "Hvis du ikke vet hva du gjÃ¸r bÃ¸r du ikke bruke dette verktÃ¸yet."
 
-#: ../utils/gpilotdcm-client.c:26
+#: ../utils/gpilotdcm-client.c:25
 msgid "lists available conduits"
 msgstr "list tilgjengelige conduiter"
 
-#: ../utils/gpilotdcm-client.c:27
+#: ../utils/gpilotdcm-client.c:26
 msgid "conduit to operate on"
 msgstr "conduit det skal opereres pÃ¥"
 
-#: ../utils/gpilotdcm-client.c:28
+#: ../utils/gpilotdcm-client.c:27
 msgid "list all attributes"
 msgstr "list alle attributter"
 
-#: ../utils/gpilotdcm-client.c:29
+#: ../utils/gpilotdcm-client.c:28
 msgid "specify PDA to operate on"
 msgstr "oppgit PDA som skal benyttes"
 
-#: ../utils/gpilotdcm-client.c:29
+#: ../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 "list attributter"
 
-#: ../utils/gpilotdcm-client.c:31
+#: ../utils/gpilotdcm-client.c:30
 msgid "list available conduits and their state"
 msgstr "list tilgjengelige conduiter og deres status"
 
-#: ../utils/gpilotdcm-client.c:32
+#: ../utils/gpilotdcm-client.c:31
 msgid "enable specified conduit"
 msgstr "slÃ¥ pÃ¥ spesifisert conduit"
 
-#: ../utils/gpilotdcm-client.c:33
+#: ../utils/gpilotdcm-client.c:32
 msgid "disable specified conduit"
 msgstr "slÃ¥ av spesifisert conduit"
 
-#: ../utils/gpilotdcm-client.c:34
+#: ../utils/gpilotdcm-client.c:33
 msgid "enable, and set firstsync to slow"
 msgstr "slÃ¥ pÃ¥, og sett fÃ¸rste synk til sakte"
 
-#: ../utils/gpilotdcm-client.c:35
+#: ../utils/gpilotdcm-client.c:34
 msgid "instantiate and destroy the conduit"
 msgstr "start og Ã¸delegg komponenten"
-
-#: ../applet/gpilot-applet.desktop.in.h:1
-msgid "PilotSync"
-msgstr "PilotSynk"
-
-#: ../applet/gpilot-applet.desktop.in.h:2
-msgid "Synchroniser for PalmOS PDAs"
-msgstr "Synkronisering for PalmOS PDAer"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]