[seahorse] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit d06557bc4239154a55269a4bfdac291dd6c7b6e1
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Aug 27 10:39:53 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1793 +++++++++++++++++++++++++++-------------------------------
 po/zh_TW.po | 1803 +++++++++++++++++++++++++++--------------------------------
 2 files changed, 1672 insertions(+), 1924 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index ce77e93..a7835c9 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: seahorse 2.91.5\n"
+"Project-Id-Version: seahorse 3.1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-23 14:31+0800\n"
-"PO-Revision-Date: 2011-01-23 14:31+0800\n"
+"POT-Creation-Date: 2011-08-27 10:39+0800\n"
+"PO-Revision-Date: 2011-08-27 10:39+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
@@ -18,328 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../daemon/seahorse-daemon.c:64
-msgid "Do not run seahorse-daemon as a daemon"
-msgstr "äääæçååååè seahorse-daemon"
-
-#: ../daemon/seahorse-daemon.c:94
-msgid "couldn't fork process"
-msgstr "çæåçåçå"
-
-#: ../daemon/seahorse-daemon.c:100
-msgid "couldn't create new process group"
-msgstr "çæåçæççåçç"
-
-#: ../daemon/seahorse-daemon.c:250
-msgid "Encryption Daemon (Seahorse)"
-msgstr "ååäæçå (Seahorse)"
-
-#: ../daemon/seahorse-service.c:164 ../daemon/seahorse-service.c:277
-#, c-format
-msgid "Invalid or unrecognized key type: %s"
-msgstr "çææçæçèçåçåéåï%s"
-
-#: ../daemon/seahorse-service.c:234
-#, c-format
-msgid "This keytype is not supported: %s"
-msgstr "éååçåéåæäææçï%s"
-
-#: ../daemon/seahorse-service.c:241
-#, c-format
-msgid "Support for this feature was not enabled at build time"
-msgstr "çèæææåçåéååèçææ"
-
-#: ../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 "çææçæçèçåçåï%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 "ç <i><key id=â%sâ/> ççïæ %s éæã"
-
-#: ../daemon/seahorse-service-crypto.c:205
-msgid "Invalid Signature"
-msgstr "çæççç"
-
-#: ../daemon/seahorse-service-crypto.c:211
-#, c-format
-msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
-msgstr "ç <i><key id=â%sâ/>æ %s ççï<b>åéæ</b>ã"
-
-#: ../daemon/seahorse-service-crypto.c:212
-msgid "Expired Signature"
-msgstr "åéæççç"
-
-#: ../daemon/seahorse-service-crypto.c:218
-#, c-format
-msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
-msgstr "ç <i><key id=â%sâ/>ççïæ %s æéã"
-
-#: ../daemon/seahorse-service-crypto.c:219
-msgid "Revoked Signature"
-msgstr "ççåæé"
-
-#. 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 "ç <i><key id=â%sâ/>æ %s ççã"
-
-#: ../daemon/seahorse-service-crypto.c:226
-msgid "Good Signature"
-msgstr "ååççç"
-
-#: ../daemon/seahorse-service-crypto.c:231
-msgid "Signing key not in keyring."
-msgstr "ççåçåäéååçåååã"
-
-#: ../daemon/seahorse-service-crypto.c:232
-msgid "Unknown Signature"
-msgstr "äæççç"
-
-#: ../daemon/seahorse-service-crypto.c:236
-msgid "Bad or forged signature. The signed data was modified."
-msgstr "æåææåéçççãççèæåèäæã"
-
-#: ../daemon/seahorse-service-crypto.c:237
-msgid "Bad Signature"
-msgstr "æåççç"
-
-#: ../daemon/seahorse-service-crypto.c:245
-msgid "Couldn't verify signature."
-msgstr "çæéèççã"
-
-#: ../daemon/seahorse-service-crypto.c:317
-#: ../daemon/seahorse-service-crypto.c:646
-#, c-format
-msgid "Invalid or unrecognized signer: %s"
-msgstr "çææçæèèçççèï%s"
-
-#: ../daemon/seahorse-service-crypto.c:324
-#: ../daemon/seahorse-service-crypto.c:653
-#, c-format
-msgid "Key is not valid for signing: %s"
-msgstr "åçåäèææåäçççäçï%s"
-
-#: ../daemon/seahorse-service-crypto.c:335
-#, c-format
-msgid "Invalid or unrecognized recipient: %s"
-msgstr "çææçæèèçæääï%s"
-
-#: ../daemon/seahorse-service-crypto.c:343
-#, c-format
-msgid "Key is not a valid recipient for encryption: %s"
-msgstr "åçåäæäåææçæäääååï%s"
-
-#: ../daemon/seahorse-service-crypto.c:352
-#, c-format
-msgid "No recipients specified"
-msgstr "æææåæää"
-
-#: ../daemon/seahorse-service-crypto.c:434
-#, c-format
-msgid "Invalid key type for decryption: %s"
-msgstr "èåçåçåéåçæï%s"
-
-#: ../daemon/seahorse-service-crypto.c:548
-#: ../daemon/seahorse-service-crypto.c:746
-#, c-format
-msgid "Please set clearuri"
-msgstr "èèå clearui"
-
-#: ../daemon/seahorse-service-crypto.c:554
-#: ../daemon/seahorse-service-crypto.c:752
-#, c-format
-msgid "Please set crypturi"
-msgstr "èèå cryptui"
-
-#: ../daemon/seahorse-service-crypto.c:564
-#, c-format
-msgid "Error opening clearuri"
-msgstr "éå clearui æççéè"
-
-#: ../daemon/seahorse-service-crypto.c:641
-#, c-format
-msgid "No signer specified"
-msgstr "æææåççè"
-
-#: ../daemon/seahorse-service-crypto.c:830
-#, c-format
-msgid "Invalid key type for verifying: %s"
-msgstr "éè %s çåçåéåçæ"
-
-#: ../daemon/seahorse-service-keyset.c:273
-#, c-format
-msgid "Invalid key id: %s"
-msgstr "çæçåçå 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 "åæéç PGP åçåçåçåäæåç URL æåãåæäéççæååæéçåçïäååçæååçã"
-
-#: ../data/seahorse.schemas.in.h:2
-msgid "Auto Retrieve Keys"
-msgstr "èååååçå"
-
-#: ../data/seahorse.schemas.in.h:3
-msgid "Auto Sync Keys"
-msgstr "åçåèååæ"
-
-#: ../data/seahorse.schemas.in.h:4
-msgid "Controls the visibility of the expires column for the key manager."
-msgstr "æååçåççåçæææææäçåçæã"
-
-#: ../data/seahorse.schemas.in.h:5
-msgid "Controls the visibility of the trust column for the key manager."
-msgstr "æååçåççåçääæäçåçæã"
-
-#: ../data/seahorse.schemas.in.h:6
-msgid "Controls the visibility of the type column for the key manager."
-msgstr "æååçåççåçéåæäçåçæã"
-
-#: ../data/seahorse.schemas.in.h:7
-msgid "Controls the visibility of the validity column for the key manager."
-msgstr "æååçåççåçææææäçåçæã"
-
-#: ../data/seahorse.schemas.in.h:8
-msgid "Enable DNS-SD sharing"
-msgstr "åç DNS-SD åä"
-
-#: ../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 "åç DNS-SD (Apple Bonjour) åçååäïåééè seahorse-daemon  ååå HKP å DNS-SD ææã"
-
-#: ../data/seahorse.schemas.in.h:10
-msgid "ID of the default key"
-msgstr "éèåçåç ID"
-
-#: ../data/seahorse.schemas.in.h:11
-msgid ""
-"If set to true, then files encrypted with seahorse will be ASCII armor "
-"encoded."
-msgstr "åèåçâtrueâïäç seahorse ååçææææä ASCII åèççã"
-
-#: ../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 "åèåçâtrueâïéèåçåçææååååæääæåã"
-
-#: ../data/seahorse.schemas.in.h:13
-msgid "Last key server search pattern"
-msgstr "äæååçåäæåçæååæ"
-
-#: ../data/seahorse.schemas.in.h:14
-msgid "Last key servers used"
-msgstr "äæäççåçåäæå"
-
-#: ../data/seahorse.schemas.in.h:15
-msgid "Last key used to sign a message."
-msgstr "äæçäçççåçå"
-
-#: ../data/seahorse.schemas.in.h:16
-msgid "PGP Key servers"
-msgstr "PGP åçåäæå"
-
-#: ../data/seahorse.schemas.in.h:17
-msgid "Publish keys to this key server."
-msgstr "çèåçååæåçåäæåã"
-
-#: ../data/seahorse.schemas.in.h:18
-msgid "Show expires column in key manager"
-msgstr "ååçåççåäéçææææçæä"
-
-#: ../data/seahorse.schemas.in.h:19
-msgid "Show trust column in key manager"
-msgstr "ååçåççåäéçääçæä"
-
-#: ../data/seahorse.schemas.in.h:20
-msgid "Show type column in key manager"
-msgstr "ååçåççåäéçéåçæä"
-
-#: ../data/seahorse.schemas.in.h:21
-msgid "Show validity column in key manager"
-msgstr "ååçåççåäéçæææçæä"
-
-#: ../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 "æåæääèççæäçæåæåïânameâåâidâãåæäåçååäâ-âäååæåã"
-
-#: ../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 "æå seahorse åçåçççåäèçæäçæåæåïânameâïâidâïâvalidityâïâexpiresâïâtrustâåâtypeâãåæäåçååäâ-âäååæåã"
-
-#: ../data/seahorse.schemas.in.h:24
-msgid "The ID of the last secret key used to sign a message."
-msgstr "äæçäççäæççäåçå IDã"
-
-#: ../data/seahorse.schemas.in.h:25
-msgid "The column to sort the recipients by"
-msgstr "seahorse æääæäçæååå"
-
-#: ../data/seahorse.schemas.in.h:26
-msgid "The column to sort the seahorse keys by"
-msgstr "seahorse åçåæäçæååå"
-
-#: ../data/seahorse.schemas.in.h:27
-msgid ""
-"The key server to publish PGP keys to. Or empty to suppress publishing of "
-"PGP keys."
-msgstr "PGP åçåçèåçåçåäæåãæäçççäçæçè PGP åçå"
-
-#: ../data/seahorse.schemas.in.h:28
-msgid ""
-"The last key server a search was performed against or empty for all key "
-"servers."
-msgstr "äææåçåçåäæåãæåçççææäæåã"
-
-#: ../data/seahorse.schemas.in.h:29
-msgid "The last search pattern searched for against a key server."
-msgstr "äæååçåäæåçæåæåã"
-
-#: ../data/seahorse.schemas.in.h:30
-msgid ""
-"This specifies the default key to use for certain operations, mainly signing."
-msgstr "éæååæäåäääççéèåçåïäèçççæäçã"
-
-#: ../data/seahorse.schemas.in.h:31
-msgid "Whether or not keys should be automatically retrieved from key servers."
-msgstr "æåèåååçåäæååååçåã"
-
-#: ../data/seahorse.schemas.in.h:32
-msgid ""
-"Whether or not modified keys should be automatically synced with the default "
-"key server."
-msgstr "åäæçåçåæåèåèéèçåçåäæååæã"
-
-#: ../data/seahorse.schemas.in.h:33
-msgid "Whether to always encrypt to default key"
-msgstr "æåçæäéèåçåäåå"
-
-#: ../data/seahorse.schemas.in.h:34
-msgid "Whether to use ASCII Armor"
-msgstr "æåäç ASCII åè"
-
 #: ../gkr/seahorse-add-keyring.xml.h:1
 msgid "Add Password Keyring"
 msgstr "åååçåçåå"
 
 #: ../gkr/seahorse-add-keyring.xml.h:2
 msgid "New Keyring Name:"
-msgstr "æåçåååç:"
+msgstr "æåçåååçï"
 
 #: ../gkr/seahorse-add-keyring.xml.h:3
 msgid ""
@@ -353,7 +38,7 @@ msgstr "èçæçåçååéæäååçãççææçäæäè
 msgid "The host name or address of the server."
 msgstr "äæåçäæåçæäåã"
 
-#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:73
+#: ../gkr/seahorse-gkr-add-item.c:51 ../gkr/seahorse-gkr-add-keyring.c:65
 msgid "Couldn't add keyring"
 msgstr "çæåååçåå"
 
@@ -362,7 +47,7 @@ msgid "Add Password"
 msgstr "åååç"
 
 #: ../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 "æè(_D):"
 
@@ -378,233 +63,227 @@ msgstr "åç(_P):"
 msgid "_Show Password"
 msgstr "éçåç(_S)"
 
-#: ../gkr/seahorse-gkr-item.c:470
+#: ../gkr/seahorse-gkr-item.c:437
 msgid "Web Password"
 msgstr "çéåç"
 
-#: ../gkr/seahorse-gkr-item.c:472
+#: ../gkr/seahorse-gkr-item.c:439
 msgid "Network Password"
 msgstr "ççåç"
 
-#: ../gkr/seahorse-gkr-item.c:474 ../gkr/seahorse-gkr-item-properties.c:107
+#: ../gkr/seahorse-gkr-item.c:441 ../gkr/seahorse-gkr-item-properties.c:108
 msgid "Password"
 msgstr "åç"
 
 #: ../gkr/seahorse-gkr-item-commands.c:78
+msgid "Couldn't delete item"
+msgstr "çæåééç"
+
+#: ../gkr/seahorse-gkr-item-commands.c:100
 #, c-format
 msgid "Are you sure you want to delete the password '%s'?"
 msgstr "çåèåéåçã%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] "çåèåé %d ååçï"
 msgstr[1] "çåèåé %d ååçï"
 
-#: ../gkr/seahorse-gkr-item-properties.c:66
+#: ../gkr/seahorse-gkr-item-commands.c:114
+msgid "Deleting item"
+msgstr "åééç"
+
+#: ../gkr/seahorse-gkr-item-commands.c:114
+msgid "Deleting items"
+msgstr "åééç"
+
+#: ../gkr/seahorse-gkr-item-properties.c:67
 msgid "Access a network share or resource"
 msgstr "ååççåäæèæ"
 
-#: ../gkr/seahorse-gkr-item-properties.c:69
+#: ../gkr/seahorse-gkr-item-properties.c:70
 msgid "Access a website"
 msgstr "ååçç"
 
-#: ../gkr/seahorse-gkr-item-properties.c:72
+#: ../gkr/seahorse-gkr-item-properties.c:73
 msgid "Unlocks a PGP key"
 msgstr "èé PGP åçåéå"
 
-#: ../gkr/seahorse-gkr-item-properties.c:75
+#: ../gkr/seahorse-gkr-item-properties.c:76
 msgid "Unlocks a Secure Shell key"
 msgstr "èé SSH åçåéå"
 
-#: ../gkr/seahorse-gkr-item-properties.c:78
+#: ../gkr/seahorse-gkr-item-properties.c:79
 msgid "Saved password or login"
 msgstr "åååçæçå"
 
-#: ../gkr/seahorse-gkr-item-properties.c:102
+#: ../gkr/seahorse-gkr-item-properties.c:103
 msgid "Network Credentials"
 msgstr "ççèè"
 
-#: ../gkr/seahorse-gkr-item-properties.c:245
+#: ../gkr/seahorse-gkr-item-properties.c:208
 msgid "Couldn't change password."
 msgstr "çæææåçã"
 
-#: ../gkr/seahorse-gkr-item-properties.c:350
+#: ../gkr/seahorse-gkr-item-properties.c:253
+#: ../gkr/seahorse-gkr-item-properties.c:369
+msgid "Updating password"
+msgstr "ææåç"
+
+#: ../gkr/seahorse-gkr-item-properties.c:330
 msgid "Couldn't set description."
 msgstr "çæèåæèã"
 
-#: ../gkr/seahorse-gkr-item-properties.c:656
-msgid "Couldn't set application access."
-msgstr "çæèåæççåçååã"
-
 #: ../gkr/seahorse-gkr-item-properties.xml.h:1
 msgid "<b>Password:</b>"
 msgstr "<b>åçï</b>"
 
 #: ../gkr/seahorse-gkr-item-properties.xml.h:2
-msgid "<b>Path:</b>"
-msgstr "<b>èå:</b>"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:3
-msgid "<b>Permissions:</b>"
-msgstr "<b>æé:</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>æèèæï</b>"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:5
-msgid "Applications"
-msgstr "æççå"
-
-#: ../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 "èçèæ"
 
-#: ../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 "åçå"
 
-#: ../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 "åçååæ"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:9
+#: ../gkr/seahorse-gkr-item-properties.xml.h:6
 msgid "Login:"
 msgstr "çå:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:10
+#: ../gkr/seahorse-gkr-item-properties.xml.h:7
 msgid "Server:"
 msgstr "äæå:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:11
+#: ../gkr/seahorse-gkr-item-properties.xml.h:8
 msgid "Show pass_word"
 msgstr "éçåç(_W)"
 
-#: ../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 "éå:"
 
 #. 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 "äç:"
 
-#. To translators: This is the infinitive not the imperative.
-#: ../gkr/seahorse-gkr-item-properties.xml.h:17
-msgid "_Read"
-msgstr "èå(_R)"
-
-#. To translators: This is the infinitive not the imperative.
-#: ../gkr/seahorse-gkr-item-properties.xml.h:19
-msgid "_Write"
-msgstr "åå(_W)"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:20
-msgctxt "infinitive"
-msgid "_Delete"
-msgstr "åé(_D)"
-
-#: ../gkr/seahorse-gkr-keyring.c:193
-msgid "Listing passwords"
-msgstr "æååååç"
-
-#: ../gkr/seahorse-gkr-keyring.c:354
+#: ../gkr/seahorse-gkr-keyring.c:121
 #, c-format
 msgid "Passwords: %s"
 msgstr "åçï%s"
 
-#: ../gkr/seahorse-gkr-keyring.c:355
+#: ../gkr/seahorse-gkr-keyring.c:122
 #, c-format
 msgid "<b>Passwords:</b> %s"
 msgstr "<b>åçï</b>%s"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:119
+#: ../gkr/seahorse-gkr-keyring-commands.c:113
 msgid "Password Keyring"
 msgstr "åçåçåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:120
+#: ../gkr/seahorse-gkr-keyring-commands.c:114
 msgid "Used to store application and network passwords"
 msgstr "çäååæççååçççåç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:121
+#: ../gkr/seahorse-gkr-keyring-commands.c:115
 msgid "Stored Password"
 msgstr "åååçåç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:122
+#: ../gkr/seahorse-gkr-keyring-commands.c:116
 msgid "Safely store a password or secret."
 msgstr "ååçåæåèææåã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:136
+#: ../gkr/seahorse-gkr-keyring-commands.c:130
 msgid "Couldn't unlock keyring"
 msgstr "çæèéåçåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:177
+#: ../gkr/seahorse-gkr-keyring-commands.c:169
 msgid "Couldn't lock keyring"
 msgstr "çæéååçåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:218
+#: ../gkr/seahorse-gkr-keyring-commands.c:208
 msgid "Couldn't set default keyring"
 msgstr "çæèåéèçåçåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:257
+#: ../gkr/seahorse-gkr-keyring-commands.c:247
 msgid "Couldn't change keyring password"
 msgstr "çæææåçåååç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:288
+#: ../gkr/seahorse-gkr-keyring-commands.c:276
 msgid "_Lock"
 msgstr "éå(_L)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:289
+#: ../gkr/seahorse-gkr-keyring-commands.c:277
 msgid ""
 "Lock the password storage keyring so a master password is required to unlock "
 "it."
 msgstr "éååçåååçååïåæèååèéåèæäæåçæèã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:290
+#: ../gkr/seahorse-gkr-keyring-commands.c:278
 msgid "_Unlock"
 msgstr "èé(_U)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:291
+#: ../gkr/seahorse-gkr-keyring-commands.c:279
 msgid ""
 "Unlock the password storage keyring with a master password so it is "
 "available for use."
 msgstr "äçäæåçååçåååçååèéïåæåæçåääçççæã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:292
+#: ../gkr/seahorse-gkr-keyring-commands.c:280
 msgid "_Set as default"
 msgstr "èçéèå(_S)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:293
+#: ../gkr/seahorse-gkr-keyring-commands.c:281
 msgid "Applications usually store new passwords in the default keyring."
 msgstr "æççåéåæææåçåååéèåçååèã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:294
+#: ../gkr/seahorse-gkr-keyring-commands.c:282
 msgid "Change _Password"
 msgstr "ææåç(_P)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:295
+#: ../gkr/seahorse-gkr-keyring-commands.c:283
 msgid "Change the unlock password of the password storage keyring"
 msgstr "æèåçåååçååçèéåç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:360
+#: ../gkr/seahorse-gkr-keyring-commands.c:348
+msgid "Couldn't delete keyring"
+msgstr "çæåéåçåå"
+
+#: ../gkr/seahorse-gkr-keyring-commands.c:366
 #, c-format
 msgid "Are you sure you want to delete the password keyring '%s'?"
 msgstr "äçåèåééååçåçååã%sãï"
 
+#: ../gkr/seahorse-gkr-keyring-commands.c:376
+msgid "Deleting keyring"
+msgstr "åéåçåå"
+
+#: ../gkr/seahorse-gkr-keyring-commands.c:376
+msgid "Deleting keyrings"
+msgstr "åéåçåå"
+
 #. -----------------------------------------------------------------------------
 #. * PUBLIC
 #.
@@ -627,263 +306,196 @@ msgstr "åçåååæ"
 msgid "_Name:"
 msgstr "åç(_N):"
 
-#: ../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 "èæäååæ"
+
+#: ../gkr/seahorse-gkr-operation.c:57
 msgid "Access to the key ring was denied"
 msgstr "åååçååèçæ"
 
-#: ../gkr/seahorse-gkr-operation.c:171
+#: ../gkr/seahorse-gkr-operation.c:60
 msgid "The gnome-keyring daemon is not running"
 msgstr "gnome-keyring æåçåææåè"
 
-#: ../gkr/seahorse-gkr-operation.c:174
+#: ../gkr/seahorse-gkr-operation.c:63
 msgid "The key ring has already been unlocked"
 msgstr "åçåååçèé"
 
-#: ../gkr/seahorse-gkr-operation.c:177
+#: ../gkr/seahorse-gkr-operation.c:66
 msgid "No such key ring exists"
 msgstr "ææèåçåååå"
 
-#: ../gkr/seahorse-gkr-operation.c:180
+#: ../gkr/seahorse-gkr-operation.c:69
 msgid "Couldn't communicate with key ring daemon"
 msgstr "çæèåçååæåçåèç"
 
-#: ../gkr/seahorse-gkr-operation.c:183
+#: ../gkr/seahorse-gkr-operation.c:72
 msgid "The item already exists"
 msgstr "éçåçåå"
 
-#: ../gkr/seahorse-gkr-operation.c:189
+#: ../gkr/seahorse-gkr-operation.c:78
 msgid "Internal error accessing gnome-keyring"
 msgstr "åå gnome-keyring ççåééè"
 
-#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264
-msgid "Saving item..."
-msgstr "æåååéçâ"
-
-#: ../gkr/seahorse-gkr-operation.c:300
-msgid "Deleting item..."
-msgstr "æååééçâ"
-
-#: ../gkr/seahorse-gkr-operation.c:325
-msgid "Deleting keyring..."
-msgstr "æååéåçåå"
-
-#: ../gkr/seahorse-gkr-source.c:234
-msgid "Listing password keyrings"
-msgstr "æååååçåçåå "
-
-#: ../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 "åéèäæèæçæäææäååååçåãçåæåå <b>åçèåååçå</b> çåèäåçæååäååçåã"
-
-#: ../libcryptui/cryptui-key-chooser.c:174
-#: ../libcryptui/cryptui-key-chooser.c:179
-msgid "All Keys"
-msgstr "ææåçå"
-
-#: ../libcryptui/cryptui-key-chooser.c:175
-#: ../libcryptui/cryptui-key-chooser.c:180
-msgid "Selected Recipients"
-msgstr "åéåæää"
-
-#: ../libcryptui/cryptui-key-chooser.c:176
-#: ../libcryptui/cryptui-key-chooser.c:181
-msgid "Search Results"
-msgstr "æåçæ"
-
-#. Filter Label
-#: ../libcryptui/cryptui-key-chooser.c:192
-msgid "Search _for:"
-msgstr "æå(_F):"
-
-#: ../libcryptui/cryptui-key-chooser.c:250
-msgid "None (Don't Sign)"
-msgstr "ææïäèççï"
-
-#: ../libcryptui/cryptui-key-chooser.c:263
-#, c-format
-msgid "Sign this message as %s"
-msgstr "ä %s ççéåéä"
-
-#. Sign Label
-#: ../libcryptui/cryptui-key-chooser.c:285
-msgid "_Sign message as:"
-msgstr "ççèæçåçå(_S):"
-
-#. 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 "åç"
-
-#. 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 "åçå ID"
-
-#: ../libegg/egg-datetime.c:325
+#: ../libegg/egg-datetime.c:317
 msgid "Display flags"
 msgstr "éçææ"
 
-#: ../libegg/egg-datetime.c:326
+#: ../libegg/egg-datetime.c:318
 msgid "Displayed date and/or time properties"
 msgstr "éççææå/ææååæ"
 
