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

[Chao-Hsiung Liao <chliao src gnome org>]

commit 41ab356fbdde20b81c620b0d8c32837ec7ed36dc
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Sep 6 20:08:07 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  256 ++++++++++++++++++++++++++++-------------------------------
 po/zh_TW.po |  256 ++++++++++++++++++++++++++++-------------------------------
 2 files changed, 242 insertions(+), 270 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index a7835c9..a3e15dd 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: seahorse 3.1.5\n"
+"Project-Id-Version: seahorse 3.1.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-27 10:39+0800\n"
-"PO-Revision-Date: 2011-08-27 10:39+0800\n"
+"POT-Creation-Date: 2011-09-06 20:07+0800\n"
+"PO-Revision-Date: 2011-09-06 20:07+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"
@@ -63,18 +63,6 @@ msgstr "åç(_P):"
 msgid "_Show Password"
 msgstr "éçåç(_S)"
 
-#: ../gkr/seahorse-gkr-item.c:437
-msgid "Web Password"
-msgstr "çéåç"
-
-#: ../gkr/seahorse-gkr-item.c:439
-msgid "Network Password"
-msgstr "ççåç"
-
-#: ../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 "çæåééç"
@@ -93,11 +81,9 @@ msgstr[1] "çåèåé %d ååçï"
 
 #: ../gkr/seahorse-gkr-item-commands.c:114
 msgid "Deleting item"
-msgstr "åééç"
-
-#: ../gkr/seahorse-gkr-item-commands.c:114
-msgid "Deleting items"
-msgstr "åééç"
+msgid_plural "Deleting items"
+msgstr[0] "åééç"
+msgstr[1] "åééç"
 
 #: ../gkr/seahorse-gkr-item-properties.c:67
 msgid "Access a network share or resource"
@@ -123,6 +109,10 @@ msgstr "åååçæçå"
 msgid "Network Credentials"
 msgstr "ççèè"
 
+#: ../gkr/seahorse-gkr-item-properties.c:108
+msgid "Password"
+msgstr "åç"
+
 #: ../gkr/seahorse-gkr-item-properties.c:208
 msgid "Couldn't change password."
 msgstr "çæææåçã"
@@ -189,12 +179,12 @@ msgstr "éå:"
 msgid "Use:"
 msgstr "äç:"
 
-#: ../gkr/seahorse-gkr-keyring.c:121
+#: ../gkr/seahorse-gkr-keyring.c:120
 #, c-format
 msgid "Passwords: %s"
 msgstr "åçï%s"
 
-#: ../gkr/seahorse-gkr-keyring.c:122
+#: ../gkr/seahorse-gkr-keyring.c:121
 #, c-format
 msgid "<b>Passwords:</b> %s"
 msgstr "<b>åçï</b>%s"
@@ -215,74 +205,72 @@ msgstr "åååçåç"
 msgid "Safely store a password or secret."
 msgstr "ååçåæåèææåã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:130
+#: ../gkr/seahorse-gkr-keyring-commands.c:128
 msgid "Couldn't unlock keyring"
 msgstr "çæèéåçåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:169
+#: ../gkr/seahorse-gkr-keyring-commands.c:165
 msgid "Couldn't lock keyring"
 msgstr "çæéååçåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:208
+#: ../gkr/seahorse-gkr-keyring-commands.c:202
 msgid "Couldn't set default keyring"
 msgstr "çæèåéèçåçåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:247
+#: ../gkr/seahorse-gkr-keyring-commands.c:239
 msgid "Couldn't change keyring password"
 msgstr "çæææåçåååç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:276
+#: ../gkr/seahorse-gkr-keyring-commands.c:268
 msgid "_Lock"
 msgstr "éå(_L)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:277
+#: ../gkr/seahorse-gkr-keyring-commands.c:269
 msgid ""
 "Lock the password storage keyring so a master password is required to unlock "
 "it."
 msgstr "éååçåååçååïåæèååèéåèæäæåçæèã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:278
+#: ../gkr/seahorse-gkr-keyring-commands.c:270
 msgid "_Unlock"
 msgstr "èé(_U)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:279
+#: ../gkr/seahorse-gkr-keyring-commands.c:271
 msgid ""
 "Unlock the password storage keyring with a master password so it is "
 "available for use."
 msgstr "äçäæåçååçåååçååèéïåæåæçåääçççæã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:280
+#: ../gkr/seahorse-gkr-keyring-commands.c:272
 msgid "_Set as default"
 msgstr "èçéèå(_S)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:281
+#: ../gkr/seahorse-gkr-keyring-commands.c:273
 msgid "Applications usually store new passwords in the default keyring."
 msgstr "æççåéåæææåçåååéèåçååèã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:282
