[seahorse] Update Simplified Chinese translation.



commit bd28080eb3997596dd5331dad55d4ca588ed5999
Author: Aron Xu <aronxu gnome org>
Date:   Sat Nov 26 10:24:19 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 1818 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 1082 insertions(+), 736 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c5dcb66..54a1189 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,9 +12,9 @@ msgstr ""
 "Project-Id-Version: seahorse master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=seahorse&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-16 12:44+0000\n"
-"PO-Revision-Date: 2011-09-16 21:00+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
+"POT-Creation-Date: 2011-11-24 11:48+0000\n"
+"PO-Revision-Date: 2011-11-26 10:24+0000\n"
+"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,141 @@ msgstr "èäæåéçéæåçãæåäèæçèåèéåçã
 msgid "The host name or address of the server."
 msgstr "æååçäæåçæåå"
 
-#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72
+#: ../gkr/seahorse-gkr-actions.c:80
+msgid "New password keyring"
+msgstr "æååçåéç"
+
+#: ../gkr/seahorse-gkr-actions.c:81 ../gkr/seahorse-gkr-actions.c:88
+msgid "Used to store application and network passwords"
+msgstr "çæäååççååççåç"
+
+#: ../gkr/seahorse-gkr-actions.c:82
+msgid "New password..."
+msgstr "æåç..."
+
+#: ../gkr/seahorse-gkr-actions.c:83 ../gkr/seahorse-gkr-actions.c:90
+msgid "Safely store a password or secret."
+msgstr "ååååååçæåèã"
+
+#: ../gkr/seahorse-gkr-actions.c:87
+msgid "Password Keyring"
+msgstr "åçåéç"
+
+#: ../gkr/seahorse-gkr-actions.c:89
+msgid "Stored Password"
+msgstr "åååçåç"
+
+#: ../gkr/seahorse-gkr-actions.c:169
+msgid "Couldn't unlock keyring"
+msgstr "ææèéåéç"
+
+#: ../gkr/seahorse-gkr-actions.c:209
+msgid "Couldn't lock keyring"
+msgstr "ææéååéç"
+
+#: ../gkr/seahorse-gkr-actions.c:250
+msgid "Couldn't set default keyring"
+msgstr "ææèçéèåéç"
+
+#: ../gkr/seahorse-gkr-actions.c:276
+msgid "Couldn't change keyring password"
+msgstr "ææäæåéçåç"
+
+#: ../gkr/seahorse-gkr-actions.c:310
+msgid "Couldn't delete keyring"
+msgstr "ææåéåéç"
+
+#: ../gkr/seahorse-gkr-actions.c:330
+#, c-format
+msgid "Are you sure you want to delete the password keyring '%s'?"
+msgstr "çèèåéåçåéçâ%sâåï"
+
+#: ../gkr/seahorse-gkr-actions.c:340
+msgid "Deleting keyring"
+msgid_plural "Deleting keyrings"
+msgstr[0] "æååéåéç"
+
+#: ../gkr/seahorse-gkr-actions.c:351
+msgid "_Lock"
+msgstr "éå(_L)"
+
+#: ../gkr/seahorse-gkr-actions.c:352
+msgid ""
+"Lock the password storage keyring so a master password is required to unlock "
+"it."
+msgstr "éååçåååéçèèéèäåçæèååèéã"
+
+#: ../gkr/seahorse-gkr-actions.c:353
+msgid "_Unlock"
+msgstr "èé(_U)"
+
+#: ../gkr/seahorse-gkr-actions.c:354
+msgid ""
+"Unlock the password storage keyring with a master password so it is "
+"available for use."
+msgstr "äçäåçèéåçåååéçäååääçã"
+
+#: ../gkr/seahorse-gkr-actions.c:356
+msgid "Delete the keyring."
+msgstr "åéåéç"
+
+#: ../gkr/seahorse-gkr-actions.c:360
+msgid "_Set as default"
+msgstr "èäéè(_S)"
+
+#: ../gkr/seahorse-gkr-actions.c:361
+msgid "Applications usually store new passwords in the default keyring."
+msgstr "åççåéååæåçåååéèåéçäã"
+
+#: ../gkr/seahorse-gkr-actions.c:362
+msgid "Change _Password"
+msgstr "ææåç(_P)"
+
+#: ../gkr/seahorse-gkr-actions.c:363
+msgid "Change the unlock password of the password storage keyring"
+msgstr "äæåçåååéççèéåç"
+
+#: ../gkr/seahorse-gkr-actions.c:365
+msgid "Properties of the keyring."
+msgstr "åéççåæã"
+
+#: ../gkr/seahorse-gkr-actions.c:369
+msgid "Lock the password storage keyring."
+msgstr "éååååççåéçã"
+
+#: ../gkr/seahorse-gkr-actions.c:371
+msgid "Unlock the password storage keyring."
+msgstr "èéåååççåéçã"
+
+#: ../gkr/seahorse-gkr-actions.c:508
+msgid "Couldn't delete item"
+msgstr "ææåééç"
+
+#: ../gkr/seahorse-gkr-actions.c:532
+#, c-format
+msgid "Are you sure you want to delete the password '%s'?"
+msgstr "çèèåéåçâ%sâåï"
+
+#: ../gkr/seahorse-gkr-actions.c:535
+#, 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 äåçåï"
+
+#: ../gkr/seahorse-gkr-actions.c:546
+msgid "Deleting item"
+msgid_plural "Deleting items"
+msgstr[0] "æååéæç"
+
+#: ../gkr/seahorse-gkr-actions.c:558
+msgid "Properties of the password."
+msgstr "åççåæã"
+
+#: ../gkr/seahorse-gkr-actions.c:563
+msgid "Delete the password."
+msgstr "åéåçã"
+
+#: ../gkr/seahorse-gkr-add-item.c:60 ../gkr/seahorse-gkr-add-keyring.c:71
 msgid "Couldn't add keyring"
 msgstr "æææååéç"
 
@@ -53,6 +187,7 @@ msgstr "æååç"
 
 #: ../gkr/seahorse-gkr-add-item.xml.h:2
 #: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5
+#: ../ssh/seahorse-ssh-generate.xml.h:9
 msgid "_Description:"
 msgstr "æè(_D)ï"
 
@@ -68,64 +203,102 @@ msgstr "åç(_P)ï"
 msgid "_Show Password"
 msgstr "æçåç(_S)"
 
-#: ../gkr/seahorse-gkr-item-commands.c:78
-msgid "Couldn't delete item"
-msgstr "ææåééç"
+#: ../gkr/seahorse-gkr-backend.c:101
+msgid "Passwords"
+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-backend.c:104
+msgid "Stored personal passwords, credentials and secrets"
+msgstr ""
 
-#: ../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 äåçåï"
+#. Translators: This should be the same as the string in empathy
+#: ../gkr/seahorse-gkr-item.c:313
+msgid "IM account password for "
+msgstr "åæéäåååç"
 
-#: ../gkr/seahorse-gkr-item-commands.c:114
-msgid "Deleting item"
-msgid_plural "Deleting items"
-msgstr[0] "æååéæç"
+#: ../gkr/seahorse-gkr-item.c:379
+msgid "Password or secret"
+msgstr ""
+
+#: ../gkr/seahorse-gkr-item.c:380
+msgid "Network password"
+msgstr "ççåç"
+
+#: ../gkr/seahorse-gkr-item.c:381
+msgid "Stored note"
+msgstr ""
+
+#: ../gkr/seahorse-gkr-item.c:382
+msgid "Keyring password"
+msgstr "åéçåç"
+
+#: ../gkr/seahorse-gkr-item.c:383
+msgid "Encryption key password"
+msgstr "åååéåä"
 
-#: ../gkr/seahorse-gkr-item-properties.c:70
+#: ../gkr/seahorse-gkr-item.c:384
+#, fuzzy
+msgid "Key storage password"
+msgstr "åååçåç"
+
+#: ../gkr/seahorse-gkr-item.c:385
+msgid "Google Chrome password"
+msgstr "Google Chrome åç"
+
+#: ../gkr/seahorse-gkr-item.c:386
+msgid "Gnome Online Accounts password"
+msgstr "GNOME åçåæåç"
+
+#: ../gkr/seahorse-gkr-item.c:387
+msgid "Telepathy password"
+msgstr "Telepathy åç"
+
+#: ../gkr/seahorse-gkr-item.c:388
+msgid "Instant messaging password"
+msgstr "åæéèåç"
+
+#: ../gkr/seahorse-gkr-item.c:389
+msgid "Network Manager secret"
+msgstr ""
+
+#: ../gkr/seahorse-gkr-item-properties.c:69
 msgid "Access a network share or resource"
 msgstr "èéççåäæèæ"
 
-#: ../gkr/seahorse-gkr-item-properties.c:73
+#: ../gkr/seahorse-gkr-item-properties.c:72
 msgid "Access a website"
 msgstr "èéçç"
 
-#: ../gkr/seahorse-gkr-item-properties.c:76
+#: ../gkr/seahorse-gkr-item-properties.c:75
 msgid "Unlocks a PGP key"
 msgstr "èé PGP åé"
 
-#: ../gkr/seahorse-gkr-item-properties.c:79
+#: ../gkr/seahorse-gkr-item-properties.c:78
 msgid "Unlocks a Secure Shell key"
 msgstr "èé SSH åé"
 
-#: ../gkr/seahorse-gkr-item-properties.c:82
+#: ../gkr/seahorse-gkr-item-properties.c:81
 msgid "Saved password or login"
 msgstr "åååçåçæçå"
 
-#: ../gkr/seahorse-gkr-item-properties.c:106
+#: ../gkr/seahorse-gkr-item-properties.c:105
 msgid "Network Credentials"
 msgstr "ççèä"
 
-#: ../gkr/seahorse-gkr-item-properties.c:111
+#: ../gkr/seahorse-gkr-item-properties.c:110
 msgid "Password"
 msgstr "åç"
 
-#: ../gkr/seahorse-gkr-item-properties.c:211
+#: ../gkr/seahorse-gkr-item-properties.c:210
 msgid "Couldn't change password."
 msgstr "ææäæåçã"
 
-#: ../gkr/seahorse-gkr-item-properties.c:256
-#: ../gkr/seahorse-gkr-item-properties.c:377
+#: ../gkr/seahorse-gkr-item-properties.c:255
+#: ../gkr/seahorse-gkr-item-properties.c:376
 msgid "Updating password"
 msgstr "æåææåç"
 
-#: ../gkr/seahorse-gkr-item-properties.c:337
+#: ../gkr/seahorse-gkr-item-properties.c:336
 msgid "Couldn't set description."
 msgstr "ææèåèæã"
 
@@ -182,101 +355,18 @@ msgstr "çåï"
 msgid "Use:"
 msgstr "äçï"
 
