[seahorse] Updated British English translation

From: Bruce Cowan <bcowan src gnome org>
To: commits-list gnome org
Cc:
Subject: [seahorse] Updated British English translation
Date: Thu, 8 Sep 2011 16:31:32 +0000 (UTC)
commit dbe3be58567c3e77a198de5f45e534f81b87e914
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Thu Sep 8 17:31:20 2011 +0100

    Updated British English translation

 po/en_GB.po | 1919 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 885 insertions(+), 1034 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 0da8001..34f4163 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahorse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 12:57+0000\n"
-"PO-Revision-Date: 2011-03-17 12:57+0100\n"
+"POT-Creation-Date: 2011-09-08 17:29+0100\n"
+"PO-Revision-Date: 2011-09-08 17:30+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -17,343 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.6.1\n"
-
-#: ../daemon/seahorse-daemon.c:64
-msgid "Do not run seahorse-daemon as a daemon"
-msgstr "Do not run seahorse-daemon as a daemon"
-
-#: ../daemon/seahorse-daemon.c:94
-msgid "couldn't fork process"
-msgstr "couldn't fork process"
-
-#: ../daemon/seahorse-daemon.c:100
-msgid "couldn't create new process group"
-msgstr "couldn't create new process group"
-
-#: ../daemon/seahorse-daemon.c:250
-msgid "Encryption Daemon (Seahorse)"
-msgstr "Encryption Daemon (Seahorse)"
-
-#: ../daemon/seahorse-service.c:164 ../daemon/seahorse-service.c:277
-#, c-format
-msgid "Invalid or unrecognized key type: %s"
-msgstr "Invalid or unrecognised key type: %s"
-
-#: ../daemon/seahorse-service.c:234
-#, c-format
-msgid "This keytype is not supported: %s"
-msgstr "This keytype is not supported: %s"
-
-#: ../daemon/seahorse-service.c:241
-#, c-format
-msgid "Support for this feature was not enabled at build time"
-msgstr "Support for this feature was not enabled at build time"
-
-#: ../daemon/seahorse-service.c:341 ../daemon/seahorse-service-keyset.c:180
-#: ../daemon/seahorse-service-keyset.c:223
-#, c-format
-msgid "Invalid or unrecognized key: %s"
-msgstr "Invalid or unrecognised key: %s"
-
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../daemon/seahorse-service-crypto.c:204
-#, c-format
-msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
-msgstr "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
-
-#: ../daemon/seahorse-service-crypto.c:205
-msgid "Invalid Signature"
-msgstr "Invalid Signature"
-
-#: ../daemon/seahorse-service-crypto.c:211
-#, c-format
-msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
-msgstr "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
-
-#: ../daemon/seahorse-service-crypto.c:212
-msgid "Expired Signature"
-msgstr "Expired Signature"
-
-#: ../daemon/seahorse-service-crypto.c:218
-#, c-format
-msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
-msgstr "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
-
-#: ../daemon/seahorse-service-crypto.c:219
-msgid "Revoked Signature"
-msgstr "Revoked Signature"
-
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../daemon/seahorse-service-crypto.c:225
-#, c-format
-msgid "Signed by <i><key id='%s'/></i> on %s."
-msgstr "Signed by <i><key id='%s'/></i> on %s."
-
-#: ../daemon/seahorse-service-crypto.c:226
-msgid "Good Signature"
-msgstr "Good Signature"
-
-#: ../daemon/seahorse-service-crypto.c:231
-msgid "Signing key not in keyring."
-msgstr "Signing key not in keyring."
-
-#: ../daemon/seahorse-service-crypto.c:232
-msgid "Unknown Signature"
-msgstr "Unknown Signature"
-
-#: ../daemon/seahorse-service-crypto.c:236
-msgid "Bad or forged signature. The signed data was modified."
-msgstr "Bad or forged signature. The signed data was modified."
-
-#: ../daemon/seahorse-service-crypto.c:237
-msgid "Bad Signature"
-msgstr "Bad Signature"
-
-#: ../daemon/seahorse-service-crypto.c:245
-msgid "Couldn't verify signature."
-msgstr "Couldn't verify signature."
-
-#: ../daemon/seahorse-service-crypto.c:317
-#: ../daemon/seahorse-service-crypto.c:646
-#, c-format
-msgid "Invalid or unrecognized signer: %s"
-msgstr "Invalid or unrecognised signer: %s"
-
-#: ../daemon/seahorse-service-crypto.c:324
-#: ../daemon/seahorse-service-crypto.c:653
-#, c-format
-msgid "Key is not valid for signing: %s"
-msgstr "Key is not valid for signing: %s"
-
-#: ../daemon/seahorse-service-crypto.c:335
-#, c-format
-msgid "Invalid or unrecognized recipient: %s"
-msgstr "Invalid or unrecognised recipient: %s"
-
-#: ../daemon/seahorse-service-crypto.c:343
-#, c-format
-msgid "Key is not a valid recipient for encryption: %s"
-msgstr "Key is not a valid recipient for encryption: %s"
-
-#: ../daemon/seahorse-service-crypto.c:352
-#, c-format
-msgid "No recipients specified"
-msgstr "No recipients specified"
-
-#: ../daemon/seahorse-service-crypto.c:434
-#, c-format
-msgid "Invalid key type for decryption: %s"
-msgstr "Invalid key type for decryption: %s"
-
-#: ../daemon/seahorse-service-crypto.c:548
-#: ../daemon/seahorse-service-crypto.c:746
-#, c-format
-msgid "Please set clearuri"
-msgstr "Please set clearuri"
-
-#: ../daemon/seahorse-service-crypto.c:554
-#: ../daemon/seahorse-service-crypto.c:752
-#, c-format
-msgid "Please set crypturi"
-msgstr "Please set crypturi"
-
-#: ../daemon/seahorse-service-crypto.c:564
-#, c-format
-msgid "Error opening clearuri"
-msgstr "Error opening clearuri"
-
-#: ../daemon/seahorse-service-crypto.c:641
-#, c-format
-msgid "No signer specified"
-msgstr "No signer specified"
-
-#: ../daemon/seahorse-service-crypto.c:830
-#, c-format
-msgid "Invalid key type for verifying: %s"
-msgstr "Invalid key type for verifying: %s"
-
-#: ../daemon/seahorse-service-keyset.c:273
-#, c-format
-msgid "Invalid key id: %s"
-msgstr "Invalid key id: %s"
-
-#: ../data/seahorse.schemas.in.h:1
-msgid ""
-"A list of key server URIs to search for remote PGP keys. In later versions a "
-"display name can be included, by appending a space and then the name."
-msgstr ""
-"A list of key server URIs to search for remote PGP keys. In later versions a "
-"display name can be included, by appending a space and then the name."
-
-#: ../data/seahorse.schemas.in.h:2
-msgid "Auto Retrieve Keys"
-msgstr "Auto Retrieve Keys"
-
-#: ../data/seahorse.schemas.in.h:3
-msgid "Auto Sync Keys"
-msgstr "Auto Sync Keys"
-
-#: ../data/seahorse.schemas.in.h:4
-msgid "Controls the visibility of the expires column for the key manager."
-msgstr "Controls the visibility of the expires column for the key manager."
-
-#: ../data/seahorse.schemas.in.h:5
-msgid "Controls the visibility of the trust column for the key manager."
-msgstr "Controls the visibility of the trust column for the key manager."
-
-#: ../data/seahorse.schemas.in.h:6
-msgid "Controls the visibility of the type column for the key manager."
-msgstr "Controls the visibility of the type column for the key manager."
-
-#: ../data/seahorse.schemas.in.h:7
-msgid "Controls the visibility of the validity column for the key manager."
-msgstr "Controls the visibility of the validity column for the key manager."
-
-#: ../data/seahorse.schemas.in.h:8
-msgid "Enable DNS-SD sharing"
-msgstr "Enable DNS-SD sharing"
-
-#: ../data/seahorse.schemas.in.h:9
-msgid ""
-"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be "
-"running and must be built with HKP and DNS-SD support."
-msgstr ""
-"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be "
-"running and must be built with HKP and DNS-SD support."
-
-#: ../data/seahorse.schemas.in.h:10
-msgid "ID of the default key"
-msgstr "ID of the default key"
-
-#: ../data/seahorse.schemas.in.h:11
-msgid ""
-"If set to true, then files encrypted with seahorse will be ASCII armor "
-"encoded."
-msgstr ""
-"If set to true, then files encrypted with seahorse will be ASCII armour "
-"encoded."
-
-#: ../data/seahorse.schemas.in.h:12
-msgid ""
-"If set to true, then the default key will always be added to an encryption "
-"recipients list."
-msgstr ""
-"If set to true, then the default key will always be added to an encryption "
-"recipients list."
-
-#: ../data/seahorse.schemas.in.h:13
-msgid "Last key server search pattern"
-msgstr "Last key server search pattern"
-
-#: ../data/seahorse.schemas.in.h:14
-msgid "Last key servers used"
-msgstr "Last key servers used"
-
-#: ../data/seahorse.schemas.in.h:15
-msgid "Last key used to sign a message."
-msgstr "Last key used to sign a message."
-
-#: ../data/seahorse.schemas.in.h:16
-msgid "PGP Key servers"
-msgstr "PGP Key servers"
-
-#: ../data/seahorse.schemas.in.h:17
-msgid "Publish keys to this key server."
-msgstr "Publish keys to this key server."
-
-#: ../data/seahorse.schemas.in.h:18
-msgid "Show expires column in key manager"
-msgstr "Show expires column in key manager"
-
-#: ../data/seahorse.schemas.in.h:19
-msgid "Show trust column in key manager"
-msgstr "Show trust column in key manager"
-
-#: ../data/seahorse.schemas.in.h:20
-msgid "Show type column in key manager"
-msgstr "Show type column in key manager"
-
-#: ../data/seahorse.schemas.in.h:21
-msgid "Show validity column in key manager"
-msgstr "Show validity column in key manager"
-
-#: ../data/seahorse.schemas.in.h:22
-msgid ""
-"Specify the column to sort the recipients window by. Columns are: 'name' and "
-"'id'. Put a '-' in front of the column name to sort in descending order."
-msgstr ""
-"Specify the column to sort the recipients window by. Columns are: 'name' and "
-"'id'. Put a '-' in front of the column name to sort in descending order."
-
-#: ../data/seahorse.schemas.in.h:23
-msgid ""
-"Specify the column to sort the seahorse key manager main window by. Columns "
-"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in "
-"front of the column name to sort in descending order."
-msgstr ""
-"Specify the column to sort the seahorse key manager main window by. Columns "
-"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in "
-"front of the column name to sort in descending order."
-
-#: ../data/seahorse.schemas.in.h:24
-msgid "The ID of the last secret key used to sign a message."
-msgstr "The ID of the last secret key used to sign a message."
-
-#: ../data/seahorse.schemas.in.h:25
-msgid "The column to sort the recipients by"
-msgstr "The column to sort the recipients by"
-
-#: ../data/seahorse.schemas.in.h:26
-msgid "The column to sort the seahorse keys by"
-msgstr "The column to sort the seahorse keys by"
-
-#: ../data/seahorse.schemas.in.h:27
-msgid ""
-"The key server to publish PGP keys to. Or empty to suppress publishing of "
-"PGP keys."
-msgstr ""
-"The key server to publish PGP keys to. Or empty to suppress publishing of "
-"PGP keys."
-
-#: ../data/seahorse.schemas.in.h:28
-msgid ""
-"The last key server a search was performed against or empty for all key "
-"servers."
-msgstr ""
-"The last key server a search was performed against or empty for all key "
-"servers."
-
-#: ../data/seahorse.schemas.in.h:29
-msgid "The last search pattern searched for against a key server."
-msgstr "The last search pattern searched for against a key server."
-
-#: ../data/seahorse.schemas.in.h:30
-msgid ""
-"This specifies the default key to use for certain operations, mainly signing."
-msgstr ""
-"This specifies the default key to use for certain operations, mainly signing."
-
-#: ../data/seahorse.schemas.in.h:31
-msgid "Whether or not keys should be automatically retrieved from key servers."
-msgstr ""
-"Whether or not keys should be automatically retrieved from key servers."
-
-#: ../data/seahorse.schemas.in.h:32
-msgid ""
-"Whether or not modified keys should be automatically synced with the default "
-"key server."
-msgstr ""
-"Whether or not modified keys should be automatically synced with the default "
-"key server."
-
-#: ../data/seahorse.schemas.in.h:33
-msgid "Whether to always encrypt to default key"
-msgstr "Whether to always encrypt to default key"
-
-#: ../data/seahorse.schemas.in.h:34
-msgid "Whether to use ASCII Armor"
-msgstr "Whether to use ASCII Armour"
+"X-Generator: Virtaal 0.7.1-beta1\n"
 
 #: ../gkr/seahorse-add-keyring.xml.h:1
 msgid "Add Password Keyring"
@@ -377,7 +41,7 @@ msgstr ""
 msgid "The host name or address of the server."
 msgstr "The host name or address of the server."
 
-#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:73
+#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72
 msgid "Couldn't add keyring"
 msgstr "Couldn't add keyring"
 
@@ -386,7 +50,7 @@ msgid "Add Password"
 msgstr "Add Password"
 
 #: ../gkr/seahorse-gkr-add-item.xml.h:2
-#: ../gkr/seahorse-gkr-item-properties.xml.h:15 ../pgp/seahorse-revoke.xml.h:5
+#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5
 msgid "_Description:"
 msgstr "_Description:"
 
@@ -402,197 +66,169 @@ msgstr "_Password:"
 msgid "_Show Password"
 msgstr "_Show Password"
 
-#: ../gkr/seahorse-gkr-item.c:473
-msgid "Web Password"
-msgstr "Web Password"
-
-#: ../gkr/seahorse-gkr-item.c:475
-msgid "Network Password"
-msgstr "Network Password"
-
-#: ../gkr/seahorse-gkr-item.c:477 ../gkr/seahorse-gkr-item-properties.c:107
-msgid "Password"
-msgstr "Password"
-
 #: ../gkr/seahorse-gkr-item-commands.c:78