+#: ../gkr/seahorse-gkr-keyring-commands.c:274
 msgid "Change _Password"
 msgstr "ææåç(_P)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:283
+#: ../gkr/seahorse-gkr-keyring-commands.c:275
 msgid "Change the unlock password of the password storage keyring"
 msgstr "æèåçåååçååçèéåç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:348
+#: ../gkr/seahorse-gkr-keyring-commands.c:340
 msgid "Couldn't delete keyring"
 msgstr "çæåéåçåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:366
+#: ../gkr/seahorse-gkr-keyring-commands.c:358
 #, c-format
 msgid "Are you sure you want to delete the password keyring '%s'?"
 msgstr "äçåèåééååçåçååã%sãï"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:376
+#: ../gkr/seahorse-gkr-keyring-commands.c:368
 msgid "Deleting keyring"
-msgstr "åéåçåå"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:376
-msgid "Deleting keyrings"
-msgstr "åéåçåå"
+msgid_plural "Deleting keyrings"
+msgstr[0] "åéåçåå"
+msgstr[1] "åéåçåå"
 
 #. -----------------------------------------------------------------------------
 #. * PUBLIC
@@ -618,30 +606,6 @@ msgstr "éæäæåçéæåã"
 msgid "initial temporary item"
 msgstr "èåèæéç"
 
-#: ../libseahorse/seahorse-object.c:318
-msgid "Symmetric Key"
-msgstr "åçååçå"
-
-#: ../libseahorse/seahorse-object.c:321
-msgid "Public Key"
-msgstr "åéåçå"
-
-#: ../libseahorse/seahorse-object.c:324
-msgid "Private Key"
-msgstr "çååçå"
-
-#: ../libseahorse/seahorse-object.c:327
-msgid "Credentials"
-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:334
-msgid "Identity"
-msgstr "èå"
-
 #: ../libseahorse/seahorse-passphrase.c:178
 msgid "Passphrase"
 msgstr "åè"
@@ -1271,17 +1235,7 @@ msgstr "æå PGP åçå"
 msgid "_Comment:"
 msgstr "éè(_C):"
 
-#: ../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:203
-#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34
-msgid "Public PGP Key"
-msgstr "åå PGP åçå"
-
-#: ../pgp/seahorse-pgp-key.c:582 ../pgp/seahorse-pgp-key-properties.c:1356
+#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1356
 msgid "Expired"
 msgstr "åéæ"
 
@@ -1322,7 +1276,7 @@ msgid "This key expired on: %s"
 msgstr "æåçåçéææï%s"
 
 #: ../pgp/seahorse-pgp-key-properties.c:848
-#: ../src/seahorse-key-manager-store.c:829
+#: ../src/seahorse-key-manager-store.c:802
 msgid "Name"
 msgstr "åç"
 
@@ -1340,7 +1294,7 @@ msgstr "çæåéåé"
 msgid "Unable to change trust"
 msgstr "çæææääå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1015 ../src/seahorse-viewer.c:296
+#: ../pgp/seahorse-pgp-key-properties.c:1015 ../src/seahorse-viewer.c:295
 #: ../ssh/seahorse-ssh-key-properties.c:184
 #, c-format
 msgid "Couldn't export key to \"%s\""
@@ -1368,7 +1322,7 @@ msgstr "ID"
 
 #. The key type column
 #: ../pgp/seahorse-pgp-key-properties.c:1324
-#: ../src/seahorse-key-manager-store.c:860
+#: ../src/seahorse-key-manager-store.c:833
 msgid "Type"
 msgstr "éå"
 
@@ -1393,7 +1347,7 @@ msgid "Good"
 msgstr "èå"
 
 #: ../pgp/seahorse-pgp-key-properties.c:1754
-#: ../src/seahorse-key-manager-store.c:841
+#: ../src/seahorse-key-manager-store.c:814
 msgid "Key ID"
 msgstr "åçå ID"
 
@@ -1538,6 +1492,10 @@ msgstr "ææè"
 msgid "Primary"
 msgstr "äè"
 
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38
+msgid "Private PGP Key"
+msgstr "çä PGP åçå"
+
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39
 msgid "Remove this photo from this key"
 msgstr "åæççåæåçåäçé"
@@ -1629,9 +1587,13 @@ msgstr "åæääåääæã%sãææéååçåï<i>æé</i>ä
 msgid "Marginally"
 msgstr "ååç"
 
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34
+msgid "Public PGP Key"
+msgstr "åå PGP åçå"
+
 #. Trust column
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37
-#: ../src/seahorse-key-manager-store.c:854
+#: ../src/seahorse-key-manager-store.c:827
 msgid "Trust"
 msgstr "ää"
 
