[seahorse] Updated Norwegian bokmål translation

[Kjartan Maraas <kmaraas src gnome org>]

commit bdd1950949a3a63a1a1a4aeee561d2da55b3a03c
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sun Aug 21 21:51:30 2011 +0200

    Updated Norwegian bokmÃl translation

 po/nb.po | 1416 ++++++++++++++++++++------------------------------------------
 1 files changed, 442 insertions(+), 974 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 6b8a54e..4a9afd0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: seahorse 2.92.x\n"
+"Project-Id-Version: seahorse 3.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-23 14:34+0100\n"
-"PO-Revision-Date: 2011-01-20 19:10+0100\n"
+"POT-Creation-Date: 2011-08-21 21:49+0200\n"
+"PO-Revision-Date: 2011-08-21 21:51+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian <i18n-nb lister ping uio no>\n"
 "Language: no\n"
@@ -16,342 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../daemon/seahorse-daemon.c:64
-msgid "Do not run seahorse-daemon as a daemon"
-msgstr "Ikke kjÃr seahorse-daemon som en tjeneste"
-
-#: ../daemon/seahorse-daemon.c:94
-msgid "couldn't fork process"
-msgstr "kunne ikke starte prosess"
-
-#: ../daemon/seahorse-daemon.c:100
-msgid "couldn't create new process group"
-msgstr "kunne ikke opprette ny prosessgruppe"
-
-#: ../daemon/seahorse-daemon.c:250
-msgid "Encryption Daemon (Seahorse)"
-msgstr "Krypteringstjeneste (Seahorse)"
-
-#: ../daemon/seahorse-service.c:164 ../daemon/seahorse-service.c:277
-#, c-format
-msgid "Invalid or unrecognized key type: %s"
-msgstr "Ugyldig eller ugjenkjennelig nÃkkeltype: %s"
-
-#: ../daemon/seahorse-service.c:234
-#, c-format
-msgid "This keytype is not supported: %s"
-msgstr "Denne typen nÃkkel er ikke stÃttet: %s"
-
-#: ../daemon/seahorse-service.c:241
-#, c-format
-msgid "Support for this feature was not enabled at build time"
-msgstr ""
-"StÃtte for denne funksjonen var ikke slÃtt pà nÃr programmet ble bygget"
-
-#: ../daemon/seahorse-service.c:341 ../daemon/seahorse-service-keyset.c:180
-#: ../daemon/seahorse-service-keyset.c:223
-#, c-format
-msgid "Invalid or unrecognized key: %s"
-msgstr "Ugyldig eller ugjent nÃkkel: %s"
-
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../daemon/seahorse-service-crypto.c:204
-#, c-format
-msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
-msgstr "Signert av <i><key id='%s'/> <b>utlÃpt</b></i> den %s."
-
-#: ../daemon/seahorse-service-crypto.c:205
-msgid "Invalid Signature"
-msgstr "Ugyldig signatur"
-
-#: ../daemon/seahorse-service-crypto.c:211
-#, c-format
-msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
-msgstr "Signert av <i><key id='%s'/></i> den %s <b>UtlÃpt</b>."
-
-#: ../daemon/seahorse-service-crypto.c:212
-msgid "Expired Signature"
-msgstr "UtgÃtt signatur"
-
-#: ../daemon/seahorse-service-crypto.c:218
-#, c-format
-msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
-msgstr "Signert av <i><key id='%s'/> <b>Tilbakekalt</b></i> den %s."
-
-#: ../daemon/seahorse-service-crypto.c:219
-msgid "Revoked Signature"
-msgstr "Tilbakekalt signatur"
-
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../daemon/seahorse-service-crypto.c:225
-#, c-format
-msgid "Signed by <i><key id='%s'/></i> on %s."
-msgstr "Signert av <i><key id='%s'/></i> den %s."
-
-#: ../daemon/seahorse-service-crypto.c:226
-msgid "Good Signature"
-msgstr "God signatur"
-
-#: ../daemon/seahorse-service-crypto.c:231
-msgid "Signing key not in keyring."
-msgstr "Signerer nÃkkel som ikke er pà nÃkkelringen."
-
-#: ../daemon/seahorse-service-crypto.c:232
-msgid "Unknown Signature"
-msgstr "Ukjent signatur"
-
-#: ../daemon/seahorse-service-crypto.c:236
-msgid "Bad or forged signature. The signed data was modified."
-msgstr "Ugyldig eller falsk signatur. Signerte data er endret."
-
-#: ../daemon/seahorse-service-crypto.c:237
-msgid "Bad Signature"
-msgstr "DÃrlig signatur"
-
-#: ../daemon/seahorse-service-crypto.c:245
-msgid "Couldn't verify signature."
-msgstr "Kunne ikke verifisere signatur."
-
-#: ../daemon/seahorse-service-crypto.c:317
-#: ../daemon/seahorse-service-crypto.c:646
-#, c-format
-msgid "Invalid or unrecognized signer: %s"
-msgstr "Ugyldig eller ukjent signerer: %s"
-
-#: ../daemon/seahorse-service-crypto.c:324
-#: ../daemon/seahorse-service-crypto.c:653
-#, c-format
-msgid "Key is not valid for signing: %s"
-msgstr "NÃkkelen er ikke gyldig for signering: %s"
-
-#: ../daemon/seahorse-service-crypto.c:335
-#, c-format
-msgid "Invalid or unrecognized recipient: %s"
-msgstr "Ugyldig eller ikke gjenkjent mottaker: %s"
-
-#: ../daemon/seahorse-service-crypto.c:343
-#, c-format
-msgid "Key is not a valid recipient for encryption: %s"
-msgstr "NÃkkelen er ikke en gyldig mottaker for kryptering: %s"
-
-#: ../daemon/seahorse-service-crypto.c:352
-#, c-format
-msgid "No recipients specified"
-msgstr "Ingen mottakere oppgitt"
-
-#: ../daemon/seahorse-service-crypto.c:434
-#, c-format
-msgid "Invalid key type for decryption: %s"
-msgstr "Ugyldig nÃkkeltype for dekryptering: %s"
-
-#: ../daemon/seahorse-service-crypto.c:548
-#: ../daemon/seahorse-service-crypto.c:746
-#, c-format
-msgid "Please set clearuri"
-msgstr "Vennligst sett clearuri"
-
-#: ../daemon/seahorse-service-crypto.c:554
-#: ../daemon/seahorse-service-crypto.c:752
-#, c-format
-msgid "Please set crypturi"
-msgstr "Vennligst sett crypturi"
-
-#: ../daemon/seahorse-service-crypto.c:564
-#, c-format
-msgid "Error opening clearuri"
-msgstr "Feil under Ãpning av clearuri"
-
-#: ../daemon/seahorse-service-crypto.c:641
-#, c-format
-msgid "No signer specified"
-msgstr "Ingen signerer oppgitt"
-
-#: ../daemon/seahorse-service-crypto.c:830
-#, c-format
-msgid "Invalid key type for verifying: %s"
-msgstr "Ugyldig nÃkkeltype for verifisering: %s"
-
-#: ../daemon/seahorse-service-keyset.c:273
-#, c-format
-msgid "Invalid key id: %s"
-msgstr "Ugyldig nÃkkel-ID: %s"
-
-#: ../data/seahorse.schemas.in.h:1
-msgid ""
-"A list of key server URIs to search for remote PGP keys. In later versions a "
-"display name can be included, by appending a space and then the name."
-msgstr ""
-"En liste med URIer til nÃkkeltjenere for à sÃke etter eksterne PGP-nÃkler. I "
-"senere versjoner kan et visningsnavn tas med ved à legge til et mellomrom og "
-"sà navnet."
-
-#: ../data/seahorse.schemas.in.h:2
-msgid "Auto Retrieve Keys"
-msgstr "Henter nÃkler automatisk"
-
-#: ../data/seahorse.schemas.in.h:3
-msgid "Auto Sync Keys"
-msgstr "Synkroniser nÃkler automatisk"
-
-#: ../data/seahorse.schemas.in.h:4
-msgid "Controls the visibility of the expires column for the key manager."
-msgstr "Kontroller synligheten av utlÃpskolonnen for nÃkkelhÃndtereren."
-
-#: ../data/seahorse.schemas.in.h:5
-msgid "Controls the visibility of the trust column for the key manager."
-msgstr "Kontroller synligheten av tillitskolonnen for nÃkkelhÃndtereren."
-
-#: ../data/seahorse.schemas.in.h:6
-msgid "Controls the visibility of the type column for the key manager."
-msgstr "Kontroller synligheten av typekolonnen for nÃkkelhÃndtereren."
-
-#: ../data/seahorse.schemas.in.h:7
-msgid "Controls the visibility of the validity column for the key manager."
-msgstr "Kontroller synligheten av gyldighetskolonnen for nÃkkelhÃndtereren."
-
-#: ../data/seahorse.schemas.in.h:8
-msgid "Enable DNS-SD sharing"
-msgstr "Aktiver DNS-SD-deling"
-
-#: ../data/seahorse.schemas.in.h:9
-msgid ""
-"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be "
-"running and must be built with HKP and DNS-SD support."
-msgstr ""
-"Aktiverer DNS-SD-deling (Apple Bonjour) av nÃkler. seahorse-daemon mà kjÃre "
-"og mà vÃre bygget med stÃtte for HKP og DNS-SD."
-
-#: ../data/seahorse.schemas.in.h:10
-msgid "ID of the default key"
-msgstr "ID for forvalgt nÃkkel"
-
-#: ../data/seahorse.schemas.in.h:11
-msgid ""
-"If set to true, then files encrypted with seahorse will be ASCII armor "
-"encoded."
-msgstr ""
-"Hvis denne settes til Âtrue vil filer som krypteres med seahorse kodes med "
-"ÂASCII-armorÂ."
-
-#: ../data/seahorse.schemas.in.h:12
-msgid ""
-"If set to true, then the default key will always be added to an encryption "
-"recipients list."
-msgstr ""
-"Hvis denne er satt til sann, sà vil den forvalgte nÃkkelen alltid à legges "
-"til en liste over krypteringsmottakere."
-
-#: ../data/seahorse.schemas.in.h:13
-msgid "Last key server search pattern"
-msgstr "Forrige sÃkemÃnster pà nÃkkeltjener"
-
-#: ../data/seahorse.schemas.in.h:14
-msgid "Last key servers used"
-msgstr "Siste brukte nÃkkeltjenere"
-
-#: ../data/seahorse.schemas.in.h:15
-msgid "Last key used to sign a message."
-msgstr "Siste nÃkkel brukt for à signere en melding."
-
-#: ../data/seahorse.schemas.in.h:16
-msgid "PGP Key servers"
-msgstr "PGP-nÃkkeltjenere"
-
-#: ../data/seahorse.schemas.in.h:17
-msgid "Publish keys to this key server."
-msgstr "Publiser nÃkler til denne nÃkkeltjeneren."
-
-#: ../data/seahorse.schemas.in.h:18
-msgid "Show expires column in key manager"
-msgstr "Vis utlÃpskolonnen i nÃkkelhÃndtereren"
-
-#: ../data/seahorse.schemas.in.h:19
-msgid "Show trust column in key manager"
-msgstr "Vis tillitskolonnen i nÃkkelhÃndtereren"
-
-#: ../data/seahorse.schemas.in.h:20
-msgid "Show type column in key manager"
-msgstr "Vis typekolonnen i nÃkkelhÃndtereren"
-
-#: ../data/seahorse.schemas.in.h:21
-msgid "Show validity column in key manager"
-msgstr "Vis gyldighetskolonnen i nÃkkelhÃndtereren"
-
-#: ../data/seahorse.schemas.in.h:22
-msgid ""
-"Specify the column to sort the recipients window by. Columns are: 'name' and "
-"'id'. Put a '-' in front of the column name to sort in descending order."
-msgstr ""
-"Oppgi kolonne for sortering av mottakervinduet. Kolonne kan vÃre: Âname og "
-"ÂidÂ. Sett Â- foran kolonnenavnet for à sortere i synkende rekkefÃlge."
-
-#: ../data/seahorse.schemas.in.h:23
-msgid ""
-"Specify the column to sort the seahorse key manager main window by. Columns "
-"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in "
-"front of the column name to sort in descending order."
-msgstr ""
-"Oppgi kolonne for sortering av hovedvindu i seahorse nÃkkelhÃndterer. "
-"Kolonner kan vÃre: ÂnameÂ, ÂidÂ, ÂvalidityÂ, ÂexpiresÂ, Âtrust og ÂtypeÂ. "
-"Sett Â- foran kolonnenavnet for à sortere i synkende rekkefÃlge."
-
-#: ../data/seahorse.schemas.in.h:24
-msgid "The ID of the last secret key used to sign a message."
-msgstr "ID for siste hemmelige nÃkkel som ble brukt til à signere en melding."
-
-#: ../data/seahorse.schemas.in.h:25
-msgid "The column to sort the recipients by"
-msgstr "Kolonne for sortering av mottakere"
-
-#: ../data/seahorse.schemas.in.h:26
-msgid "The column to sort the seahorse keys by"
-msgstr "Kolonne nÃkler skal sorteres etter i seahorse"
-
-#: ../data/seahorse.schemas.in.h:27
-msgid ""
-"The key server to publish PGP keys to. Or empty to suppress publishing of "
-"PGP keys."
-msgstr ""
-"NÃkkeltjener som brukes for publisering av PGP-nÃkler. Ingen verdi stopper "
-"publisering av PGP-nÃkler."
-
-#: ../data/seahorse.schemas.in.h:28
-msgid ""
-"The last key server a search was performed against or empty for all key "
-"servers."
-msgstr ""
-"Siste nÃkkeltjener et sÃk ble utfÃrt mot eller tom for alle nÃkkeltjenere."
-
-#: ../data/seahorse.schemas.in.h:29
-msgid "The last search pattern searched for against a key server."
-msgstr "Siste sÃkemÃnster brukt mot en nÃkkeltjener."
-
-#: ../data/seahorse.schemas.in.h:30
-msgid ""
-"This specifies the default key to use for certain operations, mainly signing."
-msgstr ""
-"Dette oppgir forvalgt nÃkkel som skal brukes for visse operasjoner, "
-"hovedsaklig signering."
-
-#: ../data/seahorse.schemas.in.h:31
-msgid "Whether or not keys should be automatically retrieved from key servers."
-msgstr "Om nÃkler skal hentes fra nÃkkeltjenere automatisk."
-
-#: ../data/seahorse.schemas.in.h:32
-msgid ""
-"Whether or not modified keys should be automatically synced with the default "
-"key server."
-msgstr ""
-"Om endrede nÃkler skal synkroniseres med forvalgt nÃkkeltjener automatisk."
-
-#: ../data/seahorse.schemas.in.h:33
-msgid "Whether to always encrypt to default key"
-msgstr "Om forvalgt nÃkkel alltid skal krypteres"
-
-#: ../data/seahorse.schemas.in.h:34
-msgid "Whether to use ASCII Armor"
-msgstr "Om ASCII-rustning skal brukes"
-
 #: ../gkr/seahorse-add-keyring.xml.h:1
 msgid "Add Password Keyring"
 msgstr "Legg til nÃkkelring for passord"