+msgid "Couldn't delete item"
+msgstr "Couldn't delete item"
+
+#: ../gkr/seahorse-gkr-item-commands.c:100
 #, c-format
 msgid "Are you sure you want to delete the password '%s'?"
 msgstr "Are you sure you want to delete the password '%s'?"
 
-#: ../gkr/seahorse-gkr-item-commands.c:81
+#: ../gkr/seahorse-gkr-item-commands.c:103
 #, c-format
 msgid "Are you sure you want to delete %d password?"
 msgid_plural "Are you sure you want to delete %d passwords?"
 msgstr[0] "Are you sure you want to delete %d password?"
 msgstr[1] "Are you sure you want to delete %d passwords?"
 
-#: ../gkr/seahorse-gkr-item-properties.c:66
+#: ../gkr/seahorse-gkr-item-commands.c:114
+msgid "Deleting item"
+msgid_plural "Deleting items"
+msgstr[0] "Deleting item"
+msgstr[1] "Deleting items"
+
+#: ../gkr/seahorse-gkr-item-properties.c:70
 msgid "Access a network share or resource"
 msgstr "Access a network share or resource"
 
-#: ../gkr/seahorse-gkr-item-properties.c:69
+#: ../gkr/seahorse-gkr-item-properties.c:73
 msgid "Access a website"
 msgstr "Access a website"
 
-#: ../gkr/seahorse-gkr-item-properties.c:72
+#: ../gkr/seahorse-gkr-item-properties.c:76
 msgid "Unlocks a PGP key"
 msgstr "Unlocks a PGP key"
 
-#: ../gkr/seahorse-gkr-item-properties.c:75
+#: ../gkr/seahorse-gkr-item-properties.c:79
 msgid "Unlocks a Secure Shell key"
 msgstr "Unlocks a Secure Shell key"
 
-#: ../gkr/seahorse-gkr-item-properties.c:78
+#: ../gkr/seahorse-gkr-item-properties.c:82
 msgid "Saved password or login"
 msgstr "Saved password or login"
 
-#: ../gkr/seahorse-gkr-item-properties.c:102
+#: ../gkr/seahorse-gkr-item-properties.c:106
 msgid "Network Credentials"
 msgstr "Network Credentials"
 
-#: ../gkr/seahorse-gkr-item-properties.c:245
+#: ../gkr/seahorse-gkr-item-properties.c:111
+msgid "Password"
+msgstr "Password"
+
+#: ../gkr/seahorse-gkr-item-properties.c:211
 msgid "Couldn't change password."
 msgstr "Couldn't change password."
 
-#: ../gkr/seahorse-gkr-item-properties.c:350
+#: ../gkr/seahorse-gkr-item-properties.c:256
+#: ../gkr/seahorse-gkr-item-properties.c:377
+msgid "Updating password"
+msgstr "Updating password"
+
+#: ../gkr/seahorse-gkr-item-properties.c:337
 msgid "Couldn't set description."
 msgstr "Couldn't set description."
 
-#: ../gkr/seahorse-gkr-item-properties.c:656
-msgid "Couldn't set application access."
-msgstr "Couldn't set application access."
-
 #: ../gkr/seahorse-gkr-item-properties.xml.h:1
 msgid "<b>Password:</b>"
 msgstr "<b>Password:</b>"
 
 #: ../gkr/seahorse-gkr-item-properties.xml.h:2
-msgid "<b>Path:</b>"
-msgstr "<b>Path:</b>"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:3
-msgid "<b>Permissions:</b>"
-msgstr "<b>Permissions:</b>"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:4
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:8
 #: ../ssh/seahorse-ssh-key-properties.xml.h:7
 msgid "<b>Technical Details:</b>"
 msgstr "<b>Technical Details:</b>"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:5
-msgid "Applications"
-msgstr "Applications"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:6
+#: ../gkr/seahorse-gkr-item-properties.xml.h:3
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:22
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:19
 #: ../ssh/seahorse-ssh-key-properties.xml.h:15
 msgid "Details"
 msgstr "Details"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:7
+#: ../gkr/seahorse-gkr-item-properties.xml.h:4
 #: ../pgp/seahorse-pgp-subkey.c:366
 #: ../ssh/seahorse-ssh-key-properties.xml.h:17
 msgid "Key"
 msgstr "Key"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:8
+#: ../gkr/seahorse-gkr-item-properties.xml.h:5
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:30
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:30
 #: ../ssh/seahorse-ssh-key-properties.xml.h:18
 msgid "Key Properties"
 msgstr "Key Properties"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:9
+#: ../gkr/seahorse-gkr-item-properties.xml.h:6
 msgid "Login:"
 msgstr "Login:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:10
+#: ../gkr/seahorse-gkr-item-properties.xml.h:7
 msgid "Server:"
 msgstr "Server:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:11
+#: ../gkr/seahorse-gkr-item-properties.xml.h:8
 msgid "Show pass_word"
 msgstr "Show pass_word"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:12
+#: ../gkr/seahorse-gkr-item-properties.xml.h:9
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:44
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:38
 msgid "Type:"
 msgstr "Type:"
 
 #. To translators: This is the noun not the verb.
-#: ../gkr/seahorse-gkr-item-properties.xml.h:14
+#: ../gkr/seahorse-gkr-item-properties.xml.h:11
 msgid "Use:"
 msgstr "Use:"
 
-#. To translators: This is the infinitive not the imperative.
-#: ../gkr/seahorse-gkr-item-properties.xml.h:17
-msgid "_Read"
-msgstr "_Read"
-
-#. To translators: This is the infinitive not the imperative.
-#: ../gkr/seahorse-gkr-item-properties.xml.h:19
-msgid "_Write"
-msgstr "_Write"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:20
-msgctxt "infinitive"
-msgid "_Delete"
-msgstr "_Delete"
-
-#: ../gkr/seahorse-gkr-keyring.c:193
-msgid "Listing passwords"
-msgstr "Listing passwords"
-
-#: ../gkr/seahorse-gkr-keyring.c:354
+#: ../gkr/seahorse-gkr-keyring.c:120
 #, c-format
 msgid "Passwords: %s"
 msgstr "Passwords: %s"
 
-#: ../gkr/seahorse-gkr-keyring.c:355
+#: ../gkr/seahorse-gkr-keyring.c:121
 #, c-format
 msgid "<b>Passwords:</b> %s"
 msgstr "<b>Passwords:</b> %s"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:119
+#: ../gkr/seahorse-gkr-keyring-commands.c:113
 msgid "Password Keyring"
 msgstr "Password Keyring"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:120
+#: ../gkr/seahorse-gkr-keyring-commands.c:114
 msgid "Used to store application and network passwords"
 msgstr "Used to store application and network passwords"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:121
+#: ../gkr/seahorse-gkr-keyring-commands.c:115
 msgid "Stored Password"
 msgstr "Stored Password"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:122
+#: ../gkr/seahorse-gkr-keyring-commands.c:116
 msgid "Safely store a password or secret."
 msgstr "Safely store a password or secret."
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:136
+#: ../gkr/seahorse-gkr-keyring-commands.c:128
 msgid "Couldn't unlock keyring"
 msgstr "Couldn't unlock keyring"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:177
+#: ../gkr/seahorse-gkr-keyring-commands.c:165
 msgid "Couldn't lock keyring"
 msgstr "Couldn't lock keyring"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:218
+#: ../gkr/seahorse-gkr-keyring-commands.c:202
 msgid "Couldn't set default keyring"
 msgstr "Couldn't set default keyring"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:257
+#: ../gkr/seahorse-gkr-keyring-commands.c:239
 msgid "Couldn't change keyring password"
 msgstr "Couldn't change keyring password."
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:288
+#: ../gkr/seahorse-gkr-keyring-commands.c:268
 msgid "_Lock"
 msgstr "_Lock"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:289
+#: ../gkr/seahorse-gkr-keyring-commands.c:269
 msgid ""
 "Lock the password storage keyring so a master password is required to unlock "
 "it."
@@ -600,11 +236,11 @@ msgstr ""
 "Lock the password storage keyring so a master password is required to unlock "
 "it."
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:290
+#: ../gkr/seahorse-gkr-keyring-commands.c:270
 msgid "_Unlock"
 msgstr "_Unlock"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:291
+#: ../gkr/seahorse-gkr-keyring-commands.c:271
 msgid ""
 "Unlock the password storage keyring with a master password so it is "
 "available for use."
@@ -612,27 +248,37 @@ msgstr ""
 "Unlock the password storage keyring with a master password so it is "
 "available for use."
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:292
+#: ../gkr/seahorse-gkr-keyring-commands.c:272
 msgid "_Set as default"
 msgstr "_Set as default"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:293
+#: ../gkr/seahorse-gkr-keyring-commands.c:273
 msgid "Applications usually store new passwords in the default keyring."
 msgstr "Applications usually store new passwords in the default keyring."
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:294
+#: ../gkr/seahorse-gkr-keyring-commands.c:274
 msgid "Change _Password"
 msgstr "Change _Password"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:295
+#: ../gkr/seahorse-gkr-keyring-commands.c:275
 msgid "Change the unlock password of the password storage keyring"
 msgstr "Change the unlock password of the password storage keyring"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:360
+#: ../gkr/seahorse-gkr-keyring-commands.c:340
+msgid "Couldn't delete keyring"
+msgstr "Couldn't delete keyring"
+
+#: ../gkr/seahorse-gkr-keyring-commands.c:358
 #, c-format
 msgid "Are you sure you want to delete the password keyring '%s'?"
 msgstr "Are you sure you want to delete the password keyring '%s'?"
 
+#: ../gkr/seahorse-gkr-keyring-commands.c:368
+msgid "Deleting keyring"
+msgid_plural "Deleting keyrings"
+msgstr[0] "Deleting keyring"
+msgstr[1] "Deleting keyrings"
+
 #. -----------------------------------------------------------------------------
 #. * PUBLIC
 #.
@@ -655,266 +301,196 @@ msgstr "Keyring Properties"
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../gkr/seahorse-gkr-operation.c:168
+#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73
+#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:257
+msgid "The operation was cancelled"
+msgstr "The operation was cancelled"
+
+#: ../gkr/seahorse-gkr-operation.c:57
 msgid "Access to the key ring was denied"
 msgstr "Access to the key ring was denied"
 
-#: ../gkr/seahorse-gkr-operation.c:171
+#: ../gkr/seahorse-gkr-operation.c:60
 msgid "The gnome-keyring daemon is not running"
 msgstr "The gnome-keyring daemon is not running"
 
-#: ../gkr/seahorse-gkr-operation.c:174
+#: ../gkr/seahorse-gkr-operation.c:63
 msgid "The key ring has already been unlocked"
 msgstr "The key ring has already been unlocked"
 
-#: ../gkr/seahorse-gkr-operation.c:177
+#: ../gkr/seahorse-gkr-operation.c:66
 msgid "No such key ring exists"
 msgstr "No such key ring exists"
 
-#: ../gkr/seahorse-gkr-operation.c:180
+#: ../gkr/seahorse-gkr-operation.c:69
 msgid "Couldn't communicate with key ring daemon"
 msgstr "Couldn't communicate with key ring daemon"
 
-#: ../gkr/seahorse-gkr-operation.c:183
+#: ../gkr/seahorse-gkr-operation.c:72
 msgid "The item already exists"
 msgstr "The item already exists"
 
-#: ../gkr/seahorse-gkr-operation.c:189
+#: ../gkr/seahorse-gkr-operation.c:78
 msgid "Internal error accessing gnome-keyring"
 msgstr "Internal error accessing gnome-keyring"
 
-#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264
-msgid "Saving item..."
-msgstr "Saving itemâ"
-
-#: ../gkr/seahorse-gkr-operation.c:300
-msgid "Deleting item..."
-msgstr "Deleting itemâ"
-
-#: ../gkr/seahorse-gkr-operation.c:325
-msgid "Deleting keyring..."
-msgstr "Deleting keyringâ"
-
-#: ../gkr/seahorse-gkr-source.c:234
-msgid "Listing password keyrings"
-msgstr "Listing password keyrings"
-
-#: ../libcryptui/cryptui.c:272
-msgid ""
-"No encryption keys were found with which to perform the operation you "
-"requested.  The program <b>Passwords and Encryption Keys</b> will now be "
-"started so that you may either create a key or import one."
-msgstr ""
-"No encryption keys were found with which to perform the operation you "
-"requested.  The program <b>Passwords and Encryption Keys</b> will now be "
-"started so that you may either create a key or import one."
-
-#: ../libcryptui/cryptui-key-chooser.c:174
-#: ../libcryptui/cryptui-key-chooser.c:179
-msgid "All Keys"
-msgstr "All Keys"
-
-#: ../libcryptui/cryptui-key-chooser.c:175
-#: ../libcryptui/cryptui-key-chooser.c:180
-msgid "Selected Recipients"
-msgstr "Selected Recipients"
-
-#: ../libcryptui/cryptui-key-chooser.c:176
-#: ../libcryptui/cryptui-key-chooser.c:181
-msgid "Search Results"
-msgstr "Search Results"
-
-#. Filter Label
-#: ../libcryptui/cryptui-key-chooser.c:192
-msgid "Search _for:"
-msgstr "Search _for:"
-
-#: ../libcryptui/cryptui-key-chooser.c:250
-msgid "None (Don't Sign)"
-msgstr "None (Don't Sign)"
-
-#: ../libcryptui/cryptui-key-chooser.c:263
-#, c-format
-msgid "Sign this message as %s"
-msgstr "Sign this message as %s"
-
-#. Sign Label
-#: ../libcryptui/cryptui-key-chooser.c:285
-msgid "_Sign message as:"
-msgstr "_Sign message as:"
-
-#. TODO: Icons
-#. The name column
-#: ../libcryptui/cryptui-key-list.c:140
-#: ../pgp/seahorse-pgp-key-properties.c:839
-#: ../src/seahorse-key-manager-store.c:865
-msgid "Name"
-msgstr "Name"
-
-#. The keyid column
-#: ../libcryptui/cryptui-key-list.c:145
-#: ../pgp/seahorse-pgp-key-properties.c:1745
-#: ../src/seahorse-key-manager-store.c:877
-msgid "Key ID"
-msgstr "Key ID"
-
-#: ../libegg/egg-datetime.c:325
+#: ../libegg/egg-datetime.c:317
 msgid "Display flags"
 msgstr "Display flags"
 