-#: ../libegg/egg-datetime.c:331
+#: ../libegg/egg-datetime.c:323
 msgid "Lazy mode"
 msgstr "æäæå"
 
-#: ../libegg/egg-datetime.c:332
+#: ../libegg/egg-datetime.c:324
 msgid "Lazy mode doesn't normalize entered date and time values"
 msgstr "æäæåäæææåèåçææåæåæå"
 
-#: ../libegg/egg-datetime.c:337
+#: ../libegg/egg-datetime.c:329
 msgid "Year"
 msgstr "å"
 
-#: ../libegg/egg-datetime.c:338
+#: ../libegg/egg-datetime.c:330
 msgid "Displayed year"
 msgstr "éççåä"
 
-#: ../libegg/egg-datetime.c:343
+#: ../libegg/egg-datetime.c:335
 msgid "Month"
 msgstr "æ"
 
-#: ../libegg/egg-datetime.c:344
+#: ../libegg/egg-datetime.c:336
 msgid "Displayed month"
 msgstr "éççæä"
 
-#: ../libegg/egg-datetime.c:349
+#: ../libegg/egg-datetime.c:341
 msgid "Day"
 msgstr "å"
 
-#: ../libegg/egg-datetime.c:350
+#: ../libegg/egg-datetime.c:342
 msgid "Displayed day of month"
 msgstr "éçäåæçåå"
 
-#: ../libegg/egg-datetime.c:355
+#: ../libegg/egg-datetime.c:347
 msgid "Hour"
 msgstr "æ"
 
-#: ../libegg/egg-datetime.c:356
+#: ../libegg/egg-datetime.c:348
 msgid "Displayed hour"
 msgstr "éççåæ"
 
-#: ../libegg/egg-datetime.c:361
+#: ../libegg/egg-datetime.c:353
 msgid "Minute"
 msgstr "å"
 
-#: ../libegg/egg-datetime.c:362
+#: ../libegg/egg-datetime.c:354
 msgid "Displayed minute"
 msgstr "éççåé"
 
-#: ../libegg/egg-datetime.c:367
+#: ../libegg/egg-datetime.c:359
 msgid "Second"
 msgstr "ç"
 
-#: ../libegg/egg-datetime.c:368
+#: ../libegg/egg-datetime.c:360
 msgid "Displayed second"
 msgstr "éçççé"
 
-#: ../libegg/egg-datetime.c:373
+#: ../libegg/egg-datetime.c:365
 msgid "Lower limit year"
 msgstr "åääé"
 
-#: ../libegg/egg-datetime.c:374
+#: ../libegg/egg-datetime.c:366
 msgid "Year part of the lower date limit"
 msgstr "éçåäçæåå"
 
-#: ../libegg/egg-datetime.c:379
+#: ../libegg/egg-datetime.c:371
 msgid "Upper limit year"
 msgstr "åääé"
 
-#: ../libegg/egg-datetime.c:380
+#: ../libegg/egg-datetime.c:372
 msgid "Year part of the upper date limit"
 msgstr "éçåäçæåå"
 
-#: ../libegg/egg-datetime.c:385
+#: ../libegg/egg-datetime.c:377
 msgid "Lower limit month"
 msgstr "æääé"
 
-#: ../libegg/egg-datetime.c:386
+#: ../libegg/egg-datetime.c:378
 msgid "Month part of the lower date limit"
 msgstr "éçæäçæåå"
 
-#: ../libegg/egg-datetime.c:391
+#: ../libegg/egg-datetime.c:383
 msgid "Upper limit month"
 msgstr "æääé"
 
-#: ../libegg/egg-datetime.c:392
+#: ../libegg/egg-datetime.c:384
 msgid "Month part of the upper date limit"
 msgstr "éçæäçæåå"
 
-#: ../libegg/egg-datetime.c:397
+#: ../libegg/egg-datetime.c:389
 msgid "Lower limit day"
 msgstr "æäé"
 
-#: ../libegg/egg-datetime.c:398
+#: ../libegg/egg-datetime.c:390
 msgid "Day of month part of the lower date limit"
 msgstr "éçææçæåå"
 
-#: ../libegg/egg-datetime.c:403
+#: ../libegg/egg-datetime.c:395
 msgid "Upper limit day"
 msgstr "æäé"
 
-#: ../libegg/egg-datetime.c:404
+#: ../libegg/egg-datetime.c:396
 msgid "Day of month part of the upper date limit"
 msgstr "éçææçæåå"
 
-#: ../libegg/egg-datetime.c:409
+#: ../libegg/egg-datetime.c:401
 msgid "Lower limit hour"
 msgstr "åæäé"
 
-#: ../libegg/egg-datetime.c:410
+#: ../libegg/egg-datetime.c:402
 msgid "Hour part of the lower time limit"
 msgstr "éçåæçæåå"
 
-#: ../libegg/egg-datetime.c:415
+#: ../libegg/egg-datetime.c:407
 msgid "Upper limit hour"
 msgstr "åæäé"
 
-#: ../libegg/egg-datetime.c:416
+#: ../libegg/egg-datetime.c:408
 msgid "Hour part of the upper time limit"
 msgstr "éçåæçæåå"
 
-#: ../libegg/egg-datetime.c:421
+#: ../libegg/egg-datetime.c:413
 msgid "Lower limit minute"
 msgstr "åéäé"
 
-#: ../libegg/egg-datetime.c:422
+#: ../libegg/egg-datetime.c:414
 msgid "Minute part of the lower time limit"
 msgstr "éçåéçæåå"
 
-#: ../libegg/egg-datetime.c:427
+#: ../libegg/egg-datetime.c:419
 msgid "Upper limit minute"
 msgstr "åéäé"
 
-#: ../libegg/egg-datetime.c:428
+#: ../libegg/egg-datetime.c:420
 msgid "Minute part of the upper time limit"
 msgstr "éçåéçæåå"
 
-#: ../libegg/egg-datetime.c:433
+#: ../libegg/egg-datetime.c:425
 msgid "Lower limit second"
 msgstr "çéäé"
 
-#: ../libegg/egg-datetime.c:434
+#: ../libegg/egg-datetime.c:426
 msgid "Second part of the lower time limit"
 msgstr "éççéçæåå"
 
-#: ../libegg/egg-datetime.c:439
+#: ../libegg/egg-datetime.c:431
 msgid "Upper limit second"
 msgstr "çéäé"
 
-#: ../libegg/egg-datetime.c:440
+#: ../libegg/egg-datetime.c:432
 msgid "Second part of the upper time limit"
 msgstr "éççéçæåå"
 
@@ -892,159 +504,96 @@ msgstr "éççéçæåå"
 #. * 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:0"
 
-#: ../libegg/egg-datetime.c:504
+#: ../libegg/egg-datetime.c:496
 msgid "Date"
 msgstr "ææ"
 
-#: ../libegg/egg-datetime.c:504
+#: ../libegg/egg-datetime.c:496
 msgid "Enter the date directly"
 msgstr "çæèåææ"
 
-#: ../libegg/egg-datetime.c:511
+#: ../libegg/egg-datetime.c:503
 msgid "Select Date"
 msgstr "éæææ"
 
-#: ../libegg/egg-datetime.c:511
+#: ../libegg/egg-datetime.c:503
 msgid "Select the date from a calendar"
 msgstr "åææäéåææ"
 
-#: ../libegg/egg-datetime.c:529 ../libegg/egg-datetime.c:2213
+#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199
 msgid "Time"
 msgstr "æå"
 
-#: ../libegg/egg-datetime.c:529
+#: ../libegg/egg-datetime.c:521
 msgid "Enter the time directly"
 msgstr "çæèåæå"
 
-#: ../libegg/egg-datetime.c:536
+#: ../libegg/egg-datetime.c:528
 msgid "Select Time"
 msgstr "éææå"
 
-#: ../libegg/egg-datetime.c:536
+#: ../libegg/egg-datetime.c:528
 msgid "Select the time from a list"
 msgstr "åæåäéåæå"
 
 #. 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 "äå"
 
-#: ../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 "äå"
 
 #. 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 "ææäæææç .desktop ææ"
-
-#: ../libegg/eggdesktopfile.c:188
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "çæèèçæéææçæã%sã"
-
-#: ../libegg/eggdesktopfile.c:968
-#, c-format
-msgid "Starting %s"
-msgstr "æååå %s"
-
-#: ../libegg/eggdesktopfile.c:1110
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "æççåäæåäåäåéåæä"
-
-#: ../libegg/eggdesktopfile.c:1178
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "çæèèçååééï%d"
-
-#: ../libegg/eggdesktopfile.c:1383
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "äèåéæä URI èãType=Linkãæééç"
-
-#: ../libegg/eggdesktopfile.c:1404
-#, c-format
-msgid "Not a launchable item"
-msgstr "äæåäååçéç"
-
-#: ../libegg/eggsmclient.c:225
-msgid "Disable connection to session manager"
-msgstr "åçåäæéæçççåçéç"
-
-#: ../libegg/eggsmclient.c:228
-msgid "Specify file containing saved configuration"
-msgstr "æååæåååçæçææ"
-
-#: ../libegg/eggsmclient.c:228
-msgid "FILE"
-msgstr "ææ"
-
-#: ../libegg/eggsmclient.c:231
-msgid "Specify session management ID"
-msgstr "æåäæéæçç 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 "äæéæççéé:"
-
-#: ../libegg/eggsmclient.c:253
-msgid "Show session management options"
-msgstr "éçäæéæççéé"
-
 #: ../libseahorse/seahorse-add-keyserver.xml.h:1
 msgid ":"
 msgstr ":"
@@ -1069,45 +618,19 @@ msgstr "éæäæåçéæåã"
 msgid "initial temporary item"
 msgstr "èåèæéç"
 
-#: ../libseahorse/seahorse-notification.c:576
-#: ../libseahorse/seahorse-notification.c:604
-msgid "Key Imported"
-msgid_plural "Keys Imported"
-msgstr[0] "åçåååå"
-msgstr[1] "åçåååå"
-
-#: ../libseahorse/seahorse-notification.c:580
-#: ../libseahorse/seahorse-notification.c:603
-#, c-format
-msgid "Imported %i key"
-msgid_plural "Imported %i keys"
-msgstr[0] "ååå %i ååçå"
-msgstr[1] "ååå %i ååçå"
-
-#: ../libseahorse/seahorse-notification.c:582
-#, c-format
-msgid "Imported a key for"
-msgid_plural "Imported keys for"
-msgstr[0] "ååæåçå"
-msgstr[1] "ååæåçå"
-
-#: ../libseahorse/seahorse-notify.xml.h:1
-msgid "Notification Messages"
-msgstr "éçèæ"
-
-#: ../libseahorse/seahorse-object.c:317
+#: ../libseahorse/seahorse-object.c:318
 msgid "Symmetric Key"
 msgstr "åçååçå"
 
-#: ../libseahorse/seahorse-object.c:320
+#: ../libseahorse/seahorse-object.c:321
 msgid "Public Key"
 msgstr "åéåçå"
 
-#: ../libseahorse/seahorse-object.c:323
+#: ../libseahorse/seahorse-object.c:324
 msgid "Private Key"
 msgstr "çååçå"
 
-#: ../libseahorse/seahorse-object.c:326
+#: ../libseahorse/seahorse-object.c:327
 msgid "Credentials"
 msgstr "èæ"
 
@@ -1115,28 +638,29 @@ msgstr "èæ"
 #. * Translators: "This object is a means of storing items such as
 #. * name, email address, etc. that make up one's digital identity.
 #.
-#: ../libseahorse/seahorse-object.c:333
+#: ../libseahorse/seahorse-object.c:334
 msgid "Identity"
 msgstr "èå"
 
-#: ../libseahorse/seahorse-passphrase.c:200
+#: ../libseahorse/seahorse-passphrase.c:178
 msgid "Passphrase"
 msgstr "åè"
 
-#: ../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 "åç:"
 
-#: ../libseahorse/seahorse-passphrase.c:269
+#. The second and main entry
+#: ../libseahorse/seahorse-passphrase.c:244
 msgid "Confirm:"
 msgstr "çè:"
 
-#: ../libseahorse/seahorse-prefs.c:62
+#: ../libseahorse/seahorse-prefs.c:59
 msgid "Not a valid Key Server address."
 msgstr "äæææçåçåäæåäåã"
 
-#: ../libseahorse/seahorse-prefs.c:63
+#: ../libseahorse/seahorse-prefs.c:60
 msgid ""
 "For help contact your system adminstrator or the administrator of the key "
 "server."
@@ -1146,11 +670,11 @@ msgstr "åççççåæåçåäæåççåååååã"
 msgid "URL"
 msgstr "URL"
 
-#: ../libseahorse/seahorse-prefs.c:352
+#: ../libseahorse/seahorse-prefs.c:333
 msgid "Custom"
 msgstr "èé"
 
-#: ../libseahorse/seahorse-prefs.c:425
+#: ../libseahorse/seahorse-prefs.c:391
 msgid "None: Don't publish keys"
 msgstr "ææïäèçèåçå"
 
@@ -1178,54 +702,54 @@ msgstr "åæåçåä(_F):"
 msgid "_Publish keys to:"
 msgstr "çèåçåè(_P):"
 
-#: ../libseahorse/seahorse-progress.xml.h:1
-msgid "Progress Title"
-msgstr "éåæé"
+#: ../libseahorse/seahorse-transfer.c:178
+msgid "Retrieving data"
+msgstr "ååèæ"
+
+#: ../libseahorse/seahorse-transfer.c:178
+msgid "Exporting data"
+msgstr "ååèæ"
 
-#: ../libseahorse/seahorse-unknown.c:67
+#: ../libseahorse/seahorse-transfer.c:182
+msgid "Importing data"
+msgstr "èåèæ"
+
+#: ../libseahorse/seahorse-transfer.c:182
+msgid "Sending data"
+msgstr "åéèæ"
+
+#: ../libseahorse/seahorse-unknown.c:59
 msgid "Unavailable"
 msgstr "äåå"
 
-#: ../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:486
 msgid "Key Data"
 msgstr "åçåèæ"
 
-#: ../libseahorse/seahorse-util.c:518
+#: ../libseahorse/seahorse-util.c:488
 msgid "Multiple Keys"
 msgstr "åååçå"
 
-#: ../libseahorse/seahorse-util.c:774
-msgid "Couldn't run file-roller"
-msgstr "çæåè fille-roller"
-
-#: ../libseahorse/seahorse-util.c:780
-msgid "Couldn't package files"
-msgstr "ææçæåè"
-
-#: ../libseahorse/seahorse-util.c:781
-msgid "The file-roller process did not complete successfully"
-msgstr "file-roller çåçæåæ"
-
 #. Filter for PGP keys. We also include *.asc, as in many
 #. cases that extension is associated with text/plain
-#: ../libseahorse/seahorse-util.c:957
+#: ../libseahorse/seahorse-util.c:776
 msgid "All key files"
 msgstr "ææåçåæ"
 
-#: ../libseahorse/seahorse-util.c:968 ../libseahorse/seahorse-util.c:1016
+#: ../libseahorse/seahorse-util.c:787 ../libseahorse/seahorse-util.c:835
 #: ../pgp/seahorse-gpgme-photos.c:242
 msgid "All files"
 msgstr "ææææ"
 
-#: ../libseahorse/seahorse-util.c:1009
+#: ../libseahorse/seahorse-util.c:828
 msgid "Archive files"
 msgstr "åçæ"
 
-#: ../libseahorse/seahorse-util.c:1079
+#: ../libseahorse/seahorse-util.c:898
 msgid ""
 "<b>A file already exists with this name.</b>\n"
 "\n"
@@ -1235,52 +759,52 @@ msgstr ""
 "\n"
 "äæååæäæçææäåäåï"
 
-#: ../libseahorse/seahorse-util.c:1082
+#: ../libseahorse/seahorse-util.c:901
 msgid "_Replace"
 msgstr "åä(_R)"
 
 #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197
-#: ../pgp/seahorse-pgp-key-properties.c:1133
+#: ../pgp/seahorse-pgp-key-properties.c:1140
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:46
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:40
 msgid "Unknown"
 msgstr "äæ"
 
 #: ../libseahorse/seahorse-validity.c:42
-#: ../pgp/seahorse-pgp-key-properties.c:1139
+#: ../pgp/seahorse-pgp-key-properties.c:1146
 msgctxt "Validity"
 msgid "Never"
 msgstr "æä"
 
 #: ../libseahorse/seahorse-validity.c:44
-#: ../pgp/seahorse-pgp-key-properties.c:1146
+#: ../pgp/seahorse-pgp-key-properties.c:1153
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32
 msgid "Marginal"
 msgstr "åå"
 
 #: ../libseahorse/seahorse-validity.c:46
-#: ../pgp/seahorse-pgp-key-properties.c:1152
+#: ../pgp/seahorse-pgp-key-properties.c:1159
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26
 msgid "Full"
 msgstr "åå"
 
 #: ../libseahorse/seahorse-validity.c:48
-#: ../pgp/seahorse-pgp-key-properties.c:1158
+#: ../pgp/seahorse-pgp-key-properties.c:1165
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:45
 msgid "Ultimate"
 msgstr "åå"
 
 #: ../libseahorse/seahorse-validity.c:50
-#: ../pgp/seahorse-pgp-key-properties.c:1351
+#: ../pgp/seahorse-pgp-key-properties.c:1358
 msgid "Disabled"
 msgstr "ååç"
 
 #: ../libseahorse/seahorse-validity.c:52
-#: ../pgp/seahorse-pgp-key-properties.c:1347
+#: ../pgp/seahorse-pgp-key-properties.c:1354
 msgid "Revoked"
 msgstr "åæé"
 
-#: ../libseahorse/seahorse-widget.c:480
+#: ../libseahorse/seahorse-widget.c:461
 #, c-format
 msgid "Could not display help: %s"
 msgstr "çæéçèææäï%s"
@@ -1366,7 +890,7 @@ msgstr "çæåååé"
 msgid "Add subkey to %s"
 msgstr "åååéè %s"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:118
+#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:117
 msgid "DSA (sign only)"
 msgstr "DSA (åèçç)"
 
@@ -1374,7 +898,7 @@ msgstr "DSA (åèçç)"
 msgid "ElGamal (encrypt only)"
 msgstr "ElGamal (åèåå)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:119
+#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:118
 msgid "RSA (sign only)"
 msgstr "RSA (åèçç)"
 
@@ -1391,68 +915,64 @@ msgstr "çæååäçè id"
 msgid "Add user ID to %s"
 msgstr "ååäçè ID è %s"
 
-#: ../pgp/seahorse-gpgme.c:72
+#: ../pgp/seahorse-gpgme.c:69
 msgid "Decryption failed. You probably do not have the decryption key."
 msgstr "èååæãäåèææèåçåçåã"
 
-#: ../pgp/seahorse-gpgme-expires.c:58
+#: ../pgp/seahorse-gpgme-expires.c:57
 msgid "Invalid expiry date"
 msgstr "çæçåææ"
 
-#: ../pgp/seahorse-gpgme-expires.c:59
+#: ../pgp/seahorse-gpgme-expires.c:58
 msgid "The expiry date must be in the future"
 msgstr "åææåéåæä"
 
-#: ../pgp/seahorse-gpgme-expires.c:72
+#: ../pgp/seahorse-gpgme-expires.c:71
 msgid "Couldn't change expiry date"
 msgstr "çæææææææ"
 
-#: ../pgp/seahorse-gpgme-expires.c:131
+#: ../pgp/seahorse-gpgme-expires.c:130
 #, c-format
 msgid "Expiry: %s"
 msgstr "åææ: %s"
 
-#: ../pgp/seahorse-gpgme-generate.c:79
+#: ../pgp/seahorse-gpgme-generate.c:78
 msgid "PGP Key"
 msgstr "PGP åçå"
 
-#: ../pgp/seahorse-gpgme-generate.c:80
+#: ../pgp/seahorse-gpgme-generate.c:79
 msgid "Used to encrypt email and files"
 msgstr "çäååéäåææ"
 
-#: ../pgp/seahorse-gpgme-generate.c:116 ../ssh/seahorse-ssh-generate.xml.h:9
+#: ../pgp/seahorse-gpgme-generate.c:115 ../ssh/seahorse-ssh-generate.xml.h:9
 msgid "RSA"
 msgstr "RSA"
 
-#: ../pgp/seahorse-gpgme-generate.c:117
+#: ../pgp/seahorse-gpgme-generate.c:116
 msgid "DSA Elgamal"
 msgstr "DSA Elgamal"
 
-#: ../pgp/seahorse-gpgme-generate.c:135
+#: ../pgp/seahorse-gpgme-generate.c:165
 msgid "Couldn't generate PGP key"
 msgstr "çæçç PGP åçå"
 
-#: ../pgp/seahorse-gpgme-generate.c:195
+#: ../pgp/seahorse-gpgme-generate.c:196
 msgid "Passphrase for New PGP Key"
 msgstr "PGP åçåçåè"
 
-#: ../pgp/seahorse-gpgme-generate.c:196
+#: ../pgp/seahorse-gpgme-generate.c:197
 msgid "Enter the passphrase for your new key twice."
 msgstr "èåæåçåçåèåæã"
 
-#: ../pgp/seahorse-gpgme-generate.c:205
-msgid "Couldn't generate key"
-msgstr "çæççåçå"
-
-#: ../pgp/seahorse-gpgme-generate.c:207
+#: ../pgp/seahorse-gpgme-generate.c:206
 msgid "Generating key"
 msgstr "æåççåçå"
 
-#: ../pgp/seahorse-gpgme-key-op.c:301
+#: ../pgp/seahorse-gpgme-key-op.c:370
 msgid "Wrong password"
 msgstr "éèçåç"
 
-#: ../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 "éæäçäæèåéèçåçãèåèäæã"
 
@@ -1492,75 +1012,79 @@ msgstr "ææ JPEG ææ"
 msgid "Choose Photo to Add to Key"
 msgstr "éæååèåçåççç"
 
-#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294
+#: ../pgp/seahorse-gpgme-photos.c:278
+msgid "Couldn't prepare photo"
+msgstr "çææåçç"
+
+#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292
 msgid "Couldn't add photo"
 msgstr "çæååçç"
 
-#: ../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 "ææçæèåãåèçæçæå"
 
-#: ../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 "çåèåçåçéåççæéååéâ%sâçäçè IDï"
 
-#: ../pgp/seahorse-gpgme-photos.c:333
+#: ../pgp/seahorse-gpgme-photos.c:331
 msgid "Couldn't delete photo"
 msgstr "çæåéçç"
 
-#: ../pgp/seahorse-gpgme-revoke.c:70
+#: ../pgp/seahorse-gpgme-revoke.c:69
 msgid "Couldn't revoke subkey"
 msgstr "çææéåé"
 
-#: ../pgp/seahorse-gpgme-revoke.c:91
+#: ../pgp/seahorse-gpgme-revoke.c:90
 #, c-format
 msgid "Revoke: %s"
 msgstr "æé: %s"
 
-#: ../pgp/seahorse-gpgme-revoke.c:102
+#: ../pgp/seahorse-gpgme-revoke.c:101
 msgid "No reason"
 msgstr "ææåå"
 
-#: ../pgp/seahorse-gpgme-revoke.c:103
+#: ../pgp/seahorse-gpgme-revoke.c:102
 msgid "No reason for revoking key"
 msgstr "æææéåçåçåå"
 
-#: ../pgp/seahorse-gpgme-revoke.c:109
+#: ../pgp/seahorse-gpgme-revoke.c:108
 msgid "Compromised"
 msgstr "åææ"
 
-#: ../pgp/seahorse-gpgme-revoke.c:110
+#: ../pgp/seahorse-gpgme-revoke.c:109
 msgid "Key has been compromised"
 msgstr "åçååææ"
 
-#: ../pgp/seahorse-gpgme-revoke.c:116
+#: ../pgp/seahorse-gpgme-revoke.c:115
 msgid "Superseded"
 msgstr "åäæ"
 
-#: ../pgp/seahorse-gpgme-revoke.c:117
+#: ../pgp/seahorse-gpgme-revoke.c:116
 msgid "Key has been superseded"
 msgstr "åçååèäæ"
 
-#: ../pgp/seahorse-gpgme-revoke.c:123
+#: ../pgp/seahorse-gpgme-revoke.c:122
 msgid "Not Used"
 msgstr "ææäç"
 
-#: ../pgp/seahorse-gpgme-revoke.c:124
+#: ../pgp/seahorse-gpgme-revoke.c:123
 msgid "Key is no longer used"
 msgstr "åçåäåäç"
 
-#: ../pgp/seahorse-gpgme-revoke.c:161
+#: ../pgp/seahorse-gpgme-revoke.c:160
 #, c-format
 msgid ""
 "You are about to add %s as a revoker for %s. This operation cannot be "
 "undone! Are you sure you want to continue?"
 msgstr "äèç%2$s åå %1$s äçæéèãéåäçæååïçåèççï"
 
-#: ../pgp/seahorse-gpgme-revoke.c:173
+#: ../pgp/seahorse-gpgme-revoke.c:172
 msgid "Couldn't add revoker"
 msgstr "çæååæéè"
 
-#: ../pgp/seahorse-gpgme-sign.c:99
+#: ../pgp/seahorse-gpgme-sign.c:98
 #, c-format
 msgid ""
 "This key was already signed by\n"
