[seahorse] Updated Norwegian bokmÃl translation

[Kjartan Maraas <kmaraas src gnome org>]

commit 6a4519b1e47b82cfe0bd759dc65bc384553d6ce1
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sat Sep 17 11:50:54 2011 +0200

    Updated Norwegian bokmÃl translation

 po/nb.po |  575 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 260 insertions(+), 315 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 01139af..43f93d9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahorse 3.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-01 08:14+0200\n"
-"PO-Revision-Date: 2011-09-01 08:15+0200\n"
+"POT-Creation-Date: 2011-09-17 11:50+0200\n"
+"PO-Revision-Date: 2011-09-17 11:50+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,7 @@ msgstr ""
 msgid "The host name or address of the server."
 msgstr "Vertsnavnet eller adressen til tjeneren."
 
-#: ../gkr/seahorse-gkr-add-item.c:51 ../gkr/seahorse-gkr-add-keyring.c:65
+#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72
 msgid "Couldn't add keyring"
 msgstr "Kunne ikke legge til nÃkkelring"
 
@@ -63,18 +63,6 @@ msgstr "_Passord:"
 msgid "_Show Password"
 msgstr "Vi_s passord"
 
-#: ../gkr/seahorse-gkr-item.c:437
-msgid "Web Password"
-msgstr "Passord for nettside"
-
-#: ../gkr/seahorse-gkr-item.c:439
-msgid "Network Password"
-msgstr "Nettverkspassord"
-
-#: ../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"
@@ -97,40 +85,44 @@ msgid_plural "Deleting items"
 msgstr[0] "Sletter oppfÃring"
 msgstr[1] "Sletter oppfÃringer"
 
-#: ../gkr/seahorse-gkr-item-properties.c:67
+#: ../gkr/seahorse-gkr-item-properties.c:70
 msgid "Access a network share or resource"
 msgstr "Aksesser en delt nettverksressurs"
 
-#: ../gkr/seahorse-gkr-item-properties.c:70
+#: ../gkr/seahorse-gkr-item-properties.c:73
 msgid "Access a website"
 msgstr "Aksesser et nettsted"
 
-#: ../gkr/seahorse-gkr-item-properties.c:73
+#: ../gkr/seahorse-gkr-item-properties.c:76
 msgid "Unlocks a PGP key"
 msgstr "LÃser opp en GPG-nÃkkel"
 
-#: ../gkr/seahorse-gkr-item-properties.c:76
+#: ../gkr/seahorse-gkr-item-properties.c:79
 msgid "Unlocks a Secure Shell key"
 msgstr "LÃser opp en nÃkkel for sikkert skall"
 
-#: ../gkr/seahorse-gkr-item-properties.c:79
+#: ../gkr/seahorse-gkr-item-properties.c:82
 msgid "Saved password or login"
 msgstr "Lagret passord eller pÃlogging"
 
-#: ../gkr/seahorse-gkr-item-properties.c:103
+#: ../gkr/seahorse-gkr-item-properties.c:106
 msgid "Network Credentials"
 msgstr "PÃloggingsinformasjon for nettverk"
 
-#: ../gkr/seahorse-gkr-item-properties.c:208
+#: ../gkr/seahorse-gkr-item-properties.c:111
+msgid "Password"
+msgstr "Passord"
+
+#: ../gkr/seahorse-gkr-item-properties.c:211
 msgid "Couldn't change password."
 msgstr "Kunne ikke endre passord"
 
-#: ../gkr/seahorse-gkr-item-properties.c:253
-#: ../gkr/seahorse-gkr-item-properties.c:369
+#: ../gkr/seahorse-gkr-item-properties.c:256
+#: ../gkr/seahorse-gkr-item-properties.c:377
 msgid "Updating password"
 msgstr "Oppdaterer passord"
 
-#: ../gkr/seahorse-gkr-item-properties.c:330
+#: ../gkr/seahorse-gkr-item-properties.c:337
 msgid "Couldn't set description."
 msgstr "Kunne ikke sette beskrivelse"
 
@@ -187,12 +179,12 @@ msgstr "Type:"
 msgid "Use:"
 msgstr "Bruk:"
 
-#: ../gkr/seahorse-gkr-keyring.c:121
+#: ../gkr/seahorse-gkr-keyring.c:120
 #, c-format
 msgid "Passwords: %s"
 msgstr "Passord: %s"
 
-#: ../gkr/seahorse-gkr-keyring.c:122
+#: ../gkr/seahorse-gkr-keyring.c:121
 #, c-format
 msgid "<b>Passwords:</b> %s"
 msgstr "<b>Passord:</b> %s"
@@ -213,70 +205,70 @@ msgstr "Lagret passord"
 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:130
+#: ../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:169
+#: ../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:208
+#: ../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:247
+#: ../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:276
+#: ../gkr/seahorse-gkr-keyring-commands.c:268
 msgid "_Lock"
 msgstr "_LÃs"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:277
+#: ../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:278
+#: ../gkr/seahorse-gkr-keyring-commands.c:270
 msgid "_Unlock"
 msgstr "LÃs _opp"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:279
+#: ../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:280
+#: ../gkr/seahorse-gkr-keyring-commands.c:272
 msgid "_Set as default"
 msgstr "_Sett som forvalg"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:281
+#: ../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:282
+#: ../gkr/seahorse-gkr-keyring-commands.c:274
 msgid "Change _Password"
 msgstr "Bytt _passord"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:283
+#: ../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:348
+#: ../gkr/seahorse-gkr-keyring-commands.c:340
 msgid "Couldn't delete keyring"
 msgstr "Kunne ikke slette nÃkkelring"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:366
+#: ../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-commands.c:376
+#: ../gkr/seahorse-gkr-keyring-commands.c:368
 msgid "Deleting keyring"
 msgid_plural "Deleting keyrings"
 msgstr[0] "Sletter nÃkkelring"