-#: ../libegg/egg-datetime.c:326
+#: ../libegg/egg-datetime.c:318
 msgid "Displayed date and/or time properties"
 msgstr "Displayed date and/or time properties"
 
-#: ../libegg/egg-datetime.c:331
+#: ../libegg/egg-datetime.c:323
 msgid "Lazy mode"
 msgstr "Lazy mode"
 
-#: ../libegg/egg-datetime.c:332
+#: ../libegg/egg-datetime.c:324
 msgid "Lazy mode doesn't normalize entered date and time values"
 msgstr "Lazy mode doesn't normalise entered date and time values"
 
-#: ../libegg/egg-datetime.c:337
+#: ../libegg/egg-datetime.c:329
 msgid "Year"
 msgstr "Year"
 
-#: ../libegg/egg-datetime.c:338
+#: ../libegg/egg-datetime.c:330
 msgid "Displayed year"
 msgstr "Displayed year"
 
-#: ../libegg/egg-datetime.c:343
+#: ../libegg/egg-datetime.c:335
 msgid "Month"
 msgstr "Month"
 
-#: ../libegg/egg-datetime.c:344
+#: ../libegg/egg-datetime.c:336
 msgid "Displayed month"
 msgstr "Displayed month"
 
-#: ../libegg/egg-datetime.c:349
+#: ../libegg/egg-datetime.c:341
 msgid "Day"
 msgstr "Day"
 
-#: ../libegg/egg-datetime.c:350
+#: ../libegg/egg-datetime.c:342
 msgid "Displayed day of month"
 msgstr "Displayed day of month"
 
-#: ../libegg/egg-datetime.c:355
+#: ../libegg/egg-datetime.c:347
 msgid "Hour"
 msgstr "Hour"
 
-#: ../libegg/egg-datetime.c:356
+#: ../libegg/egg-datetime.c:348
 msgid "Displayed hour"
 msgstr "Displayed hour"
 
-#: ../libegg/egg-datetime.c:361
+#: ../libegg/egg-datetime.c:353
 msgid "Minute"
 msgstr "Minute"
 
-#: ../libegg/egg-datetime.c:362
+#: ../libegg/egg-datetime.c:354
 msgid "Displayed minute"
 msgstr "Displayed minute"
 
-#: ../libegg/egg-datetime.c:367
+#: ../libegg/egg-datetime.c:359
 msgid "Second"
 msgstr "Second"
 
-#: ../libegg/egg-datetime.c:368
+#: ../libegg/egg-datetime.c:360
 msgid "Displayed second"
 msgstr "Displayed second"
 
-#: ../libegg/egg-datetime.c:373
+#: ../libegg/egg-datetime.c:365
 msgid "Lower limit year"
 msgstr "Lower limit year"
 
-#: ../libegg/egg-datetime.c:374
+#: ../libegg/egg-datetime.c:366
 msgid "Year part of the lower date limit"
 msgstr "Year part of the lower date limit"
 
-#: ../libegg/egg-datetime.c:379
+#: ../libegg/egg-datetime.c:371
 msgid "Upper limit year"
 msgstr "Upper limit year"
 
-#: ../libegg/egg-datetime.c:380
+#: ../libegg/egg-datetime.c:372
 msgid "Year part of the upper date limit"
 msgstr "Year part of the upper date limit"
 
-#: ../libegg/egg-datetime.c:385
+#: ../libegg/egg-datetime.c:377
 msgid "Lower limit month"
 msgstr "Lower limit month"
 
-#: ../libegg/egg-datetime.c:386
+#: ../libegg/egg-datetime.c:378
 msgid "Month part of the lower date limit"
 msgstr "Month part of the lower date limit"
 
-#: ../libegg/egg-datetime.c:391
+#: ../libegg/egg-datetime.c:383
 msgid "Upper limit month"
 msgstr "Upper limit month"
 
-#: ../libegg/egg-datetime.c:392
+#: ../libegg/egg-datetime.c:384
 msgid "Month part of the upper date limit"
 msgstr "Month part of the upper date limit"
 
-#: ../libegg/egg-datetime.c:397
+#: ../libegg/egg-datetime.c:389
 msgid "Lower limit day"
 msgstr "Lower limit day"
 
-#: ../libegg/egg-datetime.c:398
+#: ../libegg/egg-datetime.c:390
 msgid "Day of month part of the lower date limit"
 msgstr "Day of month part of the lower date limit"
 
-#: ../libegg/egg-datetime.c:403
+#: ../libegg/egg-datetime.c:395
 msgid "Upper limit day"
 msgstr "Upper limit day"
 
-#: ../libegg/egg-datetime.c:404
+#: ../libegg/egg-datetime.c:396
 msgid "Day of month part of the upper date limit"
 msgstr "Day of month part of the upper date limit"
 
-#: ../libegg/egg-datetime.c:409
+#: ../libegg/egg-datetime.c:401
 msgid "Lower limit hour"
 msgstr "Lower limit hour"
 
-#: ../libegg/egg-datetime.c:410
+#: ../libegg/egg-datetime.c:402
 msgid "Hour part of the lower time limit"
 msgstr "Hour part of the lower time limit"
 
-#: ../libegg/egg-datetime.c:415
+#: ../libegg/egg-datetime.c:407
 msgid "Upper limit hour"
 msgstr "Upper limit hour"
 
-#: ../libegg/egg-datetime.c:416
+#: ../libegg/egg-datetime.c:408
 msgid "Hour part of the upper time limit"
 msgstr "Hour part of the upper time limit"
 
-#: ../libegg/egg-datetime.c:421
+#: ../libegg/egg-datetime.c:413
 msgid "Lower limit minute"
 msgstr "Lower limit minute"
 
-#: ../libegg/egg-datetime.c:422
+#: ../libegg/egg-datetime.c:414
 msgid "Minute part of the lower time limit"
 msgstr "Minute part of the lower time limit"
 
-#: ../libegg/egg-datetime.c:427
+#: ../libegg/egg-datetime.c:419
 msgid "Upper limit minute"
 msgstr "Upper limit minute"
 
-#: ../libegg/egg-datetime.c:428
+#: ../libegg/egg-datetime.c:420
 msgid "Minute part of the upper time limit"
 msgstr "Minute part of the upper time limit"
 
-#: ../libegg/egg-datetime.c:433
+#: ../libegg/egg-datetime.c:425
 msgid "Lower limit second"
 msgstr "Lower limit second"
 
-#: ../libegg/egg-datetime.c:434
+#: ../libegg/egg-datetime.c:426
 msgid "Second part of the lower time limit"
 msgstr "Second part of the lower time limit"
 
-#: ../libegg/egg-datetime.c:439
+#: ../libegg/egg-datetime.c:431
 msgid "Upper limit second"
 msgstr "Upper limit second"
 
-#: ../libegg/egg-datetime.c:440
+#: ../libegg/egg-datetime.c:432
 msgid "Second part of the upper time limit"
 msgstr "Second part of the upper time limit"
 
@@ -923,159 +499,96 @@ msgstr "Second part of the upper time limit"
 #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1
 #. * or calendar:week_start:0 it will not work.
 #.
-#: ../libegg/egg-datetime.c:482
+#: ../libegg/egg-datetime.c:474
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
-#: ../libegg/egg-datetime.c:504
+#: ../libegg/egg-datetime.c:496
 msgid "Date"
 msgstr "Date"
 
-#: ../libegg/egg-datetime.c:504
+#: ../libegg/egg-datetime.c:496
 msgid "Enter the date directly"
 msgstr "Enter the date directly"
 
-#: ../libegg/egg-datetime.c:511
+#: ../libegg/egg-datetime.c:503
 msgid "Select Date"
 msgstr "Select Date"
 
-#: ../libegg/egg-datetime.c:511
+#: ../libegg/egg-datetime.c:503
 msgid "Select the date from a calendar"
 msgstr "Select the date from a calendar"
 
-#: ../libegg/egg-datetime.c:529 ../libegg/egg-datetime.c:2213
+#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199
 msgid "Time"
 msgstr "Time"
 
-#: ../libegg/egg-datetime.c:529
+#: ../libegg/egg-datetime.c:521
 msgid "Enter the time directly"
 msgstr "Enter the time directly"
 
-#: ../libegg/egg-datetime.c:536
+#: ../libegg/egg-datetime.c:528
 msgid "Select Time"
 msgstr "Select Time"
 
-#: ../libegg/egg-datetime.c:536
+#: ../libegg/egg-datetime.c:528
 msgid "Select the time from a list"
 msgstr "Select the time from a list"
 
 #. Translators: set this to anything else if you want to use a
 #. * 24 hour clock.
 #.
-#: ../libegg/egg-datetime.c:810
+#: ../libegg/egg-datetime.c:793
 msgid "24hr: no"
 msgstr "24hr: no"
 
-#: ../libegg/egg-datetime.c:814 ../libegg/egg-datetime.c:1274
-#: ../libegg/egg-datetime.c:1278
+#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260
+#: ../libegg/egg-datetime.c:1264
 msgid "AM"
 msgstr "AM"
 
-#: ../libegg/egg-datetime.c:816 ../libegg/egg-datetime.c:1275
-#: ../libegg/egg-datetime.c:1282
+#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261
+#: ../libegg/egg-datetime.c:1268
 msgid "PM"
 msgstr "PM"
 
 #. Translators: This is hh:mm:ss AM/PM.
-#: ../libegg/egg-datetime.c:824
+#: ../libegg/egg-datetime.c:807
 #, c-format
 msgid "%02d:%02d:%02d %s"
 msgstr "%02d:%02d:%02d %s"
 
 #. Translators: This is hh:mm AM/PM.
-#: ../libegg/egg-datetime.c:827
+#: ../libegg/egg-datetime.c:810
 #, c-format
 msgid "%02d:%02d %s"
 msgstr "%02d:%02d %s"
 
 #. Translators: This is hh:mm:ss.
-#: ../libegg/egg-datetime.c:831
+#: ../libegg/egg-datetime.c:814
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
 #. Translators: This is hh:mm.
-#: ../libegg/egg-datetime.c:834
+#: ../libegg/egg-datetime.c:817
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
 #. TODO: should handle other display modes as well...
 #. Translators: This is YYYY-MM-DD
-#: ../libegg/egg-datetime.c:1190
+#: ../libegg/egg-datetime.c:1176
 #, c-format
 msgid "%04d-%02d-%02d"
 msgstr "%04d-%02d-%02d"
 
 #. Translators: This is hh:mm:ss.
-#: ../libegg/egg-datetime.c:1255
+#: ../libegg/egg-datetime.c:1241
 #, c-format
 msgid "%u:%u:%u"
 msgstr "%u:%u:%u"
 
-#: ../libegg/eggdesktopfile.c:165
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "File is not a valid .desktop file"
-
-#: ../libegg/eggdesktopfile.c:188
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "Unrecognised desktop file Version '%s'"
-
-#: ../libegg/eggdesktopfile.c:968
-#, c-format
-msgid "Starting %s"
-msgstr "Starting %s"
-
-#: ../libegg/eggdesktopfile.c:1110
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "Application does not accept documents on the command line"
-
-#: ../libegg/eggdesktopfile.c:1178
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "Unrecognised launch option: %d"
-
-#: ../libegg/eggdesktopfile.c:1383
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Can't pass document URIs to a 'Type=Link' desktop entry"
-
-#: ../libegg/eggdesktopfile.c:1404
-#, c-format
-msgid "Not a launchable item"
-msgstr "Not a launchable item"
-
-#: ../libegg/eggsmclient.c:225
-msgid "Disable connection to session manager"
-msgstr "Disable connection to session manager"
-
-#: ../libegg/eggsmclient.c:228
-msgid "Specify file containing saved configuration"
-msgstr "Specify file containing saved configuration"
-
-#: ../libegg/eggsmclient.c:228
-msgid "FILE"
-msgstr "FILE"
-
-#: ../libegg/eggsmclient.c:231
-msgid "Specify session management ID"
-msgstr "Specify session management ID"
-
-#: ../libegg/eggsmclient.c:231 ../pgp/seahorse-pgp-key-properties.c:1314
-msgid "ID"
-msgstr "ID"
-
-#: ../libegg/eggsmclient.c:252
-msgid "Session management options:"
-msgstr "Session management options:"
-
-#: ../libegg/eggsmclient.c:253
-msgid "Show session management options"
-msgstr "Show session management options"
-
 #: ../libseahorse/seahorse-add-keyserver.xml.h:1
 msgid ":"
 msgstr ":"
@@ -1100,74 +613,25 @@ msgstr "The port to access the server on."
 msgid "initial temporary item"
 msgstr "initial temporary item"
 
-#: ../libseahorse/seahorse-notification.c:576
-#: ../libseahorse/seahorse-notification.c:604
-msgid "Key Imported"
-msgid_plural "Keys Imported"
-msgstr[0] "Key Imported"
-msgstr[1] "Keys Imported"
-
-#: ../libseahorse/seahorse-notification.c:580
-#: ../libseahorse/seahorse-notification.c:603
-#, c-format
-msgid "Imported %i key"
-msgid_plural "Imported %i keys"
-msgstr[0] "Imported %i key"
-msgstr[1] "Imported %i keys"
-
-#: ../libseahorse/seahorse-notification.c:582
-#, c-format
-msgid "Imported a key for"
-msgid_plural "Imported keys for"
-msgstr[0] "Imported a key for"
-msgstr[1] "Imported keys for"
-
-#: ../libseahorse/seahorse-notify.xml.h:1
-msgid "Notification Messages"
-msgstr "Notification Messages"
-
-#: ../libseahorse/seahorse-object.c:317
-msgid "Symmetric Key"
-msgstr "Symmetric Key"
-
-#: ../libseahorse/seahorse-object.c:320
-msgid "Public Key"
-msgstr "Public Key"
-
-#: ../libseahorse/seahorse-object.c:323
-msgid "Private Key"
-msgstr "Private Key"
-
-#: ../libseahorse/seahorse-object.c:326
-msgid "Credentials"
-msgstr "Credentials"
-
-#.
-#. * Translators: "This object is a means of storing items such as
-#. * name, email address, etc. that make up one's digital identity.
-#.
-#: ../libseahorse/seahorse-object.c:333
-msgid "Identity"
-msgstr "Identity"
-
-#: ../libseahorse/seahorse-passphrase.c:200
+#: ../libseahorse/seahorse-passphrase.c:178
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../libseahorse/seahorse-passphrase.c:203
-#: ../ssh/seahorse-ssh-operation.c:480
+#: ../libseahorse/seahorse-passphrase.c:181
+#: ../ssh/seahorse-ssh-operation.c:207
 msgid "Password:"
 msgstr "Password:"
 
