[gnome-keyring] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit 3c78ca102adffc951de3cc01afd9bbf7211423f2
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Fri Feb 4 12:53:52 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  638 ++++++++++++++++++++++++++++++++--------------------------
 po/zh_TW.po |  638 ++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 704 insertions(+), 572 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 75980c5..47d84ce 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -4,12 +4,13 @@
 # Chao-Hsiung Liao  <j_h_liau yahoo com tw>, 2008, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-keyring 2.31.92\n"
+"Project-Id-Version: gnome-keyring 2.91.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-05 19:27+0800\n"
-"PO-Revision-Date: 2010-09-05 19:28+0800\n"
+"POT-Creation-Date: 2011-02-04 12:53+0800\n"
+"PO-Revision-Date: 2011-02-04 12:53+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,8 +19,8 @@ msgstr ""
 #. TRANSLATORS: This is the label for an keyring created without a label
 #: ../daemon/dbus/gkd-secret-change.c:78 ../daemon/dbus/gkd-secret-create.c:74
 #: ../pkcs11/secret-store/gkm-secret-collection.c:325
-#: ../pkcs11/wrap-layer/gkm-wrap-login.c:317
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:767
+#: ../pkcs11/wrap-layer/gkm-wrap-login.c:343
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:789
 msgid "Unnamed"
 msgstr "æ?ªå?½å??ç??"
 
@@ -90,34 +91,35 @@ msgstr "GNOME å¯?碼å??å??ï¼?GPG 代ç??ç¨?å¼?"
 msgid "GPG Password Agent"
 msgstr "GPG å¯?碼代ç??ç¨?å¼?"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:102
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:104 ../gcr/gcr-key-renderer.c:291
+#: ../gcr/gcr-key-renderer.c:296
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:200
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:199
 #, c-format
 msgid "PGP Key: %s"
 msgstr "PGP å¯?碼å??ï¼?%s"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:303
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:304
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:348
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:349
 msgid "Enter Passphrase"
 msgstr "輸���"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:341
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:383
 msgid "Forget this password if idle for"
 msgstr "å¿?è¨?é??å??å¯?碼æ?¼é??ç½®"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:342
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:384
 msgid "Forget this password after"
 msgstr "å¿?è¨?é??å??å¯?碼æ?¼"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:343
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:385
 msgid "Forget this password when I log out"
 msgstr "ç?¶æ??ç?»å?ºæ??å¿?è¨?é??å??å¯?碼"
 
 #. TRANSLATORS: This is the display label for the login keyring
-#: ../daemon/login/gkd-login.c:159
+#: ../daemon/login/gkd-login.c:147
 msgid "Login"
 msgstr "��"
 
@@ -130,8 +132,8 @@ msgid "User ID"
 msgstr "使ç?¨è?? ID"
 
 #: ../egg/egg-oid.c:46
-msgid "Email"
-msgstr "���件"
+msgid "Email Address"
+msgstr "é?»å­?é?µä»¶ä½?å??"
 
 #: ../egg/egg-oid.c:54
 msgid "Date of Birth"
@@ -161,8 +163,7 @@ msgstr "æ?®é??å??稱"
 msgid "Surname"
 msgstr "�"
 
-#: ../egg/egg-oid.c:69 ../gcr/gcr-certificate-basics-widget.ui.h:18
-#: ../gcr/gcr-certificate-details-widget.c:318
+#: ../egg/egg-oid.c:69 ../gcr/gcr-certificate-renderer.c:379
 msgid "Serial Number"
 msgstr "åº?è??"
 
@@ -218,7 +219,7 @@ msgstr "DN 辨è­?符è??"
 msgid "Pseudonym"
 msgstr "ç­?å??"
 
-#: ../egg/egg-oid.c:98
+#: ../egg/egg-oid.c:98 ../gcr/gcr-key-renderer.c:287
 msgid "RSA"
 msgstr "RSA"
 
@@ -234,7 +235,7 @@ msgstr "MD5 é?? RSA å? å¯?"
 msgid "SHA1 with RSA"
 msgstr "SHA1 é?? RSA å? å¯?"
 
-#: ../egg/egg-oid.c:107
+#: ../egg/egg-oid.c:107 ../gcr/gcr-key-renderer.c:289
 msgid "DSA"
 msgstr "DSA ��"
 
@@ -252,176 +253,115 @@ msgstr "ç?¶ select() å¾?å­?ç¨?åº?è®?å??è³?æ??æ??ç?¼ç??æ?ªé ?æ??ç??é?¯èª¤ (%s)"
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "waitpid() ç?¼ç??æ?ªé ?æ??ç??é?¯èª¤ (%s)"
 
-#: ../gcr/gcr-certificate-basics-widget.c:59
-msgid "<i>Not Part of Certificate</i>"
-msgstr "<i>ä¸?æ?¯è­?æ?¸ç??é?¨ä»½</i>"
-
-#: ../gcr/gcr-certificate-basics-widget.c:80
-msgid "<i>unknown</i>"
-msgstr "<i>ä¸?æ??</i>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:1
-msgid "<Not Part of Certificate>"
-msgstr "<ä¸?æ?¯è­?æ?¸ç??é?¨ä»½>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:2
-msgid "<b>Fingerprints</b>"
-msgstr "<b>æ?¸ç¢¼æ??ç´?</b>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:3
-msgid "<b>Issued By</b>"
-msgstr "<b>ç?¼è¡?è??:</b>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:4
-msgid "<b>Issued To</b>"
-msgstr "<b>�給:</b>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:5
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>æ­¤è­?æ?¸å·²ç¶?檢é©?å?¯ç?¨æ?¼ä¸?å??ç?¨é??:</b>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:6
-msgid "<b>Validity</b>"
-msgstr "<b>æ??å??</b>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:7
-msgid "Common Name (CN)"
-msgstr "ä¸?è?¬å??稱 (CN)"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:8
-msgid "Email Recipient Certificate"
-msgstr "é?»å­?é?µä»¶æ?¶ä»¶è??è­?æ?¸"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:9
-msgid "Email Signer Certificate"
-msgstr "é?»å­?é?µä»¶ç°½ç½²è??è­?æ?¸"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:10
-msgid "Expires On"
-msgstr "å?°æ??æ?¥æ??"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:11
-msgid "Issued On"
-msgstr "ç?¼ç?§æ?¥æ??"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:12
-msgid "MD5 Fingerprint"
-msgstr "MD5 æ?¸ç¢¼æ??ç´?"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:13
-msgid "Organization (O)"
-msgstr "çµ?ç¹? (O)"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:14
-msgid "Organizational Unit (OU)"
-msgstr "���� (OU)"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:15
-msgid "SHA1 Fingerprint"
-msgstr "SHA1 æ?¸ç¢¼æ??ç´?"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:16
-msgid "SSL Client Certificate"
-msgstr "SSL 客�端��"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:17
-msgid "SSL Server Certificate"
-msgstr "SSL 伺æ??å?¨è­?æ?¸"
+#: ../gcr/gcr-certificate-renderer.c:82 ../gcr/gcr-parser.c:201
+msgid "Certificate"
+msgstr "è­?æ?¸"
 
-#: ../gcr/gcr-certificate-details-widget.c:203
+#: ../gcr/gcr-certificate-renderer.c:107
 msgid "Extension"
 msgstr "延伸"
 
-#: ../gcr/gcr-certificate-details-widget.c:208
+#: ../gcr/gcr-certificate-renderer.c:112
 msgid "Identifier"
 msgstr "��碼"
 
-#: ../gcr/gcr-certificate-details-widget.c:216
+#: ../gcr/gcr-certificate-renderer.c:120
 msgid "Value"
 msgstr "��"
 
-#: ../gcr/gcr-certificate-details-widget.c:224
+#: ../gcr/gcr-certificate-renderer.c:126
 msgid "Critical"
 msgstr "é??è¦?"
 
-#: ../gcr/gcr-certificate-details-widget.c:224
+#: ../gcr/gcr-certificate-renderer.c:126
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../gcr/gcr-certificate-details-widget.c:224
+#: ../gcr/gcr-certificate-renderer.c:126
 msgid "No"
 msgstr "å?¦"
 
+#: ../gcr/gcr-certificate-renderer.c:339
+msgid "Identity"
+msgstr "身å??"
+
+#: ../gcr/gcr-certificate-renderer.c:343
+msgid "Verified by"
+msgstr "檢é©?è??"
+
+#: ../gcr/gcr-certificate-renderer.c:350
+msgid "Expires"
+msgstr "å?°æ??"
+
 #. The subject
-#: ../gcr/gcr-certificate-details-widget.c:299
+#: ../gcr/gcr-certificate-renderer.c:360
 msgid "Subject Name"
 msgstr "主æ?¨å??稱"
 
 #. The Issuer
-#: ../gcr/gcr-certificate-details-widget.c:303
+#: ../gcr/gcr-certificate-renderer.c:364
 msgid "Issuer Name"
 msgstr "ç?¼ç?§è??å??稱"
 
 #. The Issued Parameters
-#: ../gcr/gcr-certificate-details-widget.c:307
+#: ../gcr/gcr-certificate-renderer.c:368
 msgid "Issued Certificate"
 msgstr "已簽ç?¼ç??è­?æ?¸"
 
-#: ../gcr/gcr-certificate-details-widget.c:312
+#: ../gcr/gcr-certificate-renderer.c:373
 msgid "Version"
 msgstr "ç??æ?¬"
 
-#: ../gcr/gcr-certificate-details-widget.c:325
+#: ../gcr/gcr-certificate-renderer.c:387
 msgid "Not Valid Before"
 msgstr "å?¨æ­¤ä¹?å??ç?¡æ??"
 
-#: ../gcr/gcr-certificate-details-widget.c:330
+#: ../gcr/gcr-certificate-renderer.c:392
 msgid "Not Valid After"
 msgstr "å?¨æ­¤ä¹?å¾?ç?¡æ??"
 
-#. Signature
-#: ../gcr/gcr-certificate-details-widget.c:335
-#: ../gcr/gcr-certificate-details-widget.c:351
-msgid "Signature"
-msgstr "簽署"
-
-#: ../gcr/gcr-certificate-details-widget.c:339
+#: ../gcr/gcr-certificate-renderer.c:401
 msgid "Signature Algorithm"
 msgstr "��簽署���"
 
-#: ../gcr/gcr-certificate-details-widget.c:344
+#: ../gcr/gcr-certificate-renderer.c:406
 msgid "Signature Parameters"
 msgstr "簽署å??æ?¸"
 
+#: ../gcr/gcr-certificate-renderer.c:413
+msgid "Signature"
+msgstr "簽署"
+
 #. Public Key Info
-#: ../gcr/gcr-certificate-details-widget.c:355
+#: ../gcr/gcr-certificate-renderer.c:418
 msgid "Public Key Info"
 msgstr "å?¬é??å¯?碼å??è³?è¨?"
 
-#: ../gcr/gcr-certificate-details-widget.c:359
+#: ../gcr/gcr-certificate-renderer.c:423
 msgid "Key Algorithm"
 msgstr "å¯?碼å??æ¼?ç®?æ³?"
 
-#: ../gcr/gcr-certificate-details-widget.c:364
+#: ../gcr/gcr-certificate-renderer.c:429
 msgid "Key Parameters"
 msgstr "å¯?碼å??å??æ?¸"
 
-#: ../gcr/gcr-certificate-details-widget.c:371
+#: ../gcr/gcr-certificate-renderer.c:436
 msgid "Key Size"
 msgstr "å¯?碼å??大å°?"
 
-#: ../gcr/gcr-certificate-details-widget.c:378 ../gcr/gcr-parser.c:203
+#: ../gcr/gcr-certificate-renderer.c:444 ../gcr/gcr-key-renderer.c:271
+#: ../gcr/gcr-parser.c:204
 msgid "Public Key"
 msgstr "å?¬é??å¯?碼å??"
 
 #. Fingerprints
-#: ../gcr/gcr-certificate-details-widget.c:383
+#: ../gcr/gcr-certificate-renderer.c:449
 msgid "Fingerprints"
 msgstr "æ?¸ç¢¼æ??ç´?"
 
 #: ../gcr/gcr-import-dialog.ui.h:1
-msgid "<span size='large' weight='bold'>Import Certificates and Keys</span>"
-msgstr "<span size='large' weight='bold'>å?¯å?¥è­?æ?¸å??å¯?碼å??</span>"
+msgid "Import Certificates and Keys"
+msgstr "å?¯å?¥è­?æ?¸å??å¯?碼å??"
 
 #: ../gcr/gcr-import-dialog.ui.h:2
 msgid "Import Into:"
@@ -432,424 +372,480 @@ msgid "Password:"
 msgstr "�碼:"
 
 #: ../gcr/gcr-unlock-options-widget.ui.h:1
+msgid "Automatically unlock this keyring whenever I'm logged in"
+msgstr "ç?¶æ??ç?»å?¥æ??è?ªå??解é??å¯?碼å??å??"
+
+#: ../gcr/gcr-unlock-options-widget.ui.h:2
 msgid "Lock this keyring after"
 msgstr "é??å®?é??å??å¯?碼å??å??æ?¼"
 