@@ -305,7 +297,7 @@ 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:257
+#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193
 msgid "The operation was cancelled"
 msgstr "Operasjonen ble avbrutt"
 
@@ -616,49 +608,24 @@ msgstr "Port som tjeneren skal aksesseres pÃ."
 msgid "initial temporary item"
 msgstr "opprinnelig midlertidig oppfÃring"
 
-#: ../libseahorse/seahorse-object.c:318
-msgid "Symmetric Key"
-msgstr "Symmetrisk nÃkkel"
-
-#: ../libseahorse/seahorse-object.c:321
-msgid "Public Key"
-msgstr "Offentlig nÃkkel"
-
-#: ../libseahorse/seahorse-object.c:324
-msgid "Private Key"
-msgstr "Privat nÃkkel"
-
-#: ../libseahorse/seahorse-object.c:327
-msgid "Credentials"
-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:334
-msgid "Identity"
-msgstr "Identitet"
-
-#: ../libseahorse/seahorse-passphrase.c:178
+#: ../libseahorse/seahorse-passphrase.c:180
 msgid "Passphrase"
 msgstr "Passord"
 
-#: ../libseahorse/seahorse-passphrase.c:181
-#: ../ssh/seahorse-ssh-operation.c:207
+#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99
 msgid "Password:"
 msgstr "Passord:"
 
 #. The second and main entry
-#: ../libseahorse/seahorse-passphrase.c:244
+#: ../libseahorse/seahorse-passphrase.c:246
 msgid "Confirm:"
 msgstr "Bekreft:"
 
-#: ../libseahorse/seahorse-prefs.c:59
+#: ../libseahorse/seahorse-prefs.c:68
 msgid "Not a valid Key Server address."
 msgstr "Ikke en gyldig adresse til nÃkkeltjener."
 
-#: ../libseahorse/seahorse-prefs.c:60
+#: ../libseahorse/seahorse-prefs.c:69
 msgid ""
 "For help contact your system adminstrator or the administrator of the key "
 "server."
@@ -666,15 +633,15 @@ msgstr ""
 "For hjelp, kontakt din systemadministrator eller nÃkkeltjenerens "
 "administrator."
 
-#: ../libseahorse/seahorse-prefs.c:172
+#: ../libseahorse/seahorse-prefs.c:183
 msgid "URL"
 msgstr "URL"
 
-#: ../libseahorse/seahorse-prefs.c:333
+#: ../libseahorse/seahorse-prefs.c:348
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../libseahorse/seahorse-prefs.c:391
+#: ../libseahorse/seahorse-prefs.c:406
 msgid "None: Don't publish keys"
 msgstr "Ingen: Ikke publiser nÃkler"
 
@@ -726,30 +693,30 @@ msgstr "Ikke tilgjengelig"
 msgid "%Y-%m-%d"
 msgstr "%d-%m-%Y"
 
-#: ../libseahorse/seahorse-util.c:486
+#: ../libseahorse/seahorse-util.c:444
 msgid "Key Data"
 msgstr "NÃkkeldata"
 
-#: ../libseahorse/seahorse-util.c:488
+#: ../libseahorse/seahorse-util.c:446
 msgid "Multiple Keys"
 msgstr "Flere nÃkler"
 
 #. Filter for PGP keys. We also include *.asc, as in many
 #. cases that extension is associated with text/plain
-#: ../libseahorse/seahorse-util.c:776
+#: ../libseahorse/seahorse-util.c:734
 msgid "All key files"
 msgstr "Alle nÃkkelfiler"
 
-#: ../libseahorse/seahorse-util.c:787 ../libseahorse/seahorse-util.c:835
+#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793
 #: ../pgp/seahorse-gpgme-photos.c:242
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../libseahorse/seahorse-util.c:828
+#: ../libseahorse/seahorse-util.c:786
 msgid "Archive files"
 msgstr "Arkivfiler"
 
-#: ../libseahorse/seahorse-util.c:898
+#: ../libseahorse/seahorse-util.c:856
 msgid ""
 "<b>A file already exists with this name.</b>\n"
 "\n"
@@ -759,48 +726,48 @@ msgstr ""
 "\n"
 "Vil du erstatte den med en ny fil?"
 
-#: ../libseahorse/seahorse-util.c:901
+#: ../libseahorse/seahorse-util.c:859
 msgid "_Replace"
 msgstr "E_rstatt"
 
 #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197
-#: ../pgp/seahorse-pgp-key-properties.c:1140
+#: ../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
 msgid "Unknown"
 msgstr "Ukjent"
 
 #: ../libseahorse/seahorse-validity.c:42
-#: ../pgp/seahorse-pgp-key-properties.c:1146
+#: ../pgp/seahorse-pgp-key-properties.c:1279
 msgctxt "Validity"
 msgid "Never"
 msgstr "Aldri"
 
 #: ../libseahorse/seahorse-validity.c:44
-#: ../pgp/seahorse-pgp-key-properties.c:1153
+#: ../pgp/seahorse-pgp-key-properties.c:1286
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32
 msgid "Marginal"
 msgstr "Marginal"
 
 #: ../libseahorse/seahorse-validity.c:46
-#: ../pgp/seahorse-pgp-key-properties.c:1159
+#: ../pgp/seahorse-pgp-key-properties.c:1292
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26
 msgid "Full"
 msgstr "Full"
 
 #: ../libseahorse/seahorse-validity.c:48
-#: ../pgp/seahorse-pgp-key-properties.c:1165
+#: ../pgp/seahorse-pgp-key-properties.c:1298
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:45
 msgid "Ultimate"
 msgstr "Ultimat"
 
 #: ../libseahorse/seahorse-validity.c:50
-#: ../pgp/seahorse-pgp-key-properties.c:1358
+#: ../pgp/seahorse-pgp-key-properties.c:1491
 msgid "Disabled"
 msgstr "Deaktivert"
 
 #: ../libseahorse/seahorse-validity.c:52