-#: ../libseahorse/seahorse-passphrase.c:269
+#. The second and main entry
+#: ../libseahorse/seahorse-passphrase.c:244
 msgid "Confirm:"
 msgstr "Confirm:"
 
-#: ../libseahorse/seahorse-prefs.c:62
+#: ../libseahorse/seahorse-prefs.c:68
 msgid "Not a valid Key Server address."
 msgstr "Not a valid Key Server address."
 
-#: ../libseahorse/seahorse-prefs.c:63
+#: ../libseahorse/seahorse-prefs.c:69
 msgid ""
 "For help contact your system adminstrator or the administrator of the key "
 "server."
@@ -1175,15 +639,15 @@ msgstr ""
 "For help contact your system adminstrator or the administrator of the key "
 "server."
 
-#: ../libseahorse/seahorse-prefs.c:172
+#: ../libseahorse/seahorse-prefs.c:183
 msgid "URL"
 msgstr "URL"
 
-#: ../libseahorse/seahorse-prefs.c:352
+#: ../libseahorse/seahorse-prefs.c:348
 msgid "Custom"
 msgstr "Custom"
 
-#: ../libseahorse/seahorse-prefs.c:425
+#: ../libseahorse/seahorse-prefs.c:406
 msgid "None: Don't publish keys"
 msgstr "None: Don't publish keys"
 
@@ -1211,54 +675,54 @@ msgstr "_Find keys via:"
 msgid "_Publish keys to:"
 msgstr "_Publish keys to:"
 
-#: ../libseahorse/seahorse-progress.xml.h:1
-msgid "Progress Title"
-msgstr "Progress Title"
+#: ../libseahorse/seahorse-transfer.c:178
+msgid "Retrieving data"
+msgstr "Retrieving data"
 
-#: ../libseahorse/seahorse-unknown.c:67
+#: ../libseahorse/seahorse-transfer.c:178
+msgid "Exporting data"
+msgstr "Exporting data"
+
+#: ../libseahorse/seahorse-transfer.c:182
+msgid "Importing data"
+msgstr "Importing data"
+
+#: ../libseahorse/seahorse-transfer.c:182
+msgid "Sending data"
+msgstr "Sending data"
+
+#: ../libseahorse/seahorse-unknown.c:59
 msgid "Unavailable"
 msgstr "Unavailable"
 
-#: ../libseahorse/seahorse-util.c:240
+#: ../libseahorse/seahorse-util.c:259
 msgid "%Y-%m-%d"
 msgstr "%Y-%m-%d"
 
-#: ../libseahorse/seahorse-util.c:516
+#: ../libseahorse/seahorse-util.c:444
 msgid "Key Data"
 msgstr "Key Data"
 
-#: ../libseahorse/seahorse-util.c:518
+#: ../libseahorse/seahorse-util.c:446
 msgid "Multiple Keys"
 msgstr "Multiple Keys"
 
-#: ../libseahorse/seahorse-util.c:774
-msgid "Couldn't run file-roller"
-msgstr "Couldn't run file-roller"
-
-#: ../libseahorse/seahorse-util.c:780
-msgid "Couldn't package files"
-msgstr "Couldn't package files"
-
-#: ../libseahorse/seahorse-util.c:781
-msgid "The file-roller process did not complete successfully"
-msgstr "The file-roller process did not complete successfully"
-
 #. Filter for PGP keys. We also include *.asc, as in many
 #. cases that extension is associated with text/plain
-#: ../libseahorse/seahorse-util.c:957
+#: ../libseahorse/seahorse-util.c:734
 msgid "All key files"
 msgstr "All key files"
 
-#: ../libseahorse/seahorse-util.c:968 ../libseahorse/seahorse-util.c:1016
+#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793
 #: ../pgp/seahorse-gpgme-photos.c:242
 msgid "All files"
 msgstr "All files"
 
-#: ../libseahorse/seahorse-util.c:1009
+#: ../libseahorse/seahorse-util.c:786
 msgid "Archive files"
 msgstr "Archive files"
 
-#: ../libseahorse/seahorse-util.c:1079
+#: ../libseahorse/seahorse-util.c:856
 msgid ""
 "<b>A file already exists with this name.</b>\n"
 "\n"
@@ -1268,52 +732,52 @@ msgstr ""
 "\n"
 "Do you want to replace it with a new file?"
 
-#: ../libseahorse/seahorse-util.c:1082
+#: ../libseahorse/seahorse-util.c:859
 msgid "_Replace"
 msgstr "_Replace"
 
 #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197
-#: ../pgp/seahorse-pgp-key-properties.c:1133
+#: ../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 "Unknown"
 
 #: ../libseahorse/seahorse-validity.c:42
-#: ../pgp/seahorse-pgp-key-properties.c:1139
+#: ../pgp/seahorse-pgp-key-properties.c:1279
 msgctxt "Validity"
 msgid "Never"
 msgstr "Never"
 
 #: ../libseahorse/seahorse-validity.c:44
-#: ../pgp/seahorse-pgp-key-properties.c:1146
+#: ../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:1152
+#: ../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:1158
+#: ../pgp/seahorse-pgp-key-properties.c:1298
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:45
 msgid "Ultimate"
 msgstr "Ultimate"
 
 #: ../libseahorse/seahorse-validity.c:50
-#: ../pgp/seahorse-pgp-key-properties.c:1351
+#: ../pgp/seahorse-pgp-key-properties.c:1491
 msgid "Disabled"
 msgstr "Disabled"
 
 #: ../libseahorse/seahorse-validity.c:52
-#: ../pgp/seahorse-pgp-key-properties.c:1347
+#: ../pgp/seahorse-pgp-key-properties.c:1487
 msgid "Revoked"
 msgstr "Revoked"
 
-#: ../libseahorse/seahorse-widget.c:480
+#: ../libseahorse/seahorse-widget.c:461
 #, c-format
 msgid "Could not display help: %s"
 msgstr "Could not display help: %s"
@@ -1390,102 +854,98 @@ msgstr "Revoke key"
 msgid "_Never expires"
 msgstr "_Never expires"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:147
+#: ../pgp/seahorse-gpgme-add-subkey.c:162
 msgid "Couldn't add subkey"
 msgstr "Couldn't add subkey"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:166
+#: ../pgp/seahorse-gpgme-add-subkey.c:181
 #, c-format
 msgid "Add subkey to %s"
 msgstr "Add subkey to %s"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:118
+#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130
 msgid "DSA (sign only)"
 msgstr "DSA (sign only)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:190
+#: ../pgp/seahorse-gpgme-add-subkey.c:205
 msgid "ElGamal (encrypt only)"
 msgstr "ElGamal (encrypt only)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:119
+#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131
 msgid "RSA (sign only)"
 msgstr "RSA (sign only)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:202
+#: ../pgp/seahorse-gpgme-add-subkey.c:217
 msgid "RSA (encrypt only)"
 msgstr "RSA (encrypt only)"
 
-#: ../pgp/seahorse-gpgme-add-uid.c:85
+#: ../pgp/seahorse-gpgme-add-uid.c:100
 msgid "Couldn't add user id"
 msgstr "Couldn't add user id"
 
-#: ../pgp/seahorse-gpgme-add-uid.c:107
+#: ../pgp/seahorse-gpgme-add-uid.c:122
 #, c-format
 msgid "Add user ID to %s"
 msgstr "Add user ID to %s"
 
-#: ../pgp/seahorse-gpgme.c:72
+#: ../pgp/seahorse-gpgme.c:69
 msgid "Decryption failed. You probably do not have the decryption key."
 msgstr "Decryption failed. You probably do not have the decryption key."
 
-#: ../pgp/seahorse-gpgme-expires.c:58
+#: ../pgp/seahorse-gpgme-expires.c:65
 msgid "Invalid expiry date"
 msgstr "Invalid expiry date"
 
-#: ../pgp/seahorse-gpgme-expires.c:59
+#: ../pgp/seahorse-gpgme-expires.c:66
 msgid "The expiry date must be in the future"
 msgstr "The expiry date must be in the future"
 
-#: ../pgp/seahorse-gpgme-expires.c:72
+#: ../pgp/seahorse-gpgme-expires.c:79
 msgid "Couldn't change expiry date"
 msgstr "Couldn't change expiry date"
 
-#: ../pgp/seahorse-gpgme-expires.c:131
+#: ../pgp/seahorse-gpgme-expires.c:140
 #, c-format
 msgid "Expiry: %s"
 msgstr "Expiry: %s"
 
-#: ../pgp/seahorse-gpgme-generate.c:79
+#: ../pgp/seahorse-gpgme-generate.c:91
 msgid "PGP Key"
 msgstr "PGP Key"
 
-#: ../pgp/seahorse-gpgme-generate.c:80
+#: ../pgp/seahorse-gpgme-generate.c:92
 msgid "Used to encrypt email and files"
 msgstr "Used to encrypt e-mail and files"
 
-#: ../pgp/seahorse-gpgme-generate.c:116 ../ssh/seahorse-ssh-generate.xml.h:9
+#: ../pgp/seahorse-gpgme-generate.c:128 ../ssh/seahorse-ssh-generate.xml.h:9
 msgid "RSA"
 msgstr "RSA"
 
-#: ../pgp/seahorse-gpgme-generate.c:117
+#: ../pgp/seahorse-gpgme-generate.c:129
 msgid "DSA Elgamal"
 msgstr "DSA Elgamal"
 
-#: ../pgp/seahorse-gpgme-generate.c:135
+#: ../pgp/seahorse-gpgme-generate.c:178
 msgid "Couldn't generate PGP key"
 msgstr "Couldn't generate PGP key"
 
-#: ../pgp/seahorse-gpgme-generate.c:195
+#: ../pgp/seahorse-gpgme-generate.c:209
 msgid "Passphrase for New PGP Key"
 msgstr "Passphrase for New PGP Key"
 
-#: ../pgp/seahorse-gpgme-generate.c:196
+#: ../pgp/seahorse-gpgme-generate.c:210
 msgid "Enter the passphrase for your new key twice."
 msgstr "Enter the passphrase for your new key twice."
 
-#: ../pgp/seahorse-gpgme-generate.c:205
-msgid "Couldn't generate key"
-msgstr "Couldn't generate key"
-
-#: ../pgp/seahorse-gpgme-generate.c:207
+#: ../pgp/seahorse-gpgme-generate.c:219
 msgid "Generating key"
 msgstr "Generating key"
 
-#: ../pgp/seahorse-gpgme-key-op.c:301
+#: ../pgp/seahorse-gpgme-key-op.c:370
 msgid "Wrong password"
 msgstr "Wrong password"
 
-#: ../pgp/seahorse-gpgme-key-op.c:301
+#: ../pgp/seahorse-gpgme-key-op.c:370
 msgid "This was the third time you entered a wrong password. Please try again."
 msgstr ""
 "This was the third time you entered a wrong password. Please try again."
@@ -1528,64 +988,68 @@ msgstr "All JPEG files"
 msgid "Choose Photo to Add to Key"
 msgstr "Choose Photo to Add to Key"
 
-#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294
+#: ../pgp/seahorse-gpgme-photos.c:278
+msgid "Couldn't prepare photo"
+msgstr "Couldn't prepare photo"
+
+#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292
 msgid "Couldn't add photo"
 msgstr "Couldn't add photo"
 
-#: ../pgp/seahorse-gpgme-photos.c:291
+#: ../pgp/seahorse-gpgme-photos.c:289
 msgid "The file could not be loaded. It may be in an invalid format"
 msgstr "The file could not be loaded. It may be in an invalid format"
 
-#: ../pgp/seahorse-gpgme-photos.c:320
+#: ../pgp/seahorse-gpgme-photos.c:318
 msgid "Are you sure you want to remove the current photo from your key?"
 msgstr "Are you sure you want to remove the current photo from your key?"
 
-#: ../pgp/seahorse-gpgme-photos.c:333
+#: ../pgp/seahorse-gpgme-photos.c:331
 msgid "Couldn't delete photo"
 msgstr "Couldn't delete photo"
 
-#: ../pgp/seahorse-gpgme-revoke.c:70
+#: ../pgp/seahorse-gpgme-revoke.c:75
 msgid "Couldn't revoke subkey"
 msgstr "Couldn't revoke subkey"
 
-#: ../pgp/seahorse-gpgme-revoke.c:91
+#: ../pgp/seahorse-gpgme-revoke.c:96
 #, c-format
 msgid "Revoke: %s"
 msgstr "Revoke: %s"
 
-#: ../pgp/seahorse-gpgme-revoke.c:102
+#: ../pgp/seahorse-gpgme-revoke.c:107
 msgid "No reason"
 msgstr "No reason"
 
-#: ../pgp/seahorse-gpgme-revoke.c:103
+#: ../pgp/seahorse-gpgme-revoke.c:108
 msgid "No reason for revoking key"
 msgstr "No reason for revoking key"
 
-#: ../pgp/seahorse-gpgme-revoke.c:109
+#: ../pgp/seahorse-gpgme-revoke.c:114
 msgid "Compromised"
 msgstr "Compromised"
 
