[gnome-keyring/gnome-2-30] Merge zh_CN.po from master.

[Aron Xu <aronxu src gnome org>]

commit 587c6298e4699ecbbd79b9b38df1c5f6f14eca2c
Author: Aron Xu <aronxu gnome org>
Date:   Fri Aug 13 17:36:58 2010 +0800

    Merge zh_CN.po from master.

 po/zh_CN.po |  364 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 196 insertions(+), 168 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bd9d6ce..79d92f3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,20 +1,24 @@
-# gnome-keyringç??ç®?ä½?中æ??ç¿»è¯?
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Chinese (China) translation of gnome-keyring
+# gnome-keyring ç??ç®?ä½?中æ??ç¿»è¯?
+# Copyright (C) 2003, 2004, 2005, 2008, 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-keyring package.
 # Neo Willis <willis linux net>, 2003.
 # QA and Edited by Funda Wang <fundawang linux net cn>, 2004
 # Wang Jian <lark linux net cn>, 2005.
 # YangZhang <zyangmath gmail com>, 2008
 # ç??é?²(Gan Lu) <rhythm gan gmail com>, 2009
+# Eleanor Chen <chenyueg gmail com>, 2010
+# Tao Wang <dancefire gmail com>, 2010
+# Aron Xu <aronxu gnome org>, 2010.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-keyring\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"keyring&component=general\n"
-"POT-Creation-Date: 2010-06-21 14:52+0000\n"
-"PO-Revision-Date: 2010-08-09 14:09+0800\n"
-"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Project-Id-Version: gnome-keyring master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-13 17:36+0800\n"
+"PO-Revision-Date: 2010-08-13 17:36+0800\n"
+"Last-Translator: Tao Wang <dancefire gmail com>\n"
+"Language-Team: Aron Xu <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,9 +30,8 @@ msgid ""
 "in). This setting may be overridden when certain command line arguments are "
 "passed to the daemon."
 msgstr ""
-"æ­¤é??项å?¯ç?¨ gnome-keyring å®?æ?¤è¿?ç¨?ç?? PKCS#11 ç»?件ã??å®?ä»?å?¨ gnome-keyring-"
-"daemon å?¯å?¨æ?¶ç??æ??(å?³ç?¨æ?·ç?»å?¥æ?¶)ã??å½?ä¸?äº?ç?¹å®?ç??å?½ä»¤è¡?å??æ?°ä¼ ç»?å®?æ?¤è¿?ç¨?æ?¶ï¼?此设å®?"
-"å?¯è?½è¢«è¦?ç??ã??"
+"æ­¤é??项å?¯ç?¨ gnome-keyring å®?æ?¤è¿?ç¨?ç?? PKCS#11 ç»?件ã??å®?ä»?å?¨ gnome-session å?¯å?¨æ?¶"
+"ç??æ??(å?³ç?¨æ?·ç?»å½?æ?¶)ã??å½?ä¸?äº?ç?¹å®?ç??å?½ä»¤è¡?å??æ?°ä¼ ç»?å®?æ?¤è¿?ç¨?æ?¶ï¼?此设å®?å?¯ä»¥è¢«è¦?ç??ã??"
 
 #: ../daemon/data/gnome-keyring.schemas.in.h:2
 msgid ""
@@ -38,7 +41,7 @@ msgid ""
 "the daemon."
 msgstr ""
 "æ­¤é??项å?¯ç?¨ gnome-keyring å®?æ?¤è¿?ç¨?ç?? SSH 代ç??ã??å®?ä»?å?¨ gnome-keyring-daemon å?¯"
-"å?¨æ?¶ç??æ??(å?³ç?¨æ?·ç?»å?¥æ?¶)ã??å½?ä¸?äº?ç?¹å®?ç??å?½ä»¤è¡?å??æ?°ä¼ ç»?å®?æ?¤è¿?ç¨?æ?¶ï¼?此设å®?å?¯ä»¥è¢«è¦?"
+"å?¨æ?¶ç??æ??(å?³ç?¨æ?·ç?»å½?æ?¶)ã??å½?ä¸?äº?ç?¹å®?ç??å?½ä»¤è¡?å??æ?°ä¼ ç»?å®?æ?¤è¿?ç¨?æ?¶ï¼?此设å®?å?¯ä»¥è¢«è¦?"
 "ç??ã??"
 
 #: ../daemon/data/gnome-keyring.schemas.in.h:3
@@ -48,9 +51,8 @@ msgid ""
 "the user logs in). This setting may be overridden when certain command line "
 "arguments are passed to the daemon."
 msgstr ""
-"æ­¤é??项å?¯ç?¨ gnome-keyring å®?æ?¤è¿?ç¨?ç?? PKCS#11 ç»?件ã??å®?ä»?å?¨ gnome-keyring-"
-"daemon å?¯å?¨æ?¶ç??æ??(å?³ç?¨æ?·ç?»å?¥æ?¶)ã??å½?ä¸?äº?ç?¹å®?ç??å?½ä»¤è¡?å??æ?°ä¼ ç»?å®?æ?¤è¿?ç¨?æ?¶ï¼?此设å®?"
-"å?¯è?½è¢«è¦?ç??ã??"
+"æ­¤é??项å?¯ç?¨ gnome-keyring å®?æ?¤è¿?ç¨?ç??ä¿?å¯?æ??å?¡ç»?件ã??å®?ä»?å?¨ gnome-session å?¯å?¨æ?¶"
+"ç??æ??(å?³ç?¨æ?·ç?»å½?æ?¶)ã??å½?ä¸?äº?ç?¹å®?ç??å?½ä»¤è¡?å??æ?°ä¼ ç»?å®?æ?¤è¿?ç¨?æ?¶ï¼?此设å®?å?¯ä»¥è¢«è¦?ç??ã??"
 
 #: ../daemon/data/gnome-keyring.schemas.in.h:4
 msgid "Whether the gnome-keyring PKCS#11 component is enabled."
@@ -62,7 +64,7 @@ msgstr "æ?¯å?¦å?¯ç?¨ gnome-keyring SSH 代ç??"
 
 #: ../daemon/data/gnome-keyring.schemas.in.h:6
 msgid "Whether the gnome-keyring secret service is enabled."
-msgstr "æ?¯å?¦å?¯ç?¨ gnome-keyring å? å¯?æ??å?¡ã??"
+msgstr "æ?¯å?¦å?¯ç?¨ gnome-keyring ä¿?å¯?æ??å?¡ã??"
 
 #. 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
@@ -73,19 +75,19 @@ msgstr "æ?ªå?½å??"
 
 #: ../daemon/dbus/gkd-secret-change.c:86
 msgid "Change Keyring Password"
-msgstr "æ?´æ?¹é?¥å??ç?¯å¯?ç ?"
+msgstr "æ?´æ?¹å¯?é?¥ç?¯å¯?ç ?"
 
 #: ../daemon/dbus/gkd-secret-change.c:88
 #, c-format
 msgid "Choose a new password for the '%s' keyring"
-msgstr "为â??%sâ??é?¥å??ç?¯é??æ?©æ?°å¯?ç ?ã??"
+msgstr "为 %s å¯?é?¥ç?¯é??æ?©æ?°å¯?ç ?"
 
 #: ../daemon/dbus/gkd-secret-change.c:92
 #, c-format
 msgid ""
 "An application wants to change the password for the '%s' keyring. Choose the "
 "new password you want to use for it."
-msgstr "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?æ?´æ?¹â??%sâ??é?¥å??ç?¯ç??å¯?ç ?ã??请为该é?¥å??ç?¯é??æ?©ä¸?个æ?°å¯?ç ?ã??"
+msgstr "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?æ?´æ?¹ %s å¯?é?¥ç?¯ç??å¯?ç ?ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #: ../daemon/dbus/gkd-secret-change.c:111
 msgid "The original password was incorrect"
@@ -93,79 +95,79 @@ msgstr "å??å¯?ç ?ä¸?正确"
 
 #: ../daemon/dbus/gkd-secret-create.c:78
 msgid "New Keyring Password"
-msgstr "æ?°é?¥å??ç?¯ç??å¯?ç ?"
+msgstr "æ?°å¯?é?¥ç?¯ç??å¯?ç ?"
 
 #: ../daemon/dbus/gkd-secret-create.c:79
 msgid "Choose password for new keyring"
-msgstr "é??æ?©æ?°é?¥å??ç?¯ç??å¯?ç ?"
+msgstr "é??æ?©æ?°å¯?é?¥ç?¯ç??å¯?ç ?"
 
 #: ../daemon/dbus/gkd-secret-create.c:81
 #, c-format
 msgid ""
 "An application wants to create a new keyring called '%s'. Choose the "
 "password you want to use for it."
