[seahorse] Updated Norwegian bokmÃl translation

[Kjartan Maraas <kmaraas src gnome org>]

commit 795317ee85d9ef59e337f8a3ae245581bad2302b
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Mon Oct 24 09:47:40 2011 +0200

    Updated Norwegian bokmÃl translation

 po/nb.po | 1585 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 884 insertions(+), 701 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 43f93d9..7ed4847 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: seahorse 3.1.x\n"
+"Project-Id-Version: seahorse 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-17 11:50+0200\n"
-"PO-Revision-Date: 2011-09-17 11:50+0200\n"
+"POT-Creation-Date: 2011-10-24 09:37+0200\n"
+"PO-Revision-Date: 2011-10-24 09:47+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian <i18n-nb lister ping uio no>\n"
 "Language: no\n"
@@ -38,7 +38,138 @@ 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:72
+#: ../gkr/seahorse-gkr-actions.c:78
+msgid "New password keyring"
+msgstr "Ny nÃkkelring for passord"
+
+#: ../gkr/seahorse-gkr-actions.c:79 ../gkr/seahorse-gkr-actions.c:86
+msgid "Used to store application and network passwords"
+msgstr "Brukes til à lagre passord for programmer og nettverk"
+
+#: ../gkr/seahorse-gkr-actions.c:80
+msgid "New password..."
+msgstr "Nytt passord â"
+
+#: ../gkr/seahorse-gkr-actions.c:81 ../gkr/seahorse-gkr-actions.c:88
+msgid "Safely store a password or secret."
+msgstr "Lagre et passord eller en hemmelighet pà en trygg mÃte."
+
+#: ../gkr/seahorse-gkr-actions.c:85
+msgid "Password Keyring"
+msgstr "NÃkkelringer for passord"
+
+#: ../gkr/seahorse-gkr-actions.c:87
+msgid "Stored Password"
+msgstr "Lagret passord"
+
+#: ../gkr/seahorse-gkr-actions.c:171
+msgid "Couldn't unlock keyring"
+msgstr "Kunne ikke lÃse opp nÃkkelring"
+
+#: ../gkr/seahorse-gkr-actions.c:202
+msgid "Couldn't lock keyring"
+msgstr "Kunne ikke lÃse nÃkkelring"
+
+#: ../gkr/seahorse-gkr-actions.c:234
+msgid "Couldn't set default keyring"
+msgstr "Kunne ikke sette forvalgt nÃkkelring"
+
+#: ../gkr/seahorse-gkr-actions.c:263
+msgid "Couldn't change keyring password"
+msgstr "Kunne ikke endre passord for nÃkkelring"
+
+#: ../gkr/seahorse-gkr-actions.c:302
+msgid "Couldn't delete keyring"
+msgstr "Kunne ikke slette nÃkkelring"
+
+#: ../gkr/seahorse-gkr-actions.c:323
+#, 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-actions.c:333
+msgid "Deleting keyring"
+msgid_plural "Deleting keyrings"
+msgstr[0] "Sletter nÃkkelring"
+msgstr[1] "Sletter nÃkkelringer"
+
+#: ../gkr/seahorse-gkr-actions.c:345
+msgid "_Lock"
+msgstr "_LÃs"
+
+#: ../gkr/seahorse-gkr-actions.c:346
+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-actions.c:347
+msgid "_Unlock"
+msgstr "LÃs _opp"
+
+#: ../gkr/seahorse-gkr-actions.c:348
+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-actions.c:349
+msgid "_Set as default"
+msgstr "_Sett som forvalg"
+
+#: ../gkr/seahorse-gkr-actions.c:350
+msgid "Applications usually store new passwords in the default keyring."
+msgstr "Programmer lagrer vanligvis nye passord i forvalgt nÃkkelring."
+
+#: ../gkr/seahorse-gkr-actions.c:351
+msgid "Change _Password"
+msgstr "Bytt _passord"
+
+#: ../gkr/seahorse-gkr-actions.c:352
+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-actions.c:354
+msgid "Properties of the keyring."
+msgstr "Egenskaper for nÃkkelring."
+
+#: ../gkr/seahorse-gkr-actions.c:356
+msgid "Delete the keyring."
+msgstr "Slett nÃkkelringen."
+
+#: ../gkr/seahorse-gkr-actions.c:486
+msgid "Couldn't delete item"
+msgstr "Kunne ikke slette oppfÃring"
+
+#: ../gkr/seahorse-gkr-actions.c:510
+#, 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-actions.c:513
+#, 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-actions.c:524
+msgid "Deleting item"
+msgid_plural "Deleting items"
+msgstr[0] "Sletter oppfÃring"
+msgstr[1] "Sletter oppfÃringer"
+
+#: ../gkr/seahorse-gkr-actions.c:536
+msgid "Properties of the password."
+msgstr "Egenskaper for passordet."
+
+#: ../gkr/seahorse-gkr-actions.c:538
+msgid "Delete the password."
+msgstr "Slett passordet."
+
+#: ../gkr/seahorse-gkr-add-item.c:60 ../gkr/seahorse-gkr-add-keyring.c:71
 msgid "Couldn't add keyring"
 msgstr "Kunne ikke legge til nÃkkelring"
 
@@ -48,6 +179,7 @@ msgstr "Legg til passord"
 
 #: ../gkr/seahorse-gkr-add-item.xml.h:2
 #: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5
+#: ../ssh/seahorse-ssh-generate.xml.h:9
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
@@ -63,66 +195,101 @@ msgstr "_Passord:"
 msgid "_Show Password"
 msgstr "Vi_s passord"
 
-#: ../gkr/seahorse-gkr-item-commands.c:78
-msgid "Couldn't delete item"
-msgstr "Kunne ikke slette oppfÃring"
+#: ../gkr/seahorse-gkr-backend.c:101
+msgid "Passwords"
+msgstr "Passord"
 
-#: ../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-backend.c:104
+msgid "Stored personal passwords, credentials and secrets"
+msgstr "Lagrede personlige passord, pÃloggingsinformasjon og hemmeligheter"
 
-#: ../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?"
+#. Translators: This should be the same as the string in empathy
+#: ../gkr/seahorse-gkr-item.c:313
+msgid "IM account password for "
+msgstr "Passord for IM-konto for "
 
-#: ../gkr/seahorse-gkr-item-commands.c:114
-msgid "Deleting item"
-msgid_plural "Deleting items"
-msgstr[0] "Sletter oppfÃring"
-msgstr[1] "Sletter oppfÃringer"
+#: ../gkr/seahorse-gkr-item.c:379
+msgid "Password or secret"
+msgstr "Passord eller hemmelighet"
+
+#: ../gkr/seahorse-gkr-item.c:380
+msgid "Network password"
+msgstr "Nettverkspassord"
+
+#: ../gkr/seahorse-gkr-item.c:381
+msgid "Stored note"
+msgstr "Lagret notat"
+
+#: ../gkr/seahorse-gkr-item.c:382
+msgid "Keyring password"
+msgstr "Passord for nÃkkelring"
+
+#: ../gkr/seahorse-gkr-item.c:383
+msgid "Encryption key password"
+msgstr "Passord for krypteringsnÃkkel"
+
+#: ../gkr/seahorse-gkr-item.c:384
+msgid "Key storage password"
+msgstr "Passord for nÃkkellager"
+
+#: ../gkr/seahorse-gkr-item.c:385
+msgid "Google Chrome password"
+msgstr "Passord for Google Chrome"
 
-#: ../gkr/seahorse-gkr-item-properties.c:70
+#: ../gkr/seahorse-gkr-item.c:386
+msgid "Gnome Online Accounts password"
+msgstr "Passord for GNOME kontoer pà nettet"
+
+#: ../gkr/seahorse-gkr-item.c:387
+msgid "Telepathy password"
+msgstr "Passord for Telepathy"
+
+#: ../gkr/seahorse-gkr-item.c:388
+msgid "Instant messaging password"
+msgstr "Passord for lynmeldinger"
+
+#: ../gkr/seahorse-gkr-item.c:389
+msgid "Network Manager secret"
+msgstr "Hemmelighet for Network Manager"
+
+#: ../gkr/seahorse-gkr-item-properties.c:69
 msgid "Access a network share or resource"
 msgstr "Aksesser en delt nettverksressurs"
 
-#: ../gkr/seahorse-gkr-item-properties.c:73
+#: ../gkr/seahorse-gkr-item-properties.c:72
 msgid "Access a website"
 msgstr "Aksesser et nettsted"
 
-#: ../gkr/seahorse-gkr-item-properties.c:76
+#: ../gkr/seahorse-gkr-item-properties.c:75
 msgid "Unlocks a PGP key"
 msgstr "LÃser opp en GPG-nÃkkel"
 
-#: ../gkr/seahorse-gkr-item-properties.c:79
+#: ../gkr/seahorse-gkr-item-properties.c:78
 msgid "Unlocks a Secure Shell key"
 msgstr "LÃser opp en nÃkkel for sikkert skall"
 
-#: ../gkr/seahorse-gkr-item-properties.c:82
+#: ../gkr/seahorse-gkr-item-properties.c:81
 msgid "Saved password or login"
 msgstr "Lagret passord eller pÃlogging"
 
-#: ../gkr/seahorse-gkr-item-properties.c:106
+#: ../gkr/seahorse-gkr-item-properties.c:105
 msgid "Network Credentials"
 msgstr "PÃloggingsinformasjon for nettverk"
 