@@ -1767,7 +1729,7 @@ msgstr "éååå(_V)"
 msgid "_Sign message with key:"
 msgstr "ççäæçåçå(_S):"
 
-#: ../pkcs11/seahorse-pkcs11-certificate.c:109
+#: ../pkcs11/seahorse-pkcs11-certificate.c:106
 #: ../pkcs11/seahorse-pkcs11-certificate-props.c:66
 msgid "Certificate"
 msgstr "èæ"
@@ -1813,7 +1775,8 @@ msgid "Manage your passwords and encryption keys"
 msgstr "ççåçååçå"
 
 #: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:850
-msgid "Passwords and Encryption Keys"
+#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:144
+msgid "Passwords and Keys"
 msgstr "åçååååçå"
 
 #: ../src/seahorse-generate-select.xml.h:1
@@ -1836,11 +1799,11 @@ msgstr[0] "åéå %d ååçå"
 msgstr[1] "åéå %d ååçå"
 
 #: ../src/seahorse-key-manager.c:413 ../src/seahorse-key-manager.c:471
-#: ../src/seahorse-key-manager.c:532 ../src/seahorse-viewer.c:451
+#: ../src/seahorse-key-manager.c:532 ../src/seahorse-viewer.c:450
 msgid "Couldn't import keys"
 msgstr "çæåååçå"
 
-#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:453
+#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:452
 msgid "Imported keys"
 msgstr "ååçåçå"
 
@@ -1964,7 +1927,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:516
+#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:515
 msgid "_Import"
 msgstr "åå(_I)"
 
@@ -1972,16 +1935,16 @@ msgstr "åå(_I)"
 msgid "_Passwords"
 msgstr "åç(_P)"
 
-#: ../src/seahorse-key-manager-store.c:637 ../src/seahorse-viewer.c:261
+#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:260
 msgid "Couldn't export keys"
 msgstr "çæååéé"
 
-#: ../src/seahorse-key-manager-store.c:847
+#: ../src/seahorse-key-manager-store.c:820
 msgid "Validity"
 msgstr "æææ"
 
 #. Expiry date column
-#: ../src/seahorse-key-manager-store.c:866
+#: ../src/seahorse-key-manager-store.c:839
 msgid "Expiration Date"
 msgstr "ææææ"
 
@@ -2094,15 +2057,11 @@ msgstr "åæ(_S)"
 msgid "Version of this application"
 msgstr "éåæççåççæ"
 
-#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:145
-msgid "Encryption Key Manager"
-msgstr "åçåççå"
-
-#: ../src/seahorse-viewer.c:121
+#: ../src/seahorse-viewer.c:120
 msgid "Contributions:"
 msgstr "èçè:"
 
-#: ../src/seahorse-viewer.c:147
+#: ../src/seahorse-viewer.c:146
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -2111,103 +2070,103 @@ msgstr ""
 "\n"
 "Woodman Tuen <wmtuen gmail com>, 2005-07"
 
-#: ../src/seahorse-viewer.c:150
+#: ../src/seahorse-viewer.c:149
 msgid "Seahorse Project Homepage"
 msgstr "Seahorse åæçé"
 
 #. Top menu items
-#: ../src/seahorse-viewer.c:170
+#: ../src/seahorse-viewer.c:169
 msgid "_File"
 msgstr "ææ(_F)"
 
-#: ../src/seahorse-viewer.c:171
+#: ../src/seahorse-viewer.c:170
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../src/seahorse-viewer.c:172
+#: ../src/seahorse-viewer.c:171
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../src/seahorse-viewer.c:173
+#: ../src/seahorse-viewer.c:172
 msgid "_Help"
 msgstr "æå(_H)"
 
-#: ../src/seahorse-viewer.c:175
+#: ../src/seahorse-viewer.c:174
 msgid "Prefere_nces"
 msgstr "ååèå(_N)"
 
-#: ../src/seahorse-viewer.c:176
+#: ../src/seahorse-viewer.c:175
 msgid "Change preferences for this program"
 msgstr "æææçåçååèå"
 
-#: ../src/seahorse-viewer.c:179
+#: ../src/seahorse-viewer.c:178
 msgid "About this program"
 msgstr "éææçå"
 
-#: ../src/seahorse-viewer.c:180
+#: ../src/seahorse-viewer.c:179
 msgid "_Contents"
 msgstr "åå(_C)"
 
-#: ../src/seahorse-viewer.c:181
+#: ../src/seahorse-viewer.c:180
 msgid "Show Seahorse help"
 msgstr "éç Seahorse çèææä"
 