-msgstr "ä¸?个åº?ç?¨ç¨?åº?æ?³è¦?å??建å??为â??%sâ??ç??æ?°é?¥å??ç?¯ã??æ?¨å¿?须为该é?¥å??ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
+msgstr "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?å??建å??为 %s ç??æ?°å¯?é?¥ç?¯ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #: ../daemon/dbus/gkd-secret-unlock.c:135
 msgid "Unlock Login Keyring"
-msgstr "解é??ç?»å½?é?¥å??ç?¯"
+msgstr "解é??ç?»å½?å¯?é?¥ç?¯"
 
 #: ../daemon/dbus/gkd-secret-unlock.c:137
 msgid "Enter password for to unlock your login keyring"
-msgstr "è¾?å?¥å¯?ç ?以解é??ç?»å½?é?¥å??ç?¯"
+msgstr "è¾?å?¥å¯?ç ?以解é??å¯?é?¥ç?¯"
 
 #: ../daemon/dbus/gkd-secret-unlock.c:141
 msgid ""
 "The password you use to log in to your computer no longer matches that of "
 "your login keyring."
-msgstr "æ?¨ç?»å½?计ç®?æ?ºç?¨ç??å¯?ç ?å·²ä¸?å?¹é??æ?¨ç??ç?»å½?é?¥å??ç?¯ã??"
+msgstr "æ?¨ç?¨æ?¥ç?»å½?æ?¨ç??ç?µè??ç??å¯?ç ?ä¸?æ?¨ç?»å½?å¯?é?¥ç?¯é??ç??å¯?ç ?ä¸?å??å?¹é??ã??"
 
 #: ../daemon/dbus/gkd-secret-unlock.c:143
 msgid ""
 "The login keyring did not get unlocked when you logged into your computer."
-msgstr "æ?¨ç?»å½?å?°æ­¤è®¡ç®?æ?ºæ?¶ï¼?æ?¨ç??ç?»å½?é?¥å??ç?¯æ?ªè¢«è§£é??ã??"
+msgstr "æ?¨ç?»å½?å?°æ?¨ç??计ç®?æ?ºæ?¶ï¼?æ?¨ç??ç?»å½?å¯?é?¥ç?¯æ?ªè¢«è§£é??ã??"
 
 #: ../daemon/dbus/gkd-secret-unlock.c:184
 msgid "Unlock Keyring"
-msgstr "解é??é?¥å??ç?¯"
+msgstr "解é??å¯?é?¥ç?¯"
 
 #: ../daemon/dbus/gkd-secret-unlock.c:186
 #, c-format
 msgid "Enter password for keyring '%s' to unlock"
-msgstr "è¦?解é?¤é??å®?ï¼?请è¾?å?¥é?¥å??ç?¯â??%sâ??ç??å¯?ç ?"
+msgstr "è¦?解é?¤é??å®?ï¼?请è¾?å?¥å¯?é?¥ç?¯ %s ç??å¯?ç ?"
 
 #: ../daemon/dbus/gkd-secret-unlock.c:190
 #, c-format
 msgid "An application wants access to the keyring '%s', but it is locked"
-msgstr "æ??个åº?ç?¨ç¨?åº?æ?³è¦?访é?®é?¥å??ç?¯â??%sâ??ï¼?ä½?该é?¥å??ç?¯å·²ä¸?é??"
+msgstr "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?访é?®å¯?é?¥ç?¯ %s ï¼?ä½?该å¯?é?¥ç?¯å·²ä¸?é??"
 
 #: ../daemon/dbus/gkd-secret-unlock.c:226
 msgid "The unlock password was incorrect"
-msgstr "解é??å¯?ç ?ä¸?正确"
+msgstr "解é??å¯?ç ?é??误"
 
 #: ../daemon/gnome-keyring-pkcs11.desktop.in.in.h:1
 msgid "Certificate and Key Storage"
-msgstr "�书/����"
+msgstr "è¯?书å??å¯?é?¥å­?å?¨"
 
 #: ../daemon/gnome-keyring-pkcs11.desktop.in.in.h:2
 msgid "GNOME Keyring: PKCS#11 Component"
-msgstr "GNOME é?¥å??ç?¯ï¼?PKCS#11 ç»?件"
+msgstr "GNOME ����PKCS#11 �件"
 
 #: ../daemon/gnome-keyring-secrets.desktop.in.in.h:1
 msgid "GNOME Keyring: Secret Service"
-msgstr "GNOME é?¥å??ç?¯ï¼?å? å¯?æ??å?¡"
+msgstr "GNOME å¯?é?¥ç?¯ï¼?ä¿?å¯?æ??å?¡"
 
 #: ../daemon/gnome-keyring-secrets.desktop.in.in.h:2
 msgid "Secret Storage Service"
-msgstr "å? å¯?å­?å?¨æ??å?¡"
+msgstr "ä¿?å¯?å­?å?¨æ??å?¡"
 
 #: ../daemon/gnome-keyring-ssh.desktop.in.in.h:1
 msgid "GNOME Keyring: SSH Agent"
-msgstr "GNOME é?¥å??ç?¯ï¼?SSH 代ç??"
+msgstr "GNOME å¯?é?¥ç?¯ï¼?SSH å?©æ??"
 
 #: ../daemon/gnome-keyring-ssh.desktop.in.in.h:2
 msgid "SSH Key Agent"
-msgstr "SSH å¯?é?¥ä»£ç??"
+msgstr "SSH å¯?é?¥å?©æ??"
 
 #. TRANSLATORS: This is the display label for the login keyring
 #: ../daemon/login/gkd-login.c:207
@@ -175,7 +177,7 @@ msgstr "��"
 #: ../daemon/login/gkd-login.c:643
 #, c-format
 msgid "Unlock password for: %s"
-msgstr "%s ç??解é??å¯?ç ?"
+msgstr " %s ç??解é??å¯?ç ?"
 
 #: ../daemon/pkcs11/gkd-pkcs11-auth.c:294
 msgid "New Password Required"
@@ -190,7 +192,7 @@ msgstr "é??è¦?æ?°å¯?ç ?以ä¿?æ?¤å®?å?¨å­?å?¨å?¨"
 msgid ""
 "In order to prepare '%s' for storage of certificates or keys, a password is "
 "required"
-msgstr "è¦?å??å¤?为 '%s' ä¿?å­?è¯?书æ??å¯?å??ï¼?å¿?é¡»è¦?ä¸?个å¯?ç ?"
+msgstr "è¦?å??å¤?为 %s ä¿?å­?è¯?书æ??å¯?é?¥ï¼?å¿?é¡»è¦?ä¸?个å¯?ç ?"
 
 #: ../daemon/pkcs11/gkd-pkcs11-auth.c:360
 msgid "Unlock private key"
@@ -228,33 +230,33 @@ msgstr "è¾?å?¥å¯?é??以解é??"
 #: ../daemon/pkcs11/gkd-pkcs11-auth.c:391
 #, c-format
 msgid "An application wants access to the private key '%s', but it is locked"
-msgstr "ä¸?个åº?ç?¨ç¨?åº?æ?³è¦?访é?®ç§?é?¥â??%sâ??ï¼?ä½?å®?已被é??å®?"
+msgstr "ä¸?个åº?ç?¨ç¨?åº?æ?³è¦?访é?®ç§?é?¥ %s ï¼?ä½?å®?已被é??å®?"
 
 #. TRANSLATORS: The certificate is locked
 #: ../daemon/pkcs11/gkd-pkcs11-auth.c:394
 #, c-format
 msgid "An application wants access to the certificate '%s', but it is locked"
-msgstr "ä¸?个åº?ç?¨ç¨?åº?æ?³è¦?访é?®è¯?书â??%sâ??ï¼?ä½?å®?已被é??å®?"
+msgstr "ä¸?个åº?ç?¨ç¨?åº?æ?³è¦?访é?®è¯?书 %s ï¼?ä½?å®?已被é??å®?"
 
 #. TRANSLATORS: The public key is locked
 #: ../daemon/pkcs11/gkd-pkcs11-auth.c:397
 #, c-format
 msgid "An application wants access to the public key '%s', but it is locked"
-msgstr "ä¸?个åº?ç?¨ç¨?åº?æ?³è¦?访é?®å?¬é?¥â??%sâ??ï¼?ä½?å®?已被é??å®?"
+msgstr "ä¸?个åº?ç?¨ç¨?åº?æ?³è¦?访é?®å?¬é?¥ %s ï¼?ä½?å®?已被é??å®?"
 
 #. TRANSLATORS: The object '%s' is locked
 #: ../daemon/pkcs11/gkd-pkcs11-auth.c:400
 #, c-format
 msgid "An application wants access to '%s', but it is locked"
-msgstr "ä¸?个åº?ç?¨ç¨?åº?è?·å??对â??%sâ??ç??访é?®ï¼?ä½?å®?已被é??å®?"
+msgstr "ä¸?个åº?ç?¨ç¨?åº?è?·å??对 %s ç??访é?®ï¼?ä½?å®?已被é??å®?"
 
 #: ../daemon/pkcs11/gkd-pkcs11-auth.c:595
 msgid "Unlock certificate/key storage"