-#: ../pgp/seahorse-pgp-key-properties.c:1354
+#: ../pgp/seahorse-pgp-key-properties.c:1487
 msgid "Revoked"
 msgstr "Tilbakekalt"
 
@@ -881,36 +848,36 @@ msgstr "Trekk tilbake nÃkkel"
 msgid "_Never expires"
 msgstr "_GÃr aldri ut"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:147
+#: ../pgp/seahorse-gpgme-add-subkey.c:162
 msgid "Couldn't add subkey"
 msgstr "Kunne ikke legge til undernÃkkel"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:166
+#: ../pgp/seahorse-gpgme-add-subkey.c:181
 #, c-format
 msgid "Add subkey to %s"
 msgstr "Legg til undernÃkkel til %s"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:117
+#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130
 msgid "DSA (sign only)"
 msgstr "DSA (kun signering)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:190
+#: ../pgp/seahorse-gpgme-add-subkey.c:205
 msgid "ElGamal (encrypt only)"
 msgstr "ElGamal (kun kryptering)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:118
+#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131
 msgid "RSA (sign only)"
 msgstr "RSA (kun signering)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:202
+#: ../pgp/seahorse-gpgme-add-subkey.c:217
 msgid "RSA (encrypt only)"
 msgstr "RSA (kun kryptering)"
 
-#: ../pgp/seahorse-gpgme-add-uid.c:85
+#: ../pgp/seahorse-gpgme-add-uid.c:100
 msgid "Couldn't add user id"
 msgstr "Kunne ikke legge til bruker-ID"
 
-#: ../pgp/seahorse-gpgme-add-uid.c:107
+#: ../pgp/seahorse-gpgme-add-uid.c:122
 #, c-format
 msgid "Add user ID to %s"
 msgstr "Legg til bruker-ID i %s"
@@ -919,52 +886,52 @@ msgstr "Legg til bruker-ID i %s"
 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:57
+#: ../pgp/seahorse-gpgme-expires.c:65
 msgid "Invalid expiry date"
 msgstr "Ugyldig utlÃpsdato"
 
-#: ../pgp/seahorse-gpgme-expires.c:58
+#: ../pgp/seahorse-gpgme-expires.c:66
 msgid "The expiry date must be in the future"
 msgstr "UlÃpsdato mà vÃre i framtiden"
 
-#: ../pgp/seahorse-gpgme-expires.c:71
+#: ../pgp/seahorse-gpgme-expires.c:79
 msgid "Couldn't change expiry date"
 msgstr "Kunne ikke endre utlÃpsdato"
 
-#: ../pgp/seahorse-gpgme-expires.c:130
+#: ../pgp/seahorse-gpgme-expires.c:140
 #, c-format
 msgid "Expiry: %s"
 msgstr "UtgÃr: %s"
 
-#: ../pgp/seahorse-gpgme-generate.c:78
+#: ../pgp/seahorse-gpgme-generate.c:91
 msgid "PGP Key"
 msgstr "PGP-nÃkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:79
+#: ../pgp/seahorse-gpgme-generate.c:92
 msgid "Used to encrypt email and files"
 msgstr "Brukes til à kryptere e-post og filer"
 
-#: ../pgp/seahorse-gpgme-generate.c:115 ../ssh/seahorse-ssh-generate.xml.h:9
+#: ../pgp/seahorse-gpgme-generate.c:128
 msgid "RSA"
 msgstr "RSA"
 
-#: ../pgp/seahorse-gpgme-generate.c:116
+#: ../pgp/seahorse-gpgme-generate.c:129
 msgid "DSA Elgamal"
 msgstr "DSA ElGamal"
 
-#: ../pgp/seahorse-gpgme-generate.c:165
+#: ../pgp/seahorse-gpgme-generate.c:178
 msgid "Couldn't generate PGP key"
 msgstr "Kunne ikke opprette PGP-nÃkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:196
+#: ../pgp/seahorse-gpgme-generate.c:209
 msgid "Passphrase for New PGP Key"
 msgstr "Passordfrase for ny PGP-nÃkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:197
+#: ../pgp/seahorse-gpgme-generate.c:210
 msgid "Enter the passphrase for your new key twice."
 msgstr "Oppgi passordfrasen for din nye nÃkkel to ganger."
 
-#: ../pgp/seahorse-gpgme-generate.c:206
+#: ../pgp/seahorse-gpgme-generate.c:219
 msgid "Generating key"
 msgstr "Genererer nÃkkel"
 
@@ -1035,48 +1002,48 @@ msgstr "Er du sikker pà at du vil fjerne det nÃvÃrende bildet fra din nÃkkel
 msgid "Couldn't delete photo"
 msgstr "Kunne ikke slette bilde"
 
-#: ../pgp/seahorse-gpgme-revoke.c:69
+#: ../pgp/seahorse-gpgme-revoke.c:75
 msgid "Couldn't revoke subkey"
 msgstr "Kunne ikke trekke tilbake undernÃkkel"
 
-#: ../pgp/seahorse-gpgme-revoke.c:90
+#: ../pgp/seahorse-gpgme-revoke.c:96
 #, c-format
 msgid "Revoke: %s"
 msgstr "Trekk tilbake: %s"
 
-#: ../pgp/seahorse-gpgme-revoke.c:101
+#: ../pgp/seahorse-gpgme-revoke.c:107
 msgid "No reason"
 msgstr "Ingen grunn"
 
-#: ../pgp/seahorse-gpgme-revoke.c:102
+#: ../pgp/seahorse-gpgme-revoke.c:108
 msgid "No reason for revoking key"
 msgstr "Ingen grunn til à tilbakekalle nÃkkelen"
 
-#: ../pgp/seahorse-gpgme-revoke.c:108
+#: ../pgp/seahorse-gpgme-revoke.c:114
 msgid "Compromised"
 msgstr "Kompromittert"
 