-#: ../src/seahorse-viewer.c:282
+#: ../src/seahorse-viewer.c:281
 msgid "Export public key"
 msgstr "åååéåçå"
 
-#: ../src/seahorse-viewer.c:303
+#: ../src/seahorse-viewer.c:302
 msgid "Exporting keys"
 msgstr "æååååçå"
 
-#: ../src/seahorse-viewer.c:332
+#: ../src/seahorse-viewer.c:331
 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:344
+#: ../src/seahorse-viewer.c:343
 msgid "Copied keys"
 msgstr "èèçåçå"
 
-#: ../src/seahorse-viewer.c:369
+#: ../src/seahorse-viewer.c:368
 msgid "Retrieving keys"
 msgstr "æååååçå"
 
-#: ../src/seahorse-viewer.c:424
+#: ../src/seahorse-viewer.c:423
 #, c-format
 msgid "%s is a private key. Are you sure you want to proceed?"
 msgstr "%s æäåçååçåãäçåèççï"
 
-#: ../src/seahorse-viewer.c:478
+#: ../src/seahorse-viewer.c:477
 msgid "Importing keys from key servers"
 msgstr "ååçåäæååååçå"
 
-#: ../src/seahorse-viewer.c:503
+#: ../src/seahorse-viewer.c:502
 msgid "Show properties"
 msgstr "éçåæ"
 
-#: ../src/seahorse-viewer.c:504
+#: ../src/seahorse-viewer.c:503
 msgctxt "This text refers to deleting an item from its type's backing store."
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/seahorse-viewer.c:505
+#: ../src/seahorse-viewer.c:504
 msgid "Delete selected items"
 msgstr "åééåçéç"
 
-#: ../src/seahorse-viewer.c:509
+#: ../src/seahorse-viewer.c:508
 msgid "E_xport..."
 msgstr "åå(_X)â"
 
-#: ../src/seahorse-viewer.c:510
+#: ../src/seahorse-viewer.c:509
 msgid "Export to a file"
 msgstr "ååçææ"
 
-#: ../src/seahorse-viewer.c:512
+#: ../src/seahorse-viewer.c:511
 msgid "Copy to the clipboard"
 msgstr "èèååèç"
 
-#: ../src/seahorse-viewer.c:517
+#: ../src/seahorse-viewer.c:516
 msgid "Import selected keys to local key ring"
 msgstr "åååéçåçååææåçåå"
 
@@ -2239,8 +2198,8 @@ msgstr "çåèåé %d å SSH åçåï"
 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
+#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91
+#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19
 msgid "Secure Shell Key"
 msgstr "SSH åçå"
 
@@ -2294,22 +2253,10 @@ msgstr "åæåçåçå(_J)"
 msgid "_Key Description:"
 msgstr "åçåæè(_K):"
 
-#: ../ssh/seahorse-ssh-key.c:88
+#: ../ssh/seahorse-ssh-key.c:87
 msgid "(Unreadable Secure Shell Key)"
 msgstr "ïäèèåç SSH åçåï"
 
-#: ../ssh/seahorse-ssh-key.c:106
-msgid "Invalid"
-msgstr "çæ"
-
-#: ../ssh/seahorse-ssh-key.c:117
-msgid "Private Secure Shell Key"
-msgstr "çä SSH åçå"
-
-#: ../ssh/seahorse-ssh-key.c:120
-msgid "Public Secure Shell Key"
-msgstr "åå SSH åçå"
-
 #: ../ssh/seahorse-ssh-key-properties.c:62
 msgid "Couldn't rename key."
 msgstr "åçåçæéæååã"
@@ -2457,6 +2404,45 @@ msgstr "çååç(_L):"
 msgid "_Set Up"
 msgstr "èå(_S)"
 
+#~ msgid "Web Password"
+#~ msgstr "çéåç"
+
+#~ msgid "Network Password"
+#~ msgstr "çèåç"
+
+#~ msgid "Deleting items"
+#~ msgstr "åééç"
+
+#~ msgid "Deleting keyrings"
+#~ msgstr "åééåå"
+
+#~ msgid "Symmetric Key"
+#~ msgstr "åçåéé"
+
+#~ msgid "Public Key"
+#~ msgstr "åééé"
+
+#~ msgid "Private Key"
+#~ msgstr "çåéé"
+
+#~ msgid "Credentials"
+#~ msgstr "æè"
+
+#~ msgid "Identity"
+#~ msgstr "èå"
+
+#~ msgid "Encryption Key Manager"
+#~ msgstr "ééççå"
+
+#~ msgid "Invalid"
+#~ msgstr "çæ"
+
+#~ msgid "Private Secure Shell Key"
+#~ msgstr "çä SSH éé"
+
+#~ msgid "Public Secure Shell Key"
+#~ msgstr "åå SSH éé"
+
 #~ msgid "Do not run seahorse-daemon as a daemon"
 #~ msgstr "äääæçååååè seahorse-daemon"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d0389ce..7daad61 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: seahorse 3.1.5\n"