-#: ../gcr/gcr-unlock-options-widget.ui.h:2
+#: ../gcr/gcr-unlock-options-widget.ui.h:3
 msgid "Lock this keyring if idle for"
 msgstr "é??å®?é??å??å¯?碼å??å??æ?¼é??ç½®"
 
-#: ../gcr/gcr-unlock-options-widget.ui.h:3
+#: ../gcr/gcr-unlock-options-widget.ui.h:4
 msgid "Lock this keyring when I log out"
 msgstr "ç?¶æ??ç?»å?ºæ??è?ªå??é??å®?å¯?碼å??å??"
 
-#: ../gcr/gcr-unlock-options-widget.ui.h:4
+#. Translators: The 'minutes' from 'Lock this keyring if idle for x minutes'.
+#: ../gcr/gcr-unlock-options-widget.ui.h:6
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../gcr/gcr-importer.c:163 ../gcr/gcr-parser.c:1565 ../gp11/gp11-misc.c:98
-msgid "The operation was cancelled"
-msgstr "該æ??ä½?å·²å??æ¶?"
-
-#: ../gcr/gcr-importer.c:255
-#, c-format
-msgid "No location available to import to"
-msgstr "æ²?æ??å?¯ç?¨ç??ä½?ç½®å?¯å?¯å?¥"
-
-#: ../gcr/gcr-importer.c:404
-msgid "Import Certificates/Keys"
-msgstr "å?¯å?¥è­?æ?¸/å¯?碼å??"
-
-#: ../gcr/gcr-importer.c:411
-msgid "Choose a location to store the imported certificates/keys."
-msgstr "é?¸æ??ä¸?å??ç?¨ä¾?å?²å­?å?¯å?¥ç??è­?æ?¸/å¯?碼å??ç??ä½?ç½®ã??"
-
-#: ../gcr/gcr-importer.c:436 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:676
+#: ../gcr/gcr-importer.c:133 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:701
 msgid "Enter password to unlock the private key"
 msgstr "輸å?¥è§£é??ç§?å¯?å¯?碼å??ç??å¯?碼"
 
-#: ../gcr/gcr-importer.c:438 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:678
+#: ../gcr/gcr-importer.c:135 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:703
 msgid "Enter password to unlock the certificate"
 msgstr "輸å?¥è§£é??è­?æ?¸ç??å¯?碼"
 
-#: ../gcr/gcr-importer.c:440 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:682
+#: ../gcr/gcr-importer.c:137 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:707
 msgid "Enter password to unlock"
 msgstr "輸å?¥è§£é??ç??å¯?碼"
 
 #. TRANSLATORS: The key is locked.
-#: ../gcr/gcr-importer.c:449
+#: ../gcr/gcr-importer.c:146
 msgid "In order to import the private key, it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥ç§?å¯?å¯?碼å??ï¼?å¿?é ?å??æ??å®?解é??"
 
 #. TRANSLATORS: The certificate is locked.
-#: ../gcr/gcr-importer.c:452
+#: ../gcr/gcr-importer.c:149
 msgid "In order to import the certificate, it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥è­?æ?¸ï¼?å¿?é ?å??æ??å®?解é??"
 
 #. TRANSLATORS: The data is locked.
-#: ../gcr/gcr-importer.c:455
+#: ../gcr/gcr-importer.c:152
 msgid "In order to import the data, it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥è³?æ??ï¼?å®?å¿?é ?解é??"
 
 #. TRANSLATORS: The key is locked.
-#: ../gcr/gcr-importer.c:460
+#: ../gcr/gcr-importer.c:157
 #, c-format
 msgid "In order to import the private key '%s', it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥ç§?å¯?å¯?碼å??ã??%sã??ï¼?å¿?é ?å??æ??å®?解é??"
 
 #. TRANSLATORS: The certificate is locked.
-#: ../gcr/gcr-importer.c:463
+#: ../gcr/gcr-importer.c:160
 #, c-format
 msgid "In order to import the certificate '%s', it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥è­?æ?¸ã??%sã??ï¼?å¿?é ?å??æ??å®?解é??"
 
 #. TRANSLATORS: The object '%s' is locked.
-#: ../gcr/gcr-importer.c:466
+#: ../gcr/gcr-importer.c:163
 #, c-format
 msgid "In order to import '%s', it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥ã??%sã??ï¼?å¿?é ?å??æ??å®?解é??"
 
-#: ../gcr/gcr-parser.c:197
+#: ../gcr/gcr-importer.c:254 ../gcr/gcr-parser.c:1566 ../gcr/gcr-parser.c:1757
+#: ../gck/gck-misc.c:98
+msgid "The operation was cancelled"
+msgstr "該æ??ä½?å·²å??æ¶?"
+
+#: ../gcr/gcr-importer.c:346
+#, c-format
+msgid "No location available to import to"
+msgstr "æ²?æ??å?¯ç?¨ç??ä½?ç½®å?¯å?¯å?¥"
+
+#: ../gcr/gcr-importer.c:495
+msgid "Import Certificates/Keys"
+msgstr "å?¯å?¥è­?æ?¸/å¯?碼å??"
+
+#: ../gcr/gcr-importer.c:502
+msgid "Choose a location to store the imported certificates/keys."
+msgstr "é?¸æ??ä¸?å??ç?¨ä¾?å?²å­?å?¯å?¥ç??è­?æ?¸/å¯?碼å??ç??ä½?ç½®ã??"
+
+#: ../gcr/gcr-key-renderer.c:69
+msgid "Key"
+msgstr "å¯?碼å??"
+
+#: ../gcr/gcr-key-renderer.c:260
+msgid "Private RSA Key"
+msgstr "RSA ç§?å¯?å¯?碼å??"
+
+#: ../gcr/gcr-key-renderer.c:262
+msgid "Private DSA Key"
+msgstr "DSA ç§?å¯?å¯?碼å??"
+
+#: ../gcr/gcr-key-renderer.c:264 ../gcr/gcr-parser.c:198
 msgid "Private Key"
 msgstr "ç§?å¯?å¯?碼å??"
 
-#: ../gcr/gcr-parser.c:200
-msgid "Certificate"
-msgstr "è­?æ?¸"
+#: ../gcr/gcr-key-renderer.c:267 ../gcr/gcr-key-renderer.c:269
+msgid "Public DSA Key"
+msgstr "DSA å?¬é??å¯?碼å??"
+
+#: ../gcr/gcr-key-renderer.c:278
+#, c-format
+msgid "%d bit"
+msgid_plural "%d bits"
+msgstr[0] "%d ä½?å??"
 
-#: ../gcr/gcr-parser.c:1568
+#: ../gcr/gcr-key-renderer.c:279
+msgid "Strength"
+msgstr "強度"
+
+#: ../gcr/gcr-key-renderer.c:292
+msgid "Algorithm"
+msgstr "æ¼?ç®?æ³?"
+
+#: ../gcr/gcr-key-renderer.c:299
+msgid "Size"
+msgstr "大�"
+
+#. TODO: We need to have consistent key fingerprints.
+#: ../gcr/gcr-key-renderer.c:303
+msgid "Fingerprint"
+msgstr "æ?¸ç¢¼æ??ç´?"
+
+#: ../gcr/gcr-parser.c:1569
 msgid "Unrecognized or unsupported data."
 msgstr "ç?¡æ³?辨è­?æ??ä¸?æ?¯æ?´ç??è³?æ??ã??"
 
-#: ../gcr/gcr-parser.c:1571
+#: ../gcr/gcr-parser.c:1572
 msgid "Could not parse invalid or corrupted data."
 msgstr "ç?¡æ³?解æ??ç?¡æ??æ??æ??æ¯?ç??è³?æ??ã??"
 
-#: ../gcr/gcr-parser.c:1574
+#: ../gcr/gcr-parser.c:1575
 msgid "The data is locked"
 msgstr "è³?æ??已被é??å®?"
 
-#: ../gp11/gp11-misc.c:101
+#: ../gcr/gcr-trust.c:417
+#, c-format
+msgid "Couldn't find a place to store the pinned certificate"
+msgstr "æ?¾ä¸?å?°ä½?ç½®ä¾?å?²å­?å?¯å?¥ç??è­?æ?¸"
+
+#: ../gck/gck-uri.c:124 ../gck/gck-uri.c:181 ../gck/gck-uri.c:216
+#: ../gck/gck-uri.c:248
+#, c-format
+msgid "The URI has invalid syntax. The '%s' field encoding is invalid."
+msgstr "é??å?? URI æ??ç?¡æ??ç??èª?æ³?ã??ã??%sã??æ¬?ä½?ç??編碼æ?¯ç?¡æ??ç??ã??"
+
+#: ../gck/gck-uri.c:287
+msgid "The URI has does not have the 'pkcs11' scheme."
+msgstr "é??å?? URI æ²?æ??ã??pkcs11ã??schemeã??"
+
+#: ../gck/gck-misc.c:101
 msgid "Insufficient memory available"
 msgstr "æ²?æ??足夠ç??è¨?æ?¶é«?å?¯ç?¨"
 
-#: ../gp11/gp11-misc.c:103
+#: ../gck/gck-misc.c:103
 msgid "The specified slot ID is not valid"
 msgstr "æ??å®?ç??æ??槽 ID æ?¯ç?¡æ??ç??"
 
-#: ../gp11/gp11-misc.c:105
+#: ../gck/gck-misc.c:105
 msgid "Internal error"
 msgstr "å?§é?¨ç??é?¯èª¤"
 
-#: ../gp11/gp11-misc.c:107
+#: ../gck/gck-misc.c:107
 msgid "The operation failed"
 msgstr "æ­¤æ??ä½?失æ??"
 
-#: ../gp11/gp11-misc.c:109
+#: ../gck/gck-misc.c:109
 msgid "Invalid arguments"
 msgstr "ç?¡æ??ç??å¼?æ?¸"
 
-#: ../gp11/gp11-misc.c:111
+#: ../gck/gck-misc.c:111
 msgid "The module cannot create needed threads"
 msgstr "模çµ?ä¸?è?½å»ºç«?æ??é??ç??å?·è¡?ç·?"
 
-#: ../gp11/gp11-misc.c:113
+#: ../gck/gck-misc.c:113
 msgid "The module cannot lock data properly"
 msgstr "模çµ?ä¸?è?½æ­£ç¢ºç??é??å®?è³?æ??"
 
-#: ../gp11/gp11-misc.c:115
+#: ../gck/gck-misc.c:115
 msgid "The field is read-only"
 msgstr "æ­¤æ¬?ä½?æ?¯å?¯è®?ç??"
 
-#: ../gp11/gp11-misc.c:117
+#: ../gck/gck-misc.c:117
 msgid "The field is sensitive and cannot be revealed"
 msgstr "æ­¤æ¬?ä½?é??å??å??大å°?寫並ä¸?ä¸?æ??顯示å?¶å¯¦é??å?¼"
 
-#: ../gp11/gp11-misc.c:119
+#: ../gck/gck-misc.c:119
 msgid "The field is invalid or does not exist"
 msgstr "該æ¬?ä½?ç?¡æ??æ??è??ä¸?å­?å?¨"
 
-#: ../gp11/gp11-misc.c:121
+#: ../gck/gck-misc.c:121
 msgid "Invalid value for field"
 msgstr "å°?æ­¤æ¬?ä½?ç?¡æ??ç??æ?¸å?¼"
 
-#: ../gp11/gp11-misc.c:123
+#: ../gck/gck-misc.c:123
 msgid "The data is not valid or unrecognized"
 msgstr "è³?æ??ç?¡æ??æ??ç?¡æ³?辨è­?"
 
-#: ../gp11/gp11-misc.c:125
+#: ../gck/gck-misc.c:125
 msgid "The data is too long"
 msgstr "è³?æ??太é?·"
 
-#: ../gp11/gp11-misc.c:127
+#: ../gck/gck-misc.c:127
 msgid "An error occurred on the device"
 msgstr "å?¨è£?ç½®ä¸?ç?¼ç??é?¯èª¤"
 
-#: ../gp11/gp11-misc.c:129
-msgid "Insufficient memory available on device"
+#: ../gck/gck-misc.c:129
+msgid "Insufficient memory available on the device"
 msgstr "è£?ç½®ä¸?æ²?æ??足夠ç??è¨?æ?¶é«?"
 
-#: ../gp11/gp11-misc.c:131
+#: ../gck/gck-misc.c:131
 msgid "The device was removed or unplugged"
 msgstr "該è£?置已移å??æ??æ??é?¤äº?"
 
-#: ../gp11/gp11-misc.c:133
+#: ../gck/gck-misc.c:133
 msgid "The encrypted data is not valid or unrecognized"
 msgstr "å·²å? å¯?è³?æ??ç?¡æ??æ??ç?¡æ³?辨è­?"
 
-#: ../gp11/gp11-misc.c:135
+#: ../gck/gck-misc.c:135
 msgid "The encrypted data is too long"
 msgstr "å·²å? å¯?è³?æ??太é?·"
 
-#: ../gp11/gp11-misc.c:137
+#: ../gck/gck-misc.c:137
 msgid "This operation is not supported"
 msgstr "é??å??æ??ä½?æ?¯ä¸?æ?¯æ?´ç??"
 