-#: ../pgp/seahorse-gpgme-revoke.c:109
+#: ../pgp/seahorse-gpgme-revoke.c:115
 msgid "Key has been compromised"
 msgstr "NÃkkelen er kompromittert"
 
-#: ../pgp/seahorse-gpgme-revoke.c:115
+#: ../pgp/seahorse-gpgme-revoke.c:121
 msgid "Superseded"
 msgstr "UtgÃtt"
 
-#: ../pgp/seahorse-gpgme-revoke.c:116
+#: ../pgp/seahorse-gpgme-revoke.c:122
 msgid "Key has been superseded"
 msgstr "NÃkkelen er utgÃtt"
 
-#: ../pgp/seahorse-gpgme-revoke.c:122
+#: ../pgp/seahorse-gpgme-revoke.c:128
 msgid "Not Used"
 msgstr "Ikke brukt"
 
-#: ../pgp/seahorse-gpgme-revoke.c:123
+#: ../pgp/seahorse-gpgme-revoke.c:129
 msgid "Key is no longer used"
 msgstr "NÃkkelen er ikke lenger i bruk"
 
-#: ../pgp/seahorse-gpgme-revoke.c:160
+#: ../pgp/seahorse-gpgme-revoke.c:166
 #, c-format
 msgid ""
 "You are about to add %s as a revoker for %s. This operation cannot be "
@@ -1085,11 +1052,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:172
+#: ../pgp/seahorse-gpgme-revoke.c:178
 msgid "Couldn't add revoker"
 msgstr "Kunne ikke legge til tilbakekaller"
 
-#: ../pgp/seahorse-gpgme-sign.c:98
+#: ../pgp/seahorse-gpgme-sign.c:101
 #, c-format
 msgid ""
 "This key was already signed by\n"
@@ -1098,17 +1065,17 @@ msgstr ""
 "NÃkkelen er allerede signert av\n"
 "Â%sÂ"
 
-#: ../pgp/seahorse-gpgme-sign.c:102
+#: ../pgp/seahorse-gpgme-sign.c:105
 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:156 ../pgp/seahorse-signer.c:60
+#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61
 msgid "No keys usable for signing"
 msgstr "Ingen nÃkler tilgjengelig for signering"
 
-#: ../pgp/seahorse-gpgme-sign.c:157
+#: ../pgp/seahorse-gpgme-sign.c:162
 msgid ""
 "You have no personal PGP keys that can be used to indicate your trust of "
 "this key."
@@ -1224,7 +1191,7 @@ msgstr "Er du sikker pà at du vil slette %d nÃkler for godt?"
 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
+#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348
 msgid "Couldn't delete user ID"
 msgstr "Kunne ikke slette bruker-ID"
 
@@ -1256,7 +1223,7 @@ msgstr "O_pprett"
 msgid "E_xpiration Date:"
 msgstr "_UtlÃpsdato:"
 
-#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:5
+#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4
 msgid "Encryption _Type:"
 msgstr "_Krypteringstype:"
 
@@ -1264,7 +1231,7 @@ msgstr "_Krypteringstype:"
 msgid "Generate a new key"
 msgstr "Generer en ny nÃkkel"
 
-#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7
+#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6
 msgid "Key _Strength (bits):"
 msgstr "NÃkkel_styrke (biter):"
 
@@ -1280,129 +1247,119 @@ msgstr "Ny PGP-nÃkkel"
 msgid "_Comment:"
 msgstr "_Kommentar:"
 
-#: ../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:203
-#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34
-msgid "Public PGP Key"
-msgstr "Offentlig PGP-nÃkkel"
-
-#: ../pgp/seahorse-pgp-key.c:582 ../pgp/seahorse-pgp-key-properties.c:1356
+#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489
 msgid "Expired"
 msgstr "UtgÃtt"
 
-#: ../pgp/seahorse-pgp-key-properties.c:226
+#: ../pgp/seahorse-pgp-key-properties.c:319
 msgid "Couldn't change primary user ID"
 msgstr "Kunne ikke endre primÃr bruker-ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:243
+#: ../pgp/seahorse-pgp-key-properties.c:338
 #, 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:335
-#: ../pgp/seahorse-pgp-key-properties.c:1471
+#: ../pgp/seahorse-pgp-key-properties.c:433
+#: ../pgp/seahorse-pgp-key-properties.c:1604
 msgid "[Unknown]"
 msgstr "[Ukjent]"
 
-#: ../pgp/seahorse-pgp-key-properties.c:435
-#: ../pgp/seahorse-pgp-key-properties.c:1751
+#: ../pgp/seahorse-pgp-key-properties.c:533
+#: ../pgp/seahorse-pgp-key-properties.c:1885
 msgid "Name/Email"
 msgstr "Navn/e-post"
 
-#: ../pgp/seahorse-pgp-key-properties.c:440
+#: ../pgp/seahorse-pgp-key-properties.c:538
 msgid "Signature ID"
 msgstr "Signatur-ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:561
+#: ../pgp/seahorse-pgp-key-properties.c:671
 msgid "Couldn't change primary photo"
 msgstr "Kunne ikke endre hovedbilde"
 
-#: ../pgp/seahorse-pgp-key-properties.c:784
+#: ../pgp/seahorse-pgp-key-properties.c:903
 msgid "(unknown)"
 msgstr "(ukjent)"
 
-#: ../pgp/seahorse-pgp-key-properties.c:787
+#: ../pgp/seahorse-pgp-key-properties.c:906
 #, c-format
 msgid "This key expired on: %s"
 msgstr "Denne nÃkkelen gikk ut: %s"
 
-#: ../pgp/seahorse-pgp-key-properties.c:848
-#: ../src/seahorse-key-manager-store.c:829
+#: ../pgp/seahorse-pgp-key-properties.c:967
+#: ../src/seahorse-key-manager-store.c:802
 msgid "Name"
 msgstr "Navn"
 