@@ -1569,179 +1093,140 @@ msgstr ""
 "éååçååççäääåçç\n"
 "ã%sã"
 
-#: ../pgp/seahorse-gpgme-sign.c:103
+#: ../pgp/seahorse-gpgme-sign.c:102
 msgid "Couldn't sign key"
 msgstr "çæççåçå"
 
 #. TODO: We should be giving an error message that allows them to
 #. generate or import a key
-#: ../pgp/seahorse-gpgme-sign.c:157 ../pgp/seahorse-signer.c:61
+#: ../pgp/seahorse-gpgme-sign.c:156 ../pgp/seahorse-signer.c:60
 msgid "No keys usable for signing"
 msgstr "ææåçåèçäçç"
 
-#: ../pgp/seahorse-gpgme-sign.c:158
+#: ../pgp/seahorse-gpgme-sign.c:157
 msgid ""
 "You have no personal PGP keys that can be used to indicate your trust of "
 "this key."
 msgstr "äææåä PGP åçååääèäääæåçåã"
 
-#: ../pgp/seahorse-gpgme-source.c:99
+#: ../pgp/seahorse-gpgme-source.c:86
 #, c-format
 msgid "Wrong passphrase."
 msgstr "åèéèã"
 
-#: ../pgp/seahorse-gpgme-source.c:103
+#: ../pgp/seahorse-gpgme-source.c:90
 #, c-format
 msgid "Enter new passphrase for '%s'"
 msgstr "èåâ%sâçæåè"
 
-#: ../pgp/seahorse-gpgme-source.c:105
+#: ../pgp/seahorse-gpgme-source.c:92
 #, c-format
 msgid "Enter passphrase for '%s'"
 msgstr "èåâ%sâçåè"
 
-#: ../pgp/seahorse-gpgme-source.c:108
-#: ../src/seahorse-change-passphrase.xml.h:4
+#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4
 msgid "Enter new passphrase"
 msgstr "èåæçåè"
 
-#: ../pgp/seahorse-gpgme-source.c:110
+#: ../pgp/seahorse-gpgme-source.c:97
 msgid "Enter passphrase"
 msgstr "èååè"
 
-#. TODO: We can use the GPGME progress to make this more accurate
-#: ../pgp/seahorse-gpgme-source.c:722
+#: ../pgp/seahorse-gpgme-source.c:328
 #, c-format
 msgid "Loaded %d key"
 msgid_plural "Loaded %d keys"
 msgstr[0] "åèå %d ååçå"
 msgstr[1] "åèå %d ååçå"
 
-#: ../pgp/seahorse-gpgme-source.c:777
-msgid "Loading Keys..."
-msgstr "æåèååçåâ"
-
-#: ../pgp/seahorse-gpgme-source.c:820
+#: ../pgp/seahorse-gpgme-source.c:649
 msgid ""
 "Invalid key data (missing UIDs). This may be due to a computer with a date "
 "set in the future or a missing self-signature."
 msgstr "çæçåçåèæïéæä UIDïãéåèæéèçæéäæçïèçæäçæéïææéæäèèçççã"
 
-#: ../pgp/seahorse-gpgme-source.c:910 ../src/seahorse-key-manager.c:544
-msgid "Importing Keys"
-msgstr "åååçå"
-
-#: ../pgp/seahorse-gpgme-source.c:946
-msgid "Exporting Keys"
-msgstr "åååçå"
-
 #: ../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 åçåäæå"
+
+#: ../pgp/seahorse-hkp-source.c:680
 #, c-format
 msgid "Search was not specific enough. Server '%s' found too many keys."
 msgstr "æåçåéåãäæåâ%sâäæååååçåã"
 
-#: ../pgp/seahorse-hkp-source.c:389
+#: ../pgp/seahorse-hkp-source.c:683
 #, c-format
 msgid "Couldn't communicate with server '%s': %s"
 msgstr "çæèäæåâ%sâèçï%s"
 
-#: ../pgp/seahorse-hkp-source.c:671
-msgid "Searching for keys..."
-msgstr "æåæååçåâ"
-
-#: ../pgp/seahorse-hkp-source.c:759
-msgid "Uploading keys..."
-msgstr "æåäååçåâ"
-
-#: ../pgp/seahorse-hkp-source.c:857
-msgid "Retrieving keys..."
-msgstr "æååååçåâ"
-
-#: ../pgp/seahorse-hkp-source.c:987
+#: ../pgp/seahorse-ldap-source.c:440
 #, c-format
-msgid "Searching for keys on: %s"
-msgstr "æåå %s çåçå"
+msgid "Couldn't communicate with '%s': %s"
+msgstr "çæèâ%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 "éæåï%s"
 
-#: ../pgp/seahorse-hkp-source.c:1184
-msgid "HTTP Key Server"
-msgstr "HTTP åçåäæå"
-
-#: ../pgp/seahorse-ldap-source.c:459
-#, c-format
-msgid "Couldn't communicate with '%s': %s"
-msgstr "çæèâ%sâæéï%s"
-
-#: ../pgp/seahorse-ldap-source.c:641
+#: ../pgp/seahorse-ldap-source.c:657
 #, c-format
 msgid "Couldn't resolve address: %s"
 msgstr "çæèæäçï%s"
 
-#: ../pgp/seahorse-ldap-source.c:719
+#: ../pgp/seahorse-ldap-source.c:701
 #, c-format
 msgid "Resolving server address: %s"
 msgstr "æåèæäæåäåï%s"
 
-#: ../pgp/seahorse-ldap-source.c:955
-#, c-format
-msgid "Searching for keys containing '%s'..."
-msgstr "æåæååæâ%sâçåçåâ"
-
-#: ../pgp/seahorse-ldap-source.c:983
-#, c-format
-msgid "Searching for key id '%s'..."
-msgstr "æåæå id çâ%sâçåçåâ"
-
-#: ../pgp/seahorse-ldap-source.c:1089
-msgid "Retrieving remote keys..."
-msgstr "æåååéçåçåâ"
-
-#: ../pgp/seahorse-ldap-source.c:1221
-msgid "Sending keys to key server..."
-msgstr "æååéåçåååçåäæå"
-
-#: ../pgp/seahorse-ldap-source.c:1423
+#: ../pgp/seahorse-ldap-source.c:781
 msgid "LDAP Key Server"
 msgstr "LDAP åçåäæå"
 
-#: ../pgp/seahorse-pgp-commands.c:103
+#: ../pgp/seahorse-pgp-commands.c:104
 msgid "_Sign Key..."
 msgstr "ççåçå(_S)â"
 
-#: ../pgp/seahorse-pgp-commands.c:103
+#: ../pgp/seahorse-pgp-commands.c:104
 msgid "Sign public key"
 msgstr "ççåéåçå"
 
-#: ../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 "çåèæäååé %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 "çåèå %d ååçåèèåèåæäååéåï"
 
-#: ../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 "äçåèæäåé %d ååçåï"
 
-#: ../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 "äçåèæäåé %d åèåèåï"
 
+#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:253
+msgid "Couldn't delete user ID"
+msgstr "çæåéäçè ID"
+
+#: ../pgp/seahorse-pgp-commands.c:205
+msgid "Couldn't delete private key"
+msgstr "çæåéçååçå"
+
+#: ../pgp/seahorse-pgp-commands.c:208
+msgid "Couldn't delete public key"
+msgstr "çæåéåéåçå"
+
 #: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1
 msgid "<b>_Advanced key options</b>"
 msgstr "<b>ééåçåéé</b>(_A)"
@@ -1786,122 +1271,132 @@ msgstr "æå PGP åçå"
 msgid "_Comment:"
 msgstr "éè(_C):"
 
-#: ../pgp/seahorse-pgp-key.c:201
+#: ../pgp/seahorse-pgp-key.c:200
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38
 msgid "Private PGP Key"
 msgstr "çä PGP åçå"
 
-#: ../pgp/seahorse-pgp-key.c:204
+#: ../pgp/seahorse-pgp-key.c:203
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34
 msgid "Public PGP Key"
 msgstr "åå PGP åçå"
 
-#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1349
+#: ../pgp/seahorse-pgp-key.c:582 ../pgp/seahorse-pgp-key-properties.c:1356
 msgid "Expired"
 msgstr "åéæ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:224
+#: ../pgp/seahorse-pgp-key-properties.c:226
 msgid "Couldn't change primary user ID"
 msgstr "çæææäèçäçè ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:241
+#: ../pgp/seahorse-pgp-key-properties.c:243
 #, c-format
 msgid "Are you sure you want to permanently delete the '%s' user ID?"
 msgstr "çåèæäååéâ%sâçäçè IDï"
 
-#: ../pgp/seahorse-pgp-key-properties.c:251
-msgid "Couldn't delete user ID"
-msgstr "çæåéäçè ID"
-
-#: ../pgp/seahorse-pgp-key-properties.c:333
-#: ../pgp/seahorse-pgp-key-properties.c:1464
+#: ../pgp/seahorse-pgp-key-properties.c:335
+#: ../pgp/seahorse-pgp-key-properties.c:1471
 msgid "[Unknown]"
 msgstr "[äè]"
 
-#: ../pgp/seahorse-pgp-key-properties.c:426
-#: ../pgp/seahorse-pgp-key-properties.c:1742
+#: ../pgp/seahorse-pgp-key-properties.c:435
+#: ../pgp/seahorse-pgp-key-properties.c:1751
 msgid "Name/Email"
 msgstr "åç/éé"
 
-#: ../pgp/seahorse-pgp-key-properties.c:431
+#: ../pgp/seahorse-pgp-key-properties.c:440
 msgid "Signature ID"
 msgstr "çç ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:552
+#: ../pgp/seahorse-pgp-key-properties.c:561
 msgid "Couldn't change primary photo"
 msgstr "çæææäèççç"
 
-#: ../pgp/seahorse-pgp-key-properties.c:775
+#: ../pgp/seahorse-pgp-key-properties.c:784
 msgid "(unknown)"
 msgstr "ïäæï"
 
-#: ../pgp/seahorse-pgp-key-properties.c:778
+#: ../pgp/seahorse-pgp-key-properties.c:787
 #, c-format
 msgid "This key expired on: %s"
 msgstr "æåçåçéææï%s"
 
-#: ../pgp/seahorse-pgp-key-properties.c:946
+#: ../pgp/seahorse-pgp-key-properties.c:848
+#: ../src/seahorse-key-manager-store.c:829
+msgid "Name"
+msgstr "åç"
+
+#: ../pgp/seahorse-pgp-key-properties.c:955
 #, c-format
 msgid "Are you sure you want to permanently delete subkey %d of %s?"
 msgstr "çåèæäååé %2$s çåé %1$dï"
 
-#: ../pgp/seahorse-pgp-key-properties.c:955
+#: ../pgp/seahorse-pgp-key-properties.c:964
 msgid "Couldn't delete subkey"
 msgstr "çæåéåé"
 
-#: ../pgp/seahorse-pgp-key-properties.c:991
-#: ../pgp/seahorse-pgp-key-properties.c:1427
+#: ../pgp/seahorse-pgp-key-properties.c:1000
+#: ../pgp/seahorse-pgp-key-properties.c:1434
 msgid "Unable to change trust"
 msgstr "çæææääå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1006 ../src/seahorse-viewer.c:290
-#: ../ssh/seahorse-ssh-key-properties.c:168
+#: ../pgp/seahorse-pgp-key-properties.c:1015 ../src/seahorse-viewer.c:296
+#: ../ssh/seahorse-ssh-key-properties.c:184
 #, c-format
 msgid "Couldn't export key to \"%s\""
 msgstr "çæåååçåèâ%sâ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1035
-#: ../ssh/seahorse-ssh-key-properties.c:193
+#: ../pgp/seahorse-pgp-key-properties.c:1043
+#: ../ssh/seahorse-ssh-key-properties.c:208
 msgid "Export Complete Key"
 msgstr "ååæååçå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1060
-#: ../ssh/seahorse-ssh-key-properties.c:215
+#: ../pgp/seahorse-pgp-key-properties.c:1068
+#: ../ssh/seahorse-ssh-key-properties.c:230
 msgid "Couldn't export key."
 msgstr "çæåååçåã"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1267
-#: ../pgp/seahorse-pgp-key-properties.c:1356
+#: ../pgp/seahorse-pgp-key-properties.c:1274
+#: ../pgp/seahorse-pgp-key-properties.c:1363
 msgctxt "Expires"
 msgid "Never"
 msgstr "æä"
 
+#: ../pgp/seahorse-pgp-key-properties.c:1321
+msgid "ID"
+msgstr "ID"
+
 #. The key type column
-#: ../pgp/seahorse-pgp-key-properties.c:1317
-#: ../src/seahorse-key-manager-store.c:896
+#: ../pgp/seahorse-pgp-key-properties.c:1324
+#: ../src/seahorse-key-manager-store.c:860
 msgid "Type"
 msgstr "éå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1320
+#: ../pgp/seahorse-pgp-key-properties.c:1327
 msgid "Created"
 msgstr "åçææ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1323
+#: ../pgp/seahorse-pgp-key-properties.c:1330
 msgid "Expires"
 msgstr "ææææ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1326
+#: ../pgp/seahorse-pgp-key-properties.c:1333
 msgid "Status"
 msgstr "çæ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1329
+#: ../pgp/seahorse-pgp-key-properties.c:1336
 msgid "Strength"
 msgstr "åå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1353
+#: ../pgp/seahorse-pgp-key-properties.c:1360
 msgid "Good"
 msgstr "èå"
 
+#: ../pgp/seahorse-pgp-key-properties.c:1754
+#: ../src/seahorse-key-manager-store.c:841
+msgid "Key ID"
+msgstr "åçå ID"
+
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:1
 msgid "<b>Actions</b>"
 msgstr "<b>åä</b>"
@@ -2136,7 +1631,7 @@ msgstr "ååç"
 
 #. Trust column
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37
-#: ../src/seahorse-key-manager-store.c:890
+#: ../src/seahorse-key-manager-store.c:854
 msgid "Trust"
 msgstr "ää"
 
@@ -2185,7 +1680,7 @@ msgstr "æéåçåçåå"
 msgid "_Reason:"
 msgstr "åå(_R):"
 
-#: ../pgp/seahorse-signer.c:62
+#: ../pgp/seahorse-signer.c:61
 msgid ""
 "You have no personal PGP keys that can be used to sign a document or message."
 msgstr "äææ  PGP åçååçäççæäæèæã"
@@ -2272,23 +1767,31 @@ msgstr "éååå(_V)"
 msgid "_Sign message with key:"
 msgstr "ççäæçåçå(_S):"
 
-#: ../pkcs11/seahorse-pkcs11-certificate.c:106
+#: ../pkcs11/seahorse-pkcs11-certificate.c:109
 #: ../pkcs11/seahorse-pkcs11-certificate-props.c:66
 msgid "Certificate"
 msgstr "èæ"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:108
+#: ../pkcs11/seahorse-pkcs11-commands.c:106
+msgid "Couldn't delete"
+msgstr "çæåé"
+
+#: ../pkcs11/seahorse-pkcs11-commands.c:127
 #, c-format
 msgid "Are you sure you want to delete the certificate '%s'?"
 msgstr "çåèåééåèæã%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] "çåèåé %d åèæï"
 msgstr[1] "çåèåé %d åèæï"
 
+#: ../pkcs11/seahorse-pkcs11-commands.c:143
+msgid "Deleting"
+msgstr "åé"
+
 #: ../src/seahorse-change-passphrase.xml.h:1
 msgid "Change Passphrase"
 msgstr "ææåè"
@@ -2309,7 +1812,7 @@ msgstr "æçåè(_P):"
 msgid "Manage your passwords and encryption keys"
 msgstr "ççåçååçå"
 
-#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:862
+#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:850
 msgid "Passwords and Encryption Keys"
 msgstr "åçååååçå"
 
@@ -2325,111 +1828,115 @@ msgstr "çç(_O)"
 msgid "Create New ..."
 msgstr "åçæçâ"
 
-#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108
+#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:109
 #, c-format
 msgid "Selected %d key"
 msgid_plural "Selected %d keys"
 msgstr[0] "åéå %d ååçå"
 msgstr[1] "åéå %d ååçå"
 
-#: ../src/seahorse-key-manager.c:410 ../src/seahorse-key-manager.c:470
-#: ../src/seahorse-key-manager.c:533 ../src/seahorse-viewer.c:458
+#: ../src/seahorse-key-manager.c:413 ../src/seahorse-key-manager.c:471
+#: ../src/seahorse-key-manager.c:532 ../src/seahorse-viewer.c:451
 msgid "Couldn't import keys"
 msgstr "çæåååçå"
 
-#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:463
+#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:453
 msgid "Imported keys"
 msgstr "ååçåçå"
 
-#: ../src/seahorse-key-manager.c:464
+#: ../src/seahorse-key-manager.c:466
 msgid "Importing keys"
 msgstr "æååååçå"
 
-#: ../src/seahorse-key-manager.c:487 ../ssh/seahorse-ssh-operation.c:1017
+#: ../src/seahorse-key-manager.c:486 ../ssh/seahorse-ssh-operation.c:1089
 msgid "Import Key"
 msgstr "åååçå"
 
-#: ../src/seahorse-key-manager.c:533
+#: ../src/seahorse-key-manager.c:532
 msgid "Unrecognized key type, or invalid data format"
 msgstr "çæèåçåçåéåïææçæçèææå"
 
-#: ../src/seahorse-key-manager.c:731 ../src/seahorse-keyserver-results.c:245
+#: ../src/seahorse-key-manager.c:547
+msgid "Importing Keys"
+msgstr "åååçå"
+
+#: ../src/seahorse-key-manager.c:719 ../src/seahorse-keyserver-results.c:247
 msgid "_Remote"
 msgstr "éç(_R)"
 
-#: ../src/seahorse-key-manager.c:733
+#: ../src/seahorse-key-manager.c:721
 msgid "Close this program"
 msgstr "ééæçå"
 
-#: ../src/seahorse-key-manager.c:734
+#: ../src/seahorse-key-manager.c:722
 msgid "_New..."
 msgstr "æå(_N)â"
 
-#: ../src/seahorse-key-manager.c:735
+#: ../src/seahorse-key-manager.c:723
 msgid "Create a new key or item"
 msgstr "åçæçåçåæéç"
 
-#: ../src/seahorse-key-manager.c:736
+#: ../src/seahorse-key-manager.c:724
 msgid "_Import..."
 msgstr "åå(_I)â"
 
-#: ../src/seahorse-key-manager.c:737
+#: ../src/seahorse-key-manager.c:725
 msgid "Import from a file"
 msgstr "çææåå"
 
-#: ../src/seahorse-key-manager.c:739
+#: ../src/seahorse-key-manager.c:727
 msgid "Import from the clipboard"
 msgstr "ååèçåå"
 
-#: ../src/seahorse-key-manager.c:744 ../src/seahorse-keyserver-results.c:255
+#: ../src/seahorse-key-manager.c:732 ../src/seahorse-keyserver-results.c:257
 msgid "_Find Remote Keys..."
 msgstr "åæéçåçå(_F)â"
 
-#: ../src/seahorse-key-manager.c:745 ../src/seahorse-keyserver-results.c:256
+#: ../src/seahorse-key-manager.c:733 ../src/seahorse-keyserver-results.c:258
 msgid "Search for keys on a key server"
 msgstr "ååçåäæååæåçå"
 
-#: ../src/seahorse-key-manager.c:746
+#: ../src/seahorse-key-manager.c:734
 msgid "_Sync and Publish Keys..."
 msgstr "åæåçèåçå(_S)â"
 
-#: ../src/seahorse-key-manager.c:747
+#: ../src/seahorse-key-manager.c:735
 msgid "Publish and/or synchronize your keys with those online."
 msgstr "åçæçèå/æååçååæ"
 
-#: ../src/seahorse-key-manager.c:752
+#: ../src/seahorse-key-manager.c:740
 msgid "T_ypes"
 msgstr "éå(_Y)"
 
-#: ../src/seahorse-key-manager.c:752
+#: ../src/seahorse-key-manager.c:740
 msgid "Show type column"
 msgstr "éçéåæä"
 
-#: ../src/seahorse-key-manager.c:754
+#: ../src/seahorse-key-manager.c:742
 msgid "_Expiry"
 msgstr "ææææ(_E)"
 
-#: ../src/seahorse-key-manager.c:754
+#: ../src/seahorse-key-manager.c:742
 msgid "Show expiry column"
 msgstr "éçæææææä"
 
-#: ../src/seahorse-key-manager.c:756
+#: ../src/seahorse-key-manager.c:744
 msgid "_Trust"
 msgstr "ää(_T)"
 
-#: ../src/seahorse-key-manager.c:756
+#: ../src/seahorse-key-manager.c:744
 msgid "Show owner trust column"
 msgstr "éçääæä"
 
-#: ../src/seahorse-key-manager.c:758
+#: ../src/seahorse-key-manager.c:746
 msgid "_Validity"
 msgstr "æææ(_V)"
 
-#: ../src/seahorse-key-manager.c:758
+#: ../src/seahorse-key-manager.c:746
 msgid "Show validity column"
 msgstr "éçææææä"
 
-#: ../src/seahorse-key-manager.c:931
+#: ../src/seahorse-key-manager.c:923
 msgid "Filter:"
 msgstr "éææä:"
 
@@ -2457,7 +1964,7 @@ msgstr "åäåçå(_K)"
 msgid "To get started with encryption you will need keys."
 msgstr "éååååäéèææåçåã"
 
-#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:522
+#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:516
 msgid "_Import"
 msgstr "åå(_I)"
 
@@ -2465,44 +1972,44 @@ msgstr "åå(_I)"
 msgid "_Passwords"
 msgstr "åç(_P)"
 
-#: ../src/seahorse-key-manager-store.c:685 ../src/seahorse-viewer.c:256
+#: ../src/seahorse-key-manager-store.c:637 ../src/seahorse-viewer.c:261
 msgid "Couldn't export keys"
 msgstr "çæååéé"
 
-#: ../src/seahorse-key-manager-store.c:883
+#: ../src/seahorse-key-manager-store.c:847
 msgid "Validity"
 msgstr "æææ"
 
 #. Expiry date column
-#: ../src/seahorse-key-manager-store.c:902
+#: ../src/seahorse-key-manager-store.c:866
 msgid "Expiration Date"
 msgstr "ææææ"
 
-#: ../src/seahorse-keyserver-results.c:247
+#: ../src/seahorse-keyserver-results.c:249
 msgid "Close this window"
 msgstr "ééæèç"
 
-#: ../src/seahorse-keyserver-results.c:248
+#: ../src/seahorse-keyserver-results.c:250
 msgid "_Expand All"
 msgstr "åéåé(_E)"
 
-#: ../src/seahorse-keyserver-results.c:249
+#: ../src/seahorse-keyserver-results.c:251
 msgid "Expand all listings"
 msgstr "åéæåæå"
 
-#: ../src/seahorse-keyserver-results.c:250
+#: ../src/seahorse-keyserver-results.c:252
 msgid "_Collapse All"
 msgstr "åéæè(_C)"
 
-#: ../src/seahorse-keyserver-results.c:251
+#: ../src/seahorse-keyserver-results.c:253
 msgid "Collapse all listings"
 msgstr "æèæåæå"
 
-#: ../src/seahorse-keyserver-results.c:322
+#: ../src/seahorse-keyserver-results.c:324
 msgid "Remote Keys"
 msgstr "éçåçå"
 
-#: ../src/seahorse-keyserver-results.c:324
+#: ../src/seahorse-keyserver-results.c:326
 #, c-format
 msgid "Remote Keys Containing '%s'"
 msgstr "éçåçåååâ%sâ"
@@ -2537,11 +2044,11 @@ msgstr "æå(_S)"
 msgid "_Search for keys containing: "
 msgstr "æååçååå(_S):"
 
-#: ../src/seahorse-keyserver-sync.c:45
+#: ../src/seahorse-keyserver-sync.c:52
 msgid "Couldn't publish keys to server"
 msgstr "çæçèåçååäæå"
 
-#: ../src/seahorse-keyserver-sync.c:61
+#: ../src/seahorse-keyserver-sync.c:71
 #, c-format
 msgid "Couldn't retrieve keys from server: %s"
 msgstr "çæåäæåäåååçåï%s"
@@ -2553,12 +2060,7 @@ msgid_plural "<b>%d keys are selected for synchronizing</b>"
 msgstr[0] "<b>éæä %d ååçåäéèåæ</b>"
 msgstr[1] "<b>éæä %d ååçåäéèåæ</b>"
 
-#: ../src/seahorse-keyserver-sync.c:216
-msgid "Synchronizing keys"
-msgstr "åçåæååæâ"
-
-#. Show the progress window if necessary
-#: ../src/seahorse-keyserver-sync.c:248
+#: ../src/seahorse-keyserver-sync.c:241
 msgid "Synchronizing keys..."
 msgstr "åçåæååæâ"
 
@@ -2588,19 +2090,19 @@ msgstr "åçåäæå(_K)"
 msgid "_Sync"
 msgstr "åæ(_S)"
 
-#: ../src/seahorse-main.c:62
+#: ../src/seahorse-main.c:60
 msgid "Version of this application"
 msgstr "éåæççåççæ"
 