-#: ../gkr/seahorse-gkr-keyring.c:120
-#, c-format
-msgid "Passwords: %s"
-msgstr "åçï%s"
-
-#: ../gkr/seahorse-gkr-keyring.c:121
-#, c-format
-msgid "<b>Passwords:</b> %s"
-msgstr "<b>åçï</b> %s"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:113
-msgid "Password Keyring"
-msgstr "åçåéç"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:114
-msgid "Used to store application and network passwords"
-msgstr "çæäååççååççåç"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:115
-msgid "Stored Password"
-msgstr "åååçåç"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:116
-msgid "Safely store a password or secret."
-msgstr "ååååååçæåèã"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:128
-msgid "Couldn't unlock keyring"
-msgstr "ææèéåéç"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:165
-msgid "Couldn't lock keyring"
-msgstr "ææéååéç"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:202
-msgid "Couldn't set default keyring"
-msgstr "ææèçéèåéç"
+#: ../gkr/seahorse-gkr-keyring.c:131
+msgid "Login keyring"
+msgstr "çååéç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:239
-msgid "Couldn't change keyring password"
-msgstr "ææäæåéçåç"
+#: ../gkr/seahorse-gkr-keyring.c:545
+msgid "A keyring that is automatically unlocked on login"
+msgstr "çåççæèåèéçåéç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:268
-msgid "_Lock"
-msgstr "éå(_L)"
+#: ../gkr/seahorse-gkr-keyring.c:546
+msgid "A keyring used to store passwords"
+msgstr "çäåååççåéç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:269
-msgid ""
-"Lock the password storage keyring so a master password is required to unlock "
-"it."
-msgstr "éååçåååéçèèéèäåçæèååèéã"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:270
-msgid "_Unlock"
-msgstr "èé(_U)"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:271
-msgid ""
-"Unlock the password storage keyring with a master password so it is "
-"available for use."
-msgstr "äçäåçèéåçåååéçäååääçã"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:272
-msgid "_Set as default"
-msgstr "èäéè(_S)"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:273
-msgid "Applications usually store new passwords in the default keyring."
-msgstr "åççåéååæåçåååéèåéçäã"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:274
-msgid "Change _Password"
-msgstr "ææåç(_P)"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:275
-msgid "Change the unlock password of the password storage keyring"
-msgstr "äæåçåååéççèéåç"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:340
-msgid "Couldn't delete keyring"
-msgstr "ææåéåéç"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:358
-#, c-format
-msgid "Are you sure you want to delete the password keyring '%s'?"
-msgstr "çèèåéåçåéçâ%sâåï"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:368
-msgid "Deleting keyring"
-msgid_plural "Deleting keyrings"
-msgstr[0] "æååéåéç"
-
-#. -----------------------------------------------------------------------------
-#. * PUBLIC
-#.
 #. To translators: This is the noun not the verb.
 #: ../gkr/seahorse-gkr-keyring.xml.h:2
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:19
@@ -296,36 +386,36 @@ msgstr "åéçåæ"
 msgid "_Name:"
 msgstr "åç(_N)ï"
 
-#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73
-#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193
+#: ../gkr/seahorse-gkr-operation.c:54 ../pgp/seahorse-gpgme.c:73
+#: ../pgp/seahorse-hkp-source.c:585 ../ssh/seahorse-ssh-operation.c:193
 msgid "The operation was cancelled"
 msgstr "æäèåæ"
 
-#: ../gkr/seahorse-gkr-operation.c:57
+#: ../gkr/seahorse-gkr-operation.c:59
 msgid "Access to the key ring was denied"
 msgstr "èéåéçèæç"
 
-#: ../gkr/seahorse-gkr-operation.c:60
+#: ../gkr/seahorse-gkr-operation.c:62
 msgid "The gnome-keyring daemon is not running"
 msgstr "gnome-keyring åæèçææèè"
 
-#: ../gkr/seahorse-gkr-operation.c:63
+#: ../gkr/seahorse-gkr-operation.c:65
 msgid "The key ring has already been unlocked"
 msgstr "åéçåçèé"
 
-#: ../gkr/seahorse-gkr-operation.c:66
+#: ../gkr/seahorse-gkr-operation.c:68
 msgid "No such key ring exists"
 msgstr "äååèåéç"
 
-#: ../gkr/seahorse-gkr-operation.c:69
+#: ../gkr/seahorse-gkr-operation.c:71
 msgid "Couldn't communicate with key ring daemon"
 msgstr "ææäåéçåæèçéè"
 
-#: ../gkr/seahorse-gkr-operation.c:72
+#: ../gkr/seahorse-gkr-operation.c:74
 msgid "The item already exists"
 msgstr "æçåçåå"
 
-#: ../gkr/seahorse-gkr-operation.c:78
+#: ../gkr/seahorse-gkr-operation.c:80
 msgid "Internal error accessing gnome-keyring"
 msgstr "èé gnome-keyring æåçåééè"
 
@@ -608,38 +698,39 @@ msgstr "èææååççåã"
 msgid "initial temporary item"
 msgstr "åååäææç"
 
-#: ../libseahorse/seahorse-passphrase.c:180
-msgid "Passphrase"
-msgstr "åç"
+#: ../libseahorse/seahorse-key-manager-store.c:476
+#: ../libseahorse/seahorse-viewer.c:259
+msgid "Couldn't export keys"
+msgstr "ææåååé"
 
-#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99
+#: ../libseahorse/seahorse-passphrase.c:182 ../ssh/seahorse-ssh-askpass.c:99
 msgid "Password:"
 msgstr "åçï"
 
 #. The second and main entry
-#: ../libseahorse/seahorse-passphrase.c:246
+#: ../libseahorse/seahorse-passphrase.c:244
 msgid "Confirm:"
 msgstr "çèï"
 
-#: ../libseahorse/seahorse-prefs.c:68
+#: ../libseahorse/seahorse-prefs.c:67
 msgid "Not a valid Key Server address."
 msgstr "äæææçåéæååååã"
 
-#: ../libseahorse/seahorse-prefs.c:69
+#: ../libseahorse/seahorse-prefs.c:68
 msgid ""
 "For help contact your system adminstrator or the administrator of the key "
 "server."
 msgstr "èåæçççççåæåéæååççååæååã"
 
-#: ../libseahorse/seahorse-prefs.c:183
+#: ../libseahorse/seahorse-prefs.c:182
 msgid "URL"
 msgstr "URL"
 
-#: ../libseahorse/seahorse-prefs.c:348
+#: ../libseahorse/seahorse-prefs.c:352
 msgid "Custom"
 msgstr "åå"
 
-#: ../libseahorse/seahorse-prefs.c:406
+#: ../libseahorse/seahorse-prefs.c:405
 msgid "None: Don't publish keys"
 msgstr "æïäèåèåé"
 
@@ -667,54 +758,34 @@ msgstr "åæåæåé(_F)ï"
 msgid "_Publish keys to:"
 msgstr "ååéååå(_P)ï"
 
-#: ../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-transfer.c:182
-msgid "Sending data"
-msgstr "æååéææ"
-
-#: ../libseahorse/seahorse-unknown.c:59
-msgid "Unavailable"
-msgstr "äåç"
-
-#: ../libseahorse/seahorse-util.c:259
+#: ../libseahorse/seahorse-util.c:216
 msgid "%Y-%m-%d"
 msgstr "%Y-%m-%d"
 
-#: ../libseahorse/seahorse-util.c:444
+#: ../libseahorse/seahorse-util.c:399
 msgid "Key Data"
 msgstr "åéææ"
 
-#: ../libseahorse/seahorse-util.c:446
+#: ../libseahorse/seahorse-util.c:401
 msgid "Multiple Keys"
 msgstr "åäåé"
 
 #. Filter for PGP keys. We also include *.asc, as in many
 #. cases that extension is associated with text/plain
-#: ../libseahorse/seahorse-util.c:734
+#: ../libseahorse/seahorse-util.c:691
 msgid "All key files"
 msgstr "ææåéæä"
 
-#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793
+#: ../libseahorse/seahorse-util.c:702 ../libseahorse/seahorse-util.c:750
 #: ../pgp/seahorse-gpgme-photos.c:242
 msgid "All files"
 msgstr "æææä"
 
-#: ../libseahorse/seahorse-util.c:786
+#: ../libseahorse/seahorse-util.c:743
 msgid "Archive files"
 msgstr "æææä"
 
-#: ../libseahorse/seahorse-util.c:856
+#: ../libseahorse/seahorse-util.c:814
 msgid ""
 "<b>A file already exists with this name.</b>\n"
 "\n"
@@ -724,52 +795,165 @@ msgstr ""
 "\n"
 "ææçæçæäææååï"
 
-#: ../libseahorse/seahorse-util.c:859
+#: ../libseahorse/seahorse-util.c:817
 msgid "_Replace"
 msgstr "ææ(_R)"
 
 #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197
-#: ../pgp/seahorse-pgp-key-properties.c:1273
+#: ../pgp/seahorse-pgp-key-properties.c:1277
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:46
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:40
+#: ../pkcs11/seahorse-token.c:581
 msgid "Unknown"
 msgstr "æç"
 
 #: ../libseahorse/seahorse-validity.c:42
-#: ../pgp/seahorse-pgp-key-properties.c:1279
+#: ../pgp/seahorse-pgp-key-properties.c:1283
 msgctxt "Validity"
 msgid "Never"
 msgstr "ää"
 
 #: ../libseahorse/seahorse-validity.c:44
-#: ../pgp/seahorse-pgp-key-properties.c:1286
+#: ../pgp/seahorse-pgp-key-properties.c:1290
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32
 msgid "Marginal"
 msgstr "éå"
 
 #: ../libseahorse/seahorse-validity.c:46
-#: ../pgp/seahorse-pgp-key-properties.c:1292
+#: ../pgp/seahorse-pgp-key-properties.c:1296
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26
 msgid "Full"
 msgstr "åå"
 
 #: ../libseahorse/seahorse-validity.c:48
-#: ../pgp/seahorse-pgp-key-properties.c:1298
+#: ../pgp/seahorse-pgp-key-properties.c:1302
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:45
 msgid "Ultimate"
 msgstr "åå"
 
 #: ../libseahorse/seahorse-validity.c:50
-#: ../pgp/seahorse-pgp-key-properties.c:1491
+#: ../pgp/seahorse-pgp-key-properties.c:1492
 msgid "Disabled"
 msgstr "çæ"
 
 #: ../libseahorse/seahorse-validity.c:52
-#: ../pgp/seahorse-pgp-key-properties.c:1487
+#: ../pgp/seahorse-pgp-key-properties.c:1488
 msgid "Revoked"
 msgstr "æå"
 