-msgstr "解é??è¯?书/å¯?å??å­?å?¨å?¨"
+msgstr "解é??è¯?书/å¯?é?¥å­?å?¨å?¨"
 
 #: ../daemon/pkcs11/gkd-pkcs11-auth.c:596
 msgid "Enter password to unlock the certificate/key storage"
-msgstr "è¾?å?¥å¯?ç ?以解é??è¯?书/å¯?å??å­?å?¨å?¨"
+msgstr "è¾?å?¥å¯?ç ?以解é??è¯?书/å¯?é?¥å­?å?¨å?¨"
 
 #. TRANSLATORS: The storage is locked, and needs unlocking before the application can use it.
 #: ../daemon/pkcs11/gkd-pkcs11-auth.c:599
@@ -262,7 +264,7 @@ msgstr "è¾?å?¥å¯?ç ?以解é??è¯?书/å¯?å??å­?å?¨å?¨"
 msgid ""
 "An application wants access to the certificate/key storage '%s', but it is "
 "locked"
-msgstr "ä¸?个åº?ç?¨ç¨?åº?æ?³è¦?访é?®è¯?书/å¯?å??å­?å?¨å?¨ '%sï¼?ä½?å®?已被é??å®?"
+msgstr "ä¸?个åº?ç?¨ç¨?åº?æ?³è¦?访é?®è¯?书/å¯?é?¥å­?å?¨å?¨ %sï¼?ä½?å®?已被é??å®?"
 
 #: ../daemon/prompt/gkd-prompt-tool.c:393
 msgid "Store passwords unencrypted?"
@@ -291,7 +293,7 @@ msgstr "å¯?ç ?ä¸?è?½ä¸ºç©º"
 
 #: ../daemon/prompt/gkd-prompt.ui.h:1
 msgid "Automatically unlock this keyring whenever I'm logged in"
-msgstr "å½?æ??ç?»å?¥æ?¶æ?»æ?¯è?ªå?¨è§£é??æ­¤é?¥å??ç?¯ã??"
+msgstr "å½?æ??ç?»å½?æ?¶è?ªå?¨è§£é??æ­¤å¯?é?¥ç?¯ã??"
 
 #: ../daemon/prompt/gkd-prompt.ui.h:2
 msgid "New password strength"
@@ -303,11 +305,11 @@ msgstr "����(_A)�"
 
 #: ../daemon/prompt/gkd-prompt.ui.h:4
 msgid "_Confirm:"
-msgstr "确认(_C)�"
+msgstr "确认å¯?ç ?(_C)ï¼?"
 
 #: ../daemon/prompt/gkd-prompt.ui.h:5
 msgid "_Details:"
-msgstr "ç»?è??(_D)ï¼?"
+msgstr "详�信�(_D)�"
 
 #: ../daemon/prompt/gkd-prompt.ui.h:6
 msgid "_Name:"
@@ -323,7 +325,7 @@ msgstr "å¯?ç ?(_P)ï¼?"
 
 #: ../egg/egg-oid.c:41
 msgid "Domain Component"
-msgstr "å??ç»?æ??"
+msgstr "å??ç»?件"
 
 #: ../egg/egg-oid.c:43
 msgid "User ID"
@@ -376,7 +378,7 @@ msgstr "ä½?ç½®"
 
 #: ../egg/egg-oid.c:75
 msgid "State"
-msgstr "ç??"
+msgstr "å·?/ç??"
 
 #: ../egg/egg-oid.c:77
 msgid "Street"
@@ -420,37 +422,37 @@ msgstr "ç¬?å??"
 
 #: ../egg/egg-oid.c:98
 msgid "RSA"
-msgstr "RSA ç®?æ³?å? å¯?"
+msgstr "RSA"
 
 #: ../egg/egg-oid.c:100
 msgid "MD2 with RSA"
-msgstr "使ç?¨ RSA ç®?æ³?ç?? MD2 å?¼"
+msgstr "使ç?¨ MD2 ç®?æ³?ç?? RSA å¯?é?¥å¯¹"
 
 #: ../egg/egg-oid.c:102
 msgid "MD5 with RSA"
-msgstr "使ç?¨ RSA ç®?æ³?ç?? MD5 å?¼"
+msgstr "使ç?¨ MD5 ç®?æ³?ç?? RSA å¯?é?¥å¯¹"
 
 #: ../egg/egg-oid.c:104
 msgid "SHA1 with RSA"
-msgstr "使ç?¨ RSA ç®?æ³?ç?? SHA1 å?¼"
+msgstr "使ç?¨ SHA1 ç®?æ³?ç?? RSA å¯?é?¥å¯¹"
 
 #: ../egg/egg-oid.c:107
 msgid "DSA"
-msgstr "DSA ç®?æ³?å? å¯?"
+msgstr "DSA"
 
 #: ../egg/egg-oid.c:109
 msgid "SHA1 with DSA"
-msgstr "使ç?¨ DSA ç®?æ³?ç?? SHA1 å?¼"
+msgstr "使ç?¨ SHA1 ç®?æ³?ç?? DSA å¯?é?¥å¯¹"
 
 #: ../egg/egg-spawn.c:273
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
-msgstr "å?¨ä»?å­?è¿?ç¨?(%s)中读å??æ?°æ?®æ?¶ select() å?ºç?°å¼?常é??误"
+msgstr "select() å?¨ä»?å­?è¿?ç¨?中读å??æ?°æ?®æ?¶å?ºç?°å¼?常é??误(%s)"
 
 #: ../egg/egg-spawn.c:320
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
-msgstr "waitpid() 中å?ºç?°å¼?常é??误(%s)"
+msgstr "waitpid() å?ºç?°å¼?常é??误(%s)"
 
 #: ../gcr/gcr-certificate-basics-widget.c:59
 msgid "<i>Not Part of Certificate</i>"
@@ -458,7 +460,7 @@ msgstr "<i>é??è¯?书é?¨å??</i>"
 
 #: ../gcr/gcr-certificate-basics-widget.c:80
 msgid "<i>unknown</i>"
-msgstr "<i>æ?ªç?¥ç??</i>"
+msgstr "<i>��</i>"
 
 #: ../gcr/gcr-certificate-basics-widget.ui.h:1
 msgid "<Not Part of Certificate>"
@@ -470,7 +472,7 @@ msgstr "<b>æ??纹</b>"
 
 #: ../gcr/gcr-certificate-basics-widget.ui.h:3
 msgid "<b>Issued By</b>"
-msgstr "<b>å??å¸?è??</b>"
+msgstr "<b>é¢?å??è??</b>"
 
 #: ../gcr/gcr-certificate-basics-widget.ui.h:4
 msgid "<b>Issued To</b>"
@@ -498,11 +500,11 @@ msgstr "ç?µå­?é?®ä»¶ç­¾å??è??è¯?书"
 
 #: ../gcr/gcr-certificate-basics-widget.ui.h:10
 msgid "Expires On"
-msgstr "�止�"
+msgstr "è¿?æ??äº?"
 
 #: ../gcr/gcr-certificate-basics-widget.ui.h:11
 msgid "Issued On"
-msgstr "å??å¸?äº?"
+msgstr "é¢?å??äº?"
 
 #: ../gcr/gcr-certificate-basics-widget.ui.h:12
 msgid "MD5 Fingerprint"
@@ -555,17 +557,17 @@ msgstr "å?¦"
 #. The subject
 #: ../gcr/gcr-certificate-details-widget.c:303
 msgid "Subject Name"
-msgstr "å­¦ç§?å??"
+msgstr "é¢?å??"
 
 #. The Issuer
 #: ../gcr/gcr-certificate-details-widget.c:307
 msgid "Issuer Name"
-msgstr "å??å¸?è??å??称"
+msgstr "é¢?å??è??å??称"
 
 #. The Issued Parameters
 #: ../gcr/gcr-certificate-details-widget.c:311
 msgid "Issued Certificate"
-msgstr "å??å¸?ç??è¯?书"
+msgstr "é¢?å??ç??è¯?书"
 
 #: ../gcr/gcr-certificate-details-widget.c:316
 msgid "Version"
@@ -600,19 +602,19 @@ msgstr "����信�"
 
 #: ../gcr/gcr-certificate-details-widget.c:363
 msgid "Key Algorithm"
-msgstr "å¯?å??ç®?æ³?"
+msgstr "����"
 
 #: ../gcr/gcr-certificate-details-widget.c:368
 msgid "Key Parameters"
-msgstr "å¯?å??å??æ?°"
+msgstr "å¯?é?¥å??æ?°"
 
 #: ../gcr/gcr-certificate-details-widget.c:375
 msgid "Key Size"