-#: ../gkr/seahorse-gkr-item-properties.c:111
+#: ../gkr/seahorse-gkr-item-properties.c:110
 msgid "Password"
 msgstr "Passord"
 
-#: ../gkr/seahorse-gkr-item-properties.c:211
+#: ../gkr/seahorse-gkr-item-properties.c:210
 msgid "Couldn't change password."
 msgstr "Kunne ikke endre passord"
 
-#: ../gkr/seahorse-gkr-item-properties.c:256
-#: ../gkr/seahorse-gkr-item-properties.c:377
+#: ../gkr/seahorse-gkr-item-properties.c:255
+#: ../gkr/seahorse-gkr-item-properties.c:376
 msgid "Updating password"
 msgstr "Oppdaterer passord"
 
-#: ../gkr/seahorse-gkr-item-properties.c:337
+#: ../gkr/seahorse-gkr-item-properties.c:336
 msgid "Couldn't set description."
 msgstr "Kunne ikke sette beskrivelse"
 
@@ -179,104 +346,14 @@ msgstr "Type:"
 msgid "Use:"
 msgstr "Bruk:"
 
-#: ../gkr/seahorse-gkr-keyring.c:120
-#, c-format
-msgid "Passwords: %s"
-msgstr "Passord: %s"
-
-#: ../gkr/seahorse-gkr-keyring.c:121
-#, c-format
-msgid "<b>Passwords:</b> %s"
-msgstr "<b>Passord:</b> %s"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:113
-msgid "Password Keyring"
-msgstr "NÃkkelringer for passord"
-
-#: ../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:115
-msgid "Stored Password"
-msgstr "Lagret passord"
-
-#: ../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:128
-msgid "Couldn't unlock keyring"
-msgstr "Kunne ikke lÃse opp nÃkkelring"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:165
-msgid "Couldn't lock keyring"
-msgstr "Kunne ikke lÃse nÃkkelring"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:202
-msgid "Couldn't set default keyring"
-msgstr "Kunne ikke sette forvalgt nÃkkelring"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:239
-msgid "Couldn't change keyring password"
-msgstr "Kunne ikke endre passord for nÃkkelring"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:268
-msgid "_Lock"
-msgstr "_LÃs"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:269
-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:270
-msgid "_Unlock"
-msgstr "LÃs _opp"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:271
-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:272
-msgid "_Set as default"
-msgstr "_Sett som forvalg"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:273
-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:274
-msgid "Change _Password"
-msgstr "Bytt _passord"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:275
-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:340
-msgid "Couldn't delete keyring"
-msgstr "Kunne ikke slette nÃkkelring"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:358
-#, 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.c:129
+msgid "Login keyring"
+msgstr "NÃkkelring for pÃlogging"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:368
-msgid "Deleting keyring"
-msgid_plural "Deleting keyrings"
-msgstr[0] "Sletter nÃkkelring"
-msgstr[1] "Sletter nÃkkelringer"
+#: ../gkr/seahorse-gkr-keyring.c:534
+msgid "To do Keyring"
+msgstr "NÃkkelring for oppgaveliste"
 
-#. -----------------------------------------------------------------------------
-#. * PUBLIC
-#.
 #. To translators: This is the noun not the verb.
 #: ../gkr/seahorse-gkr-keyring.xml.h:2
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:19
@@ -296,36 +373,36 @@ msgstr "Egenskaper for nÃkkelring"
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73
-#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193
+#: ../gkr/seahorse-gkr-operation.c:54 ../pgp/seahorse-gpgme.c:73
+#: ../pgp/seahorse-hkp-source.c:585 ../ssh/seahorse-ssh-operation.c:193
 msgid "The operation was cancelled"
 msgstr "Operasjonen ble avbrutt"
 
-#: ../gkr/seahorse-gkr-operation.c:57
+#: ../gkr/seahorse-gkr-operation.c:59
 msgid "Access to the key ring was denied"
 msgstr "Tilgang til nÃkkelringen ble nektet"
 
-#: ../gkr/seahorse-gkr-operation.c:60
+#: ../gkr/seahorse-gkr-operation.c:62
 msgid "The gnome-keyring daemon is not running"
 msgstr "gnome-keyring-tjenesten kjÃrer ikke"
 
-#: ../gkr/seahorse-gkr-operation.c:63
+#: ../gkr/seahorse-gkr-operation.c:65
 msgid "The key ring has already been unlocked"
 msgstr "NÃkkelringen er allerede lÃst opp"
 
-#: ../gkr/seahorse-gkr-operation.c:66
+#: ../gkr/seahorse-gkr-operation.c:68
 msgid "No such key ring exists"
 msgstr "NÃkkelringen eksisterer ikke"
 
-#: ../gkr/seahorse-gkr-operation.c:69
+#: ../gkr/seahorse-gkr-operation.c:71
 msgid "Couldn't communicate with key ring daemon"
 msgstr "Kunne ikke kommunisere med nÃkkelringtjenesten"
 
-#: ../gkr/seahorse-gkr-operation.c:72
+#: ../gkr/seahorse-gkr-operation.c:74
 msgid "The item already exists"
 msgstr "OppfÃringen eksisterer allerede"
 
-#: ../gkr/seahorse-gkr-operation.c:78
+#: ../gkr/seahorse-gkr-operation.c:80
 msgid "Internal error accessing gnome-keyring"
 msgstr "Intern feil ved aksess til gnome-keyring"
 
@@ -608,24 +685,29 @@ msgstr "Port som tjeneren skal aksesseres pÃ."
 msgid "initial temporary item"
 msgstr "opprinnelig midlertidig oppfÃring"
 
-#: ../libseahorse/seahorse-passphrase.c:180
+#: ../libseahorse/seahorse-key-manager-store.c:476
+#: ../libseahorse/seahorse-viewer.c:273
+msgid "Couldn't export keys"
+msgstr "Kunne ikke eksportere nÃkler"
+
+#: ../libseahorse/seahorse-passphrase.c:182
 msgid "Passphrase"
 msgstr "Passord"
 
-#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99
+#: ../libseahorse/seahorse-passphrase.c:185 ../ssh/seahorse-ssh-askpass.c:99
 msgid "Password:"
 msgstr "Passord:"
 
 #. The second and main entry
-#: ../libseahorse/seahorse-passphrase.c:246
+#: ../libseahorse/seahorse-passphrase.c:247
 msgid "Confirm:"
 msgstr "Bekreft:"
 
-#: ../libseahorse/seahorse-prefs.c:68
+#: ../libseahorse/seahorse-prefs.c:67
 msgid "Not a valid Key Server address."
 msgstr "Ikke en gyldig adresse til nÃkkeltjener."
 
-#: ../libseahorse/seahorse-prefs.c:69
+#: ../libseahorse/seahorse-prefs.c:68
 msgid ""
 "For help contact your system adminstrator or the administrator of the key "
 "server."
@@ -633,15 +715,15 @@ msgstr ""
 "For hjelp, kontakt din systemadministrator eller nÃkkeltjenerens "
 "administrator."
 
-#: ../libseahorse/seahorse-prefs.c:183
+#: ../libseahorse/seahorse-prefs.c:182
 msgid "URL"
 msgstr "URL"
 
-#: ../libseahorse/seahorse-prefs.c:348
+#: ../libseahorse/seahorse-prefs.c:347
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../libseahorse/seahorse-prefs.c:406
+#: ../libseahorse/seahorse-prefs.c:405
 msgid "None: Don't publish keys"
 msgstr "Ingen: Ikke publiser nÃkler"
 
@@ -669,27 +751,7 @@ msgstr "_Finn nÃkler via:"
 msgid "_Publish keys to:"
 msgstr "_Publiser nÃkler til:"
 
-#: ../libseahorse/seahorse-transfer.c:178
-msgid "Retrieving data"
-msgstr "Henter data"
-
-#: ../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:259
+#: ../libseahorse/seahorse-util.c:261
 msgid "%Y-%m-%d"
 msgstr "%d-%m-%Y"
 
@@ -716,7 +778,7 @@ msgstr "Alle filer"
 msgid "Archive files"
 msgstr "Arkivfiler"
 
-#: ../libseahorse/seahorse-util.c:856
+#: ../libseahorse/seahorse-util.c:857
 msgid ""
 "<b>A file already exists with this name.</b>\n"
 "\n"
@@ -726,7 +788,7 @@ msgstr ""
 "\n"
 "Vil du erstatte den med en ny fil?"
 
-#: ../libseahorse/seahorse-util.c:859
+#: ../libseahorse/seahorse-util.c:860
 msgid "_Replace"
 msgstr "E_rstatt"
 
@@ -734,6 +796,7 @@ msgstr "E_rstatt"
 #: ../pgp/seahorse-pgp-key-properties.c:1273
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:46
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:40
+#: ../pkcs11/seahorse-token.c:249
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -762,57 +825,169 @@ msgid "Ultimate"
 msgstr "Ultimat"
 
 #: ../libseahorse/seahorse-validity.c:50
-#: ../pgp/seahorse-pgp-key-properties.c:1491
+#: ../pgp/seahorse-pgp-key-properties.c:1488
 msgid "Disabled"
 msgstr "Deaktivert"
 
 #: ../libseahorse/seahorse-validity.c:52
-#: ../pgp/seahorse-pgp-key-properties.c:1487
+#: ../pgp/seahorse-pgp-key-properties.c:1484
 msgid "Revoked"
 msgstr "Tilbakekalt"
 