-#: ../libseahorse/seahorse-widget.c:461
+#: ../libseahorse/seahorse-viewer.c:83
+msgid "Contributions:"
+msgstr "èçäï"
+
+#: ../libseahorse/seahorse-viewer.c:107 ../src/seahorse.desktop.in.in.h:2
+#: ../src/seahorse-key-manager.c:590 ../src/seahorse-main.c:68
+msgid "Passwords and Keys"
+msgstr "åçååé"
+
+#: ../libseahorse/seahorse-viewer.c:109
+msgid "translator-credits"
+msgstr ""
+"wei Li <lw124124 gmail com>Zipeco <Zipeco btamail net cn>, 2002\n"
+"Funda Wang <fundawang linux net cn>, 2004\n"
+"Deng Xiyue <manphiz gmail com> 2007, 2008, 2009\n"
+"Aron Xu <happyaron xu gmail com>, 2009, 2010, 2011\n"
+"Yinghua Wang <wantinghard gmail com>, 2010, 2011"
+
+#: ../libseahorse/seahorse-viewer.c:112
+msgid "Seahorse Project Homepage"
+msgstr "Seahorse éçéé"
+
+#. Top menu items
+#: ../libseahorse/seahorse-viewer.c:229
+msgid "_File"
+msgstr "æä(_F)"
+
+#: ../libseahorse/seahorse-viewer.c:230
+msgid "_Edit"
+msgstr "çè(_E)"
+
+#. Translators: This text refers to deleting an item from its type's backing store
+#: ../libseahorse/seahorse-viewer.c:232
+#: ../pkcs11/seahorse-pkcs11-properties.c:249
+msgid "_Delete"
+msgstr "åé(_D)"
+
+#: ../libseahorse/seahorse-viewer.c:233
+msgid "Delete selected items"
+msgstr "åéåéæçéç"
+
+#: ../libseahorse/seahorse-viewer.c:235
+msgid "Show the properties of this item"
+msgstr "æçæéççåæ"
+
+#: ../libseahorse/seahorse-viewer.c:237
+msgid "Show the properties of this place"
+msgstr "æçæäççåæ"
+
+#: ../libseahorse/seahorse-viewer.c:238
+msgid "Prefere_nces"
+msgstr "ééé(_N)"
+
+#: ../libseahorse/seahorse-viewer.c:239
+msgid "Change preferences for this program"
+msgstr "äææçåçééé"
+
+#: ../libseahorse/seahorse-viewer.c:240
+msgid "_View"
+msgstr "èå(_V)"
+
+#: ../libseahorse/seahorse-viewer.c:241
+msgid "_Help"
+msgstr "åå(_H)"
+
+#: ../libseahorse/seahorse-viewer.c:243
+msgid "About this program"
+msgstr "åäæçå"
+
+#: ../libseahorse/seahorse-viewer.c:244
+msgid "_Contents"
+msgstr "åå(_C)"
+
+#: ../libseahorse/seahorse-viewer.c:245
+msgid "Show Seahorse help"
+msgstr "æç Seahorse åå"
+
+#: ../libseahorse/seahorse-viewer.c:280
+msgid "Export public key"
+msgstr "åååé"
+
+#: ../libseahorse/seahorse-viewer.c:294
+#: ../pgp/seahorse-pgp-key-properties.c:1143
+#: ../ssh/seahorse-ssh-key-properties.c:201
+#, c-format
+msgid "Couldn't export key to \"%s\""
+msgstr "ææåâ%sâåååé"
+
+#: ../libseahorse/seahorse-viewer.c:301
+msgid "Exporting keys"
+msgstr "æååååé"
+
+#: ../libseahorse/seahorse-viewer.c:330
+msgid "Couldn't retrieve data from key server"
+msgstr "ææäåéæååååææ"
+
+#: ../libseahorse/seahorse-viewer.c:364
+msgid "Retrieving keys"
+msgstr "æååååé"
+
+#: ../libseahorse/seahorse-viewer.c:372
+msgid "E_xport..."
+msgstr "åå(_X)..."
+
+#: ../libseahorse/seahorse-viewer.c:373
+msgid "Export to a file"
+msgstr "åååæä"
+
+#: ../libseahorse/seahorse-viewer.c:375
+msgid "Copy to the clipboard"
+msgstr "ååååèæ"
+
+#: ../libseahorse/seahorse-widget.c:473
 #, c-format
 msgid "Could not display help: %s"
 msgstr "æææçååï%s"
@@ -791,6 +975,7 @@ msgid "Key _Length:"
 msgstr "åééå(_L)ï"
 
 #: ../pgp/seahorse-add-subkey.xml.h:5
+#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4
 msgid "Key _Type:"
 msgstr "åéçå(_T)ï"
 
@@ -830,7 +1015,7 @@ msgstr "åéçæèåéçæé"
 msgid "Optional email address"
 msgstr "åéçåéäåå"
 
-#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13
+#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:12
 msgid "_Email Address:"
 msgstr "çåéäåå(_E)ï"
 
@@ -855,7 +1040,7 @@ msgstr "æææåååé"
 msgid "Add subkey to %s"
 msgstr "å %s æåååé"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130
+#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134
 msgid "DSA (sign only)"
 msgstr "DSA (äçç)"
 
@@ -863,7 +1048,7 @@ msgstr "DSA (äçç)"
 msgid "ElGamal (encrypt only)"
 msgstr "ElGamal (äåå)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131
+#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135
 msgid "RSA (sign only)"
 msgstr "RSA (äçç)"
 
@@ -901,46 +1086,98 @@ msgstr "æææææææ"
 msgid "Expiry: %s"
 msgstr "èæçæï%s"
 
-#: ../pgp/seahorse-gpgme-generate.c:91
+#: ../pgp/seahorse-gpgme-generate.c:95
 msgid "PGP Key"
 msgstr "PGP åé"
 
-#: ../pgp/seahorse-gpgme-generate.c:92
+#: ../pgp/seahorse-gpgme-generate.c:96
 msgid "Used to encrypt email and files"
 msgstr "çæååéäåæä"
 
-#: ../pgp/seahorse-gpgme-generate.c:128
+#: ../pgp/seahorse-gpgme-generate.c:132
+#: ../pkcs11/seahorse-pkcs11-generate.c:92
 msgid "RSA"
 msgstr "RSA"
 
-#: ../pgp/seahorse-gpgme-generate.c:129
+#: ../pgp/seahorse-gpgme-generate.c:133
 msgid "DSA Elgamal"
 msgstr "DSA ElGamal"
 
-#: ../pgp/seahorse-gpgme-generate.c:178
+#: ../pgp/seahorse-gpgme-generate.c:182
 msgid "Couldn't generate PGP key"
 msgstr "ææçæ PGP åé"
 
-#: ../pgp/seahorse-gpgme-generate.c:209
+#: ../pgp/seahorse-gpgme-generate.c:213
 msgid "Passphrase for New PGP Key"
 msgstr "æ PGP åéçåç"
 
-#: ../pgp/seahorse-gpgme-generate.c:210
+#: ../pgp/seahorse-gpgme-generate.c:214
 msgid "Enter the passphrase for your new key twice."
 msgstr "èåæçæåéçåçäæ"
 
-#: ../pgp/seahorse-gpgme-generate.c:219
+#: ../pgp/seahorse-gpgme-generate.c:223
+#: ../pkcs11/seahorse-pkcs11-generate.c:457
 msgid "Generating key"
 msgstr "æåçæåé"
 
-#: ../pgp/seahorse-gpgme-key-op.c:370
+#: ../pgp/seahorse-gpgme-key-op.c:381
 msgid "Wrong password"
 msgstr "åçéè"
 
-#: ../pgp/seahorse-gpgme-key-op.c:370
+#: ../pgp/seahorse-gpgme-key-op.c:381
 msgid "This was the third time you entered a wrong password. Please try again."
 msgstr "èææçäæèéåçäãèéèã"
 
+#: ../pgp/seahorse-gpgme-keyring.c:90
+#, c-format
+msgid "Wrong passphrase."
+msgstr "éèçåçã"
+
+#: ../pgp/seahorse-gpgme-keyring.c:94
+#, c-format
+msgid "Enter new passphrase for '%s'"
+msgstr "èèåâ%sâçæåç"
+
+#: ../pgp/seahorse-gpgme-keyring.c:96
+#, c-format
+msgid "Enter passphrase for '%s'"
+msgstr "èèåâ%sâçåç"
+
+#: ../pgp/seahorse-gpgme-keyring.c:99
+#: ../src/seahorse-change-passphrase.xml.h:4
+msgid "Enter new passphrase"
+msgstr "èåæåç"
+
+#: ../pgp/seahorse-gpgme-keyring.c:101
+msgid "Enter passphrase"
+msgstr "èååç"
+
+#: ../pgp/seahorse-gpgme-keyring.c:106
+msgid "Passphrase"
+msgstr "åç"
+
+#: ../pgp/seahorse-gpgme-keyring.c:307
+#, c-format
+msgid "Loaded %d key"
+msgid_plural "Loaded %d keys"
+msgstr[0] "åèå %d äåé"
+
+#: ../pgp/seahorse-gpgme-keyring.c:653
+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-keyring.c:962
+msgid "GnuPG keyring"
+msgstr "GnuPG åéç"
+
+#: ../pgp/seahorse-gpgme-keyring.c:965
+msgid "GnuPG: default keyring directory"
+msgstr "GnuPGïéèåéæçå"
+
 #: ../pgp/seahorse-gpgme-photos.c:73
 #, c-format
 msgid ""
@@ -1046,89 +1283,176 @@ msgid ""
 "undone! Are you sure you want to continue?"
 msgstr "æåä %2$s æå %1$s ääæåèãææääèåæïæçåèççåï"
 
-#: ../pgp/seahorse-gpgme-revoke.c:178
-msgid "Couldn't add revoker"
-msgstr "æææåæåè"
+#: ../pgp/seahorse-gpgme-revoke.c:178
+msgid "Couldn't add revoker"
+msgstr "æææåæåè"
+
+#: ../pgp/seahorse-gpgme-sign.c:100
+#, c-format
+msgid ""
+"This key was already signed by\n"
+"\"%s\""
+msgstr ""
+"åéååé\n"
+"â%sâ"
+
+#: ../pgp/seahorse-gpgme-sign.c:105
+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:164 ../pgp/seahorse-signer.c:62
+msgid "No keys usable for signing"
+msgstr "ææåçäçççåé"
+
+#: ../pgp/seahorse-gpgme-sign.c:165
+msgid ""
+"You have no personal PGP keys that can be used to indicate your trust of "
+"this key."
+msgstr "æææää PGP åéåçäèæææåääæåéã"
+
+#: ../pgp/seahorse-gpgme-subkey.c:199
+msgid "ElGamal"
+msgstr "ElGamal"
+
+#: ../pgp/seahorse-hkp-source.c:603
+#, c-format
+msgid "Search was not specific enough. Server '%s' found too many keys."
+msgstr "æçèåèåãæååâ%sâäæååååéã"
+
+#: ../pgp/seahorse-hkp-source.c:606
+#, c-format
+msgid "Couldn't communicate with server '%s': %s"
+msgstr "ææäæååâ%sâéèï%s"
+
+#: ../pgp/seahorse-hkp-source.c:1134
+msgid "HTTP Key Server"
+msgstr "HTTP åéæåå"
+
+#: ../pgp/seahorse-keyserver-results.c:176
+msgid "Couldn't import keys"
+msgstr "ææåååé"
+
+#: ../pgp/seahorse-keyserver-results.c:219
+msgid "Importing keys from key servers"
+msgstr "äåéæåååååé"
+
+#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:439
+msgid "_Remote"
+msgstr "èç(_R)"
+
+#: ../pgp/seahorse-keyserver-results.c:246
+msgid "Close this window"
+msgstr "åéæçå"
+
+#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:101
+msgid "_Find Remote Keys..."
+msgstr "åæèçåé(_F)..."
+
+#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:102
+msgid "Search for keys on a key server"
+msgstr "ååéæååæçåé"
+
+#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:5
+msgid "_Import"
+msgstr "åå(_I)"
+
+#: ../pgp/seahorse-keyserver-results.c:256
+msgid "Import selected keys to local key ring"
+msgstr "ååéæçåéåååæååéç"
+
+#: ../pgp/seahorse-keyserver-results.c:294
+msgid "Remote Keys"
+msgstr "èçåé"
 