-msgstr "å¯?å??大å°?"
+msgstr "��大�"
 
 #: ../gcr/gcr-certificate-details-widget.c:382 ../gcr/gcr-parser.c:202
 msgid "Public Key"
-msgstr "����"
+msgstr "��"
 
 #. Fingerprints
 #: ../gcr/gcr-certificate-details-widget.c:386
@@ -621,7 +623,7 @@ 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>"
+msgstr "<span size='large' weight='bold'>导å?¥è¯?书å??å¯?é?¥</span>"
 
 #: ../gcr/gcr-import-dialog.ui.h:2
 msgid "Import Into:"
@@ -633,15 +635,15 @@ msgstr "å¯?ç ?ï¼?"
 
 #: ../gcr/gcr-unlock-options-widget.ui.h:1
 msgid "Lock this keyring after"
-msgstr "å?¨æ­¤æ?¶é?´å??é??å®?该é?¥å??ç?¯"
+msgstr "ä¹?å??é??ä½?æ­¤å¯?é?¥ç?¯"
 
 #: ../gcr/gcr-unlock-options-widget.ui.h:2
 msgid "Lock this keyring if idle for"
-msgstr "é??å®?é?¥å??ç?¯ï¼?è?¥ç©ºé?²"
+msgstr "é??å®?该å¯?é?¥ç?¯äº?空é?²"
 
 #: ../gcr/gcr-unlock-options-widget.ui.h:3
 msgid "Lock this keyring when I log out"
-msgstr "å½?æ??注é??æ?¶è?ªå?¨é??å®?æ­¤é?¥å??ç?¯"
+msgstr "å?¨æ??注é??æ?¶é??ä½?æ­¤å¯?é?¥ç?¯"
 
 #: ../gcr/gcr-unlock-options-widget.ui.h:4
 msgid "minutes"
@@ -658,44 +660,44 @@ msgstr "没æ??å?¯ç?¨ç??导å?¥ä½?ç½®"
 
 #: ../gcr/gcr-importer.c:404
 msgid "Import Certificates/Keys"
-msgstr "导å?¥è¯?书/å¯?å??"
+msgstr "导��书/��"
 
 #: ../gcr/gcr-importer.c:411
 msgid "Choose a location to store the imported certificates/keys."
-msgstr "é??æ?©æ??个ä½?ç½®æ?¥ä¿?å­?导å?¥ç??è¯?书å??å¯?å??ã??"
+msgstr "é??æ?©æ??个ä½?ç½®æ?¥ä¿?å­?导å?¥ç??è¯?书å??å¯?é?¥ã??"
 
 #. TRANSLATORS: The key is locked.
 #: ../gcr/gcr-importer.c:449
 msgid "In order to import the private key, it must be unlocked"
-msgstr "è¦?导å?¥ç§?é?¥ï¼?å®?å¿?须已解é?¤é??å®?"
+msgstr "�导�����须��解�"
 
 #. TRANSLATORS: The certificate is locked.
 #: ../gcr/gcr-importer.c:452
 msgid "In order to import the certificate, it must be unlocked"
-msgstr "è¦?导å?¥è¯?书ï¼?å®?å¿?须已解é?¤é??å®?"
+msgstr "�导��书��须��解�"
 
 #. TRANSLATORS: The data is locked.
 #: ../gcr/gcr-importer.c:455
 msgid "In order to import the data, it must be unlocked"
-msgstr "è¦?导å?¥æ?°æ?®ï¼?å®?å¿?须已解é?¤é??å®?"
+msgstr "�导�����须��解�"
 
 #. TRANSLATORS: The key is locked.
 #: ../gcr/gcr-importer.c:460
 #, c-format
 msgid "In order to import the private key '%s', it must be unlocked"
-msgstr "è¦?导å?¥ç§?é?¥ '%s'ï¼?å®?å¿?须已解é?¤é??å®?"
+msgstr "�导��� %s��须��解�"
 
 #. TRANSLATORS: The certificate is locked.
 #: ../gcr/gcr-importer.c:463
 #, c-format
 msgid "In order to import the certificate '%s', it must be unlocked"
-msgstr "è¦?导å?¥è¯?书 '%s'ï¼?å®?å¿?须已解é?¤é??å®?"
+msgstr "�导��书 %s��须��解�"
 
 #. TRANSLATORS: The object '%s' is locked.
 #: ../gcr/gcr-importer.c:466
 #, c-format
 msgid "In order to import '%s', it must be unlocked"
-msgstr "è¦?导å?¥â??%sâ??ï¼?å®?å¿?须已解é?¤é??å®?"
+msgstr "�导� %s��须��解�"
 
 #: ../gcr/gcr-parser.c:196
 msgid "Private Key"
@@ -795,43 +797,43 @@ msgstr "ä¸?æ?¯æ??该æ??ä½?"
 
 #: ../gp11/gp11-misc.c:139
 msgid "The key is missing or invalid"
-msgstr "该å¯?å??丢失æ??æ? æ??"
+msgstr "该å¯?é?¥ä¸¢å¤±æ??æ? æ??"
 
 #: ../gp11/gp11-misc.c:141
 msgid "The key is the wrong size"
-msgstr "该å¯?å??大å°?é??误"
+msgstr "该å¯?é?¥å¤§å°?é??误"
 
 #: ../gp11/gp11-misc.c:143
 msgid "The key is of the wrong type"
-msgstr "该å¯?å??ç±»å??é??误"
+msgstr "该å¯?é?¥ç±»å??é??误"
 
 #: ../gp11/gp11-misc.c:145
 msgid "No key is needed"
-msgstr "ä¸?é??è¦?å¯?å??"
+msgstr "ä¸?é??è¦?å¯?é?¥"
 
 #: ../gp11/gp11-misc.c:147
 msgid "The key is different than before"
-msgstr "该å¯?å??ä¸?ä¹?å??ç??ä¸?å??"
+msgstr "该å¯?é?¥ä¸?ä¹?å??ç??ä¸?å??"
 
 #: ../gp11/gp11-misc.c:149
 msgid "A key is needed"
-msgstr "é??è¦?ä¸?个å¯?å??"
+msgstr "é??è¦?ä¸?个å¯?é?¥"
 
 #: ../gp11/gp11-misc.c:151
 msgid "Cannot include the key in digest"
-msgstr "æ? æ³?å?¨æ??è¦?中å??æ?¬è¯¥å¯?å??"
+msgstr "æ? æ³?å?¨æ??è¦?中å??æ?¬è¯¥å¯?é?¥"
 
 #: ../gp11/gp11-misc.c:153
 msgid "This operation cannot be done with this key"
-msgstr "æ? æ³?ç?¨è¿?个å¯?å??å®?æ??è¿?次æ??ä½?"
+msgstr "æ? æ³?ç?¨è¿?个å¯?é?¥å®?æ??è¿?次æ??ä½?"
 
 #: ../gp11/gp11-misc.c:155
 msgid "The key cannot be wrapped"
-msgstr "该å¯?å??æ? æ³?å??裹"
+msgstr "该å¯?é?¥æ? æ³?å°?è£?"
 
 #: ../gp11/gp11-misc.c:157
 msgid "Cannot export this key"
-msgstr "æ? æ³?导å?ºè¯¥å¯?å??"
+msgstr "æ? æ³?导å?ºè¯¥å¯?é?¥"
 
 #: ../gp11/gp11-misc.c:159
 msgid "The crypto mechanism is invalid or unrecognized"
@@ -891,7 +893,7 @@ msgstr "����读"
 
 #: ../gp11/gp11-misc.c:187
 msgid "An open session exists"
-msgstr "ä¸?个å¼?æ?¾ç??ä¼?è¯?å·²å­?å?¨"
+msgstr "å­?å?¨ä¸?个æ??å¼?ç??ä¼?è¯?"
 
 #: ../gp11/gp11-misc.c:189
 msgid "A read-only session exists"
@@ -931,23 +933,23 @@ msgstr "该设å¤?å¤?äº?å??ä¿?æ?¤ä¸­"
 
 #: ../gp11/gp11-misc.c:207
 msgid "Cannot import because the key is invalid"
-msgstr "æ? æ³?导å?¥å? 为å¯?å??æ? æ??"
+msgstr "æ? æ³?导å?¥å? 为å¯?é?¥æ? æ??"
 
 #: ../gp11/gp11-misc.c:209
 msgid "Cannot import because the key is of the wrong size"
-msgstr "æ? æ³?导å?¥å? 为å¯?å??大å°?é??误"
+msgstr "æ? æ³?导å?¥å? 为å¯?é?¥å¤§å°?é??误"
 
 #: ../gp11/gp11-misc.c:211
 msgid "Cannot import because the key is of the wrong type"