-#: ../libseahorse/seahorse-widget.c:461
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Kunne ikke vise hjelp: %s"
+#: ../libseahorse/seahorse-viewer.c:84
+msgid "Contributions:"
+msgstr "Bidrag:"
 
-#: ../pgp/seahorse-add-subkey.xml.h:1
-msgid "Expiration Date:"
-msgstr "UtlÃpsdato:"
+#: ../libseahorse/seahorse-viewer.c:108 ../src/seahorse.desktop.in.in.h:2
+#: ../src/seahorse-key-manager.c:586 ../src/seahorse-main.c:68
+msgid "Passwords and Keys"
+msgstr "Passord og nÃkler"
 
-#: ../pgp/seahorse-add-subkey.xml.h:2
-msgid "Generate a new subkey"
-msgstr "Generer en ny undernÃkkel"
+#: ../libseahorse/seahorse-viewer.c:110
+msgid "translator-credits"
+msgstr ""
+"Kjartan Maraas <kmaraas gnome org>\n"
+"Espen Stefansen <espens svn gnome org>"
 
-#: ../pgp/seahorse-add-subkey.xml.h:3
-msgid "If key never expires"
-msgstr "Hvis nÃkkelen aldri utgÃr"
+#: ../libseahorse/seahorse-viewer.c:113
+msgid "Seahorse Project Homepage"
+msgstr "Hjemmesiden til Seahorse-prosjektet"
 
-#: ../pgp/seahorse-add-subkey.xml.h:4
-msgid "Key _Length:"
-msgstr "NÃkkel_lengde:"
+#. Top menu items
+#: ../libseahorse/seahorse-viewer.c:242
+msgid "_File"
+msgstr "_Fil"
 
-#: ../pgp/seahorse-add-subkey.xml.h:5
-msgid "Key _Type:"
-msgstr "NÃkkel_type:"
+#: ../libseahorse/seahorse-viewer.c:243
+msgid "_Edit"
+msgstr "R_ediger"
 
-#: ../pgp/seahorse-add-subkey.xml.h:6
-msgid "Length of Key"
-msgstr "Lengde pà nÃkkel"
+#: ../libseahorse/seahorse-viewer.c:244
+msgctxt "This text refers to deleting an item from its type's backing store."
+msgid "_Delete"
+msgstr "_Slett"
 
-#: ../pgp/seahorse-add-subkey.xml.h:7
-msgid "Never E_xpires"
-msgstr "GÃr _aldri ut"
+#: ../libseahorse/seahorse-viewer.c:245
+msgid "Delete selected items"
+msgstr "Slett valgte oppfÃringer"
 
-#: ../pgp/seahorse-add-uid.xml.h:1
-msgid "Add User ID"
-msgstr "Legg til bruker-ID"
+#: ../libseahorse/seahorse-viewer.c:247
+msgid "Show the properties of this item"
+msgstr "Vis egenskaper for denne oppfÃringen"
 
-#: ../pgp/seahorse-add-uid.xml.h:2
-msgid "Create the new user ID"
-msgstr "Opprett ny bruker-ID"
+#: ../libseahorse/seahorse-viewer.c:249
+msgid "Show the properties of this place"
+msgstr "Vis egenskaper for dette stedet"
 
-#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7
+#: ../libseahorse/seahorse-viewer.c:251
+msgid "Show the properties of this backend"
+msgstr "Vis egenskaper for denne motoren"
+
+#: ../libseahorse/seahorse-viewer.c:252
+msgid "Prefere_nces"
+msgstr "_Innstillinger"
+
+#: ../libseahorse/seahorse-viewer.c:253
+msgid "Change preferences for this program"
+msgstr "Endre brukervalg for dette programmet"
+
+#: ../libseahorse/seahorse-viewer.c:254
+msgid "_View"
+msgstr "_Vis"
+
+#: ../libseahorse/seahorse-viewer.c:255
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: ../libseahorse/seahorse-viewer.c:257
+msgid "About this program"
+msgstr "Om dette programmet"
+
+#: ../libseahorse/seahorse-viewer.c:258
+msgid "_Contents"
+msgstr "_Innhold"
+
+#: ../libseahorse/seahorse-viewer.c:259
+msgid "Show Seahorse help"
+msgstr "Vis hjelp for Seahorse"
+
+#: ../libseahorse/seahorse-viewer.c:294
+msgid "Export public key"
+msgstr "Eksporter offentlig nÃkkel"
+
+#: ../libseahorse/seahorse-viewer.c:308
+#: ../pgp/seahorse-pgp-key-properties.c:1142
+#: ../ssh/seahorse-ssh-key-properties.c:201
+#, c-format
+msgid "Couldn't export key to \"%s\""
+msgstr "Kunne ikke eksportere nÃkkel til Â%sÂ"
+
+#: ../libseahorse/seahorse-viewer.c:315
+msgid "Exporting keys"
+msgstr "Eksporterer nÃkler"
+
+#: ../libseahorse/seahorse-viewer.c:344
+msgid "Couldn't retrieve data from key server"
+msgstr "Kunne ikke hente data fra nÃkkeltjener"
+
+#: ../libseahorse/seahorse-viewer.c:378
+msgid "Retrieving keys"
+msgstr "Henter nÃkler"
+
+#: ../libseahorse/seahorse-viewer.c:386
+msgid "E_xport..."
+msgstr "E_ksporter â"
+
+#: ../libseahorse/seahorse-viewer.c:387
+msgid "Export to a file"
+msgstr "Eksporter til en fil"
+
+#: ../libseahorse/seahorse-viewer.c:389
+msgid "Copy to the clipboard"
+msgstr "Kopier til utklippstavlen"
+
+#: ../libseahorse/seahorse-widget.c:473
+#, c-format
+msgid "Could not display help: %s"
+msgstr "Kunne ikke vise hjelp: %s"
+
+#: ../pgp/seahorse-add-subkey.xml.h:1
+msgid "Expiration Date:"
+msgstr "UtlÃpsdato:"
+
+#: ../pgp/seahorse-add-subkey.xml.h:2
+msgid "Generate a new subkey"
+msgstr "Generer en ny undernÃkkel"
+
+#: ../pgp/seahorse-add-subkey.xml.h:3
+msgid "If key never expires"
+msgstr "Hvis nÃkkelen aldri utgÃr"
+
+#: ../pgp/seahorse-add-subkey.xml.h:4
+msgid "Key _Length:"
+msgstr "NÃkkel_lengde:"
+
+#: ../pgp/seahorse-add-subkey.xml.h:5
+msgid "Key _Type:"
+msgstr "NÃkkel_type:"
+
+#: ../pgp/seahorse-add-subkey.xml.h:6
+msgid "Length of Key"
+msgstr "Lengde pà nÃkkel"
+
+#: ../pgp/seahorse-add-subkey.xml.h:7
+msgid "Never E_xpires"
+msgstr "GÃr _aldri ut"
+
+#: ../pgp/seahorse-add-uid.xml.h:1
+msgid "Add User ID"
+msgstr "Legg til bruker-ID"
+
+#: ../pgp/seahorse-add-uid.xml.h:2
+msgid "Create the new user ID"
+msgstr "Opprett ny bruker-ID"
+
+#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7
 msgid "Full _Name:"
 msgstr "Fullt _navn:"
 
@@ -832,7 +1007,7 @@ msgstr "Valgfri kommentar som beskriver nÃkkelen"
 msgid "Optional email address"
 msgstr "Alternativ e-postadresse"
 
-#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13
+#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:12
 msgid "_Email Address:"
 msgstr "_E-postadresse:"
 
@@ -857,7 +1032,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:197 ../pgp/seahorse-gpgme-generate.c:130
+#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134
 msgid "DSA (sign only)"
 msgstr "DSA (kun signering)"
 
@@ -865,7 +1040,7 @@ msgstr "DSA (kun signering)"
 msgid "ElGamal (encrypt only)"
 msgstr "ElGamal (kun kryptering)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131
+#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135
 msgid "RSA (sign only)"
 msgstr "RSA (kun signering)"
 
@@ -903,35 +1078,35 @@ msgstr "Kunne ikke endre utlÃpsdato"
 msgid "Expiry: %s"
 msgstr "UtgÃr: %s"
 
-#: ../pgp/seahorse-gpgme-generate.c:91
+#: ../pgp/seahorse-gpgme-generate.c:95
 msgid "PGP Key"
 msgstr "PGP-nÃkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:92
+#: ../pgp/seahorse-gpgme-generate.c:96
 msgid "Used to encrypt email and files"
 msgstr "Brukes til à kryptere e-post og filer"
 
-#: ../pgp/seahorse-gpgme-generate.c:128
+#: ../pgp/seahorse-gpgme-generate.c:132
 msgid "RSA"
 msgstr "RSA"
 
-#: ../pgp/seahorse-gpgme-generate.c:129
+#: ../pgp/seahorse-gpgme-generate.c:133
 msgid "DSA Elgamal"
 msgstr "DSA ElGamal"
 
-#: ../pgp/seahorse-gpgme-generate.c:178
+#: ../pgp/seahorse-gpgme-generate.c:182
 msgid "Couldn't generate PGP key"
 msgstr "Kunne ikke opprette PGP-nÃkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:209
+#: ../pgp/seahorse-gpgme-generate.c:213
 msgid "Passphrase for New PGP Key"
 msgstr "Passordfrase for ny PGP-nÃkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:210