-#: ../pgp/seahorse-gpgme-revoke.c:110
+#: ../pgp/seahorse-gpgme-revoke.c:115
 msgid "Key has been compromised"
 msgstr "Key has been compromised"
 
-#: ../pgp/seahorse-gpgme-revoke.c:116
+#: ../pgp/seahorse-gpgme-revoke.c:121
 msgid "Superseded"
 msgstr "Superseded"
 
-#: ../pgp/seahorse-gpgme-revoke.c:117
+#: ../pgp/seahorse-gpgme-revoke.c:122
 msgid "Key has been superseded"
 msgstr "Key has been superseded"
 
-#: ../pgp/seahorse-gpgme-revoke.c:123
+#: ../pgp/seahorse-gpgme-revoke.c:128
 msgid "Not Used"
 msgstr "Not Used"
 
-#: ../pgp/seahorse-gpgme-revoke.c:124
+#: ../pgp/seahorse-gpgme-revoke.c:129
 msgid "Key is no longer used"
 msgstr "Key is no longer used"
 
-#: ../pgp/seahorse-gpgme-revoke.c:161
+#: ../pgp/seahorse-gpgme-revoke.c:166
 #, c-format
 msgid ""
 "You are about to add %s as a revoker for %s. This operation cannot be "
@@ -1594,11 +1058,11 @@ msgstr ""
 "You are about to add %s as a revoker for %s. This operation cannot be "
 "undone! Are you sure you want to continue?"
 
-#: ../pgp/seahorse-gpgme-revoke.c:173
+#: ../pgp/seahorse-gpgme-revoke.c:178
 msgid "Couldn't add revoker"
 msgstr "Couldn't add revoker"
 
-#: ../pgp/seahorse-gpgme-sign.c:99
+#: ../pgp/seahorse-gpgme-sign.c:101
 #, c-format
 msgid ""
 "This key was already signed by\n"
@@ -1607,17 +1071,17 @@ msgstr ""
 "This key was already signed by\n"
 "\"%s\""
 
-#: ../pgp/seahorse-gpgme-sign.c:103
+#: ../pgp/seahorse-gpgme-sign.c:105
 msgid "Couldn't sign key"
 msgstr "Couldn't sign key"
 
 #. TODO: We should be giving an error message that allows them to
 #. generate or import a key
-#: ../pgp/seahorse-gpgme-sign.c:157 ../pgp/seahorse-signer.c:61
+#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61
 msgid "No keys usable for signing"
 msgstr "No keys usable for signing"
 
-#: ../pgp/seahorse-gpgme-sign.c:158
+#: ../pgp/seahorse-gpgme-sign.c:162
 msgid ""
 "You have no personal PGP keys that can be used to indicate your trust of "
 "this key."
@@ -1625,43 +1089,37 @@ msgstr ""
 "You have no personal PGP keys that can be used to indicate your trust of "
 "this key."
 
-#: ../pgp/seahorse-gpgme-source.c:102
+#: ../pgp/seahorse-gpgme-source.c:86
 #, c-format
 msgid "Wrong passphrase."
 msgstr "Wrong passphrase."
 
-#: ../pgp/seahorse-gpgme-source.c:106
+#: ../pgp/seahorse-gpgme-source.c:90
 #, c-format
 msgid "Enter new passphrase for '%s'"
 msgstr "Enter new passphrase for '%s'"
 
-#: ../pgp/seahorse-gpgme-source.c:108
+#: ../pgp/seahorse-gpgme-source.c:92
 #, c-format
 msgid "Enter passphrase for '%s'"
 msgstr "Enter passphrase for '%s'"
 
-#: ../pgp/seahorse-gpgme-source.c:111
-#: ../src/seahorse-change-passphrase.xml.h:4
+#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4
 msgid "Enter new passphrase"
 msgstr "Enter new passphrase"
 
-#: ../pgp/seahorse-gpgme-source.c:113
+#: ../pgp/seahorse-gpgme-source.c:97
 msgid "Enter passphrase"
 msgstr "Enter passphrase"
 
-#. TODO: We can use the GPGME progress to make this more accurate
-#: ../pgp/seahorse-gpgme-source.c:725
+#: ../pgp/seahorse-gpgme-source.c:328
 #, c-format
 msgid "Loaded %d key"
 msgid_plural "Loaded %d keys"
 msgstr[0] "Loaded %d key"
 msgstr[1] "Loaded %d keys"
 
-#: ../pgp/seahorse-gpgme-source.c:780
-msgid "Loading Keys..."
-msgstr "Loading Keysâ"
-
-#: ../pgp/seahorse-gpgme-source.c:823
+#: ../pgp/seahorse-gpgme-source.c:649
 msgid ""
 "Invalid key data (missing UIDs). This may be due to a computer with a date "
 "set in the future or a missing self-signature."
@@ -1669,121 +1127,88 @@ msgstr ""
 "Invalid key data (missing UIDs). This may be due to a computer with a date "
 "set in the future or a missing self-signature."
 
-#: ../pgp/seahorse-gpgme-source.c:913 ../src/seahorse-key-manager.c:544
-msgid "Importing Keys"
-msgstr "Importing Keys"
-
-#: ../pgp/seahorse-gpgme-source.c:949
-msgid "Exporting Keys"
-msgstr "Exporting Keys"
-
 #: ../pgp/seahorse-gpgme-subkey.c:199
 msgid "ElGamal"
 msgstr "ElGamal"
 
-#: ../pgp/seahorse-hkp-source.c:387
+#: ../pgp/seahorse-hkp-source.c:645
+msgid "HTTP Key Server"
+msgstr "HTTP Key Server"
+
+#: ../pgp/seahorse-hkp-source.c:680
 #, c-format
 msgid "Search was not specific enough. Server '%s' found too many keys."
 msgstr "Search was not specific enough. Server '%s' found too many keys."
 
-#: ../pgp/seahorse-hkp-source.c:389
+#: ../pgp/seahorse-hkp-source.c:683
 #, c-format
 msgid "Couldn't communicate with server '%s': %s"
 msgstr "Couldn't communicate with server '%s': %s"
 
-#: ../pgp/seahorse-hkp-source.c:671
-msgid "Searching for keys..."
-msgstr "Searching for keysâ"
-
-#: ../pgp/seahorse-hkp-source.c:759
-msgid "Uploading keys..."
-msgstr "Uploading keysâ"
-
-#: ../pgp/seahorse-hkp-source.c:857
-msgid "Retrieving keys..."
-msgstr "Retrieving keysâ"
-
-#: ../pgp/seahorse-hkp-source.c:987
+#: ../pgp/seahorse-ldap-source.c:440
 #, c-format
-msgid "Searching for keys on: %s"
-msgstr "Searching for keys on: %s"
+msgid "Couldn't communicate with '%s': %s"
+msgstr "Couldn't communicate with '%s': %s"
 
-#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start
-#: ../pgp/seahorse-hkp-source.c:1072 ../pgp/seahorse-hkp-source.c:1154
-#: ../pgp/seahorse-ldap-source.c:668
+#: ../pgp/seahorse-ldap-source.c:651
 #, c-format
 msgid "Connecting to: %s"
 msgstr "Connecting to: %s"
 
-#: ../pgp/seahorse-hkp-source.c:1184
-msgid "HTTP Key Server"
-msgstr "HTTP Key Server"
-
-#: ../pgp/seahorse-ldap-source.c:459
-#, c-format
-msgid "Couldn't communicate with '%s': %s"
-msgstr "Couldn't communicate with '%s': %s"
-
-#: ../pgp/seahorse-ldap-source.c:641
+#: ../pgp/seahorse-ldap-source.c:657
 #, c-format
 msgid "Couldn't resolve address: %s"
 msgstr "Couldn't resolve address: %s"
 
-#: ../pgp/seahorse-ldap-source.c:719
+#: ../pgp/seahorse-ldap-source.c:701
 #, c-format
 msgid "Resolving server address: %s"
 msgstr "Resolving server address: %s"
 
-#: ../pgp/seahorse-ldap-source.c:955
-#, c-format
-msgid "Searching for keys containing '%s'..."
-msgstr "Searching for keys containing '%s'â"
-
-#: ../pgp/seahorse-ldap-source.c:983
-#, c-format
-msgid "Searching for key id '%s'..."
-msgstr "Searching for key id '%s'â"
-
-#: ../pgp/seahorse-ldap-source.c:1089
-msgid "Retrieving remote keys..."
-msgstr "Retrieving remote keysâ"
-
-#: ../pgp/seahorse-ldap-source.c:1221
-msgid "Sending keys to key server..."
-msgstr "Sending keys to key serverâ"
-
-#: ../pgp/seahorse-ldap-source.c:1423
+#: ../pgp/seahorse-ldap-source.c:781
 msgid "LDAP Key Server"
 msgstr "LDAP Key Server"
 
-#: ../pgp/seahorse-pgp-commands.c:103
+#: ../pgp/seahorse-pgp-commands.c:104
 msgid "_Sign Key..."
 msgstr "_Sign Keyâ"
 
-#: ../pgp/seahorse-pgp-commands.c:103
+#: ../pgp/seahorse-pgp-commands.c:104
 msgid "Sign public key"
 msgstr "Sign public key"
 
-#: ../pgp/seahorse-pgp-commands.c:171
+#: ../pgp/seahorse-pgp-commands.c:174
 #, c-format
 msgid "Are you sure you want to permanently delete %s?"
 msgstr "Are you sure you want to permanently delete %s?"
 
-#: ../pgp/seahorse-pgp-commands.c:176
+#: ../pgp/seahorse-pgp-commands.c:179
 #, c-format
 msgid "Are you sure you want to permanently delete %d keys and identities?"
 msgstr "Are you sure you want to permanently delete %d keys and identities?"
 
-#: ../pgp/seahorse-pgp-commands.c:178
+#: ../pgp/seahorse-pgp-commands.c:181
 #, c-format
 msgid "Are you sure you want to permanently delete %d keys?"
 msgstr "Are you sure you want to permanently delete %d keys?"
 
-#: ../pgp/seahorse-pgp-commands.c:180
+#: ../pgp/seahorse-pgp-commands.c:183
 #, c-format
 msgid "Are you sure you want to permanently delete %d identities?"
 msgstr "Are you sure you want to permanently delete %d identities?"
 
+#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348
+msgid "Couldn't delete user ID"
+msgstr "Couldn't delete user ID"
+
+#: ../pgp/seahorse-pgp-commands.c:205
+msgid "Couldn't delete private key"
+msgstr "Couldn't delete private key"
+
+#: ../pgp/seahorse-pgp-commands.c:208
+msgid "Couldn't delete public key"
+msgstr "Couldn't delete public key"
+
 #: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1
 msgid "<b>_Advanced key options</b>"
 msgstr "<b>_Advanced key options</b>"
@@ -1828,122 +1253,122 @@ msgstr "New PGP Key"
 msgid "_Comment:"
 msgstr "_Comment:"
 
-#: ../pgp/seahorse-pgp-key.c:201
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38
-msgid "Private PGP Key"
-msgstr "Private PGP Key"
-
-#: ../pgp/seahorse-pgp-key.c:204
-#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34
-msgid "Public PGP Key"
-msgstr "Public PGP Key"
-
-#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1349
+#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489
 msgid "Expired"
 msgstr "Expired"
 
-#: ../pgp/seahorse-pgp-key-properties.c:224
+#: ../pgp/seahorse-pgp-key-properties.c:319
 msgid "Couldn't change primary user ID"
 msgstr "Couldn't change primary user ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:241
+#: ../pgp/seahorse-pgp-key-properties.c:338
 #, c-format
 msgid "Are you sure you want to permanently delete the '%s' user ID?"
 msgstr "Are you sure you want to permanently delete the '%s' user ID?"
 
-#: ../pgp/seahorse-pgp-key-properties.c:251
-msgid "Couldn't delete user ID"
-msgstr "Couldn't delete user ID"
-
-#: ../pgp/seahorse-pgp-key-properties.c:333
-#: ../pgp/seahorse-pgp-key-properties.c:1464
+#: ../pgp/seahorse-pgp-key-properties.c:433
+#: ../pgp/seahorse-pgp-key-properties.c:1604
 msgid "[Unknown]"
 msgstr "[Unknown]"
 
-#: ../pgp/seahorse-pgp-key-properties.c:426
-#: ../pgp/seahorse-pgp-key-properties.c:1742
+#: ../pgp/seahorse-pgp-key-properties.c:533
+#: ../pgp/seahorse-pgp-key-properties.c:1885
 msgid "Name/Email"
 msgstr "Name/E-mail"
 
-#: ../pgp/seahorse-pgp-key-properties.c:431
+#: ../pgp/seahorse-pgp-key-properties.c:538
 msgid "Signature ID"
 msgstr "Signature ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:552
+#: ../pgp/seahorse-pgp-key-properties.c:671
 msgid "Couldn't change primary photo"
 msgstr "Couldn't change primary photo"
 
-#: ../pgp/seahorse-pgp-key-properties.c:775
+#: ../pgp/seahorse-pgp-key-properties.c:903
 msgid "(unknown)"
 msgstr "(unknown)"
 
-#: ../pgp/seahorse-pgp-key-properties.c:778
+#: ../pgp/seahorse-pgp-key-properties.c:906
 #, c-format
 msgid "This key expired on: %s"
 msgstr "This key expired on: %s"
 
-#: ../pgp/seahorse-pgp-key-properties.c:946
+#: ../pgp/seahorse-pgp-key-properties.c:967
+#: ../src/seahorse-key-manager-store.c:802
+msgid "Name"
+msgstr "Name"
+
+#: ../pgp/seahorse-pgp-key-properties.c:1078
 #, c-format
 msgid "Are you sure you want to permanently delete subkey %d of %s?"
 msgstr "Are you sure you want to permanently delete subkey %d of %s?"
 
-#: ../pgp/seahorse-pgp-key-properties.c:955
+#: ../pgp/seahorse-pgp-key-properties.c:1087
 msgid "Couldn't delete subkey"
 msgstr "Couldn't delete subkey"
 