-#: ../pgp/seahorse-pgp-key-properties.c:955
+#: ../pgp/seahorse-pgp-key-properties.c:1078
 #, 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:964
+#: ../pgp/seahorse-pgp-key-properties.c:1087
 msgid "Couldn't delete subkey"
 msgstr "Kunne ikke slette undernÃkkel"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1000
-#: ../pgp/seahorse-pgp-key-properties.c:1434
+#: ../pgp/seahorse-pgp-key-properties.c:1127
+#: ../pgp/seahorse-pgp-key-properties.c:1567
 msgid "Unable to change trust"
 msgstr "Kan ikke endre tillitsforhold"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1015 ../src/seahorse-viewer.c:296
-#: ../ssh/seahorse-ssh-key-properties.c:184
+#: ../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:1043
-#: ../ssh/seahorse-ssh-key-properties.c:208
+#: ../pgp/seahorse-pgp-key-properties.c:1172
+#: ../ssh/seahorse-ssh-key-properties.c:225
 msgid "Export Complete Key"
 msgstr "Eksporter hele nÃkkelen"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1068
-#: ../ssh/seahorse-ssh-key-properties.c:230
+#: ../pgp/seahorse-pgp-key-properties.c:1197
+#: ../ssh/seahorse-ssh-key-properties.c:247
 msgid "Couldn't export key."
 msgstr "Kunne ikke eksportere nÃkkel."
 
-#: ../pgp/seahorse-pgp-key-properties.c:1274
-#: ../pgp/seahorse-pgp-key-properties.c:1363
+#: ../pgp/seahorse-pgp-key-properties.c:1407
+#: ../pgp/seahorse-pgp-key-properties.c:1496
 msgctxt "Expires"
 msgid "Never"
 msgstr "Aldri"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1321
+#: ../pgp/seahorse-pgp-key-properties.c:1454
 msgid "ID"
 msgstr "ID"
 
 #. The key type column
-#: ../pgp/seahorse-pgp-key-properties.c:1324
-#: ../src/seahorse-key-manager-store.c:860
+#: ../pgp/seahorse-pgp-key-properties.c:1457
+#: ../src/seahorse-key-manager-store.c:833
 msgid "Type"
 msgstr "Type"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1327
+#: ../pgp/seahorse-pgp-key-properties.c:1460
 msgid "Created"
 msgstr "Opprettet"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1330
+#: ../pgp/seahorse-pgp-key-properties.c:1463
 msgid "Expires"
 msgstr "UtgÃr"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1333
+#: ../pgp/seahorse-pgp-key-properties.c:1466
 msgid "Status"
 msgstr "Status"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1336
+#: ../pgp/seahorse-pgp-key-properties.c:1469
 msgid "Strength"
 msgstr "Styrke"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1360
+#: ../pgp/seahorse-pgp-key-properties.c:1493
 msgid "Good"
 msgstr "God"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1754
-#: ../src/seahorse-key-manager-store.c:841
+#: ../pgp/seahorse-pgp-key-properties.c:1888
+#: ../src/seahorse-key-manager-store.c:814
 msgid "Key ID"
 msgstr "NÃkkel-ID"
 
@@ -1547,6 +1504,10 @@ msgstr "Eier"
 msgid "Primary"
 msgstr "PrimÃr"
 
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38
+msgid "Private PGP Key"
+msgstr "Privat PGP-nÃkkel"
+
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39
 msgid "Remove this photo from this key"
 msgstr "Fjern dette bildet fra denne nÃkkelen"
@@ -1644,9 +1605,13 @@ msgstr ""
 msgid "Marginally"
 msgstr "Marginalt"
 
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34
+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:854
+#: ../src/seahorse-key-manager-store.c:827
 msgid "Trust"
 msgstr "Tillit"
 
@@ -1695,7 +1660,7 @@ msgstr "Grunn til à tilbakekalle nÃkkelen"
 msgid "_Reason:"
 msgstr "Ã_rsak:"
 
-#: ../pgp/seahorse-signer.c:61
+#: ../pgp/seahorse-signer.c:62
 msgid ""
 "You have no personal PGP keys that can be used to sign a document or message."
 msgstr ""
@@ -1794,7 +1759,7 @@ msgstr "_Meget nÃye"
 msgid "_Sign message with key:"
 msgstr "_Signer melding med nÃkkel:"
 
-#: ../pkcs11/seahorse-pkcs11-certificate.c:109
+#: ../pkcs11/seahorse-pkcs11-certificate.c:106
 #: ../pkcs11/seahorse-pkcs11-certificate-props.c:66
 msgid "Certificate"
 msgstr "Sertifikat"
@@ -1839,8 +1804,8 @@ 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:850
-#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:145
+#: ../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"
 
@@ -1856,115 +1821,115 @@ msgstr "F_ortsett"
 msgid "Create New ..."
 msgstr "Lag ny â"
 
-#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:109
+#: ../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:413 ../src/seahorse-key-manager.c:471
-#: ../src/seahorse-key-manager.c:532 ../src/seahorse-viewer.c:451
+#: ../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:415 ../src/seahorse-viewer.c:453
+#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455
 msgid "Imported keys"
 msgstr "Importerte nÃkler"
 
-#: ../src/seahorse-key-manager.c:466
+#: ../src/seahorse-key-manager.c:484
 msgid "Importing keys"
 msgstr "Importerer nÃkler"
 
-#: ../src/seahorse-key-manager.c:486 ../ssh/seahorse-ssh-operation.c:1089
+#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891
 msgid "Import Key"
 msgstr "Importer nÃkkel"
 
-#: ../src/seahorse-key-manager.c:532
+#: ../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:547
+#: ../src/seahorse-key-manager.c:565
 msgid "Importing Keys"
 msgstr "Importerer nÃkler"
 
-#: ../src/seahorse-key-manager.c:719 ../src/seahorse-keyserver-results.c:247
+#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254
 msgid "_Remote"
 msgstr "_Ekstern"
 