+#: ../pgp/seahorse-gpgme-generate.c:214
 msgid "Enter the passphrase for your new key twice."
 msgstr "Oppgi passordfrasen for din nye nÃkkel to ganger."
 
-#: ../pgp/seahorse-gpgme-generate.c:219
+#: ../pgp/seahorse-gpgme-generate.c:223
 msgid "Generating key"
 msgstr "Genererer nÃkkel"
 
@@ -944,6 +1119,53 @@ 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."
 
+#: ../pgp/seahorse-gpgme-keyring.c:90
+#, c-format
+msgid "Wrong passphrase."
+msgstr "Feil passordfrase."
+
+#: ../pgp/seahorse-gpgme-keyring.c:94
+#, c-format
+msgid "Enter new passphrase for '%s'"
+msgstr "Oppgi ny passordfrase for Â%sÂ"
+
+#: ../pgp/seahorse-gpgme-keyring.c:96
+#, c-format
+msgid "Enter passphrase for '%s'"
+msgstr "Oppgi passordfrase for Â%sÂ"
+
+#: ../pgp/seahorse-gpgme-keyring.c:99
+#: ../src/seahorse-change-passphrase.xml.h:4
+msgid "Enter new passphrase"
+msgstr "Oppgi nytt passord"
+
+#: ../pgp/seahorse-gpgme-keyring.c:101
+msgid "Enter passphrase"
+msgstr "Oppgi passordfrase"
+
+#: ../pgp/seahorse-gpgme-keyring.c:329
+#, 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-keyring.c:666
+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."
+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-keyring.c:966
+msgid "GnuPG keyring"
+msgstr "GnuPG-nÃkkelring"
+
+#: ../pgp/seahorse-gpgme-keyring.c:969
+msgid "GnuPG: default keyring directory"
+msgstr "GnuPG: katalog for forvalgt nÃkkelring"
+
 #: ../pgp/seahorse-gpgme-photos.c:73
 #, c-format
 msgid ""
@@ -1056,7 +1278,7 @@ msgstr ""
 msgid "Couldn't add revoker"
 msgstr "Kunne ikke legge til tilbakekaller"
 
-#: ../pgp/seahorse-gpgme-sign.c:101
+#: ../pgp/seahorse-gpgme-sign.c:100
 #, c-format
 msgid ""
 "This key was already signed by\n"
@@ -1071,11 +1293,11 @@ 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:161 ../pgp/seahorse-signer.c:61
+#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62
 msgid "No keys usable for signing"
 msgstr "Ingen nÃkler tilgjengelig for signering"
 
-#: ../pgp/seahorse-gpgme-sign.c:162
+#: ../pgp/seahorse-gpgme-sign.c:165
 msgid ""
 "You have no personal PGP keys that can be used to indicate your trust of "
 "this key."
@@ -1083,61 +1305,152 @@ msgstr ""
 "Du har ingen personlige PGP-nÃkler som kan brukes for à indikere din tillit "
 "til denne nÃkkelen."
 
-#: ../pgp/seahorse-gpgme-source.c:86
-#, c-format
-msgid "Wrong passphrase."
-msgstr "Feil passordfrase."
+#: ../pgp/seahorse-gpgme-subkey.c:199
+msgid "ElGamal"
+msgstr "ElGamal"
 
-#: ../pgp/seahorse-gpgme-source.c:90
+#: ../pgp/seahorse-hkp-source.c:603
 #, c-format
-msgid "Enter new passphrase for '%s'"
-msgstr "Oppgi ny passordfrase for Â%sÂ"
+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-gpgme-source.c:92
+#: ../pgp/seahorse-hkp-source.c:606
 #, c-format
-msgid "Enter passphrase for '%s'"
-msgstr "Oppgi passordfrase for Â%sÂ"
+msgid "Couldn't communicate with server '%s': %s"
+msgstr "Kunne ikke kommunisere med tjener Â%sÂ: %s"
 
-#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4
-msgid "Enter new passphrase"
-msgstr "Oppgi nytt passord"
+#: ../pgp/seahorse-hkp-source.c:1134
+msgid "HTTP Key Server"
+msgstr "HTTP nÃkkeltjener"
 
-#: ../pgp/seahorse-gpgme-source.c:97
-msgid "Enter passphrase"
-msgstr "Oppgi passordfrase"
+#: ../pgp/seahorse-keyserver-results.c:176
+msgid "Couldn't import keys"
+msgstr "Kunne ikke importere nÃkler"
+
+#: ../pgp/seahorse-keyserver-results.c:219
+msgid "Importing keys from key servers"
+msgstr "Importerer nÃkler fra nÃkkeltjenere"
+
+#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:439
+msgid "_Remote"
+msgstr "_Ekstern"
+
+#: ../pgp/seahorse-keyserver-results.c:246
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
+
+#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:100
+msgid "_Find Remote Keys..."
+msgstr "_Finn eksterne nÃkler â"
+
+#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:101
+msgid "Search for keys on a key server"
+msgstr "SÃker etter nÃkler pà en nÃkkeltjener"
+
+#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:5
+msgid "_Import"
+msgstr "_Importer"
+
+#: ../pgp/seahorse-keyserver-results.c:256
+msgid "Import selected keys to local key ring"
+msgstr "Importer valgte nÃkler til lokal nÃkkelring"
+
+#: ../pgp/seahorse-keyserver-results.c:300
+msgid "Remote Keys"
+msgstr "Eksterne nÃkler"
 
-#: ../pgp/seahorse-gpgme-source.c:328
+#: ../pgp/seahorse-keyserver-results.c:302
 #, c-format
-msgid "Loaded %d key"
-msgid_plural "Loaded %d keys"
-msgstr[0] "Lastet %d nÃkkel"
-msgstr[1] "Lastet %d nÃkler"
+msgid "Remote Keys Containing '%s'"
+msgstr "Eksterne nÃkler som inneholder Â%sÂ"
+
+#: ../pgp/seahorse-keyserver-results.c:497
+msgid "The search for keys failed."
+msgstr "SÃk etter nÃkler feilet."
+
+#: ../pgp/seahorse-keyserver-search.xml.h:1
+msgid "<b>Key Servers:</b>"
+msgstr "<b>NÃkkeltjenere:</b>"
+
+#: ../pgp/seahorse-keyserver-search.xml.h:2
+msgid "<b>Shared Keys Near Me:</b>"
+msgstr "<b>Delte nÃkler nÃr meg:</b>"
+
+#: ../pgp/seahorse-keyserver-search.xml.h:3
+msgid "Find Remote Keys"
+msgstr "Finn eksterne nÃkler"
 
-#: ../pgp/seahorse-gpgme-source.c:649
+#: ../pgp/seahorse-keyserver-search.xml.h:4
 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."
+"This will find keys for others on the Internet. These keys can then be "
+"imported into your local key ring."
 msgstr ""
-"Ugyldige nÃkkeldata (mangler UIDer). Dette kan vÃre forÃrsaket av en "
-"datamaskin med datoen satt i fremtiden eller en manglende selvsignering."
+"Finn andres nÃkler pà internett. Disse nÃklene kan sà importeres i din "
+"lokale nÃkkelring."
 
-#: ../pgp/seahorse-gpgme-subkey.c:199
-msgid "ElGamal"
-msgstr "ElGamal"
+#: ../pgp/seahorse-keyserver-search.xml.h:5
+msgid "Where to search:"
+msgstr "Hvor skal det sÃkes:"
 
-#: ../pgp/seahorse-hkp-source.c:645
-msgid "HTTP Key Server"
-msgstr "HTTP nÃkkeltjener"
+#: ../pgp/seahorse-keyserver-search.xml.h:6
+msgid "_Search"
+msgstr "_SÃk"
+
+#: ../pgp/seahorse-keyserver-search.xml.h:7
+msgid "_Search for keys containing: "
+msgstr "_SÃk etter nÃkler som inneholder:"
 
-#: ../pgp/seahorse-hkp-source.c:680
+#: ../pgp/seahorse-keyserver-sync.c:57
+msgid "Couldn't publish keys to server"
+msgstr "Kunne ikke publisere nÃkler til tjener"
+
+#: ../pgp/seahorse-keyserver-sync.c:76
 #, 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."
+msgid "Couldn't retrieve keys from server: %s"
+msgstr "Kunne ikke motta nÃkler fra nÃkkeltjener: %s"
 
-#: ../pgp/seahorse-hkp-source.c:683
+#: ../pgp/seahorse-keyserver-sync.c:160
 #, c-format
-msgid "Couldn't communicate with server '%s': %s"
-msgstr "Kunne ikke kommunisere med tjener Â%sÂ: %s"
+msgid "<b>%d key is selected for synchronizing</b>"
+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>"
+
+#: ../pgp/seahorse-keyserver-sync.c:229
+msgid "Synchronizing keys..."
+msgstr "Synkroniserer nÃkler â"
+
+#: ../pgp/seahorse-keyserver-sync.xml.h:1
+msgid "Sync Keys"
+msgstr "Synkroniser nÃkler"
+
+#: ../pgp/seahorse-keyserver-sync.xml.h:2
+msgid ""
+"This will publish the keys in your key ring so they're available for others "
+"to use. You'll also get any changes others have made since you received "
+"their keys."
+msgstr ""
+"Dette vil publisere nÃklene i din nÃkkelring, slik de er tilgjengelig for "
+"andre. Du vil ogsà fà de endringene andre har gjort, siden du mottok deres "
+"nÃkler."
+
+#: ../pgp/seahorse-keyserver-sync.xml.h:3
+msgid ""
+"This will retrieve any changes others have made since you received their "
+"keys. No key server has been chosen for publishing, so your keys will not be "
+"made available to others."
+msgstr ""
+"Dette vil hente de endringer andre har gjort siden du hentet deres nÃkler. "
+"Ingen nÃkkeltjenere har blitt valgt for publisering, sà dine nÃkler vil ikke "
+"bli gjort tilgjengelig for andre."
+
+#: ../pgp/seahorse-keyserver-sync.xml.h:4
+msgid "_Key Servers"
+msgstr "NÃ_kkeltjenere"
+
+#: ../pgp/seahorse-keyserver-sync.xml.h:5
+msgid "_Sync"
+msgstr "_Synkroniser"
 
 #: ../pgp/seahorse-ldap-source.c:440
 #, c-format