-#: ../pgp/seahorse-pgp-key-properties.c:991
-#: ../pgp/seahorse-pgp-key-properties.c:1427
+#: ../pgp/seahorse-pgp-key-properties.c:1127
+#: ../pgp/seahorse-pgp-key-properties.c:1567
 msgid "Unable to change trust"
 msgstr "Unable to change trust"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1006 ../src/seahorse-viewer.c:291
-#: ../ssh/seahorse-ssh-key-properties.c:168
+#: ../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 "Couldn't export key to \"%s\""
 
-#: ../pgp/seahorse-pgp-key-properties.c:1035
-#: ../ssh/seahorse-ssh-key-properties.c:193
+#: ../pgp/seahorse-pgp-key-properties.c:1172
+#: ../ssh/seahorse-ssh-key-properties.c:225
 msgid "Export Complete Key"
 msgstr "Export Complete Key"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1060
-#: ../ssh/seahorse-ssh-key-properties.c:215
+#: ../pgp/seahorse-pgp-key-properties.c:1197
+#: ../ssh/seahorse-ssh-key-properties.c:247
 msgid "Couldn't export key."
 msgstr "Couldn't export key."
 
-#: ../pgp/seahorse-pgp-key-properties.c:1267
-#: ../pgp/seahorse-pgp-key-properties.c:1356
+#: ../pgp/seahorse-pgp-key-properties.c:1407
+#: ../pgp/seahorse-pgp-key-properties.c:1496
 msgctxt "Expires"
 msgid "Never"
 msgstr "Never"
 
+#: ../pgp/seahorse-pgp-key-properties.c:1454
+msgid "ID"
+msgstr "ID"
+
 #. The key type column
-#: ../pgp/seahorse-pgp-key-properties.c:1317
-#: ../src/seahorse-key-manager-store.c:896
+#: ../pgp/seahorse-pgp-key-properties.c:1457
+#: ../src/seahorse-key-manager-store.c:833
 msgid "Type"
 msgstr "Type"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1320
+#: ../pgp/seahorse-pgp-key-properties.c:1460
 msgid "Created"
 msgstr "Created"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1323
+#: ../pgp/seahorse-pgp-key-properties.c:1463
 msgid "Expires"
 msgstr "Expires"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1326
+#: ../pgp/seahorse-pgp-key-properties.c:1466
 msgid "Status"
 msgstr "Status"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1329
+#: ../pgp/seahorse-pgp-key-properties.c:1469
 msgid "Strength"
 msgstr "Strength"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1353
+#: ../pgp/seahorse-pgp-key-properties.c:1493
 msgid "Good"
 msgstr "Good"
 
+#: ../pgp/seahorse-pgp-key-properties.c:1888
+#: ../src/seahorse-key-manager-store.c:814
+msgid "Key ID"
+msgstr "Key ID"
+
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:1
 msgid "<b>Actions</b>"
 msgstr "<b>Actions</b>"
@@ -2085,6 +1510,10 @@ msgstr "Owner"
 msgid "Primary"
 msgstr "Primary"
 
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38
+msgid "Private PGP Key"
+msgstr "Private PGP Key"
+
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39
 msgid "Remove this photo from this key"
 msgstr "Remove this photo from this key"
@@ -2179,9 +1608,13 @@ msgstr ""
 msgid "Marginally"
 msgstr "Marginally"
 
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34
+msgid "Public PGP Key"
+msgstr "Public PGP Key"
+
 #. Trust column
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37
-#: ../src/seahorse-key-manager-store.c:890
+#: ../src/seahorse-key-manager-store.c:827
 msgid "Trust"
 msgstr "Trust"
 
@@ -2333,18 +1766,26 @@ msgstr "_Sign message with key:"
 msgid "Certificate"
 msgstr "Certificate"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:108
+#: ../pkcs11/seahorse-pkcs11-commands.c:106
+msgid "Couldn't delete"
+msgstr "Couldn't delete"
+
+#: ../pkcs11/seahorse-pkcs11-commands.c:127
 #, c-format
 msgid "Are you sure you want to delete the certificate '%s'?"
 msgstr "Are you sure you want to delete the certificate '%s'?"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:111
+#: ../pkcs11/seahorse-pkcs11-commands.c:130
 #, c-format
 msgid "Are you sure you want to delete %d certificate?"
 msgid_plural "Are you sure you want to delete %d certificates?"
 msgstr[0] "Are you sure you want to delete %d certificate?"
 msgstr[1] "Are you sure you want to delete %d passwords?"
 
+#: ../pkcs11/seahorse-pkcs11-commands.c:143
+msgid "Deleting"
+msgstr "Deleting"
+
 #: ../src/seahorse-change-passphrase.xml.h:1
 msgid "Change Passphrase"
 msgstr "Change Passphrase"
@@ -2365,9 +1806,10 @@ msgstr "New _Passphrase:"
 msgid "Manage your passwords and encryption keys"
 msgstr "Manage your passwords and encryption keys"
 
-#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:862
-msgid "Passwords and Encryption Keys"
-msgstr "Passwords and Encryption Keys"
+#: ../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 "Passwords and Keys"
 
 #: ../src/seahorse-generate-select.xml.h:1
 msgid "<b>_Select the type of item to create:</b>"
@@ -2381,111 +1823,115 @@ msgstr "C_ontinue"
 msgid "Create New ..."
 msgstr "Create Newâ"
 
-#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108
+#: ../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] "Selected %d key"
 msgstr[1] "Selected %d keys"
 
-#: ../src/seahorse-key-manager.c:410 ../src/seahorse-key-manager.c:470
-#: ../src/seahorse-key-manager.c:533 ../src/seahorse-viewer.c:459
+#: ../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 "Couldn't import keys"
 
-#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:464
+#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455
 msgid "Imported keys"
 msgstr "Imported keys"
 
-#: ../src/seahorse-key-manager.c:464
+#: ../src/seahorse-key-manager.c:484
 msgid "Importing keys"
 msgstr "Importing keys"
 
-#: ../src/seahorse-key-manager.c:487 ../ssh/seahorse-ssh-operation.c:1017
+#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:1089
 msgid "Import Key"
 msgstr "Import Key"
 
-#: ../src/seahorse-key-manager.c:533
+#: ../src/seahorse-key-manager.c:550
 msgid "Unrecognized key type, or invalid data format"
 msgstr "Unrecognised key type, or invalid data format"
 
-#: ../src/seahorse-key-manager.c:731 ../src/seahorse-keyserver-results.c:245
+#: ../src/seahorse-key-manager.c:565
+msgid "Importing Keys"
+msgstr "Importing Keys"
+
+#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254
 msgid "_Remote"
 msgstr "_Remote"
 
-#: ../src/seahorse-key-manager.c:733
+#: ../src/seahorse-key-manager.c:739
 msgid "Close this program"
 msgstr "Close this program"
 
-#: ../src/seahorse-key-manager.c:734
+#: ../src/seahorse-key-manager.c:740
 msgid "_New..."
 msgstr "_Newâ"
 
-#: ../src/seahorse-key-manager.c:735
+#: ../src/seahorse-key-manager.c:741
 msgid "Create a new key or item"
 msgstr "Create a new key or item"
 
-#: ../src/seahorse-key-manager.c:736
+#: ../src/seahorse-key-manager.c:742
 msgid "_Import..."
 msgstr "_Importâ"
 
-#: ../src/seahorse-key-manager.c:737
+#: ../src/seahorse-key-manager.c:743
 msgid "Import from a file"
 msgstr "Import from a file"
 
-#: ../src/seahorse-key-manager.c:739
+#: ../src/seahorse-key-manager.c:745
 msgid "Import from the clipboard"
 msgstr "Import from the clipboard"
 
-#: ../src/seahorse-key-manager.c:744 ../src/seahorse-keyserver-results.c:255
+#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264
 msgid "_Find Remote Keys..."
 msgstr "_Find Remote Keysâ"
 
-#: ../src/seahorse-key-manager.c:745 ../src/seahorse-keyserver-results.c:256
+#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265
 msgid "Search for keys on a key server"
 msgstr "Search for keys on a key server"
 
-#: ../src/seahorse-key-manager.c:746
+#: ../src/seahorse-key-manager.c:752
 msgid "_Sync and Publish Keys..."
 msgstr "_Sync and Publish Keysâ"
 
-#: ../src/seahorse-key-manager.c:747
+#: ../src/seahorse-key-manager.c:753
 msgid "Publish and/or synchronize your keys with those online."
 msgstr "Publish and/or synchronise your keys with those online."
 
-#: ../src/seahorse-key-manager.c:752
+#: ../src/seahorse-key-manager.c:758
 msgid "T_ypes"
 msgstr "T_ypes"
 
-#: ../src/seahorse-key-manager.c:752
+#: ../src/seahorse-key-manager.c:758
 msgid "Show type column"
 msgstr "Show type column"
 
-#: ../src/seahorse-key-manager.c:754
+#: ../src/seahorse-key-manager.c:760
 msgid "_Expiry"
 msgstr "_Expiry"
 
-#: ../src/seahorse-key-manager.c:754
+#: ../src/seahorse-key-manager.c:760
 msgid "Show expiry column"
 msgstr "Show expiry column"
 
-#: ../src/seahorse-key-manager.c:756
+#: ../src/seahorse-key-manager.c:762
 msgid "_Trust"
 msgstr "_Trust"
 
-#: ../src/seahorse-key-manager.c:756
+#: ../src/seahorse-key-manager.c:762
 msgid "Show owner trust column"
 msgstr "Show owner trust column"
 
-#: ../src/seahorse-key-manager.c:758
+#: ../src/seahorse-key-manager.c:764
 msgid "_Validity"
 msgstr "_Validity"
 
-#: ../src/seahorse-key-manager.c:758
+#: ../src/seahorse-key-manager.c:764
 msgid "Show validity column"
 msgstr "Show validity column"
 
-#: ../src/seahorse-key-manager.c:931
+#: ../src/seahorse-key-manager.c:941
 msgid "Filter:"
 msgstr "Filter:"
 
@@ -2513,7 +1959,7 @@ msgstr "Other _Keys"
 msgid "To get started with encryption you will need keys."
 msgstr "To get started with encryption you will need keys."
 
-#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:523
+#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518
 msgid "_Import"
 msgstr "_Import"
 
@@ -2521,44 +1967,44 @@ msgstr "_Import"
 msgid "_Passwords"
 msgstr "_Passwords"
 
-#: ../src/seahorse-key-manager-store.c:685 ../src/seahorse-viewer.c:257
+#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263
 msgid "Couldn't export keys"
 msgstr "Couldn't export keys"
 
-#: ../src/seahorse-key-manager-store.c:883
+#: ../src/seahorse-key-manager-store.c:820
 msgid "Validity"
 msgstr "Validity"
 
 #. Expiry date column
-#: ../src/seahorse-key-manager-store.c:902
+#: ../src/seahorse-key-manager-store.c:839
 msgid "Expiration Date"
 msgstr "Expiration Date"
 
-#: ../src/seahorse-keyserver-results.c:247
+#: ../src/seahorse-keyserver-results.c:256
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../src/seahorse-keyserver-results.c:248
+#: ../src/seahorse-keyserver-results.c:257
 msgid "_Expand All"
 msgstr "_Expand All"
 
-#: ../src/seahorse-keyserver-results.c:249
+#: ../src/seahorse-keyserver-results.c:258
 msgid "Expand all listings"
 msgstr "Expand all listings"
 
-#: ../src/seahorse-keyserver-results.c:250
+#: ../src/seahorse-keyserver-results.c:259
 msgid "_Collapse All"
 msgstr "_Collapse All"
 
-#: ../src/seahorse-keyserver-results.c:251
+#: ../src/seahorse-keyserver-results.c:260
 msgid "Collapse all listings"
 msgstr "Collapse all listings"
 
-#: ../src/seahorse-keyserver-results.c:322
+#: ../src/seahorse-keyserver-results.c:331
 msgid "Remote Keys"
 msgstr "Remote Keys"
 
-#: ../src/seahorse-keyserver-results.c:324
+#: ../src/seahorse-keyserver-results.c:333
 #, c-format
 msgid "Remote Keys Containing '%s'"
 msgstr "Remote Keys Containing '%s'"
@@ -2595,28 +2041,23 @@ msgstr "_Search"
 msgid "_Search for keys containing: "
 msgstr "_Search for keys containing: "
 
-#: ../src/seahorse-keyserver-sync.c:45
+#: ../src/seahorse-keyserver-sync.c:58
 msgid "Couldn't publish keys to server"
 msgstr "Couldn't publish keys to server"
 
-#: ../src/seahorse-keyserver-sync.c:61
+#: ../src/seahorse-keyserver-sync.c:77
 #, c-format
 msgid "Couldn't retrieve keys from server: %s"
 msgstr "Couldn't retrieve keys from server: %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 key is selected for synchronising</b>"
 msgstr[1] "<b>%d keys are selected for synchronising</b>"
 
-#: ../src/seahorse-keyserver-sync.c:216
-msgid "Synchronizing keys"
-msgstr "Synchronising keys"
-
-#. Show the progress window if necessary
-#: ../src/seahorse-keyserver-sync.c:248
+#: ../src/seahorse-keyserver-sync.c:247
 msgid "Synchronizing keys..."
 msgstr "Synchronising keysâ"
 
@@ -2652,19 +2093,15 @@ msgstr "_Key Servers"
 msgid "_Sync"
 msgstr "_Sync"
 
-#: ../src/seahorse-main.c:62
+#: ../src/seahorse-main.c:60
 msgid "Version of this application"
 msgstr "Version of this application"
 
-#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:144
-msgid "Encryption Key Manager"
-msgstr "Encryption Key Manager"
-
-#: ../src/seahorse-viewer.c:120
+#: ../src/seahorse-viewer.c:123
 msgid "Contributions:"
 msgstr "Contributions:"
 
-#: ../src/seahorse-viewer.c:146
+#: ../src/seahorse-viewer.c:149
 msgid "translator-credits"
 msgstr ""
 "Abigail Brady <morwen evilmagi_c org>\n"