-msgstr "æ? æ³?导å?¥å? 为å¯?å??ç±»å??é??误"
+msgstr "æ? æ³?导å?¥å? 为å¯?é?¥ç±»å??é??误"
 
 #: ../gp11/gp11-misc.c:213
 msgid "You are already logged in"
-msgstr "ä½ å·²ç?»å½?"
+msgstr "�已��"
 
 #: ../gp11/gp11-misc.c:215
 msgid "No user has logged in"
-msgstr "没æ??ç?¨æ?·ç?»å?¥"
+msgstr "没æ??ç?¨æ?·ç?»å½?"
 
 #: ../gp11/gp11-misc.c:217
 msgid "The user's password or PIN is not set"
@@ -959,31 +961,31 @@ msgstr "该ç?¨æ?·ä¸ºæ? æ??ç±»å??"
 
 #: ../gp11/gp11-misc.c:221
 msgid "Another user is already logged in"
-msgstr "å?¦å¤?ç??ç?¨æ?·å·²ç»?ç?»å?¥"
+msgstr "å?¦å¤?ç??ç?¨æ?·å·²ç»?ç?»å½?"
 
 #: ../gp11/gp11-misc.c:223
 msgid "Too many users of different types logged in"
-msgstr "太å¤?ä¸?å??ç±»å??ç??ç?¨æ?·ç?»å?¥"
+msgstr "太å¤?ä¸?å??ç±»å??ç??ç?¨æ?·ç?»å½?"
 
 #: ../gp11/gp11-misc.c:225
 msgid "Cannot import an invalid key"
-msgstr "æ? æ³?导å?¥æ? æ??ç??å¯?å??"
+msgstr "æ? æ³?导å?¥æ? æ??ç??å¯?é?¥"
 
 #: ../gp11/gp11-misc.c:227
 msgid "Cannot import a key of the wrong size"
-msgstr "æ? æ³?导å?¥é??误大å°?ç??å¯?å??"
+msgstr "æ? æ³?导å?¥é??误大å°?ç??å¯?é?¥"
 
 #: ../gp11/gp11-misc.c:229
 msgid "Cannot export because the key is invalid"
-msgstr "æ? æ³?导å?ºå? 为å¯?å??æ? æ??"
+msgstr "æ? æ³?导å?ºå? 为å¯?é?¥æ? æ??"
 
 #: ../gp11/gp11-misc.c:231
 msgid "Cannot export because the key is of the wrong size"
-msgstr "æ? æ³?导å?ºå? 为å¯?å??大å°?é??误"
+msgstr "æ? æ³?导å?ºå? 为å¯?é?¥å¤§å°?é??误"
 
 #: ../gp11/gp11-misc.c:233
 msgid "Cannot export because the key is of the wrong type"
-msgstr "æ? æ³?导å?ºå? 为å¯?å??ç±»å??é??误"
+msgstr "æ? æ³?导å?ºå? 为å¯?é?¥ç±»å??é??误"
 
 #: ../gp11/gp11-misc.c:235
 msgid "Unable to initialize the random number generator"
@@ -999,7 +1001,7 @@ msgstr "å? å¯?æ?ºå?¶æ??ä¸?个æ? æ??ç??å??æ?°"
 
 #: ../gp11/gp11-misc.c:241
 msgid "Not enough space to store the result"
-msgstr "没æ??ç²?å¤?空é?´æ?¥å?¨å­?ç»?æ??"
+msgstr "没æ??足å¤?ç??空é?´æ?¥å?¨å­?ç»?æ??"
 
 #: ../gp11/gp11-misc.c:243
 msgid "The saved state is invalid"
@@ -1045,6 +1047,32 @@ msgstr "æ?ªå?½å??ç??è¯?书"
 msgid "Couldn't parse public SSH key"
 msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 
+#~ msgid "GNOME Keyring: GPG Agent"
+#~ msgstr "GNOME å¯?é?¥ç?¯ï¼?GPG å?©æ??"
+
+#~ msgid "GPG Password Agent"
+#~ msgstr "GPG å¯?ç ?å?©æ??"
+
+#~ msgid "Unknown"
+#~ msgstr "��"
+
+#~ msgid "PGP Key: %s"
+#~ msgstr "PGP ���%s"
+
+#~ msgid "Enter Passphrase"
+#~ msgstr "���令"
+
+#~ msgid "Change Password"
+#~ msgstr "æ?´æ?¹å¯?ç ?"
+
+#~ msgid "Change password for secure storage"
+#~ msgstr "é??è¦?æ?´æ?¹å¯?ç ?以ä¿?æ?¤å®?å?¨å­?å?¨å?¨"
+
+#~ msgid ""
+#~ "To change the password for '%s', the original and new passwords are "
+#~ "required"
+#~ msgstr "è¦?ä¿®æ?¹ %s ç??å¯?ç ?ï¼?é??è¦?è¿?å¯?ç ?å??æ?°å¯?ç ?"
+
 #~ msgid "Removable Disk: %s"
 #~ msgstr "å?¯ç§»å?¨ç£?ç??ï¼?%s"
 
@@ -1067,132 +1095,132 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ "The application '%s' (%s) wants to access the password for '<object "
 #~ "prop='name'/>' in the default keyring."
 #~ msgstr ""
-#~ "åº?ç?¨ç¨?åº?â??%sâ??(%s)æ?³è¦?访é?®é»?认é?¥å??ç?¯ä¸­ç??â??<object prop='name'/>â??ç??å¯?ç ?ã??"
+#~ "åº?ç?¨ç¨?åº? %s (%s)æ?³è¦?访é?®é»?认å¯?é?¥ç?¯ä¸­ç?? <object prop='name'/> ç??å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' (%s) wants to access the password for '<object "
 #~ "prop='name'/>' in %s."
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??(%s)æ?³è¦?访é?® %s 中â??<object prop='name'/>â??ç??å¯?ç ?ã??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s (%s)æ?³è¦?访é?® %s 中 <object prop='name'/> ç??å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' wants to access the password for '<object "
 #~ "prop='name'/>' in the default keyring."
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??æ?³è¦?访é?®é»?认é?¥å??ç?¯ä¸­â??<object prop='name'/>â??ç??å¯?ç ?ã??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s æ?³è¦?访é?®é»?认å¯?é?¥ç?¯ä¸­ <object prop='name'/> ç??å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' wants to access the password for '<object "
 #~ "prop='name'/>' in %s."
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??æ?³è¦?访é?® %s 中â??<object prop='name'/>â??ç??å¯?ç ?ã??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s æ?³è¦?访é?® %s 中 <object prop='name'/> ç??å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "An unknown application wants to access the password for '<object "
 #~ "prop='name'/>' in the default keyring."
-#~ msgstr "ä¸?个æ?ªç?¥ç¨?åº?æ?³è¦?访é?®é»?认é?¥å??ç?¯ä¸­â??<object prop='name'/>â??ç??å¯?ç ?ã??"
+#~ msgstr "ä¸?个æ?ªç?¥ç¨?åº?æ?³è¦?访é?®é»?认å¯?é?¥ç?¯ä¸­ <object prop='name'/> ç??å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "An unknown application wants to access the password for '<object "
 #~ "prop='name'/>' in %s."
-#~ msgstr "ä¸?个æ?ªç?¥ç¨?åº?æ?³è¦?访é?® %s 中â??<object prop='name'/>â??ç??å¯?ç ?ã??"
+#~ msgstr "ä¸?个æ?ªç?¥ç¨?åº?æ?³è¦?访é?® %s 中 <object prop='name'/> ç??å¯?ç ?ã??"
 
 #~ msgid "Allow access"
 #~ msgstr "å??许访é?®"
 
 #~ msgid "Allow application access to keyring?"
-#~ msgstr "å??许åº?ç?¨ç¨?åº?访é?®é?¥å??ç?¯å??ï¼?"
+#~ msgstr "å??许åº?ç?¨ç¨?åº?访é?®å¯?é?¥ç?¯å??ï¼?"
 
 #~ msgid ""
 #~ "The application '%s' (%s) wants access to the default keyring, but it is "
 #~ "locked"
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??(%s)æ?³è¦?访é?®é»?认é?¥å??ç?¯ï¼?ä½?该é?¥å??ç?¯å·²ä¸?é??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s (%s)æ?³è¦?访é?®é»?认å¯?é?¥ç?¯ï¼?ä½?该å¯?é?¥ç?¯å·²ä¸?é??"
 
 #~ msgid ""
 #~ "The application '%s' (%s) wants access to the keyring '%s', but it is "
 #~ "locked"
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??(%s)æ?³è¦?访é?®é?¥å??ç?¯â??%sâ??ï¼?ä½?该é?¥å??ç?¯å·²ä¸?é??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s (%s)æ?³è¦?访é?®å¯?é?¥ç?¯ %s ï¼?ä½?该å¯?é?¥ç?¯å·²ä¸?é??"
 
 #~ msgid ""
 #~ "The application '%s' wants access to the default keyring, but it is locked"
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??æ?³è¦?访é?®é»?认é?¥å??ç?¯ï¼?ä½?该é?¥å??ç?¯å·²ä¸?é??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s æ?³è¦?访é?®é»?认å¯?é?¥ç?¯ï¼?ä½?该å¯?é?¥ç?¯å·²ä¸?é??"
 
 #~ msgid ""
 #~ "The application '%s' wants access to the keyring '%s', but it is locked"
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??æ?³è¦?访é?®é?¥å??ç?¯â??%sâ??ï¼?ä½?该é?¥å??ç?¯å·²ä¸?é??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s æ?³è¦?访é?®å¯?é?¥ç?¯ %s ï¼?ä½?该å¯?é?¥ç?¯å·²ä¸?é??"
 
 #~ msgid ""
 #~ "An unknown application wants access to the default keyring, but it is "
 #~ "locked"