@@ -1159,51 +1472,75 @@ msgstr "Kunne ikke slà opp adresse: %s"
 msgid "Resolving server address: %s"
 msgstr "SlÃr opp tjeneradresse: %s"
 
-#: ../pgp/seahorse-ldap-source.c:781
+#: ../pgp/seahorse-ldap-source.c:1450
 msgid "LDAP Key Server"
 msgstr "LDAP nÃkkeltjener"
 
-#: ../pgp/seahorse-pgp-commands.c:104
-msgid "_Sign Key..."
-msgstr "_Signer nÃkkel â"
+#: ../pgp/seahorse-pgp-actions.c:102
+msgid "_Sync and Publish Keys..."
+msgstr "_Synkroniser og publiser nÃkler â"
 
-#: ../pgp/seahorse-pgp-commands.c:104
-msgid "Sign public key"
-msgstr "Signer offentlig nÃkkel"
+#: ../pgp/seahorse-pgp-actions.c:103
+msgid "Publish and/or synchronize your keys with those online."
+msgstr "Publiser og/eller synkroniser dine nÃkler med nÃkler pà nettet."
 
-#: ../pgp/seahorse-pgp-commands.c:174
+#: ../pgp/seahorse-pgp-actions.c:244
 #, 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:179
+#: ../pgp/seahorse-pgp-actions.c:249
 #, 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:181
+#: ../pgp/seahorse-pgp-actions.c:251
 #, 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:183
+#: ../pgp/seahorse-pgp-actions.c:253
 #, 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:348
+#: ../pgp/seahorse-pgp-actions.c:272 ../pgp/seahorse-pgp-key-properties.c:351
 msgid "Couldn't delete user ID"
 msgstr "Kunne ikke slette bruker-ID"
 
-#: ../pgp/seahorse-pgp-commands.c:205
+#: ../pgp/seahorse-pgp-actions.c:276
 msgid "Couldn't delete private key"
 msgstr "Kunne ikke slette privat nÃkkel"
 
-#: ../pgp/seahorse-pgp-commands.c:208
+#: ../pgp/seahorse-pgp-actions.c:279
 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
+#: ../pgp/seahorse-pgp-actions.c:291
+msgid "_Sign Key..."
+msgstr "_Signer nÃkkel â"
+
+#: ../pgp/seahorse-pgp-actions.c:292
+msgid "Sign public key"
+msgstr "Signer offentlig nÃkkel"
+
+#: ../pgp/seahorse-pgp-actions.c:294 ../ssh/seahorse-ssh-actions.c:136
+msgid "Properties of the key."
+msgstr "Egenskaper for nÃkkelen."
+
+#: ../pgp/seahorse-pgp-actions.c:296 ../ssh/seahorse-ssh-actions.c:138
+msgid "Delete the key."
+msgstr "Slett nÃkkelen."
+
+#: ../pgp/seahorse-pgp-backend.c:174
+msgid "PGP Keys"
+msgstr "PGP-nÃkler"
+
+#: ../pgp/seahorse-pgp-backend.c:177
+msgid "PGP keys are for encrypting email or files"
+msgstr "PGP-nÃkler brukes til à kryptere e-post og filer"
+
+#: ../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>"
 
@@ -1240,55 +1577,54 @@ msgid "Ne_ver Expires"
 msgstr "UtlÃper _aldri"
 
 #: ../pgp/seahorse-pgp-generate.xml.h:11
-msgid "New PGP Key"
-msgstr "Ny PGP-nÃkkel"
-
-#: ../pgp/seahorse-pgp-generate.xml.h:12
 msgid "_Comment:"
 msgstr "_Kommentar:"
 
-#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489
-msgid "Expired"
-msgstr "UtgÃtt"
+#: ../pgp/seahorse-pgp-key.c:347
+msgid "Personal PGP key"
+msgstr "Personlig PGP-nÃkkel"
+
+#: ../pgp/seahorse-pgp-key.c:349
+msgid "PGP key"
+msgstr "PGP-nÃkkel"
 
-#: ../pgp/seahorse-pgp-key-properties.c:319
+#: ../pgp/seahorse-pgp-key-properties.c:322
 msgid "Couldn't change primary user ID"
 msgstr "Kunne ikke endre primÃr bruker-ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:338
+#: ../pgp/seahorse-pgp-key-properties.c:341
 #, 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:433
-#: ../pgp/seahorse-pgp-key-properties.c:1604
+#: ../pgp/seahorse-pgp-key-properties.c:425
+#: ../pgp/seahorse-pgp-key-properties.c:1589
 msgid "[Unknown]"
 msgstr "[Ukjent]"
 
-#: ../pgp/seahorse-pgp-key-properties.c:533
-#: ../pgp/seahorse-pgp-key-properties.c:1885
+#: ../pgp/seahorse-pgp-key-properties.c:528
+#: ../pgp/seahorse-pgp-key-properties.c:1868
 msgid "Name/Email"
 msgstr "Navn/e-post"
 
-#: ../pgp/seahorse-pgp-key-properties.c:538
+#: ../pgp/seahorse-pgp-key-properties.c:533
 msgid "Signature ID"
 msgstr "Signatur-ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:671
+#: ../pgp/seahorse-pgp-key-properties.c:666
 msgid "Couldn't change primary photo"
 msgstr "Kunne ikke endre hovedbilde"
 
-#: ../pgp/seahorse-pgp-key-properties.c:903
+#: ../pgp/seahorse-pgp-key-properties.c:899
 msgid "(unknown)"
 msgstr "(ukjent)"
 
-#: ../pgp/seahorse-pgp-key-properties.c:906
+#: ../pgp/seahorse-pgp-key-properties.c:902
 #, c-format
 msgid "This key expired on: %s"
 msgstr "Denne nÃkkelen gikk ut: %s"
 
-#: ../pgp/seahorse-pgp-key-properties.c:967
-#: ../src/seahorse-key-manager-store.c:802
+#: ../pgp/seahorse-pgp-key-properties.c:965
 msgid "Name"
 msgstr "Navn"
 
@@ -1302,16 +1638,10 @@ msgid "Couldn't delete subkey"
 msgstr "Kunne ikke slette undernÃkkel"
 
 #: ../pgp/seahorse-pgp-key-properties.c:1127
-#: ../pgp/seahorse-pgp-key-properties.c:1567
+#: ../pgp/seahorse-pgp-key-properties.c:1564
 msgid "Unable to change trust"
 msgstr "Kan ikke endre tillitsforhold"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298
-#: ../ssh/seahorse-ssh-key-properties.c:201
-#, c-format
-msgid "Couldn't export key to \"%s\""
-msgstr "Kunne ikke eksportere nÃkkel til Â%sÂ"
-
 #: ../pgp/seahorse-pgp-key-properties.c:1172
 #: ../ssh/seahorse-ssh-key-properties.c:225
 msgid "Export Complete Key"
@@ -1322,44 +1652,45 @@ msgstr "Eksporter hele nÃkkelen"
 msgid "Couldn't export key."
 msgstr "Kunne ikke eksportere nÃkkel."
 
-#: ../pgp/seahorse-pgp-key-properties.c:1407
-#: ../pgp/seahorse-pgp-key-properties.c:1496
+#: ../pgp/seahorse-pgp-key-properties.c:1404
+#: ../pgp/seahorse-pgp-key-properties.c:1493
 msgctxt "Expires"
 msgid "Never"
 msgstr "Aldri"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1454
+#: ../pgp/seahorse-pgp-key-properties.c:1451
 msgid "ID"
 msgstr "ID"
 
-#. The key type column
-#: ../pgp/seahorse-pgp-key-properties.c:1457
-#: ../src/seahorse-key-manager-store.c:833
+#: ../pgp/seahorse-pgp-key-properties.c:1454
 msgid "Type"
 msgstr "Type"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1460
+#: ../pgp/seahorse-pgp-key-properties.c:1457
 msgid "Created"
 msgstr "Opprettet"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1463
+#: ../pgp/seahorse-pgp-key-properties.c:1460
 msgid "Expires"
 msgstr "UtgÃr"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1466
+#: ../pgp/seahorse-pgp-key-properties.c:1463
 msgid "Status"
 msgstr "Status"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1469
+#: ../pgp/seahorse-pgp-key-properties.c:1466
 msgid "Strength"
 msgstr "Styrke"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1493
+#: ../pgp/seahorse-pgp-key-properties.c:1486
+msgid "Expired"
+msgstr "UtgÃtt"
+
+#: ../pgp/seahorse-pgp-key-properties.c:1490
 msgid "Good"
 msgstr "God"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1888