-#: ../gp11/gp11-misc.c:139
+#: ../gck/gck-misc.c:139
 msgid "The key is missing or invalid"
 msgstr "該å¯?碼å??å·²é?ºå¤±æ??ç?¡æ??"
 
-#: ../gp11/gp11-misc.c:141
+#: ../gck/gck-misc.c:141
 msgid "The key is the wrong size"
 msgstr "該å¯?碼å??ç??大å°?é?¯èª¤"
 
-#: ../gp11/gp11-misc.c:143
+#: ../gck/gck-misc.c:143
 msgid "The key is of the wrong type"
 msgstr "該å¯?碼å??ç??é¡?å??é?¯èª¤"
 
-#: ../gp11/gp11-misc.c:145
+#: ../gck/gck-misc.c:145
 msgid "No key is needed"
 msgstr "ä¸?é??è¦?å¯?碼å??"
 
-#: ../gp11/gp11-misc.c:147
-msgid "The key is different from before"
+#: ../gck/gck-misc.c:147
+msgid "The key is different than before"
 msgstr "æ­¤å¯?碼å??è??å¾?å??ä¸?å??"
 
-#: ../gp11/gp11-misc.c:149
+#: ../gck/gck-misc.c:149
 msgid "A key is needed"
 msgstr "é??è¦?å¯?碼å??"
 
-#: ../gp11/gp11-misc.c:151
-msgid "Cannot include the key in digest"
+#: ../gck/gck-misc.c:151
+msgid "Cannot include the key in the digest"
 msgstr "ä¸?è?½å?¨æ??è¦?中å??å?«å¯?碼å??"
 
-#: ../gp11/gp11-misc.c:153
+#: ../gck/gck-misc.c:153
 msgid "This operation cannot be done with this key"
 msgstr "é??å??æ??ä½?ä¸?è?½ä»¥æ­¤å¯?碼å??é?²è¡?"
 
-#: ../gp11/gp11-misc.c:155
+#: ../gck/gck-misc.c:155
 msgid "The key cannot be wrapped"
 msgstr "å¯?碼å??ä¸?è?½æ?·è¡?"
 
-#: ../gp11/gp11-misc.c:157
+#: ../gck/gck-misc.c:157
 msgid "Cannot export this key"
 msgstr "ä¸?è?½å?¯å?ºé??å??å¯?碼å??"
 
-#: ../gp11/gp11-misc.c:159
+#: ../gck/gck-misc.c:159
 msgid "The crypto mechanism is invalid or unrecognized"
 msgstr "該å? å¯?æ©?å?¶ç?¡æ??æ??ç?¡æ³?辨è­?"
 
-#: ../gp11/gp11-misc.c:161
+#: ../gck/gck-misc.c:161
 msgid "The crypto mechanism has an invalid argument"
 msgstr "該å? å¯?æ©?å?¶æ??ç?¡æ??ç??å¼?æ?¸"
 
-#: ../gp11/gp11-misc.c:163
+#: ../gck/gck-misc.c:163
 msgid "The object is missing or invalid"
 msgstr "該ç?©ä»¶å·²é?ºå¤±æ??ç?¡æ??"
 
-#: ../gp11/gp11-misc.c:165
+#: ../gck/gck-misc.c:165
 msgid "Another operation is already taking place"
 msgstr "å?¦ä¸?å??æ??ä½?å·²å?¨é?²è¡?"
 
-#: ../gp11/gp11-misc.c:167
+#: ../gck/gck-misc.c:167
 msgid "No operation is taking place"
 msgstr "æ²?æ??æ??ä½?æ­£å?¨é?²è¡?"
 
-#: ../gp11/gp11-misc.c:169
+#: ../gck/gck-misc.c:169
 msgid "The password or PIN is incorrect"
 msgstr "æ­¤å¯?碼æ?? PIN æ?¯ä¸?正確ç??"
 
-#: ../gp11/gp11-misc.c:171
+#: ../gck/gck-misc.c:171
 msgid "The password or PIN is invalid"
 msgstr "æ­¤å¯?碼æ?? PIN æ?¯ç?¡æ??ç??"
 
-#: ../gp11/gp11-misc.c:173
+#: ../gck/gck-misc.c:173
 msgid "The password or PIN is of an invalid length"
 msgstr "æ­¤å¯?碼æ?? PIN ç??é?·åº¦ä¸?å??æ³?"
 
-#: ../gp11/gp11-misc.c:175
+#: ../gck/gck-misc.c:175
 msgid "The password or PIN has expired"
 msgstr "æ­¤å¯?碼æ?? PIN å·²é??æ??"
 
-#: ../gp11/gp11-misc.c:177
+#: ../gck/gck-misc.c:177
 msgid "The password or PIN is locked"
 msgstr "æ­¤å¯?碼æ?? PIN 已被é??å®?"
 
-#: ../gp11/gp11-misc.c:179
+#: ../gck/gck-misc.c:179
 msgid "The session is closed"
 msgstr "該ä½?業é??段已é??é??"
 
-#: ../gp11/gp11-misc.c:181
+#: ../gck/gck-misc.c:181
 msgid "Too many sessions are active"
 msgstr "太å¤?ä½?業é??段å?¨ä½¿ç?¨ä¸­"
 
-#: ../gp11/gp11-misc.c:183
+#: ../gck/gck-misc.c:183
 msgid "The session is invalid"
 msgstr "該ä½?業é??段æ?¯ç?¡æ??ç??"
 
-#: ../gp11/gp11-misc.c:185
+#: ../gck/gck-misc.c:185
 msgid "The session is read-only"
 msgstr "æ­¤ä½?業é??段æ?¯å?¯è®?ç??"
 
-#: ../gp11/gp11-misc.c:187
+#: ../gck/gck-misc.c:187
 msgid "An open session exists"
 msgstr "å·²å­?å?¨é??å??ç??ä½?業é??段"
 
-#: ../gp11/gp11-misc.c:189
+#: ../gck/gck-misc.c:189
 msgid "A read-only session exists"
 msgstr "å·²å­?å?¨ä¸?å??å?¯è®?ç??ä½?業é??段"
 
-#: ../gp11/gp11-misc.c:191
+#: ../gck/gck-misc.c:191
 msgid "An administrator session exists"
 msgstr "å·²å­?å?¨ç³»çµ±ç®¡ç??è??ä½?業é??段"
 
-#: ../gp11/gp11-misc.c:193
+#: ../gck/gck-misc.c:193
 msgid "The signature is bad or corrupted"
 msgstr "此簽署ä¸?è?¯æ??å·²æ??æ¯?"
 
-#: ../gp11/gp11-misc.c:195
+#: ../gck/gck-misc.c:195
 msgid "The signature is unrecognized or corrupted"
 msgstr "此簽署ç?¡æ³?辨è­?æ??å·²æ??æ¯?"
 
-#: ../gp11/gp11-misc.c:197
+#: ../gck/gck-misc.c:197
 msgid "Certain required fields are missing"
 msgstr "æ¼?æ??æ??äº?å¿?è¦?ç??æ¬?ä½?"
 
-#: ../gp11/gp11-misc.c:199
+#: ../gck/gck-misc.c:199
 msgid "Certain fields have invalid values"
 msgstr "æ??äº?æ¬?ä½?æ??ç?¡æ??ç??æ?¸å?¼"
 
-#: ../gp11/gp11-misc.c:201
+#: ../gck/gck-misc.c:201
 msgid "The device is not present or unplugged"
 msgstr "æ­¤è£?ç½®æ²?æ??å?ºç?¾æ??å·²æ??é?¤"
 
-#: ../gp11/gp11-misc.c:203
+#: ../gck/gck-misc.c:203
 msgid "The device is invalid or unrecognizable"
 msgstr "æ­¤è£?ç½®ç?¡æ??æ??ç?¡æ³?辨è­?"
 
-#: ../gp11/gp11-misc.c:205
+#: ../gck/gck-misc.c:205
 msgid "The device is write protected"
 msgstr "æ­¤è£?ç½®ç?ºå¯«å?¥ä¿?è­·ç??æ??"
 
-#: ../gp11/gp11-misc.c:207
+#: ../gck/gck-misc.c:207
 msgid "Cannot import because the key is invalid"
 msgstr "ç?±æ?¼å¯?碼å??ç?¡æ??æ??ä¸?è?½å?¯å?¥"
 
-#: ../gp11/gp11-misc.c:209
+#: ../gck/gck-misc.c:209
 msgid "Cannot import because the key is of the wrong size"
 msgstr "ç?±æ?¼å¯?碼å??大å°?é?¯èª¤æ??ä¸?è?½å?¯å?¥"
 
-#: ../gp11/gp11-misc.c:211
+#: ../gck/gck-misc.c:211
 msgid "Cannot import because the key is of the wrong type"
 msgstr "ç?±æ?¼å¯?碼å??é¡?å??é?¯èª¤æ??ä¸?è?½å?¯å?¥"
 
-#: ../gp11/gp11-misc.c:213
+#: ../gck/gck-misc.c:213
 msgid "You are already logged in"
 msgstr "你已���"
 
-#: ../gp11/gp11-misc.c:215
+#: ../gck/gck-misc.c:215
 msgid "No user has logged in"
 msgstr "æ²?æ??使ç?¨è??å·²ç?»å?¥"
 
-#: ../gp11/gp11-misc.c:217
+#: ../gck/gck-misc.c:217
 msgid "The user's password or PIN is not set"
 msgstr "該使ç?¨è??ç??å¯?碼æ?? PIN å°?æ?ªè¨­å®?"
 
-#: ../gp11/gp11-misc.c:219
+#: ../gck/gck-misc.c:219
 msgid "The user is of an invalid type"
 msgstr "該使ç?¨è??ç?ºç?¡æ??ç??é¡?å??"
 
-#: ../gp11/gp11-misc.c:221
+#: ../gck/gck-misc.c:221
 msgid "Another user is already logged in"
 msgstr "å?¦ä¸?å??使ç?¨è??å·²ç¶?ç?»å?¥"
 
-#: ../gp11/gp11-misc.c:223
-msgid "Too many users of different types logged in"
+#: ../gck/gck-misc.c:223
+msgid "Too many users of different types are logged in"
 msgstr "太å¤?ä¸?å??é¡?å??ç??使ç?¨è??å·²ç?»å?¥"
 
-#: ../gp11/gp11-misc.c:225
+#: ../gck/gck-misc.c:225
 msgid "Cannot import an invalid key"
 msgstr "ä¸?è?½å?¯å?¥ç?¡æ??ç??å¯?碼å??"
 
-#: ../gp11/gp11-misc.c:227
+#: ../gck/gck-misc.c:227
 msgid "Cannot import a key of the wrong size"
 msgstr "ä¸?è?½å?¯å?¥å¤§å°?é?¯èª¤ç??å¯?碼å??"
 
-#: ../gp11/gp11-misc.c:229
+#: ../gck/gck-misc.c:229
 msgid "Cannot export because the key is invalid"
 msgstr "ç?±æ?¼å¯?碼å??ç?¡æ??æ??ä¸?è?½å?¯å?º"
 
-#: ../gp11/gp11-misc.c:231
+#: ../gck/gck-misc.c:231
 msgid "Cannot export because the key is of the wrong size"
 msgstr "ç?±æ?¼å¯?碼å??大å°?é?¯èª¤æ??ä¸?è?½å?¯å?º"
 
-#: ../gp11/gp11-misc.c:233
+#: ../gck/gck-misc.c:233
 msgid "Cannot export because the key is of the wrong type"
 msgstr "ç?±æ?¼å¯?碼å??é¡?å??é?¯èª¤æ??ä¸?è?½å?¯å?º"
 
-#: ../gp11/gp11-misc.c:235
+#: ../gck/gck-misc.c:235
 msgid "Unable to initialize the random number generator"
 msgstr "ç?¡æ³?å??å§?å??äº?æ?¸ç?¢ç??å?¨"
 
-#: ../gp11/gp11-misc.c:237
+#: ../gck/gck-misc.c:237
 msgid "No random number generator available"
 msgstr "æ²?æ??å?¯ç?¨ç??äº?æ?¸ç?¢ç??å?¨"
 
-#: ../gp11/gp11-misc.c:239
+#: ../gck/gck-misc.c:239
 msgid "The crypto mechanism has an invalid parameter"
 msgstr "該å? å¯?æ©?å?¶æ??ç?¡æ??ç??å??æ?¸"
 
-#: ../gp11/gp11-misc.c:241
+#: ../gck/gck-misc.c:241
 msgid "Not enough space to store the result"
 msgstr "æ²?æ??足夠ç??空é??ä¾?å?²å­?çµ?æ??"
 
-#: ../gp11/gp11-misc.c:243
+#: ../gck/gck-misc.c:243
 msgid "The saved state is invalid"
 msgstr "å?²å­?ç??ç??æ??ç?¡æ??"
 
-#: ../gp11/gp11-misc.c:245
+#: ../gck/gck-misc.c:245
 msgid "The information is sensitive and cannot be revealed"
 msgstr "æ­¤è³?è¨?é??å??å??大å°?寫並ä¸?ä¸?æ??顯示å?¶å¯¦é??å?¼"
 
-#: ../gp11/gp11-misc.c:247
+#: ../gck/gck-misc.c:247
 msgid "The state cannot be saved"
 msgstr "æ­¤ç??æ??ä¸?è?½å?²å­?"
 