-#: ../pgp/seahorse-gpgme-sign.c:101
+#: ../pgp/seahorse-keyserver-results.c:296
 #, c-format
-msgid ""
-"This key was already signed by\n"
-"\"%s\""
-msgstr ""
-"åéååé\n"
-"â%sâ"
+msgid "Remote Keys Containing '%s'"
+msgstr "èçåéååâ%sâ"
 
-#: ../pgp/seahorse-gpgme-sign.c:105
-msgid "Couldn't sign key"
-msgstr "ææççåé"
+#: ../pgp/seahorse-keyserver-results.c:496
+msgid "The search for keys failed."
+msgstr "åæåéåèã"
 
-#. TODO: We should be giving an error message that allows them to
-#. generate or import a key
-#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61
-msgid "No keys usable for signing"
-msgstr "ææåçäçççåé"
+#: ../pgp/seahorse-keyserver-search.xml.h:1
+msgid "<b>Key Servers:</b>"
+msgstr "<b>åéæååï</b>"
+
+#: ../pgp/seahorse-keyserver-search.xml.h:2
+msgid "<b>Shared Keys Near Me:</b>"
+msgstr "<b>æéèçåäåéï</b>"
+
+#: ../pgp/seahorse-keyserver-search.xml.h:3
+msgid "Find Remote Keys"
+msgstr "åæèçåé"
 
-#: ../pgp/seahorse-gpgme-sign.c:162
+#: ../pgp/seahorse-keyserver-search.xml.h:4
 msgid ""
-"You have no personal PGP keys that can be used to indicate your trust of "
-"this key."
-msgstr "æææää PGP åéåçäèæææåääæåéã"
+"This will find keys for others on the Internet. These keys can then be "
+"imported into your local key ring."
+msgstr "èååäèçäåæåääçåéãèäåéåäååæçæååéçã"
 
-#: ../pgp/seahorse-gpgme-source.c:86
-#, c-format
-msgid "Wrong passphrase."
-msgstr "éèçåçã"
+#: ../pgp/seahorse-keyserver-search.xml.h:5
+msgid "Where to search:"
+msgstr "äåéæçï"
 
-#: ../pgp/seahorse-gpgme-source.c:90
-#, c-format
-msgid "Enter new passphrase for '%s'"
-msgstr "èèåâ%sâçæåç"
+#: ../pgp/seahorse-keyserver-search.xml.h:6
+msgid "_Search"
+msgstr "æç(_S)"
 
-#: ../pgp/seahorse-gpgme-source.c:92
-#, c-format
-msgid "Enter passphrase for '%s'"
-msgstr "èèåâ%sâçåç"
+#: ../pgp/seahorse-keyserver-search.xml.h:7
+msgid "_Search for keys containing: "
+msgstr "æçååèäååçåé(_S)ï "
 
-#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4
-msgid "Enter new passphrase"
-msgstr "èåæåç"
+#: ../pgp/seahorse-keyserver-sync.c:57
+msgid "Couldn't publish keys to server"
+msgstr "ææåæåååèåé"
 
-#: ../pgp/seahorse-gpgme-source.c:97
-msgid "Enter passphrase"
-msgstr "èååç"
+#: ../pgp/seahorse-keyserver-sync.c:76
+#, c-format
+msgid "Couldn't retrieve keys from server: %s"
+msgstr "ææäæåååååéï%s"
 
-#: ../pgp/seahorse-gpgme-source.c:328
+#: ../pgp/seahorse-keyserver-sync.c:160
 #, c-format
-msgid "Loaded %d key"
-msgid_plural "Loaded %d keys"
-msgstr[0] "åèå %d äåé"
+msgid "<b>%d key is selected for synchronizing</b>"
+msgid_plural "<b>%d keys are selected for synchronizing</b>"
+msgstr[0] "<b>åéæåæ %d äåé</b>"
 
-#: ../pgp/seahorse-gpgme-source.c:649
+#: ../pgp/seahorse-keyserver-sync.c:229
+msgid "Synchronizing keys..."
+msgstr "æååæåé..."
+
+#: ../pgp/seahorse-keyserver-sync.xml.h:1
+msgid "Sync Keys"
+msgstr "åæåé"
+
+#: ../pgp/seahorse-keyserver-sync.xml.h:2
 msgid ""
-"Invalid key data (missing UIDs). This may be due to a computer with a date "
-"set in the future or a missing self-signature."
+"This will publish the keys in your key ring so they're available for others "
+"to use. You'll also get any changes others have made since you received "
+"their keys."
 msgstr ""
-"ææçåéææ(çå UID)ãèåèæçäçèæéèçææææéæèçåèæç"
-"åã"
-
-#: ../pgp/seahorse-gpgme-subkey.c:199
-msgid "ElGamal"
-msgstr "ElGamal"
+"èååèæåéçéçåéïèæåäåäåääæäçãæäåäèåèäæèåå"
+"äåéäæåäèèçäæ"
 
-#: ../pgp/seahorse-hkp-source.c:645
-msgid "HTTP Key Server"
-msgstr "HTTP åéæåå"
+#: ../pgp/seahorse-keyserver-sync.xml.h:3
+msgid ""
+"This will retrieve any changes others have made since you received their "
+"keys. No key server has been chosen for publishing, so your keys will not be "
+"made available to others."
+msgstr ""
+"èåååèäææèåääçåéäæåäæäçæææåãæææåçæåèçåé"
+"æååïæäæçåéææèåäääçã"
 
-#: ../pgp/seahorse-hkp-source.c:680
-#, c-format
-msgid "Search was not specific enough. Server '%s' found too many keys."
-msgstr "æçèåèåãæååâ%sâäæååååéã"
+#: ../pgp/seahorse-keyserver-sync.xml.h:4
+msgid "_Key Servers"
+msgstr "åéæåå(_K)"
 
-#: ../pgp/seahorse-hkp-source.c:683
-#, c-format
-msgid "Couldn't communicate with server '%s': %s"
-msgstr "ææäæååâ%sâéèï%s"
+#: ../pgp/seahorse-keyserver-sync.xml.h:5
+msgid "_Sync"
+msgstr "åæ(_S)"
 
 #: ../pgp/seahorse-ldap-source.c:440
 #, c-format
@@ -1150,51 +1474,79 @@ msgstr "ææèæååï%s"
 msgid "Resolving server address: %s"
 msgstr "æåèææååååï%s"
 
-#: ../pgp/seahorse-ldap-source.c:781
+#: ../pgp/seahorse-ldap-source.c:1450
 msgid "LDAP Key Server"
 msgstr "LDAP åéæåå"
 
-#: ../pgp/seahorse-pgp-commands.c:104
-msgid "_Sign Key..."
-msgstr "ççåé(_S)..."
+#: ../pgp/seahorse-pgp-actions.c:106
+msgid "_Sync and Publish Keys..."
+msgstr "åæååååé(_S)"
 
-#: ../pgp/seahorse-pgp-commands.c:104
-msgid "Sign public key"
-msgstr "ççåé"
+#: ../pgp/seahorse-pgp-actions.c:107
+msgid "Publish and/or synchronize your keys with those online."
+msgstr "äéäåççåéåèå/æåææçåé"
 
-#: ../pgp/seahorse-pgp-commands.c:174
+#: ../pgp/seahorse-pgp-actions.c:251
 #, c-format
 msgid "Are you sure you want to permanently delete %s?"
 msgstr "æçåèæäåé %s åï"
 
-#: ../pgp/seahorse-pgp-commands.c:179
+#: ../pgp/seahorse-pgp-actions.c:256 ../pgp/seahorse-pgp-actions.c:257
 #, c-format
 msgid "Are you sure you want to permanently delete %d keys and identities?"
 msgstr "æçåæèæäååé %d äåéåèäåï"
 
-#: ../pgp/seahorse-pgp-commands.c:181
+#: ../pgp/seahorse-pgp-actions.c:261 ../pgp/seahorse-pgp-actions.c:262
 #, c-format
 msgid "Are you sure you want to permanently delete %d keys?"
 msgstr "æçåæèæäååé %d äåéåï"
 
-#: ../pgp/seahorse-pgp-commands.c:183
+#: ../pgp/seahorse-pgp-actions.c:266 ../pgp/seahorse-pgp-actions.c:267
 #, 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:348
+#: ../pgp/seahorse-pgp-actions.c:288 ../pgp/seahorse-pgp-key-properties.c:352
 msgid "Couldn't delete user ID"
 msgstr "ææåéçæ ID"
 
-#: ../pgp/seahorse-pgp-commands.c:205
+#: ../pgp/seahorse-pgp-actions.c:292
 msgid "Couldn't delete private key"
 msgstr "ææåéçé"
 
-#: ../pgp/seahorse-pgp-commands.c:208
+#: ../pgp/seahorse-pgp-actions.c:295
 msgid "Couldn't delete public key"
 msgstr "ææåéåé"
 
-#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1
+#: ../pgp/seahorse-pgp-actions.c:307
+msgid "_Sign Key..."
+msgstr "ççåé(_S)..."
+
+#: ../pgp/seahorse-pgp-actions.c:308
+msgid "Sign public key"
+msgstr "ççåé"
+
+#: ../pgp/seahorse-pgp-actions.c:310 ../ssh/seahorse-ssh-actions.c:145
+msgid "Properties of the key."
+msgstr "åéçåæã"
+
+#: ../pgp/seahorse-pgp-actions.c:315 ../ssh/seahorse-ssh-actions.c:140
+msgid "Delete the key."
+msgstr "åéåéã"
+
+#: ../pgp/seahorse-pgp-backend.c:174
+msgid "PGP Keys"
+msgstr "PGP åé"
+
+#: ../pgp/seahorse-pgp-backend.c:177
+#, fuzzy
+#| msgid "Used to encrypt email and files"
+msgid "PGP keys are for encrypting email or files"
+msgstr "çæååéäåæä"
+
+#: ../pgp/seahorse-pgp-generate.xml.h:1
+#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1
+#: ../ssh/seahorse-ssh-generate.xml.h:1
 msgid "<b>_Advanced key options</b>"
 msgstr "<b>éçåééé</b>"
 