@@ -2674,111 +2111,103 @@ msgstr ""
 "Philip Withnall <philip tecnocode co uk>\n"
 "Bruce Cowan <bruce bcowan me uk>"
 
-#: ../src/seahorse-viewer.c:149
+#: ../src/seahorse-viewer.c:152
 msgid "Seahorse Project Homepage"
 msgstr "Seahorse Project Homepage"
 
 #. Top menu items
-#: ../src/seahorse-viewer.c:169
+#: ../src/seahorse-viewer.c:172
 msgid "_File"
 msgstr "_File"
 
-#: ../src/seahorse-viewer.c:170
+#: ../src/seahorse-viewer.c:173
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../src/seahorse-viewer.c:171
+#: ../src/seahorse-viewer.c:174
 msgid "_View"
 msgstr "_View"
 
-#: ../src/seahorse-viewer.c:172
+#: ../src/seahorse-viewer.c:175
 msgid "_Help"
 msgstr "_Help"
 
-#: ../src/seahorse-viewer.c:174
+#: ../src/seahorse-viewer.c:177
 msgid "Prefere_nces"
 msgstr "Prefere_nces"
 
-#: ../src/seahorse-viewer.c:175
+#: ../src/seahorse-viewer.c:178
 msgid "Change preferences for this program"
 msgstr "Change preferences for this program"
 
-#: ../src/seahorse-viewer.c:178
+#: ../src/seahorse-viewer.c:181
 msgid "About this program"
 msgstr "About this program"
 
-#: ../src/seahorse-viewer.c:179
+#: ../src/seahorse-viewer.c:182
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../src/seahorse-viewer.c:180
+#: ../src/seahorse-viewer.c:183
 msgid "Show Seahorse help"
 msgstr "Show Seahorse help"
 
-#: ../src/seahorse-viewer.c:277
+#: ../src/seahorse-viewer.c:284
 msgid "Export public key"
 msgstr "Export public key"
 
-#: ../src/seahorse-viewer.c:297
+#: ../src/seahorse-viewer.c:305
 msgid "Exporting keys"
 msgstr "Exporting keys"
 
-#: ../src/seahorse-viewer.c:322
+#: ../src/seahorse-viewer.c:334
 msgid "Couldn't retrieve data from key server"
 msgstr "Couldn't retrieve data from key server"
 
 #. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys"
-#: ../src/seahorse-viewer.c:341
+#: ../src/seahorse-viewer.c:346
 msgid "Copied keys"
 msgstr "Copied keys"
 
-#: ../src/seahorse-viewer.c:361
+#: ../src/seahorse-viewer.c:371
 msgid "Retrieving keys"
 msgstr "Retrieving keys"
 
-#: ../src/seahorse-viewer.c:376
-msgid "Couldn't delete."
-msgstr "Couldn't delete."
-
-#: ../src/seahorse-viewer.c:410
-msgid "Deleting..."
-msgstr "Deletingâ"
-
-#: ../src/seahorse-viewer.c:436
+#: ../src/seahorse-viewer.c:426
 #, c-format
 msgid "%s is a private key. Are you sure you want to proceed?"
 msgstr "%s is a private key. Are you sure you want to proceed?"
 
-#: ../src/seahorse-viewer.c:484
+#: ../src/seahorse-viewer.c:480
 msgid "Importing keys from key servers"
 msgstr "Importing keys from key servers"
 
-#: ../src/seahorse-viewer.c:510
+#: ../src/seahorse-viewer.c:505
 msgid "Show properties"
 msgstr "Show properties"
 
-#: ../src/seahorse-viewer.c:511
+#: ../src/seahorse-viewer.c:506
 msgctxt "This text refers to deleting an item from its type's backing store."
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../src/seahorse-viewer.c:512
+#: ../src/seahorse-viewer.c:507
 msgid "Delete selected items"
 msgstr "Delete selected items"
 
-#: ../src/seahorse-viewer.c:516
+#: ../src/seahorse-viewer.c:511
 msgid "E_xport..."
 msgstr "E_xportâ"
 
-#: ../src/seahorse-viewer.c:517
+#: ../src/seahorse-viewer.c:512
 msgid "Export to a file"
 msgstr "Export to a file"
 
-#: ../src/seahorse-viewer.c:519
+#: ../src/seahorse-viewer.c:514
 msgid "Copy to the clipboard"
 msgstr "Copy to the clipboard"
 
-#: ../src/seahorse-viewer.c:524
+#: ../src/seahorse-viewer.c:519
 msgid "Import selected keys to local key ring"
 msgstr "Import selected keys to local key ring"
 
@@ -2786,11 +2215,11 @@ msgstr "Import selected keys to local key ring"
 msgid "Enter your Secure Shell passphrase:"
 msgstr "Enter your Secure Shell passphrase:"
 
-#: ../ssh/seahorse-ssh-commands.c:85
+#: ../ssh/seahorse-ssh-commands.c:86
 msgid "Configure Key for _Secure Shell..."
 msgstr "Configure Key for _Secure Shellâ"
 
-#: ../ssh/seahorse-ssh-commands.c:86
+#: ../ssh/seahorse-ssh-commands.c:87
 msgid ""
 "Send public Secure Shell key to another machine, and enable logins using "
 "that key."
@@ -2798,30 +2227,34 @@ msgstr ""
 "Send public Secure Shell key to another machine, and enable logins using "
 "that key."
 
-#: ../ssh/seahorse-ssh-commands.c:115
+#: ../ssh/seahorse-ssh-commands.c:118
 #, c-format
 msgid "Are you sure you want to delete the secure shell key '%s'?"
 msgstr "Are you sure you want to delete the secure shell key '%s'?"
 
-#: ../ssh/seahorse-ssh-commands.c:118
+#: ../ssh/seahorse-ssh-commands.c:121
 #, c-format
 msgid "Are you sure you want to delete %d secure shell keys?"
 msgstr "Are you sure you want to delete %d secure shell keys?"
 
-#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91
+#: ../ssh/seahorse-ssh-commands.c:133
+msgid "Couldn't delete key"
+msgstr "Couldn't delete key"
+
+#: ../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 "Secure Shell Key"
 
-#: ../ssh/seahorse-ssh-generate.c:60
+#: ../ssh/seahorse-ssh-generate.c:61
 msgid "Used to access other computers (eg: via a terminal)"
 msgstr "Used to access other computers (eg: via a terminal)"
 
-#: ../ssh/seahorse-ssh-generate.c:90
+#: ../ssh/seahorse-ssh-generate.c:116 ../ssh/seahorse-ssh-generate.c:135
 msgid "Couldn't generate Secure Shell key"
 msgstr "Couldn't generate Secure Shell key"
 
-#: ../ssh/seahorse-ssh-generate.c:213
+#: ../ssh/seahorse-ssh-generate.c:203
 msgid "Creating Secure Shell Key"
 msgstr "Creating Secure Shell Key"
 
@@ -2873,27 +2306,15 @@ msgstr "_Key Description:"
 msgid "(Unreadable Secure Shell Key)"
 msgstr "(Unreadable Secure Shell Key)"
 
-#: ../ssh/seahorse-ssh-key.c:105
-msgid "Invalid"
-msgstr "Invalid"
-
-#: ../ssh/seahorse-ssh-key.c:116
-msgid "Private Secure Shell Key"
-msgstr "Private Secure Shell Key"
-
-#: ../ssh/seahorse-ssh-key.c:119
-msgid "Public Secure Shell Key"
-msgstr "Public Secure Shell Key"
-
-#: ../ssh/seahorse-ssh-key-properties.c:71
+#: ../ssh/seahorse-ssh-key-properties.c:79
 msgid "Couldn't rename key."
 msgstr "Couldn't rename key."
 
-#: ../ssh/seahorse-ssh-key-properties.c:112
+#: ../ssh/seahorse-ssh-key-properties.c:132
 msgid "Couldn't change authorization for key."
 msgstr "Couldn't change authorisation for key."
 
-#: ../ssh/seahorse-ssh-key-properties.c:127
+#: ../ssh/seahorse-ssh-key-properties.c:167
 msgid "Couldn't change passphrase for key."
 msgstr "Couldn't change passphrase for key."
 
@@ -2938,77 +2359,71 @@ msgstr "The owner of this key is _authorised to connect to this computer"
 msgid "Used to connect to other computers."
 msgstr "Used to connect to other computers."
 
-#: ../ssh/seahorse-ssh-operation.c:143 ../ssh/seahorse-ssh-operation.c:732
-#, c-format
+#: ../ssh/seahorse-ssh-operation.c:204
+msgid "Secure Shell key"
+msgstr "Secure Shell key"
+
+#: ../ssh/seahorse-ssh-operation.c:262
 msgid "The SSH command was terminated unexpectedly."
 msgstr "The SSH command was terminated unexpectedly."
 
-#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739
+#: ../ssh/seahorse-ssh-operation.c:270
 msgid "The SSH command failed."
 msgstr "The SSH command failed."
 
-#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477
-msgid "Secure Shell key"
-msgstr "Secure Shell key"
-
-#: ../ssh/seahorse-ssh-operation.c:448
-msgid "Passphrase:"
-msgstr "Passphrase:"
-
 #. Just prompt over and over again
-#: ../ssh/seahorse-ssh-operation.c:762
+#: ../ssh/seahorse-ssh-operation.c:678
 msgid "Remote Host Password"
 msgstr "Remote Host Password"
 
-#: ../ssh/seahorse-ssh-operation.c:850
+#: ../ssh/seahorse-ssh-operation.c:808
 msgid "Old Key Passphrase"
 msgstr "Old Key Passphrase"
 
-#: ../ssh/seahorse-ssh-operation.c:851
+#: ../ssh/seahorse-ssh-operation.c:809
 #, c-format
 msgid "Enter the old passphrase for: %s"
 msgstr "Enter the old passphrase for: %s"
 
-#: ../ssh/seahorse-ssh-operation.c:855
+#: ../ssh/seahorse-ssh-operation.c:813
 msgid "New Key Passphrase"
 msgstr "New Key Passphrase"
 
-#: ../ssh/seahorse-ssh-operation.c:856
+#: ../ssh/seahorse-ssh-operation.c:814
 #, c-format
 msgid "Enter the new passphrase for: %s"
 msgstr "Enter the new passphrase for: %s"
 
-#: ../ssh/seahorse-ssh-operation.c:864
+#: ../ssh/seahorse-ssh-operation.c:822
 msgid "Enter Key Passphrase"
 msgstr "Enter Key Passphrase"
 
-#: ../ssh/seahorse-ssh-operation.c:931
+#: ../ssh/seahorse-ssh-operation.c:942
 msgid "Passphrase for New Secure Shell Key"
 msgstr "Passphrase for New Secure Shell Key"
 
-#: ../ssh/seahorse-ssh-operation.c:932
+#: ../ssh/seahorse-ssh-operation.c:943
 msgid "Enter a passphrase for your new Secure Shell key."
 msgstr "Enter a passphrase for your new Secure Shell key."
 
-#: ../ssh/seahorse-ssh-operation.c:1013
+#: ../ssh/seahorse-ssh-operation.c:1085
 #, c-format
 msgid "Importing key: %s"
 msgstr "Importing key: %s"
 
-#: ../ssh/seahorse-ssh-operation.c:1015
+#: ../ssh/seahorse-ssh-operation.c:1087
 msgid "Importing key. Enter passphrase"
 msgstr "Importing key. Enter passphrase"
 
-#: ../ssh/seahorse-ssh-source.c:825
+#: ../ssh/seahorse-ssh-source.c:915
 msgid "No private key file is available for this key."
 msgstr "No private key file is available for this key."
 
-#: ../ssh/seahorse-ssh-upload.c:45
+#: ../ssh/seahorse-ssh-upload.c:51
 msgid "Couldn't configure Secure Shell keys on remote computer."
 msgstr "Couldn't configure Secure Shell keys on remote computer."
 
-#. Show the progress window if necessary
-#: ../ssh/seahorse-ssh-upload.c:181
+#: ../ssh/seahorse-ssh-upload.c:136
 msgid "Configuring Secure Shell Keys..."
 msgstr "Configuring Secure Shell Keysâ"
 
@@ -3040,6 +2455,448 @@ msgstr "_Login Name:"
 msgid "_Set Up"
 msgstr "_Set Up"
 