@@ -374,7 +38,7 @@ msgstr ""
 msgid "The host name or address of the server."
 msgstr "Vertsnavnet eller adressen til tjeneren."
 
-#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:73
+#: ../gkr/seahorse-gkr-add-item.c:51 ../gkr/seahorse-gkr-add-keyring.c:65
 msgid "Couldn't add keyring"
 msgstr "Kunne ikke legge til nÃkkelring"
 
@@ -383,7 +47,7 @@ msgid "Add Password"
 msgstr "Legg til passord"
 
 #: ../gkr/seahorse-gkr-add-item.xml.h:2
-#: ../gkr/seahorse-gkr-item-properties.xml.h:15 ../pgp/seahorse-revoke.xml.h:5
+#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
@@ -399,235 +63,229 @@ msgstr "_Passord:"
 msgid "_Show Password"
 msgstr "Vi_s passord"
 
-#: ../gkr/seahorse-gkr-item.c:473
+#: ../gkr/seahorse-gkr-item.c:437
 msgid "Web Password"
 msgstr "Passord for nettside"
 
-#: ../gkr/seahorse-gkr-item.c:475
+#: ../gkr/seahorse-gkr-item.c:439
 msgid "Network Password"
 msgstr "Nettverkspassord"
 
-#: ../gkr/seahorse-gkr-item.c:477 ../gkr/seahorse-gkr-item-properties.c:107
+#: ../gkr/seahorse-gkr-item.c:441 ../gkr/seahorse-gkr-item-properties.c:108
 msgid "Password"
 msgstr "Passord"
 
 #: ../gkr/seahorse-gkr-item-commands.c:78
+msgid "Couldn't delete item"
+msgstr "Kunne ikke slette oppfÃring"
+
+#: ../gkr/seahorse-gkr-item-commands.c:100
 #, c-format
 msgid "Are you sure you want to delete the password '%s'?"
 msgstr "Er du sikker pà at du vil slette passordet Â%sÂ?"
 
-#: ../gkr/seahorse-gkr-item-commands.c:81
+#: ../gkr/seahorse-gkr-item-commands.c:103
 #, c-format
 msgid "Are you sure you want to delete %d password?"
 msgid_plural "Are you sure you want to delete %d passwords?"
 msgstr[0] "Er du sikker pà at du vil slette %d passord?"
 msgstr[1] "Er du sikker pà at du vil slette %d passord?"
 
-#: ../gkr/seahorse-gkr-item-properties.c:66
+#: ../gkr/seahorse-gkr-item-commands.c:114
+msgid "Deleting item"
+msgstr "Sletter oppfÃring"
+
+#: ../gkr/seahorse-gkr-item-commands.c:114
+msgid "Deleting items"
+msgstr "Sletter oppfÃringer"
+
+#: ../gkr/seahorse-gkr-item-properties.c:67
 msgid "Access a network share or resource"
 msgstr "Aksesser en delt nettverksressurs"
 
-#: ../gkr/seahorse-gkr-item-properties.c:69
+#: ../gkr/seahorse-gkr-item-properties.c:70
 msgid "Access a website"
 msgstr "Aksesser et nettsted"
 
-#: ../gkr/seahorse-gkr-item-properties.c:72
+#: ../gkr/seahorse-gkr-item-properties.c:73
 msgid "Unlocks a PGP key"
 msgstr "LÃser opp en GPG-nÃkkel"
 
-#: ../gkr/seahorse-gkr-item-properties.c:75
+#: ../gkr/seahorse-gkr-item-properties.c:76
 msgid "Unlocks a Secure Shell key"
 msgstr "LÃser opp en nÃkkel for sikkert skall"
 
-#: ../gkr/seahorse-gkr-item-properties.c:78
+#: ../gkr/seahorse-gkr-item-properties.c:79
 msgid "Saved password or login"
 msgstr "Lagret passord eller pÃlogging"
 
-#: ../gkr/seahorse-gkr-item-properties.c:102
+#: ../gkr/seahorse-gkr-item-properties.c:103
 msgid "Network Credentials"
 msgstr "PÃloggingsinformasjon for nettverk"
 
-#: ../gkr/seahorse-gkr-item-properties.c:245
+#: ../gkr/seahorse-gkr-item-properties.c:208
 msgid "Couldn't change password."
 msgstr "Kunne ikke endre passord"
 
-#: ../gkr/seahorse-gkr-item-properties.c:350
+#: ../gkr/seahorse-gkr-item-properties.c:253
+#: ../gkr/seahorse-gkr-item-properties.c:369
+msgid "Updating password"
+msgstr "Oppdaterer passord"
+
+#: ../gkr/seahorse-gkr-item-properties.c:330
 msgid "Couldn't set description."
 msgstr "Kunne ikke sette beskrivelse"
 
-#: ../gkr/seahorse-gkr-item-properties.c:656
-msgid "Couldn't set application access."
-msgstr "Kunne ikke sette tilgang for program."
-
 #: ../gkr/seahorse-gkr-item-properties.xml.h:1
 msgid "<b>Password:</b>"
 msgstr "<b>Passord:</b>"
 
 #: ../gkr/seahorse-gkr-item-properties.xml.h:2
-msgid "<b>Path:</b>"
-msgstr "<b>Sti:</b>"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:3
-msgid "<b>Permissions:</b>"
-msgstr "<b>Tillatelser:</b>"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:4
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:8
 #: ../ssh/seahorse-ssh-key-properties.xml.h:7
 msgid "<b>Technical Details:</b>"
 msgstr "<b>Tekniske detaljer:</b>"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:5
-msgid "Applications"
-msgstr "Programmer"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:6
+#: ../gkr/seahorse-gkr-item-properties.xml.h:3
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:22
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:19
 #: ../ssh/seahorse-ssh-key-properties.xml.h:15
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:7
+#: ../gkr/seahorse-gkr-item-properties.xml.h:4
 #: ../pgp/seahorse-pgp-subkey.c:366
 #: ../ssh/seahorse-ssh-key-properties.xml.h:17
 msgid "Key"
 msgstr "NÃkkel"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:8
+#: ../gkr/seahorse-gkr-item-properties.xml.h:5
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:30
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:30
 #: ../ssh/seahorse-ssh-key-properties.xml.h:18
 msgid "Key Properties"
 msgstr "Egenskaper for nÃkkel"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:9
+#: ../gkr/seahorse-gkr-item-properties.xml.h:6
 msgid "Login:"
 msgstr "PÃlogging:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:10
+#: ../gkr/seahorse-gkr-item-properties.xml.h:7
 msgid "Server:"
 msgstr "Tjener:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:11
+#: ../gkr/seahorse-gkr-item-properties.xml.h:8
 msgid "Show pass_word"
 msgstr "Vis pass_ord"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:12
+#: ../gkr/seahorse-gkr-item-properties.xml.h:9
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:44
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:38
 msgid "Type:"
 msgstr "Type:"
 
 #. To translators: This is the noun not the verb.
-#: ../gkr/seahorse-gkr-item-properties.xml.h:14
+#: ../gkr/seahorse-gkr-item-properties.xml.h:11
 msgid "Use:"
 msgstr "Bruk:"
 
-#. To translators: This is the infinitive not the imperative.
-#: ../gkr/seahorse-gkr-item-properties.xml.h:17
-msgid "_Read"
-msgstr "_Les"
-
-#. To translators: This is the infinitive not the imperative.
-#: ../gkr/seahorse-gkr-item-properties.xml.h:19
-msgid "_Write"
-msgstr "_Skriv"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:20
-msgctxt "infinitive"
-msgid "_Delete"
-msgstr "_Slett"
-
-#: ../gkr/seahorse-gkr-keyring.c:193
-msgid "Listing passwords"
-msgstr "Lister passord"
-
-#: ../gkr/seahorse-gkr-keyring.c:354
+#: ../gkr/seahorse-gkr-keyring.c:121
 #, c-format
 msgid "Passwords: %s"
 msgstr "Passord: %s"
 
-#: ../gkr/seahorse-gkr-keyring.c:355
+#: ../gkr/seahorse-gkr-keyring.c:122
 #, c-format
 msgid "<b>Passwords:</b> %s"
 msgstr "<b>Passord:</b> %s"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:119
+#: ../gkr/seahorse-gkr-keyring-commands.c:113
 msgid "Password Keyring"
 msgstr "NÃkkelringer for passord"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:120
+#: ../gkr/seahorse-gkr-keyring-commands.c:114
 msgid "Used to store application and network passwords"
 msgstr "Brukes til à lagre passord for programmer og nettverk"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:121
+#: ../gkr/seahorse-gkr-keyring-commands.c:115
 msgid "Stored Password"
 msgstr "Lagret passord"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:122
+#: ../gkr/seahorse-gkr-keyring-commands.c:116
 msgid "Safely store a password or secret."
 msgstr "Lagre et passord eller en hemmelighet pà en trygg mÃte."
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:136
+#: ../gkr/seahorse-gkr-keyring-commands.c:130
 msgid "Couldn't unlock keyring"
 msgstr "Kunne ikke lÃse opp nÃkkelring"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:177
+#: ../gkr/seahorse-gkr-keyring-commands.c:169
 msgid "Couldn't lock keyring"
 msgstr "Kunne ikke lÃse nÃkkelring"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:218
+#: ../gkr/seahorse-gkr-keyring-commands.c:208
 msgid "Couldn't set default keyring"
 msgstr "Kunne ikke sette forvalgt nÃkkelring"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:257
+#: ../gkr/seahorse-gkr-keyring-commands.c:247
 msgid "Couldn't change keyring password"
 msgstr "Kunne ikke endre passord for nÃkkelring"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:288
+#: ../gkr/seahorse-gkr-keyring-commands.c:276
 msgid "_Lock"
 msgstr "_LÃs"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:289
+#: ../gkr/seahorse-gkr-keyring-commands.c:277
 msgid ""
 "Lock the password storage keyring so a master password is required to unlock "
 "it."
 msgstr ""
 "LÃs nÃkkelring for passordlager og krev et hovedpassord for à lÃse den opp."
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:290
+#: ../gkr/seahorse-gkr-keyring-commands.c:278
 msgid "_Unlock"
 msgstr "LÃs _opp"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:291
+#: ../gkr/seahorse-gkr-keyring-commands.c:279
 msgid ""
 "Unlock the password storage keyring with a master password so it is "
 "available for use."
 msgstr ""
 "LÃs opp nÃkkelring for passordlager slik at den er tilgjengelig for bruk."
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:292
+#: ../gkr/seahorse-gkr-keyring-commands.c:280
 msgid "_Set as default"
 msgstr "_Sett som forvalg"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:293
+#: ../gkr/seahorse-gkr-keyring-commands.c:281
 msgid "Applications usually store new passwords in the default keyring."
 msgstr "Programmer lagrer vanligvis nye passord i forvalgt nÃkkelring."
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:294
+#: ../gkr/seahorse-gkr-keyring-commands.c:282
 msgid "Change _Password"
 msgstr "Bytt _passord"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:295
+#: ../gkr/seahorse-gkr-keyring-commands.c:283
 msgid "Change the unlock password of the password storage keyring"
 msgstr "Endre passord for à lÃse opp nÃkkelring for lagring av passord"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:360