-#: ../gp11/gp11-misc.c:249
+#: ../gck/gck-misc.c:249
 msgid "The module has not been initialized"
 msgstr "模çµ?å°?æ?ªå??å§?å??"
 
-#: ../gp11/gp11-misc.c:251
+#: ../gck/gck-misc.c:251
 msgid "The module has already been initialized"
 msgstr "模çµ?å·²ç¶?å??å§?å??äº?"
 
-#: ../gp11/gp11-misc.c:253
+#: ../gck/gck-misc.c:253
 msgid "Cannot lock data"
 msgstr "ä¸?è?½é??å®?è³?æ??"
 
-#: ../gp11/gp11-misc.c:255
+#: ../gck/gck-misc.c:255
 msgid "The data cannot be locked"
 msgstr "該è³?æ??ä¸?è?½é??å®?"
 
-#: ../gp11/gp11-misc.c:257
+#: ../gck/gck-misc.c:257
 msgid "The signature request was rejected by the user"
 msgstr "簽署ç??è¦?æ±?被使ç?¨è??æ??çµ?"
 
-#: ../gp11/gp11-misc.c:261
+#: ../gck/gck-misc.c:261
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../pkcs11/gkm/gkm-certificate.c:726
+#: ../pkcs11/gkm/gkm-certificate.c:572
 msgid "Unnamed Certificate"
 msgstr "æ?ªå?½å??ç??è­?æ?¸"
 
@@ -858,193 +854,263 @@ msgid "Couldn't parse public SSH key"
 msgstr "ç?¡æ³?解æ?? SSH å?¬é??å¯?碼å??ã??"
 
 #. Get the label ready
-#: ../pkcs11/wrap-layer/gkm-wrap-login.c:317
+#: ../pkcs11/wrap-layer/gkm-wrap-login.c:343
 #, c-format
 msgid "Unlock password for: %s"
 msgstr "解é??å¯?碼ç?¨æ?¼ï¼?%s"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:88
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:779
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:90
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:801
 msgid "The unlock password was incorrect"
 msgstr "解é??ç??å¯?碼æ?¯é?¯èª¤ç??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:606
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:634
 msgid "Unlock Login Keyring"
 msgstr "解é??ç?»å?¥å¯?碼å??å??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:608
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:636
 msgid "Enter password to unlock your login keyring"
 msgstr "è«?輸å?¥è§£é??ç?»å?¥å¯?碼å??å??ç??å¯?碼"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:612
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:640
 msgid ""
 "The password you use to log in to your computer no longer matches that of "
 "your login keyring."
 msgstr "ä½ ç?¨ä¾?ç?»å?¥é?»è?¦ç??å¯?碼已å??ç?»å?¥å¯?碼å??å??ä¸?符ã??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:614
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:642
 msgid ""
 "The login keyring did not get unlocked when you logged into your computer."
 msgstr "ä½ ç??ç?»å?¥å¯?碼å??å??並æ?ªå?¨ç?»å?¥ä½ ç??é?»è?¦æ??è?ªå??解é??ã??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:632
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:660
 msgid "Unlock Keyring"
 msgstr "解é??å¯?碼å??å??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:634
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:662
 #, c-format
 msgid "Enter password for keyring '%s' to unlock"
 msgstr "輸å?¥å¯?碼å??å??â??%sâ??ç??å¯?碼ï¼?ä½?ç?ºé??é??ä¹?ç?¨"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:638
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:666
 #, c-format
 msgid "An application wants access to the keyring '%s', but it is locked"
 msgstr "æ??ç¨?å¼?è¦?æ±?å­?å??å¯?碼å??å??ã??%sã??ï¼?ä½?æ?¯å®?已被é??å®?"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:661
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:686
 msgid "Unlock private key"
 msgstr "解é??ç§?å¯?å¯?碼å??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:663
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:688
 msgid "Unlock certificate"
 msgstr "解é??è­?æ?¸"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:665
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:690
 msgid "Unlock public key"
 msgstr "解é??å?¬é??å¯?碼å??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:667
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:692
 msgid "Unlock"
 msgstr "解é??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:680
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:705
 msgid "Enter password to unlock the public key"
 msgstr "輸å?¥è§£é??å?¬é??å¯?碼å??ç??å¯?碼"
 
 #. TRANSLATORS: The private key is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:692
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:717
 #, c-format
 msgid "An application wants access to the private key '%s', but it is locked"
 msgstr "ä¸?å??ç¨?å¼?è¦?æ±?å­?å??ç§?å¯?å¯?碼å??â??%sâ??ï¼?ä½?å®?已被é??ä¸?"
 
 #. TRANSLATORS: The certificate is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:695
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:720
 #, c-format
 msgid "An application wants access to the certificate '%s', but it is locked"
 msgstr "ä¸?å??ç¨?å¼?è¦?æ±?å­?å??è­?æ?¸â??%sâ??ï¼?ä½?å®?已被é??ä¸?"
 
 #. TRANSLATORS: The public key is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:698
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:723
 #, c-format
 msgid "An application wants access to the public key '%s', but it is locked"
 msgstr "ä¸?å??ç¨?å¼?è¦?æ±?å­?å??å?¬é??å¯?碼å??â??%sâ??ï¼?ä½?å®?已被é??ä¸?"
 
 #. TRANSLATORS: The object '%s' is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:701
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:726
 #, c-format
 msgid "An application wants access to '%s', but it is locked"
 msgstr "ä¸?å??ä¸?æ??ç??ç¨?å¼?è¦?æ±?å­?å??â??%sâ??ï¼?ä½?å®?已被é??ä¸?"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:800
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:822
 msgid "Unlock certificate/key storage"
 msgstr "解é??è­?æ?¸/å¯?碼å??å?²å­?å??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:801
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:823
 msgid "Enter password to unlock the certificate/key storage"
 msgstr "輸å?¥è§£é??è­?æ?¸/å¯?碼å??å?²å­?å??ç??å¯?碼"
 
 #. TRANSLATORS: The storage is locked, and needs unlocking before the application can use it.
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:804
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:826
 #, c-format
 msgid ""
 "An application wants access to the certificate/key storage '%s', but it is "
 "locked"
 msgstr "ä¸?å??ç¨?å¼?è¦?æ±?å­?å??è­?æ?¸/å¯?碼å??å?²å­?å??ã??%sã??ï¼?ä½?å®?已被é??ä¸?"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1039
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1132
 msgid "New Password Required"
 msgstr "è¦?æ±?æ?°ç??å¯?碼"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1040
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1133
 msgid "New password required for secure storage"
 msgstr "å®?å?¨å?²å­?å??è¦?æ±?æ?°ç??å¯?碼"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1042
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1135
 #, c-format
 msgid ""
 "In order to prepare '%s' for storage of certificates or keys, a password is "
 "required"
 msgstr "ç?ºäº?æº?å??ç?¨ä¾?å?²å­?è­?æ?¸æ??å¯?碼å??ç??ã??%sã??ï¼?å¯?碼æ?¯å¿?è¦?ç??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1164
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1258
 msgid "Change Password"
 msgstr "���碼"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1165
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1259
 msgid "Change password for secure storage"
 msgstr "æ?¹è®?å®?å?¨å?²å­?å??ç??å¯?碼"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1167
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1261
 #, c-format
 msgid ""
 "To change the password for '%s', the original and new passwords are required"
 msgstr "è¦?æ?¹è®?ã??%sã??ç??å¯?碼ï¼?é??è¦?å??ä¾?ç??å¯?碼å??æ?°ç??å¯?碼"
 
-#: ../ui/gku-prompt-tool.c:547
+#: ../tool/gkr-tool.c:102
+#, c-format
+msgid "usage: gnome-keyring command [options]\n"
+msgstr "���gnome-keyring command [options]\n"
+
+#: ../tool/gkr-tool.c:104
+msgid "commands: "
+msgstr "�令�"
+
+#. Translators: keep same length as translated message "commands: "
+#: ../tool/gkr-tool.c:108
+msgid "          "
+msgstr "   "
+
+#: ../ui/gku-prompt-tool.c:538
 msgid "Store passwords unencrypted?"
 msgstr "æ?¯å?¦å?²å­?ä¸?å? å¯?ç??å¯?碼ï¼?"
 
-#: ../ui/gku-prompt-tool.c:548
+#: ../ui/gku-prompt-tool.c:539
 msgid ""
 "By choosing to use a blank password, your stored passwords will not be "
 "safely encrypted. They will be accessible by anyone with access to your "
 "files."
 msgstr "è?¥é?¸æ??使ç?¨ç©ºç?½å¯?碼ï¼?ä½ æ??å?²å­?ç??å¯?碼å°?ä¸?æ??被å®?å?¨ç??å? å¯?ã??ä»»ä½?è?½å­?å??ä½ ç??æª?æ¡?ç??人é?½å°?è?½ç??å?°é??äº?å¯?碼ã??"
 
-#: ../ui/gku-prompt-tool.c:555
+#: ../ui/gku-prompt-tool.c:546
 msgid "Use Unsafe Storage"
 msgstr "使ç?¨ä¸?å®?å?¨ç??å?²å­?"
 
-#: ../ui/gku-prompt-tool.c:593
+#: ../ui/gku-prompt-tool.c:584
 msgid "Passwords do not match."
 msgstr "å¯?碼ä¸?ç?¸ç¬¦ã??"
 
-#: ../ui/gku-prompt-tool.c:603
+#: ../ui/gku-prompt-tool.c:594
 msgid "Password cannot be blank"
 msgstr "�碼��空�"
 
 #: ../ui/gku-prompt.ui.h:1
-msgid "Automatically unlock this keyring whenever I'm logged in"
-msgstr "ç?¶æ??ç?»å?¥æ??è?ªå??解é??å¯?碼å??å??"
-
-#: ../ui/gku-prompt.ui.h:2
 msgid "New password strength"
 msgstr "æ?°å¯?碼ç??強度"
 
-#: ../ui/gku-prompt.ui.h:3
+#: ../ui/gku-prompt.ui.h:2
 msgid "_Application:"
 msgstr "æ??ç?¨ç¨?å¼?(_A):"
 
-#: ../ui/gku-prompt.ui.h:4
+#: ../ui/gku-prompt.ui.h:3
 msgid "_Confirm:"
 msgstr "確�(_C):"
 
-#: ../ui/gku-prompt.ui.h:5
+#: ../ui/gku-prompt.ui.h:4
 msgid "_Details:"
 msgstr "詳細è³?æ??(_D):"
 
-#: ../ui/gku-prompt.ui.h:6
+#: ../ui/gku-prompt.ui.h:5
 msgid "_Name:"
 msgstr "å??稱(_N):"
 
-#: ../ui/gku-prompt.ui.h:7
+#: ../ui/gku-prompt.ui.h:6
 msgid "_Old Password:"
 msgstr "è??å¯?碼(_O):"
 
-#: ../ui/gku-prompt.ui.h:8
+#: ../ui/gku-prompt.ui.h:7
 msgid "_Password:"
 msgstr "�碼(_P):"
 
+#~ msgid "Email"
+#~ msgstr "���件"
+
+#~ msgid "<i>Not Part of Certificate</i>"
+#~ msgstr "<i>ä¸?æ?¯æ??è­?ç??é?¨ä»½</i>"
+
+#~ msgid "<i>unknown</i>"
+#~ msgstr "<i>ä¸?æ??</i>"
+
+#~ msgid "<Not Part of Certificate>"
+#~ msgstr "<ä¸?æ?¯æ??è­?ç??é?¨ä»½>"
+
+#~ msgid "<b>Fingerprints</b>"
+#~ msgstr "<b>æ?¸ä½?æ??ç´?</b>"
+
+#~ msgid "<b>Issued By</b>"
+#~ msgstr "<b>ç?¼è¡?è??:</b>"
+
+#~ msgid "<b>Issued To</b>"
+#~ msgstr "<b>�給:</b>"
+
+#~ msgid "<b>This certificate has been verified for the following uses:</b>"
+#~ msgstr "<b>æ­¤æ??è­?å·²ç¶?檢é©?å?¯ç?¨æ?¼ä¸?å??ç?¨é??:</b>"
+
+#~ msgid "<b>Validity</b>"
+#~ msgstr "<b>æ??å??</b>"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "ä¸?è?¬å??稱 (CN)"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "é?»å­?é?µä»¶æ?¶ä»¶è??æ??è­?"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "é?»å­?é?µä»¶ç°½ç½²è??æ??è­?"
+
+#~ msgid "Issued On"
+#~ msgstr "ç?¼ç?§æ?¥æ??"
+
+#~ msgid "MD5 Fingerprint"
+#~ msgstr "MD5 æ?¸ä½?æ??ç´?"
+
+#~ msgid "Organization (O)"
+#~ msgstr "çµ?ç¹? (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "���� (OU)"
+
+#~ msgid "SHA1 Fingerprint"
+#~ msgstr "SHA1 æ?¸ä½?æ??ç´?"
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "SSL 客æ?¶ç«¯æ??è­?"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "SSL 伺æ??å?¨æ??è­?"
+
+#~ msgid "<span size='large' weight='bold'>Import Certificates and Keys</span>"
+#~ msgstr "<span size='large' weight='bold'>å?¯å?¥æ??è­?å??é??é?°</span>"
+
 #~ msgid ""
 #~ "This option enables the PKCS#11 component in the gnome-keyring daemon. It "
 #~ "only takes effect during startup with gnome-session, (ie: when the user "
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d70d6db..96d2650 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,12 +4,13 @@
 # Chao-Hsiung Liao  <j_h_liau yahoo com tw>, 2008, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-keyring 2.31.92\n"