-#: ../src/seahorse-key-manager.c:721
+#: ../src/seahorse-key-manager.c:739
 msgid "Close this program"
 msgstr "Lukk dette programmet"
 
-#: ../src/seahorse-key-manager.c:722
+#: ../src/seahorse-key-manager.c:740
 msgid "_New..."
 msgstr "_Ny â"
 
-#: ../src/seahorse-key-manager.c:723
+#: ../src/seahorse-key-manager.c:741
 msgid "Create a new key or item"
 msgstr "Lag en ny nÃkkel eller oppfÃring"
 
-#: ../src/seahorse-key-manager.c:724
+#: ../src/seahorse-key-manager.c:742
 msgid "_Import..."
 msgstr "_Importer â"
 
-#: ../src/seahorse-key-manager.c:725
+#: ../src/seahorse-key-manager.c:743
 msgid "Import from a file"
 msgstr "Importer fra en fil"
 
-#: ../src/seahorse-key-manager.c:727
+#: ../src/seahorse-key-manager.c:745
 msgid "Import from the clipboard"
 msgstr "Importer fra utklippstavlen"
 
-#: ../src/seahorse-key-manager.c:732 ../src/seahorse-keyserver-results.c:257
+#: ../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:733 ../src/seahorse-keyserver-results.c:258
+#: ../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:734
+#: ../src/seahorse-key-manager.c:752
 msgid "_Sync and Publish Keys..."
 msgstr "_Synkroniser og publiser nÃkler â"
 
-#: ../src/seahorse-key-manager.c:735
+#: ../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:740
+#: ../src/seahorse-key-manager.c:758
 msgid "T_ypes"
 msgstr "T_yper"
 
-#: ../src/seahorse-key-manager.c:740
+#: ../src/seahorse-key-manager.c:758
 msgid "Show type column"
 msgstr "Vis typekolonnen"
 
-#: ../src/seahorse-key-manager.c:742
+#: ../src/seahorse-key-manager.c:760
 msgid "_Expiry"
 msgstr "_UtlÃp"
 
-#: ../src/seahorse-key-manager.c:742
+#: ../src/seahorse-key-manager.c:760
 msgid "Show expiry column"
 msgstr "Vis utlÃpskolonnen"
 
-#: ../src/seahorse-key-manager.c:744
+#: ../src/seahorse-key-manager.c:762
 msgid "_Trust"
 msgstr "_Tillit"
 
-#: ../src/seahorse-key-manager.c:744
+#: ../src/seahorse-key-manager.c:762
 msgid "Show owner trust column"
 msgstr "Vis tillitskolonnen"
 
-#: ../src/seahorse-key-manager.c:746
+#: ../src/seahorse-key-manager.c:764
 msgid "_Validity"
 msgstr "_Validitet"
 
-#: ../src/seahorse-key-manager.c:746
+#: ../src/seahorse-key-manager.c:764
 msgid "Show validity column"
 msgstr "Vis gyldighetskolonnen"
 
-#: ../src/seahorse-key-manager.c:923
+#: ../src/seahorse-key-manager.c:941
 msgid "Filter:"
 msgstr "Filter:"
 
@@ -1992,7 +1957,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:516
+#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518
 msgid "_Import"
 msgstr "_Importer"
 
@@ -2000,44 +1965,44 @@ msgstr "_Importer"
 msgid "_Passwords"
 msgstr "_Passord"
 
-#: ../src/seahorse-key-manager-store.c:637 ../src/seahorse-viewer.c:261
+#: ../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:847
+#: ../src/seahorse-key-manager-store.c:820
 msgid "Validity"
 msgstr "Validitet"
 
 #. Expiry date column
-#: ../src/seahorse-key-manager-store.c:866
+#: ../src/seahorse-key-manager-store.c:839
 msgid "Expiration Date"
 msgstr "UtlÃpsdato"
 
-#: ../src/seahorse-keyserver-results.c:249
+#: ../src/seahorse-keyserver-results.c:256
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ../src/seahorse-keyserver-results.c:250
+#: ../src/seahorse-keyserver-results.c:257
 msgid "_Expand All"
 msgstr "_Utvid alle"
 
-#: ../src/seahorse-keyserver-results.c:251
+#: ../src/seahorse-keyserver-results.c:258
 msgid "Expand all listings"
 msgstr "Utvid alle lister"
 
-#: ../src/seahorse-keyserver-results.c:252
+#: ../src/seahorse-keyserver-results.c:259
 msgid "_Collapse All"
 msgstr "S_là sammen alle"
 
-#: ../src/seahorse-keyserver-results.c:253
+#: ../src/seahorse-keyserver-results.c:260
 msgid "Collapse all listings"
 msgstr "Slà sammen alle lister"
 
-#: ../src/seahorse-keyserver-results.c:324
+#: ../src/seahorse-keyserver-results.c:331
 msgid "Remote Keys"
 msgstr "Eksterne nÃkler"
 
-#: ../src/seahorse-keyserver-results.c:326
+#: ../src/seahorse-keyserver-results.c:333
 #, c-format
 msgid "Remote Keys Containing '%s'"
 msgstr "Eksterne nÃkler som inneholder Â%sÂ"
@@ -2074,23 +2039,23 @@ msgstr "_SÃk"
 msgid "_Search for keys containing: "
 msgstr "_SÃk etter nÃkler som inneholder:"
 
-#: ../src/seahorse-keyserver-sync.c:52
+#: ../src/seahorse-keyserver-sync.c:58
 msgid "Couldn't publish keys to server"
 msgstr "Kunne ikke publisere nÃkler til tjener"
 
-#: ../src/seahorse-keyserver-sync.c:71
+#: ../src/seahorse-keyserver-sync.c:77
 #, c-format
 msgid "Couldn't retrieve keys from server: %s"
 msgstr "Kunne ikke motta nÃkler fra nÃkkeltjener: %s"
 