+#: ../gkr/seahorse-gkr-keyring-commands.c:348
+msgid "Couldn't delete keyring"
+msgstr "Kunne ikke slette nÃkkelring"
+
+#: ../gkr/seahorse-gkr-keyring-commands.c:366
 #, c-format
 msgid "Are you sure you want to delete the password keyring '%s'?"
 msgstr "Er du sikker pà at du vil slette passordnÃkkelring Â%sÂ?"
 
+#: ../gkr/seahorse-gkr-keyring-commands.c:376
+msgid "Deleting keyring"
+msgstr "Sletter nÃkkelring â"
+
+#: ../gkr/seahorse-gkr-keyring-commands.c:376
+msgid "Deleting keyrings"
+msgstr "Sletter nÃkkelringer"
+
 #. -----------------------------------------------------------------------------
 #. * PUBLIC
 #.
@@ -650,266 +308,196 @@ msgstr "Egenskaper for nÃkkelring"
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../gkr/seahorse-gkr-operation.c:168
+#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73
+#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:257
+msgid "The operation was cancelled"
+msgstr "Operasjonen ble avbrutt"
+
+#: ../gkr/seahorse-gkr-operation.c:57
 msgid "Access to the key ring was denied"
 msgstr "Tilgang til nÃkkelringen ble nektet"
 
-#: ../gkr/seahorse-gkr-operation.c:171
+#: ../gkr/seahorse-gkr-operation.c:60
 msgid "The gnome-keyring daemon is not running"
 msgstr "gnome-keyring-tjenesten kjÃrer ikke"
 
-#: ../gkr/seahorse-gkr-operation.c:174
+#: ../gkr/seahorse-gkr-operation.c:63
 msgid "The key ring has already been unlocked"
 msgstr "NÃkkelringen er allerede lÃst opp"
 
-#: ../gkr/seahorse-gkr-operation.c:177
+#: ../gkr/seahorse-gkr-operation.c:66
 msgid "No such key ring exists"
 msgstr "NÃkkelringen eksisterer ikke"
 
-#: ../gkr/seahorse-gkr-operation.c:180
+#: ../gkr/seahorse-gkr-operation.c:69
 msgid "Couldn't communicate with key ring daemon"
 msgstr "Kunne ikke kommunisere med nÃkkelringtjenesten"
 
-#: ../gkr/seahorse-gkr-operation.c:183
+#: ../gkr/seahorse-gkr-operation.c:72
 msgid "The item already exists"
 msgstr "OppfÃringen eksisterer allerede"
 
-#: ../gkr/seahorse-gkr-operation.c:189
+#: ../gkr/seahorse-gkr-operation.c:78
 msgid "Internal error accessing gnome-keyring"
 msgstr "Intern feil ved aksess til gnome-keyring"
 
-#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264
-msgid "Saving item..."
-msgstr "Lagrer oppfÃring â"
-
-#: ../gkr/seahorse-gkr-operation.c:300
-msgid "Deleting item..."
-msgstr "Sletter oppfÃring â"
-
-#: ../gkr/seahorse-gkr-operation.c:325
-msgid "Deleting keyring..."
-msgstr "Sletter nÃkkelring â"
-
-#: ../gkr/seahorse-gkr-source.c:234
-msgid "Listing password keyrings"
-msgstr "Viser nÃkkelringer med passord"
-
-#: ../libcryptui/cryptui.c:272
-msgid ""
-"No encryption keys were found with which to perform the operation you "
-"requested.  The program <b>Passwords and Encryption Keys</b> will now be "
-"started so that you may either create a key or import one."
-msgstr ""
-"Fant ingen krypteringsnÃkler for à utfÃre operasjonen du forespurte. "
-"Programmet <b>Passord og krypteringsnÃkler</b> vil nà startes slik at du kan "
-"lage en nÃkkel eller importere en."
-
-#: ../libcryptui/cryptui-key-chooser.c:174
-#: ../libcryptui/cryptui-key-chooser.c:179
-msgid "All Keys"
-msgstr "Alle nÃkler"
-
-#: ../libcryptui/cryptui-key-chooser.c:175
-#: ../libcryptui/cryptui-key-chooser.c:180
-msgid "Selected Recipients"
-msgstr "Valgte mottakere"
-
-#: ../libcryptui/cryptui-key-chooser.c:176
-#: ../libcryptui/cryptui-key-chooser.c:181
-msgid "Search Results"
-msgstr "SÃkeresultater"
-
-#. Filter Label
-#: ../libcryptui/cryptui-key-chooser.c:192
-msgid "Search _for:"
-msgstr "SÃk _etter:"
-
-#: ../libcryptui/cryptui-key-chooser.c:250
-msgid "None (Don't Sign)"
-msgstr "Ingen (Ikke signer)"
-
-#: ../libcryptui/cryptui-key-chooser.c:263
-#, c-format
-msgid "Sign this message as %s"
-msgstr "Signer denne meldingen som %s"
-
-#. Sign Label
-#: ../libcryptui/cryptui-key-chooser.c:285
-msgid "_Sign message as:"
-msgstr "_Signer melding som:"
-
-#. TODO: Icons
-#. The name column
-#: ../libcryptui/cryptui-key-list.c:140
-#: ../pgp/seahorse-pgp-key-properties.c:839
-#: ../src/seahorse-key-manager-store.c:865
-msgid "Name"
-msgstr "Navn"
-
-#. The keyid column
-#: ../libcryptui/cryptui-key-list.c:145
-#: ../pgp/seahorse-pgp-key-properties.c:1745
-#: ../src/seahorse-key-manager-store.c:877
-msgid "Key ID"
-msgstr "NÃkkel-ID"
-
-#: ../libegg/egg-datetime.c:325
+#: ../libegg/egg-datetime.c:317
 msgid "Display flags"
 msgstr "Vis flagg"
 
-#: ../libegg/egg-datetime.c:326
+#: ../libegg/egg-datetime.c:318
 msgid "Displayed date and/or time properties"
 msgstr "Viste egenskaper for dato og/eller tid"
 
-#: ../libegg/egg-datetime.c:331
+#: ../libegg/egg-datetime.c:323
 msgid "Lazy mode"
 msgstr "Lat modus"
 
-#: ../libegg/egg-datetime.c:332
+#: ../libegg/egg-datetime.c:324
 msgid "Lazy mode doesn't normalize entered date and time values"
 msgstr "Lat modus normaliserer ikke oppgitte dato- og tidsverdier"
 
-#: ../libegg/egg-datetime.c:337
+#: ../libegg/egg-datetime.c:329
 msgid "Year"
 msgstr "Ãr"
 
-#: ../libegg/egg-datetime.c:338
+#: ../libegg/egg-datetime.c:330
 msgid "Displayed year"
 msgstr "Vist Ãr"
 
-#: ../libegg/egg-datetime.c:343
+#: ../libegg/egg-datetime.c:335
 msgid "Month"
 msgstr "MÃned"
 
-#: ../libegg/egg-datetime.c:344
+#: ../libegg/egg-datetime.c:336
 msgid "Displayed month"
 msgstr "Vist mÃned"
 
-#: ../libegg/egg-datetime.c:349
+#: ../libegg/egg-datetime.c:341
 msgid "Day"
 msgstr "Dag"
 
-#: ../libegg/egg-datetime.c:350
+#: ../libegg/egg-datetime.c:342
 msgid "Displayed day of month"
 msgstr "Vist dag i mÃneden"
 
-#: ../libegg/egg-datetime.c:355
+#: ../libegg/egg-datetime.c:347
 msgid "Hour"
 msgstr "Time"
 
-#: ../libegg/egg-datetime.c:356
+#: ../libegg/egg-datetime.c:348
 msgid "Displayed hour"
 msgstr "Vist time"
 
-#: ../libegg/egg-datetime.c:361
+#: ../libegg/egg-datetime.c:353
 msgid "Minute"
 msgstr " Minutt"
 
-#: ../libegg/egg-datetime.c:362
+#: ../libegg/egg-datetime.c:354
 msgid "Displayed minute"
 msgstr "Vist minutt"
 
-#: ../libegg/egg-datetime.c:367
+#: ../libegg/egg-datetime.c:359
 msgid "Second"
 msgstr "Sekund"
 
-#: ../libegg/egg-datetime.c:368
+#: ../libegg/egg-datetime.c:360
 msgid "Displayed second"
 msgstr "Vist sekund"
 
-#: ../libegg/egg-datetime.c:373
+#: ../libegg/egg-datetime.c:365
 msgid "Lower limit year"
 msgstr "Ãr i nedre grense"
 
-#: ../libegg/egg-datetime.c:374
+#: ../libegg/egg-datetime.c:366
 msgid "Year part of the lower date limit"
 msgstr "Ãr-delen av nedre datogrense"
 
-#: ../libegg/egg-datetime.c:379
+#: ../libegg/egg-datetime.c:371
 msgid "Upper limit year"
 msgstr "Ãr i Ãvre grense"
 
-#: ../libegg/egg-datetime.c:380
+#: ../libegg/egg-datetime.c:372
 msgid "Year part of the upper date limit"
 msgstr "Ãr-delen av Ãvre datogrense"
 
-#: ../libegg/egg-datetime.c:385
+#: ../libegg/egg-datetime.c:377
 msgid "Lower limit month"
 msgstr "Nedre grense for mÃned"
 
-#: ../libegg/egg-datetime.c:386
+#: ../libegg/egg-datetime.c:378
 msgid "Month part of the lower date limit"
 msgstr "MÃnedsdelen av den nedre datogrensen"
 
-#: ../libegg/egg-datetime.c:391
+#: ../libegg/egg-datetime.c:383
 msgid "Upper limit month"
 msgstr "Ãvre grense for mÃned"
 
-#: ../libegg/egg-datetime.c:392
+#: ../libegg/egg-datetime.c:384
 msgid "Month part of the upper date limit"
 msgstr "MÃnedsdelen av Ãvre datogrense"
 
-#: ../libegg/egg-datetime.c:397
+#: ../libegg/egg-datetime.c:389
 msgid "Lower limit day"
 msgstr "Nedre grense for dag"
 
-#: ../libegg/egg-datetime.c:398
+#: ../libegg/egg-datetime.c:390
 msgid "Day of month part of the lower date limit"
 msgstr "Dag i mÃneden i forhold til nedre datogrense"
 
-#: ../libegg/egg-datetime.c:403
+#: ../libegg/egg-datetime.c:395
 msgid "Upper limit day"
 msgstr "Ãvre grense for dag"
 
-#: ../libegg/egg-datetime.c:404
+#: ../libegg/egg-datetime.c:396
 msgid "Day of month part of the upper date limit"
 msgstr "Dag i mÃneden iht Ãvre datogrense"
 
-#: ../libegg/egg-datetime.c:409
+#: ../libegg/egg-datetime.c:401
 msgid "Lower limit hour"
 msgstr "Nedre grense for time"
 
-#: ../libegg/egg-datetime.c:410
+#: ../libegg/egg-datetime.c:402
 msgid "Hour part of the lower time limit"
 msgstr "Timedelen av nedre tidsgrense"
 
-#: ../libegg/egg-datetime.c:415
+#: ../libegg/egg-datetime.c:407
 msgid "Upper limit hour"
 msgstr "Ãvre grense for time"
 
-#: ../libegg/egg-datetime.c:416
+#: ../libegg/egg-datetime.c:408
 msgid "Hour part of the upper time limit"
 msgstr "Timedelen av Ãvre tidsgrense"
 
-#: ../libegg/egg-datetime.c:421
+#: ../libegg/egg-datetime.c:413
 msgid "Lower limit minute"
 msgstr "Nedre grense for minutt"
 
-#: ../libegg/egg-datetime.c:422
+#: ../libegg/egg-datetime.c:414
 msgid "Minute part of the lower time limit"
 msgstr "Minuttdelen av nedre tidsgrense"
 
-#: ../libegg/egg-datetime.c:427
+#: ../libegg/egg-datetime.c:419
 msgid "Upper limit minute"
 msgstr "Ãvre grense for minutt"
 
-#: ../libegg/egg-datetime.c:428
+#: ../libegg/egg-datetime.c:420
 msgid "Minute part of the upper time limit"
 msgstr "Minuttdelen av Ãvre tidsgrense"
 
-#: ../libegg/egg-datetime.c:433
+#: ../libegg/egg-datetime.c:425
 msgid "Lower limit second"
 msgstr "Nedre grense for sekund"
 
-#: ../libegg/egg-datetime.c:434
+#: ../libegg/egg-datetime.c:426
 msgid "Second part of the lower time limit"
 msgstr "Sekunddelen av nedre tidsgrense"
 
-#: ../libegg/egg-datetime.c:439
+#: ../libegg/egg-datetime.c:431
 msgid "Upper limit second"
 msgstr "Ãvre grense for sekund"
 
-#: ../libegg/egg-datetime.c:440
+#: ../libegg/egg-datetime.c:432
 msgid "Second part of the upper time limit"
 msgstr "Sekunddelen av Ãvre tidsgrense"
 
@@ -918,159 +506,96 @@ msgstr "Sekunddelen av Ãvre tidsgrense"
 #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1
 #. * or calendar:week_start:0 it will not work.
 #.
-#: ../libegg/egg-datetime.c:482
+#: ../libegg/egg-datetime.c:474
 msgid "calendar:week_start:0"
 msgstr "1"
 