+"Project-Id-Version: gnome-keyring 2.91.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-05 19:27+0800\n"
-"PO-Revision-Date: 2010-09-04 16:29+0800\n"
+"POT-Creation-Date: 2011-02-04 12:53+0800\n"
+"PO-Revision-Date: 2011-02-04 08:16+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,8 +19,8 @@ msgstr ""
 #. TRANSLATORS: This is the label for an keyring created without a label
 #: ../daemon/dbus/gkd-secret-change.c:78 ../daemon/dbus/gkd-secret-create.c:74
 #: ../pkcs11/secret-store/gkm-secret-collection.c:325
-#: ../pkcs11/wrap-layer/gkm-wrap-login.c:317
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:767
+#: ../pkcs11/wrap-layer/gkm-wrap-login.c:343
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:789
 msgid "Unnamed"
 msgstr "æ?ªå?½å??ç??"
 
@@ -90,34 +91,35 @@ msgstr "GNOME é?°å??å??ï¼?GPG 代ç??ç¨?å¼?"
 msgid "GPG Password Agent"
 msgstr "GPG å¯?碼代ç??ç¨?å¼?"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:102
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:104 ../gcr/gcr-key-renderer.c:291
+#: ../gcr/gcr-key-renderer.c:296
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:200
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:199
 #, c-format
 msgid "PGP Key: %s"
 msgstr "PGP é??é?°ï¼?%s"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:303
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:304
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:348
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:349
 msgid "Enter Passphrase"
 msgstr "輸���"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:341
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:383
 msgid "Forget this password if idle for"
 msgstr "å¿?è¨?é??å??å¯?碼æ?¼é??ç½®"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:342
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:384
 msgid "Forget this password after"
 msgstr "å¿?è¨?é??å??å¯?碼æ?¼"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:343
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:385
 msgid "Forget this password when I log out"
 msgstr "ç?¶æ??ç?»å?ºæ??å¿?è¨?é??å??å¯?碼"
 
 #. TRANSLATORS: This is the display label for the login keyring
-#: ../daemon/login/gkd-login.c:159
+#: ../daemon/login/gkd-login.c:147
 msgid "Login"
 msgstr "��"
 
@@ -130,8 +132,8 @@ msgid "User ID"
 msgstr "使ç?¨è?? ID"
 
 #: ../egg/egg-oid.c:46
-msgid "Email"
-msgstr "���件"
+msgid "Email Address"
+msgstr "é?»å­?é?µä»¶ä½?å??"
 
 #: ../egg/egg-oid.c:54
 msgid "Date of Birth"
@@ -161,8 +163,7 @@ msgstr "æ?®é??å??稱"
 msgid "Surname"
 msgstr "�"
 
-#: ../egg/egg-oid.c:69 ../gcr/gcr-certificate-basics-widget.ui.h:18
-#: ../gcr/gcr-certificate-details-widget.c:318
+#: ../egg/egg-oid.c:69 ../gcr/gcr-certificate-renderer.c:379
 msgid "Serial Number"
 msgstr "åº?è??"
 
@@ -218,7 +219,7 @@ msgstr "DN 辨è­?符è??"
 msgid "Pseudonym"
 msgstr "ç­?å??"
 
-#: ../egg/egg-oid.c:98
+#: ../egg/egg-oid.c:98 ../gcr/gcr-key-renderer.c:287
 msgid "RSA"
 msgstr "RSA"
 
@@ -234,7 +235,7 @@ msgstr "MD5 é?? RSA å? å¯?"
 msgid "SHA1 with RSA"
 msgstr "SHA1 é?? RSA å? å¯?"
 
-#: ../egg/egg-oid.c:107
+#: ../egg/egg-oid.c:107 ../gcr/gcr-key-renderer.c:289
 msgid "DSA"
 msgstr "DSA ��"
 
@@ -252,176 +253,115 @@ msgstr "ç?¶ select() å¾?å­?ç¨?åº?è®?å??è³?æ??æ??ç?¼ç??æ?ªé ?æ??ç??é?¯èª¤ (%s)"
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "waitpid() ç?¼ç??æ?ªé ?æ??ç??é?¯èª¤ (%s)"
 
-#: ../gcr/gcr-certificate-basics-widget.c:59
-msgid "<i>Not Part of Certificate</i>"
-msgstr "<i>ä¸?æ?¯æ??è­?ç??é?¨ä»½</i>"
-
-#: ../gcr/gcr-certificate-basics-widget.c:80
-msgid "<i>unknown</i>"
-msgstr "<i>ä¸?æ??</i>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:1
-msgid "<Not Part of Certificate>"
-msgstr "<ä¸?æ?¯æ??è­?ç??é?¨ä»½>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:2
-msgid "<b>Fingerprints</b>"
-msgstr "<b>æ?¸ä½?æ??ç´?</b>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:3
-msgid "<b>Issued By</b>"
-msgstr "<b>ç?¼è¡?è??:</b>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:4
-msgid "<b>Issued To</b>"
-msgstr "<b>�給:</b>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:5
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>æ­¤æ??è­?å·²ç¶?檢é©?å?¯ç?¨æ?¼ä¸?å??ç?¨é??:</b>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:6
-msgid "<b>Validity</b>"
-msgstr "<b>æ??å??</b>"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:7
-msgid "Common Name (CN)"
-msgstr "ä¸?è?¬å??稱 (CN)"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:8
-msgid "Email Recipient Certificate"
-msgstr "é?»å­?é?µä»¶æ?¶ä»¶è??æ??è­?"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:9
-msgid "Email Signer Certificate"
-msgstr "é?»å­?é?µä»¶ç°½ç½²è??æ??è­?"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:10
-msgid "Expires On"
-msgstr "å?°æ??æ?¥æ??"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:11
-msgid "Issued On"
-msgstr "ç?¼ç?§æ?¥æ??"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:12
-msgid "MD5 Fingerprint"
-msgstr "MD5 æ?¸ä½?æ??ç´?"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:13
-msgid "Organization (O)"
-msgstr "çµ?ç¹? (O)"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:14
-msgid "Organizational Unit (OU)"
-msgstr "���� (OU)"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:15
-msgid "SHA1 Fingerprint"
-msgstr "SHA1 æ?¸ä½?æ??ç´?"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:16
-msgid "SSL Client Certificate"
-msgstr "SSL 客æ?¶ç«¯æ??è­?"
-
-#: ../gcr/gcr-certificate-basics-widget.ui.h:17
-msgid "SSL Server Certificate"
-msgstr "SSL 伺æ??å?¨æ??è­?"
+#: ../gcr/gcr-certificate-renderer.c:82 ../gcr/gcr-parser.c:201
+msgid "Certificate"
+msgstr "æ??è­?"
 
-#: ../gcr/gcr-certificate-details-widget.c:203
+#: ../gcr/gcr-certificate-renderer.c:107
 msgid "Extension"
 msgstr "延伸"
 
-#: ../gcr/gcr-certificate-details-widget.c:208
+#: ../gcr/gcr-certificate-renderer.c:112
 msgid "Identifier"
 msgstr "��碼"
 
-#: ../gcr/gcr-certificate-details-widget.c:216
+#: ../gcr/gcr-certificate-renderer.c:120
 msgid "Value"
 msgstr "��"
 
-#: ../gcr/gcr-certificate-details-widget.c:224
+#: ../gcr/gcr-certificate-renderer.c:126
 msgid "Critical"
 msgstr "é??è¦?"
 
-#: ../gcr/gcr-certificate-details-widget.c:224
+#: ../gcr/gcr-certificate-renderer.c:126
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../gcr/gcr-certificate-details-widget.c:224
+#: ../gcr/gcr-certificate-renderer.c:126
 msgid "No"
 msgstr "å?¦"
 
+#: ../gcr/gcr-certificate-renderer.c:339
+msgid "Identity"
+msgstr "身å??"
+
+#: ../gcr/gcr-certificate-renderer.c:343
+msgid "Verified by"
+msgstr "檢é©?è??"
+
+#: ../gcr/gcr-certificate-renderer.c:350
+msgid "Expires"
+msgstr "å?°æ??"
+
 #. The subject
-#: ../gcr/gcr-certificate-details-widget.c:299
+#: ../gcr/gcr-certificate-renderer.c:360
 msgid "Subject Name"
 msgstr "主æ?¨å??稱"
 
 #. The Issuer
-#: ../gcr/gcr-certificate-details-widget.c:303
+#: ../gcr/gcr-certificate-renderer.c:364
 msgid "Issuer Name"
 msgstr "ç?¼ç?§è??å??稱"
 
 #. The Issued Parameters
-#: ../gcr/gcr-certificate-details-widget.c:307
+#: ../gcr/gcr-certificate-renderer.c:368
 msgid "Issued Certificate"
 msgstr "已簽ç?¼ç??æ??è­?"
 
-#: ../gcr/gcr-certificate-details-widget.c:312
+#: ../gcr/gcr-certificate-renderer.c:373
 msgid "Version"
 msgstr "ç??æ?¬"
 
-#: ../gcr/gcr-certificate-details-widget.c:325
+#: ../gcr/gcr-certificate-renderer.c:387
 msgid "Not Valid Before"
 msgstr "å?¨æ­¤ä¹?å??ç?¡æ??"
 
-#: ../gcr/gcr-certificate-details-widget.c:330
+#: ../gcr/gcr-certificate-renderer.c:392
 msgid "Not Valid After"
 msgstr "å?¨æ­¤ä¹?å¾?ç?¡æ??"
 
-#. Signature
-#: ../gcr/gcr-certificate-details-widget.c:335
-#: ../gcr/gcr-certificate-details-widget.c:351
-msgid "Signature"
-msgstr "簽章"
-
-#: ../gcr/gcr-certificate-details-widget.c:339
+#: ../gcr/gcr-certificate-renderer.c:401
 msgid "Signature Algorithm"
 msgstr "æ??è­?簽章æ¼?ç®?æ³?"
 
-#: ../gcr/gcr-certificate-details-widget.c:344
+#: ../gcr/gcr-certificate-renderer.c:406
 msgid "Signature Parameters"
 msgstr "簽章å??æ?¸"
 
+#: ../gcr/gcr-certificate-renderer.c:413
+msgid "Signature"
+msgstr "簽章"
+
 #. Public Key Info
-#: ../gcr/gcr-certificate-details-widget.c:355
+#: ../gcr/gcr-certificate-renderer.c:418
 msgid "Public Key Info"
 msgstr "å?¬é??é??é?°è³?è¨?"
 
-#: ../gcr/gcr-certificate-details-widget.c:359
+#: ../gcr/gcr-certificate-renderer.c:423
 msgid "Key Algorithm"
 msgstr "é??é?°æ¼?ç®?æ³?"
 
-#: ../gcr/gcr-certificate-details-widget.c:364
+#: ../gcr/gcr-certificate-renderer.c:429
 msgid "Key Parameters"
 msgstr "é??é?°å??æ?¸"
 
-#: ../gcr/gcr-certificate-details-widget.c:371
+#: ../gcr/gcr-certificate-renderer.c:436
 msgid "Key Size"
 msgstr "é??é?°å¤§å°?"
 
-#: ../gcr/gcr-certificate-details-widget.c:378 ../gcr/gcr-parser.c:203
+#: ../gcr/gcr-certificate-renderer.c:444 ../gcr/gcr-key-renderer.c:271
+#: ../gcr/gcr-parser.c:204
 msgid "Public Key"
 msgstr "å?¬é??é??é?°"
 
 #. Fingerprints
-#: ../gcr/gcr-certificate-details-widget.c:383
+#: ../gcr/gcr-certificate-renderer.c:449
 msgid "Fingerprints"
 msgstr "æ?¸ä½?æ??ç´?"
 
 #: ../gcr/gcr-import-dialog.ui.h:1
-msgid "<span size='large' weight='bold'>Import Certificates and Keys</span>"
-msgstr "<span size='large' weight='bold'>å?¯å?¥æ??è­?å??é??é?°</span>"
+msgid "Import Certificates and Keys"
+msgstr "å?¯å?¥æ??è­?å??é??é?°"
 
 #: ../gcr/gcr-import-dialog.ui.h:2
 msgid "Import Into:"
@@ -432,424 +372,480 @@ msgid "Password:"
 msgstr "�碼:"
 
 #: ../gcr/gcr-unlock-options-widget.ui.h:1
+msgid "Automatically unlock this keyring whenever I'm logged in"
+msgstr "ç?¶æ??ç?»å?¥æ??è?ªå??解é??é?°å??å??"
+
+#: ../gcr/gcr-unlock-options-widget.ui.h:2
 msgid "Lock this keyring after"
 msgstr "é??å®?é??å??é?°å??å??æ?¼"
 