@@ -1222,7 +1574,9 @@ msgstr "ååçå(_T)ï"
 msgid "Generate a new key"
 msgstr "çææåé"
 
-#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6
+#: ../pgp/seahorse-pgp-generate.xml.h:9
+#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3
+#: ../ssh/seahorse-ssh-generate.xml.h:6
 msgid "Key _Strength (bits):"
 msgstr "åéäååå(ä)(_S)"
 
@@ -1231,126 +1585,120 @@ msgid "Ne_ver Expires"
 msgstr "æäèæ(_V)"
 
 #: ../pgp/seahorse-pgp-generate.xml.h:11
-msgid "New PGP Key"
-msgstr "æ PGP åé"
-
-#: ../pgp/seahorse-pgp-generate.xml.h:12
 msgid "_Comment:"
 msgstr "åæ(_C)ï"
 
-#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489
-msgid "Expired"
-msgstr "åèæ"
+#: ../pgp/seahorse-pgp-key.c:347
+msgid "Personal PGP key"
+msgstr "ää PGP åé"
+
+#: ../pgp/seahorse-pgp-key.c:349
+msgid "PGP key"
+msgstr "PGP åé"
 
-#: ../pgp/seahorse-pgp-key-properties.c:319
+#: ../pgp/seahorse-pgp-key-properties.c:323
 msgid "Couldn't change primary user ID"
 msgstr "ææäæäçæ ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:338
+#: ../pgp/seahorse-pgp-key-properties.c:342
 #, c-format
 msgid "Are you sure you want to permanently delete the '%s' user ID?"
 msgstr "æçåèæäåéâ%sâçæ ID åï"
 
-#: ../pgp/seahorse-pgp-key-properties.c:433
-#: ../pgp/seahorse-pgp-key-properties.c:1604
+#: ../pgp/seahorse-pgp-key-properties.c:426
+#: ../pgp/seahorse-pgp-key-properties.c:1593
 msgid "[Unknown]"
 msgstr "[æç]"
 
-#: ../pgp/seahorse-pgp-key-properties.c:533
-#: ../pgp/seahorse-pgp-key-properties.c:1885
+#: ../pgp/seahorse-pgp-key-properties.c:529
+#: ../pgp/seahorse-pgp-key-properties.c:1872
 msgid "Name/Email"
 msgstr "åç/çåéä"
 
-#: ../pgp/seahorse-pgp-key-properties.c:538
+#: ../pgp/seahorse-pgp-key-properties.c:534
 msgid "Signature ID"
 msgstr "çå ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:671
+#: ../pgp/seahorse-pgp-key-properties.c:667
 msgid "Couldn't change primary photo"
 msgstr "ææäæäçç"
 
-#: ../pgp/seahorse-pgp-key-properties.c:903
+#: ../pgp/seahorse-pgp-key-properties.c:900
 msgid "(unknown)"
 msgstr "(æç)"
 
-#: ../pgp/seahorse-pgp-key-properties.c:906
+#: ../pgp/seahorse-pgp-key-properties.c:903
 #, c-format
 msgid "This key expired on: %s"
 msgstr "æåéåä %s èæã"
 
-#: ../pgp/seahorse-pgp-key-properties.c:967
-#: ../src/seahorse-key-manager-store.c:802
+#: ../pgp/seahorse-pgp-key-properties.c:966
 msgid "Name"
 msgstr "åç"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1078
+#: ../pgp/seahorse-pgp-key-properties.c:1079
 #, 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:1087
+#: ../pgp/seahorse-pgp-key-properties.c:1088
 msgid "Couldn't delete subkey"
 msgstr "ææåéååé"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1127
-#: ../pgp/seahorse-pgp-key-properties.c:1567
+#: ../pgp/seahorse-pgp-key-properties.c:1128
+#: ../pgp/seahorse-pgp-key-properties.c:1568
 msgid "Unable to change trust"
 msgstr "ææäæääæ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298
-#: ../ssh/seahorse-ssh-key-properties.c:201
-#, c-format
-msgid "Couldn't export key to \"%s\""
-msgstr "ææåâ%sâåååé"
-
-#: ../pgp/seahorse-pgp-key-properties.c:1172
+#: ../pgp/seahorse-pgp-key-properties.c:1173
 #: ../ssh/seahorse-ssh-key-properties.c:225
 msgid "Export Complete Key"
 msgstr "åååæåé"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1197
+#: ../pgp/seahorse-pgp-key-properties.c:1201
 #: ../ssh/seahorse-ssh-key-properties.c:247
 msgid "Couldn't export key."
 msgstr "ææåååéã"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1407
-#: ../pgp/seahorse-pgp-key-properties.c:1496
+#: ../pgp/seahorse-pgp-key-properties.c:1408
+#: ../pgp/seahorse-pgp-key-properties.c:1497
 msgctxt "Expires"
 msgid "Never"
 msgstr "ää"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1454
+#: ../pgp/seahorse-pgp-key-properties.c:1455
 msgid "ID"
 msgstr "ID"
 
-#. The key type column
-#: ../pgp/seahorse-pgp-key-properties.c:1457
-#: ../src/seahorse-key-manager-store.c:833
+#: ../pgp/seahorse-pgp-key-properties.c:1458
 msgid "Type"
 msgstr "çå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1460
+#: ../pgp/seahorse-pgp-key-properties.c:1461
 msgid "Created"
 msgstr "ååå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1463
+#: ../pgp/seahorse-pgp-key-properties.c:1464
 msgid "Expires"
 msgstr "èæ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1466
+#: ../pgp/seahorse-pgp-key-properties.c:1467
 msgid "Status"
 msgstr "çæ"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1469
+#: ../pgp/seahorse-pgp-key-properties.c:1470
 msgid "Strength"
 msgstr "åå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1493
+#: ../pgp/seahorse-pgp-key-properties.c:1490
+msgid "Expired"
+msgstr "åèæ"
+
+#: ../pgp/seahorse-pgp-key-properties.c:1494
 msgid "Good"
 msgstr "å"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1888
-#: ../src/seahorse-key-manager-store.c:814
+#: ../pgp/seahorse-pgp-key-properties.c:1875
 msgid "Key ID"
 msgstr "åé ID"
 
@@ -1594,9 +1942,7 @@ msgstr "éå"
 msgid "Public PGP Key"
 msgstr "PGP åé"
 
-#. Trust column
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37
-#: ../src/seahorse-key-manager-store.c:827
 msgid "Trust"
 msgstr "ää"
 
@@ -1645,11 +1991,15 @@ msgstr "æååéçåå"
 msgid "_Reason:"
 msgstr "åå(_R)ï"
 
-#: ../pgp/seahorse-signer.c:62
+#: ../pgp/seahorse-signer.c:63
 msgid ""
 "You have no personal PGP keys that can be used to sign a document or message."
 msgstr "æææää PGP åéåçäççæææææ"
 
+#: ../pgp/seahorse-signer.xml.h:1
+msgid "_Sign message with key:"
+msgstr "çæåéççææ(_S)ï"
+
 #: ../pgp/seahorse-sign.xml.h:1
 msgid "<b>How carefully have you checked this key?</b>"
 msgstr "<b>ææææåéçäæçååäï</b>"
@@ -1734,451 +2084,382 @@ msgstr "ççè(_S)ï"
 msgid "_Very Carefully"
 msgstr "éåäçå(_V)"
 
-#: ../pgp/seahorse-signer.xml.h:1
-msgid "_Sign message with key:"
-msgstr "çæåéççææ(_S)ï"
+#: ../pgp/seahorse-transfer.c:200
+msgid "Exporting data"
+msgstr "æåååææ"
+
+#: ../pgp/seahorse-transfer.c:200
+msgid "Retrieving data"
+msgstr "æåååææ"
+
+#: ../pgp/seahorse-transfer.c:203
+msgid "Importing data"
+msgstr "æåååææ"
 
-#: ../pkcs11/seahorse-pkcs11-certificate.c:106
-#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66
+#: ../pgp/seahorse-transfer.c:203
+msgid "Sending data"
+msgstr "æååéææ"
+
+#: ../pgp/seahorse-unknown.c:61
+msgid "Unavailable"
+msgstr "äåç"
+
+#: ../pkcs11/seahorse-certificate.c:298
+msgid "Certificate and Key"
+msgstr "èäååé"
+
+#: ../pkcs11/seahorse-certificate.c:300
 msgid "Certificate"
 msgstr "èä"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:106
+#: ../pkcs11/seahorse-interaction.c:100
+#, fuzzy, c-format
+#| msgid "Enter the old passphrase for: %s"
+msgid "Enter PIN or password for: %s"
+msgstr "èå %s çæåçï"
+
+#: ../pkcs11/seahorse-pkcs11-actions.c:118
+msgid "Lock this token"
+msgstr "éåæäç"
+
+#: ../pkcs11/seahorse-pkcs11-actions.c:120
+msgid "Unlock this token"
+msgstr "èéæäç"
+
+#: ../pkcs11/seahorse-pkcs11-actions.c:218
+#: ../pkcs11/seahorse-pkcs11-properties.c:173
 msgid "Couldn't delete"
 msgstr "ææåé"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:127
+#: ../pkcs11/seahorse-pkcs11-actions.c:239
+#: ../pkcs11/seahorse-pkcs11-properties.c:198
 #, c-format
 msgid "Are you sure you want to delete the certificate '%s'?"
 msgstr "æçåèåéèäâ%sâåï"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:130
+#: ../pkcs11/seahorse-pkcs11-actions.c:243
 #, 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 äèäåï"
 
-#: ../pkcs11/seahorse-pkcs11-commands.c:143
+#: ../pkcs11/seahorse-pkcs11-actions.c:256
+#: ../pkcs11/seahorse-pkcs11-properties.c:227
 msgid "Deleting"
 msgstr "æååé"
 
-#: ../src/seahorse-change-passphrase.xml.h:1
-msgid "Change Passphrase"
-msgstr "ææåç"
-
-#: ../src/seahorse-change-passphrase.xml.h:2
-msgid "Con_firm Passphrase:"
-msgstr "çèåç(_F)ï"
-
-#: ../src/seahorse-change-passphrase.xml.h:3
-msgid "Confirm new passphrase"
-msgstr "çèæåç"
-
-#: ../src/seahorse-change-passphrase.xml.h:5
-msgid "New _Passphrase:"
-msgstr "æåç(_P)ï"
-
-#: ../src/seahorse.desktop.in.in.h:1
-msgid "Manage your passwords and encryption keys"
-msgstr "ççæçåçååååé"
-
-#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868
-#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147
-msgid "Passwords and Keys"
-msgstr "åçååé"
-
-#: ../src/seahorse-generate-select.xml.h:1
-msgid "<b>_Select the type of item to create:</b>"
-msgstr "<b>éææåæååçæçççå(_S)ï</b>"
-
-#: ../src/seahorse-generate-select.xml.h:2
-msgid "C_ontinue"
-msgstr "çç(_C)"
-
-#: ../src/seahorse-generate-select.xml.h:3
-msgid "Create New ..."
-msgstr "æå..."
+#: ../pkcs11/seahorse-pkcs11-actions.c:265
+msgid "Properties of the certificate."
+msgstr "èäçåæã"
 