-#: ../libegg/egg-datetime.c:504
+#: ../libegg/egg-datetime.c:496
 msgid "Date"
 msgstr "Dato"
 
-#: ../libegg/egg-datetime.c:504
+#: ../libegg/egg-datetime.c:496
 msgid "Enter the date directly"
 msgstr "Oppgi dato direkte"
 
-#: ../libegg/egg-datetime.c:511
+#: ../libegg/egg-datetime.c:503
 msgid "Select Date"
 msgstr "Velg dato"
 
-#: ../libegg/egg-datetime.c:511
+#: ../libegg/egg-datetime.c:503
 msgid "Select the date from a calendar"
 msgstr "Velg dato fra en kalender"
 
-#: ../libegg/egg-datetime.c:529 ../libegg/egg-datetime.c:2213
+#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199
 msgid "Time"
 msgstr "Tid"
 
-#: ../libegg/egg-datetime.c:529
+#: ../libegg/egg-datetime.c:521
 msgid "Enter the time directly"
 msgstr "Oppgi tid direkte"
 
-#: ../libegg/egg-datetime.c:536
+#: ../libegg/egg-datetime.c:528
 msgid "Select Time"
 msgstr "Velg tid"
 
-#: ../libegg/egg-datetime.c:536
+#: ../libegg/egg-datetime.c:528
 msgid "Select the time from a list"
 msgstr "Velg tid fra en liste"
 
 #. Translators: set this to anything else if you want to use a
 #. * 24 hour clock.
 #.
-#: ../libegg/egg-datetime.c:810
+#: ../libegg/egg-datetime.c:793
 msgid "24hr: no"
 msgstr "ja"
 
-#: ../libegg/egg-datetime.c:814 ../libegg/egg-datetime.c:1274
-#: ../libegg/egg-datetime.c:1278
+#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260
+#: ../libegg/egg-datetime.c:1264
 msgid "AM"
 msgstr "AM"
 
-#: ../libegg/egg-datetime.c:816 ../libegg/egg-datetime.c:1275
-#: ../libegg/egg-datetime.c:1282
+#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261
+#: ../libegg/egg-datetime.c:1268
 msgid "PM"
 msgstr "PM"
 
 #. Translators: This is hh:mm:ss AM/PM.
-#: ../libegg/egg-datetime.c:824
+#: ../libegg/egg-datetime.c:807
 #, c-format
 msgid "%02d:%02d:%02d %s"
 msgstr "%02d.%02d.%02d %s"
 
 #. Translators: This is hh:mm AM/PM.
-#: ../libegg/egg-datetime.c:827
+#: ../libegg/egg-datetime.c:810
 #, c-format
 msgid "%02d:%02d %s"
 msgstr "%02d.%02d %s"
 
 #. Translators: This is hh:mm:ss.
-#: ../libegg/egg-datetime.c:831
+#: ../libegg/egg-datetime.c:814
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d. %02d.%02d"
 
 #. Translators: This is hh:mm.
-#: ../libegg/egg-datetime.c:834
+#: ../libegg/egg-datetime.c:817
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d.%02d"
 
 #. TODO: should handle other display modes as well...
 #. Translators: This is YYYY-MM-DD
-#: ../libegg/egg-datetime.c:1190
+#: ../libegg/egg-datetime.c:1176
 #, c-format
 msgid "%04d-%02d-%02d"
 msgstr "%04d-%02d-%02d"
 
 #. Translators: This is hh:mm:ss.
-#: ../libegg/egg-datetime.c:1255
+#: ../libegg/egg-datetime.c:1241
 #, c-format
 msgid "%u:%u:%u"
 msgstr "%u.%u.%u"
 
-#: ../libegg/eggdesktopfile.c:165
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "Filen er ikke en gyldig .desktop-fil"
-
-#: ../libegg/eggdesktopfile.c:188
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "Ikke gjenkjent Version Â%s i desktop-fil"
-
-#: ../libegg/eggdesktopfile.c:968
-#, c-format
-msgid "Starting %s"
-msgstr "Starter %s"
-
-#: ../libegg/eggdesktopfile.c:1110
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "Programmet tar ikke i mot dokumenter pà kommandolinjen"
-
-#: ../libegg/eggdesktopfile.c:1178
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "Ikke gjenkjent oppstartsflagg: %d"
-
-#: ../libegg/eggdesktopfile.c:1383
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Kan ikke gi dokument-URIer til en ÂType=Link oppfÃring i desktop-fil"
-
-#: ../libegg/eggdesktopfile.c:1404
-#, c-format
-msgid "Not a launchable item"
-msgstr "Ikke en startbar oppfÃring"
-
-#: ../libegg/eggsmclient.c:225
-msgid "Disable connection to session manager"
-msgstr "Slà av tilkobling til sesjonshÃndterer"
-
-#: ../libegg/eggsmclient.c:228
-msgid "Specify file containing saved configuration"
-msgstr "Oppgi fil som inneholder lagret konfigurasjon"
-
-#: ../libegg/eggsmclient.c:228
-msgid "FILE"
-msgstr "FIL"
-
-#: ../libegg/eggsmclient.c:231
-msgid "Specify session management ID"
-msgstr "Oppgi sesjonshÃndterings-ID"
-
-#: ../libegg/eggsmclient.c:231 ../pgp/seahorse-pgp-key-properties.c:1314
-msgid "ID"
-msgstr "ID"
-
-#: ../libegg/eggsmclient.c:252
-msgid "Session management options:"
-msgstr "Alternativer for sesjonshÃndtering:"
-
-#: ../libegg/eggsmclient.c:253
-msgid "Show session management options"
-msgstr "Vis alternativer for sesjonshÃndtering"
-
 #: ../libseahorse/seahorse-add-keyserver.xml.h:1
 msgid ":"
 msgstr ":"
@@ -1095,45 +620,19 @@ msgstr "Port som tjeneren skal aksesseres pÃ."
 msgid "initial temporary item"
 msgstr "opprinnelig midlertidig oppfÃring"
 
-#: ../libseahorse/seahorse-notification.c:576
-#: ../libseahorse/seahorse-notification.c:604
-msgid "Key Imported"
-msgid_plural "Keys Imported"
-msgstr[0] "NÃkkel importert"
-msgstr[1] "NÃkler importert"
-
-#: ../libseahorse/seahorse-notification.c:580
-#: ../libseahorse/seahorse-notification.c:603
-#, c-format
-msgid "Imported %i key"
-msgid_plural "Imported %i keys"
-msgstr[0] "Importerte %i nÃkkel"
-msgstr[1] "Importerte %i nÃkler"
-
-#: ../libseahorse/seahorse-notification.c:582
-#, c-format
-msgid "Imported a key for"
-msgid_plural "Imported keys for"
-msgstr[0] "Importerte en nÃkkel for"
-msgstr[1] "Importerte nÃkler for"
-
-#: ../libseahorse/seahorse-notify.xml.h:1
-msgid "Notification Messages"
-msgstr "Varslingsmeldinger"
-
-#: ../libseahorse/seahorse-object.c:317
+#: ../libseahorse/seahorse-object.c:318
 msgid "Symmetric Key"
 msgstr "Symmetrisk nÃkkel"
 
-#: ../libseahorse/seahorse-object.c:320
+#: ../libseahorse/seahorse-object.c:321
 msgid "Public Key"
 msgstr "Offentlig nÃkkel"
 
-#: ../libseahorse/seahorse-object.c:323
+#: ../libseahorse/seahorse-object.c:324
 msgid "Private Key"
 msgstr "Privat nÃkkel"
 
-#: ../libseahorse/seahorse-object.c:326
+#: ../libseahorse/seahorse-object.c:327
 msgid "Credentials"
 msgstr "PÃloggingsinformasjon"
 
@@ -1141,28 +640,29 @@ msgstr "PÃloggingsinformasjon"
 #. * Translators: "This object is a means of storing items such as
 #. * name, email address, etc. that make up one's digital identity.
 #.
-#: ../libseahorse/seahorse-object.c:333
+#: ../libseahorse/seahorse-object.c:334
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../libseahorse/seahorse-passphrase.c:200
+#: ../libseahorse/seahorse-passphrase.c:178
 msgid "Passphrase"
 msgstr "Passord"
 
-#: ../libseahorse/seahorse-passphrase.c:203
-#: ../ssh/seahorse-ssh-operation.c:480
+#: ../libseahorse/seahorse-passphrase.c:181
+#: ../ssh/seahorse-ssh-operation.c:207
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../libseahorse/seahorse-passphrase.c:269
+#. The second and main entry
+#: ../libseahorse/seahorse-passphrase.c:244
 msgid "Confirm:"
 msgstr "Bekreft:"
 
-#: ../libseahorse/seahorse-prefs.c:62
+#: ../libseahorse/seahorse-prefs.c:59
 msgid "Not a valid Key Server address."
 msgstr "Ikke en gyldig adresse til nÃkkeltjener."
 
-#: ../libseahorse/seahorse-prefs.c:63
+#: ../libseahorse/seahorse-prefs.c:60
 msgid ""
 "For help contact your system adminstrator or the administrator of the key "
 "server."
@@ -1174,11 +674,11 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
-#: ../libseahorse/seahorse-prefs.c:352
+#: ../libseahorse/seahorse-prefs.c:333
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../libseahorse/seahorse-prefs.c:425
+#: ../libseahorse/seahorse-prefs.c:391
 msgid "None: Don't publish keys"
 msgstr "Ingen: Ikke publiser nÃkler"
 
@@ -1206,54 +706,54 @@ msgstr "_Finn nÃkler via:"
 msgid "_Publish keys to:"
 msgstr "_Publiser nÃkler til:"
 
-#: ../libseahorse/seahorse-progress.xml.h:1
-msgid "Progress Title"
-msgstr "Tittel for framdrift"
+#: ../libseahorse/seahorse-transfer.c:178
+msgid "Retrieving data"
+msgstr "Henter data"
 
-#: ../libseahorse/seahorse-unknown.c:67
+#: ../libseahorse/seahorse-transfer.c:178
+msgid "Exporting data"
+msgstr "Eksporterer data"
+
+#: ../libseahorse/seahorse-transfer.c:182
+msgid "Importing data"
+msgstr "Importerer data"
+
+#: ../libseahorse/seahorse-transfer.c:182
+msgid "Sending data"
+msgstr "Sender data"
+
+#: ../libseahorse/seahorse-unknown.c:59
 msgid "Unavailable"
 msgstr "Ikke tilgjengelig"
 
-#: ../libseahorse/seahorse-util.c:240
+#: ../libseahorse/seahorse-util.c:259
 msgid "%Y-%m-%d"
 msgstr "%d-%m-%Y"
 
-#: ../libseahorse/seahorse-util.c:516
+#: ../libseahorse/seahorse-util.c:486
 msgid "Key Data"
 msgstr "NÃkkeldata"
 
-#: ../libseahorse/seahorse-util.c:518
+#: ../libseahorse/seahorse-util.c:488
 msgid "Multiple Keys"
 msgstr "Flere nÃkler"
 
-#: ../libseahorse/seahorse-util.c:774
-msgid "Couldn't run file-roller"
-msgstr "Kunne ikke kjÃre file-roller"
-
-#: ../libseahorse/seahorse-util.c:780
-msgid "Couldn't package files"
-msgstr "Kunne ikke pakke filene"
-
-#: ../libseahorse/seahorse-util.c:781
-msgid "The file-roller process did not complete successfully"
-msgstr "Prosess for file-roller fullfÃrte ikke operasjonen"
-
 #. Filter for PGP keys. We also include *.asc, as in many
 #. cases that extension is associated with text/plain
-#: ../libseahorse/seahorse-util.c:957
+#: ../libseahorse/seahorse-util.c:776
 msgid "All key files"
 msgstr "Alle nÃkkelfiler"
 
-#: ../libseahorse/seahorse-util.c:968 ../libseahorse/seahorse-util.c:1016
+#: ../libseahorse/seahorse-util.c:787 ../libseahorse/seahorse-util.c:835
 #: ../pgp/seahorse-gpgme-photos.c:242
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../libseahorse/seahorse-util.c:1009
+#: ../libseahorse/seahorse-util.c:828
 msgid "Archive files"
 msgstr "Arkivfiler"
 
-#: ../libseahorse/seahorse-util.c:1079
+#: ../libseahorse/seahorse-util.c:898
 msgid ""
 "<b>A file already exists with this name.</b>\n"
 "\n"
@@ -1263,52 +763,52 @@ msgstr ""
 "\n"
 "Vil du erstatte den med en ny fil?"
 
-#: ../libseahorse/seahorse-util.c:1082
+#: ../libseahorse/seahorse-util.c:901
 msgid "_Replace"
 msgstr "E_rstatt"
 
 #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197
-#: ../pgp/seahorse-pgp-key-properties.c:1133
+#: ../pgp/seahorse-pgp-key-properties.c:1140
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:46
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:40
 msgid "Unknown"
 msgstr "Ukjent"
 
 #: ../libseahorse/seahorse-validity.c:42
-#: ../pgp/seahorse-pgp-key-properties.c:1139
+#: ../pgp/seahorse-pgp-key-properties.c:1146
 msgctxt "Validity"
 msgid "Never"
 msgstr "Aldri"
 
 #: ../libseahorse/seahorse-validity.c:44