-#: ../gcr/gcr-unlock-options-widget.ui.h:2
+#: ../gcr/gcr-unlock-options-widget.ui.h:3
 msgid "Lock this keyring if idle for"
 msgstr "é??å®?é??å??é?°å??å??æ?¼é??ç½®"
 
-#: ../gcr/gcr-unlock-options-widget.ui.h:3
+#: ../gcr/gcr-unlock-options-widget.ui.h:4
 msgid "Lock this keyring when I log out"
 msgstr "ç?¶æ??ç?»å?ºæ??è?ªå??é??å®?é?°å??å??"
 
-#: ../gcr/gcr-unlock-options-widget.ui.h:4
+#. Translators: The 'minutes' from 'Lock this keyring if idle for x minutes'.
+#: ../gcr/gcr-unlock-options-widget.ui.h:6
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../gcr/gcr-importer.c:163 ../gcr/gcr-parser.c:1565 ../gp11/gp11-misc.c:98
-msgid "The operation was cancelled"
-msgstr "該æ??ä½?å·²å??æ¶?"
-
-#: ../gcr/gcr-importer.c:255
-#, c-format
-msgid "No location available to import to"
-msgstr "æ²?æ??å?¯ç?¨ç??ä½?ç½®å?¯å?¯å?¥"
-
-#: ../gcr/gcr-importer.c:404
-msgid "Import Certificates/Keys"
-msgstr "å?¯å?¥æ??è­?/é??é?°"
-
-#: ../gcr/gcr-importer.c:411
-msgid "Choose a location to store the imported certificates/keys."
-msgstr "é?¸æ??ä¸?å??ç?¨ä¾?å?²å­?å?¯å?¥ç??æ??è­?/é??é?°ç??ä½?ç½®ã??"
-
-#: ../gcr/gcr-importer.c:436 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:676
+#: ../gcr/gcr-importer.c:133 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:701
 msgid "Enter password to unlock the private key"
 msgstr "輸å?¥è§£é??ç§?å¯?é??é?°ç??å¯?碼"
 
-#: ../gcr/gcr-importer.c:438 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:678
+#: ../gcr/gcr-importer.c:135 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:703
 msgid "Enter password to unlock the certificate"
 msgstr "輸å?¥è§£é??æ??è­?ç??å¯?碼"
 
-#: ../gcr/gcr-importer.c:440 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:682
+#: ../gcr/gcr-importer.c:137 ../pkcs11/wrap-layer/gkm-wrap-prompt.c:707
 msgid "Enter password to unlock"
 msgstr "輸å?¥è§£é??ç??å¯?碼"
 
 #. TRANSLATORS: The key is locked.
-#: ../gcr/gcr-importer.c:449
+#: ../gcr/gcr-importer.c:146
 msgid "In order to import the private key, it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥ç§?å¯?é??é?°ï¼?å¿?é ?å??æ??å®?解é??"
 
 #. TRANSLATORS: The certificate is locked.
-#: ../gcr/gcr-importer.c:452
+#: ../gcr/gcr-importer.c:149
 msgid "In order to import the certificate, it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥æ??è­?ï¼?å¿?é ?å??æ??å®?解é??"
 
 #. TRANSLATORS: The data is locked.
-#: ../gcr/gcr-importer.c:455
+#: ../gcr/gcr-importer.c:152
 msgid "In order to import the data, it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥è³?æ??ï¼?å®?å¿?é ?解é??"
 
 #. TRANSLATORS: The key is locked.
-#: ../gcr/gcr-importer.c:460
+#: ../gcr/gcr-importer.c:157
 #, c-format
 msgid "In order to import the private key '%s', it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥ç§?å¯?é??é?°ã??%sã??ï¼?å¿?é ?å??æ??å®?解é??"
 
 #. TRANSLATORS: The certificate is locked.
-#: ../gcr/gcr-importer.c:463
+#: ../gcr/gcr-importer.c:160
 #, c-format
 msgid "In order to import the certificate '%s', it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥æ??è­?ã??%sã??ï¼?å¿?é ?å??æ??å®?解é??"
 
 #. TRANSLATORS: The object '%s' is locked.
-#: ../gcr/gcr-importer.c:466
+#: ../gcr/gcr-importer.c:163
 #, c-format
 msgid "In order to import '%s', it must be unlocked"
 msgstr "ç?ºäº?å?¯å?¥ã??%sã??ï¼?å¿?é ?å??æ??å®?解é??"
 
-#: ../gcr/gcr-parser.c:197
+#: ../gcr/gcr-importer.c:254 ../gcr/gcr-parser.c:1566 ../gcr/gcr-parser.c:1757
+#: ../gck/gck-misc.c:98
+msgid "The operation was cancelled"
+msgstr "該æ??ä½?å·²å??æ¶?"
+
+#: ../gcr/gcr-importer.c:346
+#, c-format
+msgid "No location available to import to"
+msgstr "æ²?æ??å?¯ç?¨ç??ä½?ç½®å?¯å?¯å?¥"
+
+#: ../gcr/gcr-importer.c:495
+msgid "Import Certificates/Keys"
+msgstr "å?¯å?¥æ??è­?/é??é?°"
+
+#: ../gcr/gcr-importer.c:502
+msgid "Choose a location to store the imported certificates/keys."
+msgstr "é?¸æ??ä¸?å??ç?¨ä¾?å?²å­?å?¯å?¥ç??æ??è­?/é??é?°ç??ä½?ç½®ã??"
+
+#: ../gcr/gcr-key-renderer.c:69
+msgid "Key"
+msgstr "é??é?°"
+
+#: ../gcr/gcr-key-renderer.c:260
+msgid "Private RSA Key"
+msgstr "RSA ç§?å¯?é??é?°"
+
+#: ../gcr/gcr-key-renderer.c:262
+msgid "Private DSA Key"
+msgstr "DSA ç§?å¯?é??é?°"
+
+#: ../gcr/gcr-key-renderer.c:264 ../gcr/gcr-parser.c:198
 msgid "Private Key"
 msgstr "ç§?å¯?é??é?°"
 
-#: ../gcr/gcr-parser.c:200
-msgid "Certificate"
-msgstr "æ??è­?"
+#: ../gcr/gcr-key-renderer.c:267 ../gcr/gcr-key-renderer.c:269
+msgid "Public DSA Key"
+msgstr "DSA å?¬é??é??é?°"
+
+#: ../gcr/gcr-key-renderer.c:278
+#, c-format
+msgid "%d bit"
+msgid_plural "%d bits"
+msgstr[0] "%d ä½?å??"
 
-#: ../gcr/gcr-parser.c:1568
+#: ../gcr/gcr-key-renderer.c:279
+msgid "Strength"
+msgstr "強度"
+
+#: ../gcr/gcr-key-renderer.c:292
+msgid "Algorithm"
+msgstr "æ¼?ç®?æ³?"
+
+#: ../gcr/gcr-key-renderer.c:299
+msgid "Size"
+msgstr "大�"
+
+#. TODO: We need to have consistent key fingerprints.
+#: ../gcr/gcr-key-renderer.c:303
+msgid "Fingerprint"
+msgstr "æ?¸ä½?æ??ç´?"
+
+#: ../gcr/gcr-parser.c:1569
 msgid "Unrecognized or unsupported data."
 msgstr "ç?¡æ³?辨è­?æ??ä¸?æ?¯æ?´ç??è³?æ??ã??"
 
-#: ../gcr/gcr-parser.c:1571
+#: ../gcr/gcr-parser.c:1572
 msgid "Could not parse invalid or corrupted data."
 msgstr "ç?¡æ³?解æ??ç?¡æ??æ??æ??æ¯?ç??è³?æ??ã??"
 
-#: ../gcr/gcr-parser.c:1574
+#: ../gcr/gcr-parser.c:1575
 msgid "The data is locked"
 msgstr "è³?æ??已被é??å®?"
 
-#: ../gp11/gp11-misc.c:101
+#: ../gcr/gcr-trust.c:417
+#, c-format
+msgid "Couldn't find a place to store the pinned certificate"
+msgstr "æ?¾ä¸?å?°ä½?ç½®ä¾?å?²å­?å?¯å?¥ç??æ??è­?"
+
+#: ../gck/gck-uri.c:124 ../gck/gck-uri.c:181 ../gck/gck-uri.c:216
+#: ../gck/gck-uri.c:248
+#, c-format
+msgid "The URI has invalid syntax. The '%s' field encoding is invalid."
+msgstr "é??å?? URI æ??ç?¡æ??ç??èª?æ³?ã??ã??%sã??æ¬?ä½?ç??編碼æ?¯ç?¡æ??ç??ã??"
+
+#: ../gck/gck-uri.c:287
+msgid "The URI has does not have the 'pkcs11' scheme."
+msgstr "é??å?? URI æ²?æ??ã??pkcs11ã??schemeã??"
+
+#: ../gck/gck-misc.c:101
 msgid "Insufficient memory available"
 msgstr "æ²?æ??足夠ç??è¨?æ?¶é«?å?¯ç?¨"
 
-#: ../gp11/gp11-misc.c:103
+#: ../gck/gck-misc.c:103
 msgid "The specified slot ID is not valid"
 msgstr "æ??å®?ç??æ??槽 ID æ?¯ç?¡æ??ç??"
 
-#: ../gp11/gp11-misc.c:105
+#: ../gck/gck-misc.c:105
 msgid "Internal error"
 msgstr "å?§é?¨ç??é?¯èª¤"
 
-#: ../gp11/gp11-misc.c:107
+#: ../gck/gck-misc.c:107
 msgid "The operation failed"
 msgstr "æ­¤æ??ä½?失æ??"
 
-#: ../gp11/gp11-misc.c:109
+#: ../gck/gck-misc.c:109
 msgid "Invalid arguments"
 msgstr "ç?¡æ??ç??å¼?æ?¸"
 
-#: ../gp11/gp11-misc.c:111
+#: ../gck/gck-misc.c:111
 msgid "The module cannot create needed threads"
 msgstr "模çµ?ä¸?è?½å»ºç«?æ??é??ç??å?·è¡?ç·?"
 
-#: ../gp11/gp11-misc.c:113
+#: ../gck/gck-misc.c:113
 msgid "The module cannot lock data properly"
 msgstr "模çµ?ä¸?è?½æ­£ç¢ºç??é??å®?è³?æ??"
 
-#: ../gp11/gp11-misc.c:115
+#: ../gck/gck-misc.c:115
 msgid "The field is read-only"
 msgstr "æ­¤æ¬?ä½?æ?¯å?¯è®?ç??"
 
-#: ../gp11/gp11-misc.c:117
+#: ../gck/gck-misc.c:117
 msgid "The field is sensitive and cannot be revealed"
 msgstr "æ­¤æ¬?ä½?é??å??å??大å°?寫並ä¸?ä¸?æ??顯示å?¶å¯¦é??å?¼"
 
-#: ../gp11/gp11-misc.c:119
+#: ../gck/gck-misc.c:119
 msgid "The field is invalid or does not exist"
 msgstr "該æ¬?ä½?ç?¡æ??æ??è??ä¸?å­?å?¨"
 
-#: ../gp11/gp11-misc.c:121
+#: ../gck/gck-misc.c:121
 msgid "Invalid value for field"
 msgstr "å°?æ­¤æ¬?ä½?ç?¡æ??ç??æ?¸å?¼"
 
-#: ../gp11/gp11-misc.c:123
+#: ../gck/gck-misc.c:123
 msgid "The data is not valid or unrecognized"
 msgstr "è³?æ??ç?¡æ??æ??ç?¡æ³?辨è­?"
 
-#: ../gp11/gp11-misc.c:125
+#: ../gck/gck-misc.c:125
 msgid "The data is too long"
 msgstr "è³?æ??太é?·"
 
-#: ../gp11/gp11-misc.c:127
+#: ../gck/gck-misc.c:127
 msgid "An error occurred on the device"
 msgstr "å?¨è£?ç½®ä¸?ç?¼ç??é?¯èª¤"
 
-#: ../gp11/gp11-misc.c:129
-msgid "Insufficient memory available on device"
+#: ../gck/gck-misc.c:129
+msgid "Insufficient memory available on the device"
 msgstr "è£?ç½®ä¸?æ²?æ??足夠ç??è¨?æ?¶é«?"
 
-#: ../gp11/gp11-misc.c:131
+#: ../gck/gck-misc.c:131
 msgid "The device was removed or unplugged"
 msgstr "該è£?置已移å??æ??æ??é?¤äº?"
 
-#: ../gp11/gp11-misc.c:133
+#: ../gck/gck-misc.c:133
 msgid "The encrypted data is not valid or unrecognized"
 msgstr "å·²å? å¯?è³?æ??ç?¡æ??æ??ç?¡æ³?辨è­?"
 
-#: ../gp11/gp11-misc.c:135
+#: ../gck/gck-misc.c:135
 msgid "The encrypted data is too long"
 msgstr "å·²å? å¯?è³?æ??太é?·"
 
-#: ../gp11/gp11-misc.c:137
+#: ../gck/gck-misc.c:137
 msgid "This operation is not supported"
 msgstr "é??å??æ??ä½?æ?¯ä¸?æ?¯æ?´ç??"
 
-#: ../gp11/gp11-misc.c:139
+#: ../gck/gck-misc.c:139
 msgid "The key is missing or invalid"
 msgstr "該é??é?°å·²é?ºå¤±æ??ç?¡æ??"
 