+"Project-Id-Version: seahorse 3.1.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-27 10:39+0800\n"
-"PO-Revision-Date: 2011-08-27 08:24+0800\n"
+"POT-Creation-Date: 2011-09-06 20:07+0800\n"
+"PO-Revision-Date: 2011-09-05 20:25+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"
@@ -63,18 +63,6 @@ msgstr "åç(_P):"
 msgid "_Show Password"
 msgstr "éçåç(_S)"
 
-#: ../gkr/seahorse-gkr-item.c:437
-msgid "Web Password"
-msgstr "çéåç"
-
-#: ../gkr/seahorse-gkr-item.c:439
-msgid "Network Password"
-msgstr "çèåç"
-
-#: ../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 "çæåééç"
@@ -93,11 +81,9 @@ msgstr[1] "çåèåé %d ååçï"
 
 #: ../gkr/seahorse-gkr-item-commands.c:114
 msgid "Deleting item"
-msgstr "åééç"
-
-#: ../gkr/seahorse-gkr-item-commands.c:114
-msgid "Deleting items"
-msgstr "åééç"
+msgid_plural "Deleting items"
+msgstr[0] "åééç"
+msgstr[1] "åééç"
 
 #: ../gkr/seahorse-gkr-item-properties.c:67
 msgid "Access a network share or resource"
@@ -123,6 +109,10 @@ msgstr "åååçæçå"
 msgid "Network Credentials"
 msgstr "çèèè"
 
+#: ../gkr/seahorse-gkr-item-properties.c:108
+msgid "Password"
+msgstr "åç"
+
 #: ../gkr/seahorse-gkr-item-properties.c:208
 msgid "Couldn't change password."
 msgstr "çæææåçã"
@@ -189,12 +179,12 @@ msgstr "éå:"
 msgid "Use:"
 msgstr "äç:"
 
-#: ../gkr/seahorse-gkr-keyring.c:121
+#: ../gkr/seahorse-gkr-keyring.c:120
 #, c-format
 msgid "Passwords: %s"
 msgstr "åçï%s"
 
-#: ../gkr/seahorse-gkr-keyring.c:122
+#: ../gkr/seahorse-gkr-keyring.c:121
 #, c-format
 msgid "<b>Passwords:</b> %s"
 msgstr "<b>åçï</b>%s"
@@ -215,74 +205,72 @@ msgstr "åååçåç"
 msgid "Safely store a password or secret."
 msgstr "ååçåæåèææåã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:130
+#: ../gkr/seahorse-gkr-keyring-commands.c:128
 msgid "Couldn't unlock keyring"
 msgstr "çæèééåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:169
+#: ../gkr/seahorse-gkr-keyring-commands.c:165
 msgid "Couldn't lock keyring"
 msgstr "çæéåéåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:208
+#: ../gkr/seahorse-gkr-keyring-commands.c:202
 msgid "Couldn't set default keyring"
 msgstr "çæèåéèçéåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:247
+#: ../gkr/seahorse-gkr-keyring-commands.c:239
 msgid "Couldn't change keyring password"
 msgstr "çæææéåååç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:276
+#: ../gkr/seahorse-gkr-keyring-commands.c:268
 msgid "_Lock"
 msgstr "éå(_L)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:277
+#: ../gkr/seahorse-gkr-keyring-commands.c:269
 msgid ""
 "Lock the password storage keyring so a master password is required to unlock "
 "it."
 msgstr "éååçååéååïåæèååèéåèæäæåçæèã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:278
+#: ../gkr/seahorse-gkr-keyring-commands.c:270
 msgid "_Unlock"
 msgstr "èé(_U)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:279
+#: ../gkr/seahorse-gkr-keyring-commands.c:271
 msgid ""
 "Unlock the password storage keyring with a master password so it is "
 "available for use."
 msgstr "äçäæåçååçååéååèéïåæåæçåääçççæã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:280
+#: ../gkr/seahorse-gkr-keyring-commands.c:272
 msgid "_Set as default"
 msgstr "èçéèå(_S)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:281
+#: ../gkr/seahorse-gkr-keyring-commands.c:273
 msgid "Applications usually store new passwords in the default keyring."
 msgstr "æççåéåæææåçåååéèéååèã"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:282
+#: ../gkr/seahorse-gkr-keyring-commands.c:274
 msgid "Change _Password"
 msgstr "èæåç(_P)"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:283