-#~ msgstr "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?访é?®é»?认é?¥å??ç?¯ï¼?ä½?该é?¥å??ç?¯å·²ä¸?é??"
+#~ msgstr "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?访é?®é»?认å¯?é?¥ç?¯ï¼?ä½?该å¯?é?¥ç?¯å·²ä¸?é??"
 
 #~ msgid "Enter password for default keyring to unlock"
-#~ msgstr "è¦?解é?¤é??å®?ï¼?请è¾?å?¥é»?认é?¥å??ç?¯ç??å¯?ç ?"
+#~ msgstr "è¦?解é?¤é??å®?ï¼?请è¾?å?¥é»?认å¯?é?¥ç?¯ç??å¯?ç ?"
 
 #~ msgid ""
 #~ "The application '%s' (%s) wants to create a new keyring called '%s'. You "
 #~ "have to choose the password you want to use for it."
 #~ msgstr ""
-#~ "åº?ç?¨ç¨?åº?â??%sâ??(%s)æ?³è¦?å??建å??为â??%sâ??ç??æ?°é?¥å??ç?¯ã??æ?¨å¿?须为该é?¥å??ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
+#~ "åº?ç?¨ç¨?åº? %s (%s)æ?³è¦?å??建å??为 %s ç??æ?°å¯?é?¥ç?¯ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' (%s) wants to create a new default keyring. You have "
 #~ "to choose the password you want to use for it."
 #~ msgstr ""
-#~ "åº?ç?¨ç¨?åº?â??%sâ??(%s)æ?³è¦?å??建æ?°ç??é»?认é?¥å??ç?¯ã??æ?¨å¿?须为该é?¥å??ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
+#~ "åº?ç?¨ç¨?åº? %s (%s)æ?³è¦?å??建æ?°ç??é»?认å¯?é?¥ç?¯ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' wants to create a new keyring called '%s'. You have "
 #~ "to choose the password you want to use for it."
 #~ msgstr ""
-#~ "åº?ç?¨ç¨?åº?â??%sâ??æ?³è¦?å??建å??为â??%sâ??ç??æ?°é?¥å??ç?¯ã??æ?¨å¿?须为该é?¥å??ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
+#~ "åº?ç?¨ç¨?åº? %s æ?³è¦?å??建å??为 %s ç??æ?°å¯?é?¥ç?¯ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' wants to create a new default keyring. You have to "
 #~ "choose the password you want to use for it."
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??æ?³è¦?å??建æ?°ç??é»?认é?¥å??ç?¯ã??æ?¨å¿?须为该é?¥å??ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s æ?³è¦?å??建æ?°ç??é»?认å¯?é?¥ç?¯ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "An unknown application wants to create a new default keyring. You have to "
 #~ "choose the password you want to use for it."
-#~ msgstr "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?å??建æ?°ç??é»?认é?¥å??ç?¯ã??æ?¨å¿?须为该é?¥å??ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
+#~ msgstr "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?å??建æ?°ç??é»?认å¯?é?¥ç?¯ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' (%s) wants to change the password for the '%s' "
 #~ "keyring. You have to choose the password you want to use for it."
 #~ msgstr ""
-#~ "åº?ç?¨ç¨?åº?â??%sâ??(%s)æ?³è¦?æ?´æ?¹â??%sâ??é?¥å??ç?¯ç??å¯?ç ?ã??æ?¨å¿?须为该é?¥å??ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
+#~ "åº?ç?¨ç¨?åº? %s (%s)æ?³è¦?æ?´æ?¹ %s å¯?é?¥ç?¯ç??å¯?ç ?ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' (%s) wants to change the password for the default "
 #~ "keyring. You have to choose the password you want to use for it."
 #~ msgstr ""
-#~ "åº?ç?¨ç¨?åº?â??%sâ??(%s)æ?³è¦?æ?´æ?¹é»?认é?¥å??ç?¯ç??å¯?ç ?ã??æ?¨å¿?须为该é?¥å??ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
+#~ "åº?ç?¨ç¨?åº? %s (%s)æ?³è¦?æ?´æ?¹é»?认å¯?é?¥ç?¯ç??å¯?ç ?ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' wants to change the password for the '%s' keyring. "
 #~ "You have to choose the password you want to use for it."
 #~ msgstr ""
-#~ "åº?ç?¨ç¨?åº?â??%sâ??æ?³è¦?æ?´æ?¹â??%sâ??é?¥å??ç?¯ç??å¯?ç ?ã??æ?¨å¿?须为该é?¥å??ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
+#~ "åº?ç?¨ç¨?åº? %s æ?³è¦?æ?´æ?¹ %s å¯?é?¥ç?¯ç??å¯?ç ?ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' wants to change the password for the default "
 #~ "keyring. You have to choose the password you want to use for it."
 #~ msgstr ""
-#~ "åº?ç?¨ç¨?åº?â??%sâ??æ?³è¦?æ?´æ?¹é»?认é?¥å??ç?¯ç??å¯?ç ?ã??æ?¨å¿?须为该é?¥å??ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
+#~ "åº?ç?¨ç¨?åº? %s æ?³è¦?æ?´æ?¹é»?认å¯?é?¥ç?¯ç??å¯?ç ?ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "An unknown application wants to change the password for the default "
 #~ "keyring. You have to choose the password you want to use for it."
 #~ msgstr ""
-#~ "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?æ?´æ?¹é»?认é?¥å??ç?¯ç??å¯?ç ?ã??æ?¨å¿?须为该é?¥å??ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
+#~ "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?æ?´æ?¹é»?认å¯?é?¥ç?¯ç??å¯?ç ?ã??æ?¨å¿?须为该å¯?é?¥ç?¯é??æ?©ä¸?个å¯?ç ?ã??"
 
 #~ msgid "Choose a new password for the default keyring. "
-#~ msgstr "为é»?认é?¥å??ç?¯é??æ?©æ?°å¯?ç ?ã??"
+#~ msgstr "为é»?认å¯?é?¥ç?¯é??æ?©æ?°å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' (%s) wants to store a password, but there is no "
 #~ "default keyring. To create one, you need to choose the password you wish "
 #~ "to use for it."
 #~ msgstr ""
-#~ "åº?ç?¨ç¨?åº?â??%sâ??(%s)æ?³è¦?å­?å?¨å¯?ç ?ï¼?ä½?å°?没æ??é»?认ç??é?¥å??ç?¯ã??è?¥è¦?å??建é»?认ç??é?¥å??ç?¯ï¼?"
+#~ "åº?ç?¨ç¨?åº? %s (%s)æ?³è¦?å­?å?¨å¯?ç ?ï¼?ä½?å°?没æ??é»?认ç??å¯?é?¥ç?¯ã??è?¥è¦?å??建é»?认ç??å¯?é?¥ç?¯ï¼?"
 #~ "请为å?¶è¾?å?¥å¯?ç ?ã??"
 
 #~ msgid ""
@@ -1200,7 +1228,7 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ "keyring. To create one, you need to choose the password you wish to use "
 #~ "for it."
 #~ msgstr ""
-#~ "åº?ç?¨ç¨?åº?â??%sâ??æ?³è¦?å­?å?¨å¯?ç ?ï¼?ä½?å°?没æ??é»?认ç??é?¥å??ç?¯ã??è?¥è¦?å??建é»?认ç??é?¥å??ç?¯ï¼?请为"
+#~ "åº?ç?¨ç¨?åº? %s æ?³è¦?å­?å?¨å¯?ç ?ï¼?ä½?å°?没æ??é»?认ç??å¯?é?¥ç?¯ã??è?¥è¦?å??建é»?认ç??å¯?é?¥ç?¯ï¼?请为"
 #~ "å?¶è¾?å?¥å¯?ç ?ã??"
 
 #~ msgid ""
@@ -1208,17 +1236,17 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ "keyring. To create one, you need to choose the password you wish to use "
 #~ "for it."
 #~ msgstr ""