-#: ../src/seahorse-key-manager-store.c:814
+#: ../pgp/seahorse-pgp-key-properties.c:1871
 msgid "Key ID"
 msgstr "NÃkkel-ID"
 
@@ -1609,9 +1940,7 @@ msgstr "Marginalt"
 msgid "Public PGP Key"
 msgstr "Offentlig PGP-nÃkkel"
 
-#. Trust column
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37
-#: ../src/seahorse-key-manager-store.c:827
 msgid "Trust"
 msgstr "Tillit"
 
@@ -1660,13 +1989,17 @@ msgstr "Grunn til à tilbakekalle nÃkkelen"
 msgid "_Reason:"
 msgstr "Ã_rsak:"
 
-#: ../pgp/seahorse-signer.c:62
+#: ../pgp/seahorse-signer.c:63
 msgid ""
 "You have no personal PGP keys that can be used to sign a document or message."
 msgstr ""
 "Du har ingen personlige PGP-nÃkler som kan brukes til à signere et dokument "
 "eller beskjed."
 
+#: ../pgp/seahorse-signer.xml.h:1
+msgid "_Sign message with key:"
+msgstr "_Signer melding med nÃkkel:"
+
 #: ../pgp/seahorse-sign.xml.h:1
 msgid "<b>How carefully have you checked this key?</b>"
 msgstr "<b>Hvor nÃye har du sjekket denne nÃkkelen?</b>"
@@ -1755,35 +2088,66 @@ msgstr "_Signeringspart:"
 msgid "_Very Carefully"
 msgstr "_Meget nÃye"
 
-#: ../pgp/seahorse-signer.xml.h:1
-msgid "_Sign message with key:"
-msgstr "_Signer melding med nÃkkel:"
+#: ../pgp/seahorse-transfer.c:200
+msgid "Exporting data"
+msgstr "Eksporterer data"
 
-#: ../pkcs11/seahorse-pkcs11-certificate.c:106
-#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66
-msgid "Certificate"
-msgstr "Sertifikat"
+#: ../pgp/seahorse-transfer.c:200
+msgid "Retrieving data"
+msgstr "Henter data"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:106
+#: ../pgp/seahorse-transfer.c:203
+msgid "Importing data"
+msgstr "Importerer data"
+
+#: ../pgp/seahorse-transfer.c:203
+msgid "Sending data"
+msgstr "Sender data"
+
+#: ../pgp/seahorse-unknown.c:61
+msgid "Unavailable"
+msgstr "Ikke tilgjengelig"
+
+#: ../pkcs11/seahorse-pkcs11-actions.c:103
 msgid "Couldn't delete"
 msgstr "Kunne ikke slette"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:127
+#: ../pkcs11/seahorse-pkcs11-actions.c:124
 #, 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:130
+#: ../pkcs11/seahorse-pkcs11-actions.c:127
 #, 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
+#: ../pkcs11/seahorse-pkcs11-actions.c:140
 msgid "Deleting"
 msgstr "Sletter"
 
+#: ../pkcs11/seahorse-pkcs11-actions.c:149
+msgid "Properties of the certificate."
+msgstr "Egenskaper for sertifikatet."
+
+#: ../pkcs11/seahorse-pkcs11-actions.c:151
+msgid "Delete the certificate."
+msgstr "Slett sertifikatet."
+
+#: ../pkcs11/seahorse-pkcs11-backend.c:183
+msgid "Certificates"
+msgstr "Sertifikater"
+
+#: ../pkcs11/seahorse-pkcs11-backend.c:186
+msgid "X.509 certificates and related keys"
+msgstr "X.509-sertifikater og relaterte nÃkler"
+
+#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66
+msgid "Certificate"
+msgstr "Sertifikat"
+
 #: ../src/seahorse-change-passphrase.xml.h:1
 msgid "Change Passphrase"
 msgstr "Endre passord"
@@ -1804,134 +2168,106 @@ 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:868
-#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147
-msgid "Passwords and Keys"
-msgstr "Passord og nÃkler"
+#: ../src/seahorse-generate-select.c:219
+msgid "Continue"
+msgstr "Fortsett"
 
 #: ../src/seahorse-generate-select.xml.h:1
 msgid "<b>_Select the type of item to create:</b>"
 msgstr "<b>_Velg type oppfÃring du Ãnsker à opprettte:</b>"
 
-#: ../src/seahorse-generate-select.xml.h:2
-msgid "C_ontinue"
-msgstr "F_ortsett"
-
-#: ../src/seahorse-generate-select.xml.h:3
-msgid "Create New ..."
-msgstr "Lag ny â"
+#: ../src/seahorse-import-dialog.c:74
+msgid "Import failed"
+msgstr "Import feilet"
 
-#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116
-#, 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:431 ../src/seahorse-key-manager.c:489
-#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453
-msgid "Couldn't import keys"
-msgstr "Kunne ikke importere nÃkler"
-
-#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455
-msgid "Imported keys"
-msgstr "Importerte nÃkler"
+#: ../src/seahorse-import-dialog.c:95
+msgid "Import"
+msgstr "Importer"
 
-#: ../src/seahorse-key-manager.c:484
-msgid "Importing keys"
-msgstr "Importerer nÃkler"
+#: ../src/seahorse-import-dialog.c:105
+msgid "<b>Data to be imported:</b>"
+msgstr "<b>Data som skal importeres:</b>"
 
-#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891
+#: ../src/seahorse-key-manager.c:235 ../ssh/seahorse-ssh-operation.c:891
 msgid "Import Key"
 msgstr "Importer nÃkkel"
 
-#: ../src/seahorse-key-manager.c:550
-msgid "Unrecognized key type, or invalid data format"
-msgstr "Ikke gjenkjent nÃkkeltype eller ugyldig dataformat"
+#: ../src/seahorse-key-manager.c:298
+msgid "Dropped text"
+msgstr ""
 
-#: ../src/seahorse-key-manager.c:565
-msgid "Importing Keys"
-msgstr "Importerer nÃkler"
+#: ../src/seahorse-key-manager.c:321
+msgid "Clipboard text"
+msgstr "Tekst fra utklippstavle"
 
-#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254
-msgid "_Remote"
-msgstr "_Ekstern"
+#: ../src/seahorse-key-manager.c:440
+msgid "_New"
+msgstr "_Ny"
 
-#: ../src/seahorse-key-manager.c:739
+#: ../src/seahorse-key-manager.c:442
 msgid "Close this program"
 msgstr "Lukk dette programmet"
 
-#: ../src/seahorse-key-manager.c:740
+#: ../src/seahorse-key-manager.c:443 ../src/seahorse-key-manager.c:445
 msgid "_New..."
 msgstr "_Ny â"
 
-#: ../src/seahorse-key-manager.c:741
+#: ../src/seahorse-key-manager.c:444
 msgid "Create a new key or item"
 msgstr "Lag en ny nÃkkel eller oppfÃring"
 
-#: ../src/seahorse-key-manager.c:742
+#: ../src/seahorse-key-manager.c:446
+msgid "Add a new key or item"
+msgstr "Legg til en ny nÃkkel eller oppfÃring"
+
+#: ../src/seahorse-key-manager.c:447
 msgid "_Import..."
 msgstr "_Importer â"
 
-#: ../src/seahorse-key-manager.c:743
+#: ../src/seahorse-key-manager.c:448
 msgid "Import from a file"
 msgstr "Importer fra en fil"
 
-#: ../src/seahorse-key-manager.c:745
+#: ../src/seahorse-key-manager.c:450
 msgid "Import from the clipboard"
 msgstr "Importer fra utklippstavlen"
 
-#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264
-msgid "_Find Remote Keys..."
-msgstr "_Finn eksterne nÃkler â"
-
-#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265
-msgid "Search for keys on a key server"
-msgstr "SÃker etter nÃkler pà en nÃkkeltjener"
-
-#: ../src/seahorse-key-manager.c:752
-msgid "_Sync and Publish Keys..."
-msgstr "_Synkroniser og publiser nÃkler â"
-
-#: ../src/seahorse-key-manager.c:753
-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:758
-msgid "T_ypes"
-msgstr "T_yper"
+#: ../src/seahorse-key-manager.c:454
+msgid "P_laces"
+msgstr "_Steder"
 
-#: ../src/seahorse-key-manager.c:758
-msgid "Show type column"
-msgstr "Vis typekolonnen"
+#: ../src/seahorse-key-manager.c:455
+#, fuzzy
+msgid "Show places sidebar"
+msgstr "Vis pass_ord"
 
-#: ../src/seahorse-key-manager.c:760
-msgid "_Expiry"
-msgstr "_UtlÃp"
+#: ../src/seahorse-key-manager.c:459
+msgid "Show _personal"
+msgstr "Vis _personlige"
 
-#: ../src/seahorse-key-manager.c:760
-msgid "Show expiry column"
-msgstr "Vis utlÃpskolonnen"
+#: ../src/seahorse-key-manager.c:460
+msgid "Only show personal keys, certificates and passwords"
+msgstr "Kun vis personlige nÃkler, sertifikater og passord"
 
-#: ../src/seahorse-key-manager.c:762
-msgid "_Trust"
-msgstr "_Tillit"
+#: ../src/seahorse-key-manager.c:461
+msgid "Show _trusted"
+msgstr "Vis innhold med _tillit"
 