+#: ../gkr/seahorse-gkr-keyring-commands.c:275
 msgid "Change the unlock password of the password storage keyring"
 msgstr "æèåçååéååçèéåç"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:348
+#: ../gkr/seahorse-gkr-keyring-commands.c:340
 msgid "Couldn't delete keyring"
 msgstr "çæåééåå"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:366
+#: ../gkr/seahorse-gkr-keyring-commands.c:358
 #, c-format
 msgid "Are you sure you want to delete the password keyring '%s'?"
 msgstr "æçåèåééååçéååã%sãï"
 
-#: ../gkr/seahorse-gkr-keyring-commands.c:376
+#: ../gkr/seahorse-gkr-keyring-commands.c:368
 msgid "Deleting keyring"
-msgstr "åééåå"
-
-#: ../gkr/seahorse-gkr-keyring-commands.c:376
-msgid "Deleting keyrings"
-msgstr "åééåå"
+msgid_plural "Deleting keyrings"
+msgstr[0] "åééåå"
+msgstr[1] "åééåå"
 
 #. -----------------------------------------------------------------------------
 #. * PUBLIC
@@ -618,30 +606,6 @@ msgstr "éæäæåçéæåã"
 msgid "initial temporary item"
 msgstr "èåèæéç"
 
-#: ../libseahorse/seahorse-object.c:318
-msgid "Symmetric Key"
-msgstr "åçåéé"
-
-#: ../libseahorse/seahorse-object.c:321
-msgid "Public Key"
-msgstr "åééé"
-
-#: ../libseahorse/seahorse-object.c:324
-msgid "Private Key"
-msgstr "çåéé"
-
-#: ../libseahorse/seahorse-object.c:327
-msgid "Credentials"
-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:334
-msgid "Identity"
-msgstr "èå"
-
 #: ../libseahorse/seahorse-passphrase.c:178
 msgid "Passphrase"
 msgstr "åè"
@@ -1273,17 +1237,7 @@ msgstr "æå PGP éé"
 msgid "_Comment:"
 msgstr "éè(_C):"
 
-#: ../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:203
-#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34
-msgid "Public PGP Key"
-msgstr "åå PGP éé"
-
-#: ../pgp/seahorse-pgp-key.c:582 ../pgp/seahorse-pgp-key-properties.c:1356
+#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1356
 msgid "Expired"
 msgstr "åéæ"
 
@@ -1324,7 +1278,7 @@ msgid "This key expired on: %s"
 msgstr "æééçéææï%s"
 
 #: ../pgp/seahorse-pgp-key-properties.c:848
-#: ../src/seahorse-key-manager-store.c:829
+#: ../src/seahorse-key-manager-store.c:802
 msgid "Name"
 msgstr "åç"
 
@@ -1342,7 +1296,7 @@ msgstr "çæåéåé"
 msgid "Unable to change trust"
 msgstr "çæææääå"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1015 ../src/seahorse-viewer.c:296
+#: ../pgp/seahorse-pgp-key-properties.c:1015 ../src/seahorse-viewer.c:295
 #: ../ssh/seahorse-ssh-key-properties.c:184
 #, c-format
 msgid "Couldn't export key to \"%s\""
@@ -1370,7 +1324,7 @@ msgstr "ID"
 
 #. The key type column
 #: ../pgp/seahorse-pgp-key-properties.c:1324
-#: ../src/seahorse-key-manager-store.c:860
+#: ../src/seahorse-key-manager-store.c:833
 msgid "Type"
 msgstr "éå"
 
@@ -1395,7 +1349,7 @@ msgid "Good"
 msgstr "èå"
 
 #: ../pgp/seahorse-pgp-key-properties.c:1754
-#: ../src/seahorse-key-manager-store.c:841
+#: ../src/seahorse-key-manager-store.c:814
 msgid "Key ID"
 msgstr "éé ID"
 
@@ -1540,6 +1494,10 @@ msgstr "ææè"
 msgid "Primary"
 msgstr "äè"
 
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38
+msgid "Private PGP Key"
+msgstr "çä PGP éé"
+
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39
 msgid "Remove this photo from this key"
 msgstr "åæççåæééäçé"
@@ -1631,9 +1589,13 @@ msgstr "åææäåääæã%sãææéåééï<i>æé</i>æç
 msgid "Marginally"
 msgstr "ååç"
 
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34
+msgid "Public PGP Key"
+msgstr "åå PGP éé"
+
 #. Trust column
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37
-#: ../src/seahorse-key-manager-store.c:854
+#: ../src/seahorse-key-manager-store.c:827
 msgid "Trust"
 msgstr "ää"
 
@@ -1775,7 +1737,7 @@ msgstr "éååå(_V)"
 msgid "_Sign message with key:"
 msgstr "ççäæçéé(_S):"
 