-#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:144
+#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:145
 msgid "Encryption Key Manager"
 msgstr "åçåççå"
 
-#: ../src/seahorse-viewer.c:120
+#: ../src/seahorse-viewer.c:121
 msgid "Contributions:"
 msgstr "èçè:"
 
-#: ../src/seahorse-viewer.c:146
+#: ../src/seahorse-viewer.c:147
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -2609,111 +2111,103 @@ msgstr ""
 "\n"
 "Woodman Tuen <wmtuen gmail com>, 2005-07"
 
-#: ../src/seahorse-viewer.c:149
+#: ../src/seahorse-viewer.c:150
 msgid "Seahorse Project Homepage"
 msgstr "Seahorse åæçé"
 
 #. Top menu items
-#: ../src/seahorse-viewer.c:168
+#: ../src/seahorse-viewer.c:170
 msgid "_File"
 msgstr "ææ(_F)"
 
-#: ../src/seahorse-viewer.c:169
+#: ../src/seahorse-viewer.c:171
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../src/seahorse-viewer.c:170
+#: ../src/seahorse-viewer.c:172
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../src/seahorse-viewer.c:171
+#: ../src/seahorse-viewer.c:173
 msgid "_Help"
 msgstr "æå(_H)"
 
-#: ../src/seahorse-viewer.c:173
+#: ../src/seahorse-viewer.c:175
 msgid "Prefere_nces"
 msgstr "ååèå(_N)"
 
-#: ../src/seahorse-viewer.c:174
+#: ../src/seahorse-viewer.c:176
 msgid "Change preferences for this program"
 msgstr "æææçåçååèå"
 
-#: ../src/seahorse-viewer.c:177
+#: ../src/seahorse-viewer.c:179
 msgid "About this program"
 msgstr "éææçå"
 
-#: ../src/seahorse-viewer.c:178
+#: ../src/seahorse-viewer.c:180
 msgid "_Contents"
 msgstr "åå(_C)"
 
-#: ../src/seahorse-viewer.c:179
+#: ../src/seahorse-viewer.c:181
 msgid "Show Seahorse help"
 msgstr "éç Seahorse çèææä"
 
-#: ../src/seahorse-viewer.c:276
+#: ../src/seahorse-viewer.c:282
 msgid "Export public key"
 msgstr "åååéåçå"
 
-#: ../src/seahorse-viewer.c:296
+#: ../src/seahorse-viewer.c:303
 msgid "Exporting keys"
 msgstr "æååååçå"
 
-#: ../src/seahorse-viewer.c:321
+#: ../src/seahorse-viewer.c:332
 msgid "Couldn't retrieve data from key server"
 msgstr "çæååçåäæåäååèæ"
 
 #. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys"
-#: ../src/seahorse-viewer.c:340
+#: ../src/seahorse-viewer.c:344
 msgid "Copied keys"
 msgstr "èèçåçå"
 
-#: ../src/seahorse-viewer.c:360
+#: ../src/seahorse-viewer.c:369
 msgid "Retrieving keys"
 msgstr "æååååçå"
 
-#: ../src/seahorse-viewer.c:375
-msgid "Couldn't delete."
-msgstr "çæåéã"
-
-#: ../src/seahorse-viewer.c:409
-msgid "Deleting..."
-msgstr "æååéâ"
-
-#: ../src/seahorse-viewer.c:435
+#: ../src/seahorse-viewer.c:424
 #, c-format
 msgid "%s is a private key. Are you sure you want to proceed?"
 msgstr "%s æäåçååçåãäçåèççï"
 
-#: ../src/seahorse-viewer.c:483
+#: ../src/seahorse-viewer.c:478
 msgid "Importing keys from key servers"
 msgstr "ååçåäæååååçå"
 
-#: ../src/seahorse-viewer.c:509
+#: ../src/seahorse-viewer.c:503
 msgid "Show properties"
 msgstr "éçåæ"
 
-#: ../src/seahorse-viewer.c:510
+#: ../src/seahorse-viewer.c:504
 msgctxt "This text refers to deleting an item from its type's backing store."
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/seahorse-viewer.c:511
+#: ../src/seahorse-viewer.c:505
 msgid "Delete selected items"
 msgstr "åééåçéç"
 
-#: ../src/seahorse-viewer.c:515
+#: ../src/seahorse-viewer.c:509
 msgid "E_xport..."
 msgstr "åå(_X)â"
 
-#: ../src/seahorse-viewer.c:516
+#: ../src/seahorse-viewer.c:510
 msgid "Export to a file"
 msgstr "ååçææ"
 
-#: ../src/seahorse-viewer.c:518
+#: ../src/seahorse-viewer.c:512
 msgid "Copy to the clipboard"
 msgstr "èèååèç"
 
-#: ../src/seahorse-viewer.c:523
+#: ../src/seahorse-viewer.c:517
 msgid "Import selected keys to local key ring"
 msgstr "åååéçåçååææåçåå"
 
@@ -2721,40 +2215,44 @@ msgstr "åååéçåçååææåçåå"
 msgid "Enter your Secure Shell passphrase:"
 msgstr "èåäç SSH åè:"
 
-#: ../ssh/seahorse-ssh-commands.c:85
+#: ../ssh/seahorse-ssh-commands.c:86
 msgid "Configure Key for _Secure Shell..."
 msgstr "æåèå _SSH åçåâ"
 
-#: ../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."
 msgstr "ååå SSH åçååéçååéèïåèäçèåçåçåã"
 
-#: ../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 "çåèåé SSH ééã%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 "çåèåé %d å SSH åçåï"
 
-#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91
-#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19
+#: ../ssh/seahorse-ssh-commands.c:133
+msgid "Couldn't delete key"
+msgstr "çæåéåçå"
+
+#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:92
+#: ../ssh/seahorse-ssh-key.c:96 ../ssh/seahorse-ssh-key-properties.xml.h:19
 msgid "Secure Shell Key"
 msgstr "SSH åçå"
 
-#: ../ssh/seahorse-ssh-generate.c:60
+#: ../ssh/seahorse-ssh-generate.c:61
 msgid "Used to access other computers (eg: via a terminal)"
 msgstr "çäååååéèïåççæï"
 
-#: ../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 "çæçç SSH åçå"
 
-#: ../ssh/seahorse-ssh-generate.c:213
+#: ../ssh/seahorse-ssh-generate.c:203
 msgid "Creating Secure Shell Key"
 msgstr "æåçç SSH åçå"
 
@@ -2796,31 +2294,31 @@ msgstr "åæåçåçå(_J)"
 msgid "_Key Description:"
 msgstr "åçåæè(_K):"
 
-#: ../ssh/seahorse-ssh-key.c:87
+#: ../ssh/seahorse-ssh-key.c:88
 msgid "(Unreadable Secure Shell Key)"
 msgstr "ïäèèåç SSH åçåï"
 
-#: ../ssh/seahorse-ssh-key.c:105
+#: ../ssh/seahorse-ssh-key.c:106
 msgid "Invalid"
 msgstr "çæ"
 
-#: ../ssh/seahorse-ssh-key.c:116
+#: ../ssh/seahorse-ssh-key.c:117
 msgid "Private Secure Shell Key"
 msgstr "çä SSH åçå"
 
-#: ../ssh/seahorse-ssh-key.c:119
+#: ../ssh/seahorse-ssh-key.c:120
 msgid "Public Secure Shell Key"
 msgstr "åå SSH åçå"
 
-#: ../ssh/seahorse-ssh-key-properties.c:71
+#: ../ssh/seahorse-ssh-key-properties.c:62
 msgid "Couldn't rename key."
 msgstr "åçåçæéæååã"
 
-#: ../ssh/seahorse-ssh-key-properties.c:112
+#: ../ssh/seahorse-ssh-key-properties.c:115
 msgid "Couldn't change authorization for key."
 msgstr "çæææåçåçèèã"
 
-#: ../ssh/seahorse-ssh-key-properties.c:127
+#: ../ssh/seahorse-ssh-key-properties.c:150
 msgid "Couldn't change passphrase for key."
 msgstr "çæææåçåçåèã"
 
@@ -2865,77 +2363,71 @@ msgstr "æåçåçææèèææéææéè(_A)"
 msgid "Used to connect to other computers."
 msgstr "çäéæååéèã"
 
-#: ../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 "SSH åçå"
+
+#: ../ssh/seahorse-ssh-operation.c:262
 msgid "The SSH command was terminated unexpectedly."
 msgstr "SSH æäåçæéæääæã"
 
-#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739
+#: ../ssh/seahorse-ssh-operation.c:270
 msgid "The SSH command failed."
 msgstr "SSH æäåæã"
 
-#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477
-msgid "Secure Shell key"
-msgstr "SSH åçå"
-
-#: ../ssh/seahorse-ssh-operation.c:448
-msgid "Passphrase:"
-msgstr "åèï"
-
 #. Just prompt over and over again
-#: ../ssh/seahorse-ssh-operation.c:762
+#: ../ssh/seahorse-ssh-operation.c:678
 msgid "Remote Host Password"
 msgstr "éçäæåç "
 
-#: ../ssh/seahorse-ssh-operation.c:850
+#: ../ssh/seahorse-ssh-operation.c:808
 msgid "Old Key Passphrase"
 msgstr "èåçååè"
 
-#: ../ssh/seahorse-ssh-operation.c:851
+#: ../ssh/seahorse-ssh-operation.c:809
 #, c-format
 msgid "Enter the old passphrase for: %s"
 msgstr "èå %s çèåè"
 
-#: ../ssh/seahorse-ssh-operation.c:855
+#: ../ssh/seahorse-ssh-operation.c:813
 msgid "New Key Passphrase"
 msgstr "æçåçååè"
 
-#: ../ssh/seahorse-ssh-operation.c:856
+#: ../ssh/seahorse-ssh-operation.c:814
 #, c-format
 msgid "Enter the new passphrase for: %s"
 msgstr "èå %s çæåè"
 
-#: ../ssh/seahorse-ssh-operation.c:864
+#: ../ssh/seahorse-ssh-operation.c:822
 msgid "Enter Key Passphrase"
 msgstr "èååçååè"
 
-#: ../ssh/seahorse-ssh-operation.c:931
+#: ../ssh/seahorse-ssh-operation.c:942
 msgid "Passphrase for New Secure Shell Key"
 msgstr "æç SSH åçåçåè"
 
-#: ../ssh/seahorse-ssh-operation.c:932
+#: ../ssh/seahorse-ssh-operation.c:943
 msgid "Enter a passphrase for your new Secure Shell key."
 msgstr "èåæç SSH åçåçåèã"
 
-#: ../ssh/seahorse-ssh-operation.c:1013
+#: ../ssh/seahorse-ssh-operation.c:1085
 #, c-format
 msgid "Importing key: %s"
 msgstr "åååçåï%s"
 
-#: ../ssh/seahorse-ssh-operation.c:1015
+#: ../ssh/seahorse-ssh-operation.c:1087
 msgid "Importing key. Enter passphrase"
 msgstr "æååååçåïèèååè"
 
-#: ../ssh/seahorse-ssh-source.c:825
+#: ../ssh/seahorse-ssh-source.c:915
 msgid "No private key file is available for this key."
 msgstr "éååçåææåçççååçåã"
 
-#: ../ssh/seahorse-ssh-upload.c:45
+#: ../ssh/seahorse-ssh-upload.c:47
 msgid "Couldn't configure Secure Shell keys on remote computer."
 msgstr "åéçéèçæèå SSH åçå"
 
-#. Show the progress window if necessary
-#: ../ssh/seahorse-ssh-upload.c:181
+#: ../ssh/seahorse-ssh-upload.c:132
 msgid "Configuring Secure Shell Keys..."
 msgstr "æåèå SSH åçå"
 
@@ -2965,6 +2457,399 @@ msgstr "çååç(_L):"
 msgid "_Set Up"
 msgstr "èå(_S)"
 
+#~ msgid "Do not run seahorse-daemon as a daemon"
+#~ msgstr "äääæçååååè seahorse-daemon"
+
+#~ msgid "couldn't fork process"
+#~ msgstr "çæåçåçå"
+
+#~ msgid "couldn't create new process group"
+#~ msgstr "çæåçæççåçç"
+
+#~ msgid "Encryption Daemon (Seahorse)"
+#~ msgstr "ååäæçå (Seahorse)"
+
+#~ msgid "Invalid or unrecognized key type: %s"
+#~ msgstr "çææçæçèçéééåï%s"
+
+#~ msgid "This keytype is not supported: %s"
+#~ msgstr "éåéééåæäææçï%s"
+
+#~ msgid "Support for this feature was not enabled at build time"
+#~ msgstr "çèæææåçåéååèçææ"
+
+#~ msgid "Invalid or unrecognized key: %s"
+#~ msgstr "çææçæçèçééï%s"
+
+#~ msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
+#~ msgstr "ç <i><key id=â%sâ/> ççïæ %s éæã"
+
+#~ msgid "Invalid Signature"
+#~ msgstr "çæççç"
+
+#~ msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
+#~ msgstr "ç <i><key id=â%sâ/>æ %s ççï<b>åéæ</b>ã"
+
+#~ msgid "Expired Signature"
+#~ msgstr "åéæççç"
+
+#~ msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
+#~ msgstr "ç <i><key id=â%sâ/>ççïæ %s æéã"
+
+#~ msgid "Revoked Signature"
+#~ msgstr "ççåæé"
+
+#~ msgid "Signed by <i><key id='%s'/></i> on %s."
+#~ msgstr "ç <i><key id=â%sâ/>æ %s ççã"
+
+#~ msgid "Good Signature"
+#~ msgstr "ååççç"
+
+#~ msgid "Signing key not in keyring."
+#~ msgstr "ççééäéåéåååã"
+
+#~ msgid "Unknown Signature"
+#~ msgstr "äæççç"
+
+#~ msgid "Bad or forged signature. The signed data was modified."
+#~ msgstr "æåææåéçççãççèæåèäæã"
+
+#~ msgid "Bad Signature"
+#~ msgstr "æåççç"
+
+#~ msgid "Couldn't verify signature."
+#~ msgstr "çæéèççã"
+
+#~ msgid "Invalid or unrecognized signer: %s"
+#~ msgstr "çææçæèèçççèï%s"
+
+#~ msgid "Key is not valid for signing: %s"
+#~ msgstr "ééäèææåäçççäçï%s"
+
+#~ msgid "Invalid or unrecognized recipient: %s"
+#~ msgstr "çææçæèèçæääï%s"
+
+#~ msgid "Key is not a valid recipient for encryption: %s"
+#~ msgstr "ééäæäåææçæäääååï%s"
+
+#~ msgid "No recipients specified"
+#~ msgstr "æææåæää"
+
+#~ msgid "Invalid key type for decryption: %s"
+#~ msgstr "èåçéééåçæï%s"
+
+#~ msgid "Please set clearuri"
+#~ msgstr "èèå clearui"
+
+#~ msgid "Please set crypturi"
+#~ msgstr "èèå cryptui"
+
+#~ msgid "Error opening clearuri"
+#~ msgstr "éå clearui æççéè"
+
+#~ msgid "No signer specified"
+#~ msgstr "æææåççè"
+
+#~ msgid "Invalid key type for verifying: %s"
+#~ msgstr "éè %s çéééåçæ"
+
+#~ msgid "Invalid key id: %s"
+#~ msgstr "çæçéé 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 ""
+#~ "åæéç PGP ééçééäæåç URL æåãåæäéççæååæéçåçïä"
+#~ "ååçæååçã"
+
+#~ msgid "Auto Retrieve Keys"
+#~ msgstr "èåååéé"
+
+#~ msgid "Auto Sync Keys"
+#~ msgstr "ééèååæ"
+
+#~ msgid "Controls the visibility of the expires column for the key manager."
+#~ msgstr "æåééççåçæææææäçåçæã"
+
+#~ msgid "Controls the visibility of the trust column for the key manager."
+#~ msgstr "æåééççåçääæäçåçæã"
+
+#~ msgid "Controls the visibility of the type column for the key manager."
+#~ msgstr "æåééççåçéåæäçåçæã"
+
+#~ msgid "Controls the visibility of the validity column for the key manager."
+#~ msgstr "æåééççåçææææäçåçæã"
+
+#~ msgid "Enable DNS-SD sharing"
+#~ msgstr "åç DNS-SD åä"
+
+#~ 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 ""
+#~ "åç DNS-SD (Apple Bonjour) ééåäïåééè seahorse-daemon  ååå "
+#~ "HKP å DNS-SD ææã"
+
+#~ msgid "ID of the default key"
+#~ msgstr "éèééç ID"
+
+#~ msgid ""
+#~ "If set to true, then files encrypted with seahorse will be ASCII armor "
+#~ "encoded."
+#~ msgstr "åèåçâtrueâïäç seahorse ååçææææä ASCII åèççã"
+
+#~ msgid ""
+#~ "If set to true, then the default key will always be added to an "
+#~ "encryption recipients list."
+#~ msgstr "åèåçâtrueâïéèééçææååååæääæåã"
+
+#~ msgid "Last key server search pattern"
+#~ msgstr "äæåééäæåçæååæ"
+
+#~ msgid "Last key servers used"
+#~ msgstr "äæäççééäæå"
+
+#~ msgid "Last key used to sign a message."
+#~ msgstr "äæçäçççéé"
+
+#~ msgid "PGP Key servers"
+#~ msgstr "PGP ééäæå"
+
+#~ msgid "Publish keys to this key server."
+#~ msgstr "çèééåæééäæåã"
+
+#~ msgid "Show expires column in key manager"
+#~ msgstr "åééççåäéçææææçæä"
+
+#~ msgid "Show trust column in key manager"
+#~ msgstr "åééççåäéçääçæä"
+
+#~ msgid "Show type column in key manager"
+#~ msgstr "åééççåäéçéåçæä"
+
+#~ msgid "Show validity column in key manager"
+#~ msgstr "åééççåäéçæææçæä"
+
+#~ 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 ""
+#~ "æåæääèççæäçæåæåïânameâåâidâãåæäåçååäâ-âäååæ"
+#~ "åã"
+
+#~ 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 ""
+#~ "æå seahorse ééçççåäèçæäçæåæ"
+#~ "åïânameâïâidâïâvalidityâïâexpiresâïâtrustâåâtypeâãåæäåçåå"
+#~ "äâ-âäååæåã"
+
+#~ msgid "The ID of the last secret key used to sign a message."
+#~ msgstr "äæçäççäæççé IDã"
+
+#~ msgid "The column to sort the recipients by"
+#~ msgstr "seahorse æääæäçæååå"
+
+#~ msgid "The column to sort the seahorse keys by"
+#~ msgstr "seahorse ééæäçæååå"
+
+#~ msgid ""
+#~ "The key server to publish PGP keys to. Or empty to suppress publishing of "
+#~ "PGP keys."
+#~ msgstr "PGP ééçèåçééäæåãæäçççäçæçè PGP éé"
+
+#~ msgid ""
+#~ "The last key server a search was performed against or empty for all key "
+#~ "servers."
+#~ msgstr "äææåçééäæåãæåçççææäæåã"
+
+#~ msgid "The last search pattern searched for against a key server."
+#~ msgstr "äæåééäæåçæåæåã"
+
+#~ msgid ""
+#~ "This specifies the default key to use for certain operations, mainly "
+#~ "signing."
+#~ msgstr "éæååæäåäääççéèééïäèçççæäçã"
+
+#~ msgid ""
+#~ "Whether or not keys should be automatically retrieved from key servers."
+#~ msgstr "æåèååééäæåååééã"
+
+#~ msgid ""
+#~ "Whether or not modified keys should be automatically synced with the "
+#~ "default key server."
+#~ msgstr "åäæçééæåèåèéèçééäæååæã"
+
+#~ msgid "Whether to always encrypt to default key"
+#~ msgstr "æåçæäéèééäåå"
+
+#~ msgid "Whether to use ASCII Armor"
+#~ msgstr "æåäç ASCII åè"
+
+#~ msgid "Couldn't set application access."
+#~ msgstr "çæèåæççåçååã"
+
+#~ msgid "<b>Path:</b>"
+#~ msgstr "<b>èå:</b>"
+
+#~ msgid "<b>Permissions:</b>"
+#~ msgstr "<b>æé:</b>"
+
+#~ msgid "Applications"
+#~ msgstr "æççå"
+
+#~ msgid "_Read"
+#~ msgstr "èå(_R)"
+
+#~ msgid "_Write"
+#~ msgstr "åå(_W)"
+
+#~ msgctxt "infinitive"
+#~ msgid "_Delete"
+#~ msgstr "åé(_D)"
+
+#~ msgid "Saving item..."
+#~ msgstr "æåååéçâ"
+
+#~ msgid "Listing password keyrings"
+#~ msgstr "æååååçéåå "
+
+#~ 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 ""
+#~ "åéèææèæçæäææäåååééãçåæåå <b>åçèååéé</b> ç"
+#~ "åèæåçæååäåééã"
+
+#~ msgid "All Keys"
+#~ msgstr "ææéé"
+
+#~ msgid "Selected Recipients"
+#~ msgstr "åéåæää"
+
+#~ msgid "Search Results"
+#~ msgstr "æåçæ"
+
+#~ msgid "Search _for:"
+#~ msgstr "æå(_F):"
+
+#~ msgid "None (Don't Sign)"
+#~ msgstr "ææïäèççï"
+
+#~ msgid "Sign this message as %s"
+#~ msgstr "ä %s ççéåéä"
+
+#~ msgid "_Sign message as:"
+#~ msgstr "ççèæçéé(_S):"
+
+#~ msgid "File is not a valid .desktop file"
+#~ msgstr "ææäæææç .desktop ææ"
+
+#~ msgid "Unrecognized desktop file Version '%s'"
+#~ msgstr "çæèèçæéææçæã%sã"
+
+#~ msgid "Starting %s"
+#~ msgstr "æååå %s"
+
+#~ msgid "Application does not accept documents on command line"
+#~ msgstr "æççåäæåäåäåéåæä"
+
+#~ msgid "Unrecognized launch option: %d"
+#~ msgstr "çæèèçååééï%d"
+
+#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+#~ msgstr "äèåéæä URI èãType=Linkãæééç"
+
+#~ msgid "Not a launchable item"
+#~ msgstr "äæåäååçéç"
+
+#~ msgid "Disable connection to session manager"
+#~ msgstr "åçåäæéæçççåçéç"
+
+#~ msgid "Specify file containing saved configuration"
+#~ msgstr "æååæåååçæçææ"
+
+#~ msgid "FILE"
+#~ msgstr "ææ"
+
+#~ msgid "Specify session management ID"
+#~ msgstr "æåäæéæçç ID"
+
+#~ msgid "Session management options:"
+#~ msgstr "äæéæççéé:"
+
+#~ msgid "Show session management options"
+#~ msgstr "éçäæéæççéé"
+
+#~ msgid "Key Imported"
+#~ msgid_plural "Keys Imported"
+#~ msgstr[0] "ééååå"
+#~ msgstr[1] "ééååå"
+
+#~ msgid "Imported %i key"
+#~ msgid_plural "Imported %i keys"
+#~ msgstr[0] "ååå %i åéé"
+#~ msgstr[1] "ååå %i åéé"
+
+#~ msgid "Imported a key for"
+#~ msgid_plural "Imported keys for"
+#~ msgstr[0] "ååæéé"
+#~ msgstr[1] "ååæéé"
+
+#~ msgid "Notification Messages"
+#~ msgstr "éçèæ"
+
+#~ msgid "Progress Title"
+#~ msgstr "éåæé"
+
+#~ msgid "Couldn't run file-roller"
+#~ msgstr "çæåè fille-roller"
+
+#~ msgid "Couldn't package files"
+#~ msgstr "ææçæåè"
+
+#~ msgid "The file-roller process did not complete successfully"
+#~ msgstr "file-roller çåçæåæ"
+
+#~ msgid "Loading Keys..."
+#~ msgstr "æåèåééâ"
+
+#~ msgid "Searching for keys..."
+#~ msgstr "æåæåééâ"
+
+#~ msgid "Uploading keys..."
+#~ msgstr "æåäåééâ"
+
+#~ msgid "Retrieving keys..."
+#~ msgstr "æåååééâ"
+
+#~ msgid "Searching for keys on: %s"
+#~ msgstr "æåå %s çéé"
+
+#~ msgid "Searching for keys containing '%s'..."
+#~ msgstr "æåæååæâ%sâçééâ"
+
+#~ msgid "Searching for key id '%s'..."
+#~ msgstr "æåæå id çâ%sâçééâ"
+
+#~ msgid "Retrieving remote keys..."
+#~ msgstr "æåååéçééâ"
+
+#~ msgid "Sending keys to key server..."
+#~ msgstr "æååéééåééäæå"
+
+#~ msgid "Synchronizing keys"
+#~ msgstr "ééæååæâ"
+
+#~ msgid "Passphrase:"
+#~ msgstr "åèï"
+
 #~ msgid "Couldn't share keys"
 #~ msgstr "çæåäéé"
 
@@ -3053,9 +2938,6 @@ msgstr "èå(_S)"
 #~ msgid "_Copy"
 #~ msgstr "èè(_C)"
 
-#~ msgid "Retrieving key"
-#~ msgstr "ååéé"
-
 #~ msgid "Removing item"
 #~ msgstr "æåçééç"
 