-#: ../pgp/seahorse-pgp-key-properties.c:1146
+#: ../pgp/seahorse-pgp-key-properties.c:1153
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32
 msgid "Marginal"
 msgstr "Marginal"
 
 #: ../libseahorse/seahorse-validity.c:46
-#: ../pgp/seahorse-pgp-key-properties.c:1152
+#: ../pgp/seahorse-pgp-key-properties.c:1159
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26
 msgid "Full"
 msgstr "Full"
 
 #: ../libseahorse/seahorse-validity.c:48
-#: ../pgp/seahorse-pgp-key-properties.c:1158
+#: ../pgp/seahorse-pgp-key-properties.c:1165
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:45
 msgid "Ultimate"
 msgstr "Ultimat"
 
 #: ../libseahorse/seahorse-validity.c:50
-#: ../pgp/seahorse-pgp-key-properties.c:1351
+#: ../pgp/seahorse-pgp-key-properties.c:1358
 msgid "Disabled"
 msgstr "Deaktivert"
 
 #: ../libseahorse/seahorse-validity.c:52
-#: ../pgp/seahorse-pgp-key-properties.c:1347
+#: ../pgp/seahorse-pgp-key-properties.c:1354
 msgid "Revoked"
 msgstr "Tilbakekalt"
 
-#: ../libseahorse/seahorse-widget.c:480
+#: ../libseahorse/seahorse-widget.c:461
 #, c-format
 msgid "Could not display help: %s"
 msgstr "Kunne ikke vise hjelp: %s"
@@ -1394,7 +894,7 @@ msgstr "Kunne ikke legge til undernÃkkel"
 msgid "Add subkey to %s"
 msgstr "Legg til undernÃkkel til %s"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:118
+#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:117
 msgid "DSA (sign only)"
 msgstr "DSA (kun signering)"
 
@@ -1402,7 +902,7 @@ msgstr "DSA (kun signering)"
 msgid "ElGamal (encrypt only)"
 msgstr "ElGamal (kun kryptering)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:119
+#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:118
 msgid "RSA (sign only)"
 msgstr "RSA (kun signering)"
 
@@ -1419,68 +919,64 @@ msgstr "Kunne ikke legge til bruker-ID"
 msgid "Add user ID to %s"
 msgstr "Legg til bruker-ID i %s"
 
-#: ../pgp/seahorse-gpgme.c:72
+#: ../pgp/seahorse-gpgme.c:69
 msgid "Decryption failed. You probably do not have the decryption key."
 msgstr "Dekryptering feilet. Du har muligens ikke dekrypteringsnÃkkelen."
 
-#: ../pgp/seahorse-gpgme-expires.c:58
+#: ../pgp/seahorse-gpgme-expires.c:57
 msgid "Invalid expiry date"
 msgstr "Ugyldig utlÃpsdato"
 
-#: ../pgp/seahorse-gpgme-expires.c:59
+#: ../pgp/seahorse-gpgme-expires.c:58
 msgid "The expiry date must be in the future"
 msgstr "UlÃpsdato mà vÃre i framtiden"
 
-#: ../pgp/seahorse-gpgme-expires.c:72
+#: ../pgp/seahorse-gpgme-expires.c:71
 msgid "Couldn't change expiry date"
 msgstr "Kunne ikke endre utlÃpsdato"
 
-#: ../pgp/seahorse-gpgme-expires.c:131
+#: ../pgp/seahorse-gpgme-expires.c:130
 #, c-format
 msgid "Expiry: %s"
 msgstr "UtgÃr: %s"
 
-#: ../pgp/seahorse-gpgme-generate.c:79
+#: ../pgp/seahorse-gpgme-generate.c:78
 msgid "PGP Key"
 msgstr "PGP-nÃkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:80
+#: ../pgp/seahorse-gpgme-generate.c:79
 msgid "Used to encrypt email and files"
 msgstr "Brukes til à kryptere e-post og filer"
 
-#: ../pgp/seahorse-gpgme-generate.c:116 ../ssh/seahorse-ssh-generate.xml.h:9
+#: ../pgp/seahorse-gpgme-generate.c:115 ../ssh/seahorse-ssh-generate.xml.h:9
 msgid "RSA"
 msgstr "RSA"
 
-#: ../pgp/seahorse-gpgme-generate.c:117
+#: ../pgp/seahorse-gpgme-generate.c:116
 msgid "DSA Elgamal"
 msgstr "DSA ElGamal"
 
-#: ../pgp/seahorse-gpgme-generate.c:135
+#: ../pgp/seahorse-gpgme-generate.c:165
 msgid "Couldn't generate PGP key"
 msgstr "Kunne ikke opprette PGP-nÃkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:195
+#: ../pgp/seahorse-gpgme-generate.c:196
 msgid "Passphrase for New PGP Key"
 msgstr "Passordfrase for ny PGP-nÃkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:196
+#: ../pgp/seahorse-gpgme-generate.c:197
 msgid "Enter the passphrase for your new key twice."
 msgstr "Oppgi passordfrasen for din nye nÃkkel to ganger."
 
-#: ../pgp/seahorse-gpgme-generate.c:205
-msgid "Couldn't generate key"
-msgstr "Kunne ikke generere nÃkkel"
-
-#: ../pgp/seahorse-gpgme-generate.c:207
+#: ../pgp/seahorse-gpgme-generate.c:206
 msgid "Generating key"
 msgstr "Genererer nÃkkel"
 
-#: ../pgp/seahorse-gpgme-key-op.c:301
+#: ../pgp/seahorse-gpgme-key-op.c:370
 msgid "Wrong password"
 msgstr "Feil passord"
 
-#: ../pgp/seahorse-gpgme-key-op.c:301
+#: ../pgp/seahorse-gpgme-key-op.c:370
 msgid "This was the third time you entered a wrong password. Please try again."
 msgstr ""
 "Dette er tredje gang du skrev inn et feil passord. Vennligst prÃv igjen."
@@ -1523,64 +1019,68 @@ msgstr "Alle JPEG-filer"
 msgid "Choose Photo to Add to Key"
 msgstr "Velg bilde som skal legges til nÃkkelen"
 
-#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294
+#: ../pgp/seahorse-gpgme-photos.c:278
+msgid "Couldn't prepare photo"
+msgstr "Kunne ikke forberede bilde"
+
+#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292
 msgid "Couldn't add photo"
 msgstr "Kunne ikke legge til bilde"
 
-#: ../pgp/seahorse-gpgme-photos.c:291
+#: ../pgp/seahorse-gpgme-photos.c:289
 msgid "The file could not be loaded. It may be in an invalid format"
 msgstr "Filen kunne ikke bli lastet. Den kan vÃre i et ugyldig format"
 
-#: ../pgp/seahorse-gpgme-photos.c:320
+#: ../pgp/seahorse-gpgme-photos.c:318
 msgid "Are you sure you want to remove the current photo from your key?"
 msgstr "Er du sikker pà at du vil fjerne det nÃvÃrende bildet fra din nÃkkel?"
 
-#: ../pgp/seahorse-gpgme-photos.c:333
+#: ../pgp/seahorse-gpgme-photos.c:331
 msgid "Couldn't delete photo"
 msgstr "Kunne ikke slette bilde"
 
-#: ../pgp/seahorse-gpgme-revoke.c:70
+#: ../pgp/seahorse-gpgme-revoke.c:69
 msgid "Couldn't revoke subkey"
 msgstr "Kunne ikke trekke tilbake undernÃkkel"
 
-#: ../pgp/seahorse-gpgme-revoke.c:91
+#: ../pgp/seahorse-gpgme-revoke.c:90
 #, c-format
 msgid "Revoke: %s"
 msgstr "Trekk tilbake: %s"
 
-#: ../pgp/seahorse-gpgme-revoke.c:102
+#: ../pgp/seahorse-gpgme-revoke.c:101
 msgid "No reason"
 msgstr "Ingen grunn"
 
-#: ../pgp/seahorse-gpgme-revoke.c:103
+#: ../pgp/seahorse-gpgme-revoke.c:102
 msgid "No reason for revoking key"
 msgstr "Ingen grunn til à tilbakekalle nÃkkelen"
 
-#: ../pgp/seahorse-gpgme-revoke.c:109
+#: ../pgp/seahorse-gpgme-revoke.c:108
 msgid "Compromised"
 msgstr "Kompromittert"
 
-#: ../pgp/seahorse-gpgme-revoke.c:110
+#: ../pgp/seahorse-gpgme-revoke.c:109
 msgid "Key has been compromised"
 msgstr "NÃkkelen er kompromittert"
 
-#: ../pgp/seahorse-gpgme-revoke.c:116
+#: ../pgp/seahorse-gpgme-revoke.c:115
 msgid "Superseded"
 msgstr "UtgÃtt"
 
-#: ../pgp/seahorse-gpgme-revoke.c:117
+#: ../pgp/seahorse-gpgme-revoke.c:116
 msgid "Key has been superseded"
 msgstr "NÃkkelen er utgÃtt"
 
-#: ../pgp/seahorse-gpgme-revoke.c:123
+#: ../pgp/seahorse-gpgme-revoke.c:122
 msgid "Not Used"
 msgstr "Ikke brukt"
 
-#: ../pgp/seahorse-gpgme-revoke.c:124
+#: ../pgp/seahorse-gpgme-revoke.c:123
 msgid "Key is no longer used"
 msgstr "NÃkkelen er ikke lenger i bruk"
 
-#: ../pgp/seahorse-gpgme-revoke.c:161
+#: ../pgp/seahorse-gpgme-revoke.c:160
 #, c-format
 msgid ""
 "You are about to add %s as a revoker for %s. This operation cannot be "
@@ -1589,11 +1089,11 @@ msgstr ""
 "Du er i ferd med à legge til %s som tilbaketrekker for %s. Denne operasjonen "
 "kan ikke angres!. Er du sikker pà at du vil fortsette?"
 
-#: ../pgp/seahorse-gpgme-revoke.c:173
+#: ../pgp/seahorse-gpgme-revoke.c:172
 msgid "Couldn't add revoker"
 msgstr "Kunne ikke legge til tilbakekaller"
 
-#: ../pgp/seahorse-gpgme-sign.c:99
+#: ../pgp/seahorse-gpgme-sign.c:98
 #, c-format
 msgid ""
 "This key was already signed by\n"
@@ -1602,17 +1102,17 @@ msgstr ""
 "NÃkkelen er allerede signert av\n"
 "Â%sÂ"
 
-#: ../pgp/seahorse-gpgme-sign.c:103
+#: ../pgp/seahorse-gpgme-sign.c:102
 msgid "Couldn't sign key"
 msgstr "Kunne ikke signere nÃkkelen"
 
 #. TODO: We should be giving an error message that allows them to
 #. generate or import a key
-#: ../pgp/seahorse-gpgme-sign.c:157 ../pgp/seahorse-signer.c:61
+#: ../pgp/seahorse-gpgme-sign.c:156 ../pgp/seahorse-signer.c:60
 msgid "No keys usable for signing"
 msgstr "Ingen nÃkler tilgjengelig for signering"
 
-#: ../pgp/seahorse-gpgme-sign.c:158
+#: ../pgp/seahorse-gpgme-sign.c:157
 msgid ""
 "You have no personal PGP keys that can be used to indicate your trust of "
 "this key."
@@ -1620,43 +1120,37 @@ msgstr ""
 "Du har ingen personlige PGP-nÃkler som kan brukes for à indikere din tillit "
 "til denne nÃkkelen."
 
-#: ../pgp/seahorse-gpgme-source.c:99
+#: ../pgp/seahorse-gpgme-source.c:86
 #, c-format
 msgid "Wrong passphrase."
 msgstr "Feil passordfrase."
 
-#: ../pgp/seahorse-gpgme-source.c:103
+#: ../pgp/seahorse-gpgme-source.c:90
 #, c-format
 msgid "Enter new passphrase for '%s'"
 msgstr "Oppgi ny passordfrase for Â%sÂ"
 
-#: ../pgp/seahorse-gpgme-source.c:105
+#: ../pgp/seahorse-gpgme-source.c:92
 #, c-format
 msgid "Enter passphrase for '%s'"
 msgstr "Oppgi passordfrase for Â%sÂ"
 
-#: ../pgp/seahorse-gpgme-source.c:108
-#: ../src/seahorse-change-passphrase.xml.h:4
+#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4
 msgid "Enter new passphrase"
 msgstr "Oppgi nytt passord"
 
-#: ../pgp/seahorse-gpgme-source.c:110
+#: ../pgp/seahorse-gpgme-source.c:97
 msgid "Enter passphrase"
 msgstr "Oppgi passordfrase"
 
-#. TODO: We can use the GPGME progress to make this more accurate
-#: ../pgp/seahorse-gpgme-source.c:722
+#: ../pgp/seahorse-gpgme-source.c:328
 #, c-format
 msgid "Loaded %d key"
 msgid_plural "Loaded %d keys"
 msgstr[0] "Lastet %d nÃkkel"
 msgstr[1] "Lastet %d nÃkler"
 
-#: ../pgp/seahorse-gpgme-source.c:777
-msgid "Loading Keys..."
-msgstr "Laster nÃkler â"
-
-#: ../pgp/seahorse-gpgme-source.c:820
+#: ../pgp/seahorse-gpgme-source.c:649
 msgid ""
 "Invalid key data (missing UIDs). This may be due to a computer with a date "
 "set in the future or a missing self-signature."