-#: ../pkcs11/seahorse-pkcs11-certificate.c:109
+#: ../pkcs11/seahorse-pkcs11-certificate.c:106
 #: ../pkcs11/seahorse-pkcs11-certificate-props.c:66
 msgid "Certificate"
 msgstr "æè"
@@ -1821,7 +1783,8 @@ msgid "Manage your passwords and encryption keys"
 msgstr "ççåçåéé"
 
 #: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:850
-msgid "Passwords and Encryption Keys"
+#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:144
+msgid "Passwords and Keys"
 msgstr "åçåååéé"
 
 #: ../src/seahorse-generate-select.xml.h:1
@@ -1844,11 +1807,11 @@ msgstr[0] "åéå %d åéé"
 msgstr[1] "åéå %d åéé"
 
 #: ../src/seahorse-key-manager.c:413 ../src/seahorse-key-manager.c:471
-#: ../src/seahorse-key-manager.c:532 ../src/seahorse-viewer.c:451
+#: ../src/seahorse-key-manager.c:532 ../src/seahorse-viewer.c:450
 msgid "Couldn't import keys"
 msgstr "çæååéé"
 
-#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:453
+#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:452
 msgid "Imported keys"
 msgstr "ååçéé"
 
@@ -1972,7 +1935,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:516
+#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:515
 msgid "_Import"
 msgstr "åå(_I)"
 
@@ -1980,16 +1943,16 @@ msgstr "åå(_I)"
 msgid "_Passwords"
 msgstr "åç(_P)"
 
-#: ../src/seahorse-key-manager-store.c:637 ../src/seahorse-viewer.c:261
+#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:260
 msgid "Couldn't export keys"
 msgstr "çæååéé"
 
-#: ../src/seahorse-key-manager-store.c:847
+#: ../src/seahorse-key-manager-store.c:820
 msgid "Validity"
 msgstr "æææ"
 
 #. Expiry date column
-#: ../src/seahorse-key-manager-store.c:866
+#: ../src/seahorse-key-manager-store.c:839
 msgid "Expiration Date"
 msgstr "ææææ"
 
@@ -2107,15 +2070,11 @@ msgstr "åæ(_S)"
 msgid "Version of this application"
 msgstr "éåæççåççæ"
 
-#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:145
-msgid "Encryption Key Manager"
-msgstr "ééççå"
-
-#: ../src/seahorse-viewer.c:121
+#: ../src/seahorse-viewer.c:120
 msgid "Contributions:"
 msgstr "èçè:"
 
-#: ../src/seahorse-viewer.c:147
+#: ../src/seahorse-viewer.c:146
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -2124,103 +2083,103 @@ msgstr ""
 "\n"
 "Woodman Tuen <wmtuen gmail com>, 2005-07"
 
-#: ../src/seahorse-viewer.c:150
+#: ../src/seahorse-viewer.c:149
 msgid "Seahorse Project Homepage"
 msgstr "Seahorse åæçé"
 
 #. Top menu items
-#: ../src/seahorse-viewer.c:170
+#: ../src/seahorse-viewer.c:169
 msgid "_File"
 msgstr "ææ(_F)"
 
-#: ../src/seahorse-viewer.c:171
+#: ../src/seahorse-viewer.c:170
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../src/seahorse-viewer.c:172
+#: ../src/seahorse-viewer.c:171
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../src/seahorse-viewer.c:173
+#: ../src/seahorse-viewer.c:172
 msgid "_Help"
 msgstr "æå(_H)"
 
-#: ../src/seahorse-viewer.c:175
+#: ../src/seahorse-viewer.c:174
 msgid "Prefere_nces"
 msgstr "ååèå(_N)"
 
-#: ../src/seahorse-viewer.c:176
+#: ../src/seahorse-viewer.c:175
 msgid "Change preferences for this program"
 msgstr "æææçåçååèå"
 
-#: ../src/seahorse-viewer.c:179
+#: ../src/seahorse-viewer.c:178
 msgid "About this program"
 msgstr "éææçå"
 
-#: ../src/seahorse-viewer.c:180
+#: ../src/seahorse-viewer.c:179
 msgid "_Contents"
 msgstr "åå(_C)"
 
-#: ../src/seahorse-viewer.c:181
+#: ../src/seahorse-viewer.c:180
 msgid "Show Seahorse help"
 msgstr "éç Seahorse çèææä"
 
-#: ../src/seahorse-viewer.c:282
+#: ../src/seahorse-viewer.c:281
 msgid "Export public key"
 msgstr "åååé"
 