@@ -3605,9 +3487,6 @@ msgstr "èå(_S)"
 #~ msgid "Couldn't sign file: %s"
 #~ msgstr "çæççææï%s"
 
-#~ msgid "Importing"
-#~ msgstr "ååä"
-
 #~ msgid "Couldn't import keys from file: %s"
 #~ msgstr "çæåææååééï%s"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 93952a6..d0389ce 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: seahorse 2.91.5\n"
+"Project-Id-Version: seahorse 3.1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-23 14:31+0800\n"
-"PO-Revision-Date: 2011-01-22 20:24+0800\n"
+"POT-Creation-Date: 2011-08-27 10:39+0800\n"
+"PO-Revision-Date: 2011-08-27 08:24+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "Language: \n"
@@ -18,336 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../daemon/seahorse-daemon.c:64
-msgid "Do not run seahorse-daemon as a daemon"
-msgstr "äääæçååååè seahorse-daemon"
-
-#: ../daemon/seahorse-daemon.c:94
-msgid "couldn't fork process"
-msgstr "çæåçåçå"
-
-#: ../daemon/seahorse-daemon.c:100
-msgid "couldn't create new process group"
-msgstr "çæåçæççåçç"
-
-#: ../daemon/seahorse-daemon.c:250
-msgid "Encryption Daemon (Seahorse)"
-msgstr "ååäæçå (Seahorse)"
-
-#: ../daemon/seahorse-service.c:164 ../daemon/seahorse-service.c:277
-#, c-format
-msgid "Invalid or unrecognized key type: %s"
-msgstr "çææçæçèçéééåï%s"
-
-#: ../daemon/seahorse-service.c:234
-#, c-format
-msgid "This keytype is not supported: %s"
-msgstr "éåéééåæäææçï%s"
-
-#: ../daemon/seahorse-service.c:241
-#, c-format
-msgid "Support for this feature was not enabled at build time"
-msgstr "çèæææåçåéååèçææ"
-
-#: ../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 "çææçæçèçééï%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 "ç <i><key id=â%sâ/> ççïæ %s éæã"
-
-#: ../daemon/seahorse-service-crypto.c:205
-msgid "Invalid Signature"
-msgstr "çæççç"
-
-#: ../daemon/seahorse-service-crypto.c:211
-#, c-format
-msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
-msgstr "ç <i><key id=â%sâ/>æ %s ççï<b>åéæ</b>ã"
-
-#: ../daemon/seahorse-service-crypto.c:212
-msgid "Expired Signature"
-msgstr "åéæççç"
-
-#: ../daemon/seahorse-service-crypto.c:218
-#, c-format
-msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
-msgstr "ç <i><key id=â%sâ/>ççïæ %s æéã"
-
-#: ../daemon/seahorse-service-crypto.c:219
-msgid "Revoked Signature"
-msgstr "ççåæé"
-
-#. 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 "ç <i><key id=â%sâ/>æ %s ççã"
-
-#: ../daemon/seahorse-service-crypto.c:226
-msgid "Good Signature"
-msgstr "ååççç"
-
-#: ../daemon/seahorse-service-crypto.c:231
-msgid "Signing key not in keyring."
-msgstr "ççééäéåéåååã"
-
-#: ../daemon/seahorse-service-crypto.c:232
-msgid "Unknown Signature"
-msgstr "äæççç"
-
-#: ../daemon/seahorse-service-crypto.c:236
-msgid "Bad or forged signature. The signed data was modified."
-msgstr "æåææåéçççãççèæåèäæã"
-
-#: ../daemon/seahorse-service-crypto.c:237
-msgid "Bad Signature"
-msgstr "æåççç"
-
-#: ../daemon/seahorse-service-crypto.c:245
-msgid "Couldn't verify signature."
-msgstr "çæéèççã"
-
-#: ../daemon/seahorse-service-crypto.c:317
-#: ../daemon/seahorse-service-crypto.c:646
-#, c-format
-msgid "Invalid or unrecognized signer: %s"
-msgstr "çææçæèèçççèï%s"
-
-#: ../daemon/seahorse-service-crypto.c:324
-#: ../daemon/seahorse-service-crypto.c:653
-#, c-format
-msgid "Key is not valid for signing: %s"
-msgstr "ééäèææåäçççäçï%s"
-
-#: ../daemon/seahorse-service-crypto.c:335
-#, c-format
-msgid "Invalid or unrecognized recipient: %s"
-msgstr "çææçæèèçæääï%s"
-
-#: ../daemon/seahorse-service-crypto.c:343
-#, c-format
-msgid "Key is not a valid recipient for encryption: %s"
-msgstr "ééäæäåææçæäääååï%s"
-
-#: ../daemon/seahorse-service-crypto.c:352
-#, c-format
-msgid "No recipients specified"
-msgstr "æææåæää"
-
-#: ../daemon/seahorse-service-crypto.c:434
-#, c-format
-msgid "Invalid key type for decryption: %s"
-msgstr "èåçéééåçæï%s"
-
-#: ../daemon/seahorse-service-crypto.c:548
-#: ../daemon/seahorse-service-crypto.c:746
-#, c-format
-msgid "Please set clearuri"
-msgstr "èèå clearui"
-
-#: ../daemon/seahorse-service-crypto.c:554
-#: ../daemon/seahorse-service-crypto.c:752
-#, c-format
-msgid "Please set crypturi"
-msgstr "èèå cryptui"
-
-#: ../daemon/seahorse-service-crypto.c:564
-#, c-format
-msgid "Error opening clearuri"
-msgstr "éå clearui æççéè"
-
-#: ../daemon/seahorse-service-crypto.c:641
-#, c-format
-msgid "No signer specified"
-msgstr "æææåççè"
-
-#: ../daemon/seahorse-service-crypto.c:830
-#, c-format
-msgid "Invalid key type for verifying: %s"
-msgstr "éè %s çéééåçæ"
-
-#: ../daemon/seahorse-service-keyset.c:273
-#, c-format
-msgid "Invalid key id: %s"
-msgstr "çæçéé 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 ""
-"åæéç PGP ééçééäæåç URL æåãåæäéççæååæéçåçïäå"
-"åçæååçã"
-
-#: ../data/seahorse.schemas.in.h:2
-msgid "Auto Retrieve Keys"
-msgstr "èåååéé"
-
-#: ../data/seahorse.schemas.in.h:3
-msgid "Auto Sync Keys"
-msgstr "ééèååæ"
-
-#: ../data/seahorse.schemas.in.h:4
-msgid "Controls the visibility of the expires column for the key manager."
-msgstr "æåééççåçæææææäçåçæã"
-
-#: ../data/seahorse.schemas.in.h:5
-msgid "Controls the visibility of the trust column for the key manager."
-msgstr "æåééççåçääæäçåçæã"
-
-#: ../data/seahorse.schemas.in.h:6
-msgid "Controls the visibility of the type column for the key manager."
-msgstr "æåééççåçéåæäçåçæã"
-
-#: ../data/seahorse.schemas.in.h:7
-msgid "Controls the visibility of the validity column for the key manager."
-msgstr "æåééççåçææææäçåçæã"
-
-#: ../data/seahorse.schemas.in.h:8
-msgid "Enable DNS-SD sharing"
-msgstr "åç DNS-SD åä"
-
-#: ../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 ""
-"åç DNS-SD (Apple Bonjour) ééåäïåééè seahorse-daemon  ååå HKP "
-"å DNS-SD ææã"
-
-#: ../data/seahorse.schemas.in.h:10
-msgid "ID of the default key"
-msgstr "éèééç ID"
-
-#: ../data/seahorse.schemas.in.h:11
-msgid ""
-"If set to true, then files encrypted with seahorse will be ASCII armor "
-"encoded."
-msgstr "åèåçâtrueâïäç seahorse ååçææææä ASCII åèççã"
-
-#: ../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 "åèåçâtrueâïéèééçææååååæääæåã"
-
-#: ../data/seahorse.schemas.in.h:13
-msgid "Last key server search pattern"
-msgstr "äæåééäæåçæååæ"
-
-#: ../data/seahorse.schemas.in.h:14
-msgid "Last key servers used"
-msgstr "äæäççééäæå"
-
-#: ../data/seahorse.schemas.in.h:15
-msgid "Last key used to sign a message."
-msgstr "äæçäçççéé"
-
-#: ../data/seahorse.schemas.in.h:16
-msgid "PGP Key servers"
-msgstr "PGP ééäæå"
-
-#: ../data/seahorse.schemas.in.h:17
-msgid "Publish keys to this key server."
-msgstr "çèééåæééäæåã"
-
-#: ../data/seahorse.schemas.in.h:18
-msgid "Show expires column in key manager"
-msgstr "åééççåäéçææææçæä"
-
-#: ../data/seahorse.schemas.in.h:19
-msgid "Show trust column in key manager"
-msgstr "åééççåäéçääçæä"
-
-#: ../data/seahorse.schemas.in.h:20
-msgid "Show type column in key manager"
-msgstr "åééççåäéçéåçæä"
-
-#: ../data/seahorse.schemas.in.h:21
-msgid "Show validity column in key manager"
-msgstr "åééççåäéçæææçæä"
-
-#: ../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 ""
-"æåæääèççæäçæåæåïânameâåâidâãåæäåçååäâ-âäååæåã"
-
-#: ../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 ""
-"æå seahorse ééçççåäèçæäçæåæ"
-"åïânameâïâidâïâvalidityâïâexpiresâïâtrustâåâtypeâãåæäåçåå"
-"äâ-âäååæåã"
-
-#: ../data/seahorse.schemas.in.h:24
-msgid "The ID of the last secret key used to sign a message."
-msgstr "äæçäççäæççé IDã"
-
-#: ../data/seahorse.schemas.in.h:25
-msgid "The column to sort the recipients by"
-msgstr "seahorse æääæäçæååå"
-
-#: ../data/seahorse.schemas.in.h:26
-msgid "The column to sort the seahorse keys by"
-msgstr "seahorse ééæäçæååå"
-
-#: ../data/seahorse.schemas.in.h:27
-msgid ""
-"The key server to publish PGP keys to. Or empty to suppress publishing of "
-"PGP keys."
-msgstr "PGP ééçèåçééäæåãæäçççäçæçè PGP éé"
-
-#: ../data/seahorse.schemas.in.h:28
-msgid ""
-"The last key server a search was performed against or empty for all key "
-"servers."
-msgstr "äææåçééäæåãæåçççææäæåã"
-
-#: ../data/seahorse.schemas.in.h:29
-msgid "The last search pattern searched for against a key server."
-msgstr "äæåééäæåçæåæåã"
-
-#: ../data/seahorse.schemas.in.h:30
-msgid ""
-"This specifies the default key to use for certain operations, mainly signing."
-msgstr "éæååæäåäääççéèééïäèçççæäçã"
-
-#: ../data/seahorse.schemas.in.h:31
-msgid "Whether or not keys should be automatically retrieved from key servers."
-msgstr "æåèååééäæåååééã"
-
-#: ../data/seahorse.schemas.in.h:32
-msgid ""
-"Whether or not modified keys should be automatically synced with the default "
-"key server."
-msgstr "åäæçééæåèåèéèçééäæååæã"
-
-#: ../data/seahorse.schemas.in.h:33
-msgid "Whether to always encrypt to default key"
-msgstr "æåçæäéèééäåå"
-
-#: ../data/seahorse.schemas.in.h:34
-msgid "Whether to use ASCII Armor"
-msgstr "æåäç ASCII åè"
-
 #: ../gkr/seahorse-add-keyring.xml.h:1
 msgid "Add Password Keyring"
 msgstr "åååçéåå"
 
 #: ../gkr/seahorse-add-keyring.xml.h:2
 msgid "New Keyring Name:"
-msgstr "æéåååç:"
+msgstr "æéåååçï"
 
 #: ../gkr/seahorse-add-keyring.xml.h:3
 msgid ""
@@ -361,7 +38,7 @@ msgstr "èçæçéååéæäååçãççææçææäèé
 msgid "The host name or address of the server."
 msgstr "äæåçäæåçæäåã"
 
-#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:73
+#: ../gkr/seahorse-gkr-add-item.c:51 ../gkr/seahorse-gkr-add-keyring.c:65
 msgid "Couldn't add keyring"
 msgstr "çæååéåå"
 
@@ -370,7 +47,7 @@ msgid "Add Password"
 msgstr "åååç"
 
 #: ../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 "æè(_D):"
 
@@ -386,233 +63,227 @@ msgstr "åç(_P):"
 msgid "_Show Password"
 msgstr "éçåç(_S)"
 
-#: ../gkr/seahorse-gkr-item.c:470
+#: ../gkr/seahorse-gkr-item.c:437
 msgid "Web Password"
 msgstr "çéåç"
 
-#: ../gkr/seahorse-gkr-item.c:472
+#: ../gkr/seahorse-gkr-item.c:439
 msgid "Network Password"
 msgstr "çèåç"
 
-#: ../gkr/seahorse-gkr-item.c:474 ../gkr/seahorse-gkr-item-properties.c:107
+#: ../gkr/seahorse-gkr-item.c:441 ../gkr/seahorse-gkr-item-properties.c:108
 msgid "Password"
 msgstr "åç"
 
 #: ../gkr/seahorse-gkr-item-commands.c:78
+msgid "Couldn't delete item"
+msgstr "çæåééç"
+
+#: ../gkr/seahorse-gkr-item-commands.c:100
 #, c-format
 msgid "Are you sure you want to delete the password '%s'?"
 msgstr "çåèåéåçã%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] "çåèåé %d ååçï"
 msgstr[1] "çåèåé %d ååçï"
 
-#: ../gkr/seahorse-gkr-item-properties.c:66
+#: ../gkr/seahorse-gkr-item-commands.c:114
+msgid "Deleting item"
+msgstr "åééç"
+
+#: ../gkr/seahorse-gkr-item-commands.c:114
+msgid "Deleting items"
+msgstr "åééç"
+
+#: ../gkr/seahorse-gkr-item-properties.c:67
 msgid "Access a network share or resource"
 msgstr "ååçèåäæèæ"
 
-#: ../gkr/seahorse-gkr-item-properties.c:69
+#: ../gkr/seahorse-gkr-item-properties.c:70
 msgid "Access a website"
 msgstr "ååçç"
 
-#: ../gkr/seahorse-gkr-item-properties.c:72
+#: ../gkr/seahorse-gkr-item-properties.c:73
 msgid "Unlocks a PGP key"
 msgstr "èé PGP éééå"
 
-#: ../gkr/seahorse-gkr-item-properties.c:75
+#: ../gkr/seahorse-gkr-item-properties.c:76
 msgid "Unlocks a Secure Shell key"
 msgstr "èé SSH éééå"
 
-#: ../gkr/seahorse-gkr-item-properties.c:78
+#: ../gkr/seahorse-gkr-item-properties.c:79
 msgid "Saved password or login"
 msgstr "åååçæçå"
 
-#: ../gkr/seahorse-gkr-item-properties.c:102
+#: ../gkr/seahorse-gkr-item-properties.c:103
 msgid "Network Credentials"
 msgstr "çèèè"
 
-#: ../gkr/seahorse-gkr-item-properties.c:245
+#: ../gkr/seahorse-gkr-item-properties.c:208
 msgid "Couldn't change password."
 msgstr "çæææåçã"
 
-#: ../gkr/seahorse-gkr-item-properties.c:350
+#: ../gkr/seahorse-gkr-item-properties.c:253
+#: ../gkr/seahorse-gkr-item-properties.c:369
+msgid "Updating password"
+msgstr "ææåç"
+
+#: ../gkr/seahorse-gkr-item-properties.c:330
 msgid "Couldn't set description."
 msgstr "çæèåæèã"
 
-#: ../gkr/seahorse-gkr-item-properties.c:656
-msgid "Couldn't set application access."
-msgstr "çæèåæççåçååã"
-
 #: ../gkr/seahorse-gkr-item-properties.xml.h:1
 msgid "<b>Password:</b>"
 msgstr "<b>åçï</b>"
 
 #: ../gkr/seahorse-gkr-item-properties.xml.h:2
-msgid "<b>Path:</b>"
-msgstr "<b>èå:</b>"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:3
-msgid "<b>Permissions:</b>"
-msgstr "<b>æé:</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>æèèæï</b>"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:5
-msgid "Applications"
-msgstr "æççå"
-
-#: ../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 "èçèæ"
 
-#: ../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 "éé"
 
-#: ../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 "ééåæ"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:9
+#: ../gkr/seahorse-gkr-item-properties.xml.h:6
 msgid "Login:"
 msgstr "çå:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:10
+#: ../gkr/seahorse-gkr-item-properties.xml.h:7
 msgid "Server:"
 msgstr "äæå:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:11
+#: ../gkr/seahorse-gkr-item-properties.xml.h:8
 msgid "Show pass_word"
 msgstr "éçåç(_W)"
 
-#: ../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 "éå:"
 
 #. 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 "äç:"
 
-#. To translators: This is the infinitive not the imperative.
-#: ../gkr/seahorse-gkr-item-properties.xml.h:17
-msgid "_Read"
-msgstr "èå(_R)"
-
-#. To translators: This is the infinitive not the imperative.
-#: ../gkr/seahorse-gkr-item-properties.xml.h:19
-msgid "_Write"
-msgstr "åå(_W)"
-
-#: ../gkr/seahorse-gkr-item-properties.xml.h:20
-msgctxt "infinitive"
-msgid "_Delete"
-msgstr "åé(_D)"
-
-#: ../gkr/seahorse-gkr-keyring.c:193
-msgid "Listing passwords"
-msgstr "æååååç"
-
-#: ../gkr/seahorse-gkr-keyring.c:354
+#: ../gkr/seahorse-gkr-keyring.c:121
 #, c-format
 msgid "Passwords: %s"
 msgstr "åçï%s"
 
-#: ../gkr/seahorse-gkr-keyring.c:355
+#: ../gkr/seahorse-gkr-keyring.c:122
 #, c-format
 msgid "<b>Passwords:</b> %s"
 msgstr "<b>åçï</b>%s"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:119
+#: ../gkr/seahorse-gkr-keyring-commands.c:113
 msgid "Password Keyring"
 msgstr "åçéåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:120
+#: ../gkr/seahorse-gkr-keyring-commands.c:114
 msgid "Used to store application and network passwords"
 msgstr "çäååæççååçèçåç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:121
+#: ../gkr/seahorse-gkr-keyring-commands.c:115
 msgid "Stored Password"
 msgstr "åååçåç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:122
+#: ../gkr/seahorse-gkr-keyring-commands.c:116
 msgid "Safely store a password or secret."
 msgstr "ååçåæåèææåã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:136
+#: ../gkr/seahorse-gkr-keyring-commands.c:130
 msgid "Couldn't unlock keyring"
 msgstr "çæèééåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:177
+#: ../gkr/seahorse-gkr-keyring-commands.c:169
 msgid "Couldn't lock keyring"
 msgstr "çæéåéåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:218
+#: ../gkr/seahorse-gkr-keyring-commands.c:208
 msgid "Couldn't set default keyring"
 msgstr "çæèåéèçéåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:257
+#: ../gkr/seahorse-gkr-keyring-commands.c:247
 msgid "Couldn't change keyring password"
 msgstr "çæææéåååç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:288
+#: ../gkr/seahorse-gkr-keyring-commands.c:276
 msgid "_Lock"
 msgstr "éå(_L)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:289
+#: ../gkr/seahorse-gkr-keyring-commands.c:277
 msgid ""
 "Lock the password storage keyring so a master password is required to unlock "
 "it."
 msgstr "éååçååéååïåæèååèéåèæäæåçæèã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:290
+#: ../gkr/seahorse-gkr-keyring-commands.c:278
 msgid "_Unlock"
 msgstr "èé(_U)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:291
+#: ../gkr/seahorse-gkr-keyring-commands.c:279
 msgid ""
 "Unlock the password storage keyring with a master password so it is "
 "available for use."
 msgstr "äçäæåçååçååéååèéïåæåæçåääçççæã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:292
+#: ../gkr/seahorse-gkr-keyring-commands.c:280
 msgid "_Set as default"
 msgstr "èçéèå(_S)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:293
+#: ../gkr/seahorse-gkr-keyring-commands.c:281
 msgid "Applications usually store new passwords in the default keyring."
 msgstr "æççåéåæææåçåååéèéååèã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:294
+#: ../gkr/seahorse-gkr-keyring-commands.c:282
 msgid "Change _Password"
 msgstr "èæåç(_P)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:295
+#: ../gkr/seahorse-gkr-keyring-commands.c:283
 msgid "Change the unlock password of the password storage keyring"
 msgstr "æèåçååéååçèéåç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:360
+#: ../gkr/seahorse-gkr-keyring-commands.c:348
+msgid "Couldn't delete keyring"
+msgstr "çæåééåå"
+
+#: ../gkr/seahorse-gkr-keyring-commands.c:366
 #, c-format
 msgid "Are you sure you want to delete the password keyring '%s'?"
 msgstr "æçåèåééååçéååã%sãï"
 
+#: ../gkr/seahorse-gkr-keyring-commands.c:376
+msgid "Deleting keyring"
+msgstr "åééåå"
+
+#: ../gkr/seahorse-gkr-keyring-commands.c:376
+msgid "Deleting keyrings"
+msgstr "åééåå"
+
 #. -----------------------------------------------------------------------------
 #. * PUBLIC
 #.
@@ -635,265 +306,196 @@ msgstr "éåååæ"
 msgid "_Name:"
 msgstr "åç(_N):"
 
-#: ../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 "èæäååæ"
+
+#: ../gkr/seahorse-gkr-operation.c:57
 msgid "Access to the key ring was denied"
 msgstr "ååéååèçæ"
 
-#: ../gkr/seahorse-gkr-operation.c:171
+#: ../gkr/seahorse-gkr-operation.c:60
 msgid "The gnome-keyring daemon is not running"
 msgstr "gnome-keyring æåçåææåè"
 
-#: ../gkr/seahorse-gkr-operation.c:174
+#: ../gkr/seahorse-gkr-operation.c:63
 msgid "The key ring has already been unlocked"
 msgstr "éåååçèé"
 
-#: ../gkr/seahorse-gkr-operation.c:177
+#: ../gkr/seahorse-gkr-operation.c:66
 msgid "No such key ring exists"
 msgstr "ææèéåååå"
 
-#: ../gkr/seahorse-gkr-operation.c:180
+#: ../gkr/seahorse-gkr-operation.c:69
 msgid "Couldn't communicate with key ring daemon"
 msgstr "çæèéååæåçåèç"
 
-#: ../gkr/seahorse-gkr-operation.c:183
+#: ../gkr/seahorse-gkr-operation.c:72
 msgid "The item already exists"
 msgstr "éçåçåå"
 
-#: ../gkr/seahorse-gkr-operation.c:189
+#: ../gkr/seahorse-gkr-operation.c:78
 msgid "Internal error accessing gnome-keyring"
 msgstr "åå gnome-keyring ççåééè"
 
-#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264
-msgid "Saving item..."
-msgstr "æåååéçâ"
-
-#: ../gkr/seahorse-gkr-operation.c:300
-msgid "Deleting item..."
-msgstr "æååééçâ"
-
-#: ../gkr/seahorse-gkr-operation.c:325
-msgid "Deleting keyring..."
-msgstr "æååééåå"
-
-#: ../gkr/seahorse-gkr-source.c:234
-msgid "Listing password keyrings"
-msgstr "æååååçéåå "
-
-#: ../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 ""
-"åéèææèæçæäææäåååééãçåæåå <b>åçèååéé</b> çåè"
-"æåçæååäåééã"
-
-#: ../libcryptui/cryptui-key-chooser.c:174
-#: ../libcryptui/cryptui-key-chooser.c:179
-msgid "All Keys"
-msgstr "ææéé"
-
-#: ../libcryptui/cryptui-key-chooser.c:175
-#: ../libcryptui/cryptui-key-chooser.c:180
-msgid "Selected Recipients"
-msgstr "åéåæää"
-
-#: ../libcryptui/cryptui-key-chooser.c:176
-#: ../libcryptui/cryptui-key-chooser.c:181
-msgid "Search Results"
-msgstr "æåçæ"
-
-#. Filter Label
-#: ../libcryptui/cryptui-key-chooser.c:192
-msgid "Search _for:"
-msgstr "æå(_F):"
-
-#: ../libcryptui/cryptui-key-chooser.c:250
-msgid "None (Don't Sign)"
-msgstr "ææïäèççï"
-
-#: ../libcryptui/cryptui-key-chooser.c:263
-#, c-format
-msgid "Sign this message as %s"
-msgstr "ä %s ççéåéä"
-
-#. Sign Label
-#: ../libcryptui/cryptui-key-chooser.c:285
-msgid "_Sign message as:"
-msgstr "ççèæçéé(_S):"
-
-#. 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 "åç"
-
-#. 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 "éé ID"
-
-#: ../libegg/egg-datetime.c:325
+#: ../libegg/egg-datetime.c:317
 msgid "Display flags"
 msgstr "éçææ"
 
-#: ../libegg/egg-datetime.c:326
+#: ../libegg/egg-datetime.c:318
 msgid "Displayed date and/or time properties"
 msgstr "éççææå/ææååæ"
 