-#: ../src/seahorse-keyserver-sync.c:155
+#: ../src/seahorse-keyserver-sync.c:161
 #, 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:241
+#: ../src/seahorse-keyserver-sync.c:247
 msgid "Synchronizing keys..."
 msgstr "Synkroniserer nÃkler â"
 
@@ -2130,120 +2095,143 @@ msgstr "_Synkroniser"
 msgid "Version of this application"
 msgstr "Versjon av dette programmet"
 
-#: ../src/seahorse-viewer.c:121
+#: ../src/seahorse-viewer.c:123
 msgid "Contributions:"
 msgstr "Bidrag:"
 
-#: ../src/seahorse-viewer.c:147
+#: ../src/seahorse-viewer.c:149
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas gnome org>\n"
 "Espen Stefansen <espens svn gnome org>"
 
-#: ../src/seahorse-viewer.c:150
+#: ../src/seahorse-viewer.c:152
 msgid "Seahorse Project Homepage"
 msgstr "Hjemmesiden til Seahorse-prosjektet"
 
 #. Top menu items
-#: ../src/seahorse-viewer.c:170
+#: ../src/seahorse-viewer.c:172
 msgid "_File"
 msgstr "_Fil"
 
-#: ../src/seahorse-viewer.c:171
+#: ../src/seahorse-viewer.c:173
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/seahorse-viewer.c:172
+#: ../src/seahorse-viewer.c:174
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/seahorse-viewer.c:173
+#: ../src/seahorse-viewer.c:175
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/seahorse-viewer.c:175
+#: ../src/seahorse-viewer.c:177
 msgid "Prefere_nces"
 msgstr "_Innstillinger"
 
-#: ../src/seahorse-viewer.c:176
+#: ../src/seahorse-viewer.c:178
 msgid "Change preferences for this program"
 msgstr "Endre brukervalg for dette programmet"
 
-#: ../src/seahorse-viewer.c:179
+#: ../src/seahorse-viewer.c:181
 msgid "About this program"
 msgstr "Om dette programmet"
 
-#: ../src/seahorse-viewer.c:180
+#: ../src/seahorse-viewer.c:182
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/seahorse-viewer.c:181
+#: ../src/seahorse-viewer.c:183
 msgid "Show Seahorse help"
 msgstr "Vis hjelp for Seahorse"
 
-#: ../src/seahorse-viewer.c:282
+#: ../src/seahorse-viewer.c:284
 msgid "Export public key"
 msgstr "Eksporter offentlig nÃkkel"
 
-#: ../src/seahorse-viewer.c:303
+#: ../src/seahorse-viewer.c:305
 msgid "Exporting keys"
 msgstr "Eksporterer nÃkler"
 
-#: ../src/seahorse-viewer.c:332
+#: ../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:344
+#: ../src/seahorse-viewer.c:346
 msgid "Copied keys"
 msgstr "Kopierte nÃkler"
 
-#: ../src/seahorse-viewer.c:369
+#: ../src/seahorse-viewer.c:371
 msgid "Retrieving keys"
 msgstr "Henter nÃkler"
 
-#: ../src/seahorse-viewer.c:424
+#: ../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:478
+#: ../src/seahorse-viewer.c:480
 msgid "Importing keys from key servers"
 msgstr "Importerer nÃkler fra nÃkkeltjenere"
 
-#: ../src/seahorse-viewer.c:503
+#: ../src/seahorse-viewer.c:505
 msgid "Show properties"
 msgstr "Vis egenskaper"
 
-#: ../src/seahorse-viewer.c:504
+#: ../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:505
+#: ../src/seahorse-viewer.c:507
 msgid "Delete selected items"
 msgstr "Slett valgte oppfÃringer"
 
-#: ../src/seahorse-viewer.c:509
+#: ../src/seahorse-viewer.c:511
 msgid "E_xport..."
 msgstr "E_ksporter â"
 
-#: ../src/seahorse-viewer.c:510
+#: ../src/seahorse-viewer.c:512
 msgid "Export to a file"
 msgstr "Eksporter til en fil"
 
-#: ../src/seahorse-viewer.c:512
+#: ../src/seahorse-viewer.c:514
 msgid "Copy to the clipboard"
 msgstr "Kopier til utklippstavlen"
 
-#: ../src/seahorse-viewer.c:517
+#: ../src/seahorse-viewer.c:519
 msgid "Import selected keys to local key ring"
 msgstr "Importer valgte nÃkler til lokal nÃkkelring"
 
-#: ../ssh/seahorse-ssh-askpass.c:99
+#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68
 msgid "Enter your Secure Shell passphrase:"
 msgstr "Oppgi din Secure Shell-passordfrase:"
 
+#: ../ssh/seahorse-ssh-askpass.c:82
+msgid "Old Key Passphrase"
+msgstr "Gammel passordfrase for nÃkkel"
+
+#: ../ssh/seahorse-ssh-askpass.c:83
+#, c-format
+msgid "Enter the old passphrase for: %s"
+msgstr "Oppgi den gamle passordfrasen for: %s"
+
+#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92
+msgid "New Key Passphrase"
+msgstr "Ny passordfrase for nÃkkel"
+
+#: ../ssh/seahorse-ssh-askpass.c:88
+#, c-format
+msgid "Enter the new passphrase for: %s"
+msgstr "Oppgi den nye passordfrasen for: %s"
+
+#: ../ssh/seahorse-ssh-askpass.c:93
+#, c-format
+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 â"
@@ -2270,8 +2258,8 @@ msgstr "Er du sikker pà at du vil slette %d nÃkler for secure shell?"
 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
+#: ../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
 msgid "Secure Shell Key"
 msgstr "NÃkkel for sikkert skall"
 
@@ -2279,11 +2267,11 @@ msgstr "NÃkkel for sikkert skall"
 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:116 ../ssh/seahorse-ssh-generate.c:135
+#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131
 msgid "Couldn't generate Secure Shell key"
 msgstr "Kunne ikke generere Secure Shell-nÃkkel"
 