-#: ../src/seahorse-key-manager.c:762
-msgid "Show owner trust column"
-msgstr "Vis tillitskolonnen"
+#: ../src/seahorse-key-manager.c:462
+msgid "Only show trusted keys, certificates and passwords"
+msgstr "Vis kun nÃkler, sertifikater og passord som med tillitsforhold"
 
-#: ../src/seahorse-key-manager.c:764
-msgid "_Validity"
-msgstr "_Validitet"
+#: ../src/seahorse-key-manager.c:463
+msgid "_Show _any"
+msgstr "Vi_s alle"
 
-#: ../src/seahorse-key-manager.c:764
-msgid "Show validity column"
-msgstr "Vis gyldighetskolonnen"
+#: ../src/seahorse-key-manager.c:464
+msgid "Show all keys, certificates and passwords"
+msgstr "Vis alle nÃkler, sertifikater og passord"
 
-#: ../src/seahorse-key-manager.c:941
-msgid "Filter:"
-msgstr "Filter:"
+#: ../src/seahorse-key-manager.c:648
+msgid "Filter"
+msgstr "Filter"
 
 #: ../src/seahorse-key-manager.xml.h:1
 msgid "<big><b>First time options:</b></big>"
@@ -1946,264 +2282,38 @@ msgid "Import existing keys from a file:"
 msgstr "Importer eksisterende nÃkler fra en fil:"
 
 #: ../src/seahorse-key-manager.xml.h:4
-msgid "My _Personal Keys"
-msgstr "Mine _personlige nÃkler"
-
-#: ../src/seahorse-key-manager.xml.h:5
-msgid "Other _Keys"
-msgstr "Andre nÃ_kler"
-
-#: ../src/seahorse-key-manager.xml.h:6
 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:518
-msgid "_Import"
-msgstr "_Importer"
-
-#: ../src/seahorse-key-manager.xml.h:8
-msgid "_Passwords"
-msgstr "_Passord"
-
-#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263
-msgid "Couldn't export keys"
-msgstr "Kunne ikke eksportere nÃkler"
-
-#: ../src/seahorse-key-manager-store.c:820
-msgid "Validity"
-msgstr "Validitet"
-
-#. Expiry date column
-#: ../src/seahorse-key-manager-store.c:839
-msgid "Expiration Date"
-msgstr "UtlÃpsdato"
-
-#: ../src/seahorse-keyserver-results.c:256
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: ../src/seahorse-keyserver-results.c:257
-msgid "_Expand All"
-msgstr "_Utvid alle"
-
-#: ../src/seahorse-keyserver-results.c:258
-msgid "Expand all listings"
-msgstr "Utvid alle lister"
-
-#: ../src/seahorse-keyserver-results.c:259
-msgid "_Collapse All"
-msgstr "S_là sammen alle"
-
-#: ../src/seahorse-keyserver-results.c:260
-msgid "Collapse all listings"
-msgstr "Slà sammen alle lister"
-
-#: ../src/seahorse-keyserver-results.c:331
-msgid "Remote Keys"
-msgstr "Eksterne nÃkler"
-
-#: ../src/seahorse-keyserver-results.c:333
-#, c-format
-msgid "Remote Keys Containing '%s'"
-msgstr "Eksterne nÃkler som inneholder Â%sÂ"
-
-#: ../src/seahorse-keyserver-search.xml.h:1
-msgid "<b>Key Servers:</b>"
-msgstr "<b>NÃkkeltjenere:</b>"
-
-#: ../src/seahorse-keyserver-search.xml.h:2
-msgid "<b>Shared Keys Near Me:</b>"
-msgstr "<b>Delte nÃkler nÃr meg:</b>"
-
-#: ../src/seahorse-keyserver-search.xml.h:3
-msgid "Find Remote Keys"
-msgstr "Finn eksterne nÃkler"
-
-#: ../src/seahorse-keyserver-search.xml.h:4
-msgid ""
-"This will find keys for others on the Internet. These keys can then be "
-"imported into your local key ring."
-msgstr ""
-"Finn andres nÃkler pà internett. Disse nÃklene kan sà importeres i din "
-"lokale nÃkkelring."
-
-#: ../src/seahorse-keyserver-search.xml.h:5
-msgid "Where to search:"
-msgstr "Hvor skal det sÃkes:"
-
-#: ../src/seahorse-keyserver-search.xml.h:6
-msgid "_Search"
-msgstr "_SÃk"
-
-#: ../src/seahorse-keyserver-search.xml.h:7
-msgid "_Search for keys containing: "
-msgstr "_SÃk etter nÃkler som inneholder:"
-
-#: ../src/seahorse-keyserver-sync.c:58
-msgid "Couldn't publish keys to server"
-msgstr "Kunne ikke publisere nÃkler til tjener"
+#: ../src/seahorse-main.c:54
+msgid "Version of this application"
+msgstr "Versjon av dette programmet"
 
-#: ../src/seahorse-keyserver-sync.c:77
+#: ../ssh/seahorse-ssh-actions.c:109
 #, c-format
-msgid "Couldn't retrieve keys from server: %s"
-msgstr "Kunne ikke motta nÃkler fra nÃkkeltjener: %s"
+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Â?"
 
-#: ../src/seahorse-keyserver-sync.c:161
+#: ../ssh/seahorse-ssh-actions.c:113
 #, c-format
-msgid "<b>%d key is selected for synchronizing</b>"
-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:247
-msgid "Synchronizing keys..."
-msgstr "Synkroniserer nÃkler â"
+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?"
 
-#: ../src/seahorse-keyserver-sync.xml.h:1
-msgid "Sync Keys"
-msgstr "Synkroniser nÃkler"
+#: ../ssh/seahorse-ssh-actions.c:120
+msgid "Couldn't delete key"
+msgstr "Kunne ikke slette nÃkkel"
 
-#: ../src/seahorse-keyserver-sync.xml.h:2
-msgid ""
-"This will publish the keys in your key ring so they're available for others "
-"to use. You'll also get any changes others have made since you received "
-"their keys."
-msgstr ""
-"Dette vil publisere nÃklene i din nÃkkelring, slik de er tilgjengelig for "
-"andre. Du vil ogsà fà de endringene andre har gjort, siden du mottok deres "
-"nÃkler."
+#: ../ssh/seahorse-ssh-actions.c:132
+msgid "Configure Key for _Secure Shell..."
+msgstr "Konfigurerer nÃkkel for _Secure Shell â"
 
-#: ../src/seahorse-keyserver-sync.xml.h:3
+#: ../ssh/seahorse-ssh-actions.c:133
 msgid ""
-"This will retrieve any changes others have made since you received their "
-"keys. No key server has been chosen for publishing, so your keys will not be "
-"made available to others."
-msgstr ""
-"Dette vil hente de endringer andre har gjort siden du hentet deres nÃkler. "
-"Ingen nÃkkeltjenere har blitt valgt for publisering, sà dine nÃkler vil ikke "
-"bli gjort tilgjengelig for andre."
-
-#: ../src/seahorse-keyserver-sync.xml.h:4
-msgid "_Key Servers"
-msgstr "NÃ_kkeltjenere"
-
-#: ../src/seahorse-keyserver-sync.xml.h:5
-msgid "_Sync"
-msgstr "_Synkroniser"
-
-#: ../src/seahorse-main.c:60
-msgid "Version of this application"
-msgstr "Versjon av dette programmet"
-
-#: ../src/seahorse-viewer.c:123
-msgid "Contributions:"
-msgstr "Bidrag:"
-
-#: ../src/seahorse-viewer.c:149
-msgid "translator-credits"
+"Send public Secure Shell key to another machine, and enable logins using "
+"that key."
 msgstr ""
-"Kjartan Maraas <kmaraas gnome org>\n"
-"Espen Stefansen <espens svn gnome org>"
-
-#: ../src/seahorse-viewer.c:152
-msgid "Seahorse Project Homepage"
-msgstr "Hjemmesiden til Seahorse-prosjektet"
-
-#. Top menu items
-#: ../src/seahorse-viewer.c:172
-msgid "_File"
-msgstr "_Fil"
-
-#: ../src/seahorse-viewer.c:173
-msgid "_Edit"
-msgstr "R_ediger"
-
-#: ../src/seahorse-viewer.c:174
-msgid "_View"
-msgstr "_Vis"
-
-#: ../src/seahorse-viewer.c:175
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: ../src/seahorse-viewer.c:177
-msgid "Prefere_nces"
-msgstr "_Innstillinger"
-
-#: ../src/seahorse-viewer.c:178
-msgid "Change preferences for this program"
-msgstr "Endre brukervalg for dette programmet"
-
-#: ../src/seahorse-viewer.c:181
-msgid "About this program"
-msgstr "Om dette programmet"
-
-#: ../src/seahorse-viewer.c:182
-msgid "_Contents"
-msgstr "_Innhold"
-
-#: ../src/seahorse-viewer.c:183
-msgid "Show Seahorse help"
-msgstr "Vis hjelp for Seahorse"
-
-#: ../src/seahorse-viewer.c:284
-msgid "Export public key"
-msgstr "Eksporter offentlig nÃkkel"
-
-#: ../src/seahorse-viewer.c:305
-msgid "Exporting keys"
-msgstr "Eksporterer nÃkler"
-
-#: ../src/seahorse-viewer.c:334
-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:346
-msgid "Copied keys"
-msgstr "Kopierte nÃkler"
-
-#: ../src/seahorse-viewer.c:371
-msgid "Retrieving keys"
-msgstr "Henter nÃkler"
-
-#: ../src/seahorse-viewer.c:426
-#, 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:480
-msgid "Importing keys from key servers"
-msgstr "Importerer nÃkler fra nÃkkeltjenere"
-
-#: ../src/seahorse-viewer.c:505
-msgid "Show properties"
-msgstr "Vis egenskaper"
-
-#: ../src/seahorse-viewer.c:506
-msgctxt "This text refers to deleting an item from its type's backing store."
-msgid "_Delete"
-msgstr "_Slett"
-
-#: ../src/seahorse-viewer.c:507
-msgid "Delete selected items"
-msgstr "Slett valgte oppfÃringer"
-
-#: ../src/seahorse-viewer.c:511
-msgid "E_xport..."
-msgstr "E_ksporter â"
-
-#: ../src/seahorse-viewer.c:512
-msgid "Export to a file"
-msgstr "Eksporter til en fil"
-
-#: ../src/seahorse-viewer.c:514
-msgid "Copy to the clipboard"
-msgstr "Kopier til utklippstavlen"
-
-#: ../src/seahorse-viewer.c:519
-msgid "Import selected keys to local key ring"
-msgstr "Importer valgte nÃkler til lokal nÃkkelring"
+"Send offentlig nÃkkel for sikkert skall til en annen maskin og aktiver "
+"pÃlogging med denne nÃkkelen."
 
 #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68
 msgid "Enter your Secure Shell passphrase:"