-#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116
-#, c-format
-msgid "Selected %d key"
-msgid_plural "Selected %d keys"
-msgstr[0] "åéæ %d äåé"
-
-#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489
-#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453
-msgid "Couldn't import keys"
-msgstr "ææåååé"
-
-#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455
-msgid "Imported keys"
-msgstr "åååçåé"
-
-#: ../src/seahorse-key-manager.c:484
-msgid "Importing keys"
-msgstr "æååååé"
-
-#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891
-msgid "Import Key"
-msgstr "åååé"
-
-#: ../src/seahorse-key-manager.c:550
-msgid "Unrecognized key type, or invalid data format"
-msgstr "ææèåçåéçåïæææçæææå"
-
-#: ../src/seahorse-key-manager.c:565
-msgid "Importing Keys"
-msgstr "æååååé"
-
-#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254
-msgid "_Remote"
-msgstr "èç(_R)"
-
-#: ../src/seahorse-key-manager.c:739
-msgid "Close this program"
-msgstr "åéæçå"
-
-#: ../src/seahorse-key-manager.c:740
-msgid "_New..."
-msgstr "æå(_N)..."
-
-#: ../src/seahorse-key-manager.c:741
-msgid "Create a new key or item"
-msgstr "ååæåéææç"
-
-#: ../src/seahorse-key-manager.c:742
-msgid "_Import..."
-msgstr "åå(_I)..."
-
-#: ../src/seahorse-key-manager.c:743
-msgid "Import from a file"
-msgstr "äæäåå"
-
-#: ../src/seahorse-key-manager.c:745
-msgid "Import from the clipboard"
-msgstr "äåèæåå"
+#: ../pkcs11/seahorse-pkcs11-actions.c:270
+msgid "Delete the certificate."
+msgstr "åéæèäã"
 
-#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264
-msgid "_Find Remote Keys..."
-msgstr "åæèçåé(_F)..."
-
-#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265
-msgid "Search for keys on a key server"
-msgstr "ååéæååæçåé"
-
-#: ../src/seahorse-key-manager.c:752
-msgid "_Sync and Publish Keys..."
-msgstr "åæååååé(_S)"
-
-#: ../src/seahorse-key-manager.c:753
-msgid "Publish and/or synchronize your keys with those online."
-msgstr "äéäåççåéåèå/æåææçåé"
-
-#: ../src/seahorse-key-manager.c:758
-msgid "T_ypes"
-msgstr "çå(_Y)"
-
-#: ../src/seahorse-key-manager.c:758
-msgid "Show type column"
-msgstr "æççåå"
-
-#: ../src/seahorse-key-manager.c:760
-msgid "_Expiry"
-msgstr "èæ(_E)"
-
-#: ../src/seahorse-key-manager.c:760
-msgid "Show expiry column"
-msgstr "æçèæå"
+#: ../pkcs11/seahorse-pkcs11-backend.c:183
+msgid "Certificates"
+msgstr "èä"
 
-#: ../src/seahorse-key-manager.c:762
-msgid "_Trust"
-msgstr "ää(_T)"
+#: ../pkcs11/seahorse-pkcs11-backend.c:186
+msgid "X.509 certificates and related keys"
+msgstr ""
 
-#: ../src/seahorse-key-manager.c:762
-msgid "Show owner trust column"
-msgstr "æçææèääå"
+#: ../pkcs11/seahorse-pkcs11-generate.c:116
+msgid "Couldn't generate private key"
+msgstr "ææçæçé"
 
-#: ../src/seahorse-key-manager.c:764
-msgid "_Validity"
-msgstr "æææ(_V)"
+#: ../pkcs11/seahorse-pkcs11-generate.c:411
+#: ../pkcs11/seahorse-pkcs11-request.c:256
+msgid "Create"
+msgstr "åå"
 
-#: ../src/seahorse-key-manager.c:764
-msgid "Show validity column"
-msgstr "æçæææå"
+#: ../pkcs11/seahorse-pkcs11-generate.c:504
+#: ../pkcs11/seahorse-private-key.c:160
+msgid "Private key"
+msgstr "çé"
 
-#: ../src/seahorse-key-manager.c:941
-msgid "Filter:"
-msgstr "èæåï"
+#: ../pkcs11/seahorse-pkcs11-generate.c:505
+msgid "Used to request a certificate"
+msgstr ""
 
-#: ../src/seahorse-key-manager.xml.h:1
-msgid "<big><b>First time options:</b></big>"
-msgstr "<big><b>åæééï</b></big>"
+#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2
+msgid "Create a new private key"
+msgstr "ååæåé"
 
-#: ../src/seahorse-key-manager.xml.h:2
-msgid "Generate a new key of your own: "
-msgstr "çææèåçæåéï"
+#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5
+msgid "Label:"
+msgstr "æçï"
 
-#: ../src/seahorse-key-manager.xml.h:3
-msgid "Import existing keys from a file:"
-msgstr "äæäåååååçåéï"
+#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6
+#, fuzzy
+#| msgid "Stored Password"
+msgid "Stored at:"
+msgstr "åååçåç"
 
-#: ../src/seahorse-key-manager.xml.h:4
-msgid "My _Personal Keys"
-msgstr "æçääåé(_P)"
+#: ../pkcs11/seahorse-pkcs11-properties.c:140
+#: ../pkcs11/seahorse-pkcs11-properties.c:144
+msgid "Unnamed"
+msgstr "æåå"
 
-#: ../src/seahorse-key-manager.xml.h:5
-msgid "Other _Keys"
-msgstr "åäåé(_K)"
+#: ../pkcs11/seahorse-pkcs11-properties.c:204
+msgid "Also delete matching private key"
+msgstr "åæåéåéççé"
 
-#: ../src/seahorse-key-manager.xml.h:6
-msgid "To get started with encryption you will need keys."
-msgstr "æéèåéäååååã"
+#: ../pkcs11/seahorse-pkcs11-properties.c:211
+#, fuzzy, c-format
+#| msgid "Are you sure you want to delete the certificate '%s'?"
+msgid "Are you sure you want to delete the private key '%s'?"
+msgstr "æçåèåéèäâ%sâåï"
 
-#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518
-msgid "_Import"
-msgstr "åå(_I)"
+#: ../pkcs11/seahorse-pkcs11-properties.c:217
+msgid "I understand that this action cannot be undone"
+msgstr "ææçïèäæääèæå"
 
-#: ../src/seahorse-key-manager.xml.h:8
-msgid "_Passwords"
-msgstr "åç(_P)"
+#: ../pkcs11/seahorse-pkcs11-properties.c:247
+msgid "_Export"
+msgstr "åå(_E)"
 
-#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263
-msgid "Couldn't export keys"
-msgstr "ææåååé"
+#: ../pkcs11/seahorse-pkcs11-properties.c:248
+msgid "Export the certificate"
+msgstr "ååèä"
 
-#: ../src/seahorse-key-manager-store.c:820
-msgid "Validity"
-msgstr "æææ"
+#: ../pkcs11/seahorse-pkcs11-properties.c:250
+msgid "Delete this certificate or key"
+msgstr "åéæèäæåé"
 
-#. Expiry date column
-#: ../src/seahorse-key-manager-store.c:839
-msgid "Expiration Date"
-msgstr "æææ"
+#: ../pkcs11/seahorse-pkcs11-properties.c:251
+#, fuzzy
+#| msgid "Certificate"
+msgid "Request _Certificate"
+msgstr "èä"
 
-#: ../src/seahorse-keyserver-results.c:256
-msgid "Close this window"
-msgstr "åéæçå"
+#: ../pkcs11/seahorse-pkcs11-properties.c:252
+#, fuzzy
+#| msgid "No private key file is available for this key."
+msgid "Create a certificate request file for this key"
+msgstr "æåéççéæääåçã"
 
-#: ../src/seahorse-keyserver-results.c:257
-msgid "_Expand All"
-msgstr "åéåå(_E)"
+#: ../pkcs11/seahorse-pkcs11-request.c:104
+#, fuzzy
+#| msgid "Couldn't verify signature."
+msgid "Couldn't save certificate request"
+msgstr "ææéèçåã"
 
-#: ../src/seahorse-keyserver-results.c:258
-msgid "Expand all listings"
-msgstr "åååéåè"
+#: ../pkcs11/seahorse-pkcs11-request.c:127
+msgid "Save certificate request"
+msgstr ""
 
-#: ../src/seahorse-keyserver-results.c:259
-msgid "_Collapse All"
-msgstr "åéæå(_C)"
+#: ../pkcs11/seahorse-pkcs11-request.c:138
+#, fuzzy
+#| msgid "Certificate"
+msgid "Certificate request"
+msgstr "èä"
 
-#: ../src/seahorse-keyserver-results.c:260
-msgid "Collapse all listings"
-msgstr "æååéåè"
+#: ../pkcs11/seahorse-pkcs11-request.c:146
+msgid "PEM encoded request"
+msgstr ""
 
-#: ../src/seahorse-keyserver-results.c:331
-msgid "Remote Keys"
-msgstr "èçåé"
+#: ../pkcs11/seahorse-pkcs11-request.c:194
+#, fuzzy
+#| msgid "couldn't create new process group"
+msgid "Couldn't create certificate request"
+msgstr "ææååæçèçç"
 
-#: ../src/seahorse-keyserver-results.c:333
-#, c-format
-msgid "Remote Keys Containing '%s'"
-msgstr "èçåéååâ%sâ"
+#: ../pkcs11/seahorse-pkcs11-request.xml.h:1
+msgid "Create a certificate request file."
+msgstr ""
 
-#: ../src/seahorse-keyserver-search.xml.h:1
-msgid "<b>Key Servers:</b>"
-msgstr "<b>åéæååï</b>"
+#: ../pkcs11/seahorse-pkcs11-request.xml.h:2
+msgid "Name (CN):"
+msgstr "åç(CN)ï"
 
-#: ../src/seahorse-keyserver-search.xml.h:2
-msgid "<b>Shared Keys Near Me:</b>"
-msgstr "<b>æéèçåäåéï</b>"
+#: ../pkcs11/seahorse-pkcs11-request.xml.h:3
+msgid "The common name (CN) placed in the certificate request."
+msgstr ""
 
-#: ../src/seahorse-keyserver-search.xml.h:3
-msgid "Find Remote Keys"
-msgstr "åæèçåé"
+#: ../pkcs11/seahorse-private-key.c:119
+#, fuzzy
+#| msgid "Couldn't delete private key"
+msgid "Unnamed private key"
+msgstr "ææåéçé"
 