@@ -1664,121 +1158,88 @@ msgstr ""
 "Ugyldige nÃkkeldata (mangler UIDer). Dette kan vÃre forÃrsaket av en "
 "datamaskin med datoen satt i fremtiden eller en manglende selvsignering."
 
-#: ../pgp/seahorse-gpgme-source.c:910 ../src/seahorse-key-manager.c:544
-msgid "Importing Keys"
-msgstr "Importerer nÃkler"
-
-#: ../pgp/seahorse-gpgme-source.c:946
-msgid "Exporting Keys"
-msgstr "Eksporterer nÃkler"
-
 #: ../pgp/seahorse-gpgme-subkey.c:199
 msgid "ElGamal"
 msgstr "ElGamal"
 
-#: ../pgp/seahorse-hkp-source.c:387
+#: ../pgp/seahorse-hkp-source.c:645
+msgid "HTTP Key Server"
+msgstr "HTTP nÃkkeltjener"
+
+#: ../pgp/seahorse-hkp-source.c:680
 #, c-format
 msgid "Search was not specific enough. Server '%s' found too many keys."
 msgstr "SÃket var ikke spesifikt nok. Serveren '%s' fant for mange nÃkler."
 
-#: ../pgp/seahorse-hkp-source.c:389
+#: ../pgp/seahorse-hkp-source.c:683
 #, c-format
 msgid "Couldn't communicate with server '%s': %s"
 msgstr "Kunne ikke kommunisere med tjener Â%sÂ: %s"
 
-#: ../pgp/seahorse-hkp-source.c:671
-msgid "Searching for keys..."
-msgstr "SÃker etter nÃkler â"
-
-#: ../pgp/seahorse-hkp-source.c:759
-msgid "Uploading keys..."
-msgstr "Laster opp nÃkler â"
-
-#: ../pgp/seahorse-hkp-source.c:857
-msgid "Retrieving keys..."
-msgstr "Henter nÃkler â"
-
-#: ../pgp/seahorse-hkp-source.c:987
+#: ../pgp/seahorse-ldap-source.c:440
 #, c-format
-msgid "Searching for keys on: %s"
-msgstr "SÃker etter nÃkler pÃ: %s"
+msgid "Couldn't communicate with '%s': %s"
+msgstr "Kunne ikke kommunisere med Â%sÂ: %s"
 
-#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start
-#: ../pgp/seahorse-hkp-source.c:1072 ../pgp/seahorse-hkp-source.c:1154
-#: ../pgp/seahorse-ldap-source.c:668
+#: ../pgp/seahorse-ldap-source.c:651
 #, c-format
 msgid "Connecting to: %s"
 msgstr "Kobler til: %s"
 
-#: ../pgp/seahorse-hkp-source.c:1184
-msgid "HTTP Key Server"
-msgstr "HTTP nÃkkeltjener"
-
-#: ../pgp/seahorse-ldap-source.c:459
-#, c-format
-msgid "Couldn't communicate with '%s': %s"
-msgstr "Kunne ikke kommunisere med Â%sÂ: %s"
-
-#: ../pgp/seahorse-ldap-source.c:641
+#: ../pgp/seahorse-ldap-source.c:657
 #, c-format
 msgid "Couldn't resolve address: %s"
 msgstr "Kunne ikke slà opp adresse: %s"
 
-#: ../pgp/seahorse-ldap-source.c:719
+#: ../pgp/seahorse-ldap-source.c:701
 #, c-format
 msgid "Resolving server address: %s"
 msgstr "SlÃr opp tjeneradresse: %s"
 
-#: ../pgp/seahorse-ldap-source.c:955
-#, c-format
-msgid "Searching for keys containing '%s'..."
-msgstr "SÃker etter nÃkler som inneholder Â%s â"
-
-#: ../pgp/seahorse-ldap-source.c:983
-#, c-format
-msgid "Searching for key id '%s'..."
-msgstr "SÃker etter nÃkkel-ID Â%s â"
-
-#: ../pgp/seahorse-ldap-source.c:1089
-msgid "Retrieving remote keys..."
-msgstr "Henter eksterne nÃkler â"
-
-#: ../pgp/seahorse-ldap-source.c:1221
-msgid "Sending keys to key server..."
-msgstr "Sender nÃkler til en nÃkkeltjener â"
-
-#: ../pgp/seahorse-ldap-source.c:1423
+#: ../pgp/seahorse-ldap-source.c:781
 msgid "LDAP Key Server"
 msgstr "LDAP nÃkkeltjener"
 
-#: ../pgp/seahorse-pgp-commands.c:103
+#: ../pgp/seahorse-pgp-commands.c:104
 msgid "_Sign Key..."
 msgstr "_Signer nÃkkel â"
 
-#: ../pgp/seahorse-pgp-commands.c:103
+#: ../pgp/seahorse-pgp-commands.c:104
 msgid "Sign public key"
 msgstr "Signer offentlig nÃkkel"
 
-#: ../pgp/seahorse-pgp-commands.c:171
+#: ../pgp/seahorse-pgp-commands.c:174
 #, c-format
 msgid "Are you sure you want to permanently delete %s?"
 msgstr "Er du sikker pà at du vil slette %s for godt?"
 
-#: ../pgp/seahorse-pgp-commands.c:176
+#: ../pgp/seahorse-pgp-commands.c:179
 #, c-format
 msgid "Are you sure you want to permanently delete %d keys and identities?"
 msgstr "Er du sikker pà at du vil slette %d nÃkler og identiteter for godt?"
 
-#: ../pgp/seahorse-pgp-commands.c:178
+#: ../pgp/seahorse-pgp-commands.c:181
 #, c-format
 msgid "Are you sure you want to permanently delete %d keys?"
 msgstr "Er du sikker pà at du vil slette %d nÃkler for godt?"
 
-#: ../pgp/seahorse-pgp-commands.c:180
+#: ../pgp/seahorse-pgp-commands.c:183
 #, c-format
 msgid "Are you sure you want to permanently delete %d identities?"
 msgstr "Er du sikker pà at du vil slette %d identiteter for godt?"
 
+#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:253
+msgid "Couldn't delete user ID"
+msgstr "Kunne ikke slette bruker-ID"
+
+#: ../pgp/seahorse-pgp-commands.c:205
+msgid "Couldn't delete private key"
+msgstr "Kunne ikke slette privat nÃkkel"
+
+#: ../pgp/seahorse-pgp-commands.c:208
+msgid "Couldn't delete public key"
+msgstr "Kunne ikke slette offentlig nÃkkel"
+
 #: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1
 msgid "<b>_Advanced key options</b>"
 msgstr "<b>_Avanserte nÃkkelvalg</b>"
@@ -1823,122 +1284,132 @@ msgstr "Ny PGP-nÃkkel"
 msgid "_Comment:"
 msgstr "_Kommentar:"
 
-#: ../pgp/seahorse-pgp-key.c:201
+#: ../pgp/seahorse-pgp-key.c:200
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38
 msgid "Private PGP Key"
 msgstr "Privat PGP-nÃkkel"
 
-#: ../pgp/seahorse-pgp-key.c:204
+#: ../pgp/seahorse-pgp-key.c:203
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34
 msgid "Public PGP Key"
 msgstr "Offentlig PGP-nÃkkel"
 
-#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1349
+#: ../pgp/seahorse-pgp-key.c:582 ../pgp/seahorse-pgp-key-properties.c:1356
 msgid "Expired"
 msgstr "UtgÃtt"
 
-#: ../pgp/seahorse-pgp-key-properties.c:224
+#: ../pgp/seahorse-pgp-key-properties.c:226
 msgid "Couldn't change primary user ID"
 msgstr "Kunne ikke endre primÃr bruker-ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:241
+#: ../pgp/seahorse-pgp-key-properties.c:243
 #, c-format
 msgid "Are you sure you want to permanently delete the '%s' user ID?"
 msgstr "Er du sikker pà at du vil slette bruker-IDen Â%s for godt?"
 
-#: ../pgp/seahorse-pgp-key-properties.c:251
-msgid "Couldn't delete user ID"
-msgstr "Kunne ikke slette bruker-ID"
-
-#: ../pgp/seahorse-pgp-key-properties.c:333
-#: ../pgp/seahorse-pgp-key-properties.c:1464
+#: ../pgp/seahorse-pgp-key-properties.c:335
+#: ../pgp/seahorse-pgp-key-properties.c:1471
 msgid "[Unknown]"
 msgstr "[Ukjent]"
 
-#: ../pgp/seahorse-pgp-key-properties.c:426
-#: ../pgp/seahorse-pgp-key-properties.c:1742
+#: ../pgp/seahorse-pgp-key-properties.c:435
+#: ../pgp/seahorse-pgp-key-properties.c:1751
 msgid "Name/Email"
 msgstr "Navn/e-post"
 
-#: ../pgp/seahorse-pgp-key-properties.c:431
+#: ../pgp/seahorse-pgp-key-properties.c:440
 msgid "Signature ID"
 msgstr "Signatur-ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:552
+#: ../pgp/seahorse-pgp-key-properties.c:561
 msgid "Couldn't change primary photo"
 msgstr "Kunne ikke endre hovedbilde"
 
-#: ../pgp/seahorse-pgp-key-properties.c:775
+#: ../pgp/seahorse-pgp-key-properties.c:784
 msgid "(unknown)"
 msgstr "(ukjent)"
 
-#: ../pgp/seahorse-pgp-key-properties.c:778
+#: ../pgp/seahorse-pgp-key-properties.c:787
 #, c-format
 msgid "This key expired on: %s"
 msgstr "Denne nÃkkelen gikk ut: %s"
 
-#: ../pgp/seahorse-pgp-key-properties.c:946
+#: ../pgp/seahorse-pgp-key-properties.c:848
+#: ../src/seahorse-key-manager-store.c:829
+msgid "Name"
+msgstr "Navn"
+
+#: ../pgp/seahorse-pgp-key-properties.c:955
 #, c-format
 msgid "Are you sure you want to permanently delete subkey %d of %s?"
 msgstr "Er du sikker pà at du vil slette undernÃkkelen %d av %s for godt?"
 
-#: ../pgp/seahorse-pgp-key-properties.c:955
+#: ../pgp/seahorse-pgp-key-properties.c:964
 msgid "Couldn't delete subkey"
 msgstr "Kunne ikke slette undernÃkkel"
 
-#: ../pgp/seahorse-pgp-key-properties.c:991
-#: ../pgp/seahorse-pgp-key-properties.c:1427
+#: ../pgp/seahorse-pgp-key-properties.c:1000
+#: ../pgp/seahorse-pgp-key-properties.c:1434
 msgid "Unable to change trust"
 msgstr "Kan ikke endre tillitsforhold"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1006 ../src/seahorse-viewer.c:290
-#: ../ssh/seahorse-ssh-key-properties.c:168
+#: ../pgp/seahorse-pgp-key-properties.c:1015 ../src/seahorse-viewer.c:296
+#: ../ssh/seahorse-ssh-key-properties.c:184
 #, c-format
 msgid "Couldn't export key to \"%s\""
 msgstr "Kunne ikke eksportere nÃkkel til Â%sÂ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1035
-#: ../ssh/seahorse-ssh-key-properties.c:193
+#: ../pgp/seahorse-pgp-key-properties.c:1043
+#: ../ssh/seahorse-ssh-key-properties.c:208
 msgid "Export Complete Key"
 msgstr "Eksporter hele nÃkkelen"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1060
-#: ../ssh/seahorse-ssh-key-properties.c:215
+#: ../pgp/seahorse-pgp-key-properties.c:1068
+#: ../ssh/seahorse-ssh-key-properties.c:230
 msgid "Couldn't export key."
 msgstr "Kunne ikke eksportere nÃkkel."
 
-#: ../pgp/seahorse-pgp-key-properties.c:1267
-#: ../pgp/seahorse-pgp-key-properties.c:1356
+#: ../pgp/seahorse-pgp-key-properties.c:1274
+#: ../pgp/seahorse-pgp-key-properties.c:1363
 msgctxt "Expires"
 msgid "Never"
 msgstr "Aldri"
 
+#: ../pgp/seahorse-pgp-key-properties.c:1321
+msgid "ID"
+msgstr "ID"
+
 #. The key type column
-#: ../pgp/seahorse-pgp-key-properties.c:1317
-#: ../src/seahorse-key-manager-store.c:896
+#: ../pgp/seahorse-pgp-key-properties.c:1324
+#: ../src/seahorse-key-manager-store.c:860
 msgid "Type"
 msgstr "Type"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1320
+#: ../pgp/seahorse-pgp-key-properties.c:1327
 msgid "Created"
 msgstr "Opprettet"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1323
+#: ../pgp/seahorse-pgp-key-properties.c:1330
 msgid "Expires"
 msgstr "UtgÃr"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1326
+#: ../pgp/seahorse-pgp-key-properties.c:1333
 msgid "Status"
 msgstr "Status"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1329
+#: ../pgp/seahorse-pgp-key-properties.c:1336
 msgid "Strength"
 msgstr "Styrke"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1353
+#: ../pgp/seahorse-pgp-key-properties.c:1360
 msgid "Good"
 msgstr "God"
 