+#~ msgid "Do not run seahorse-daemon as a daemon"
+#~ msgstr "Do not run seahorse-daemon as a daemon"
+
+#~ msgid "couldn't fork process"
+#~ msgstr "couldn't fork process"
+
+#~ msgid "couldn't create new process group"
+#~ msgstr "couldn't create new process group"
+
+#~ msgid "Encryption Daemon (Seahorse)"
+#~ msgstr "Encryption Daemon (Seahorse)"
+
+#~ msgid "Invalid or unrecognized key type: %s"
+#~ msgstr "Invalid or unrecognised key type: %s"
+
+#~ msgid "This keytype is not supported: %s"
+#~ msgstr "This keytype is not supported: %s"
+
+#~ msgid "Support for this feature was not enabled at build time"
+#~ msgstr "Support for this feature was not enabled at build time"
+
+#~ msgid "Invalid or unrecognized key: %s"
+#~ msgstr "Invalid or unrecognised key: %s"
+
+#~ msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
+#~ msgstr "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
+
+#~ msgid "Invalid Signature"
+#~ msgstr "Invalid Signature"
+
+#~ msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
+#~ msgstr "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
+
+#~ msgid "Expired Signature"
+#~ msgstr "Expired Signature"
+
+#~ msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
+#~ msgstr "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
+
+#~ msgid "Revoked Signature"
+#~ msgstr "Revoked Signature"
+
+#~ msgid "Signed by <i><key id='%s'/></i> on %s."
+#~ msgstr "Signed by <i><key id='%s'/></i> on %s."
+
+#~ msgid "Good Signature"
+#~ msgstr "Good Signature"
+
+#~ msgid "Signing key not in keyring."
+#~ msgstr "Signing key not in keyring."
+
+#~ msgid "Unknown Signature"
+#~ msgstr "Unknown Signature"
+
+#~ msgid "Bad or forged signature. The signed data was modified."
+#~ msgstr "Bad or forged signature. The signed data was modified."
+
+#~ msgid "Bad Signature"
+#~ msgstr "Bad Signature"
+
+#~ msgid "Couldn't verify signature."
+#~ msgstr "Couldn't verify signature."
+
+#~ msgid "Invalid or unrecognized signer: %s"
+#~ msgstr "Invalid or unrecognised signer: %s"
+
+#~ msgid "Key is not valid for signing: %s"
+#~ msgstr "Key is not valid for signing: %s"
+
+#~ msgid "Invalid or unrecognized recipient: %s"
+#~ msgstr "Invalid or unrecognised recipient: %s"
+
+#~ msgid "Key is not a valid recipient for encryption: %s"
+#~ msgstr "Key is not a valid recipient for encryption: %s"
+
+#~ msgid "No recipients specified"
+#~ msgstr "No recipients specified"
+
+#~ msgid "Invalid key type for decryption: %s"
+#~ msgstr "Invalid key type for decryption: %s"
+
+#~ msgid "Please set clearuri"
+#~ msgstr "Please set clearuri"
+
+#~ msgid "Please set crypturi"
+#~ msgstr "Please set crypturi"
+
+#~ msgid "Error opening clearuri"
+#~ msgstr "Error opening clearuri"
+
+#~ msgid "No signer specified"
+#~ msgstr "No signer specified"
+
+#~ msgid "Invalid key type for verifying: %s"
+#~ msgstr "Invalid key type for verifying: %s"
+
+#~ msgid "Invalid key id: %s"
+#~ msgstr "Invalid key id: %s"
+
+#~ msgid ""
+#~ "A list of key server URIs to search for remote PGP keys. In later "
+#~ "versions a display name can be included, by appending a space and then "
+#~ "the name."
+#~ msgstr ""
+#~ "A list of key server URIs to search for remote PGP keys. In later "
+#~ "versions a display name can be included, by appending a space and then "
+#~ "the name."
+
+#~ msgid "Auto Retrieve Keys"
+#~ msgstr "Auto Retrieve Keys"
+
+#~ msgid "Auto Sync Keys"
+#~ msgstr "Auto Sync Keys"
+
+#~ msgid "Controls the visibility of the expires column for the key manager."
+#~ msgstr "Controls the visibility of the expires column for the key manager."
+
+#~ msgid "Controls the visibility of the trust column for the key manager."
+#~ msgstr "Controls the visibility of the trust column for the key manager."
+
+#~ msgid "Controls the visibility of the type column for the key manager."
+#~ msgstr "Controls the visibility of the type column for the key manager."
+
+#~ msgid "Controls the visibility of the validity column for the key manager."
+#~ msgstr "Controls the visibility of the validity column for the key manager."
+
+#~ msgid "Enable DNS-SD sharing"
+#~ msgstr "Enable DNS-SD sharing"
+
+#~ msgid ""
+#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be "
+#~ "running and must be built with HKP and DNS-SD support."
+#~ msgstr ""
+#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be "
+#~ "running and must be built with HKP and DNS-SD support."
+
+#~ msgid "ID of the default key"
+#~ msgstr "ID of the default key"
+
+#~ msgid ""
+#~ "If set to true, then files encrypted with seahorse will be ASCII armor "
+#~ "encoded."
+#~ msgstr ""
+#~ "If set to true, then files encrypted with seahorse will be ASCII armour "
+#~ "encoded."
+
+#~ msgid ""
+#~ "If set to true, then the default key will always be added to an "
+#~ "encryption recipients list."
+#~ msgstr ""
+#~ "If set to true, then the default key will always be added to an "
+#~ "encryption recipients list."
+
+#~ msgid "Last key server search pattern"
+#~ msgstr "Last key server search pattern"
+
+#~ msgid "Last key servers used"
+#~ msgstr "Last key servers used"
+
+#~ msgid "Last key used to sign a message."
+#~ msgstr "Last key used to sign a message."
+
+#~ msgid "PGP Key servers"
+#~ msgstr "PGP Key servers"
+
+#~ msgid "Publish keys to this key server."
+#~ msgstr "Publish keys to this key server."
+
+#~ msgid "Show expires column in key manager"
+#~ msgstr "Show expires column in key manager"
+
+#~ msgid "Show trust column in key manager"
+#~ msgstr "Show trust column in key manager"
+
+#~ msgid "Show type column in key manager"
+#~ msgstr "Show type column in key manager"
+
+#~ msgid "Show validity column in key manager"
+#~ msgstr "Show validity column in key manager"
+
+#~ msgid ""
+#~ "Specify the column to sort the recipients window by. Columns are: 'name' "
+#~ "and 'id'. Put a '-' in front of the column name to sort in descending "
+#~ "order."
+#~ msgstr ""
+#~ "Specify the column to sort the recipients window by. Columns are: 'name' "
+#~ "and 'id'. Put a '-' in front of the column name to sort in descending "
+#~ "order."
+
+#~ msgid ""
+#~ "Specify the column to sort the seahorse key manager main window by. "
+#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. "
+#~ "Put a '-' in front of the column name to sort in descending order."
+#~ msgstr ""
+#~ "Specify the column to sort the seahorse key manager main window by. "
+#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. "
+#~ "Put a '-' in front of the column name to sort in descending order."
+
+#~ msgid "The ID of the last secret key used to sign a message."
+#~ msgstr "The ID of the last secret key used to sign a message."
+
+#~ msgid "The column to sort the recipients by"
+#~ msgstr "The column to sort the recipients by"
+
+#~ msgid "The column to sort the seahorse keys by"
+#~ msgstr "The column to sort the seahorse keys by"
+
+#~ msgid ""
+#~ "The key server to publish PGP keys to. Or empty to suppress publishing of "
+#~ "PGP keys."
+#~ msgstr ""
+#~ "The key server to publish PGP keys to. Or empty to suppress publishing of "
+#~ "PGP keys."
+
+#~ msgid ""
+#~ "The last key server a search was performed against or empty for all key "
+#~ "servers."
+#~ msgstr ""
+#~ "The last key server a search was performed against or empty for all key "
+#~ "servers."
+
+#~ msgid "The last search pattern searched for against a key server."
+#~ msgstr "The last search pattern searched for against a key server."
+
+#~ msgid ""
+#~ "This specifies the default key to use for certain operations, mainly "
+#~ "signing."
+#~ msgstr ""
+#~ "This specifies the default key to use for certain operations, mainly "
+#~ "signing."
+
+#~ msgid ""
+#~ "Whether or not keys should be automatically retrieved from key servers."
+#~ msgstr ""
+#~ "Whether or not keys should be automatically retrieved from key servers."
+
+#~ msgid ""
+#~ "Whether or not modified keys should be automatically synced with the "
+#~ "default key server."
+#~ msgstr ""
+#~ "Whether or not modified keys should be automatically synced with the "
+#~ "default key server."
+
+#~ msgid "Whether to always encrypt to default key"
+#~ msgstr "Whether to always encrypt to default key"
+
+#~ msgid "Whether to use ASCII Armor"
+#~ msgstr "Whether to use ASCII Armour"
+
+#~ msgid "Web Password"
+#~ msgstr "Web Password"
+
+#~ msgid "Network Password"
+#~ msgstr "Network Password"
+
+#~ msgid "Couldn't set application access."
+#~ msgstr "Couldn't set application access."
+
+#~ msgid "<b>Path:</b>"
+#~ msgstr "<b>Path:</b>"
+
+#~ msgid "<b>Permissions:</b>"
+#~ msgstr "<b>Permissions:</b>"
+
+#~ msgid "Applications"
+#~ msgstr "Applications"
+
+#~ msgid "_Read"
+#~ msgstr "_Read"
+
+#~ msgid "_Write"
+#~ msgstr "_Write"
+
+#~ msgctxt "infinitive"
+#~ msgid "_Delete"
+#~ msgstr "_Delete"
+
+#~ msgid "Saving item..."
+#~ msgstr "Saving itemâ"
+
+#~ msgid "Listing password keyrings"
+#~ msgstr "Listing password keyrings"
+
+#~ msgid ""
+#~ "No encryption keys were found with which to perform the operation you "
+#~ "requested.  The program <b>Passwords and Encryption Keys</b> will now be "
+#~ "started so that you may either create a key or import one."
+#~ msgstr ""
+#~ "No encryption keys were found with which to perform the operation you "
+#~ "requested.  The program <b>Passwords and Encryption Keys</b> will now be "
+#~ "started so that you may either create a key or import one."
+
+#~ msgid "All Keys"
+#~ msgstr "All Keys"
+
+#~ msgid "Selected Recipients"
+#~ msgstr "Selected Recipients"
+
+#~ msgid "Search Results"
+#~ msgstr "Search Results"
+
+#~ msgid "Search _for:"
+#~ msgstr "Search _for:"
+
+#~ msgid "None (Don't Sign)"
+#~ msgstr "None (Don't Sign)"
+
+#~ msgid "Sign this message as %s"
+#~ msgstr "Sign this message as %s"
+
+#~ msgid "_Sign message as:"
+#~ msgstr "_Sign message as:"
+
+#~ msgid "File is not a valid .desktop file"
+#~ msgstr "File is not a valid .desktop file"
+
+#~ msgid "Unrecognized desktop file Version '%s'"
+#~ msgstr "Unrecognised desktop file Version '%s'"
+
+#~ msgid "Starting %s"
+#~ msgstr "Starting %s"
+
+#~ msgid "Application does not accept documents on command line"
+#~ msgstr "Application does not accept documents on the command line"
+
+#~ msgid "Unrecognized launch option: %d"
+#~ msgstr "Unrecognised launch option: %d"
+
+#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+#~ msgstr "Can't pass document URIs to a 'Type=Link' desktop entry"
+
+#~ msgid "Not a launchable item"
+#~ msgstr "Not a launchable item"
+
+#~ msgid "Disable connection to session manager"
+#~ msgstr "Disable connection to session manager"
+
+#~ msgid "Specify file containing saved configuration"
+#~ msgstr "Specify file containing saved configuration"
+
+#~ msgid "FILE"
+#~ msgstr "FILE"
+
+#~ msgid "Specify session management ID"
+#~ msgstr "Specify session management ID"
+
+#~ msgid "Session management options:"
+#~ msgstr "Session management options:"
+
+#~ msgid "Show session management options"
+#~ msgstr "Show session management options"
+
+#~ msgid "Key Imported"
+#~ msgid_plural "Keys Imported"
+#~ msgstr[0] "Key Imported"
+#~ msgstr[1] "Keys Imported"
+
+#~ msgid "Imported %i key"
+#~ msgid_plural "Imported %i keys"
+#~ msgstr[0] "Imported %i key"
+#~ msgstr[1] "Imported %i keys"
+
+#~ msgid "Imported a key for"
+#~ msgid_plural "Imported keys for"
+#~ msgstr[0] "Imported a key for"
+#~ msgstr[1] "Imported keys for"
+
+#~ msgid "Notification Messages"
+#~ msgstr "Notification Messages"
+
+#~ msgid "Symmetric Key"
+#~ msgstr "Symmetric Key"
+
+#~ msgid "Public Key"
+#~ msgstr "Public Key"
+
+#~ msgid "Private Key"
+#~ msgstr "Private Key"
+
+#~ msgid "Credentials"
+#~ msgstr "Credentials"
+
+#~ msgid "Identity"
+#~ msgstr "Identity"
+
+#~ msgid "Progress Title"
+#~ msgstr "Progress Title"
+
+#~ msgid "Couldn't run file-roller"
+#~ msgstr "Couldn't run file-roller"
+
+#~ msgid "Couldn't package files"
+#~ msgstr "Couldn't package files"
+
+#~ msgid "The file-roller process did not complete successfully"
+#~ msgstr "The file-roller process did not complete successfully"
+
+#~ msgid "Loading Keys..."
+#~ msgstr "Loading Keysâ"
+
+#~ msgid "Searching for keys..."
+#~ msgstr "Searching for keysâ"
+
+#~ msgid "Uploading keys..."
+#~ msgstr "Uploading keysâ"
+
+#~ msgid "Retrieving keys..."
+#~ msgstr "Retrieving keysâ"
+
+#~ msgid "Searching for keys on: %s"
+#~ msgstr "Searching for keys on: %s"
+
+#~ msgid "Searching for keys containing '%s'..."
+#~ msgstr "Searching for keys containing '%s'â"
+
+#~ msgid "Searching for key id '%s'..."
+#~ msgstr "Searching for key id '%s'â"
+
+#~ msgid "Retrieving remote keys..."
+#~ msgstr "Retrieving remote keysâ"
+
+#~ msgid "Sending keys to key server..."
+#~ msgstr "Sending keys to key serverâ"
+
+#~ msgid "Synchronizing keys"
+#~ msgstr "Synchronising keys"
+
+#~ msgid "Encryption Key Manager"
+#~ msgstr "Encryption Key Manager"
+
+#~ msgid "Invalid"
+#~ msgstr "Invalid"
+
+#~ msgid "Private Secure Shell Key"
+#~ msgstr "Private Secure Shell Key"
+
+#~ msgid "Public Secure Shell Key"
+#~ msgstr "Public Secure Shell Key"
+
+#~ msgid "Passphrase:"
+#~ msgstr "Passphrase:"
+
 #~ msgid "Couldn't share keys"
 #~ msgstr "Couldn't share keys"
 
@@ -3122,9 +2979,6 @@ msgstr "_Set Up"
 #~ "One or more of the deleted keys are private keys. Are you sure you want "
 #~ "to proceed?"
 
-#~ msgid "Retrieving key"
-#~ msgstr "Retrieving key"
-
 #~ msgid "Removing item"
 #~ msgstr "Removing item"
 
@@ -3697,9 +3551,6 @@ msgstr "_Set Up"
 #~ msgid "Couldn't sign file: %s"
 #~ msgstr "Couldn't sign file: %s"
 
-#~ msgid "Importing"
-#~ msgstr "Importing"
-
 #~ msgid "Couldn't import keys from file: %s"
 #~ msgstr "Couldn't import keys from file: %s"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]