-#: ../src/seahorse-keyserver-search.xml.h:4
-msgid ""
-"This will find keys for others on the Internet. These keys can then be "
-"imported into your local key ring."
-msgstr "èååäèçäåæåääçåéãèäåéåäååæçæååéçã"
+#: ../src/seahorse-change-passphrase.xml.h:1
+msgid "Change Passphrase"
+msgstr "ææåç"
 
-#: ../src/seahorse-keyserver-search.xml.h:5
-msgid "Where to search:"
-msgstr "äåéæçï"
+#: ../src/seahorse-change-passphrase.xml.h:2
+msgid "Con_firm Passphrase:"
+msgstr "çèåç(_F)ï"
 
-#: ../src/seahorse-keyserver-search.xml.h:6
-msgid "_Search"
-msgstr "æç(_S)"
+#: ../src/seahorse-change-passphrase.xml.h:3
+msgid "Confirm new passphrase"
+msgstr "çèæåç"
 
-#: ../src/seahorse-keyserver-search.xml.h:7
-msgid "_Search for keys containing: "
-msgstr "æçååèäååçåé(_S)ï "
+#: ../src/seahorse-change-passphrase.xml.h:5
+msgid "New _Passphrase:"
+msgstr "æåç(_P)ï"
 
-#: ../src/seahorse-keyserver-sync.c:58
-msgid "Couldn't publish keys to server"
-msgstr "ææåæåååèåé"
+#: ../src/seahorse.desktop.in.in.h:1
+msgid "Manage your passwords and encryption keys"
+msgstr "ççæçåçååååé"
 
-#: ../src/seahorse-keyserver-sync.c:77
-#, c-format
-msgid "Couldn't retrieve keys from server: %s"
-msgstr "ææäæåååååéï%s"
+#: ../src/seahorse-generate-select.c:229
+#, fuzzy
+#| msgid "C_ontinue"
+msgid "Continue"
+msgstr "çç(_C)"
 
-#: ../src/seahorse-keyserver-sync.c:161
-#, c-format
-msgid "<b>%d key is selected for synchronizing</b>"
-msgid_plural "<b>%d keys are selected for synchronizing</b>"
-msgstr[0] "<b>åéæåæ %d äåé</b>"
+#: ../src/seahorse-generate-select.xml.h:1
+msgid "<b>_Select the type of item to create:</b>"
+msgstr "<b>éææåæååçæçççå(_S)ï</b>"
 
-#: ../src/seahorse-keyserver-sync.c:247
-msgid "Synchronizing keys..."
-msgstr "æååæåé..."
+#: ../src/seahorse-import-dialog.c:74
+#, fuzzy
+#| msgid "Import from a file"
+msgid "Import failed"
+msgstr "äæäåå"
 
-#: ../src/seahorse-keyserver-sync.xml.h:1
-msgid "Sync Keys"
-msgstr "åæåé"
+#: ../src/seahorse-import-dialog.c:95
+#, fuzzy
+#| msgid "_Import"
+msgid "Import"
+msgstr "åå(_I)"
 
-#: ../src/seahorse-keyserver-sync.xml.h:2
-msgid ""
-"This will publish the keys in your key ring so they're available for others "
-"to use. You'll also get any changes others have made since you received "
-"their keys."
-msgstr ""
-"èååèæåéçéçåéïèæåäåäåääæäçãæäåäèåèäæèåå"
-"äåéäæåäèèçäæ"
+#: ../src/seahorse-import-dialog.c:105
+#, fuzzy
+#| msgid "<b>Dates:</b>"
+msgid "<b>Data to be imported:</b>"
+msgstr "<b>ææï</b>"
 
-#: ../src/seahorse-keyserver-sync.xml.h:3
-msgid ""
-"This will retrieve any changes others have made since you received their "
-"keys. No key server has been chosen for publishing, so your keys will not be "
-"made available to others."
-msgstr ""
-"èåååèäææèåääçåéäæåäæäçæææåãæææåçæåèçåé"
-"æååïæäæçåéææèåäääçã"
+#: ../src/seahorse-key-manager.c:235 ../ssh/seahorse-ssh-operation.c:891
+msgid "Import Key"
+msgstr "åååé"
 
-#: ../src/seahorse-keyserver-sync.xml.h:4
-msgid "_Key Servers"
-msgstr "åéæåå(_K)"
+#: ../src/seahorse-key-manager.c:298
+msgid "Dropped text"
+msgstr ""
 
-#: ../src/seahorse-keyserver-sync.xml.h:5
-msgid "_Sync"
-msgstr "åæ(_S)"
+#: ../src/seahorse-key-manager.c:321
+msgid "Clipboard text"
+msgstr "åèæææ"
 
-#: ../src/seahorse-main.c:60
-msgid "Version of this application"
-msgstr "æçåççæ"
+#: ../src/seahorse-key-manager.c:440
+msgid "_New"
+msgstr "æå(_N)"
 
-#: ../src/seahorse-viewer.c:123
-msgid "Contributions:"
-msgstr "èçäï"
+#: ../src/seahorse-key-manager.c:442
+msgid "Close this program"
+msgstr "åéæçå"
 
-#: ../src/seahorse-viewer.c:149
-msgid "translator-credits"
-msgstr ""
-"wei Li <lw124124 gmail com>Zipeco <Zipeco btamail net cn>, 2002\n"
-"Funda Wang <fundawang linux net cn>, 2004\n"
-"Deng Xiyue <manphiz gmail com> 2007, 2008, 2009\n"
-"Aron Xu <happyaron xu gmail com>, 2009, 2010, 2011\n"
-"Yinghua Wang <wantinghard gmail com>, 2010, 2011"
+#: ../src/seahorse-key-manager.c:443 ../src/seahorse-key-manager.c:445
+msgid "_New..."
+msgstr "æå(_N)..."
 
-#: ../src/seahorse-viewer.c:152
-msgid "Seahorse Project Homepage"
-msgstr "Seahorse éçéé"
+#: ../src/seahorse-key-manager.c:444
+msgid "Create a new key or item"
+msgstr "ååæåéææç"
 
-#. Top menu items
-#: ../src/seahorse-viewer.c:172
-msgid "_File"
-msgstr "æä(_F)"
+#: ../src/seahorse-key-manager.c:446
+#, fuzzy
+#| msgid "Create a new key or item"
+msgid "Add a new key or item"
+msgstr "ååæåéææç"
 
-#: ../src/seahorse-viewer.c:173
-msgid "_Edit"
-msgstr "çè(_E)"
+#: ../src/seahorse-key-manager.c:447
+msgid "_Import..."
+msgstr "åå(_I)..."
 
-#: ../src/seahorse-viewer.c:174
-msgid "_View"
-msgstr "èå(_V)"
+#: ../src/seahorse-key-manager.c:448
+msgid "Import from a file"
+msgstr "äæäåå"
 
-#: ../src/seahorse-viewer.c:175
-msgid "_Help"
-msgstr "åå(_H)"
+#: ../src/seahorse-key-manager.c:450
+msgid "Import from the clipboard"
+msgstr "äåèæåå"
 
-#: ../src/seahorse-viewer.c:177
-msgid "Prefere_nces"
-msgstr "ééé(_N)"
+#: ../src/seahorse-key-manager.c:454
+msgid "P_laces"
+msgstr "äç(_L)"
 
-#: ../src/seahorse-viewer.c:178
-msgid "Change preferences for this program"
-msgstr "äææçåçééé"
+#: ../src/seahorse-key-manager.c:455
+#, fuzzy
+#| msgid "Show pass_word"
+msgid "Show places sidebar"
+msgstr "æçåç(_W)"
 
-#: ../src/seahorse-viewer.c:181
-msgid "About this program"
-msgstr "åäæçå"
+#: ../src/seahorse-key-manager.c:459
+#, fuzzy
+#| msgid "Show properties"
+msgid "Show _personal"
+msgstr "æçåæ"
 
-#: ../src/seahorse-viewer.c:182
-msgid "_Contents"
-msgstr "åå(_C)"
+#: ../src/seahorse-key-manager.c:460
+msgid "Only show personal keys, certificates and passwords"
+msgstr ""
 
-#: ../src/seahorse-viewer.c:183
-msgid "Show Seahorse help"
-msgstr "æç Seahorse åå"
+#: ../src/seahorse-key-manager.c:461
+msgid "Show _trusted"
+msgstr ""
 
-#: ../src/seahorse-viewer.c:284
-msgid "Export public key"
-msgstr "åååé"
+#: ../src/seahorse-key-manager.c:462
+msgid "Only show trusted keys, certificates and passwords"
+msgstr ""
 
-#: ../src/seahorse-viewer.c:305
-msgid "Exporting keys"
-msgstr "æååååé"
+#: ../src/seahorse-key-manager.c:463
+msgid "_Show _any"
+msgstr ""
 
-#: ../src/seahorse-viewer.c:334
-msgid "Couldn't retrieve data from key server"
-msgstr "ææäåéæååååææ"
+#: ../src/seahorse-key-manager.c:464
+msgid "Show all keys, certificates and passwords"
+msgstr ""
 
-#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys"
-#: ../src/seahorse-viewer.c:346
-msgid "Copied keys"
-msgstr "ååååé"
+#: ../src/seahorse-key-manager.c:652
+msgid "Filter"
+msgstr "èæå"
 
-#: ../src/seahorse-viewer.c:371
-msgid "Retrieving keys"
-msgstr "æååååé"
+#: ../src/seahorse-key-manager.xml.h:1
+msgid "<big><b>First time options:</b></big>"
+msgstr "<big><b>åæééï</b></big>"
 
-#: ../src/seahorse-viewer.c:426
-#, c-format
-msgid "%s is a private key. Are you sure you want to proceed?"
-msgstr "%s æçéãæçåèèèåï"
+#: ../src/seahorse-key-manager.xml.h:2
+msgid "Generate a new key of your own: "
+msgstr "çææèåçæåéï"
 
-#: ../src/seahorse-viewer.c:480
-msgid "Importing keys from key servers"
-msgstr "äåéæåååååé"
+#: ../src/seahorse-key-manager.xml.h:3
+msgid "Import existing keys from a file:"
+msgstr "äæäåååååçåéï"
 
-#: ../src/seahorse-viewer.c:505
-msgid "Show properties"
-msgstr "æçåæ"
+#: ../src/seahorse-key-manager.xml.h:4
+msgid "To get started with encryption you will need keys."
+msgstr "æéèåéäååååã"
 
-#: ../src/seahorse-viewer.c:506
-msgctxt "This text refers to deleting an item from its type's backing store."
-msgid "_Delete"
-msgstr "åé(_D)"
+#: ../src/seahorse-main.c:54
+msgid "Version of this application"
+msgstr "æçåççæ"
 
-#: ../src/seahorse-viewer.c:507
-msgid "Delete selected items"
-msgstr "åéåéæçéç"
+#: ../ssh/seahorse-ssh-actions.c:110
+#, c-format
+msgid "Are you sure you want to delete the secure shell key '%s'?"
+msgstr "æçèèåé SSH åéâ%sâåï"
 