-#: ../ssh/seahorse-ssh-generate.c:203
+#: ../ssh/seahorse-ssh-generate.c:197
 msgid "Creating Secure Shell Key"
 msgstr "Oppretter Secure Shell-nÃkkel"
 
@@ -2303,11 +2291,7 @@ 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:4
-msgid "DSA"
-msgstr "DSA"
-
-#: ../ssh/seahorse-ssh-generate.xml.h:6
+#: ../ssh/seahorse-ssh-generate.xml.h:5
 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. "
@@ -2315,47 +2299,35 @@ 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Ã."
 
-#: ../ssh/seahorse-ssh-generate.xml.h:8
+#: ../ssh/seahorse-ssh-generate.xml.h:7
 msgid "New Secure Shell Key"
 msgstr "Ny Secure Shell-nÃkkel"
 
-#: ../ssh/seahorse-ssh-generate.xml.h:10
+#: ../ssh/seahorse-ssh-generate.xml.h:8
 msgid "_Create and Set Up"
 msgstr "_Opprett og sett opp"
 
-#: ../ssh/seahorse-ssh-generate.xml.h:11
+#: ../ssh/seahorse-ssh-generate.xml.h:9
 msgid "_Just Create Key"
 msgstr "_Bare opprett nÃkkel"
 
-#: ../ssh/seahorse-ssh-generate.xml.h:12
+#: ../ssh/seahorse-ssh-generate.xml.h:10
 msgid "_Key Description:"
 msgstr "NÃ_kkelbeskrivelse:"
 
-#: ../ssh/seahorse-ssh-key.c:88
+#: ../ssh/seahorse-ssh-key.c:87
 msgid "(Unreadable Secure Shell Key)"
 msgstr "(Uleslig Secure Shell-nÃkkel)"
 
-#: ../ssh/seahorse-ssh-key.c:106
-msgid "Invalid"
-msgstr "Ugyldig"
-
-#: ../ssh/seahorse-ssh-key.c:117
-msgid "Private Secure Shell Key"
-msgstr "Privat Secure Shell-nÃkkel"
-
-#: ../ssh/seahorse-ssh-key.c:120
-msgid "Public Secure Shell Key"
-msgstr "Offentlig nÃkkel for sikkert skall"
-
-#: ../ssh/seahorse-ssh-key-properties.c:62
+#: ../ssh/seahorse-ssh-key-properties.c:79
 msgid "Couldn't rename key."
 msgstr "Kunne ikke endre navn pà nÃkkel."
 
-#: ../ssh/seahorse-ssh-key-properties.c:115
+#: ../ssh/seahorse-ssh-key-properties.c:132
 msgid "Couldn't change authorization for key."
 msgstr "Kunne ikke endre autorisasjon for nÃkkelen."
 
-#: ../ssh/seahorse-ssh-key-properties.c:150
+#: ../ssh/seahorse-ssh-key-properties.c:167
 msgid "Couldn't change passphrase for key."
 msgstr "Kunne ikke endre passordfrasen for nÃkkel."
 
@@ -2401,71 +2373,44 @@ msgstr ""
 msgid "Used to connect to other computers."
 msgstr "Brukt til à koble til andre datamaskiner."
 
-#: ../ssh/seahorse-ssh-operation.c:204
-msgid "Secure Shell key"
-msgstr "NÃkkel for sikkert skall"
-
-#: ../ssh/seahorse-ssh-operation.c:262
+#: ../ssh/seahorse-ssh-operation.c:198
 msgid "The SSH command was terminated unexpectedly."
 msgstr "SSH-kommando terminerte uventet."
 
-#: ../ssh/seahorse-ssh-operation.c:270
+#: ../ssh/seahorse-ssh-operation.c:208
 msgid "The SSH command failed."
 msgstr "SSH-kommando feilet"
 
-#. Just prompt over and over again
-#: ../ssh/seahorse-ssh-operation.c:678
+#: ../ssh/seahorse-ssh-operation.c:518
 msgid "Remote Host Password"
 msgstr "Passord for ekstern vert"
 
-#: ../ssh/seahorse-ssh-operation.c:808
-msgid "Old Key Passphrase"
-msgstr "Gammel passordfrase for nÃkkel"
-
-#: ../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:813
-msgid "New Key Passphrase"
-msgstr "Ny passordfrase for nÃkkel"
-
-#: ../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:822
+#: ../ssh/seahorse-ssh-operation.c:634
 msgid "Enter Key Passphrase"
 msgstr "Oppgi passordfrase for nÃkkel"
 
-#: ../ssh/seahorse-ssh-operation.c:942
+#: ../ssh/seahorse-ssh-operation.c:724
 msgid "Passphrase for New Secure Shell Key"
 msgstr "Passordfrase for ny Secure Shell-nÃkkel"
 
-#: ../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:1085
+#: ../ssh/seahorse-ssh-operation.c:908
 #, c-format
 msgid "Importing key: %s"
 msgstr "Importerer nÃkkel: %s"
 
-#: ../ssh/seahorse-ssh-operation.c:1087
+#: ../ssh/seahorse-ssh-operation.c:910
 msgid "Importing key. Enter passphrase"
 msgstr "Importerer nÃkkel. Oppgi passord"
 
-#: ../ssh/seahorse-ssh-source.c:915
+#: ../ssh/seahorse-ssh-source.c:951
 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:47
+#: ../ssh/seahorse-ssh-upload.c:50
 msgid "Couldn't configure Secure Shell keys on remote computer."
 msgstr "Kunne ikke konfigurere Secure Shell-nÃkkelen pà ekstern datamaskin."
 
-#: ../ssh/seahorse-ssh-upload.c:132
+#: ../ssh/seahorse-ssh-upload.c:133
 msgid "Configuring Secure Shell Keys..."
 msgstr "Konfigurerer Secure Shell-nÃkler â"