@@ -2232,69 +2342,51 @@ msgstr "Oppgi den nye passordfrasen for: %s"
 msgid "Enter the new passphrase again: %s"
 msgstr "Oppgi den nye passordfrasen igjen: %s"
 
-#: ../ssh/seahorse-ssh-commands.c:86
-msgid "Configure Key for _Secure Shell..."
-msgstr "Konfigurerer nÃkkel for _Secure Shell â"
-
-#: ../ssh/seahorse-ssh-commands.c:87
-msgid ""
-"Send public Secure Shell key to another machine, and enable logins using "
-"that key."
-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: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: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-backend.c:92
+msgid "Secure Shell"
+msgstr "Sikkert skall"
 
-#: ../ssh/seahorse-ssh-commands.c:133
-msgid "Couldn't delete key"
-msgstr "Kunne ikke slette nÃkkel"
+#: ../ssh/seahorse-ssh-backend.c:95
+#, fuzzy
+msgid "Keys used to connect securely to other computers"
+msgstr "Brukt til à koble til andre datamaskiner."
 
-#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91
-#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19
+#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:95
+#: ../ssh/seahorse-ssh-key.c:99 ../ssh/seahorse-ssh-key-properties.xml.h:19
 msgid "Secure Shell Key"
 msgstr "NÃkkel for sikkert skall"
 
-#: ../ssh/seahorse-ssh-generate.c:61
+#: ../ssh/seahorse-ssh-generate.c:56
 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:115 ../ssh/seahorse-ssh-generate.c:131
+#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126
 msgid "Couldn't generate Secure Shell key"
 msgstr "Kunne ikke generere Secure Shell-nÃkkel"
 
-#: ../ssh/seahorse-ssh-generate.c:197
+#: ../ssh/seahorse-ssh-generate.c:192
 msgid "Creating Secure Shell Key"
 msgstr "Oppretter Secure Shell-nÃkkel"
 
 #: ../ssh/seahorse-ssh-generate.xml.h:2
-msgid ""
-"<i>Use your email address, and any other reminder you need about what this "
-"key is for.</i>"
+#, fuzzy
+msgid "<i>Your email address, or a reminder of what this key is for.</i>"
 msgstr ""
 "<i>Bruk e-postadressen din og noe annet som minner deg hva denne nÃkkelen er "
 "for.</i>"
 
 #: ../ssh/seahorse-ssh-generate.xml.h:3
-msgid ""
-"A Secure Shell (SSH) key lets you connect securely to trusted computers "
-"using SSH, without entering a different password for each of them."
+#, fuzzy
+msgid "A Secure Shell (SSH) key lets you connect securely to other computers."
 msgstr ""
 "En Secure Shell(SSH)-nÃkkel lar deg koble deg sikkert til pÃlitelige "
 "datamaskiner med SSH, uten à angi et passord for hver og en av dem."
 
 #: ../ssh/seahorse-ssh-generate.xml.h:5
+#, fuzzy
 msgid ""
-"If there is already a computer you want to use this key with, you can set up "
-"that computer to recognize your key now. "
+"If there a computer you want to use this key with, you can set up that "
+"computer to recognize your new key."
 msgstr ""
 "Hvis det allerede er en datamaskin du vil bruke denne nÃkkelen pÃ, kan du "
 "sette opp den datamaskinen til à kjenne igjen nÃkkelen nÃ."
@@ -2307,18 +2399,22 @@ msgstr "Ny Secure Shell-nÃkkel"
 msgid "_Create and Set Up"
 msgstr "_Opprett og sett opp"
 
-#: ../ssh/seahorse-ssh-generate.xml.h:9
+#: ../ssh/seahorse-ssh-generate.xml.h:10
 msgid "_Just Create Key"
 msgstr "_Bare opprett nÃkkel"
 
-#: ../ssh/seahorse-ssh-generate.xml.h:10
-msgid "_Key Description:"
-msgstr "NÃ_kkelbeskrivelse:"
-
-#: ../ssh/seahorse-ssh-key.c:87
+#: ../ssh/seahorse-ssh-key.c:91
 msgid "(Unreadable Secure Shell Key)"
 msgstr "(Uleslig Secure Shell-nÃkkel)"
 
+#: ../ssh/seahorse-ssh-key.c:195
+msgid "Personal SSH key"
+msgstr "Personlig SSH-nÃkkel"
+
+#: ../ssh/seahorse-ssh-key.c:197
+msgid "SSH key"
+msgstr "SSH-nÃkkel"
+
 #: ../ssh/seahorse-ssh-key-properties.c:79
 msgid "Couldn't rename key."
 msgstr "Kunne ikke endre navn pà nÃkkel."
@@ -2402,7 +2498,16 @@ msgstr "Importerer nÃkkel: %s"
 msgid "Importing key. Enter passphrase"
 msgstr "Importerer nÃkkel. Oppgi passord"
 
-#: ../ssh/seahorse-ssh-source.c:951
+#: ../ssh/seahorse-ssh-source.c:232
+msgid "OpenSSH directory"
+msgstr "OpenSSH-katalog"
+
+#: ../ssh/seahorse-ssh-source.c:235
+#, c-format
+msgid "OpenSSH: %s"
+msgstr "OpenSSH: %s"
+
+#: ../ssh/seahorse-ssh-source.c:1022
 msgid "No private key file is available for this key."
 msgstr "Ingen privat nÃkkelfil er tilgjengelig for denne nÃkkelen."
 
@@ -2441,3 +2546,81 @@ msgstr "PÃ_loggingsnavn:"
 #: ../ssh/seahorse-ssh-upload.xml.h:7
 msgid "_Set Up"
 msgstr "_Sett opp"
+
+#~ msgid "Passwords: %s"
+#~ msgstr "Passord: %s"
+
+#~ msgid "<b>Passwords:</b> %s"
+#~ msgstr "<b>Passord:</b> %s"
+
+#~ msgid "New PGP Key"
+#~ msgstr "Ny PGP-nÃkkel"
+
+#~ msgid "Create New ..."
+#~ msgstr "Lag ny â"
+
+#~ msgid "Imported keys"
+#~ msgstr "Importerte nÃkler"
+
+#~ msgid "Importing keys"
+#~ msgstr "Importerer nÃkler"
+
+#~ msgid "Unrecognized key type, or invalid data format"
+#~ msgstr "Ikke gjenkjent nÃkkeltype eller ugyldig dataformat"
+
+#~ msgid "Importing Keys"
+#~ msgstr "Importerer nÃkler"
+
+#~ msgid "T_ypes"
+#~ msgstr "T_yper"
+
+#~ msgid "Show type column"
+#~ msgstr "Vis typekolonnen"
+
+#~ msgid "_Expiry"
+#~ msgstr "_UtlÃp"
+
+#~ msgid "Show expiry column"
+#~ msgstr "Vis utlÃpskolonnen"
+
+#~ msgid "_Trust"
+#~ msgstr "_Tillit"
+
+#~ msgid "Show owner trust column"
+#~ msgstr "Vis tillitskolonnen"
+
+#~ msgid "_Validity"
+#~ msgstr "_Validitet"
+
+#~ msgid "Show validity column"
+#~ msgstr "Vis gyldighetskolonnen"
+
+#~ msgid "Other _Keys"
+#~ msgstr "Andre nÃ_kler"
+
+#~ msgid "Validity"
+#~ msgstr "Validitet"
+
+#~ msgid "Expiration Date"
+#~ msgstr "UtlÃpsdato"
+
+#~ msgid "_Expand All"
+#~ msgstr "_Utvid alle"
+
+#~ msgid "Expand all listings"
+#~ msgstr "Utvid alle lister"
+
+#~ msgid "_Collapse All"
+#~ msgstr "S_là sammen alle"
+
+#~ msgid "Collapse all listings"
+#~ msgstr "Slà sammen alle lister"
+
+#~ msgid "Copied keys"
+#~ msgstr "Kopierte nÃkler"
+
+#~ 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?"
+
+#~ msgid "_Key Description:"
+#~ msgstr "NÃ_kkelbeskrivelse:"