-#: ../src/seahorse-viewer.c:511
-msgid "E_xport..."
-msgstr "åå(_X)..."
+#: ../ssh/seahorse-ssh-actions.c:114 ../ssh/seahorse-ssh-actions.c:115
+#, c-format
+msgid "Are you sure you want to delete %d secure shell keys?"
+msgstr "æçèèåé %d ä SSH åéåï"
 
-#: ../src/seahorse-viewer.c:512
-msgid "Export to a file"
-msgstr "åååæä"
+#: ../ssh/seahorse-ssh-actions.c:124
+msgid "Couldn't delete key"
+msgstr "ææåéåé"
 
-#: ../src/seahorse-viewer.c:514
-msgid "Copy to the clipboard"
-msgstr "ååååèæ"
+#: ../ssh/seahorse-ssh-actions.c:136
+msgid "Configure Key for _Secure Shell..."
+msgstr "ä _SSH éçåé..."
 
-#: ../src/seahorse-viewer.c:519
-msgid "Import selected keys to local key ring"
-msgstr "ååéæçåéåååæååéç"
+#: ../ssh/seahorse-ssh-actions.c:137
+msgid ""
+"Send public Secure Shell key to another machine, and enable logins using "
+"that key."
+msgstr "åé SSH åéååääæåïååèäçèåéçåã"
 
 #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68
 msgid "Enter your Secure Shell passphrase:"
@@ -2207,66 +2488,58 @@ msgstr "èå %s çæåçï"
 msgid "Enter the new passphrase again: %s"
 msgstr "åæèåæåçï%s"
 
-#: ../ssh/seahorse-ssh-commands.c:86
-msgid "Configure Key for _Secure Shell..."
-msgstr "ä _SSH éçåé..."
-
-#: ../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:118
-#, c-format
-msgid "Are you sure you want to delete the secure shell key '%s'?"
-msgstr "æçèèåé SSH åéâ%sâåï"
-
-#: ../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-backend.c:92
+msgid "Secure Shell"
+msgstr "SSH"
 
-#: ../ssh/seahorse-ssh-commands.c:133
-msgid "Couldn't delete key"
-msgstr "ææåéåé"
+#: ../ssh/seahorse-ssh-backend.c:95
+msgid "Keys used to connect securely to other computers"
+msgstr "çæèæååäèçæçåéã"
 
-#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91
-#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19
+#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:99
+#: ../ssh/seahorse-ssh-key.c:103 ../ssh/seahorse-ssh-key-properties.xml.h:19
 msgid "Secure Shell Key"
 msgstr "SSH åé"
 
-#: ../ssh/seahorse-ssh-generate.c:61
+#: ../ssh/seahorse-ssh-generate.c:56
 msgid "Used to access other computers (eg: via a terminal)"
 msgstr "çæèéåäèçæ(äåïéèçç)"
 
-#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131
+#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126
 msgid "Couldn't generate Secure Shell key"
 msgstr "ææåå SSH åé"
 
-#: ../ssh/seahorse-ssh-generate.c:197
+#: ../ssh/seahorse-ssh-generate.c:192
 msgid "Creating Secure Shell Key"
 msgstr "åå SSH åé"
 
 #: ../ssh/seahorse-ssh-generate.xml.h:2
-msgid ""
-"<i>Use your email address, and any other reminder you need about what this "
-"key is for.</i>"
+#, fuzzy
+#| msgid ""
+#| "<i>Use your email address, and any other reminder you need about what "
+#| "this key is for.</i>"
+msgid "<i>Your email address, or a reminder of what this key is for.</i>"
 msgstr ""
 "<i>äçæççåéäååïååäææéèçæéäæææéæåéççé</i>"
 
 #: ../ssh/seahorse-ssh-generate.xml.h:3
-msgid ""
-"A Secure Shell (SSH) key lets you connect securely to trusted computers "
-"using SSH, without entering a different password for each of them."
+#, fuzzy
+#| msgid ""
+#| "A Secure Shell (SSH) key lets you connect securely to trusted computers "
+#| "using SSH, without entering a different password for each of them."
+msgid "A Secure Shell (SSH) key lets you connect securely to other computers."
 msgstr ""
 "SSH åéåèæéè SSH ååçèæåääçèçæïèäçäåääæèåäåçå"
 "çã"
 
 #: ../ssh/seahorse-ssh-generate.xml.h:5
+#, fuzzy
+#| msgid ""
+#| "If there is already a computer you want to use this key with, you can set "
+#| "up that computer to recognize your key now. "
 msgid ""
-"If there is already a computer you want to use this key with, you can set up "
-"that computer to recognize your key now. "
+"If there a computer you want to use this key with, you can set up that "
+"computer to recognize your new key."
 msgstr ""
 "åææåçæçåäåèçæääçæåéïæçååäèåéåèçææèåæçå"
 "é "
@@ -2279,18 +2552,22 @@ msgstr "æ SSH åé"
 msgid "_Create and Set Up"
 msgstr "åååèå(_C)"
 
-#: ../ssh/seahorse-ssh-generate.xml.h:9
+#: ../ssh/seahorse-ssh-generate.xml.h:10
 msgid "_Just Create Key"
 msgstr "äåååé(_J)"
 
-#: ../ssh/seahorse-ssh-generate.xml.h:10
-msgid "_Key Description:"
-msgstr "åéæè(_K)"
-
-#: ../ssh/seahorse-ssh-key.c:87
+#: ../ssh/seahorse-ssh-key.c:95
 msgid "(Unreadable Secure Shell Key)"
 msgstr "(ææèåç SSH åé)"
 
+#: ../ssh/seahorse-ssh-key.c:203
+msgid "Personal SSH key"
+msgstr "ää SSH åé"
+
+#: ../ssh/seahorse-ssh-key.c:205
+msgid "SSH key"
+msgstr "SSH åé"
+
 #: ../ssh/seahorse-ssh-key-properties.c:79
 msgid "Couldn't rename key."
 msgstr "ææéåååéã"
@@ -2373,7 +2650,16 @@ msgstr "æååååéï%s"
 msgid "Importing key. Enter passphrase"
 msgstr "æååååéãèååç"
 
-#: ../ssh/seahorse-ssh-source.c:951
+#: ../ssh/seahorse-ssh-source.c:232
+msgid "OpenSSH directory"
+msgstr "OpenSSH çå"
+
+#: ../ssh/seahorse-ssh-source.c:235
+#, c-format
+msgid "OpenSSH: %s"
+msgstr "OpenSSHï%s"
+
+#: ../ssh/seahorse-ssh-source.c:1022
 msgid "No private key file is available for this key."
 msgstr "æåéççéæääåçã"
 
@@ -2413,6 +2699,84 @@ msgstr "çåå(_L)"
 msgid "_Set Up"
 msgstr "èå(_S)"
 
+#~ msgid "Passwords: %s"
+#~ msgstr "åçï%s"
+
+#~ msgid "<b>Passwords:</b> %s"
+#~ msgstr "<b>åçï</b> %s"
+
+#~ msgid "New PGP Key"
+#~ msgstr "æ PGP åé"
+
+#~ msgid "Create New ..."
+#~ msgstr "æå..."
+
+#~ msgid "Imported keys"
+#~ msgstr "åååçåé"
+
+#~ msgid "Importing keys"
+#~ msgstr "æååååé"
+
+#~ msgid "Unrecognized key type, or invalid data format"
+#~ msgstr "ææèåçåéçåïæææçæææå"
+
+#~ msgid "Importing Keys"
+#~ msgstr "æååååé"
+
+#~ msgid "T_ypes"
+#~ msgstr "çå(_Y)"
+
+#~ msgid "Show type column"
+#~ msgstr "æççåå"
+
+#~ msgid "_Expiry"
+#~ msgstr "èæ(_E)"
+
+#~ msgid "Show expiry column"
+#~ msgstr "æçèæå"
+
+#~ msgid "_Trust"
+#~ msgstr "ää(_T)"
+
+#~ msgid "Show owner trust column"
+#~ msgstr "æçææèääå"
+
+#~ msgid "_Validity"
+#~ msgstr "æææ(_V)"
+
+#~ msgid "Show validity column"
+#~ msgstr "æçæææå"
+
+#~ msgid "Other _Keys"
+#~ msgstr "åäåé(_K)"
+
+#~ msgid "Validity"
+#~ msgstr "æææ"
+
+#~ msgid "Expiration Date"
+#~ msgstr "æææ"
+
+#~ msgid "_Expand All"
+#~ msgstr "åéåå(_E)"
+
+#~ msgid "Expand all listings"
+#~ msgstr "åååéåè"
+
+#~ msgid "_Collapse All"
+#~ msgstr "åéæå(_C)"
+
+#~ msgid "Collapse all listings"
+#~ msgstr "æååéåè"
+
+#~ msgid "Copied keys"
+#~ msgstr "ååååé"
+
+#~ msgid "%s is a private key. Are you sure you want to proceed?"
+#~ msgstr "%s æçéãæçåèèèåï"
+
+#~ msgid "_Key Description:"
+#~ msgstr "åéæè(_K)"
+
 #~ msgid "DSA"
 #~ msgstr "DSA"
 
@@ -2425,9 +2789,6 @@ msgstr "èå(_S)"
 #~ msgid "Web Password"
 #~ msgstr "Web åç"
 
-#~ msgid "Network Password"
-#~ msgstr "ççåç"
-
 #~ msgid "Deleting items"
 #~ msgstr "æååééç"
 
@@ -2440,18 +2801,12 @@ msgstr "èå(_S)"
 #~ msgid "Public Key"
 #~ msgstr "åé"
 
-#~ msgid "Private Key"
-#~ msgstr "çé"
-
 #~ msgid "Credentials"
 #~ msgstr "èä"
 
 #~ msgid "Identity"
 #~ msgstr "èä"
 
-#~ msgid "Encryption Key Manager"
-#~ msgstr "åéççå"
-
 #~ msgid "Invalid"
 #~ msgstr "ææ"
 
@@ -2467,9 +2822,6 @@ msgstr "èå(_S)"
 #~ msgid "couldn't fork process"
 #~ msgstr "ææåååèç"
 
-#~ msgid "couldn't create new process group"
-#~ msgstr "ææååæçèçç"
-
 #~ msgid "Encryption Daemon (Seahorse)"
 #~ msgstr "åååæèç (Seahorse)"
 
@@ -2521,9 +2873,6 @@ msgstr "èå(_S)"
 #~ msgid "Bad Signature"
 #~ msgstr "çåéè"
 
-#~ msgid "Couldn't verify signature."
-#~ msgstr "ææéèçåã"
-
 #~ msgid "Invalid or unrecognized signer: %s"
 #~ msgstr "æææèææèåçççèï%s"
 
@@ -2819,9 +3168,6 @@ msgstr "èå(_S)"
 #~ msgid "Loading Keys..."
 #~ msgstr "æåèååé... "
 
-#~ msgid "Searching for keys..."
-#~ msgstr "æååæåé..."
-
 #~ msgid "Uploading keys..."
 #~ msgstr "æåääåé..."
 



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