-#~ "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?å­?å?¨å¯?ç ?ï¼?ä½?å°?没æ??é»?认ç??é?¥å??ç?¯ã??è?¥è¦?å??建é»?认ç??é?¥å??ç?¯ï¼?请为"
+#~ "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?å­?å?¨å¯?ç ?ï¼?ä½?å°?没æ??é»?认ç??å¯?é?¥ç?¯ã??è?¥è¦?å??建é»?认ç??å¯?é?¥ç?¯ï¼?请为"
 #~ "å?¶è¾?å?¥å¯?ç ?ã??"
 
 #~ msgid "Create Default Keyring"
-#~ msgstr "å??建é»?认é?¥å??ç?¯"
+#~ msgstr "å??建é»?认å¯?é?¥ç?¯"
 
 #~ msgid "Choose password for default keyring"
-#~ msgstr "é??æ?©é»?认é?¥å??ç?¯ç??å¯?ç ?"
+#~ msgstr "é??æ?©é»?认å¯?é?¥ç?¯ç??å¯?ç ?"
 
 #~ msgid "Create Login Keyring"
-#~ msgstr "å??建ç?»å½?é?¥å??ç?¯"
+#~ msgstr "å??建ç?»å½?å¯?é?¥ç?¯"
 
 #~ msgid "Enter your login password"
 #~ msgstr "è¾?å?¥æ?¨ç??ç?»å½?å¯?ç ?"
@@ -1226,25 +1254,25 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ msgid ""
 #~ "Your login keyring was not automatically created when you logged into "
 #~ "this computer. It will now be created."
-#~ msgstr "æ?¨ç?»å½?å?°æ­¤è®¡ç®?æ?ºæ?¶ï¼?æ?¨ç??ç?»å½?é?¥å??ç?¯æ?ªè¢«è?ªå?¨å??建ã??ç?°å?¨å??建å®?ã??"
+#~ msgstr "æ?¨ç?»å½?å?°æ­¤è®¡ç®?æ?ºæ?¶ï¼?æ?¨ç??ç?»å½?å¯?é?¥ç?¯æ?ªè¢«è?ªå?¨å??建ã??ç?°å?¨å??建å®?ã??"
 
 #~ msgid "Unlock password for %s keyring"
-#~ msgstr "%s é?¥å??ç?¯ç??解é??å¯?ç ?"
+#~ msgstr "%s å¯?é?¥ç?¯ç??解é??å¯?ç ?"
 
 #~ msgid "Automatically unlock this private key when I log in."
-#~ msgstr "å½?æ??ç?»å?¥æ?¶è?ªå?¨è§£é??æ­¤ç§?é?¥ã??"
+#~ msgstr "å½?æ??ç?»å½?æ?¶è?ªå?¨è§£é??æ­¤ç§?é?¥ã??"
 
 #~ msgid "Automatically unlock this certificate when I log in."
-#~ msgstr "å½?æ??ç?»å?¥æ?¶è?ªå?¨è§£é??æ­¤è¯?书ã??"
+#~ msgstr "å½?æ??ç?»å½?æ?¶è?ªå?¨è§£é??æ­¤è¯?书ã??"
 
 #~ msgid "Automatically unlock this public key when I log in."
-#~ msgstr "å½?æ??ç?»å?¥æ?¶è?ªå?¨è§£é??æ­¤å?¬é?¥ã??"
+#~ msgstr "å½?æ??ç?»å½?æ?¶è?ªå?¨è§£é??æ­¤å?¬é?¥ã??"
 
 #~ msgid "Automatically unlock this when I log in"
-#~ msgstr "å½?æ??ç?»å?¥æ?¶è?ªå?¨è§£é?¤æ­¤é??å®?ã??"
+#~ msgstr "å½?æ??ç?»å½?æ?¶è?ªå?¨è§£é?¤æ­¤é??å®?ã??"
 
 #~ msgid "Automatically unlock secure storage when I log in."
-#~ msgstr "å½?æ??ç?»å?¥æ?¶è?ªå?¨è§£é??å®?å?¨å­?å?¨å?¨ã??"
+#~ msgstr "å½?æ??ç?»å½?æ?¶è?ªå?¨è§£é??å®?å?¨å­?å?¨å?¨ã??"
 
 #~ msgid ""
 #~ "<b><big>Could not grab your mouse.</big></b>\n"
@@ -1254,9 +1282,9 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ "\n"
 #~ "Try again."
 #~ msgstr ""
-#~ "<b><big>æ? æ³?æ??å??ä½ ç??é¼ æ ?</big></b>\n"
+#~ "<b><big>æ? æ³?æ??å??æ?¨ç??é¼ æ ?</big></b>\n"
 #~ "\n"
-#~ "æ??个æ?¶æ??客æ?·ç«¯ä¹?许正å?¨çª?å?¬ä½ ç??è¿?ç¨?ï¼?æ??ä½ æ­£å¥½ç?¹å?»äº?æ??个è??å??æ??æ??äº?ç¨?åº?å??好é??"
+#~ "æ??个æ?¶æ??客æ?·ç«¯ä¹?许正å?¨çª?å?¬æ?¨ç??è¿?ç¨?ï¼?æ??æ?¨æ­£å¥½ç?¹å?»äº?æ??个è??å??æ??æ??äº?ç¨?åº?å??好é??"
 #~ "�����\n"
 #~ "\n"
 #~ "请é??è¯?ã??"
@@ -1269,9 +1297,9 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ "\n"
 #~ "Try again."
 #~ msgstr ""
-#~ "<b><big>æ? æ³?æ??å??ä½ ç??é?®ç??</big></b>\n"
+#~ "<b><big>æ? æ³?æ??å??æ?¨ç??é?®ç??</big></b>\n"
 #~ "\n"
-#~ "æ??个æ?¶æ??客æ?·ç«¯ä¹?许正å?¨çª?å?¬ä½ ç??è¿?ç¨?ï¼?æ??ä½ æ­£å¥½ç?¹å?»äº?æ??个è??å??æ??æ??äº?ç¨?åº?å??好é??"
+#~ "æ??个æ?¶æ??客æ?·ç«¯ä¹?许正å?¨çª?å?¬æ?¨ç??è¿?ç¨?ï¼?æ??æ?¨æ­£å¥½ç?¹å?»äº?æ??个è??å??æ??æ??äº?ç¨?åº?å??好é??"
 #~ "�����\n"
 #~ "\n"
 #~ "请é??è¯?ã??"
@@ -1301,7 +1329,7 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ msgstr "ä¸? gnome-keyring-daemon é??ä¿¡å?ºé??"
 
 #~ msgid "A keyring with that name already exists"
-#~ msgstr "å·²å­?å?¨ä¸?个å??å??ç??é?¥å??ç?¯"
+#~ msgstr "å·²å­?å?¨ä¸?个å??å??ç??å¯?é?¥ç?¯"
 
 #~ msgid "Programmer error: The application sent invalid data."
 #~ msgstr "ç¨?åº?å??é??误ï¼?åº?ç?¨ç¨?åº?å??é??äº?é??æ³?æ?°æ?®ã??"
@@ -1310,10 +1338,10 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ msgstr "æ? å?¹é??ç»?æ??"
 
 #~ msgid "A keyring with that name does not exist."
-#~ msgstr "ä¸?å­?å?¨æ­¤å??称对åº?ç??é?¥å??ç?¯"
+#~ msgstr "ä¸?å­?å?¨æ­¤å??称对åº?ç??å¯?é?¥ç?¯"
 
 #~ msgid "The keyring has already been unlocked."
-#~ msgstr "é?¥å??ç?¯å·²è¢«è§£é??ã??"
+#~ msgstr "å¯?é?¥ç?¯å·²è¢«è§£é??ã??"
 
 #~ msgid ""
 #~ "A list of paths to PKCS#11 modules to load. No modules are currently "
@@ -1339,19 +1367,19 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ msgstr "导�"
 
 #~ msgid "The system wants to import the private key '%s', but it is locked"
-#~ msgstr "ç³»ç»?æ?³è¦?导å?¥ç§?é?¥â??%sâ??ï¼?ä½?å®?å·²ä¸?é??"
+#~ msgstr "ç³»ç»?æ?³è¦?导å?¥ç§?é?¥ %s ï¼?ä½?å®?å·²ä¸?é??"
 
 #~ msgid "The system wants to import the certificate '%s', but it is locked"
-#~ msgstr "ç³»ç»?æ?³è¦?导å?¥è¯?书â??%sâ??ï¼?ä½?å®?å·²ä¸?é??"
+#~ msgstr "ç³»ç»?æ?³è¦?导å?¥è¯?书 %s ï¼?ä½?å®?å·²ä¸?é??"
 
 #~ msgid "The system wants to import the public key '%s', but it is locked"