-#: ../libegg/egg-datetime.c:331
+#: ../libegg/egg-datetime.c:323
 msgid "Lazy mode"
 msgstr "æäæå"
 
-#: ../libegg/egg-datetime.c:332
+#: ../libegg/egg-datetime.c:324
 msgid "Lazy mode doesn't normalize entered date and time values"
 msgstr "æäæåäæææåèåçææåæåæå"
 
-#: ../libegg/egg-datetime.c:337
+#: ../libegg/egg-datetime.c:329
 msgid "Year"
 msgstr "å"
 
-#: ../libegg/egg-datetime.c:338
+#: ../libegg/egg-datetime.c:330
 msgid "Displayed year"
 msgstr "éççåä"
 
-#: ../libegg/egg-datetime.c:343
+#: ../libegg/egg-datetime.c:335
 msgid "Month"
 msgstr "æ"
 
-#: ../libegg/egg-datetime.c:344
+#: ../libegg/egg-datetime.c:336
 msgid "Displayed month"
 msgstr "éççæä"
 
-#: ../libegg/egg-datetime.c:349
+#: ../libegg/egg-datetime.c:341
 msgid "Day"
 msgstr "å"
 
-#: ../libegg/egg-datetime.c:350
+#: ../libegg/egg-datetime.c:342
 msgid "Displayed day of month"
 msgstr "éçäåæçåå"
 
-#: ../libegg/egg-datetime.c:355
+#: ../libegg/egg-datetime.c:347
 msgid "Hour"
 msgstr "æ"
 
-#: ../libegg/egg-datetime.c:356
+#: ../libegg/egg-datetime.c:348
 msgid "Displayed hour"
 msgstr "éççåæ"
 
-#: ../libegg/egg-datetime.c:361
+#: ../libegg/egg-datetime.c:353
 msgid "Minute"
 msgstr "å"
 
-#: ../libegg/egg-datetime.c:362
+#: ../libegg/egg-datetime.c:354
 msgid "Displayed minute"
 msgstr "éççåé"
 
-#: ../libegg/egg-datetime.c:367
+#: ../libegg/egg-datetime.c:359
 msgid "Second"
 msgstr "ç"
 
-#: ../libegg/egg-datetime.c:368
+#: ../libegg/egg-datetime.c:360
 msgid "Displayed second"
 msgstr "éçççé"
 
-#: ../libegg/egg-datetime.c:373
+#: ../libegg/egg-datetime.c:365
 msgid "Lower limit year"
 msgstr "åääé"
 
-#: ../libegg/egg-datetime.c:374
+#: ../libegg/egg-datetime.c:366
 msgid "Year part of the lower date limit"
 msgstr "éçåäçæåå"
 
-#: ../libegg/egg-datetime.c:379
+#: ../libegg/egg-datetime.c:371
 msgid "Upper limit year"
 msgstr "åääé"
 
-#: ../libegg/egg-datetime.c:380
+#: ../libegg/egg-datetime.c:372
 msgid "Year part of the upper date limit"
 msgstr "éçåäçæåå"
 
-#: ../libegg/egg-datetime.c:385
+#: ../libegg/egg-datetime.c:377
 msgid "Lower limit month"
 msgstr "æääé"
 
-#: ../libegg/egg-datetime.c:386
+#: ../libegg/egg-datetime.c:378
 msgid "Month part of the lower date limit"
 msgstr "éçæäçæåå"
 
-#: ../libegg/egg-datetime.c:391
+#: ../libegg/egg-datetime.c:383
 msgid "Upper limit month"
 msgstr "æääé"
 
-#: ../libegg/egg-datetime.c:392
+#: ../libegg/egg-datetime.c:384
 msgid "Month part of the upper date limit"
 msgstr "éçæäçæåå"
 
-#: ../libegg/egg-datetime.c:397
+#: ../libegg/egg-datetime.c:389
 msgid "Lower limit day"
 msgstr "æäé"
 
-#: ../libegg/egg-datetime.c:398
+#: ../libegg/egg-datetime.c:390
 msgid "Day of month part of the lower date limit"
 msgstr "éçææçæåå"
 
-#: ../libegg/egg-datetime.c:403
+#: ../libegg/egg-datetime.c:395
 msgid "Upper limit day"
 msgstr "æäé"
 
-#: ../libegg/egg-datetime.c:404
+#: ../libegg/egg-datetime.c:396
 msgid "Day of month part of the upper date limit"
 msgstr "éçææçæåå"
 
-#: ../libegg/egg-datetime.c:409
+#: ../libegg/egg-datetime.c:401
 msgid "Lower limit hour"
 msgstr "åæäé"
 
-#: ../libegg/egg-datetime.c:410
+#: ../libegg/egg-datetime.c:402
 msgid "Hour part of the lower time limit"
 msgstr "éçåæçæåå"
 
-#: ../libegg/egg-datetime.c:415
+#: ../libegg/egg-datetime.c:407
 msgid "Upper limit hour"
 msgstr "åæäé"
 
-#: ../libegg/egg-datetime.c:416
+#: ../libegg/egg-datetime.c:408
 msgid "Hour part of the upper time limit"
 msgstr "éçåæçæåå"
 
-#: ../libegg/egg-datetime.c:421
+#: ../libegg/egg-datetime.c:413
 msgid "Lower limit minute"
 msgstr "åéäé"
 
-#: ../libegg/egg-datetime.c:422
+#: ../libegg/egg-datetime.c:414
 msgid "Minute part of the lower time limit"
 msgstr "éçåéçæåå"
 
-#: ../libegg/egg-datetime.c:427
+#: ../libegg/egg-datetime.c:419
 msgid "Upper limit minute"
 msgstr "åéäé"
 
-#: ../libegg/egg-datetime.c:428
+#: ../libegg/egg-datetime.c:420
 msgid "Minute part of the upper time limit"
 msgstr "éçåéçæåå"
 
-#: ../libegg/egg-datetime.c:433
+#: ../libegg/egg-datetime.c:425
 msgid "Lower limit second"
 msgstr "çéäé"
 
-#: ../libegg/egg-datetime.c:434
+#: ../libegg/egg-datetime.c:426
 msgid "Second part of the lower time limit"
 msgstr "éççéçæåå"
 
-#: ../libegg/egg-datetime.c:439
+#: ../libegg/egg-datetime.c:431
 msgid "Upper limit second"
 msgstr "çéäé"
 
-#: ../libegg/egg-datetime.c:440
+#: ../libegg/egg-datetime.c:432
 msgid "Second part of the upper time limit"
 msgstr "éççéçæåå"
 
@@ -902,159 +504,96 @@ msgstr "éççéçæåå"
 #. * 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:0"
 
-#: ../libegg/egg-datetime.c:504
+#: ../libegg/egg-datetime.c:496
 msgid "Date"
 msgstr "ææ"
 
-#: ../libegg/egg-datetime.c:504
+#: ../libegg/egg-datetime.c:496
 msgid "Enter the date directly"
 msgstr "çæèåææ"
 
-#: ../libegg/egg-datetime.c:511
+#: ../libegg/egg-datetime.c:503
 msgid "Select Date"
 msgstr "éæææ"
 
-#: ../libegg/egg-datetime.c:511
+#: ../libegg/egg-datetime.c:503
 msgid "Select the date from a calendar"
 msgstr "åææäéåææ"
 
-#: ../libegg/egg-datetime.c:529 ../libegg/egg-datetime.c:2213
+#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199
 msgid "Time"
 msgstr "æå"
 
-#: ../libegg/egg-datetime.c:529
+#: ../libegg/egg-datetime.c:521
 msgid "Enter the time directly"
 msgstr "çæèåæå"
 
-#: ../libegg/egg-datetime.c:536
+#: ../libegg/egg-datetime.c:528
 msgid "Select Time"
 msgstr "éææå"
 
-#: ../libegg/egg-datetime.c:536
+#: ../libegg/egg-datetime.c:528
 msgid "Select the time from a list"
 msgstr "åæåäéåæå"
 
 #. 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 "äå"
 
-#: ../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 "äå"
 
 #. 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 "ææäæææç .desktop ææ"
-
-#: ../libegg/eggdesktopfile.c:188
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "çæèèçæéææçæã%sã"
-
-#: ../libegg/eggdesktopfile.c:968
-#, c-format
-msgid "Starting %s"
-msgstr "æååå %s"
-
-#: ../libegg/eggdesktopfile.c:1110
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "æççåäæåäåäåéåæä"
-
-#: ../libegg/eggdesktopfile.c:1178
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "çæèèçååééï%d"
-
-#: ../libegg/eggdesktopfile.c:1383
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "äèåéæä URI èãType=Linkãæééç"
-
-#: ../libegg/eggdesktopfile.c:1404
-#, c-format
-msgid "Not a launchable item"
-msgstr "äæåäååçéç"
-
-#: ../libegg/eggsmclient.c:225
-msgid "Disable connection to session manager"
-msgstr "åçåäæéæçççåçéç"
-
-#: ../libegg/eggsmclient.c:228
-msgid "Specify file containing saved configuration"
-msgstr "æååæåååçæçææ"
-
-#: ../libegg/eggsmclient.c:228
-msgid "FILE"
-msgstr "ææ"
-
-#: ../libegg/eggsmclient.c:231
-msgid "Specify session management ID"
-msgstr "æåäæéæçç 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 "äæéæççéé:"
-
-#: ../libegg/eggsmclient.c:253
-msgid "Show session management options"
-msgstr "éçäæéæççéé"
-
 #: ../libseahorse/seahorse-add-keyserver.xml.h:1
 msgid ":"
 msgstr ":"
@@ -1079,45 +618,19 @@ msgstr "éæäæåçéæåã"
 msgid "initial temporary item"
 msgstr "èåèæéç"
 
-#: ../libseahorse/seahorse-notification.c:576
-#: ../libseahorse/seahorse-notification.c:604
-msgid "Key Imported"
-msgid_plural "Keys Imported"
-msgstr[0] "ééååå"
-msgstr[1] "ééååå"
-
-#: ../libseahorse/seahorse-notification.c:580
-#: ../libseahorse/seahorse-notification.c:603
-#, c-format
-msgid "Imported %i key"
-msgid_plural "Imported %i keys"
-msgstr[0] "ååå %i åéé"
-msgstr[1] "ååå %i åéé"
-
-#: ../libseahorse/seahorse-notification.c:582
-#, c-format
-msgid "Imported a key for"
-msgid_plural "Imported keys for"
-msgstr[0] "ååæéé"
-msgstr[1] "ååæéé"
-
-#: ../libseahorse/seahorse-notify.xml.h:1
-msgid "Notification Messages"
-msgstr "éçèæ"
-
-#: ../libseahorse/seahorse-object.c:317
+#: ../libseahorse/seahorse-object.c:318
 msgid "Symmetric Key"
 msgstr "åçåéé"
 
-#: ../libseahorse/seahorse-object.c:320
+#: ../libseahorse/seahorse-object.c:321
 msgid "Public Key"
 msgstr "åééé"
 
-#: ../libseahorse/seahorse-object.c:323
+#: ../libseahorse/seahorse-object.c:324
 msgid "Private Key"
 msgstr "çåéé"
 
-#: ../libseahorse/seahorse-object.c:326
+#: ../libseahorse/seahorse-object.c:327
 msgid "Credentials"
 msgstr "æè"
 
@@ -1125,28 +638,29 @@ msgstr "æè"
 #. * Translators: "This object is a means of storing items such as
 #. * name, email address, etc. that make up one's digital identity.
 #.
-#: ../libseahorse/seahorse-object.c:333
+#: ../libseahorse/seahorse-object.c:334
 msgid "Identity"
 msgstr "èå"
 
-#: ../libseahorse/seahorse-passphrase.c:200
+#: ../libseahorse/seahorse-passphrase.c:178
 msgid "Passphrase"
 msgstr "åè"
 
-#: ../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 "åç:"
 
-#: ../libseahorse/seahorse-passphrase.c:269
+#. The second and main entry
+#: ../libseahorse/seahorse-passphrase.c:244
 msgid "Confirm:"
 msgstr "çè:"
 
-#: ../libseahorse/seahorse-prefs.c:62
+#: ../libseahorse/seahorse-prefs.c:59
 msgid "Not a valid Key Server address."
 msgstr "äæææçééäæåäåã"
 
-#: ../libseahorse/seahorse-prefs.c:63
+#: ../libseahorse/seahorse-prefs.c:60
 msgid ""
 "For help contact your system adminstrator or the administrator of the key "
 "server."
@@ -1156,11 +670,11 @@ msgstr "åççççåæééäæåççåååååã"
 msgid "URL"
 msgstr "URL"
 
-#: ../libseahorse/seahorse-prefs.c:352
+#: ../libseahorse/seahorse-prefs.c:333
 msgid "Custom"
 msgstr "èè"
 
-#: ../libseahorse/seahorse-prefs.c:425
+#: ../libseahorse/seahorse-prefs.c:391
 msgid "None: Don't publish keys"
 msgstr "ææïäèçèéé"
 
@@ -1188,54 +702,54 @@ msgstr "åæééä(_F):"
 msgid "_Publish keys to:"
 msgstr "çèééè(_P):"
 
-#: ../libseahorse/seahorse-progress.xml.h:1
-msgid "Progress Title"
-msgstr "éåæé"
+#: ../libseahorse/seahorse-transfer.c:178
+msgid "Retrieving data"
+msgstr "ååèæ"
+
+#: ../libseahorse/seahorse-transfer.c:178
+msgid "Exporting data"
+msgstr "ååèæ"
+
+#: ../libseahorse/seahorse-transfer.c:182
+msgid "Importing data"
+msgstr "èåèæ"
 
-#: ../libseahorse/seahorse-unknown.c:67
+#: ../libseahorse/seahorse-transfer.c:182
+msgid "Sending data"
+msgstr "åéèæ"
+
+#: ../libseahorse/seahorse-unknown.c:59
 msgid "Unavailable"
 msgstr "äåå"
 
-#: ../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:486
 msgid "Key Data"
 msgstr "ééèæ"
 
-#: ../libseahorse/seahorse-util.c:518
+#: ../libseahorse/seahorse-util.c:488
 msgid "Multiple Keys"
 msgstr "ååéé"
 
-#: ../libseahorse/seahorse-util.c:774
-msgid "Couldn't run file-roller"
-msgstr "çæåè fille-roller"
-
-#: ../libseahorse/seahorse-util.c:780
-msgid "Couldn't package files"
-msgstr "ææçæåè"
-
-#: ../libseahorse/seahorse-util.c:781
-msgid "The file-roller process did not complete successfully"
-msgstr "file-roller çåçæåæ"
-
 #. Filter for PGP keys. We also include *.asc, as in many
 #. cases that extension is associated with text/plain
-#: ../libseahorse/seahorse-util.c:957
+#: ../libseahorse/seahorse-util.c:776
 msgid "All key files"
 msgstr "ææééæ"
 
-#: ../libseahorse/seahorse-util.c:968 ../libseahorse/seahorse-util.c:1016
+#: ../libseahorse/seahorse-util.c:787 ../libseahorse/seahorse-util.c:835
 #: ../pgp/seahorse-gpgme-photos.c:242
 msgid "All files"
 msgstr "ææææ"
 
-#: ../libseahorse/seahorse-util.c:1009
+#: ../libseahorse/seahorse-util.c:828
 msgid "Archive files"
 msgstr "åçæ"
 
-#: ../libseahorse/seahorse-util.c:1079
+#: ../libseahorse/seahorse-util.c:898
 msgid ""
 "<b>A file already exists with this name.</b>\n"
 "\n"
@@ -1245,52 +759,52 @@ msgstr ""
 "\n"
 "ææååæäæçææäåäåï"
 
-#: ../libseahorse/seahorse-util.c:1082
+#: ../libseahorse/seahorse-util.c:901
 msgid "_Replace"
 msgstr "åä(_R)"
 
 #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197
-#: ../pgp/seahorse-pgp-key-properties.c:1133
+#: ../pgp/seahorse-pgp-key-properties.c:1140
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:46
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:40
 msgid "Unknown"
 msgstr "äæ"
 
 #: ../libseahorse/seahorse-validity.c:42
-#: ../pgp/seahorse-pgp-key-properties.c:1139
+#: ../pgp/seahorse-pgp-key-properties.c:1146
 msgctxt "Validity"
 msgid "Never"
 msgstr "æä"
 
 #: ../libseahorse/seahorse-validity.c:44
-#: ../pgp/seahorse-pgp-key-properties.c:1146
+#: ../pgp/seahorse-pgp-key-properties.c:1153
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32
 msgid "Marginal"
 msgstr "åå"
 
 #: ../libseahorse/seahorse-validity.c:46
-#: ../pgp/seahorse-pgp-key-properties.c:1152
+#: ../pgp/seahorse-pgp-key-properties.c:1159
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26
 msgid "Full"
 msgstr "åå"
 
 #: ../libseahorse/seahorse-validity.c:48
-#: ../pgp/seahorse-pgp-key-properties.c:1158
+#: ../pgp/seahorse-pgp-key-properties.c:1165
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:45
 msgid "Ultimate"
 msgstr "åå"
 
 #: ../libseahorse/seahorse-validity.c:50
-#: ../pgp/seahorse-pgp-key-properties.c:1351
+#: ../pgp/seahorse-pgp-key-properties.c:1358
 msgid "Disabled"
 msgstr "ååç"
 
 #: ../libseahorse/seahorse-validity.c:52
-#: ../pgp/seahorse-pgp-key-properties.c:1347
+#: ../pgp/seahorse-pgp-key-properties.c:1354
 msgid "Revoked"
 msgstr "åæé"
 
-#: ../libseahorse/seahorse-widget.c:480
+#: ../libseahorse/seahorse-widget.c:461
 #, c-format
 msgid "Could not display help: %s"
 msgstr "çæéçèææäï%s"
@@ -1376,7 +890,7 @@ msgstr "çæåååé"
 msgid "Add subkey to %s"
 msgstr "åååéè %s"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:118
+#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:117
 msgid "DSA (sign only)"
 msgstr "DSA (åèçç)"
 
@@ -1384,7 +898,7 @@ msgstr "DSA (åèçç)"
 msgid "ElGamal (encrypt only)"
 msgstr "ElGamal (åèåå)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:119
+#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:118
 msgid "RSA (sign only)"
 msgstr "RSA (åèçç)"
 
@@ -1401,68 +915,64 @@ msgstr "çæååäçè id"
 msgid "Add user ID to %s"
 msgstr "ååäçè ID è %s"
 
-#: ../pgp/seahorse-gpgme.c:72
+#: ../pgp/seahorse-gpgme.c:69
 msgid "Decryption failed. You probably do not have the decryption key."
 msgstr "èååæãæåèææèåçééã"
 
-#: ../pgp/seahorse-gpgme-expires.c:58
+#: ../pgp/seahorse-gpgme-expires.c:57
 msgid "Invalid expiry date"
 msgstr "çæçåææ"
 
-#: ../pgp/seahorse-gpgme-expires.c:59
+#: ../pgp/seahorse-gpgme-expires.c:58
 msgid "The expiry date must be in the future"
 msgstr "åææåéåæä"
 
-#: ../pgp/seahorse-gpgme-expires.c:72
+#: ../pgp/seahorse-gpgme-expires.c:71
 msgid "Couldn't change expiry date"
 msgstr "çæèæææææ"
 
-#: ../pgp/seahorse-gpgme-expires.c:131
+#: ../pgp/seahorse-gpgme-expires.c:130
 #, c-format
 msgid "Expiry: %s"
 msgstr "åææ: %s"
 
-#: ../pgp/seahorse-gpgme-generate.c:79
+#: ../pgp/seahorse-gpgme-generate.c:78
 msgid "PGP Key"
 msgstr "PGP éé"
 
-#: ../pgp/seahorse-gpgme-generate.c:80
+#: ../pgp/seahorse-gpgme-generate.c:79
 msgid "Used to encrypt email and files"
 msgstr "çäååéäåææ"
 
-#: ../pgp/seahorse-gpgme-generate.c:116 ../ssh/seahorse-ssh-generate.xml.h:9
+#: ../pgp/seahorse-gpgme-generate.c:115 ../ssh/seahorse-ssh-generate.xml.h:9
 msgid "RSA"
 msgstr "RSA"
 
-#: ../pgp/seahorse-gpgme-generate.c:117
+#: ../pgp/seahorse-gpgme-generate.c:116
 msgid "DSA Elgamal"
 msgstr "DSA Elgamal"
 
-#: ../pgp/seahorse-gpgme-generate.c:135
+#: ../pgp/seahorse-gpgme-generate.c:165
 msgid "Couldn't generate PGP key"
 msgstr "çæçç PGP éé"
 
-#: ../pgp/seahorse-gpgme-generate.c:195
+#: ../pgp/seahorse-gpgme-generate.c:196
 msgid "Passphrase for New PGP Key"
 msgstr "PGP ééçåè"
 
-#: ../pgp/seahorse-gpgme-generate.c:196
+#: ../pgp/seahorse-gpgme-generate.c:197
 msgid "Enter the passphrase for your new key twice."
 msgstr "èåæééçåèåæã"
 
-#: ../pgp/seahorse-gpgme-generate.c:205
-msgid "Couldn't generate key"
-msgstr "çæççéé"
-
-#: ../pgp/seahorse-gpgme-generate.c:207
+#: ../pgp/seahorse-gpgme-generate.c:206
 msgid "Generating key"
 msgstr "æåççéé"
 
-#: ../pgp/seahorse-gpgme-key-op.c:301
+#: ../pgp/seahorse-gpgme-key-op.c:370
 msgid "Wrong password"
 msgstr "éèçåç"
 
-#: ../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 "éææçäæèåéèçåçãèåèäæã"
 
@@ -1502,75 +1012,79 @@ msgstr "ææ JPEG ææ"
 msgid "Choose Photo to Add to Key"
 msgstr "éæååèééççç"
 
-#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294
+#: ../pgp/seahorse-gpgme-photos.c:278
+msgid "Couldn't prepare photo"
+msgstr "çææåçç"
+
+#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292
 msgid "Couldn't add photo"
 msgstr "çæååçç"
 
-#: ../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 "ææçæèåãåèçæçæå"
 
-#: ../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 "çåèåçåçéåççæéååéâ%sâçäçè IDï"
 
-#: ../pgp/seahorse-gpgme-photos.c:333
+#: ../pgp/seahorse-gpgme-photos.c:331
 msgid "Couldn't delete photo"
 msgstr "çæåéçç"
 
-#: ../pgp/seahorse-gpgme-revoke.c:70
+#: ../pgp/seahorse-gpgme-revoke.c:69
 msgid "Couldn't revoke subkey"
 msgstr "çææéåé"
 
-#: ../pgp/seahorse-gpgme-revoke.c:91
+#: ../pgp/seahorse-gpgme-revoke.c:90
 #, c-format
 msgid "Revoke: %s"
 msgstr "æé: %s"
 
-#: ../pgp/seahorse-gpgme-revoke.c:102
+#: ../pgp/seahorse-gpgme-revoke.c:101
 msgid "No reason"
 msgstr "ææåå"
 
-#: ../pgp/seahorse-gpgme-revoke.c:103
+#: ../pgp/seahorse-gpgme-revoke.c:102
 msgid "No reason for revoking key"
 msgstr "æææéééçåå"
 
-#: ../pgp/seahorse-gpgme-revoke.c:109
+#: ../pgp/seahorse-gpgme-revoke.c:108
 msgid "Compromised"
 msgstr "åææ"
 
-#: ../pgp/seahorse-gpgme-revoke.c:110
+#: ../pgp/seahorse-gpgme-revoke.c:109
 msgid "Key has been compromised"
 msgstr "ééåææ"
 
-#: ../pgp/seahorse-gpgme-revoke.c:116
+#: ../pgp/seahorse-gpgme-revoke.c:115
 msgid "Superseded"
 msgstr "åäæ"
 
-#: ../pgp/seahorse-gpgme-revoke.c:117
+#: ../pgp/seahorse-gpgme-revoke.c:116
 msgid "Key has been superseded"
 msgstr "ééåèäæ"
 
-#: ../pgp/seahorse-gpgme-revoke.c:123
+#: ../pgp/seahorse-gpgme-revoke.c:122
 msgid "Not Used"
 msgstr "ææäç"
 
-#: ../pgp/seahorse-gpgme-revoke.c:124
+#: ../pgp/seahorse-gpgme-revoke.c:123
 msgid "Key is no longer used"
 msgstr "ééäåäç"
 
-#: ../pgp/seahorse-gpgme-revoke.c:161
+#: ../pgp/seahorse-gpgme-revoke.c:160
 #, c-format
 msgid ""
 "You are about to add %s as a revoker for %s. This operation cannot be "
 "undone! Are you sure you want to continue?"
 msgstr "æèç%2$s åå %1$s äçæéèãéåäçæååïçåèççï"
 
-#: ../pgp/seahorse-gpgme-revoke.c:173
+#: ../pgp/seahorse-gpgme-revoke.c:172
 msgid "Couldn't add revoker"
 msgstr "çæååæéè"
 
-#: ../pgp/seahorse-gpgme-sign.c:99
+#: ../pgp/seahorse-gpgme-sign.c:98
 #, c-format
 msgid ""
 "This key was already signed by\n"
@@ -1579,59 +1093,53 @@ msgstr ""
 "éåééåççäääåçç\n"
 "ã%sã"
 