-#: ../gp11/gp11-misc.c:141
+#: ../gck/gck-misc.c:141
 msgid "The key is the wrong size"
 msgstr "該é??é?°ç??大å°?é?¯èª¤"
 
-#: ../gp11/gp11-misc.c:143
+#: ../gck/gck-misc.c:143
 msgid "The key is of the wrong type"
 msgstr "該é??é?°ç??é¡?å??é?¯èª¤"
 
-#: ../gp11/gp11-misc.c:145
+#: ../gck/gck-misc.c:145
 msgid "No key is needed"
 msgstr "ä¸?é??è¦?é??é?°"
 
-#: ../gp11/gp11-misc.c:147
-msgid "The key is different from before"
+#: ../gck/gck-misc.c:147
+msgid "The key is different than before"
 msgstr "æ­¤é??é?°è??å¾?å??ä¸?å??"
 
-#: ../gp11/gp11-misc.c:149
+#: ../gck/gck-misc.c:149
 msgid "A key is needed"
 msgstr "é??è¦?é??é?°"
 
-#: ../gp11/gp11-misc.c:151
-msgid "Cannot include the key in digest"
+#: ../gck/gck-misc.c:151
+msgid "Cannot include the key in the digest"
 msgstr "ä¸?è?½å?¨æ??è¦?中å??å?«é??é?°"
 
-#: ../gp11/gp11-misc.c:153
+#: ../gck/gck-misc.c:153
 msgid "This operation cannot be done with this key"
 msgstr "é??å??æ??ä½?ä¸?è?½ä»¥æ­¤é??é?°é?²è¡?"
 
-#: ../gp11/gp11-misc.c:155
+#: ../gck/gck-misc.c:155
 msgid "The key cannot be wrapped"
 msgstr "é??é?°ä¸?è?½æ?·è¡?"
 
-#: ../gp11/gp11-misc.c:157
+#: ../gck/gck-misc.c:157
 msgid "Cannot export this key"
 msgstr "ä¸?è?½å?¯å?ºé??å??é??é?°"
 
-#: ../gp11/gp11-misc.c:159
+#: ../gck/gck-misc.c:159
 msgid "The crypto mechanism is invalid or unrecognized"
 msgstr "該å? å¯?æ©?å?¶ç?¡æ??æ??ç?¡æ³?辨è­?"
 
-#: ../gp11/gp11-misc.c:161
+#: ../gck/gck-misc.c:161
 msgid "The crypto mechanism has an invalid argument"
 msgstr "該å? å¯?æ©?å?¶æ??ç?¡æ??ç??å¼?æ?¸"
 
-#: ../gp11/gp11-misc.c:163
+#: ../gck/gck-misc.c:163
 msgid "The object is missing or invalid"
 msgstr "該ç?©ä»¶å·²é?ºå¤±æ??ç?¡æ??"
 
-#: ../gp11/gp11-misc.c:165
+#: ../gck/gck-misc.c:165
 msgid "Another operation is already taking place"
 msgstr "å?¦ä¸?å??æ??ä½?å·²å?¨é?²è¡?"
 
-#: ../gp11/gp11-misc.c:167
+#: ../gck/gck-misc.c:167
 msgid "No operation is taking place"
 msgstr "æ²?æ??æ??ä½?æ­£å?¨é?²è¡?"
 
-#: ../gp11/gp11-misc.c:169
+#: ../gck/gck-misc.c:169
 msgid "The password or PIN is incorrect"
 msgstr "æ­¤å¯?碼æ?? PIN æ?¯ä¸?正確ç??"
 
-#: ../gp11/gp11-misc.c:171
+#: ../gck/gck-misc.c:171
 msgid "The password or PIN is invalid"
 msgstr "æ­¤å¯?碼æ?? PIN æ?¯ç?¡æ??ç??"
 
-#: ../gp11/gp11-misc.c:173
+#: ../gck/gck-misc.c:173
 msgid "The password or PIN is of an invalid length"
 msgstr "æ­¤å¯?碼æ?? PIN ç??é?·åº¦ä¸?å??æ³?"
 
-#: ../gp11/gp11-misc.c:175
+#: ../gck/gck-misc.c:175
 msgid "The password or PIN has expired"
 msgstr "æ­¤å¯?碼æ?? PIN å·²é??æ??"
 
-#: ../gp11/gp11-misc.c:177
+#: ../gck/gck-misc.c:177
 msgid "The password or PIN is locked"
 msgstr "æ­¤å¯?碼æ?? PIN 已被é??å®?"
 
-#: ../gp11/gp11-misc.c:179
+#: ../gck/gck-misc.c:179
 msgid "The session is closed"
 msgstr "該ä½?業é??段已é??é??"
 
-#: ../gp11/gp11-misc.c:181
+#: ../gck/gck-misc.c:181
 msgid "Too many sessions are active"
 msgstr "太å¤?ä½?業é??段å?¨ä½¿ç?¨ä¸­"
 
-#: ../gp11/gp11-misc.c:183
+#: ../gck/gck-misc.c:183
 msgid "The session is invalid"
 msgstr "該ä½?業é??段æ?¯ç?¡æ??ç??"
 
-#: ../gp11/gp11-misc.c:185
+#: ../gck/gck-misc.c:185
 msgid "The session is read-only"
 msgstr "æ­¤ä½?業é??段æ?¯å?¯è®?ç??"
 
-#: ../gp11/gp11-misc.c:187
+#: ../gck/gck-misc.c:187
 msgid "An open session exists"
 msgstr "å·²å­?å?¨é??å??ç??ä½?業é??段"
 
-#: ../gp11/gp11-misc.c:189
+#: ../gck/gck-misc.c:189
 msgid "A read-only session exists"
 msgstr "å·²å­?å?¨ä¸?å??å?¯è®?ç??ä½?業é??段"
 
-#: ../gp11/gp11-misc.c:191
+#: ../gck/gck-misc.c:191
 msgid "An administrator session exists"
 msgstr "å·²å­?å?¨ç³»çµ±ç®¡ç??è??ä½?業é??段"
 
-#: ../gp11/gp11-misc.c:193
+#: ../gck/gck-misc.c:193
 msgid "The signature is bad or corrupted"
 msgstr "此簽章ä¸?è?¯æ??å·²æ??æ¯?"
 
-#: ../gp11/gp11-misc.c:195
+#: ../gck/gck-misc.c:195
 msgid "The signature is unrecognized or corrupted"
 msgstr "此簽章ç?¡æ³?辨è­?æ??å·²æ??æ¯?"
 
-#: ../gp11/gp11-misc.c:197
+#: ../gck/gck-misc.c:197
 msgid "Certain required fields are missing"
 msgstr "æ¼?æ??æ??äº?å¿?è¦?ç??æ¬?ä½?"
 
-#: ../gp11/gp11-misc.c:199
+#: ../gck/gck-misc.c:199
 msgid "Certain fields have invalid values"
 msgstr "æ??äº?æ¬?ä½?æ??ç?¡æ??ç??æ?¸å?¼"
 
-#: ../gp11/gp11-misc.c:201
+#: ../gck/gck-misc.c:201
 msgid "The device is not present or unplugged"
 msgstr "æ­¤è£?ç½®æ²?æ??å?ºç?¾æ??å·²æ??é?¤"
 
-#: ../gp11/gp11-misc.c:203
+#: ../gck/gck-misc.c:203
 msgid "The device is invalid or unrecognizable"
 msgstr "æ­¤è£?ç½®ç?¡æ??æ??ç?¡æ³?辨è­?"
 
-#: ../gp11/gp11-misc.c:205
+#: ../gck/gck-misc.c:205
 msgid "The device is write protected"
 msgstr "æ­¤è£?ç½®ç?ºå¯«å?¥ä¿?è­·ç??æ??"
 
-#: ../gp11/gp11-misc.c:207
+#: ../gck/gck-misc.c:207
 msgid "Cannot import because the key is invalid"
 msgstr "ç?±æ?¼é??é?°ç?¡æ??æ??ä¸?è?½å?¯å?¥"
 
-#: ../gp11/gp11-misc.c:209
+#: ../gck/gck-misc.c:209
 msgid "Cannot import because the key is of the wrong size"
 msgstr "ç?±æ?¼é??é?°å¤§å°?é?¯èª¤æ??ä¸?è?½å?¯å?¥"
 
-#: ../gp11/gp11-misc.c:211
+#: ../gck/gck-misc.c:211
 msgid "Cannot import because the key is of the wrong type"
 msgstr "ç?±æ?¼é??é?°é¡?å??é?¯èª¤æ??ä¸?è?½å?¯å?¥"
 
-#: ../gp11/gp11-misc.c:213
+#: ../gck/gck-misc.c:213
 msgid "You are already logged in"
 msgstr "�已���"
 
-#: ../gp11/gp11-misc.c:215
+#: ../gck/gck-misc.c:215
 msgid "No user has logged in"
 msgstr "æ²?æ??使ç?¨è??å·²ç?»å?¥"
 
-#: ../gp11/gp11-misc.c:217
+#: ../gck/gck-misc.c:217
 msgid "The user's password or PIN is not set"
 msgstr "該使ç?¨è??ç??å¯?碼æ?? PIN å°?æ?ªè¨­å®?"
 
-#: ../gp11/gp11-misc.c:219
+#: ../gck/gck-misc.c:219
 msgid "The user is of an invalid type"
 msgstr "該使ç?¨è??ç?ºç?¡æ??ç??é¡?å??"
 
-#: ../gp11/gp11-misc.c:221
+#: ../gck/gck-misc.c:221
 msgid "Another user is already logged in"
 msgstr "å?¦ä¸?å??使ç?¨è??å·²ç¶?ç?»å?¥"
 
-#: ../gp11/gp11-misc.c:223
-msgid "Too many users of different types logged in"
+#: ../gck/gck-misc.c:223
+msgid "Too many users of different types are logged in"
 msgstr "太å¤?ä¸?å??é¡?å??ç??使ç?¨è??å·²ç?»å?¥"
 
-#: ../gp11/gp11-misc.c:225
+#: ../gck/gck-misc.c:225
 msgid "Cannot import an invalid key"
 msgstr "ä¸?è?½å?¯å?¥ç?¡æ??ç??é??é?°"
 
-#: ../gp11/gp11-misc.c:227
+#: ../gck/gck-misc.c:227
 msgid "Cannot import a key of the wrong size"
 msgstr "ä¸?è?½å?¯å?¥å¤§å°?é?¯èª¤ç??é??é?°"
 
-#: ../gp11/gp11-misc.c:229
+#: ../gck/gck-misc.c:229
 msgid "Cannot export because the key is invalid"
 msgstr "ç?±æ?¼é??é?°ç?¡æ??æ??ä¸?è?½å?¯å?º"
 
-#: ../gp11/gp11-misc.c:231
+#: ../gck/gck-misc.c:231
 msgid "Cannot export because the key is of the wrong size"
 msgstr "ç?±æ?¼é??é?°å¤§å°?é?¯èª¤æ??ä¸?è?½å?¯å?º"
 
-#: ../gp11/gp11-misc.c:233
+#: ../gck/gck-misc.c:233
 msgid "Cannot export because the key is of the wrong type"
 msgstr "ç?±æ?¼é??é?°é¡?å??é?¯èª¤æ??ä¸?è?½å?¯å?º"
 
-#: ../gp11/gp11-misc.c:235
+#: ../gck/gck-misc.c:235
 msgid "Unable to initialize the random number generator"
 msgstr "ç?¡æ³?å??å§?å??äº?æ?¸ç?¢ç??å?¨"
 
-#: ../gp11/gp11-misc.c:237
+#: ../gck/gck-misc.c:237
 msgid "No random number generator available"
 msgstr "æ²?æ??å?¯ç?¨ç??äº?æ?¸ç?¢ç??å?¨"
 
-#: ../gp11/gp11-misc.c:239
+#: ../gck/gck-misc.c:239
 msgid "The crypto mechanism has an invalid parameter"
 msgstr "該å? å¯?æ©?å?¶æ??ç?¡æ??ç??å??æ?¸"
 
-#: ../gp11/gp11-misc.c:241
+#: ../gck/gck-misc.c:241
 msgid "Not enough space to store the result"
 msgstr "æ²?æ??足夠ç??空é??ä¾?å?²å­?çµ?æ??"
 
-#: ../gp11/gp11-misc.c:243
+#: ../gck/gck-misc.c:243
 msgid "The saved state is invalid"
 msgstr "å?²å­?ç??ç??æ??ç?¡æ??"
 
-#: ../gp11/gp11-misc.c:245
+#: ../gck/gck-misc.c:245
 msgid "The information is sensitive and cannot be revealed"
 msgstr "æ­¤è³?è¨?é??å??å??大å°?寫並ä¸?ä¸?æ??顯示å?¶å¯¦é??å?¼"
 
-#: ../gp11/gp11-misc.c:247
+#: ../gck/gck-misc.c:247
 msgid "The state cannot be saved"
 msgstr "æ­¤ç??æ??ä¸?è?½å?²å­?"
 
-#: ../gp11/gp11-misc.c:249
+#: ../gck/gck-misc.c:249
 msgid "The module has not been initialized"
 msgstr "模çµ?å°?æ?ªå??å§?å??"
 