-#: ../src/seahorse-viewer.c:303
+#: ../src/seahorse-viewer.c:302
 msgid "Exporting keys"
 msgstr "æåååéé"
 
-#: ../src/seahorse-viewer.c:332
+#: ../src/seahorse-viewer.c:331
 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:344
+#: ../src/seahorse-viewer.c:343
 msgid "Copied keys"
 msgstr "èèçéé"
 
-#: ../src/seahorse-viewer.c:369
+#: ../src/seahorse-viewer.c:368
 msgid "Retrieving keys"
 msgstr "æåååéé"
 
-#: ../src/seahorse-viewer.c:424
+#: ../src/seahorse-viewer.c:423
 #, c-format
 msgid "%s is a private key. Are you sure you want to proceed?"
 msgstr "%s æäåçåééãæçåèççï"
 
-#: ../src/seahorse-viewer.c:478
+#: ../src/seahorse-viewer.c:477
 msgid "Importing keys from key servers"
 msgstr "åééäæåååéé"
 
-#: ../src/seahorse-viewer.c:503
+#: ../src/seahorse-viewer.c:502
 msgid "Show properties"
 msgstr "éçåæ"
 
-#: ../src/seahorse-viewer.c:504
+#: ../src/seahorse-viewer.c:503
 msgctxt "This text refers to deleting an item from its type's backing store."
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/seahorse-viewer.c:505
+#: ../src/seahorse-viewer.c:504
 msgid "Delete selected items"
 msgstr "åééåçéç"
 
-#: ../src/seahorse-viewer.c:509
+#: ../src/seahorse-viewer.c:508
 msgid "E_xport..."
 msgstr "åå(_X)â"
 
-#: ../src/seahorse-viewer.c:510
+#: ../src/seahorse-viewer.c:509
 msgid "Export to a file"
 msgstr "ååçææ"
 
-#: ../src/seahorse-viewer.c:512
+#: ../src/seahorse-viewer.c:511
 msgid "Copy to the clipboard"
 msgstr "èèååèç"
 
-#: ../src/seahorse-viewer.c:517
+#: ../src/seahorse-viewer.c:516
 msgid "Import selected keys to local key ring"
 msgstr "åååéçééåææéåå"
 
@@ -2252,8 +2211,8 @@ msgstr "çåèåé %d å SSH ééï"
 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
+#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91
+#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19
 msgid "Secure Shell Key"
 msgstr "SSH éé"
 
@@ -2309,22 +2268,10 @@ msgstr "åæåçéé(_J)"
 msgid "_Key Description:"
 msgstr "ééæè(_K):"
 
-#: ../ssh/seahorse-ssh-key.c:88
+#: ../ssh/seahorse-ssh-key.c:87
 msgid "(Unreadable Secure Shell Key)"
 msgstr "ïäèèåç SSH ééï"
 
-#: ../ssh/seahorse-ssh-key.c:106
-msgid "Invalid"
-msgstr "çæ"
-
-#: ../ssh/seahorse-ssh-key.c:117
-msgid "Private Secure Shell Key"
-msgstr "çä SSH éé"
-
-#: ../ssh/seahorse-ssh-key.c:120
-msgid "Public Secure Shell Key"
-msgstr "åå SSH éé"
-
 #: ../ssh/seahorse-ssh-key-properties.c:62
 msgid "Couldn't rename key."
 msgstr "ééçæéæååã"
@@ -2472,6 +2419,45 @@ msgstr "çååç(_L):"
 msgid "_Set Up"
 msgstr "èå(_S)"
 
+#~ msgid "Web Password"
+#~ msgstr "çéåç"
+
+#~ msgid "Network Password"
+#~ msgstr "çèåç"
+
+#~ msgid "Deleting items"
+#~ msgstr "åééç"
+
+#~ msgid "Deleting keyrings"
+#~ msgstr "åééåå"
+
+#~ msgid "Symmetric Key"
+#~ msgstr "åçåéé"
+
+#~ msgid "Public Key"
+#~ msgstr "åééé"
+
+#~ msgid "Private Key"
+#~ msgstr "çåéé"
+
+#~ msgid "Credentials"
+#~ msgstr "æè"
+
+#~ msgid "Identity"
+#~ msgstr "èå"
+
+#~ msgid "Encryption Key Manager"
+#~ msgstr "ééççå"
+
+#~ msgid "Invalid"
+#~ msgstr "çæ"
+
+#~ msgid "Private Secure Shell Key"
+#~ msgstr "çä SSH éé"
+
+#~ msgid "Public Secure Shell Key"
+#~ msgstr "åå SSH éé"
+
 #~ msgid "Do not run seahorse-daemon as a daemon"
 #~ msgstr "äääæçååååè seahorse-daemon"