-#: ../pgp/seahorse-gpgme-sign.c:103
+#: ../pgp/seahorse-gpgme-sign.c:102
 msgid "Couldn't sign key"
 msgstr "çæççéé"
 
 #. TODO: We should be giving an error message that allows them to
 #. generate or import a key
-#: ../pgp/seahorse-gpgme-sign.c:157 ../pgp/seahorse-signer.c:61
+#: ../pgp/seahorse-gpgme-sign.c:156 ../pgp/seahorse-signer.c:60
 msgid "No keys usable for signing"
 msgstr "ææééèçäçç"
 
-#: ../pgp/seahorse-gpgme-sign.c:158
+#: ../pgp/seahorse-gpgme-sign.c:157
 msgid ""
 "You have no personal PGP keys that can be used to indicate your trust of "
 "this key."
 msgstr "æææåä PGP ééåääèæääæééã"
 
-#: ../pgp/seahorse-gpgme-source.c:99
+#: ../pgp/seahorse-gpgme-source.c:86
 #, c-format
 msgid "Wrong passphrase."
 msgstr "åèéèã"
 
-#: ../pgp/seahorse-gpgme-source.c:103
+#: ../pgp/seahorse-gpgme-source.c:90
 #, c-format
 msgid "Enter new passphrase for '%s'"
 msgstr "èåâ%sâçæåè"
 
-#: ../pgp/seahorse-gpgme-source.c:105
+#: ../pgp/seahorse-gpgme-source.c:92
 #, c-format
 msgid "Enter passphrase for '%s'"
 msgstr "èåâ%sâçåè"
 
-#: ../pgp/seahorse-gpgme-source.c:108
-#: ../src/seahorse-change-passphrase.xml.h:4
+#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4
 msgid "Enter new passphrase"
 msgstr "èåæçåè"
 
-#: ../pgp/seahorse-gpgme-source.c:110
+#: ../pgp/seahorse-gpgme-source.c:97
 msgid "Enter passphrase"
 msgstr "èååè"
 
-#. TODO: We can use the GPGME progress to make this more accurate
-#: ../pgp/seahorse-gpgme-source.c:722
+#: ../pgp/seahorse-gpgme-source.c:328
 #, c-format
 msgid "Loaded %d key"
 msgid_plural "Loaded %d keys"
 msgstr[0] "åèå %d åéé"
 msgstr[1] "åèå %d åéé"
 
-#: ../pgp/seahorse-gpgme-source.c:777
-msgid "Loading Keys..."
-msgstr "æåèåééâ"
-
-#: ../pgp/seahorse-gpgme-source.c:820
+#: ../pgp/seahorse-gpgme-source.c:649
 msgid ""
 "Invalid key data (missing UIDs). This may be due to a computer with a date "
 "set in the future or a missing self-signature."
@@ -1639,121 +1147,88 @@ msgstr ""
 "çæçééèæïéæä UIDïãéåèæéèçæéäæçïèçæäçæéïææ"
 "éæäèèçççã"
 
-#: ../pgp/seahorse-gpgme-source.c:910 ../src/seahorse-key-manager.c:544
-msgid "Importing Keys"
-msgstr "ååéé"
-
-#: ../pgp/seahorse-gpgme-source.c:946
-msgid "Exporting Keys"
-msgstr "ååéé"
-
 #: ../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 ééäæå"
+
+#: ../pgp/seahorse-hkp-source.c:680
 #, c-format
 msgid "Search was not specific enough. Server '%s' found too many keys."
 msgstr "æåçåéåãäæåâ%sâäæåååééã"
 
-#: ../pgp/seahorse-hkp-source.c:389
+#: ../pgp/seahorse-hkp-source.c:683
 #, c-format
 msgid "Couldn't communicate with server '%s': %s"
 msgstr "çæèäæåâ%sâèçï%s"
 
-#: ../pgp/seahorse-hkp-source.c:671
-msgid "Searching for keys..."
-msgstr "æåæåééâ"
-
-#: ../pgp/seahorse-hkp-source.c:759
-msgid "Uploading keys..."
-msgstr "æåäåééâ"
-
-#: ../pgp/seahorse-hkp-source.c:857
-msgid "Retrieving keys..."
-msgstr "æåååééâ"
-
-#: ../pgp/seahorse-hkp-source.c:987
+#: ../pgp/seahorse-ldap-source.c:440
 #, c-format
-msgid "Searching for keys on: %s"
-msgstr "æåå %s çéé"
+msgid "Couldn't communicate with '%s': %s"
+msgstr "çæèâ%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 "éæåï%s"
 
-#: ../pgp/seahorse-hkp-source.c:1184
-msgid "HTTP Key Server"
-msgstr "HTTP ééäæå"
-
-#: ../pgp/seahorse-ldap-source.c:459
-#, c-format
-msgid "Couldn't communicate with '%s': %s"
-msgstr "çæèâ%sâæéï%s"
-
-#: ../pgp/seahorse-ldap-source.c:641
+#: ../pgp/seahorse-ldap-source.c:657
 #, c-format
 msgid "Couldn't resolve address: %s"
 msgstr "çæèæäçï%s"
 
-#: ../pgp/seahorse-ldap-source.c:719
+#: ../pgp/seahorse-ldap-source.c:701
 #, c-format
 msgid "Resolving server address: %s"
 msgstr "æåèæäæåäåï%s"
 
-#: ../pgp/seahorse-ldap-source.c:955
-#, c-format
-msgid "Searching for keys containing '%s'..."
-msgstr "æåæååæâ%sâçééâ"
-
-#: ../pgp/seahorse-ldap-source.c:983
-#, c-format
-msgid "Searching for key id '%s'..."
-msgstr "æåæå id çâ%sâçééâ"
-
-#: ../pgp/seahorse-ldap-source.c:1089
-msgid "Retrieving remote keys..."
-msgstr "æåååéçééâ"
-
-#: ../pgp/seahorse-ldap-source.c:1221
-msgid "Sending keys to key server..."
-msgstr "æååéééåééäæå"
-
-#: ../pgp/seahorse-ldap-source.c:1423
+#: ../pgp/seahorse-ldap-source.c:781
 msgid "LDAP Key Server"
 msgstr "LDAP ééäæå"
 
-#: ../pgp/seahorse-pgp-commands.c:103
+#: ../pgp/seahorse-pgp-commands.c:104
 msgid "_Sign Key..."
 msgstr "ççéé(_S)â"
 
-#: ../pgp/seahorse-pgp-commands.c:103
+#: ../pgp/seahorse-pgp-commands.c:104
 msgid "Sign public key"
 msgstr "ççåé"
 
-#: ../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 "çåèæäååé %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 "çåèå %d åééèèåèåæäååéåï"
 
-#: ../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 "æçåèæäåé %d åééï"
 
-#: ../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 "æçåèæäåé %d åèåèåï"
 
+#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:253
+msgid "Couldn't delete user ID"
+msgstr "çæåéäçè ID"
+
+#: ../pgp/seahorse-pgp-commands.c:205
+msgid "Couldn't delete private key"
+msgstr "çæåéçåéé"
+
+#: ../pgp/seahorse-pgp-commands.c:208
+msgid "Couldn't delete public key"
+msgstr "çæåéåééé"
+
 #: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1
 msgid "<b>_Advanced key options</b>"
 msgstr "<b>éééééé</b>(_A)"
@@ -1798,122 +1273,132 @@ msgstr "æå PGP éé"
 msgid "_Comment:"
 msgstr "éè(_C):"
 
-#: ../pgp/seahorse-pgp-key.c:201
+#: ../pgp/seahorse-pgp-key.c:200
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38
 msgid "Private PGP Key"
 msgstr "çä PGP éé"
 
-#: ../pgp/seahorse-pgp-key.c:204
+#: ../pgp/seahorse-pgp-key.c:203
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34
 msgid "Public PGP Key"
 msgstr "åå PGP éé"
 
-#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1349
+#: ../pgp/seahorse-pgp-key.c:582 ../pgp/seahorse-pgp-key-properties.c:1356
 msgid "Expired"
 msgstr "åéæ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:224
+#: ../pgp/seahorse-pgp-key-properties.c:226
 msgid "Couldn't change primary user ID"
 msgstr "çæèæäèçäçè ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:241
+#: ../pgp/seahorse-pgp-key-properties.c:243
 #, c-format
 msgid "Are you sure you want to permanently delete the '%s' user ID?"
 msgstr "çåèæäååéâ%sâçäçè IDï"
 
-#: ../pgp/seahorse-pgp-key-properties.c:251
-msgid "Couldn't delete user ID"
-msgstr "çæåéäçè ID"
-
-#: ../pgp/seahorse-pgp-key-properties.c:333
-#: ../pgp/seahorse-pgp-key-properties.c:1464
+#: ../pgp/seahorse-pgp-key-properties.c:335
+#: ../pgp/seahorse-pgp-key-properties.c:1471
 msgid "[Unknown]"
 msgstr "[äè]"
 
-#: ../pgp/seahorse-pgp-key-properties.c:426
-#: ../pgp/seahorse-pgp-key-properties.c:1742
+#: ../pgp/seahorse-pgp-key-properties.c:435
+#: ../pgp/seahorse-pgp-key-properties.c:1751
 msgid "Name/Email"
 msgstr "åç/éé"
 
-#: ../pgp/seahorse-pgp-key-properties.c:431
+#: ../pgp/seahorse-pgp-key-properties.c:440
 msgid "Signature ID"
 msgstr "çç ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:552
+#: ../pgp/seahorse-pgp-key-properties.c:561
 msgid "Couldn't change primary photo"
 msgstr "çæèæäèççç"
 
-#: ../pgp/seahorse-pgp-key-properties.c:775
+#: ../pgp/seahorse-pgp-key-properties.c:784
 msgid "(unknown)"
 msgstr "ïäæï"
 
-#: ../pgp/seahorse-pgp-key-properties.c:778
+#: ../pgp/seahorse-pgp-key-properties.c:787
 #, c-format
 msgid "This key expired on: %s"
 msgstr "æééçéææï%s"
 
-#: ../pgp/seahorse-pgp-key-properties.c:946
+#: ../pgp/seahorse-pgp-key-properties.c:848
+#: ../src/seahorse-key-manager-store.c:829
+msgid "Name"
+msgstr "åç"
+
+#: ../pgp/seahorse-pgp-key-properties.c:955
 #, c-format
 msgid "Are you sure you want to permanently delete subkey %d of %s?"
 msgstr "çåèæäååé %2$s çåé %1$dï"
 
-#: ../pgp/seahorse-pgp-key-properties.c:955
+#: ../pgp/seahorse-pgp-key-properties.c:964
 msgid "Couldn't delete subkey"
 msgstr "çæåéåé"
 
-#: ../pgp/seahorse-pgp-key-properties.c:991
-#: ../pgp/seahorse-pgp-key-properties.c:1427
+#: ../pgp/seahorse-pgp-key-properties.c:1000
+#: ../pgp/seahorse-pgp-key-properties.c:1434
 msgid "Unable to change trust"
 msgstr "çæææääå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1006 ../src/seahorse-viewer.c:290
-#: ../ssh/seahorse-ssh-key-properties.c:168
+#: ../pgp/seahorse-pgp-key-properties.c:1015 ../src/seahorse-viewer.c:296
+#: ../ssh/seahorse-ssh-key-properties.c:184
 #, c-format
 msgid "Couldn't export key to \"%s\""
 msgstr "çæååééèâ%sâ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1035
-#: ../ssh/seahorse-ssh-key-properties.c:193
+#: ../pgp/seahorse-pgp-key-properties.c:1043
+#: ../ssh/seahorse-ssh-key-properties.c:208
 msgid "Export Complete Key"
 msgstr "ååæåéé"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1060
-#: ../ssh/seahorse-ssh-key-properties.c:215
+#: ../pgp/seahorse-pgp-key-properties.c:1068
+#: ../ssh/seahorse-ssh-key-properties.c:230
 msgid "Couldn't export key."
 msgstr "çæååééã"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1267
-#: ../pgp/seahorse-pgp-key-properties.c:1356
+#: ../pgp/seahorse-pgp-key-properties.c:1274
+#: ../pgp/seahorse-pgp-key-properties.c:1363
 msgctxt "Expires"
 msgid "Never"
 msgstr "æä"
 
+#: ../pgp/seahorse-pgp-key-properties.c:1321
+msgid "ID"
+msgstr "ID"
+
 #. The key type column
-#: ../pgp/seahorse-pgp-key-properties.c:1317
-#: ../src/seahorse-key-manager-store.c:896
+#: ../pgp/seahorse-pgp-key-properties.c:1324
+#: ../src/seahorse-key-manager-store.c:860
 msgid "Type"
 msgstr "éå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1320
+#: ../pgp/seahorse-pgp-key-properties.c:1327
 msgid "Created"
 msgstr "åçææ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1323
+#: ../pgp/seahorse-pgp-key-properties.c:1330
 msgid "Expires"
 msgstr "ææææ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1326
+#: ../pgp/seahorse-pgp-key-properties.c:1333
 msgid "Status"
 msgstr "çæ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1329
+#: ../pgp/seahorse-pgp-key-properties.c:1336
 msgid "Strength"
 msgstr "åå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1353
+#: ../pgp/seahorse-pgp-key-properties.c:1360
 msgid "Good"
 msgstr "èå"
 
+#: ../pgp/seahorse-pgp-key-properties.c:1754
+#: ../src/seahorse-key-manager-store.c:841
+msgid "Key ID"
+msgstr "éé ID"
+
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:1
 msgid "<b>Actions</b>"
 msgstr "<b>åä</b>"
@@ -2148,7 +1633,7 @@ msgstr "ååç"
 
 #. Trust column
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37
-#: ../src/seahorse-key-manager-store.c:890
+#: ../src/seahorse-key-manager-store.c:854
 msgid "Trust"
 msgstr "ää"
 
@@ -2197,7 +1682,7 @@ msgstr "æéééçåå"
 msgid "_Reason:"
 msgstr "åå(_R):"
 
-#: ../pgp/seahorse-signer.c:62
+#: ../pgp/seahorse-signer.c:61
 msgid ""
 "You have no personal PGP keys that can be used to sign a document or message."
 msgstr "æææ  PGP ééåçäççæäæèæã"
@@ -2290,23 +1775,31 @@ msgstr "éååå(_V)"
 msgid "_Sign message with key:"
 msgstr "ççäæçéé(_S):"
 
-#: ../pkcs11/seahorse-pkcs11-certificate.c:106
+#: ../pkcs11/seahorse-pkcs11-certificate.c:109
 #: ../pkcs11/seahorse-pkcs11-certificate-props.c:66
 msgid "Certificate"
 msgstr "æè"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:108
+#: ../pkcs11/seahorse-pkcs11-commands.c:106
+msgid "Couldn't delete"
+msgstr "çæåé"
+
+#: ../pkcs11/seahorse-pkcs11-commands.c:127
 #, c-format
 msgid "Are you sure you want to delete the certificate '%s'?"
 msgstr "çåèåééåæèã%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] "çåèåé %d åæèï"
 msgstr[1] "çåèåé %d åæèï"
 
+#: ../pkcs11/seahorse-pkcs11-commands.c:143
+msgid "Deleting"
+msgstr "åé"
+
 #: ../src/seahorse-change-passphrase.xml.h:1
 msgid "Change Passphrase"
 msgstr "ææåè"
@@ -2327,7 +1820,7 @@ msgstr "æçåè(_P):"
 msgid "Manage your passwords and encryption keys"
 msgstr "ççåçåéé"
 
-#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:862
+#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:850
 msgid "Passwords and Encryption Keys"
 msgstr "åçåååéé"
 
@@ -2343,111 +1836,115 @@ msgstr "çç(_O)"
 msgid "Create New ..."
 msgstr "åçæçâ"
 
-#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108
+#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:109
 #, c-format
 msgid "Selected %d key"
 msgid_plural "Selected %d keys"
 msgstr[0] "åéå %d åéé"
 msgstr[1] "åéå %d åéé"
 
-#: ../src/seahorse-key-manager.c:410 ../src/seahorse-key-manager.c:470
-#: ../src/seahorse-key-manager.c:533 ../src/seahorse-viewer.c:458
+#: ../src/seahorse-key-manager.c:413 ../src/seahorse-key-manager.c:471
+#: ../src/seahorse-key-manager.c:532 ../src/seahorse-viewer.c:451
 msgid "Couldn't import keys"
 msgstr "çæååéé"
 
-#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:463
+#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:453
 msgid "Imported keys"
 msgstr "ååçéé"
 
-#: ../src/seahorse-key-manager.c:464
+#: ../src/seahorse-key-manager.c:466
 msgid "Importing keys"
 msgstr "æåååéé"
 
-#: ../src/seahorse-key-manager.c:487 ../ssh/seahorse-ssh-operation.c:1017
+#: ../src/seahorse-key-manager.c:486 ../ssh/seahorse-ssh-operation.c:1089
 msgid "Import Key"
 msgstr "ååéé"
 
-#: ../src/seahorse-key-manager.c:533
+#: ../src/seahorse-key-manager.c:532
 msgid "Unrecognized key type, or invalid data format"
 msgstr "çæèåçéééåïææçæçèææå"
 
-#: ../src/seahorse-key-manager.c:731 ../src/seahorse-keyserver-results.c:245
+#: ../src/seahorse-key-manager.c:547
+msgid "Importing Keys"
+msgstr "ååéé"
+
+#: ../src/seahorse-key-manager.c:719 ../src/seahorse-keyserver-results.c:247
 msgid "_Remote"
 msgstr "éç(_R)"
 
-#: ../src/seahorse-key-manager.c:733
+#: ../src/seahorse-key-manager.c:721
 msgid "Close this program"
 msgstr "ééæçå"
 
-#: ../src/seahorse-key-manager.c:734
+#: ../src/seahorse-key-manager.c:722
 msgid "_New..."
 msgstr "æå(_N)â"
 
-#: ../src/seahorse-key-manager.c:735
+#: ../src/seahorse-key-manager.c:723
 msgid "Create a new key or item"
 msgstr "åçæçééæéç"
 
-#: ../src/seahorse-key-manager.c:736
+#: ../src/seahorse-key-manager.c:724
 msgid "_Import..."
 msgstr "åå(_I)â"
 
-#: ../src/seahorse-key-manager.c:737
+#: ../src/seahorse-key-manager.c:725
 msgid "Import from a file"
 msgstr "çææåå"
 
-#: ../src/seahorse-key-manager.c:739
+#: ../src/seahorse-key-manager.c:727
 msgid "Import from the clipboard"
 msgstr "ååèçåå"
 
-#: ../src/seahorse-key-manager.c:744 ../src/seahorse-keyserver-results.c:255
+#: ../src/seahorse-key-manager.c:732 ../src/seahorse-keyserver-results.c:257
 msgid "_Find Remote Keys..."
 msgstr "åæéçéé(_F)â"
 
-#: ../src/seahorse-key-manager.c:745 ../src/seahorse-keyserver-results.c:256
+#: ../src/seahorse-key-manager.c:733 ../src/seahorse-keyserver-results.c:258
 msgid "Search for keys on a key server"
 msgstr "åééäæååæéé"
 
-#: ../src/seahorse-key-manager.c:746
+#: ../src/seahorse-key-manager.c:734
 msgid "_Sync and Publish Keys..."
 msgstr "åæåçèéé(_S)â"
 
-#: ../src/seahorse-key-manager.c:747
+#: ../src/seahorse-key-manager.c:735
 msgid "Publish and/or synchronize your keys with those online."
 msgstr "åçæçèå/æåééåæ"
 
-#: ../src/seahorse-key-manager.c:752
+#: ../src/seahorse-key-manager.c:740
 msgid "T_ypes"
 msgstr "éå(_Y)"
 
-#: ../src/seahorse-key-manager.c:752
+#: ../src/seahorse-key-manager.c:740
 msgid "Show type column"
 msgstr "éçéåæä"
 
-#: ../src/seahorse-key-manager.c:754
+#: ../src/seahorse-key-manager.c:742
 msgid "_Expiry"
 msgstr "ææææ(_E)"
 
-#: ../src/seahorse-key-manager.c:754
+#: ../src/seahorse-key-manager.c:742
 msgid "Show expiry column"
 msgstr "éçæææææä"
 
-#: ../src/seahorse-key-manager.c:756
+#: ../src/seahorse-key-manager.c:744
 msgid "_Trust"
 msgstr "ää(_T)"
 
-#: ../src/seahorse-key-manager.c:756
+#: ../src/seahorse-key-manager.c:744
 msgid "Show owner trust column"
 msgstr "éçääæä"
 
-#: ../src/seahorse-key-manager.c:758
+#: ../src/seahorse-key-manager.c:746
 msgid "_Validity"
 msgstr "æææ(_V)"
 
-#: ../src/seahorse-key-manager.c:758
+#: ../src/seahorse-key-manager.c:746
 msgid "Show validity column"
 msgstr "éçææææä"
 
-#: ../src/seahorse-key-manager.c:931
+#: ../src/seahorse-key-manager.c:923
 msgid "Filter:"
 msgstr "éææä:"
 
@@ -2475,7 +1972,7 @@ msgstr "åäéé(_K)"
 msgid "To get started with encryption you will need keys."
 msgstr "éååååæéèææééã"
 
-#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:522
+#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:516
 msgid "_Import"
 msgstr "åå(_I)"
 
@@ -2483,44 +1980,44 @@ msgstr "åå(_I)"
 msgid "_Passwords"
 msgstr "åç(_P)"
 
-#: ../src/seahorse-key-manager-store.c:685 ../src/seahorse-viewer.c:256
+#: ../src/seahorse-key-manager-store.c:637 ../src/seahorse-viewer.c:261
 msgid "Couldn't export keys"
 msgstr "çæååéé"
 
-#: ../src/seahorse-key-manager-store.c:883
+#: ../src/seahorse-key-manager-store.c:847
 msgid "Validity"
 msgstr "æææ"
 
 #. Expiry date column
-#: ../src/seahorse-key-manager-store.c:902
+#: ../src/seahorse-key-manager-store.c:866
 msgid "Expiration Date"
 msgstr "ææææ"
 
-#: ../src/seahorse-keyserver-results.c:247
+#: ../src/seahorse-keyserver-results.c:249
 msgid "Close this window"
 msgstr "ééæèç"
 
-#: ../src/seahorse-keyserver-results.c:248
+#: ../src/seahorse-keyserver-results.c:250
 msgid "_Expand All"
 msgstr "åéåé(_E)"
 
-#: ../src/seahorse-keyserver-results.c:249
+#: ../src/seahorse-keyserver-results.c:251
 msgid "Expand all listings"
 msgstr "åéæåæå"
 
-#: ../src/seahorse-keyserver-results.c:250
+#: ../src/seahorse-keyserver-results.c:252
 msgid "_Collapse All"
 msgstr "åéæè(_C)"
 
-#: ../src/seahorse-keyserver-results.c:251
+#: ../src/seahorse-keyserver-results.c:253
 msgid "Collapse all listings"
 msgstr "æèæåæå"
 
-#: ../src/seahorse-keyserver-results.c:322
+#: ../src/seahorse-keyserver-results.c:324
 msgid "Remote Keys"
 msgstr "éçéé"
 
-#: ../src/seahorse-keyserver-results.c:324
+#: ../src/seahorse-keyserver-results.c:326
 #, c-format
 msgid "Remote Keys Containing '%s'"
 msgstr "éçééååâ%sâ"
@@ -2556,11 +2053,11 @@ msgstr "æå(_S)"
 msgid "_Search for keys containing: "
 msgstr "æåééåå(_S):"
 
-#: ../src/seahorse-keyserver-sync.c:45
+#: ../src/seahorse-keyserver-sync.c:52
 msgid "Couldn't publish keys to server"
 msgstr "çæçèééåäæå"
 
-#: ../src/seahorse-keyserver-sync.c:61
+#: ../src/seahorse-keyserver-sync.c:71
 #, c-format
 msgid "Couldn't retrieve keys from server: %s"
 msgstr "çæåäæåäååééï%s"
@@ -2572,12 +2069,7 @@ msgid_plural "<b>%d keys are selected for synchronizing</b>"
 msgstr[0] "<b>éæä %d åééäéèåæ</b>"
 msgstr[1] "<b>éæä %d åééäéèåæ</b>"
 
-#: ../src/seahorse-keyserver-sync.c:216
-msgid "Synchronizing keys"
-msgstr "ééæååæâ"
-
-#. Show the progress window if necessary
-#: ../src/seahorse-keyserver-sync.c:248
+#: ../src/seahorse-keyserver-sync.c:241
 msgid "Synchronizing keys..."
 msgstr "ééæååæâ"
 
@@ -2611,19 +2103,19 @@ msgstr "ééäæå(_K)"
 msgid "_Sync"
 msgstr "åæ(_S)"
 
-#: ../src/seahorse-main.c:62
+#: ../src/seahorse-main.c:60
 msgid "Version of this application"
 msgstr "éåæççåççæ"
 
-#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:144
+#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:145
 msgid "Encryption Key Manager"
 msgstr "ééççå"
 
-#: ../src/seahorse-viewer.c:120
+#: ../src/seahorse-viewer.c:121
 msgid "Contributions:"
 msgstr "èçè:"
 