+#: ../pgp/seahorse-pgp-key-properties.c:1754
+#: ../src/seahorse-key-manager-store.c:841
+msgid "Key ID"
+msgstr "NÃkkel-ID"
+
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:1
 msgid "<b>Actions</b>"
 msgstr "<b>Handlinger</b>"
@@ -2179,7 +1650,7 @@ msgstr "Marginalt"
 
 #. Trust column
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37
-#: ../src/seahorse-key-manager-store.c:890
+#: ../src/seahorse-key-manager-store.c:854
 msgid "Trust"
 msgstr "Tillit"
 
@@ -2228,7 +1699,7 @@ msgstr "Grunn til à tilbakekalle nÃkkelen"
 msgid "_Reason:"
 msgstr "Ã_rsak:"
 
-#: ../pgp/seahorse-signer.c:62
+#: ../pgp/seahorse-signer.c:61
 msgid ""
 "You have no personal PGP keys that can be used to sign a document or message."
 msgstr ""
@@ -2327,23 +1798,31 @@ msgstr "_Meget nÃye"
 msgid "_Sign message with key:"
 msgstr "_Signer melding med nÃkkel:"
 
-#: ../pkcs11/seahorse-pkcs11-certificate.c:106
+#: ../pkcs11/seahorse-pkcs11-certificate.c:109
 #: ../pkcs11/seahorse-pkcs11-certificate-props.c:66
 msgid "Certificate"
 msgstr "Sertifikat"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:108
+#: ../pkcs11/seahorse-pkcs11-commands.c:106
+msgid "Couldn't delete"
+msgstr "Kunne ikke slette"
+
+#: ../pkcs11/seahorse-pkcs11-commands.c:127
 #, c-format
 msgid "Are you sure you want to delete the certificate '%s'?"
 msgstr "Er du sikker pà at du vil slette sertifikatet Â%sÂ?"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:111
+#: ../pkcs11/seahorse-pkcs11-commands.c:130
 #, c-format
 msgid "Are you sure you want to delete %d certificate?"
 msgid_plural "Are you sure you want to delete %d certificates?"
 msgstr[0] "Er du sikker pà at du vil slette %d sertifikat?"
 msgstr[1] "Er du sikker pà at du vil slette %d sertifikater?"
 
+#: ../pkcs11/seahorse-pkcs11-commands.c:143
+msgid "Deleting"
+msgstr "Sletter"
+
 #: ../src/seahorse-change-passphrase.xml.h:1
 msgid "Change Passphrase"
 msgstr "Endre passord"
@@ -2364,7 +1843,7 @@ msgstr "Nytt _passord:"
 msgid "Manage your passwords and encryption keys"
 msgstr "HÃndter dine passord og krypteringsnÃkler"
 
-#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:862
+#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:850
 msgid "Passwords and Encryption Keys"
 msgstr "Passord og krypteringsnÃkler"
 
@@ -2380,111 +1859,115 @@ msgstr "F_ortsett"
 msgid "Create New ..."
 msgstr "Lag ny â"
 
-#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108
+#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:109
 #, c-format
 msgid "Selected %d key"
 msgid_plural "Selected %d keys"
 msgstr[0] "Valgte %d nÃkkel"
 msgstr[1] "Valgte %d nÃkler"
 
-#: ../src/seahorse-key-manager.c:410 ../src/seahorse-key-manager.c:470
-#: ../src/seahorse-key-manager.c:533 ../src/seahorse-viewer.c:458
+#: ../src/seahorse-key-manager.c:413 ../src/seahorse-key-manager.c:471
+#: ../src/seahorse-key-manager.c:532 ../src/seahorse-viewer.c:451
 msgid "Couldn't import keys"
 msgstr "Kunne ikke importere nÃkler"
 
-#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:463
+#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:453
 msgid "Imported keys"
 msgstr "Importerte nÃkler"
 
-#: ../src/seahorse-key-manager.c:464
+#: ../src/seahorse-key-manager.c:466
 msgid "Importing keys"
 msgstr "Importerer nÃkler"
 
-#: ../src/seahorse-key-manager.c:487 ../ssh/seahorse-ssh-operation.c:1017
+#: ../src/seahorse-key-manager.c:486 ../ssh/seahorse-ssh-operation.c:1089
 msgid "Import Key"
 msgstr "Importer nÃkkel"
 
-#: ../src/seahorse-key-manager.c:533
+#: ../src/seahorse-key-manager.c:532
 msgid "Unrecognized key type, or invalid data format"
 msgstr "Ikke gjenkjent nÃkkeltype eller ugyldig dataformat"
 
-#: ../src/seahorse-key-manager.c:731 ../src/seahorse-keyserver-results.c:245
+#: ../src/seahorse-key-manager.c:547
+msgid "Importing Keys"
+msgstr "Importerer nÃkler"
+
+#: ../src/seahorse-key-manager.c:719 ../src/seahorse-keyserver-results.c:247
 msgid "_Remote"
 msgstr "_Ekstern"
 
-#: ../src/seahorse-key-manager.c:733
+#: ../src/seahorse-key-manager.c:721
 msgid "Close this program"
 msgstr "Lukk dette programmet"
 
-#: ../src/seahorse-key-manager.c:734
+#: ../src/seahorse-key-manager.c:722
 msgid "_New..."
 msgstr "_Ny â"
 
-#: ../src/seahorse-key-manager.c:735
+#: ../src/seahorse-key-manager.c:723
 msgid "Create a new key or item"
 msgstr "Lag en ny nÃkkel eller oppfÃring"
 
-#: ../src/seahorse-key-manager.c:736
+#: ../src/seahorse-key-manager.c:724
 msgid "_Import..."
 msgstr "_Importer â"
 
-#: ../src/seahorse-key-manager.c:737
+#: ../src/seahorse-key-manager.c:725
 msgid "Import from a file"
 msgstr "Importer fra en fil"
 
-#: ../src/seahorse-key-manager.c:739
+#: ../src/seahorse-key-manager.c:727
 msgid "Import from the clipboard"
 msgstr "Importer fra utklippstavlen"
 
-#: ../src/seahorse-key-manager.c:744 ../src/seahorse-keyserver-results.c:255
+#: ../src/seahorse-key-manager.c:732 ../src/seahorse-keyserver-results.c:257
 msgid "_Find Remote Keys..."
 msgstr "_Finn eksterne nÃkler â"
 
-#: ../src/seahorse-key-manager.c:745 ../src/seahorse-keyserver-results.c:256
+#: ../src/seahorse-key-manager.c:733 ../src/seahorse-keyserver-results.c:258
 msgid "Search for keys on a key server"
 msgstr "SÃker etter nÃkler pà en nÃkkeltjener"
 
-#: ../src/seahorse-key-manager.c:746
+#: ../src/seahorse-key-manager.c:734
 msgid "_Sync and Publish Keys..."
 msgstr "_Synkroniser og publiser nÃkler â"
 
-#: ../src/seahorse-key-manager.c:747
+#: ../src/seahorse-key-manager.c:735
 msgid "Publish and/or synchronize your keys with those online."
 msgstr "Publiser og/eller synkroniser dine nÃkler med nÃkler pà nettet."
 
-#: ../src/seahorse-key-manager.c:752
+#: ../src/seahorse-key-manager.c:740
 msgid "T_ypes"
 msgstr "T_yper"
 
-#: ../src/seahorse-key-manager.c:752
+#: ../src/seahorse-key-manager.c:740
 msgid "Show type column"
 msgstr "Vis typekolonnen"
 
-#: ../src/seahorse-key-manager.c:754
+#: ../src/seahorse-key-manager.c:742
 msgid "_Expiry"
 msgstr "_UtlÃp"
 
-#: ../src/seahorse-key-manager.c:754
+#: ../src/seahorse-key-manager.c:742
 msgid "Show expiry column"
 msgstr "Vis utlÃpskolonnen"
 
-#: ../src/seahorse-key-manager.c:756
+#: ../src/seahorse-key-manager.c:744
 msgid "_Trust"
 msgstr "_Tillit"
 
-#: ../src/seahorse-key-manager.c:756
+#: ../src/seahorse-key-manager.c:744
 msgid "Show owner trust column"
 msgstr "Vis tillitskolonnen"
 
-#: ../src/seahorse-key-manager.c:758
+#: ../src/seahorse-key-manager.c:746
 msgid "_Validity"
 msgstr "_Validitet"
 
-#: ../src/seahorse-key-manager.c:758
+#: ../src/seahorse-key-manager.c:746
 msgid "Show validity column"
 msgstr "Vis gyldighetskolonnen"
 
-#: ../src/seahorse-key-manager.c:931
+#: ../src/seahorse-key-manager.c:923
 msgid "Filter:"
 msgstr "Filter:"
 
@@ -2512,7 +1995,7 @@ msgstr "Andre nÃ_kler"
 msgid "To get started with encryption you will need keys."
 msgstr "For à komme i gang med kryptering mà du ha nÃkler."
 
-#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:522
+#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:516
 msgid "_Import"
 msgstr "_Importer"
 
@@ -2520,44 +2003,44 @@ msgstr "_Importer"
 msgid "_Passwords"
 msgstr "_Passord"
 
-#: ../src/seahorse-key-manager-store.c:685 ../src/seahorse-viewer.c:256
+#: ../src/seahorse-key-manager-store.c:637 ../src/seahorse-viewer.c:261
 msgid "Couldn't export keys"
 msgstr "Kunne ikke eksportere nÃkler"
 
-#: ../src/seahorse-key-manager-store.c:883
+#: ../src/seahorse-key-manager-store.c:847
 msgid "Validity"
 msgstr "Validitet"
 
 #. Expiry date column
-#: ../src/seahorse-key-manager-store.c:902
+#: ../src/seahorse-key-manager-store.c:866
 msgid "Expiration Date"
 msgstr "UtlÃpsdato"
 
-#: ../src/seahorse-keyserver-results.c:247
+#: ../src/seahorse-keyserver-results.c:249
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ../src/seahorse-keyserver-results.c:248
+#: ../src/seahorse-keyserver-results.c:250
 msgid "_Expand All"
 msgstr "_Utvid alle"
 
-#: ../src/seahorse-keyserver-results.c:249
+#: ../src/seahorse-keyserver-results.c:251
 msgid "Expand all listings"
 msgstr "Utvid alle lister"
 
-#: ../src/seahorse-keyserver-results.c:250
+#: ../src/seahorse-keyserver-results.c:252
 msgid "_Collapse All"
 msgstr "S_là sammen alle"
 
-#: ../src/seahorse-keyserver-results.c:251
+#: ../src/seahorse-keyserver-results.c:253
 msgid "Collapse all listings"
 msgstr "Slà sammen alle lister"
 
-#: ../src/seahorse-keyserver-results.c:322
+#: ../src/seahorse-keyserver-results.c:324
 msgid "Remote Keys"
 msgstr "Eksterne nÃkler"
 
-#: ../src/seahorse-keyserver-results.c:324
+#: ../src/seahorse-keyserver-results.c:326
 #, c-format
 msgid "Remote Keys Containing '%s'"
 msgstr "Eksterne nÃkler som inneholder Â%sÂ"
@@ -2594,11 +2077,11 @@ msgstr "_SÃk"
 msgid "_Search for keys containing: "
 msgstr "_SÃk etter nÃkler som inneholder:"
 
-#: ../src/seahorse-keyserver-sync.c:45
+#: ../src/seahorse-keyserver-sync.c:52
 msgid "Couldn't publish keys to server"
 msgstr "Kunne ikke publisere nÃkler til tjener"
 
-#: ../src/seahorse-keyserver-sync.c:61
+#: ../src/seahorse-keyserver-sync.c:71
 #, c-format
 msgid "Couldn't retrieve keys from server: %s"
 msgstr "Kunne ikke motta nÃkler fra nÃkkeltjener: %s"
@@ -2610,12 +2093,7 @@ msgid_plural "<b>%d keys are selected for synchronizing</b>"
 msgstr[0] "<b>%d nÃkkel er valgt for synkronisering</b>"
 msgstr[1] "<b>%d nÃkler er valgt for synkronisering</b>"
 
-#: ../src/seahorse-keyserver-sync.c:216
-msgid "Synchronizing keys"
-msgstr "Synkroniserer nÃkler"
-
-#. Show the progress window if necessary
-#: ../src/seahorse-keyserver-sync.c:248
+#: ../src/seahorse-keyserver-sync.c:241
 msgid "Synchronizing keys..."
 msgstr "Synkroniserer nÃkler â"
 
@@ -2651,129 +2129,121 @@ msgstr "NÃ_kkeltjenere"
 msgid "_Sync"
 msgstr "_Synkroniser"
 
-#: ../src/seahorse-main.c:62
+#: ../src/seahorse-main.c:60
 msgid "Version of this application"
 msgstr "Versjon av dette programmet"
 
-#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:144
+#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:145
 msgid "Encryption Key Manager"
 msgstr "HÃndtering av krypteringsnÃkler"
 
-#: ../src/seahorse-viewer.c:120
+#: ../src/seahorse-viewer.c:121
 msgid "Contributions:"
 msgstr "Bidrag:"
 
-#: ../src/seahorse-viewer.c:146
+#: ../src/seahorse-viewer.c:147
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas gnome org>\n"
 "Espen Stefansen <espens svn gnome org>"
 