-#: ../gp11/gp11-misc.c:251
+#: ../gck/gck-misc.c:251
 msgid "The module has already been initialized"
 msgstr "模çµ?å·²ç¶?å??å§?å??äº?"
 
-#: ../gp11/gp11-misc.c:253
+#: ../gck/gck-misc.c:253
 msgid "Cannot lock data"
 msgstr "ä¸?è?½é??å®?è³?æ??"
 
-#: ../gp11/gp11-misc.c:255
+#: ../gck/gck-misc.c:255
 msgid "The data cannot be locked"
 msgstr "該è³?æ??ä¸?è?½é??å®?"
 
-#: ../gp11/gp11-misc.c:257
+#: ../gck/gck-misc.c:257
 msgid "The signature request was rejected by the user"
 msgstr "簽署ç??è¦?æ±?被使ç?¨è??æ??çµ?"
 
-#: ../gp11/gp11-misc.c:261
+#: ../gck/gck-misc.c:261
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../pkcs11/gkm/gkm-certificate.c:726
+#: ../pkcs11/gkm/gkm-certificate.c:572
 msgid "Unnamed Certificate"
 msgstr "æ?ªå?½å??ç??æ??è­?"
 
@@ -858,143 +854,157 @@ msgid "Couldn't parse public SSH key"
 msgstr "ç?¡æ³?解æ?? SSH å?¬é??é??é?°ã??"
 
 #. Get the label ready
-#: ../pkcs11/wrap-layer/gkm-wrap-login.c:317
+#: ../pkcs11/wrap-layer/gkm-wrap-login.c:343
 #, c-format
 msgid "Unlock password for: %s"
 msgstr "解é??å¯?碼ç?¨æ?¼ï¼?%s"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:88
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:779
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:90
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:801
 msgid "The unlock password was incorrect"
 msgstr "解é??ç??å¯?碼æ?¯é?¯èª¤ç??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:606
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:634
 msgid "Unlock Login Keyring"
 msgstr "解é??ç?»å?¥é?°å??å??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:608
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:636
 msgid "Enter password to unlock your login keyring"
 msgstr "è«?輸å?¥è§£é??ç?»å?¥é?°å??å??ç??å¯?碼"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:612
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:640
 msgid ""
 "The password you use to log in to your computer no longer matches that of "
 "your login keyring."
 msgstr "æ?¨ç?¨ä¾?ç?»å?¥é?»è?¦ç??å¯?碼已å??ç?»å?¥é?°å??å??ä¸?符ã??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:614
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:642
 msgid ""
 "The login keyring did not get unlocked when you logged into your computer."
 msgstr "æ?¨ç??ç?»å?¥é?°å??å??並æ?ªå?¨ç?»å?¥æ?¨ç??é?»è?¦æ??è?ªå??解é??ã??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:632
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:660
 msgid "Unlock Keyring"
 msgstr "解é??é?°å??å??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:634
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:662
 #, c-format
 msgid "Enter password for keyring '%s' to unlock"
 msgstr "輸å?¥é?°å??å??â??%sâ??ç??å¯?碼ï¼?ä½?ç?ºé??é??ä¹?ç?¨"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:638
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:666
 #, c-format
 msgid "An application wants access to the keyring '%s', but it is locked"
 msgstr "æ??ç¨?å¼?è¦?æ±?å­?å??é?°å??å??ã??%sã??ï¼?ä½?æ?¯å®?已被é??å®?"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:661
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:686
 msgid "Unlock private key"
 msgstr "解é??ç§?å¯?é??é?°"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:663
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:688
 msgid "Unlock certificate"
 msgstr "解é??æ??è­?"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:665
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:690
 msgid "Unlock public key"
 msgstr "解é??å?¬é??é??é?°"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:667
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:692
 msgid "Unlock"
 msgstr "解é??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:680
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:705
 msgid "Enter password to unlock the public key"
 msgstr "輸å?¥è§£é??å?¬é??é??é?°ç??å¯?碼"
 
 #. TRANSLATORS: The private key is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:692
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:717
 #, c-format
 msgid "An application wants access to the private key '%s', but it is locked"
 msgstr "ä¸?å??ç¨?å¼?è¦?æ±?å­?å??ç§?å¯?é??é?°â??%sâ??ï¼?ä½?å®?已被é??ä¸?"
 
 #. TRANSLATORS: The certificate is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:695
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:720
 #, c-format
 msgid "An application wants access to the certificate '%s', but it is locked"
 msgstr "ä¸?å??ç¨?å¼?è¦?æ±?å­?å??æ??è­?â??%sâ??ï¼?ä½?å®?已被é??ä¸?"
 
 #. TRANSLATORS: The public key is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:698
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:723
 #, c-format
 msgid "An application wants access to the public key '%s', but it is locked"
 msgstr "ä¸?å??ç¨?å¼?è¦?æ±?å­?å??å?¬é??é??é?°â??%sâ??ï¼?ä½?å®?已被é??ä¸?"
 
 #. TRANSLATORS: The object '%s' is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:701
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:726
 #, c-format
 msgid "An application wants access to '%s', but it is locked"
 msgstr "ä¸?å??ä¸?æ??ç??ç¨?å¼?è¦?æ±?å­?å??â??%sâ??ï¼?ä½?å®?已被é??ä¸?"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:800
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:822
 msgid "Unlock certificate/key storage"
 msgstr "解é??æ??è­?/é??é?°å?²å­?å??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:801
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:823
 msgid "Enter password to unlock the certificate/key storage"
 msgstr "輸å?¥è§£é??æ??è­?/é??é?°å?²å­?å??ç??å¯?碼"
 
 #. TRANSLATORS: The storage is locked, and needs unlocking before the application can use it.
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:804
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:826
 #, c-format
 msgid ""
 "An application wants access to the certificate/key storage '%s', but it is "
 "locked"
 msgstr "ä¸?å??ç¨?å¼?è¦?æ±?å­?å??æ??è­?/é??é?°å?²å­?å??ã??%sã??ï¼?ä½?å®?已被é??ä¸?"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1039
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1132
 msgid "New Password Required"
 msgstr "è¦?æ±?æ?°ç??å¯?碼"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1040
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1133
 msgid "New password required for secure storage"
 msgstr "å®?å?¨å?²å­?å??è¦?æ±?æ?°ç??å¯?碼"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1042
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1135
 #, c-format
 msgid ""
 "In order to prepare '%s' for storage of certificates or keys, a password is "
 "required"
 msgstr "ç?ºäº?æº?å??ç?¨ä¾?å?²å­?æ??è­?æ??é??é?°ç??ã??%sã??ï¼?å¯?碼æ?¯å¿?è¦?ç??"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1164
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1258
 msgid "Change Password"
 msgstr "���碼"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1165
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1259
 msgid "Change password for secure storage"
 msgstr "æ?¹è®?å®?å?¨å?²å­?å??ç??å¯?碼"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1167
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1261
 #, c-format
 msgid ""
 "To change the password for '%s', the original and new passwords are required"
 msgstr "è¦?æ?¹è®?ã??%sã??ç??å¯?碼ï¼?é??è¦?å??ä¾?ç??å¯?碼å??æ?°ç??å¯?碼"
 
-#: ../ui/gku-prompt-tool.c:547
+#: ../tool/gkr-tool.c:102
+#, c-format
+msgid "usage: gnome-keyring command [options]\n"
+msgstr "���gnome-keyring command [options]\n"
+
+#: ../tool/gkr-tool.c:104
+msgid "commands: "
+msgstr "�令�"
+
+#. Translators: keep same length as translated message "commands: "
+#: ../tool/gkr-tool.c:108
+msgid "          "
+msgstr "   "
+
+#: ../ui/gku-prompt-tool.c:538
 msgid "Store passwords unencrypted?"
 msgstr "æ?¯å?¦å?²å­?ä¸?å? å¯?ç??å¯?碼ï¼?"
 
-#: ../ui/gku-prompt-tool.c:548
+#: ../ui/gku-prompt-tool.c:539
 msgid ""
 "By choosing to use a blank password, your stored passwords will not be "
 "safely encrypted. They will be accessible by anyone with access to your "
@@ -1003,50 +1013,106 @@ msgstr ""
 "è?¥é?¸æ??使ç?¨ç©ºç?½å¯?碼ï¼?æ?¨æ??å?²å­?ç??å¯?碼å°?ä¸?æ??被å®?å?¨ç??å? å¯?ã??ä»»ä½?è?½å­?å??æ?¨ç??æª?æ¡?ç??人"
 "é?½å°?è?½ç??å?°é??äº?å¯?碼ã??"
 
-#: ../ui/gku-prompt-tool.c:555
+#: ../ui/gku-prompt-tool.c:546
 msgid "Use Unsafe Storage"
 msgstr "使ç?¨ä¸?å®?å?¨ç??å?²å­?"
 
-#: ../ui/gku-prompt-tool.c:593
+#: ../ui/gku-prompt-tool.c:584
 msgid "Passwords do not match."
 msgstr "å¯?碼ä¸?ç?¸ç¬¦ã??"
 
-#: ../ui/gku-prompt-tool.c:603
+#: ../ui/gku-prompt-tool.c:594
 msgid "Password cannot be blank"
 msgstr "�碼��空�"
 
 #: ../ui/gku-prompt.ui.h:1
-msgid "Automatically unlock this keyring whenever I'm logged in"
-msgstr "ç?¶æ??ç?»å?¥æ??è?ªå??解é??é?°å??å??"
-
-#: ../ui/gku-prompt.ui.h:2
 msgid "New password strength"
 msgstr "æ?°å¯?碼ç??強度"
 
-#: ../ui/gku-prompt.ui.h:3
+#: ../ui/gku-prompt.ui.h:2
 msgid "_Application:"
 msgstr "æ??ç?¨ç¨?å¼?(_A):"
 
-#: ../ui/gku-prompt.ui.h:4
+#: ../ui/gku-prompt.ui.h:3
 msgid "_Confirm:"
 msgstr "確�(_C):"
 
-#: ../ui/gku-prompt.ui.h:5
+#: ../ui/gku-prompt.ui.h:4
 msgid "_Details:"
 msgstr "詳細è³?æ??(_D):"
 
-#: ../ui/gku-prompt.ui.h:6
+#: ../ui/gku-prompt.ui.h:5
 msgid "_Name:"
 msgstr "å??稱(_N):"
 
-#: ../ui/gku-prompt.ui.h:7
+#: ../ui/gku-prompt.ui.h:6
 msgid "_Old Password:"
 msgstr "è??å¯?碼(_O):"
 
-#: ../ui/gku-prompt.ui.h:8
+#: ../ui/gku-prompt.ui.h:7
 msgid "_Password:"
 msgstr "�碼(_P):"
 
+#~ msgid "Email"
+#~ msgstr "���件"
+
+#~ msgid "<i>Not Part of Certificate</i>"
+#~ msgstr "<i>ä¸?æ?¯æ??è­?ç??é?¨ä»½</i>"
+
+#~ msgid "<i>unknown</i>"
+#~ msgstr "<i>ä¸?æ??</i>"
+
+#~ msgid "<Not Part of Certificate>"
+#~ msgstr "<ä¸?æ?¯æ??è­?ç??é?¨ä»½>"
+
+#~ msgid "<b>Fingerprints</b>"
+#~ msgstr "<b>æ?¸ä½?æ??ç´?</b>"
+
+#~ msgid "<b>Issued By</b>"
+#~ msgstr "<b>ç?¼è¡?è??:</b>"
+
+#~ msgid "<b>Issued To</b>"
+#~ msgstr "<b>�給:</b>"
+
+#~ msgid "<b>This certificate has been verified for the following uses:</b>"
+#~ msgstr "<b>æ­¤æ??è­?å·²ç¶?檢é©?å?¯ç?¨æ?¼ä¸?å??ç?¨é??:</b>"
+
+#~ msgid "<b>Validity</b>"
+#~ msgstr "<b>æ??å??</b>"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "ä¸?è?¬å??稱 (CN)"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "é?»å­?é?µä»¶æ?¶ä»¶è??æ??è­?"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "é?»å­?é?µä»¶ç°½ç½²è??æ??è­?"
+
+#~ msgid "Issued On"
+#~ msgstr "ç?¼ç?§æ?¥æ??"
+
+#~ msgid "MD5 Fingerprint"
+#~ msgstr "MD5 æ?¸ä½?æ??ç´?"
+
+#~ msgid "Organization (O)"
+#~ msgstr "çµ?ç¹? (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "���� (OU)"
+
+#~ msgid "SHA1 Fingerprint"
+#~ msgstr "SHA1 æ?¸ä½?æ??ç´?"
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "SSL 客æ?¶ç«¯æ??è­?"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "SSL 伺æ??å?¨æ??è­?"
+
+#~ msgid "<span size='large' weight='bold'>Import Certificates and Keys</span>"
+#~ msgstr "<span size='large' weight='bold'>å?¯å?¥æ??è­?å??é??é?°</span>"
+
 #~ msgid ""
 #~ "This option enables the PKCS#11 component in the gnome-keyring daemon. It "
 #~ "only takes effect during startup with gnome-session, (ie: when the user "



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