-#: ../src/seahorse-viewer.c:146
+#: ../src/seahorse-viewer.c:147
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -2632,111 +2124,103 @@ msgstr ""
 "\n"
 "Woodman Tuen <wmtuen gmail com>, 2005-07"
 
-#: ../src/seahorse-viewer.c:149
+#: ../src/seahorse-viewer.c:150
 msgid "Seahorse Project Homepage"
 msgstr "Seahorse åæçé"
 
 #. Top menu items
-#: ../src/seahorse-viewer.c:168
+#: ../src/seahorse-viewer.c:170
 msgid "_File"
 msgstr "ææ(_F)"
 
-#: ../src/seahorse-viewer.c:169
+#: ../src/seahorse-viewer.c:171
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../src/seahorse-viewer.c:170
+#: ../src/seahorse-viewer.c:172
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../src/seahorse-viewer.c:171
+#: ../src/seahorse-viewer.c:173
 msgid "_Help"
 msgstr "æå(_H)"
 
-#: ../src/seahorse-viewer.c:173
+#: ../src/seahorse-viewer.c:175
 msgid "Prefere_nces"
 msgstr "ååèå(_N)"
 
-#: ../src/seahorse-viewer.c:174
+#: ../src/seahorse-viewer.c:176
 msgid "Change preferences for this program"
 msgstr "æææçåçååèå"
 
-#: ../src/seahorse-viewer.c:177
+#: ../src/seahorse-viewer.c:179
 msgid "About this program"
 msgstr "éææçå"
 
-#: ../src/seahorse-viewer.c:178
+#: ../src/seahorse-viewer.c:180
 msgid "_Contents"
 msgstr "åå(_C)"
 
-#: ../src/seahorse-viewer.c:179
+#: ../src/seahorse-viewer.c:181
 msgid "Show Seahorse help"
 msgstr "éç Seahorse çèææä"
 
-#: ../src/seahorse-viewer.c:276
+#: ../src/seahorse-viewer.c:282
 msgid "Export public key"
 msgstr "åååé"
 
-#: ../src/seahorse-viewer.c:296
+#: ../src/seahorse-viewer.c:303
 msgid "Exporting keys"
 msgstr "æåååéé"
 
-#: ../src/seahorse-viewer.c:321
+#: ../src/seahorse-viewer.c:332
 msgid "Couldn't retrieve data from key server"
 msgstr "çæåééäæåäååèæ"
 
 #. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys"
-#: ../src/seahorse-viewer.c:340
+#: ../src/seahorse-viewer.c:344
 msgid "Copied keys"
 msgstr "èèçéé"
 
-#: ../src/seahorse-viewer.c:360
+#: ../src/seahorse-viewer.c:369
 msgid "Retrieving keys"
 msgstr "æåååéé"
 
-#: ../src/seahorse-viewer.c:375
-msgid "Couldn't delete."
-msgstr "çæåéã"
-
-#: ../src/seahorse-viewer.c:409
-msgid "Deleting..."
-msgstr "æååéâ"
-
-#: ../src/seahorse-viewer.c:435
+#: ../src/seahorse-viewer.c:424
 #, c-format
 msgid "%s is a private key. Are you sure you want to proceed?"
 msgstr "%s æäåçåééãæçåèççï"
 
-#: ../src/seahorse-viewer.c:483
+#: ../src/seahorse-viewer.c:478
 msgid "Importing keys from key servers"
 msgstr "åééäæåååéé"
 
-#: ../src/seahorse-viewer.c:509
+#: ../src/seahorse-viewer.c:503
 msgid "Show properties"
 msgstr "éçåæ"
 
-#: ../src/seahorse-viewer.c:510
+#: ../src/seahorse-viewer.c:504
 msgctxt "This text refers to deleting an item from its type's backing store."
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/seahorse-viewer.c:511
+#: ../src/seahorse-viewer.c:505
 msgid "Delete selected items"
 msgstr "åééåçéç"
 
-#: ../src/seahorse-viewer.c:515
+#: ../src/seahorse-viewer.c:509
 msgid "E_xport..."
 msgstr "åå(_X)â"
 
-#: ../src/seahorse-viewer.c:516
+#: ../src/seahorse-viewer.c:510
 msgid "Export to a file"
 msgstr "ååçææ"
 
-#: ../src/seahorse-viewer.c:518
+#: ../src/seahorse-viewer.c:512
 msgid "Copy to the clipboard"
 msgstr "èèååèç"
 
-#: ../src/seahorse-viewer.c:523
+#: ../src/seahorse-viewer.c:517
 msgid "Import selected keys to local key ring"
 msgstr "åååéçééåææéåå"
 
@@ -2744,40 +2228,44 @@ msgstr "åååéçééåææéåå"
 msgid "Enter your Secure Shell passphrase:"
 msgstr "èåæç SSH åè:"
 
-#: ../ssh/seahorse-ssh-commands.c:85
+#: ../ssh/seahorse-ssh-commands.c:86
 msgid "Configure Key for _Secure Shell..."
 msgstr "æåèå _SSH ééâ"
 
-#: ../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."
 msgstr "ååå SSH ééåéçååéèïåèäçèééçåã"
 
-#: ../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 "çåèåé SSH ééã%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 "çåèåé %d å SSH ééï"
 
-#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91
-#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19
+#: ../ssh/seahorse-ssh-commands.c:133
+msgid "Couldn't delete key"
+msgstr "çæåééé"
+
+#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:92
+#: ../ssh/seahorse-ssh-key.c:96 ../ssh/seahorse-ssh-key-properties.xml.h:19
 msgid "Secure Shell Key"
 msgstr "SSH éé"
 
-#: ../ssh/seahorse-ssh-generate.c:60
+#: ../ssh/seahorse-ssh-generate.c:61
 msgid "Used to access other computers (eg: via a terminal)"
 msgstr "çäååååéèïåççæï"
 
-#: ../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 "çæçç SSH éé"
 
-#: ../ssh/seahorse-ssh-generate.c:213
+#: ../ssh/seahorse-ssh-generate.c:203
 msgid "Creating Secure Shell Key"
 msgstr "æåçç SSH éé"
 
@@ -2821,31 +2309,31 @@ msgstr "åæåçéé(_J)"
 msgid "_Key Description:"
 msgstr "ééæè(_K):"
 
-#: ../ssh/seahorse-ssh-key.c:87
+#: ../ssh/seahorse-ssh-key.c:88
 msgid "(Unreadable Secure Shell Key)"
 msgstr "ïäèèåç SSH ééï"
 
-#: ../ssh/seahorse-ssh-key.c:105
+#: ../ssh/seahorse-ssh-key.c:106
 msgid "Invalid"
 msgstr "çæ"
 
-#: ../ssh/seahorse-ssh-key.c:116
+#: ../ssh/seahorse-ssh-key.c:117
 msgid "Private Secure Shell Key"
 msgstr "çä SSH éé"
 
-#: ../ssh/seahorse-ssh-key.c:119
+#: ../ssh/seahorse-ssh-key.c:120
 msgid "Public Secure Shell Key"
 msgstr "åå SSH éé"
 
-#: ../ssh/seahorse-ssh-key-properties.c:71
+#: ../ssh/seahorse-ssh-key-properties.c:62
 msgid "Couldn't rename key."
 msgstr "ééçæéæååã"
 
-#: ../ssh/seahorse-ssh-key-properties.c:112
+#: ../ssh/seahorse-ssh-key-properties.c:115
 msgid "Couldn't change authorization for key."
 msgstr "çæèæééçèèã"
 
-#: ../ssh/seahorse-ssh-key-properties.c:127
+#: ../ssh/seahorse-ssh-key-properties.c:150
 msgid "Couldn't change passphrase for key."
 msgstr "çæææééçåèã"
 
@@ -2890,77 +2378,71 @@ msgstr "æééçææèèææéææéè(_A)"
 msgid "Used to connect to other computers."
 msgstr "çäéæååéèã"
 
-#: ../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 "SSH éé"
+
+#: ../ssh/seahorse-ssh-operation.c:262
 msgid "The SSH command was terminated unexpectedly."
 msgstr "SSH æäåçæéæääæã"
 
-#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739
+#: ../ssh/seahorse-ssh-operation.c:270
 msgid "The SSH command failed."
 msgstr "SSH æäåæã"
 
-#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477
-msgid "Secure Shell key"
-msgstr "SSH éé"
-
-#: ../ssh/seahorse-ssh-operation.c:448
-msgid "Passphrase:"
-msgstr "åèï"
-
 #. Just prompt over and over again
-#: ../ssh/seahorse-ssh-operation.c:762
+#: ../ssh/seahorse-ssh-operation.c:678
 msgid "Remote Host Password"
 msgstr "éçäæåç "
 
-#: ../ssh/seahorse-ssh-operation.c:850
+#: ../ssh/seahorse-ssh-operation.c:808
 msgid "Old Key Passphrase"
 msgstr "èééåè"
 
-#: ../ssh/seahorse-ssh-operation.c:851
+#: ../ssh/seahorse-ssh-operation.c:809
 #, c-format
 msgid "Enter the old passphrase for: %s"
 msgstr "èå %s çèåè"
 
-#: ../ssh/seahorse-ssh-operation.c:855
+#: ../ssh/seahorse-ssh-operation.c:813
 msgid "New Key Passphrase"
 msgstr "æçééåè"
 
-#: ../ssh/seahorse-ssh-operation.c:856
+#: ../ssh/seahorse-ssh-operation.c:814
 #, c-format
 msgid "Enter the new passphrase for: %s"
 msgstr "èå %s çæåè"
 
-#: ../ssh/seahorse-ssh-operation.c:864
+#: ../ssh/seahorse-ssh-operation.c:822
 msgid "Enter Key Passphrase"
 msgstr "èåééåè"
 
-#: ../ssh/seahorse-ssh-operation.c:931
+#: ../ssh/seahorse-ssh-operation.c:942
 msgid "Passphrase for New Secure Shell Key"
 msgstr "æç SSH ééçåè"
 
-#: ../ssh/seahorse-ssh-operation.c:932
+#: ../ssh/seahorse-ssh-operation.c:943
 msgid "Enter a passphrase for your new Secure Shell key."
 msgstr "èåæç SSH ééçåèã"
 
-#: ../ssh/seahorse-ssh-operation.c:1013
+#: ../ssh/seahorse-ssh-operation.c:1085
 #, c-format
 msgid "Importing key: %s"
 msgstr "ååééï%s"
 
-#: ../ssh/seahorse-ssh-operation.c:1015
+#: ../ssh/seahorse-ssh-operation.c:1087
 msgid "Importing key. Enter passphrase"
 msgstr "æåååééïèèååè"
 
-#: ../ssh/seahorse-ssh-source.c:825
+#: ../ssh/seahorse-ssh-source.c:915
 msgid "No private key file is available for this key."
 msgstr "éåééææåçççåééã"
 
-#: ../ssh/seahorse-ssh-upload.c:45
+#: ../ssh/seahorse-ssh-upload.c:47
 msgid "Couldn't configure Secure Shell keys on remote computer."
 msgstr "åéçéèçæèå SSH éé"
 
-#. Show the progress window if necessary
-#: ../ssh/seahorse-ssh-upload.c:181
+#: ../ssh/seahorse-ssh-upload.c:132
 msgid "Configuring Secure Shell Keys..."
 msgstr "æåèå SSH éé"
 
@@ -2990,6 +2472,399 @@ msgstr "çååç(_L):"
 msgid "_Set Up"
 msgstr "èå(_S)"
 
+#~ msgid "Do not run seahorse-daemon as a daemon"
+#~ msgstr "äääæçååååè seahorse-daemon"
+
+#~ msgid "couldn't fork process"
+#~ msgstr "çæåçåçå"
+
+#~ msgid "couldn't create new process group"
+#~ msgstr "çæåçæççåçç"
+
+#~ msgid "Encryption Daemon (Seahorse)"
+#~ msgstr "ååäæçå (Seahorse)"
+
+#~ msgid "Invalid or unrecognized key type: %s"
+#~ msgstr "çææçæçèçéééåï%s"
+
+#~ msgid "This keytype is not supported: %s"
+#~ msgstr "éåéééåæäææçï%s"
+
+#~ msgid "Support for this feature was not enabled at build time"
+#~ msgstr "çèæææåçåéååèçææ"
+
+#~ msgid "Invalid or unrecognized key: %s"
+#~ msgstr "çææçæçèçééï%s"
+
+#~ msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
+#~ msgstr "ç <i><key id=â%sâ/> ççïæ %s éæã"
+
+#~ msgid "Invalid Signature"
+#~ msgstr "çæççç"
+
+#~ msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
+#~ msgstr "ç <i><key id=â%sâ/>æ %s ççï<b>åéæ</b>ã"
+
+#~ msgid "Expired Signature"
+#~ msgstr "åéæççç"
+
+#~ msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
+#~ msgstr "ç <i><key id=â%sâ/>ççïæ %s æéã"
+
+#~ msgid "Revoked Signature"
+#~ msgstr "ççåæé"
+
+#~ msgid "Signed by <i><key id='%s'/></i> on %s."
+#~ msgstr "ç <i><key id=â%sâ/>æ %s ççã"
+
+#~ msgid "Good Signature"
+#~ msgstr "ååççç"
+
+#~ msgid "Signing key not in keyring."
+#~ msgstr "ççééäéåéåååã"
+
+#~ msgid "Unknown Signature"
+#~ msgstr "äæççç"
+
+#~ msgid "Bad or forged signature. The signed data was modified."
+#~ msgstr "æåææåéçççãççèæåèäæã"
+
+#~ msgid "Bad Signature"
+#~ msgstr "æåççç"
+
+#~ msgid "Couldn't verify signature."
+#~ msgstr "çæéèççã"
+
+#~ msgid "Invalid or unrecognized signer: %s"
+#~ msgstr "çææçæèèçççèï%s"
+
+#~ msgid "Key is not valid for signing: %s"
+#~ msgstr "ééäèææåäçççäçï%s"
+
+#~ msgid "Invalid or unrecognized recipient: %s"
+#~ msgstr "çææçæèèçæääï%s"
+
+#~ msgid "Key is not a valid recipient for encryption: %s"
+#~ msgstr "ééäæäåææçæäääååï%s"
+
+#~ msgid "No recipients specified"
+#~ msgstr "æææåæää"
+
+#~ msgid "Invalid key type for decryption: %s"
+#~ msgstr "èåçéééåçæï%s"
+
+#~ msgid "Please set clearuri"
+#~ msgstr "èèå clearui"
+
+#~ msgid "Please set crypturi"
+#~ msgstr "èèå cryptui"
+
+#~ msgid "Error opening clearuri"
+#~ msgstr "éå clearui æççéè"
+
+#~ msgid "No signer specified"
+#~ msgstr "æææåççè"
+
+#~ msgid "Invalid key type for verifying: %s"
+#~ msgstr "éè %s çéééåçæ"
+
+#~ msgid "Invalid key id: %s"
+#~ msgstr "çæçéé 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 ""
+#~ "åæéç PGP ééçééäæåç URL æåãåæäéççæååæéçåçïä"
+#~ "ååçæååçã"
+
+#~ msgid "Auto Retrieve Keys"
+#~ msgstr "èåååéé"
+
+#~ msgid "Auto Sync Keys"
+#~ msgstr "ééèååæ"
+
+#~ msgid "Controls the visibility of the expires column for the key manager."
+#~ msgstr "æåééççåçæææææäçåçæã"
+
+#~ msgid "Controls the visibility of the trust column for the key manager."
+#~ msgstr "æåééççåçääæäçåçæã"
+
+#~ msgid "Controls the visibility of the type column for the key manager."
+#~ msgstr "æåééççåçéåæäçåçæã"
+
+#~ msgid "Controls the visibility of the validity column for the key manager."
+#~ msgstr "æåééççåçææææäçåçæã"
+
+#~ msgid "Enable DNS-SD sharing"
+#~ msgstr "åç DNS-SD åä"
+
+#~ 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 ""
+#~ "åç DNS-SD (Apple Bonjour) ééåäïåééè seahorse-daemon  ååå "
+#~ "HKP å DNS-SD ææã"
+
+#~ msgid "ID of the default key"
+#~ msgstr "éèééç ID"
+
+#~ msgid ""
+#~ "If set to true, then files encrypted with seahorse will be ASCII armor "
+#~ "encoded."
+#~ msgstr "åèåçâtrueâïäç seahorse ååçææææä ASCII åèççã"
+
+#~ msgid ""
+#~ "If set to true, then the default key will always be added to an "
+#~ "encryption recipients list."
+#~ msgstr "åèåçâtrueâïéèééçææååååæääæåã"
+
+#~ msgid "Last key server search pattern"
+#~ msgstr "äæåééäæåçæååæ"
+
+#~ msgid "Last key servers used"
+#~ msgstr "äæäççééäæå"
+
+#~ msgid "Last key used to sign a message."
+#~ msgstr "äæçäçççéé"
+
+#~ msgid "PGP Key servers"
+#~ msgstr "PGP ééäæå"
+
+#~ msgid "Publish keys to this key server."
+#~ msgstr "çèééåæééäæåã"
+
+#~ msgid "Show expires column in key manager"
+#~ msgstr "åééççåäéçææææçæä"
+
+#~ msgid "Show trust column in key manager"
+#~ msgstr "åééççåäéçääçæä"
+
+#~ msgid "Show type column in key manager"
+#~ msgstr "åééççåäéçéåçæä"
+
+#~ msgid "Show validity column in key manager"
+#~ msgstr "åééççåäéçæææçæä"
+
+#~ 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 ""
+#~ "æåæääèççæäçæåæåïânameâåâidâãåæäåçååäâ-âäååæ"
+#~ "åã"
+
+#~ 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 ""
+#~ "æå seahorse ééçççåäèçæäçæåæ"
+#~ "åïânameâïâidâïâvalidityâïâexpiresâïâtrustâåâtypeâãåæäåçåå"
+#~ "äâ-âäååæåã"
+
+#~ msgid "The ID of the last secret key used to sign a message."
+#~ msgstr "äæçäççäæççé IDã"
+
+#~ msgid "The column to sort the recipients by"
+#~ msgstr "seahorse æääæäçæååå"
+
+#~ msgid "The column to sort the seahorse keys by"
+#~ msgstr "seahorse ééæäçæååå"
+
+#~ msgid ""
+#~ "The key server to publish PGP keys to. Or empty to suppress publishing of "
+#~ "PGP keys."
+#~ msgstr "PGP ééçèåçééäæåãæäçççäçæçè PGP éé"
+
+#~ msgid ""
+#~ "The last key server a search was performed against or empty for all key "
+#~ "servers."
+#~ msgstr "äææåçééäæåãæåçççææäæåã"
+
+#~ msgid "The last search pattern searched for against a key server."
+#~ msgstr "äæåééäæåçæåæåã"
+
+#~ msgid ""
+#~ "This specifies the default key to use for certain operations, mainly "
+#~ "signing."
+#~ msgstr "éæååæäåäääççéèééïäèçççæäçã"
+
+#~ msgid ""
+#~ "Whether or not keys should be automatically retrieved from key servers."
+#~ msgstr "æåèååééäæåååééã"
+
+#~ msgid ""
+#~ "Whether or not modified keys should be automatically synced with the "
+#~ "default key server."
+#~ msgstr "åäæçééæåèåèéèçééäæååæã"
+
+#~ msgid "Whether to always encrypt to default key"
+#~ msgstr "æåçæäéèééäåå"
+
+#~ msgid "Whether to use ASCII Armor"
+#~ msgstr "æåäç ASCII åè"
+
+#~ msgid "Couldn't set application access."
+#~ msgstr "çæèåæççåçååã"
+
+#~ msgid "<b>Path:</b>"
+#~ msgstr "<b>èå:</b>"
+
+#~ msgid "<b>Permissions:</b>"
+#~ msgstr "<b>æé:</b>"
+
+#~ msgid "Applications"
+#~ msgstr "æççå"
+
+#~ msgid "_Read"
+#~ msgstr "èå(_R)"
+
+#~ msgid "_Write"
+#~ msgstr "åå(_W)"
+
+#~ msgctxt "infinitive"
+#~ msgid "_Delete"
+#~ msgstr "åé(_D)"
+
+#~ msgid "Saving item..."
+#~ msgstr "æåååéçâ"
+
+#~ msgid "Listing password keyrings"
+#~ msgstr "æååååçéåå "
+
+#~ 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 ""
+#~ "åéèææèæçæäææäåååééãçåæåå <b>åçèååéé</b> ç"
+#~ "åèæåçæååäåééã"
+
+#~ msgid "All Keys"
+#~ msgstr "ææéé"
+
+#~ msgid "Selected Recipients"
+#~ msgstr "åéåæää"
+
+#~ msgid "Search Results"
+#~ msgstr "æåçæ"
+
+#~ msgid "Search _for:"
+#~ msgstr "æå(_F):"
+
+#~ msgid "None (Don't Sign)"
+#~ msgstr "ææïäèççï"
+
+#~ msgid "Sign this message as %s"
+#~ msgstr "ä %s ççéåéä"
+
+#~ msgid "_Sign message as:"
+#~ msgstr "ççèæçéé(_S):"
+
+#~ msgid "File is not a valid .desktop file"
+#~ msgstr "ææäæææç .desktop ææ"
+
+#~ msgid "Unrecognized desktop file Version '%s'"
+#~ msgstr "çæèèçæéææçæã%sã"
+
+#~ msgid "Starting %s"
+#~ msgstr "æååå %s"
+
+#~ msgid "Application does not accept documents on command line"
+#~ msgstr "æççåäæåäåäåéåæä"
+
+#~ msgid "Unrecognized launch option: %d"
+#~ msgstr "çæèèçååééï%d"
+
+#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+#~ msgstr "äèåéæä URI èãType=Linkãæééç"
+
+#~ msgid "Not a launchable item"
+#~ msgstr "äæåäååçéç"
+
+#~ msgid "Disable connection to session manager"
+#~ msgstr "åçåäæéæçççåçéç"
+
+#~ msgid "Specify file containing saved configuration"
+#~ msgstr "æååæåååçæçææ"
+
+#~ msgid "FILE"
+#~ msgstr "ææ"
+
+#~ msgid "Specify session management ID"
+#~ msgstr "æåäæéæçç ID"
+
+#~ msgid "Session management options:"
+#~ msgstr "äæéæççéé:"
+
+#~ msgid "Show session management options"
+#~ msgstr "éçäæéæççéé"
+
+#~ msgid "Key Imported"
+#~ msgid_plural "Keys Imported"
+#~ msgstr[0] "ééååå"
+#~ msgstr[1] "ééååå"
+
+#~ msgid "Imported %i key"
+#~ msgid_plural "Imported %i keys"
+#~ msgstr[0] "ååå %i åéé"
+#~ msgstr[1] "ååå %i åéé"
+
+#~ msgid "Imported a key for"
+#~ msgid_plural "Imported keys for"
+#~ msgstr[0] "ååæéé"
+#~ msgstr[1] "ååæéé"
+
+#~ msgid "Notification Messages"
+#~ msgstr "éçèæ"
+
+#~ msgid "Progress Title"
+#~ msgstr "éåæé"
+
+#~ msgid "Couldn't run file-roller"
+#~ msgstr "çæåè fille-roller"
+
+#~ msgid "Couldn't package files"
+#~ msgstr "ææçæåè"
+
+#~ msgid "The file-roller process did not complete successfully"
+#~ msgstr "file-roller çåçæåæ"
+
+#~ msgid "Loading Keys..."
+#~ msgstr "æåèåééâ"
+
+#~ msgid "Searching for keys..."
+#~ msgstr "æåæåééâ"
+
+#~ msgid "Uploading keys..."
+#~ msgstr "æåäåééâ"
+
+#~ msgid "Retrieving keys..."
+#~ msgstr "æåååééâ"
+
+#~ msgid "Searching for keys on: %s"
+#~ msgstr "æåå %s çéé"
+
+#~ msgid "Searching for keys containing '%s'..."
+#~ msgstr "æåæååæâ%sâçééâ"
+
+#~ msgid "Searching for key id '%s'..."
+#~ msgstr "æåæå id çâ%sâçééâ"
+
+#~ msgid "Retrieving remote keys..."
+#~ msgstr "æåååéçééâ"
+
+#~ msgid "Sending keys to key server..."
+#~ msgstr "æååéééåééäæå"
+
+#~ msgid "Synchronizing keys"
+#~ msgstr "ééæååæâ"
+
+#~ msgid "Passphrase:"
+#~ msgstr "åèï"
+
 #~ msgid "Couldn't share keys"
 #~ msgstr "çæåäéé"
 
@@ -3078,9 +2953,6 @@ msgstr "èå(_S)"
 #~ msgid "_Copy"
 #~ msgstr "èè(_C)"
 
-#~ msgid "Retrieving key"
-#~ msgstr "ååéé"
-
 #~ msgid "Removing item"
 #~ msgstr "æåçééç"
 
@@ -3630,9 +3502,6 @@ msgstr "èå(_S)"
 #~ msgid "Couldn't sign file: %s"
 #~ msgstr "çæççææï%s"
 
-#~ msgid "Importing"
-#~ msgstr "ååä"
-
 #~ msgid "Couldn't import keys from file: %s"
 #~ msgstr "çæåææååééï%s"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]