-#: ../src/seahorse-viewer.c:149
+#: ../src/seahorse-viewer.c:150
 msgid "Seahorse Project Homepage"
 msgstr "Hjemmesiden til Seahorse-prosjektet"
 
 #. Top menu items
-#: ../src/seahorse-viewer.c:168
+#: ../src/seahorse-viewer.c:170
 msgid "_File"
 msgstr "_Fil"
 
-#: ../src/seahorse-viewer.c:169
+#: ../src/seahorse-viewer.c:171
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/seahorse-viewer.c:170
+#: ../src/seahorse-viewer.c:172
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/seahorse-viewer.c:171
+#: ../src/seahorse-viewer.c:173
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/seahorse-viewer.c:173
+#: ../src/seahorse-viewer.c:175
 msgid "Prefere_nces"
 msgstr "_Innstillinger"
 
-#: ../src/seahorse-viewer.c:174
+#: ../src/seahorse-viewer.c:176
 msgid "Change preferences for this program"
 msgstr "Endre brukervalg for dette programmet"
 
-#: ../src/seahorse-viewer.c:177
+#: ../src/seahorse-viewer.c:179
 msgid "About this program"
 msgstr "Om dette programmet"
 
-#: ../src/seahorse-viewer.c:178
+#: ../src/seahorse-viewer.c:180
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/seahorse-viewer.c:179
+#: ../src/seahorse-viewer.c:181
 msgid "Show Seahorse help"
 msgstr "Vis hjelp for Seahorse"
 
-#: ../src/seahorse-viewer.c:276
+#: ../src/seahorse-viewer.c:282
 msgid "Export public key"
 msgstr "Eksporter offentlig nÃkkel"
 
-#: ../src/seahorse-viewer.c:296
+#: ../src/seahorse-viewer.c:303
 msgid "Exporting keys"
 msgstr "Eksporterer nÃkler"
 
-#: ../src/seahorse-viewer.c:321
+#: ../src/seahorse-viewer.c:332
 msgid "Couldn't retrieve data from key server"
 msgstr "Kunne ikke hente data fra nÃkkeltjener"
 
 #. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys"
-#: ../src/seahorse-viewer.c:340
+#: ../src/seahorse-viewer.c:344
 msgid "Copied keys"
 msgstr "Kopierte nÃkler"
 
-#: ../src/seahorse-viewer.c:360
+#: ../src/seahorse-viewer.c:369
 msgid "Retrieving keys"
 msgstr "Henter nÃkler"
 
-#: ../src/seahorse-viewer.c:375
-msgid "Couldn't delete."
-msgstr "Kunne ikke slette."
-
-#: ../src/seahorse-viewer.c:409
-msgid "Deleting..."
-msgstr "Sletter â"
-
-#: ../src/seahorse-viewer.c:435
+#: ../src/seahorse-viewer.c:424
 #, c-format
 msgid "%s is a private key. Are you sure you want to proceed?"
 msgstr "%s er en privat nÃkkel. Er du sikker pà at du vil fortsette?"
 
-#: ../src/seahorse-viewer.c:483
+#: ../src/seahorse-viewer.c:478
 msgid "Importing keys from key servers"
 msgstr "Importerer nÃkler fra nÃkkeltjenere"
 
-#: ../src/seahorse-viewer.c:509
+#: ../src/seahorse-viewer.c:503
 msgid "Show properties"
 msgstr "Vis egenskaper"
 
-#: ../src/seahorse-viewer.c:510
+#: ../src/seahorse-viewer.c:504
 msgctxt "This text refers to deleting an item from its type's backing store."
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../src/seahorse-viewer.c:511
+#: ../src/seahorse-viewer.c:505
 msgid "Delete selected items"
 msgstr "Slett valgte oppfÃringer"
 
-#: ../src/seahorse-viewer.c:515
+#: ../src/seahorse-viewer.c:509
 msgid "E_xport..."
 msgstr "E_ksporter â"
 
-#: ../src/seahorse-viewer.c:516
+#: ../src/seahorse-viewer.c:510
 msgid "Export to a file"
 msgstr "Eksporter til en fil"
 
-#: ../src/seahorse-viewer.c:518
+#: ../src/seahorse-viewer.c:512
 msgid "Copy to the clipboard"
 msgstr "Kopier til utklippstavlen"
 
-#: ../src/seahorse-viewer.c:523
+#: ../src/seahorse-viewer.c:517
 msgid "Import selected keys to local key ring"
 msgstr "Importer valgte nÃkler til lokal nÃkkelring"
 
@@ -2781,11 +2251,11 @@ msgstr "Importer valgte nÃkler til lokal nÃkkelring"
 msgid "Enter your Secure Shell passphrase:"
 msgstr "Oppgi din Secure Shell-passordfrase:"
 
-#: ../ssh/seahorse-ssh-commands.c:85
+#: ../ssh/seahorse-ssh-commands.c:86
 msgid "Configure Key for _Secure Shell..."
 msgstr "Konfigurerer nÃkkel for _Secure Shell â"
 
-#: ../ssh/seahorse-ssh-commands.c:86
+#: ../ssh/seahorse-ssh-commands.c:87
 msgid ""
 "Send public Secure Shell key to another machine, and enable logins using "
 "that key."
@@ -2793,30 +2263,34 @@ msgstr ""
 "Send offentlig nÃkkel for sikkert skall til en annen maskin og aktiver "
 "pÃlogging med denne nÃkkelen."
 
-#: ../ssh/seahorse-ssh-commands.c:115
+#: ../ssh/seahorse-ssh-commands.c:118
 #, c-format
 msgid "Are you sure you want to delete the secure shell key '%s'?"
 msgstr "Er du sikker pà at du vil slette nÃkkel for secure shell Â%sÂ?"
 
-#: ../ssh/seahorse-ssh-commands.c:118
+#: ../ssh/seahorse-ssh-commands.c:121
 #, c-format
 msgid "Are you sure you want to delete %d secure shell keys?"
 msgstr "Er du sikker pà at du vil slette %d nÃkler for secure shell?"
 
-#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91
-#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19
+#: ../ssh/seahorse-ssh-commands.c:133
+msgid "Couldn't delete key"
+msgstr "Kunne ikke slette nÃkkel"
+
+#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:92
+#: ../ssh/seahorse-ssh-key.c:96 ../ssh/seahorse-ssh-key-properties.xml.h:19
 msgid "Secure Shell Key"
 msgstr "NÃkkel for sikkert skall"
 
-#: ../ssh/seahorse-ssh-generate.c:60
+#: ../ssh/seahorse-ssh-generate.c:61
 msgid "Used to access other computers (eg: via a terminal)"
 msgstr "Brukes til à aksessere andre datamaskiner (f.eks via en terminal)"
 
-#: ../ssh/seahorse-ssh-generate.c:90
+#: ../ssh/seahorse-ssh-generate.c:116 ../ssh/seahorse-ssh-generate.c:135
 msgid "Couldn't generate Secure Shell key"
 msgstr "Kunne ikke generere Secure Shell-nÃkkel"
 
-#: ../ssh/seahorse-ssh-generate.c:213
+#: ../ssh/seahorse-ssh-generate.c:203
 msgid "Creating Secure Shell Key"
 msgstr "Oppretter Secure Shell-nÃkkel"
 
@@ -2864,31 +2338,31 @@ msgstr "_Bare opprett nÃkkel"
 msgid "_Key Description:"
 msgstr "NÃ_kkelbeskrivelse:"
 
-#: ../ssh/seahorse-ssh-key.c:87
+#: ../ssh/seahorse-ssh-key.c:88
 msgid "(Unreadable Secure Shell Key)"
 msgstr "(Uleslig Secure Shell-nÃkkel)"
 
-#: ../ssh/seahorse-ssh-key.c:105
+#: ../ssh/seahorse-ssh-key.c:106
 msgid "Invalid"
 msgstr "Ugyldig"
 
-#: ../ssh/seahorse-ssh-key.c:116
+#: ../ssh/seahorse-ssh-key.c:117
 msgid "Private Secure Shell Key"
 msgstr "Privat Secure Shell-nÃkkel"
 
-#: ../ssh/seahorse-ssh-key.c:119
+#: ../ssh/seahorse-ssh-key.c:120
 msgid "Public Secure Shell Key"
 msgstr "Offentlig nÃkkel for sikkert skall"
 
-#: ../ssh/seahorse-ssh-key-properties.c:71
+#: ../ssh/seahorse-ssh-key-properties.c:62
 msgid "Couldn't rename key."
 msgstr "Kunne ikke endre navn pà nÃkkel."
 
-#: ../ssh/seahorse-ssh-key-properties.c:112
+#: ../ssh/seahorse-ssh-key-properties.c:115
 msgid "Couldn't change authorization for key."
 msgstr "Kunne ikke endre autorisasjon for nÃkkelen."
 
-#: ../ssh/seahorse-ssh-key-properties.c:127
+#: ../ssh/seahorse-ssh-key-properties.c:150
 msgid "Couldn't change passphrase for key."
 msgstr "Kunne ikke endre passordfrasen for nÃkkel."
 
@@ -2934,77 +2408,71 @@ msgstr ""
 msgid "Used to connect to other computers."
 msgstr "Brukt til à koble til andre datamaskiner."
 
-#: ../ssh/seahorse-ssh-operation.c:143 ../ssh/seahorse-ssh-operation.c:732
-#, c-format
+#: ../ssh/seahorse-ssh-operation.c:204
+msgid "Secure Shell key"
+msgstr "NÃkkel for sikkert skall"
+
+#: ../ssh/seahorse-ssh-operation.c:262
 msgid "The SSH command was terminated unexpectedly."
 msgstr "SSH-kommando terminerte uventet."
 
-#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739
+#: ../ssh/seahorse-ssh-operation.c:270
 msgid "The SSH command failed."
 msgstr "SSH-kommando feilet"
 
-#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477
-msgid "Secure Shell key"
-msgstr "NÃkkel for sikkert skall"
-
-#: ../ssh/seahorse-ssh-operation.c:448
-msgid "Passphrase:"
-msgstr "Passordfrase:"
-
 #. Just prompt over and over again
-#: ../ssh/seahorse-ssh-operation.c:762
+#: ../ssh/seahorse-ssh-operation.c:678
 msgid "Remote Host Password"
 msgstr "Passord for ekstern vert"
 
-#: ../ssh/seahorse-ssh-operation.c:850
+#: ../ssh/seahorse-ssh-operation.c:808
 msgid "Old Key Passphrase"
 msgstr "Gammel passordfrase for nÃkkel"
 
-#: ../ssh/seahorse-ssh-operation.c:851
+#: ../ssh/seahorse-ssh-operation.c:809
 #, c-format
 msgid "Enter the old passphrase for: %s"
 msgstr "Oppgi den gamle passordfrasen for: %s"
 
-#: ../ssh/seahorse-ssh-operation.c:855
+#: ../ssh/seahorse-ssh-operation.c:813
 msgid "New Key Passphrase"
 msgstr "Ny passordfrase for nÃkkel"
 
-#: ../ssh/seahorse-ssh-operation.c:856
+#: ../ssh/seahorse-ssh-operation.c:814
 #, c-format
 msgid "Enter the new passphrase for: %s"
 msgstr "Oppgi den nye passordfrasen for: %s"
 
-#: ../ssh/seahorse-ssh-operation.c:864
+#: ../ssh/seahorse-ssh-operation.c:822
 msgid "Enter Key Passphrase"
 msgstr "Oppgi passordfrase for nÃkkel"
 
-#: ../ssh/seahorse-ssh-operation.c:931
+#: ../ssh/seahorse-ssh-operation.c:942
 msgid "Passphrase for New Secure Shell Key"
 msgstr "Passordfrase for ny Secure Shell-nÃkkel"
 
-#: ../ssh/seahorse-ssh-operation.c:932
+#: ../ssh/seahorse-ssh-operation.c:943
 msgid "Enter a passphrase for your new Secure Shell key."
 msgstr "Oppgi en passordfrase for din nye Secure Shell-nÃkkel"
 
-#: ../ssh/seahorse-ssh-operation.c:1013
+#: ../ssh/seahorse-ssh-operation.c:1085
 #, c-format
 msgid "Importing key: %s"
 msgstr "Importerer nÃkkel: %s"
 
-#: ../ssh/seahorse-ssh-operation.c:1015
+#: ../ssh/seahorse-ssh-operation.c:1087
 msgid "Importing key. Enter passphrase"
 msgstr "Importerer nÃkkel. Oppgi passord"
 
-#: ../ssh/seahorse-ssh-source.c:825
+#: ../ssh/seahorse-ssh-source.c:915
 msgid "No private key file is available for this key."
 msgstr "Ingen privat nÃkkelfil er tilgjengelig for denne nÃkkelen."
 
-#: ../ssh/seahorse-ssh-upload.c:45
+#: ../ssh/seahorse-ssh-upload.c:47
 msgid "Couldn't configure Secure Shell keys on remote computer."
 msgstr "Kunne ikke konfigurere Secure Shell-nÃkkelen pà ekstern datamaskin."
 
-#. Show the progress window if necessary
-#: ../ssh/seahorse-ssh-upload.c:181
+#: ../ssh/seahorse-ssh-upload.c:132
 msgid "Configuring Secure Shell Keys..."
 msgstr "Konfigurerer Secure Shell-nÃkler â"