-#~ msgstr "ç³»ç»?æ?³è¦?导å?¥å?¬é?¥â??%sâ??ï¼?ä½?å®?å·²ä¸?é??"
+#~ msgstr "ç³»ç»?æ?³è¦?导å?¥å?¬é?¥ %s ï¼?ä½?å®?å·²ä¸?é??"
 
 #~ msgid "The system wants to import '%s', but it is locked"
-#~ msgstr "ç³»ç»?æ?³è¦?导å?¥â??%sâ??ï¼?ä½?å®?å·²ä¸?é??"
+#~ msgstr "ç³»ç»?æ?³è¦?导å?¥ %s ï¼?ä½?å®?å·²ä¸?é??"
 
 #~ msgid "Create Storage for Key Information"
-#~ msgstr "为å¯?å??ä¿¡æ?¯å??建å?¨å­?å?¨"
+#~ msgstr "为å¯?é?¥ä¿¡æ?¯å??建å?¨å­?å?¨"
 
 #~ msgid "Choose password to protect storage"
 #~ msgstr "é??æ?©ä¿?æ?¤å­?å?¨å?¨ç??å¯?ç ?"
@@ -1361,11 +1389,11 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ "In order to protect this information, choose a password with which it "
 #~ "will be locked."
 #~ msgstr ""
-#~ "ç³»ç»?æ?³è¦?ä¿?å­?å?³äº?ä½ å¯?å??å??è¯?书ç??ä¿¡æ?¯ã??为äº?ä¿?æ?¤è¯¥ä¿¡æ?¯ï¼?请é??æ?©ä¸?个å¯?ç ?以ç?¨äº?é??"
+#~ "ç³»ç»?æ?³è¦?ä¿?å­?å?³äº?æ?¨å¯?é?¥å??è¯?书ç??ä¿¡æ?¯ã??为äº?ä¿?æ?¤è¯¥ä¿¡æ?¯ï¼?请é??æ?©ä¸?个å¯?ç ?以ç?¨äº?é??"
 #~ "å®?ã??"
 
 #~ msgid "Unlock Storage for Key Information"
-#~ msgstr "为å¯?å??ä¿¡æ?¯è§£é?¤å?¨å­?å?¨é??å®?"
+#~ msgstr "为å¯?é?¥ä¿¡æ?¯è§£é?¤å?¨å­?å?¨é??å®?"
 
 #~ msgid "Enter password to unlock storage"
 #~ msgstr "è¾?å?¥å¯?é??以解é?¤å­?å?¨å?¨é??å®?"
@@ -1373,7 +1401,7 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ msgid ""
 #~ "The system wants to access information about your keys and certificates, "
 #~ "but it is locked."
-#~ msgstr "ç³»ç»?æ?³è¦?访é?®å?³äº?ä½ å¯?å??å??è¯?书ç??ä¿¡æ?¯ï¼?ä½?å®?已被é??å®?"
+#~ msgstr "ç³»ç»?æ?³è¦?访é?®å?³äº?æ?¨å¯?é?¥å??è¯?书ç??ä¿¡æ?¯ï¼?ä½?å®?已被é??å®?"
 
 #~ msgid "Trust Association"
 #~ msgstr "ä¿¡ä»»è??ç??"
@@ -1396,12 +1424,12 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ msgid ""
 #~ "The system wants to store the private key '%s' on your disk. Please enter "
 #~ "a password to lock it with."
-#~ msgstr "ç³»ç»?æ?³è¦?å?¨ä½ ç??ç£?ç??ä¸?ä¿?å­?ç§?é?¥â??%sâ??ã??请è¾?å?¥ä¸?个å¯?ç ?以é??å®?ã??"
+#~ msgstr "ç³»ç»?æ?³è¦?å?¨æ?¨ç??ç£?ç??ä¸?ä¿?å­?ç§?é?¥ %s ã??请è¾?å?¥ä¸?个å¯?ç ?以é??å®?ã??"
 
 #~ msgid ""
 #~ "The system wants to store '%s' on your disk. Please enter a password to "
 #~ "lock it with."
-#~ msgstr "ç³»ç»?æ?³è¦?å?¨ä½ ç??ç£?ç??ä¸?å?¨å­? '%s' ã??请è¾?å?¥ä¸?个å¯?ç ?以å°?å?¶é??å®?ã??"
+#~ msgstr "ç³»ç»?æ?³è¦?å?¨æ?¨ç??ç£?ç??ä¸?å?¨å­? '%s' ã??请è¾?å?¥ä¸?个å¯?ç ?以å°?å?¶é??å®?ã??"
 
 #~ msgid "Unrecognized or unsupported file."
 #~ msgstr "æ?ªè¯?å?«ç??æ??ä¸?被æ?¯æ??ç??æ??件ã??"
@@ -1416,10 +1444,10 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ msgstr "æ? æ??ç??å®?å?¨å¤?壳ç§?å??å?¨ï¼?%s"
 
 #~ msgid "Couldn't encrypt the SSH key to store it."
-#~ msgstr "æ? æ³?å? å¯?该 SSH å¯?å??以ä¿?å­?ã??"
+#~ msgstr "æ? æ³?å? å¯?该 SSH å¯?é?¥ä»¥ä¿?å­?ã??"
 
 #~ msgid "Couldn't encode the SSH key to store it."
-#~ msgstr "æ? æ³?ç¼?ç ?该 SSH å¯?å??以ä¿?å­?ã??"
+#~ msgstr "æ? æ³?ç¼?ç ?该 SSH å¯?é?¥ä»¥ä¿?å­?ã??"
 
 #~ msgid "Old password cannot be blank."
 #~ msgstr "æ?§å¯?ç ?ä¸?è?½ä¸ºç©ºã??"
@@ -1430,31 +1458,31 @@ msgstr "æ? æ³?å¤?ç?? SSH å?¬å??"
 #~ msgid ""
 #~ "The application '%s' (%s) wants access to an unknown keyring, but it is "
 #~ "locked"
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??(%s)æ?³è¦?访é?®æ?ªç?¥é?¥å??ç?¯ï¼?ä½?该é?¥å??ç?¯å·²ä¸?é??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s (%s)æ?³è¦?访é?®æ?ªç?¥å¯?é?¥ç?¯ï¼?ä½?该å¯?é?¥ç?¯å·²ä¸?é??"
 
 #~ msgid ""
 #~ "The application '%s' wants access to an unknown keyring, but it is locked"
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??æ?³è¦?访é?®æ?ªç?¥é?¥å??ç?¯ï¼?ä½?该é?¥å??ç?¯å·²ä¸?é??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s æ?³è¦?访é?®æ?ªç?¥å¯?é?¥ç?¯ï¼?ä½?该å¯?é?¥ç?¯å·²ä¸?é??"
 
 #~ msgid ""
 #~ "An unknown application wants access to an unknown keyring, but it is "
 #~ "locked"
-#~ msgstr "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?访é?®æ?ªç?¥é?¥å??ç?¯ï¼?ä½?该é?¥å??ç?¯å·²ä¸?é??"
+#~ msgstr "æ?ªç?¥åº?ç?¨ç¨?åº?æ?³è¦?访é?®æ?ªç?¥å¯?é?¥ç?¯ï¼?ä½?该å¯?é?¥ç?¯å·²ä¸?é??"
 
 #~ msgid ""
 #~ "The application '%s' (%s) wants to access the password for '%s' in an "
 #~ "unknown keyring."
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??(%s)æ?³è¦?访é?®æ?ªç?¥é?¥å??ç?¯ä¸­â??%sâ??ç??å¯?ç ?ã??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s (%s)æ?³è¦?访é?®æ?ªç?¥å¯?é?¥ç?¯ä¸­ %s ç??å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "The application '%s' wants to access the password for '%s' in an unknown "
 #~ "keyring."
-#~ msgstr "åº?ç?¨ç¨?åº?â??%sâ??æ?³è¦?访é?®æ?ªç?¥é?¥å??ç?¯ä¸­â??%sâ??ç??å¯?ç ?ã??"
+#~ msgstr "åº?ç?¨ç¨?åº? %s æ?³è¦?访é?®æ?ªç?¥å¯?é?¥ç?¯ä¸­ %s ç??å¯?ç ?ã??"
 
 #~ msgid ""
 #~ "An unknown application wants to access the password for '%s' in an "
 #~ "unknown keyring."
-#~ msgstr "ä¸?个æ?ªç?¥ç¨?åº?æ?³è¦?访é?®æ?ªç?¥é?¥å??ç?¯ä¸­â??%sâ??ç??å¯?ç ?ã??"
+#~ msgstr "ä¸?个æ?ªç?¥ç¨?åº?æ?³è¦?访é?®æ?ªç?¥å¯?é?¥ç?¯ä¸­ %s ç??å¯?ç ?ã??"
 
 #~ msgid "You must specify the type of request to run\n"
 #~ msgstr "æ?¨å¿?é¡»æ??å®?è¦?æ?§è¡?ç??请æ±?ç±»å??\n"