[seahorse/gnome-3-32] Update Chinese (China) translation

[Translations User D-L <translations src gnome org>]

commit 2276c4c6dc39fc77d23cf32c8bd48b2ff705cbff
Author: Boyuan Yang <073plan gmail com>
Date:   Tue Jun 23 21:33:30 2020 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 2011 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1070 insertions(+), 941 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f4e5c75b..1fe3a37b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,22 +9,22 @@
 # Tong Hui <tonghuix gmail com>, 2013, 2014.
 # YunQiang Su <wzssyqa gmail com>, 2012, 2015.
 # Mingcong Bai <jeffbai aosc xyz>, 2018.
+# Dingzhong Chen <wsxy162 gmail com>, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: seahorse master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=seahorse&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-05-10 15:19+0000\n"
-"PO-Revision-Date: 2018-05-10 11:02-0500\n"
-"Last-Translator: Mingcong Bai <jeffbai aosc xyz>\n"
-"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Project-Id-Version: seahorse 3.32\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/seahorse/issues\n";
+"POT-Creation-Date: 2019-06-15 10:34+0000\n"
+"PO-Revision-Date: 2020-06-23 17:32-0400\n"
+"Last-Translator: Boyuan Yang <073plan gmail com>\n"
+"Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.3.1\n"
 
 #: common/add-keyserver-dialog.vala:32
 msgid "Add Key Server"
@@ -35,8 +35,9 @@ msgid "Custom"
 msgstr "制定"
 
 #. Buttons
-#: common/add-keyserver-dialog.vala:68 gkr/seahorse-gkr-add-item.ui:112
-#: gkr/seahorse-gkr-add-keyring.ui:82
+#: common/add-keyserver-dialog.vala:68 gkr/seahorse-gkr-add-item.ui:132
+#: gkr/seahorse-gkr-add-keyring.ui:82 pgp/seahorse-keyserver-search.ui:130
+#: pkcs11/seahorse-pkcs11-generate.ui:186 ssh/seahorse-ssh-upload.ui:138
 msgid "Cancel"
 msgstr "取消"
 
@@ -44,145 +45,50 @@ msgstr "取消"
 msgid "Save"
 msgstr "保存"
 
-#: common/catalog.vala:249
-msgid "Contributions:"
-msgstr "贡献者："
-
-#: common/catalog.vala:275 data/seahorse.desktop.in.in:3
-#: src/key-manager.vala:82
-msgid "Passwords and Keys"
-msgstr "密码和密钥"
-
-#: common/catalog.vala:277
-msgid "translator-credits"
-msgstr ""
-"wei Li <lw124124 gmail com>\n"
-"Zipeco <Zipeco btamail net cn>, 2002\n"
-"Funda Wang <fundawang linux net cn>, 2004\n"
-"Deng Xiyue <manphiz gmail com> 2007, 2008, 2009\n"
-"Aron Xu <happyaron xu gmail com>, 2009, 2010, 2011\n"
-"YunQiang Su <wzssyqa gmail com>, 2012\n"
-"Wylmer Wang <wantinghard gmail com>, 2010, 2011, 2013\n"
-"Tong Hui <tonghuix gmail com>, 2013\n"
-"Mingcong Bai <jeffbai aosc xyz>, 2018"
-
-#: common/catalog.vala:280
-msgid "Seahorse Project Homepage"
-msgstr "Seahorse 项目首页"
-
-#: common/catalog.vala:298
+#: common/catalog.vala:116
 msgid "Cannot delete"
 msgstr "无法删除"
 
-#: common/catalog.vala:321 common/key-manager-store.vala:375
+#: common/catalog.vala:130 common/key-manager-store.vala:418
 msgid "Couldn’t export keys"
 msgstr "无法导出密钥"
 
-#: common/catalog.vala:332
+#: common/catalog.vala:140
 msgid "Couldn’t export data"
 msgstr "无法导出数据"
 
-#: common/catalog.vala:348 libseahorse/seahorse-widget.c:461
-#, c-format
-msgid "Could not display help: %s"
-msgstr "无法显示帮助：%s"
-
-#. Top menu items
-#: common/catalog.vala:354
-msgid "_File"
-msgstr "文件(_F)"
-
-#: common/catalog.vala:355
-msgid "E_xport…"
-msgstr "导出(_X)…"
-
-#: common/catalog.vala:356
-msgid "Export to a file"
-msgstr "导出到文件"
-
-#: common/catalog.vala:357
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: common/catalog.vala:358
-msgid "_Copy"
-msgstr "复制(_C)"
-
-#: common/catalog.vala:359
-msgid "Copy to the clipboard"
-msgstr "复制到剪贴板"
+#. The buttons
+#: common/delete-dialog.vala:87 common/exportable.vala:191
+#: common/passphrase-prompt.vala:117 pgp/seahorse-gpgme-add-uid.ui:118
+#: pgp/seahorse-gpgme-photos.c:76 pgp/seahorse-gpgme-photos.c:264
+#: pgp/seahorse-gpgme-photos.c:324 pgp/seahorse-pgp-generate.ui:294
+#: pkcs11/pkcs11-request.vala:55 pkcs11/pkcs11-request.vala:106
+#: src/import-dialog.vala:34 src/key-manager.vala:249
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#. Translators: This text refers to deleting an item from its type's backing store
 #. Delete item
-#: common/catalog.vala:361 common/delete-dialog.vala:91
-#: pkcs11/pkcs11-properties.vala:201 src/sidebar.vala:655
+#: common/delete-dialog.vala:91 pgp/seahorse-gpgme-photos.c:323
+#: pkcs11/pkcs11-properties.vala:201 src/sidebar.vala:650
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: common/catalog.vala:362
-msgid "Delete selected items"
-msgstr "删除已选择的项目"
-
-#. Properties item
-#: common/catalog.vala:363 common/catalog.vala:365 src/sidebar.vala:664
-msgid "_Properties"
-msgstr "属性(_P)"
-
-#: common/catalog.vala:364
-msgid "Show the properties of this item"
-msgstr "显示此项目的属性"
-
-#: common/catalog.vala:366
-msgid "Show the properties of this keyring"
-msgstr "显示此密钥环的属性"
-
-#: common/catalog.vala:367
-msgid "Prefere_nces"
-msgstr "首选项(_N)"
-
-#: common/catalog.vala:368
-msgid "Change preferences for this program"
-msgstr "修改此程序的首选项"
-
-#: common/catalog.vala:369
-msgid "_View"
-msgstr "视图(_V)"
-
-#: common/catalog.vala:370
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: common/catalog.vala:371
-msgid "_About"
-msgstr "关于(_A)"
-
-#: common/catalog.vala:372
-msgid "About this program"
-msgstr "关于此程序"
-
-#: common/catalog.vala:373
-msgid "_Contents"
-msgstr "内容(_C)"
-
-#: common/catalog.vala:374
-msgid "Show Seahorse help"
-msgstr "显示 Seahorse 帮助"
-
-#: common/delete-dialog.vala:87 common/exportable.vala:191
-#: common/passphrase-prompt.vala:117 src/key-manager.vala:237
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: common/exportable.vala:192 pgp/seahorse-pgp-private-key-properties.ui:1427
+#: common/exportable.vala:192 pgp/seahorse-pgp-private-key-properties.ui:909
+#: ssh/seahorse-ssh-key-properties.ui:280
 msgid "Export"
 msgstr "导出"
 
+#: common/interaction.vala:61
+#, c-format
+msgid "Enter PIN or password for: %s"
+msgstr "输入密码或 PIN：%s"
+
 #. The second and main entry
 #: common/passphrase-prompt.vala:92
 msgid "Confirm:"
 msgstr "确认："
 
-#: common/passphrase-prompt.vala:121
+#: common/passphrase-prompt.vala:121 pgp/seahorse-gpgme-add-uid.ui:127
 msgid "_OK"
 msgstr "确定(_O)"
 
@@ -190,7 +96,7 @@ msgstr "确定(_O)"
 msgid "Password:"
 msgstr "密码："
 
-#: common/prefs.vala:42
+#: common/prefs.vala:42 src/seahorse-key-manager.ui:43
 msgid "Preferences"
 msgstr "首选项"
 
@@ -224,8 +130,8 @@ msgstr "密钥服务器类型："
 msgid "Host:"
 msgstr "主机："
 
-#: common/seahorse-add-keyserver.ui:77 ssh/seahorse-ssh-upload.ui:59
-#: ssh/seahorse-ssh-upload.ui:127
+#: common/seahorse-add-keyserver.ui:77 ssh/seahorse-ssh-upload.ui:67
+#: ssh/seahorse-ssh-upload.ui:108
 msgid "The host name or address of the server."
 msgstr "服务器的主机名称或地址。"
 
@@ -257,31 +163,29 @@ msgstr "自动从密钥服务器同步修改的密钥(_M)"
 msgid "Key Servers"
 msgstr "密钥服务器"
 
-#: common/validity.vala:38 pgp/seahorse-pgp-key-properties.c:1250
-#: pgp/seahorse-pgp-private-key-properties.ui:12
-#: pgp/seahorse-pgp-public-key-properties.ui:12
+#: common/validity.vala:38 pgp/seahorse-pgp-private-key-properties.ui:11
+#: pgp/seahorse-pgp-public-key-properties.ui:11
 msgctxt "Validity"
 msgid "Unknown"
 msgstr "未知"
 
-#: common/validity.vala:40 pgp/seahorse-pgp-key-properties.c:1256
-#: pgp/seahorse-pgp-private-key-properties.ui:15
-#: pgp/seahorse-pgp-public-key-properties.ui:15
+#: common/validity.vala:40 pgp/seahorse-pgp-private-key-properties.ui:14
+#: pgp/seahorse-pgp-public-key-properties.ui:14
 msgctxt "Validity"
 msgid "Never"
 msgstr "从不"
 
-#: common/validity.vala:42 pgp/seahorse-pgp-private-key-properties.ui:18
+#: common/validity.vala:42 pgp/seahorse-pgp-private-key-properties.ui:17
 msgctxt "Validity"
 msgid "Marginal"
 msgstr "最低限度"
 
-#: common/validity.vala:44 pgp/seahorse-pgp-private-key-properties.ui:21
+#: common/validity.vala:44 pgp/seahorse-pgp-private-key-properties.ui:20
 msgctxt "Validity"
 msgid "Full"
 msgstr "完全"
 
-#: common/validity.vala:46 pgp/seahorse-pgp-private-key-properties.ui:24
+#: common/validity.vala:46 pgp/seahorse-pgp-private-key-properties.ui:23
 msgctxt "Validity"
 msgid "Ultimate"
 msgstr "彻底"
@@ -296,15 +200,148 @@ msgctxt "Validity"
 msgid "Revoked"
 msgstr "已吊销"
 
-#: data/seahorse.appdata.xml.in:6
+#: data/org.gnome.seahorse.gschema.xml:5
+msgid "Auto retrieve keys"
+msgstr "自动获取密钥"
+
+#: data/org.gnome.seahorse.gschema.xml:6
+msgid "Whether or not keys should be automatically retrieved from key servers."
+msgstr "是否自动从密钥服务器获取密钥。"
+
+#: data/org.gnome.seahorse.gschema.xml:10
+msgid "Auto publish keys"
+msgstr "自动发布密钥"
+
+#: data/org.gnome.seahorse.gschema.xml:11
+msgid "Whether or not modified keys should be automatically published."
+msgstr "是否自动发布已更改的密钥。"
+
+#: data/org.gnome.seahorse.gschema.xml:15
+msgid "Publish keys to this key server"
+msgstr "将密钥发布至此密钥服务器"
+
+#: data/org.gnome.seahorse.gschema.xml:16
+msgid ""
+"The key server to publish PGP keys to. Or empty to suppress publishing of "
+"PGP keys."
+msgstr "用来发行 PGP 密钥的服务器。留空以禁止发行 PGP 密钥。"
+
+#: data/org.gnome.seahorse.gschema.xml:20
+msgid "Last key server search pattern"
+msgstr "上次密钥服务器的搜索模式"
+
+#: data/org.gnome.seahorse.gschema.xml:21
+msgid "The last search pattern searched for against a key server."
+msgstr "上次在密钥服务器的搜索模式。"
+
+#: data/org.gnome.seahorse.gschema.xml:25
+msgid "Last key servers used"
+msgstr "上次使用的密钥服务器"
+
+#: data/org.gnome.seahorse.gschema.xml:26
+msgid ""
+"The last key server a search was performed against or empty for all key "
+"servers."
+msgstr "上次搜索的密钥服务器，或留空以指定所有密钥服务器。"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:5
+msgid "Show keyrings sidebar"
+msgstr "显示密钥环侧边栏"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:6
+msgid "Show keyrings sidebar in Seahorse."
+msgstr "在 Seahorse 中显示密钥环侧边栏。"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:10
+msgid "Which items to show"
+msgstr "要显示的条目"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:11
+msgid ""
+"Filter which items to show. If empty, show all items, if “personal” show "
+"personal keys, if “trusted” show trusted."
+msgstr ""
+"过滤要显示的条目。如果为空则显示所有条目，如果写入“personal”则显示个人密钥，"
+"如果写入“trusted”则显示已信任的密钥。"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:16
+msgid "Width of the side pane"
+msgstr "侧边栏宽度"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:17
+msgid "The default width of the side pane."
+msgstr "默认侧边栏宽度。"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:21
+msgid "The keyrings chosen"
+msgstr "已选择的密钥环"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:22
+msgid "The URIs of the keyrings chosen in the sidebar."
+msgstr "已从侧边栏选中的密钥环的 URI。"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:29
+msgid "The column to sort the Seahorse keys by"
+msgstr "用于排序 Seahorse 密钥的列"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:30
+msgid ""
+"Specify the column to sort the Seahorse key manager main window by. Columns "
+"are: “name”, “id”, “validity”, “expires”, “trust”, and “type”. Put a “-” in "
+"front of the column name to sort in descending order."
+msgstr ""
+"指定用于排序 Seahorse 密钥管理器主窗口的列。列名称为：“名称”、“id”、“有效"
+"性”、“有效日期”、“是否信任”和“类型”。在列名前加上“-”以进行逆向排序。"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:34
+msgid "Show validity column"
+msgstr "显示有效性列"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:35
+#: data/org.gnome.seahorse.manager.gschema.xml:40
+#: data/org.gnome.seahorse.manager.gschema.xml:45
+#: data/org.gnome.seahorse.manager.gschema.xml:50
+msgid "No longer in use."
+msgstr "不再使用。"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:39
+msgid "Show expiry column"
+msgstr "显示过期列"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:44
+msgid "Show trust column"
+msgstr "显示是否信任列"
+
+#: data/org.gnome.seahorse.manager.gschema.xml:49
+msgid "Show type column"
+msgstr "显示类型列"
+
+#: data/org.gnome.seahorse.window.gschema.xml:5
+msgid "Width of the window"
+msgstr "窗口宽度"
+
+#: data/org.gnome.seahorse.window.gschema.xml:6
+msgid "Width (in pixels) of the window."
+msgstr "窗口宽度（像素）。"
+
+#: data/org.gnome.seahorse.window.gschema.xml:10
+msgid "Height of the window"
+msgstr "窗口高度"
+
+#: data/org.gnome.seahorse.window.gschema.xml:11
+msgid "Height (in pixels) of the window."
+msgstr "窗口高度（像素）。"
+
+#: data/org.gnome.seahorse.Application.appdata.xml.in:6
 msgid "Seahorse"
 msgstr "Seahorse"
 
-#: data/seahorse.appdata.xml.in:7 data/seahorse.desktop.in.in:4
+#: data/org.gnome.seahorse.Application.appdata.xml.in:7
+#: data/org.gnome.seahorse.Application.desktop.in.in:4
 msgid "Manage your passwords and encryption keys"
 msgstr "管理您的密码和加密密钥"
 
-#: data/seahorse.appdata.xml.in:9
+#: data/org.gnome.seahorse.Application.appdata.xml.in:9
 msgid ""
 "Seahorse is a GNOME application for managing encryption keys. It also "
 "integrates with nautilus, gedit and other places for encryption operations."
@@ -312,7 +349,7 @@ msgstr ""
 "Seahorse 是一款用于管理加密密钥的 GNOME 应用程序。它也与 nautilus、gedit 和其"
 "他地方集成，处理加密操作。"
 
-#: data/seahorse.appdata.xml.in:13
+#: data/org.gnome.seahorse.Application.appdata.xml.in:13
 msgid ""
 "With seahorse you can create and manage PGP keys, create and manage SSH "
 "keys, publish and retrieve keys from key servers, cache your passphrase so "
@@ -321,153 +358,154 @@ msgstr ""
 "您可以通过 seahorse 创建和管理 PGP 密钥，创建和管理 SSH 密钥、将密钥发送到密"
 "钥服务器或取回、缓存您的口令以免重复输入，以及备份您的密钥和密钥环。"
 
+#: data/org.gnome.seahorse.Application.appdata.xml.in:105
+msgid "The GNOME Project"
+msgstr "GNOME 项目"
+
+#: data/org.gnome.seahorse.Application.desktop.in.in:3 src/application.vala:158
+#: src/seahorse-key-manager.ui:277
+msgid "Passwords and Keys"
+msgstr "密码和密钥"
+
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: data/seahorse.desktop.in.in:6
+#: data/org.gnome.seahorse.Application.desktop.in.in:6
 msgid "keyring;encryption;security;sign;ssh;"
 msgstr "密钥环;加密;安全;签名;密码;keyring;encryption;security;sign;ssh;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: data/seahorse.desktop.in.in:11
-msgid "seahorse"
-msgstr "seahorse"
-
-#: gkr/gkr-backend.vala:43
+#: gkr/gkr-backend.vala:39
 msgid "Passwords"
 msgstr "密码"
 
-#: gkr/gkr-backend.vala:47
+#: gkr/gkr-backend.vala:43
 msgid "Stored personal passwords, credentials and secrets"
 msgstr "存储个人密码、证书和私钥"
 
-#: gkr/gkr-backend.vala:255
-msgid "New password keyring"
-msgstr "新建密码密钥环"
-
-#: gkr/gkr-backend.vala:256 gkr/gkr-backend.vala:263
-msgid "Used to store application and network passwords"
-msgstr "用来保存应用程序和网络密码"
-
-#: gkr/gkr-backend.vala:257
-msgid "New password…"
-msgstr "新建密码…"
-
-#: gkr/gkr-backend.vala:258 gkr/gkr-backend.vala:265
-msgid "Safely store a password or secret."
-msgstr "安全地储存密码或密语。"
-
-#: gkr/gkr-backend.vala:262
-msgid "Password Keyring"
-msgstr "密码密钥环"
-
-#: gkr/gkr-backend.vala:264
-msgid "Stored Password"
-msgstr "已储存的密码"
+#: gkr/gkr-item-add.vala:113 src/sidebar.vala:604
+msgid "Couldn’t unlock"
+msgstr "无法解锁"
 
-#: gkr/gkr-item-add.vala:103
+#: gkr/gkr-item-add.vala:137
 msgid "Couldn’t add item"
 msgstr "无法添加项目"
 
-#: gkr/gkr-item-properties.vala:102
+#: gkr/gkr-item-properties.vala:106
 msgid "Save changes for this item?"
 msgstr "要保存此条目的更改吗？"
 
-#: gkr/gkr-item-properties.vala:120
+#: gkr/gkr-item-properties.vala:123
 msgid "Access a network share or resource"
 msgstr "访问网络共享或资源"
 
-#: gkr/gkr-item-properties.vala:123
+#: gkr/gkr-item-properties.vala:126
 msgid "Access a website"
 msgstr "访问站点"
 
-#: gkr/gkr-item-properties.vala:126
+#: gkr/gkr-item-properties.vala:129
 msgid "Unlocks a PGP key"
 msgstr "解锁 PGP 密钥"
 
-#: gkr/gkr-item-properties.vala:129
+#: gkr/gkr-item-properties.vala:132
 msgid "Unlocks a Secure Shell key"
 msgstr "解锁 SSH 密钥"
 
-#: gkr/gkr-item-properties.vala:132
+#: gkr/gkr-item-properties.vala:135
 msgid "Saved password or login"
 msgstr "已存储的密码或登录"
 
-#: gkr/gkr-item-properties.vala:145
+#: gkr/gkr-item-properties.vala:147
 msgid "Network Credentials"
 msgstr "网络证书"
 
-#: gkr/gkr-item-properties.vala:150 gkr/seahorse-gkr-item-properties.ui:68
+#: gkr/gkr-item-properties.vala:152 gkr/seahorse-gkr-item-properties.ui:70
+#: src/seahorse-key-manager.ui:191
 msgid "Password"
 msgstr "密码"
 
-#: gkr/gkr-item-properties.vala:206
+#: gkr/gkr-item-properties.vala:209
 msgid "Couldn’t change password."
 msgstr "无法更改密码。"
 
-#: gkr/gkr-item-properties.vala:230
+#: gkr/gkr-item-properties.vala:233
 msgid "Couldn’t set description."
 msgstr "无法设置说明。"
 
+#: gkr/gkr-item-properties.vala:268
+msgid "Error deleting the password."
+msgstr "删除密码时出错。"
+
 #. Translators: This should be the same as the string in empathy
-#: gkr/gkr-item.vala:388
+#: gkr/gkr-item.vala:425
 msgid "IM account password for "
 msgstr "即时通信帐号密码，用于 "
 
-#: gkr/gkr-item.vala:444
+#: gkr/gkr-item.vala:485
+msgid "Wi-Fi password"
+msgstr "Wi-Fi 密码"
+
+#: gkr/gkr-item.vala:490
 msgid "Password or secret"
 msgstr "密码或私钥"
 
-#: gkr/gkr-item.vala:445
+#: gkr/gkr-item.vala:491
 msgid "Network password"
 msgstr "网络密码"
 
-#: gkr/gkr-item.vala:446
+#: gkr/gkr-item.vala:492
 msgid "Stored note"
 msgstr "已存储的便笺"
 
-#: gkr/gkr-item.vala:447
+#: gkr/gkr-item.vala:493
 msgid "Keyring password"
 msgstr "密钥环密码"
 
-#: gkr/gkr-item.vala:448
+#: gkr/gkr-item.vala:494
 msgid "Encryption key password"
 msgstr "加密密钥口令"
 
-#: gkr/gkr-item.vala:449
+#: gkr/gkr-item.vala:495
 msgid "Key storage password"
 msgstr "密钥存储口令"
 
-#: gkr/gkr-item.vala:450
+#: gkr/gkr-item.vala:496
+msgid "GNOME Web password"
+msgstr "GNOME Web 密码"
+
+#: gkr/gkr-item.vala:497
 msgid "Google Chrome password"
 msgstr "Google Chrome 密码"
 
-#: gkr/gkr-item.vala:451
+#: gkr/gkr-item.vala:498
 msgid "GNOME Online Accounts password"
 msgstr "GNOME 在线帐号密码"
 
-#: gkr/gkr-item.vala:452
+#: gkr/gkr-item.vala:499
 msgid "Telepathy password"
 msgstr "Telepathy 密码"
 
-#: gkr/gkr-item.vala:453
+#: gkr/gkr-item.vala:500
 msgid "Instant messaging password"
 msgstr "即时通讯密码"
 
-#: gkr/gkr-item.vala:454
+#: gkr/gkr-item.vala:501
 msgid "Network Manager secret"
-msgstr "网络管理器私钥"
+msgstr "网络管理器（NetworkManager）密文"
+
+#: gkr/gkr-item.vala:502
+msgid "Network connection secret"
+msgstr "网络连接密文"
 
-#: gkr/gkr-item.vala:504
+#: gkr/gkr-item.vala:565
 #, c-format
 msgid "Are you sure you want to delete the password “%s”?"
 msgstr "您确定要删除密码“%s”吗？"
 
-#: gkr/gkr-item.vala:506
+#: gkr/gkr-item.vala:567
 #, c-format
 msgid "Are you sure you want to delete %d password?"
 msgid_plural "Are you sure you want to delete %d passwords?"
 msgstr[0] "您确定要删除 %d 个密码吗？"
 
-#: gkr/gkr-keyring-add.vala:52
+#: gkr/gkr-keyring-add.vala:53
 msgid "Couldn’t add keyring"
 msgstr "无法添加密钥环"
 
@@ -475,44 +513,36 @@ msgstr "无法添加密钥环"
 msgid "Unknown date"
 msgstr "未知日期"
 
-#: gkr/gkr-keyring.vala:28
+#: gkr/gkr-keyring.vala:34
 msgid "A keyring that is automatically unlocked on login"
 msgstr "登录系统时自动解锁的密钥环"
 
-#: gkr/gkr-keyring.vala:29
+#: gkr/gkr-keyring.vala:35
 msgid "A keyring used to store passwords"
 msgstr "用于存储密码的密钥环"
 
-#: gkr/gkr-keyring.vala:174
+#: gkr/gkr-keyring.vala:192
 msgid "Couldn’t set default keyring"
 msgstr "无法设置默认密钥环"
 
-#: gkr/gkr-keyring.vala:198 gkr/gkr-keyring.vala:203
+#: gkr/gkr-keyring.vala:219 gkr/gkr-keyring.vala:224
 msgid "Couldn’t change keyring password"
 msgstr "无法更改密钥环密码"
 
-#: gkr/gkr-keyring.vala:209
+#: gkr/gkr-keyring.vala:243
 msgid "_Set as default"
 msgstr "设为默认(_S)"
 
-#: gkr/gkr-keyring.vala:210
-msgid "Applications usually store new passwords in the default keyring."
-msgstr "应用程序通常将新密码存储在默认密钥环中。"
-
-#: gkr/gkr-keyring.vala:211
+#: gkr/gkr-keyring.vala:244
 msgid "Change _Password"
 msgstr "更改密码(_P)"
 
-#: gkr/gkr-keyring.vala:212
-msgid "Change the unlock password of the password storage keyring"
-msgstr "修改密码存储密钥环的解锁密码"
-
-#: gkr/gkr-keyring.vala:237
+#: gkr/gkr-keyring.vala:255
 #, c-format
 msgid "Are you sure you want to delete the password keyring “%s”?"
 msgstr "您确定要删除密码密钥环“%s”吗？"
 
-#: gkr/gkr-keyring.vala:240
+#: gkr/gkr-keyring.vala:258
 msgid "I understand that all items will be permanently deleted."
 msgstr "我明白，所有的条目都将永久删除。"
 
@@ -528,8 +558,8 @@ msgstr "添加密码"
 msgid "_Keyring:"
 msgstr "密钥环(_K)："
 
-#: gkr/seahorse-gkr-add-item.ui:45 gkr/seahorse-gkr-item-properties.ui:41
-#: pgp/seahorse-revoke.ui:55 ssh/seahorse-ssh-generate.ui:130
+#: gkr/seahorse-gkr-add-item.ui:45 pgp/seahorse-revoke.ui:55
+#: ssh/seahorse-ssh-generate.ui:78
 msgid "_Description:"
 msgstr "描述(_D)："
 
@@ -537,11 +567,7 @@ msgstr "描述(_D)："
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: gkr/seahorse-gkr-add-item.ui:93
-msgid "_Show Password"
-msgstr "显示密码(_S)"
-
-#: gkr/seahorse-gkr-add-item.ui:119 gkr/seahorse-gkr-add-keyring.ui:89
+#: gkr/seahorse-gkr-add-item.ui:139 gkr/seahorse-gkr-add-keyring.ui:89
 msgid "OK"
 msgstr "确定"
 
@@ -559,69 +585,67 @@ msgstr "请为新密钥环选择名称。您将会被提示输入解锁密码。
 msgid "New Keyring Name:"
 msgstr "新密钥环名称："
 
-#. To translators: This is the noun not the verb.
-#: gkr/seahorse-gkr-item-properties.ui:92
-#: pgp/seahorse-pgp-private-key-properties.ui:553
-#: pgp/seahorse-pgp-public-key-properties.ui:442
-msgid "Use:"
-msgstr "使用："
-
-#: gkr/seahorse-gkr-item-properties.ui:118
-#: pgp/seahorse-pgp-private-key-properties.ui:567
-#: pgp/seahorse-pgp-private-key-properties.ui:1106
-#: pgp/seahorse-pgp-public-key-properties.ui:557
-#: pgp/seahorse-pgp-public-key-properties.ui:1223
-#: ssh/seahorse-ssh-key-properties.ui:81
-msgid "Type:"
-msgstr "类型："
+#: gkr/seahorse-gkr-item-properties.ui:8
+msgid "Item Properties"
+msgstr "项目属性"
 
-#: gkr/seahorse-gkr-item-properties.ui:143
-msgid "Server:"
-msgstr "服务器："
+#: gkr/seahorse-gkr-item-properties.ui:43
+msgid "Description"
+msgstr "描述"
 
-#: gkr/seahorse-gkr-item-properties.ui:167
-msgid "Login:"
-msgstr "登录："
+#: gkr/seahorse-gkr-item-properties.ui:86
+msgid "Copy"
+msgstr "复制"
 
-#: gkr/seahorse-gkr-item-properties.ui:206 pgp/seahorse-pgp-subkey.c:402
-#: ssh/seahorse-ssh-key-properties.ui:245
-msgid "Key"
-msgstr "密钥"
+#. To translators: This is the noun not the verb.
+#: gkr/seahorse-gkr-item-properties.ui:113
+msgid "Use"
+msgstr "使用"
 
-#: gkr/seahorse-gkr-item-properties.ui:256
-#: pgp/seahorse-pgp-public-key-properties.ui:1151
-#: ssh/seahorse-ssh-key-properties.ui:414
-msgid "Technical Details:"
-msgstr "技术细节："
+#: gkr/seahorse-gkr-item-properties.ui:139
+#: pgp/seahorse-pgp-key-properties.c:1217
+msgid "Type"
+msgstr "类型"
+
+#: gkr/seahorse-gkr-item-properties.ui:165
+msgid "Server"
+msgstr "服务器"
+
+#: gkr/seahorse-gkr-item-properties.ui:191
+msgid "Login"
+msgstr "登录"
 
-#: gkr/seahorse-gkr-item-properties.ui:276
-#: pgp/seahorse-pgp-private-key-properties.ui:1722
-#: pgp/seahorse-pgp-public-key-properties.ui:1611
-#: ssh/seahorse-ssh-key-properties.ui:458
+#: gkr/seahorse-gkr-item-properties.ui:218
+#: pgp/seahorse-pgp-private-key-properties.ui:1103
+#: pgp/seahorse-pgp-public-key-properties.ui:915
 msgid "Details"
 msgstr "细节"
 
+#: gkr/seahorse-gkr-item-properties.ui:255
+msgid "Delete Password"
+msgstr "删除密码"
+
 #: gkr/seahorse-gkr-keyring.ui:9
 msgid "Keyring properties"
 msgstr "密钥环属性"
 
-#: gkr/seahorse-gkr-keyring.ui:23
-msgid "Keyring is unlocked"
-msgstr "密钥环已解锁"
+#: gkr/seahorse-gkr-keyring.ui:23 src/seahorse-key-manager.ui:487
+msgid "Keyring is locked"
+msgstr "密钥环已锁定"
 
-#: gkr/seahorse-gkr-keyring.ui:33
+#: gkr/seahorse-gkr-keyring.ui:33 src/seahorse-key-manager.ui:497
 msgid "Unlock"
 msgstr "解锁"
 
 #: gkr/seahorse-gkr-keyring.ui:46
-msgid "Keyring is locked"
-msgstr "密钥环已锁定"
+msgid "Keyring is unlocked"
+msgstr "密钥环已解锁"
 
 #: gkr/seahorse-gkr-keyring.ui:56
 msgid "Lock"
 msgstr "锁定"
 
-#: gkr/seahorse-gkr-keyring.ui:102 pgp/seahorse-pgp-key-properties.c:969
+#: gkr/seahorse-gkr-keyring.ui:102 pgp/seahorse-pgp-key-properties.c:851
 msgid "Name"
 msgstr "名称"
 
@@ -892,10 +916,10 @@ msgstr "%04d-%02d-%02d"
 msgid "%u:%u:%u"
 msgstr "%u:%u:%u"
 
-#: libseahorse/seahorse-interaction.c:97
+#: libseahorse/seahorse-widget.c:461
 #, c-format
-msgid "Enter PIN or password for: %s"
-msgstr "输入密码或 PIN：%s"
+msgid "Could not display help: %s"
+msgstr "无法显示帮助：%s"
 
 #: pgp/seahorse-add-subkey.ui:31
 msgid "Never E_xpires"
@@ -905,7 +929,7 @@ msgstr "永不过期(_X)"
 msgid "If key never expires"
 msgstr "如果密钥永不过期"
 
-#: pgp/seahorse-add-subkey.ui:65 pkcs11/seahorse-pkcs11-generate.ui:149
+#: pgp/seahorse-add-subkey.ui:65 pkcs11/seahorse-pkcs11-generate.ui:128
 msgid "Key _Type:"
 msgstr "密钥类型(_T)："
 
@@ -925,39 +949,6 @@ msgstr "密钥长度"
 msgid "Generate a new subkey"
 msgstr "生成一个新的子密钥"
 
-#: pgp/seahorse-add-uid.ui:8
-msgid "Add User ID"
-msgstr "添加用户 ID"
-
-#: pgp/seahorse-add-uid.ui:28
-msgid "Must be at least 5 characters long"
-msgstr "必须至少5个字符长度"
-
-#: pgp/seahorse-add-uid.ui:42
-msgid "Optional email address"
-msgstr "可选电子邮件地址"
-
-#: pgp/seahorse-add-uid.ui:58
-msgid "Optional comment describing key"
-msgstr "可选的描述密钥的注释"
-
-#. Full name of the key, usually the name of the user.
-#: pgp/seahorse-add-uid.ui:73 pgp/seahorse-pgp-generate.ui:191
-msgid "Full _Name:"
-msgstr "全名(_N)："
-
-#: pgp/seahorse-add-uid.ui:86 pgp/seahorse-pgp-generate.ui:204
-msgid "_Email Address:"
-msgstr "电子邮件地址(_E)："
-
-#: pgp/seahorse-add-uid.ui:101
-msgid "Key Co_mment:"
-msgstr "密钥注释(_M)："
-
-#: pgp/seahorse-add-uid.ui:162
-msgid "Create the new user ID"
-msgstr "创建新用户 ID"
-
 #: pgp/seahorse-expires.ui:22
 msgid "_Never expires"
 msgstr "永不过期(_N)"
@@ -979,7 +970,7 @@ msgstr "无法添加子密钥"
 msgid "Add subkey to %s"
 msgstr "向 %s 添加子密钥"
 
-#: pgp/seahorse-gpgme-add-subkey.c:196 pgp/seahorse-gpgme-generate.c:131
+#: pgp/seahorse-gpgme-add-subkey.c:196 pgp/seahorse-gpgme-generate.c:78
 msgid "DSA (sign only)"
 msgstr "DSA（仅签署）"
 
@@ -987,7 +978,7 @@ msgstr "DSA（仅签署）"
 msgid "ElGamal (encrypt only)"
 msgstr "ElGamal（仅加密）"
 
-#: pgp/seahorse-gpgme-add-subkey.c:210 pgp/seahorse-gpgme-generate.c:132
+#: pgp/seahorse-gpgme-add-subkey.c:210 pgp/seahorse-gpgme-generate.c:79
 msgid "RSA (sign only)"
 msgstr "RSA（仅签署）"
 
@@ -995,15 +986,56 @@ msgstr "RSA（仅签署）"
 msgid "RSA (encrypt only)"
 msgstr "RSA（仅加密）"
 
-#: pgp/seahorse-gpgme-add-uid.c:99
-msgid "Couldn’t add user id"
-msgstr "无法添加用户 ID"
-
-#: pgp/seahorse-gpgme-add-uid.c:121
+#: pgp/seahorse-gpgme-add-uid.c:149
 #, c-format
 msgid "Add user ID to %s"
 msgstr "向 %s 添加用户 ID"
 
+#: pgp/seahorse-gpgme-add-uid.c:217
+msgid "Couldn’t add user ID"
+msgstr "无法添加用户 ID"
+
+#: pgp/seahorse-gpgme-add-uid.ui:8
+msgid "Add User ID"
+msgstr "添加用户 ID"
+
+#. Full name of the key, usually the name of the user.
+#: pgp/seahorse-gpgme-add-uid.ui:24
+msgid "Full _Name"
+msgstr "全名(_N)"
+
+#: pgp/seahorse-gpgme-add-uid.ui:42
+msgid "Must be at least 5 characters long"
+msgstr "必须至少5个字符长度"
+
+#: pgp/seahorse-gpgme-add-uid.ui:55
+msgid "_Email Address"
+msgstr "电子邮件地址(_E)"
+
+#: pgp/seahorse-gpgme-add-uid.ui:72
+msgid "Optional email address"
+msgstr "可选电子邮件地址"
+
+#: pgp/seahorse-gpgme-add-uid.ui:85
+msgid "Key Co_mment"
+msgstr "密钥注释(_M)"
+
+#: pgp/seahorse-gpgme-add-uid.ui:102
+msgid "Optional comment describing key"
+msgstr "可选的描述密钥的注释"
+
+#: pgp/seahorse-gpgme-add-uid.ui:134
+msgid "Create the new user ID"
+msgstr "创建新用户 ID"
+
+#: pgp/seahorse-gpgme.c:69
+msgid "Decryption failed. You probably do not have the decryption key."
+msgstr "解密失败。您可能没有解密密钥。"
+
+#: pgp/seahorse-gpgme.c:73 pgp/seahorse-hkp-source.c:515
+msgid "The operation was cancelled"
+msgstr "操作被取消"
+
 #: pgp/seahorse-gpgme-expires.c:63
 msgid "Invalid expiry date"
 msgstr "无效的有效期"
@@ -1021,53 +1053,45 @@ msgstr "无法更改过期日期"
 msgid "Expiry: %s"
 msgstr "过期状态：%s"
 
-#: pgp/seahorse-gpgme-exporter.c:81
+#: pgp/seahorse-gpgme-exporter.c:72
 msgid "Multiple Keys"
 msgstr "多个密钥"
 
-#: pgp/seahorse-gpgme-exporter.c:85
+#: pgp/seahorse-gpgme-exporter.c:76
 msgid "Key Data"
 msgstr "密钥数据"
 
-#: pgp/seahorse-gpgme-exporter.c:113
+#: pgp/seahorse-gpgme-exporter.c:104
 msgid "Armored PGP keys"
 msgstr "字符形式的 PGP 密钥"
 
-#: pgp/seahorse-gpgme-exporter.c:117
+#: pgp/seahorse-gpgme-exporter.c:108
 msgid "PGP keys"
 msgstr "PGP 密钥"
 
-#: pgp/seahorse-gpgme-generate.c:92
-msgid "PGP Key"
-msgstr "PGP 密钥"
-
-#: pgp/seahorse-gpgme-generate.c:93
-msgid "Used to encrypt email and files"
-msgstr "用来加密邮件和文件"
-
-#: pgp/seahorse-gpgme-generate.c:129 pkcs11/seahorse-pkcs11-generate.c:90
-#: ssh/seahorse-ssh-generate.ui:252
+#: pgp/seahorse-gpgme-generate.c:76 pkcs11/pkcs11-generate.vala:60
+#: ssh/seahorse-ssh-generate.ui:141
 msgid "RSA"
 msgstr "RSA"
 
-#: pgp/seahorse-gpgme-generate.c:130
+#: pgp/seahorse-gpgme-generate.c:77
 msgid "DSA ElGamal"
 msgstr "DSA ElGamal"
 
-#: pgp/seahorse-gpgme-generate.c:179
+#: pgp/seahorse-gpgme-generate.c:129
 msgid "Couldn’t generate PGP key"
 msgstr "无法生成 PGP 密钥"
 
-#: pgp/seahorse-gpgme-generate.c:212
+#: pgp/seahorse-gpgme-generate.c:168
 msgid "Passphrase for New PGP Key"
 msgstr "新 PGP 密钥的密码"
 
-#: pgp/seahorse-gpgme-generate.c:213
+#: pgp/seahorse-gpgme-generate.c:169
 msgid "Enter the passphrase for your new key twice."
 msgstr "输入您的新密钥的密码两次。"
 
 #. Has line breaks because GtkLabel is completely broken WRT wrapping
-#: pgp/seahorse-gpgme-generate.c:225
+#: pgp/seahorse-gpgme-generate.c:181
 msgid ""
 "When creating a key we need to generate a lot of\n"
 "random data and we need you to help. It’s a good\n"
@@ -1079,64 +1103,68 @@ msgstr ""
 "执行在键盘上打字、移动鼠标、使用应用程序等都有所帮助。\n"
 "这将给予系统其所需用的随机数据。"
 
-#: pgp/seahorse-gpgme-generate.c:230 pkcs11/seahorse-pkcs11-generate.c:458
+#: pgp/seahorse-gpgme-generate.c:186 pkcs11/pkcs11-generate.vala:216
 msgid "Generating key"
 msgstr "正在生成密钥"
 
-#: pgp/seahorse-gpgme-key-deleter.c:77 pgp/seahorse-gpgme-secret-deleter.c:76
+#: pgp/seahorse-gpgme-generate.c:313
+msgid "Name must be at least 5 characters long."
+msgstr "名称长度应至少为 5 个字符。"
+
+#: pgp/seahorse-gpgme-key-deleter.c:76 pgp/seahorse-gpgme-secret-deleter.c:59
 #: pkcs11/pkcs11-deleter.vala:35 pkcs11/pkcs11-key-deleter.vala:33
 #, c-format
 msgid "Are you sure you want to permanently delete %s?"
 msgstr "您确定要永久删除 %s 吗？"
 
-#: pgp/seahorse-gpgme-key-deleter.c:80
+#: pgp/seahorse-gpgme-key-deleter.c:79
 #, c-format
 msgid "Are you sure you want to permanently delete %d keys?"
 msgid_plural "Are you sure you want to permanently delete %d keys?"
 msgstr[0] "您确定您要永久地删除 %d 个密钥吗？"
 
-#: pgp/seahorse-gpgme-key-op.c:378
+#: pgp/seahorse-gpgme-key-op.c:347
 msgid "Wrong password"
 msgstr "密码错误"
 
-#: pgp/seahorse-gpgme-key-op.c:378
+#: pgp/seahorse-gpgme-key-op.c:347
 msgid "This was the third time you entered a wrong password. Please try again."
 msgstr "这是您第三次输错密码了。请重试。"
 
-#: pgp/seahorse-gpgme-keyring.c:88
+#: pgp/seahorse-gpgme-keyring.c:89
 #, c-format
 msgid "Wrong passphrase."
 msgstr "错误的密码。"
 
-#: pgp/seahorse-gpgme-keyring.c:92
+#: pgp/seahorse-gpgme-keyring.c:93
 #, c-format
 msgid "Enter new passphrase for “%s”"
 msgstr "请输入“%s”的新密码"
 
-#: pgp/seahorse-gpgme-keyring.c:94
+#: pgp/seahorse-gpgme-keyring.c:95
 #, c-format
 msgid "Enter passphrase for “%s”"
 msgstr "请输入“%s”的密码"
 
-#: pgp/seahorse-gpgme-keyring.c:97 src/seahorse-change-passphrase.ui:28
+#: pgp/seahorse-gpgme-keyring.c:98 src/seahorse-change-passphrase.ui:28
 msgid "Enter new passphrase"
 msgstr "输入新密码"
 
-#: pgp/seahorse-gpgme-keyring.c:99
+#: pgp/seahorse-gpgme-keyring.c:100
 msgid "Enter passphrase"
 msgstr "输入密码"
 
-#: pgp/seahorse-gpgme-keyring.c:104
+#: pgp/seahorse-gpgme-keyring.c:105
 msgid "Passphrase"
 msgstr "密码"
 
-#: pgp/seahorse-gpgme-keyring.c:305
+#: pgp/seahorse-gpgme-keyring.c:300
 #, c-format
 msgid "Loaded %d key"
 msgid_plural "Loaded %d keys"
 msgstr[0] "已载入 %d 个密钥"
 
-#: pgp/seahorse-gpgme-keyring.c:652
+#: pgp/seahorse-gpgme-keyring.c:625
 msgid ""
 "Invalid key data (missing UIDs). This may be due to a computer with a date "
 "set in the future or a missing self-signature."
@@ -1144,11 +1172,11 @@ msgstr ""
 "无效的密钥数据（缺少 UID）。这可能是由于电脑时间设置成未来时间或者缺少自我签"
 "名。"
 
-#: pgp/seahorse-gpgme-keyring.c:805
+#: pgp/seahorse-gpgme-keyring.c:755
 msgid "GnuPG keys"
 msgstr "GnuPG 密钥"
 
-#: pgp/seahorse-gpgme-keyring.c:816
+#: pgp/seahorse-gpgme-keyring.c:766
 msgid "GnuPG: default keyring directory"
 msgstr "GnuPG：默认密钥换目录"
 
@@ -1185,7 +1213,7 @@ msgstr "所有图像文件"
 msgid "All JPEG files"
 msgstr "所有 JPEG 文件"
 
-#: pgp/seahorse-gpgme-photos.c:241 src/key-manager.vala:280
+#: pgp/seahorse-gpgme-photos.c:241 src/key-manager.vala:292
 msgid "All files"
 msgstr "所有文件"
 
@@ -1193,6 +1221,10 @@ msgstr "所有文件"
 msgid "Choose Photo to Add to Key"
 msgstr "选择要添加到密钥的照片"
 
+#: pgp/seahorse-gpgme-photos.c:265 src/key-manager.vala:250
+msgid "_Open"
+msgstr "打开(_O)"
+
 #: pgp/seahorse-gpgme-photos.c:284
 msgid "Couldn’t prepare photo"
 msgstr "无法准备照片"
@@ -1265,7 +1297,7 @@ msgstr "您将为 %2$s 添加为 %1$s 吊销者。此操作不能取消！您确
 msgid "Couldn’t add revoker"
 msgstr "无法添加废除者"
 
-#: pgp/seahorse-gpgme-secret-deleter.c:81 ssh/deleter.vala:43
+#: pgp/seahorse-gpgme-secret-deleter.c:64 ssh/deleter.vala:43
 msgid "I understand that this secret key will be permanently deleted."
 msgstr "我明白，此私钥将永久删除。"
 
@@ -1292,110 +1324,92 @@ msgid ""
 "this key."
 msgstr "您没有个人 PGP 密钥可用于表明您是否信任此密钥。"
 
-#: pgp/seahorse-gpgme-subkey.c:195
+#: pgp/seahorse-gpgme-subkey.c:89
 msgctxt "Algorithm"
 msgid "Unknown"
 msgstr "未知"
 
-#: pgp/seahorse-gpgme-subkey.c:197
+#: pgp/seahorse-gpgme-subkey.c:91
 msgid "ElGamal"
 msgstr "ElGamal"
 
-#: pgp/seahorse-gpgme.c:69
-msgid "Decryption failed. You probably do not have the decryption key."
-msgstr "解密失败。您可能没有解密密钥。"
-
-#: pgp/seahorse-gpgme.c:73 pgp/seahorse-hkp-source.c:549
-msgid "The operation was cancelled"
-msgstr "操作被取消"
-
-#: pgp/seahorse-hkp-source.c:567
+#: pgp/seahorse-hkp-source.c:533
 #, c-format
 msgid "Search was not specific enough. Server “%s” found too many keys."
 msgstr "搜索范围过宽。服务器“%s”中找到太多密钥。"
 
-#: pgp/seahorse-hkp-source.c:570
+#: pgp/seahorse-hkp-source.c:536
 #, c-format
 msgid "Couldn’t communicate with server “%s”: %s"
 msgstr "无法与服务器“%s”通讯：%s"
 
-#: pgp/seahorse-hkp-source.c:1080
+#: pgp/seahorse-hkp-source.c:999
 msgid "HTTP Key Server"
 msgstr "HTTP 密钥服务器"
 
-#: pgp/seahorse-keyserver-results.c:167
-msgid "Couldn’t import keys"
-msgstr "无法导入密钥"
-
-#: pgp/seahorse-keyserver-results.c:210
-msgid "Importing keys from key servers"
-msgstr "从密钥服务器导入密钥"
-
-#. TRANSLATORS: The "Remote" menu contains key operations on remote systems.
-#: pgp/seahorse-keyserver-results.c:236 src/key-manager.vala:52
-msgid "_Remote"
-msgstr "远程(_R)"
-
-#: pgp/seahorse-keyserver-results.c:238
-msgid "Close this window"
-msgstr "关闭此窗口"
-
-#: pgp/seahorse-keyserver-results.c:242 pgp/seahorse-pgp-actions.c:112
-msgid "_Find Remote Keys…"
-msgstr "寻找远程密钥(_F)…"
+#: pgp/seahorse-keyserver-results.c:62
+#, c-format
+msgid "Couldn’t import key: %s"
+msgstr "无法导入密钥：%s"
 
-#: pgp/seahorse-keyserver-results.c:243 pgp/seahorse-pgp-actions.c:113
-msgid "Search for keys on a key server"
-msgstr "在密钥服务器搜索密钥"
+#: pgp/seahorse-keyserver-results.c:66
+msgid "Key import succeeded"
+msgstr "密钥导入成功"
 
-#: pgp/seahorse-keyserver-results.c:247 src/seahorse-key-manager.ui:222
-msgid "_Import"
-msgstr "导入(_I)"
+#: pgp/seahorse-keyserver-results.c:154 src/import-dialog.vala:38
+msgid "Import"
+msgstr "导入"
 
-#: pgp/seahorse-keyserver-results.c:248
-msgid "Import selected keys to local key ring"
-msgstr "将已选择的密钥导入到本地密钥环"
+#: pgp/seahorse-keyserver-results.c:156
+msgid "Can’t import key"
+msgstr "无法导入密钥"
 
-#: pgp/seahorse-keyserver-results.c:279
-msgid "Remote Keys"
+#: pgp/seahorse-keyserver-results.c:240
+msgid "Remote keys"
 msgstr "远程密钥"
 
-#: pgp/seahorse-keyserver-results.c:281
+#: pgp/seahorse-keyserver-results.c:242
 #, c-format
-msgid "Remote Keys Containing “%s”"
+msgid "Remote keys containing “%s”"
 msgstr "远程密钥包含“%s”"
 
-#: pgp/seahorse-keyserver-results.c:482
+#: pgp/seahorse-keyserver-results.c:357
 msgid "The search for keys failed."
 msgstr "寻找密钥失败。"
 
-#: pgp/seahorse-keyserver-search.ui:12
+#: pgp/seahorse-keyserver-results.ui:16
+msgid ""
+"Double click on a key to inspect it, or click the import button to import it "
+"into your local keyring."
+msgstr "双击密钥以检查它，或者点击导入按钮将它导入你的本地密钥环。"
+
+#: pgp/seahorse-keyserver-search.ui:8
 msgid "Find Remote Keys"
 msgstr "寻找远程密钥"
 
-#: pgp/seahorse-keyserver-search.ui:48
+#: pgp/seahorse-keyserver-search.ui:37
 msgid ""
 "This will find keys for others on the Internet. These keys can then be "
 "imported into your local key ring."
 msgstr "这将在互联网上寻找其他人的密钥。这些密钥可以导入您的本地密钥环。"
 
-#: pgp/seahorse-keyserver-search.ui:72
+#: pgp/seahorse-keyserver-search.ui:52
 msgid "_Search for keys containing: "
 msgstr "搜索包含这些内容的密钥(_S)： "
 
-#: pgp/seahorse-keyserver-search.ui:127
+#: pgp/seahorse-keyserver-search.ui:74
+msgid "Where to search:"
+msgstr "从哪里搜索："
+
+#: pgp/seahorse-keyserver-search.ui:103
 msgid "Key Servers:"
 msgstr "密钥服务器："
 
-#: pgp/seahorse-keyserver-search.ui:153
+#: pgp/seahorse-keyserver-search.ui:117
 msgid "Shared Keys Near Me:"
 msgstr "我附近的共享密钥："
 
-#: pgp/seahorse-keyserver-search.ui:180
-msgid "Where to search:"
-msgstr "从哪里搜索："
-
-#: pgp/seahorse-keyserver-search.ui:223
+#: pgp/seahorse-keyserver-search.ui:144
 msgid "_Search"
 msgstr "搜索(_S)"
 
@@ -1448,493 +1462,472 @@ msgstr "密钥服务器(_K)"
 msgid "_Sync"
 msgstr "同步(_S)"
 
-#: pgp/seahorse-ldap-source.c:435
+#: pgp/seahorse-ldap-source.c:439
 #, c-format
 msgid "Couldn’t communicate with %s: %s"
 msgstr "无法与“%s”通讯：%s"
 
-#: pgp/seahorse-ldap-source.c:645
+#: pgp/seahorse-ldap-source.c:649
 #, c-format
 msgid "Connecting to: %s"
 msgstr "正在连接到：%s"
 
-#: pgp/seahorse-ldap-source.c:651
+#: pgp/seahorse-ldap-source.c:655
 #, c-format
 msgid "Couldn’t resolve address: %s"
 msgstr "无法解析地址：%s"
 
-#: pgp/seahorse-ldap-source.c:695
+#: pgp/seahorse-ldap-source.c:699
 #, c-format
 msgid "Resolving server address: %s"
 msgstr "正在解析服务器地址：%s"
 
-#: pgp/seahorse-ldap-source.c:1430
+#: pgp/seahorse-ldap-source.c:1434
 msgid "LDAP Key Server"
 msgstr "LDAP 密钥服务器"
 
-#: pgp/seahorse-pgp-actions.c:117
-msgid "_Sync and Publish Keys…"
-msgstr "同步并发布密钥(_S)"
-
-#: pgp/seahorse-pgp-actions.c:118
-msgid "Publish and/or synchronize your keys with those online."
-msgstr "与那些在线的密钥发布并/或同步您的密钥。"
-
-#: pgp/seahorse-pgp-backend.c:192
+#: pgp/seahorse-pgp-backend.c:187
 msgid "PGP Keys"
 msgstr "PGP 密钥"
 
-#: pgp/seahorse-pgp-backend.c:198
+#: pgp/seahorse-pgp-backend.c:193
 msgid "PGP keys are for encrypting email or files"
 msgstr "PGP 密钥用来加密邮件和文件"
 
-#: pgp/seahorse-pgp-generate.ui:80
-msgid "C_reate"
-msgstr "创建(_R)"
+#: pgp/seahorse-pgp-generate.ui:18
+msgid "New PGP key"
+msgstr "新建 PGP 密钥"
 
-#: pgp/seahorse-pgp-generate.ui:87
-msgid "Generate a new key"
-msgstr "生成新密钥"
-
-#: pgp/seahorse-pgp-generate.ui:137
+#: pgp/seahorse-pgp-generate.ui:67
 msgid "A PGP key allows you to encrypt email or files to other people."
 msgstr "PGP 密钥允许您加密给别人的电子邮件或文件。"
 
-#: pgp/seahorse-pgp-generate.ui:254
-msgid "Ne_ver Expires"
-msgstr "永不过期(_V)"
+#. Full name of the key, usually the name of the user.
+#: pgp/seahorse-pgp-generate.ui:86
+msgid "Full _Name:"
+msgstr "全名(_N)："
+
+#: pgp/seahorse-pgp-generate.ui:114
+msgid "_Email Address:"
+msgstr "电子邮件地址(_E)："
+
+#: pgp/seahorse-pgp-generate.ui:143 pkcs11/seahorse-pkcs11-generate.ui:110
+msgid "_Advanced key options"
+msgstr "高级密钥选项(_A)"
 
-#: pgp/seahorse-pgp-generate.ui:354
+#: pgp/seahorse-pgp-generate.ui:160
 msgid "_Comment:"
 msgstr "备注(_C)："
 
-#: pgp/seahorse-pgp-generate.ui:370 ssh/seahorse-ssh-generate.ui:212
+#: pgp/seahorse-pgp-generate.ui:188 ssh/seahorse-ssh-generate.ui:124
 msgid "Encryption _Type:"
 msgstr "加密类型(_T)："
 
-#: pgp/seahorse-pgp-generate.ui:385 pkcs11/seahorse-pkcs11-generate.ui:164
-#: ssh/seahorse-ssh-generate.ui:228
+#: pgp/seahorse-pgp-generate.ui:215 pkcs11/seahorse-pkcs11-generate.ui:151
+#: ssh/seahorse-ssh-generate.ui:158
 msgid "Key _Strength (bits):"
 msgstr "密钥保密强度(位)(_S)"
 
-#: pgp/seahorse-pgp-generate.ui:400
+#: pgp/seahorse-pgp-generate.ui:242
 msgid "E_xpiration Date:"
 msgstr "有效期至(_X)："
 
-#: pgp/seahorse-pgp-generate.ui:418 pkcs11/seahorse-pkcs11-generate.ui:226
-#: ssh/seahorse-ssh-generate.ui:274
-msgid "_Advanced key options"
-msgstr "高级密钥选项(_A)"
+#: pgp/seahorse-pgp-generate.ui:261
+msgid "Ne_ver Expires"
+msgstr "永不过期(_V)"
 
-#: pgp/seahorse-pgp-key-properties.c:316
+#: pgp/seahorse-pgp-generate.ui:304
+msgid "C_reate"
+msgstr "创建(_R)"
+
+#: pgp/seahorse-pgp-generate.ui:311
+msgid "Generate a new key"
+msgstr "生成新密钥"
+
+#: pgp/seahorse-pgp-key.c:555
+msgid "Personal PGP key"
+msgstr "个人 PGP 密钥"
+
+#: pgp/seahorse-pgp-key.c:557
+msgid "PGP key"
+msgstr "PGP 密钥"
+
+#: pgp/seahorse-pgp-key-properties.c:245
 msgid "Couldn’t change primary user ID"
 msgstr "无法修改主用户 ID"
 
-#: pgp/seahorse-pgp-key-properties.c:335
+#: pgp/seahorse-pgp-key-properties.c:280
 #, c-format
 msgid "Are you sure you want to permanently delete the “%s” user ID?"
 msgstr "您确定要永久删除“%s”用户 ID 吗？"
 
-#: pgp/seahorse-pgp-key-properties.c:345
+#: pgp/seahorse-pgp-key-properties.c:289
 msgid "Couldn’t delete user ID"
 msgstr "无法删除用户 ID"
 
 #. TRANSLATORS: [Unknown] signature name
-#: pgp/seahorse-pgp-key-properties.c:420 pgp/seahorse-pgp-key-properties.c:1575
+#: pgp/seahorse-pgp-key-properties.c:361 pgp/seahorse-pgp-key-properties.c:1351
 msgid "[Unknown]"
 msgstr "[未知]"
 
 #. TRANSLATORS: The name and email set on the PGP key
-#: pgp/seahorse-pgp-key-properties.c:529 pgp/seahorse-pgp-key-properties.c:1858
+#: pgp/seahorse-pgp-key-properties.c:457 pgp/seahorse-pgp-key-properties.c:1556
 msgid "Name/Email"
 msgstr "名称/电子邮件"
 
-#: pgp/seahorse-pgp-key-properties.c:536
+#: pgp/seahorse-pgp-key-properties.c:464
 msgid "Signature ID"
 msgstr "签名 ID"
 
-#: pgp/seahorse-pgp-key-properties.c:669
+#: pgp/seahorse-pgp-key-properties.c:570
 msgid "Couldn’t change primary photo"
 msgstr "无法修改主照片"
 
+#: pgp/seahorse-pgp-key-properties.c:730
+msgid "Error changing password"
+msgstr "更改密码时出错"
+
 #. TRANSLATORS: (unknown) expiry date
-#: pgp/seahorse-pgp-key-properties.c:903
+#: pgp/seahorse-pgp-key-properties.c:776
 msgid "(unknown)"
-msgstr "(未知)"
+msgstr "（未知）"
 
-#: pgp/seahorse-pgp-key-properties.c:906
+#: pgp/seahorse-pgp-key-properties.c:781
 #, c-format
 msgid "This key expired on: %s"
 msgstr "此密钥已于 %s 过期"
 
-#: pgp/seahorse-pgp-key-properties.c:1084
+#. Translators: the 1st part of the title is the owner's name
+#: pgp/seahorse-pgp-key-properties.c:809
+#, c-format
+msgid "%s — Public key"
+msgstr "%s——公钥"
+
+#. Translators: the 1st part of the title is the owner's name
+#: pgp/seahorse-pgp-key-properties.c:812
+#, c-format
+msgid "%s — Private key"
+msgstr "%s——私钥"
+
+#: pgp/seahorse-pgp-key-properties.c:965
 #, c-format
 msgid "Are you sure you want to permanently delete subkey %d of %s?"
 msgstr "您确定要永久删除 %2$s 的子密钥 %1$d 吗？"
 
-#: pgp/seahorse-pgp-key-properties.c:1093
+#: pgp/seahorse-pgp-key-properties.c:973
 msgid "Couldn’t delete subkey"
 msgstr "无法删除子密钥"
 
-#: pgp/seahorse-pgp-key-properties.c:1133
-#: pgp/seahorse-pgp-key-properties.c:1549
+#: pgp/seahorse-pgp-key-properties.c:1032
+#: pgp/seahorse-pgp-key-properties.c:1325
 msgid "Unable to change trust"
 msgstr "无法修改信任栏"
 
-#: pgp/seahorse-pgp-key-properties.c:1147 ssh/key-properties.vala:174
+#: pgp/seahorse-pgp-key-properties.c:1044 ssh/key-properties.vala:185
 msgid "Couldn’t export key"
 msgstr "无法导出密钥"
 
-#: pgp/seahorse-pgp-key-properties.c:1263
-msgid "Marginal"
-msgstr "部分"
-
-#: pgp/seahorse-pgp-key-properties.c:1269
-msgid "Full"
-msgstr "完全"
-
-#: pgp/seahorse-pgp-key-properties.c:1275
-msgid "Ultimate"
-msgstr "彻底"
-
-#: pgp/seahorse-pgp-key-properties.c:1381
-#: pgp/seahorse-pgp-key-properties.c:1474
+#: pgp/seahorse-pgp-key-properties.c:1175
+#: pgp/seahorse-pgp-key-properties.c:1259
 msgctxt "Expires"
 msgid "Never"
 msgstr "从不"
 
-#: pgp/seahorse-pgp-key-properties.c:1428
+#: pgp/seahorse-pgp-key-properties.c:1214
 msgid "ID"
 msgstr "ID"
 
-#: pgp/seahorse-pgp-key-properties.c:1431
-msgid "Type"
-msgstr "类型"
-
-#: pgp/seahorse-pgp-key-properties.c:1434
+#: pgp/seahorse-pgp-key-properties.c:1220
 msgid "Usage"
 msgstr "使用"
 
-#: pgp/seahorse-pgp-key-properties.c:1437
+#: pgp/seahorse-pgp-key-properties.c:1223
 msgid "Created"
 msgstr "已创建"
 
-#: pgp/seahorse-pgp-key-properties.c:1440
+#: pgp/seahorse-pgp-key-properties.c:1226
 msgid "Expires"
 msgstr "过期"
 
-#: pgp/seahorse-pgp-key-properties.c:1443
+#: pgp/seahorse-pgp-key-properties.c:1229
 msgid "Status"
 msgstr "状态"
 
-#: pgp/seahorse-pgp-key-properties.c:1446
+#: pgp/seahorse-pgp-key-properties.c:1232
 msgid "Strength"
 msgstr "强度"
 
-#: pgp/seahorse-pgp-key-properties.c:1465
+#: pgp/seahorse-pgp-key-properties.c:1250
 msgid "Revoked"
 msgstr "已吊销"
 
-#: pgp/seahorse-pgp-key-properties.c:1467
+#: pgp/seahorse-pgp-key-properties.c:1252
 msgid "Expired"
 msgstr "已过期"
 
-#: pgp/seahorse-pgp-key-properties.c:1469
+#: pgp/seahorse-pgp-key-properties.c:1254
 msgid "Disabled"
 msgstr "禁止"
 
-#: pgp/seahorse-pgp-key-properties.c:1471
+#: pgp/seahorse-pgp-key-properties.c:1256
 msgid "Good"
 msgstr "好"
 
-#: pgp/seahorse-pgp-key-properties.c:1861
+#: pgp/seahorse-pgp-key-properties.c:1559
+#: pgp/seahorse-pgp-private-key-properties.ui:333
+#: pgp/seahorse-pgp-public-key-properties.ui:274
 msgid "Key ID"
 msgstr "密钥 ID"
 
-#: pgp/seahorse-pgp-key.c:349
-msgid "Personal PGP key"
-msgstr "个人 PGP 密钥"
+#: pgp/seahorse-pgp-key-properties.c:1700
+#, c-format
+msgid "I trust signatures from “%s” on other keys"
+msgstr "我信任来自其它密钥上的“%s”的签名"
 
-#: pgp/seahorse-pgp-key.c:351
-msgid "PGP key"
-msgstr "PGP 密钥"
+#: pgp/seahorse-pgp-key-properties.c:1707
+#, c-format
+msgid ""
+"If you believe that the person that owns this key is “%s”, <i>sign</i> this "
+"key:"
+msgstr "如果您相信拥有此密钥的人是“%s”，请<i>签署</i>此密钥："
 
-#: pgp/seahorse-pgp-private-key-properties.ui:31
-#: pgp/seahorse-pgp-public-key-properties.ui:32
-msgid "Key Properties"
-msgstr "密钥首选项"
+#: pgp/seahorse-pgp-key-properties.c:1714
+#, c-format
+msgid ""
+"If you no longer trust that “%s” owns this key, <i>revoke</i> your signature:"
+msgstr "如果您不再相信“%s”拥有此密钥，请<i>吊销</i>您的签名："
 
-#: pgp/seahorse-pgp-private-key-properties.ui:70
-#: pgp/seahorse-pgp-public-key-properties.ui:120
+#: pgp/seahorse-pgp-private-key-properties.ui:56
+#: pgp/seahorse-pgp-public-key-properties.ui:61
 msgid "This key has been revoked"
 msgstr "此密钥已被吊销"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:89
-#: pgp/seahorse-pgp-public-key-properties.ui:141
+#: pgp/seahorse-pgp-private-key-properties.ui:66
+#: pgp/seahorse-pgp-public-key-properties.ui:73
 msgid "The owner of the key revoked the key. It can no longer be used."
 msgstr "此密钥的所有者已吊销此密钥。它将不能再使用。"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:132
-#: pgp/seahorse-pgp-public-key-properties.ui:192
+#: pgp/seahorse-pgp-private-key-properties.ui:94
+#: pgp/seahorse-pgp-public-key-properties.ui:104
 msgid "This key has expired"
 msgstr "此密钥已过期"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:222
+#: pgp/seahorse-pgp-private-key-properties.ui:159
 msgid "Add a photo to this key"
 msgstr "向此密钥添加照片"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:246
+#: pgp/seahorse-pgp-private-key-properties.ui:178
 msgid "Remove this photo from this key"
 msgstr "从此密钥中移除此照片"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:270
+#: pgp/seahorse-pgp-private-key-properties.ui:197
 msgid "Make this photo the primary photo"
 msgstr "使用此照片作为主照片"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:303
+#: pgp/seahorse-pgp-private-key-properties.ui:222
 msgid "Go to previous photo"
 msgstr "上一张照片"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:327
+#: pgp/seahorse-pgp-private-key-properties.ui:241
 msgid "Go to next photo"
 msgstr "下一张照片"
 
-#. A photograph
-#: pgp/seahorse-pgp-private-key-properties.ui:389
-#: pgp/seahorse-pgp-public-key-properties.ui:395
-msgid "Photo "
-msgstr "照片"
-
-#: pgp/seahorse-pgp-private-key-properties.ui:425
-#: pgp/seahorse-pgp-private-key-properties.ui:1066
-#: pgp/seahorse-pgp-public-key-properties.ui:472
-#: pgp/seahorse-pgp-public-key-properties.ui:1181
-msgid "Key ID:"
-msgstr "密钥 ID："
+#: pgp/seahorse-pgp-private-key-properties.ui:306
+#: pgp/seahorse-pgp-public-key-properties.ui:246
+msgid "Comment"
+msgstr "备注"
 
-#. Name of key, usually a persons name
-#: pgp/seahorse-pgp-private-key-properties.ui:442
-#: pgp/seahorse-pgp-public-key-properties.ui:506
-msgctxt "name-of-key"
-msgid "Name:"
-msgstr "名称："
-
-#: pgp/seahorse-pgp-private-key-properties.ui:458
-#: pgp/seahorse-pgp-public-key-properties.ui:523
-msgid "Email:"
-msgstr "电子邮件："
-
-#: pgp/seahorse-pgp-private-key-properties.ui:474
-#: pgp/seahorse-pgp-public-key-properties.ui:540
-msgid "Comment:"
-msgstr "备注："
-
-#: pgp/seahorse-pgp-private-key-properties.ui:583
-msgid "Decrypt files and email sent to you."
-msgstr "解密发给您的文件和电子邮件。"
-
-#: pgp/seahorse-pgp-private-key-properties.ui:596
-msgid "Private PGP Key"
-msgstr "PGP 私钥"
-
-#: pgp/seahorse-pgp-private-key-properties.ui:649
-#: ssh/seahorse-ssh-key-properties.ui:150
+#: pgp/seahorse-pgp-private-key-properties.ui:363
+#: ssh/seahorse-ssh-key-properties.ui:294
 msgid "Change _Passphrase"
 msgstr "更改密码(_P)"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:691
-#: pgp/seahorse-pgp-public-key-properties.ui:711
+#: pgp/seahorse-pgp-private-key-properties.ui:379
+#: pgp/seahorse-pgp-public-key-properties.ui:347
 msgid "Owner"
 msgstr "所有者"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:706
+#: pgp/seahorse-pgp-private-key-properties.ui:392
 msgid "Key Names and Signatures"
 msgstr "密钥名称和签名"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:758
+#: pgp/seahorse-pgp-private-key-properties.ui:430
 msgid "Primary"
 msgstr "主要"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:809 pgp/seahorse-pgp-subkey.c:292
+#: pgp/seahorse-pgp-private-key-properties.ui:460 pgp/seahorse-pgp-subkey.c:160
 msgid "Sign"
 msgstr "签署"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:860
+#. Translators: This text refers to deleting an item from its type's backing store
+#: pgp/seahorse-pgp-private-key-properties.ui:490
+#: src/seahorse-key-manager-widgets.ui:12
 msgid "Delete"
 msgstr "删除"
 
 #. Add another name to the PGP key.
-#: pgp/seahorse-pgp-private-key-properties.ui:911
+#: pgp/seahorse-pgp-private-key-properties.ui:520
 msgid "_Add Name"
 msgstr "添加名称(_A)"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:959
-#: pgp/seahorse-pgp-private-key-properties.ui:1649
+#: pgp/seahorse-pgp-private-key-properties.ui:550
+#: pgp/seahorse-pgp-private-key-properties.ui:1040
 msgid "Revoke"
 msgstr "吊销"
 
 #. List of names and signatures on the PGP key.
-#: pgp/seahorse-pgp-private-key-properties.ui:1023
+#: pgp/seahorse-pgp-private-key-properties.ui:586
 msgid "Names and Signatures"
 msgstr "名称和签名"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1092
-#: pgp/seahorse-pgp-public-key-properties.ui:1208
+#: pgp/seahorse-pgp-private-key-properties.ui:623
+#: pgp/seahorse-pgp-public-key-properties.ui:623
+msgid "Key ID:"
+msgstr "密钥 ID："
+
+#: pgp/seahorse-pgp-private-key-properties.ui:648
+#: pgp/seahorse-pgp-public-key-properties.ui:649
+msgid "Type:"
+msgstr "类型："
+
+#: pgp/seahorse-pgp-private-key-properties.ui:673
+#: pgp/seahorse-pgp-public-key-properties.ui:675
 msgid "Strength:"
 msgstr "保密强度："
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1154
+#: pgp/seahorse-pgp-private-key-properties.ui:698
 msgid "Technical Details"
 msgstr "技术细节"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1190
+#: pgp/seahorse-pgp-private-key-properties.ui:726
+#: ssh/seahorse-ssh-key-properties.ui:174
 msgid "Fingerprint"
 msgstr "指纹"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1233
-#: pgp/seahorse-pgp-public-key-properties.ui:1384
+#: pgp/seahorse-pgp-private-key-properties.ui:758
+#: pgp/seahorse-pgp-public-key-properties.ui:769
 msgid "Created:"
 msgstr "创建："
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1305
-#: pgp/seahorse-pgp-public-key-properties.ui:1397
+#: pgp/seahorse-pgp-private-key-properties.ui:782
+#: pgp/seahorse-pgp-public-key-properties.ui:794
 msgid "Expires:"
 msgstr "过期："
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1321
+#: pgp/seahorse-pgp-private-key-properties.ui:828
 msgid "Dates"
 msgstr "日期"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1375
+#: pgp/seahorse-pgp-private-key-properties.ui:851
 msgid "Override Owner _Trust:"
 msgstr "覆盖所有者信任状态(_T)："
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1387
+#: pgp/seahorse-pgp-private-key-properties.ui:879
 msgid "_Export Secret Key:"
 msgstr "导出私钥(_E)："
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1457
+#: pgp/seahorse-pgp-private-key-properties.ui:926
 msgid "Actions"
 msgstr "操作"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1532
+#: pgp/seahorse-pgp-private-key-properties.ui:980
 msgid "Add"
 msgstr "添加"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1581
+#: pgp/seahorse-pgp-private-key-properties.ui:1010
 msgid "Expire"
 msgstr "过期"
 
-#: pgp/seahorse-pgp-private-key-properties.ui:1701
-#: pgp/seahorse-pgp-public-key-properties.ui:1587
+#: pgp/seahorse-pgp-private-key-properties.ui:1084
+#: pgp/seahorse-pgp-public-key-properties.ui:898
 msgid "_Subkeys"
 msgstr "子密钥(_S)"
 
-#: pgp/seahorse-pgp-public-key-properties.ui:18
+#: pgp/seahorse-pgp-public-key-properties.ui:17
 msgctxt "Validity"
 msgid "Marginally"
 msgstr "最小限度"
 
-#: pgp/seahorse-pgp-public-key-properties.ui:21
+#: pgp/seahorse-pgp-public-key-properties.ui:20
 msgctxt "Validity"
 msgid "Fully"
 msgstr "完全"
 
-#: pgp/seahorse-pgp-public-key-properties.ui:24
+#: pgp/seahorse-pgp-public-key-properties.ui:23
 msgctxt "Validity"
 msgid "Ultimately"
 msgstr "彻底"
 
-#: pgp/seahorse-pgp-public-key-properties.ui:457
-msgid "Encrypt files and email to the key’s owner"
-msgstr "加密文件并通过电子邮件发给密钥所有者"
-
-#: pgp/seahorse-pgp-public-key-properties.ui:621
-msgid "Public PGP Key"
-msgstr "PGP 公钥"
-
 #. Names set on the PGP key.
-#: pgp/seahorse-pgp-public-key-properties.ui:673
+#: pgp/seahorse-pgp-public-key-properties.ui:326
 msgid "_Other Names:"
 msgstr "其他名称(_O)："
 
-#: pgp/seahorse-pgp-public-key-properties.ui:753
+#: pgp/seahorse-pgp-public-key-properties.ui:369
 msgid "Your trust of this key"
 msgstr "您是否信任此密钥"
 
-#: pgp/seahorse-pgp-public-key-properties.ui:780
+#: pgp/seahorse-pgp-public-key-properties.ui:382
 msgid "Your trust is manually specified on the <i>Details</i> tab."
 msgstr "您的信任度在<i>细节</i>栏手动指定。"
 
-#: pgp/seahorse-pgp-public-key-properties.ui:796
-#, c-format
-msgid "I trust signatures from “%s” on other keys"
-msgstr "我信任来自其它密钥上的“%s”的签名"
-
-#: pgp/seahorse-pgp-public-key-properties.ui:828
-#, c-format
-msgid ""
-"If you believe that the person that owns this key is “%s”, <i>sign</i> this "
-"key:"
-msgstr "如果您相信拥有此密钥的人是“%s”，请<i>签署</i>此密钥："
-
-#: pgp/seahorse-pgp-public-key-properties.ui:879
-msgid "_Sign this Key"
-msgstr "签署此密钥(_S)"
-
-#: pgp/seahorse-pgp-public-key-properties.ui:919
-#, c-format
-msgid ""
-"If you no longer trust that “%s” owns this key, <i>revoke</i> your signature:"
-msgstr "如果您不再相信“%s”拥有此密钥，请<i>吊销</i>您的签名："
-
-#: pgp/seahorse-pgp-public-key-properties.ui:970
+#: pgp/seahorse-pgp-public-key-properties.ui:455
+msgid "_Sign this Key"
+msgstr "签署此密钥(_S)"
+
+#: pgp/seahorse-pgp-public-key-properties.ui:504
 msgid "_Revoke Signature"
 msgstr "吊销签名(_R)"
 
-#: pgp/seahorse-pgp-public-key-properties.ui:1031
+#: pgp/seahorse-pgp-public-key-properties.ui:526
 msgid "_People who have signed this key:"
 msgstr "其他签署此密钥的人(_P)："
 
-#: pgp/seahorse-pgp-public-key-properties.ui:1077
+#: pgp/seahorse-pgp-public-key-properties.ui:551
 msgid "_Only display the signatures of people I trust"
 msgstr "仅显示我信任的人的签名(_O)"
 
-#: pgp/seahorse-pgp-public-key-properties.ui:1117
-#: ssh/seahorse-ssh-key-properties.ui:175
+#: pgp/seahorse-pgp-public-key-properties.ui:570
 msgid "Trust"
 msgstr "信任"
 
-#: pgp/seahorse-pgp-public-key-properties.ui:1290
-#: ssh/seahorse-ssh-key-properties.ui:358
+#: pgp/seahorse-pgp-public-key-properties.ui:604
+msgid "Technical Details:"
+msgstr "技术细节："
+
+#: pgp/seahorse-pgp-public-key-properties.ui:710
 msgid "Fingerprint:"
 msgstr "指纹："
 
-#: pgp/seahorse-pgp-public-key-properties.ui:1354
+#: pgp/seahorse-pgp-public-key-properties.ui:750
 msgid "Dates:"
 msgstr "日期："
 
-#: pgp/seahorse-pgp-public-key-properties.ui:1460
+#: pgp/seahorse-pgp-public-key-properties.ui:828
 msgid "Indicate Trust:"
 msgstr "是否信任："
 
-#: pgp/seahorse-pgp-public-key-properties.ui:1485
+#: pgp/seahorse-pgp-public-key-properties.ui:845
 msgid "You _Trust the Owner:"
 msgstr "对此密钥的信任度(_T)："
 
-#: pgp/seahorse-pgp-subkey.c:291
+#: pgp/seahorse-pgp-subkey.c:159
 msgid "Encrypt"
 msgstr "加密"
 
-#: pgp/seahorse-pgp-subkey.c:293
+#: pgp/seahorse-pgp-subkey.c:161
 msgid "Certify"
 msgstr "验证"
 
-#: pgp/seahorse-pgp-subkey.c:294
+#: pgp/seahorse-pgp-subkey.c:162
 msgid "Authenticate"
 msgstr "认证"
 
-#: pgp/seahorse-pgp-subkey.c:407
+#: pgp/seahorse-pgp-subkey.c:311
+msgid "Key"
+msgstr "密钥"
+
+#: pgp/seahorse-pgp-subkey.c:316
 #, c-format
 msgid "Subkey %d of %s"
 msgstr "%2$s 的子密钥 %1$d"
@@ -1955,35 +1948,48 @@ msgstr "可选的撤回描述"
 msgid "Re_voke"
 msgstr "撤回(_V)"
 
-#: pgp/seahorse-sign.ui:7
+#: pgp/seahorse-signer.c:63
+msgid ""
+"You have no personal PGP keys that can be used to sign a document or message."
+msgstr "您没有个人 PGP 密钥可用于签署文档或消息。"
+
+#: pgp/seahorse-signer.ui:7
+msgid "Choose Signing Key"
+msgstr "选择签署用密钥"
+
+#: pgp/seahorse-signer.ui:25
+msgid "_Sign message with key:"
+msgstr "用此密钥签署消息(_S)："
+
+#: pgp/seahorse-sign.ui:6
 msgid "Sign Key"
 msgstr "签署密钥"
 
-#: pgp/seahorse-sign.ui:42
+#: pgp/seahorse-sign.ui:27
 msgid "By signing you indicate your trust that this key belongs to:"
 msgstr "通过签署您表明您信任此密钥属于："
 
-#: pgp/seahorse-sign.ui:54
+#: pgp/seahorse-sign.ui:34
 msgid "Key Name"
 msgstr "密钥名称"
 
-#: pgp/seahorse-sign.ui:86
+#: pgp/seahorse-sign.ui:54
 msgid "How carefully have you checked this key?"
 msgstr "您仔细检查过此密钥吗？"
 
-#: pgp/seahorse-sign.ui:118
+#: pgp/seahorse-sign.ui:84
 msgid "_Not at all"
 msgstr "没有(_N)"
 
-#: pgp/seahorse-sign.ui:132
+#: pgp/seahorse-sign.ui:95
 msgid "_Casually"
 msgstr "随意检查过(_C)"
 
-#: pgp/seahorse-sign.ui:147
+#: pgp/seahorse-sign.ui:107
 msgid "_Very Carefully"
 msgstr "仔细检查过(_V)"
 
-#: pgp/seahorse-sign.ui:180
+#: pgp/seahorse-sign.ui:134
 msgid ""
 "<i>Not at all:</i> means you believe the key is owned by the person who "
 "claims to own it, but you could not or did not verify this to be a fact."
@@ -1991,7 +1997,7 @@ msgstr ""
 "<i>无：</i>意味着您相信此密钥是声称拥有它的人所拥有的，但您不能或没有校验其真"
 "实性。"
 
-#: pgp/seahorse-sign.ui:197
+#: pgp/seahorse-sign.ui:147
 msgid ""
 "<i>Casually:</i> means you have done a casual verification that the key is "
 "owned by the person who claims to own it. For example, you could read the "
@@ -2000,13 +2006,13 @@ msgstr ""
 "<i>非正式：</i>意思是您完成了一项非正式地验证，证明该密钥是由声称拥有它的人所"
 "有。比如，您可以通过电话将密钥指纹读给所有者以确认。"
 
-#: pgp/seahorse-sign.ui:221
+#: pgp/seahorse-sign.ui:168
 msgid ""
 "<i>Very Carefully:</i> Select this only if you are absolutely sure that this "
 "key is genuine."
 msgstr "<i>非常仔细：</i>选择此选项仅当您绝对确信此密钥是真实的。"
 
-#: pgp/seahorse-sign.ui:240
+#: pgp/seahorse-sign.ui:184
 msgid ""
 "You could use a hard to forge photo identification (such as a passport) to "
 "personally check that the name on the key is correct. You should have also "
@@ -2015,43 +2021,30 @@ msgstr ""
 "您可以使用一个很难伪造的照片证明（比如护照）来亲自检查密钥名称的正确性。您还"
 "需要使用电子邮件来检查此电子邮件地址属于所有者。"
 
-#: pgp/seahorse-sign.ui:289
+#: pgp/seahorse-sign.ui:215
 msgid "How others will see this signature:"
 msgstr "其他人如何看到这个签名："
 
-#: pgp/seahorse-sign.ui:310
+#: pgp/seahorse-sign.ui:232
 msgid "_Others may not see this signature"
 msgstr "其他人不能看到此签名(_O)"
 
-#: pgp/seahorse-sign.ui:326
+#: pgp/seahorse-sign.ui:243
 msgid "I can _revoke this signature at a later date."
 msgstr "我可以在之后吊销此签名(_R)。"
 
-#: pgp/seahorse-sign.ui:363
+#: pgp/seahorse-sign.ui:268
 msgid "Sign key as:"
 msgstr "以此身份签署密钥："
 
-#: pgp/seahorse-sign.ui:385
+#: pgp/seahorse-sign.ui:286
 msgid "_Signer:"
 msgstr "签署者(_S)："
 
-#: pgp/seahorse-sign.ui:487
+#: pgp/seahorse-sign.ui:321
 msgid "_Sign"
 msgstr "签署(_S)"
 
-#: pgp/seahorse-signer.c:63
-msgid ""
-"You have no personal PGP keys that can be used to sign a document or message."
-msgstr "您没有个人 PGP 密钥可用于签署文档或消息。"
-
-#: pgp/seahorse-signer.ui:7
-msgid "Choose Signing Key"
-msgstr "选择签署用密钥"
-
-#: pgp/seahorse-signer.ui:25
-msgid "_Sign message with key:"
-msgstr "用此密钥签署消息(_S)："
-
 #: pgp/seahorse-transfer.c:238 pgp/seahorse-transfer.c:285
 msgid "Exporting data"
 msgstr "正在导出数据"
@@ -2094,6 +2087,10 @@ msgid "Are you sure you want to permanently delete %d certificate?"
 msgid_plural "Are you sure you want to permanently delete %d certificates?"
 msgstr[0] "您确定要永久删除 %d 个证书吗？"
 
+#: pkcs11/pkcs11-generate.vala:229
+msgid "Couldn’t generate private key"
+msgstr "无法生成私钥"
+
 #: pkcs11/pkcs11-key-deleter.vala:34
 msgid "I understand that this key will be permanently deleted."
 msgstr "我明白，此密钥将永久删除。"
@@ -2102,7 +2099,7 @@ msgstr "我明白，此密钥将永久删除。"
 msgid "Unnamed private key"
 msgstr "未命名的私钥"
 
-#: pkcs11/pkcs11-private-key.vala:70 pkcs11/seahorse-pkcs11-generate.c:505
+#: pkcs11/pkcs11-private-key.vala:70 src/seahorse-key-manager.ui:225
 msgid "Private key"
 msgstr "私钥"
 
@@ -2114,7 +2111,7 @@ msgstr "未命名"
 msgid "Failed to export certificate"
 msgstr "导出证书失败"
 
-#: pkcs11/pkcs11-properties.vala:188 src/sidebar.vala:622
+#: pkcs11/pkcs11-properties.vala:188 src/sidebar.vala:620
 msgid "Couldn’t delete"
 msgstr "无法删除"
 
@@ -2138,7 +2135,7 @@ msgstr "请求证书(_C)"
 msgid "Create a certificate request file for this key"
 msgstr "为此密钥创建一个证书请求文件"
 
-#: pkcs11/pkcs11-request.vala:56 pkcs11/seahorse-pkcs11-generate.c:412
+#: pkcs11/pkcs11-request.vala:56 pkcs11/seahorse-pkcs11-generate.ui:193
 msgid "Create"
 msgstr "创建"
 
@@ -2150,6 +2147,10 @@ msgstr "无法创建证书请求"
 msgid "Save certificate request"
 msgstr "保存证书请求"
 
+#: pkcs11/pkcs11-request.vala:107
+msgid "_Save"
+msgstr "保存(_S)"
+
 #: pkcs11/pkcs11-request.vala:113
 msgid "Certificate request"
 msgstr "证书请求"
@@ -2167,31 +2168,27 @@ msgctxt "Label"
 msgid "Unknown"
 msgstr "未知"
 
-#: pkcs11/seahorse-pkcs11-backend.c:189
+#: pkcs11/seahorse-pkcs11-backend.c:207
 msgid "Certificates"
 msgstr "证书"
 
-#: pkcs11/seahorse-pkcs11-backend.c:195
+#: pkcs11/seahorse-pkcs11-backend.c:213
 msgid "X.509 certificates and related keys"
 msgstr "X.509 证书和相关的密钥"
 
-#: pkcs11/seahorse-pkcs11-generate.c:113
-msgid "Couldn’t generate private key"
-msgstr "无法生成私钥"
-
-#: pkcs11/seahorse-pkcs11-generate.c:506
-msgid "Used to request a certificate"
-msgstr "用于请求证书"
+#: pkcs11/seahorse-pkcs11-generate.ui:6
+msgid "New private key"
+msgstr "新建私钥"
 
-#: pkcs11/seahorse-pkcs11-generate.ui:34
+#: pkcs11/seahorse-pkcs11-generate.ui:39
 msgid "Create a new private key"
 msgstr "创建新密钥"
 
-#: pkcs11/seahorse-pkcs11-generate.ui:53
+#: pkcs11/seahorse-pkcs11-generate.ui:58
 msgid "Label:"
 msgstr "标签："
 
-#: pkcs11/seahorse-pkcs11-generate.ui:66
+#: pkcs11/seahorse-pkcs11-generate.ui:71
 msgid "Stored at:"
 msgstr "已储存于："
 
@@ -2207,116 +2204,62 @@ msgstr "在证书请求中的通用名 (CN)。"
 msgid "Name (CN):"
 msgstr "通用名称 (CN)："
 
-#: src/application.vala:66
+#: src/application.vala:38
+msgid "Contributions:"
+msgstr "贡献者："
+
+#: src/application.vala:65
 msgid "Version of this application"
 msgstr "本程序的版本"
 
-#: src/application.vala:71 src/application.vala:107
-msgid "- System Settings"
-msgstr "- 系统设置"
-
-#: src/application.vala:102
-msgid "Don't display a window"
-msgstr "不要显示窗口"
-
-#: src/generate-select.vala:77
-msgid "Continue"
-msgstr "继续"
+#: src/application.vala:160
+msgid "translator-credits"
+msgstr ""
+"wei Li <lw124124 gmail com>\n"
+"Zipeco <Zipeco btamail net cn>, 2002\n"
+"Funda Wang <fundawang linux net cn>, 2004\n"
+"Deng Xiyue <manphiz gmail com> 2007, 2008, 2009\n"
+"Aron Xu <happyaron xu gmail com>, 2009, 2010, 2011\n"
+"YunQiang Su <wzssyqa gmail com>, 2012\n"
+"Wylmer Wang <wantinghard gmail com>, 2010, 2011, 2013\n"
+"Tong Hui <tonghuix gmail com>, 2013\n"
+"Mingcong Bai <jeffbai aosc xyz>, 2018\n"
+"Dingzhong Chen <wsxy162 gmail com>, 2019"
 
-#: src/import-dialog.vala:34
-msgid "Import"
-msgstr "导入"
+#: src/application.vala:163
+msgid "Seahorse Project Homepage"
+msgstr "Seahorse 项目首页"
 
-#: src/import-dialog.vala:40
-msgid "<b>Data to be imported:</b>"
-msgstr "<b>要导入的数据：</b>"
+#: src/import-dialog.vala:30
+msgid "Data to be imported"
+msgstr "要导入的数据"
 
-#: src/import-dialog.vala:75
+#: src/import-dialog.vala:74
 msgid "Import failed"
 msgstr "导入失败"
 
-#: src/key-manager.vala:53
-msgid "_New"
-msgstr "新建(_N)"
-
-#: src/key-manager.vala:54
-msgid "Close this program"
-msgstr "关闭此程序"
-
-#: src/key-manager.vala:55
-msgid "_New…"
-msgstr "新建(_N)…"
-
-#: src/key-manager.vala:55
-msgid "Create a new key or item"
-msgstr "创建新密钥或条目"
-
-#: src/key-manager.vala:56
-msgid "_Import…"
-msgstr "导入(_I)…"
-
-#: src/key-manager.vala:56
-msgid "Import from a file"
-msgstr "从文件导入"
-
-#: src/key-manager.vala:57
-msgid "Import from the clipboard"
-msgstr "从剪贴板导入"
-
-#: src/key-manager.vala:61
-msgid "By _Keyring"
-msgstr "根据密钥环(_K)"
-
-#: src/key-manager.vala:61
-msgid "Show sidebar listing keyrings"
-msgstr "显示密钥环列表侧边栏"
-
-#: src/key-manager.vala:65
-msgid "Show _Personal"
-msgstr "显示个人(_P)"
-
-#: src/key-manager.vala:65
-msgid "Only show personal keys, certificates and passwords"
-msgstr "只显示个人密钥、证书和密码"
-
-#: src/key-manager.vala:66
-msgid "Show _Trusted"
-msgstr "仅显示信任的(_T)"
-
-#: src/key-manager.vala:66
-msgid "Only show trusted keys, certificates and passwords"
-msgstr "只显示信任的密钥、证书和密码"
-
-#: src/key-manager.vala:67
-msgid "Show _Any"
-msgstr "显示全部(_A)"
-
-#: src/key-manager.vala:67
-msgid "Show all keys, certificates and passwords"
-msgstr "显示全部密钥、证书和密码"
-
 #. The prompt
-#: src/key-manager.vala:235 ssh/operation.vala:320
+#: src/key-manager.vala:247 ssh/operation.vala:324
 msgid "Import Key"
 msgstr "导入密钥"
 
-#: src/key-manager.vala:238
-msgid "_Open"
-msgstr "打开(_O)"
-
 #. TODO: This should come from libgcr somehow
-#: src/key-manager.vala:246
+#: src/key-manager.vala:258
 msgid "All key files"
 msgstr "所有密钥文件"
 
-#: src/key-manager.vala:321
+#: src/key-manager.vala:323
 msgid "Dropped text"
 msgstr "丢失的文本"
 
-#: src/key-manager.vala:344
+#: src/key-manager.vala:351
 msgid "Clipboard text"
 msgstr "剪贴板文本"
 
+#: src/key-manager.vala:443
+msgid "Couldn’t unlock keyring"
+msgstr "无法解锁密钥环"
+
 #: src/seahorse-change-passphrase.ui:8
 msgid "Change Passphrase"
 msgstr "更改密码"
@@ -2333,60 +2276,124 @@ msgstr "确认新密码"
 msgid "Con_firm Passphrase:"
 msgstr "确认密码(_F)："
 
-#: src/seahorse-generate-select.ui:15
-msgid "_Select the type of item to create:"
-msgstr "选择要创建的项目类型(_S)："
+#: src/seahorse-key-manager.ui:6
+msgid "Filter items:"
+msgstr "筛选项目："
+
+#: src/seahorse-key-manager.ui:8
+msgid "Show personal"
+msgstr "显示个人"
+
+#: src/seahorse-key-manager.ui:13
+msgid "Show trusted"
+msgstr "显示受信任"
+
+#: src/seahorse-key-manager.ui:18
+msgid "Show any"
+msgstr "显示全部"
+
+#: src/seahorse-key-manager.ui:25
+msgid "Combine all keyrings"
+msgstr "合并所有密钥环"
+
+#: src/seahorse-key-manager.ui:31
+msgid "Find remote keys…"
+msgstr "寻找远程密钥…"
+
+#: src/seahorse-key-manager.ui:36
+msgid "Sync and publish keys…"
+msgstr "同步并发布密钥…"
+
+#: src/seahorse-key-manager.ui:48
+msgid "Help"
+msgstr "帮助"
+
+#: src/seahorse-key-manager.ui:52
+msgid "_About Passwords and Keys"
+msgstr "关于密码和密钥(_A)"
+
+#: src/seahorse-key-manager.ui:89
+msgid "Secure Shell key"
+msgstr "SSH 密钥"
+
+#: src/seahorse-key-manager.ui:96
+msgid "Used to access other computers"
+msgstr "用来连接到其他计算机"
+
+#: src/seahorse-key-manager.ui:123
+msgid "GPG key"
+msgstr "GPG 密钥"
+
+#: src/seahorse-key-manager.ui:130
+msgid "Used to encrypt email and files"
+msgstr "用来加密邮件和文件"
+
+#: src/seahorse-key-manager.ui:157
+msgid "Password keyring"
+msgstr "密码密钥环"
+
+#: src/seahorse-key-manager.ui:164
+msgid "Used to store application and network passwords"
+msgstr "用来保存应用程序和网络密码"
+
+#: src/seahorse-key-manager.ui:198
+msgid "Safely store a password or secret"
+msgstr "安全地储存密码或密文"
+
+#: src/seahorse-key-manager.ui:232
+msgid "Used to request a certificate"
+msgstr "用于请求证书"
+
+#: src/seahorse-key-manager.ui:258
+msgid "Import from file…"
+msgstr "从文件导入…"
 
-#: src/seahorse-key-manager.ui:57
+#: src/seahorse-key-manager.ui:283
 msgid "Add a new key or item"
 msgstr "添加新密钥或条目"
 
-#: src/seahorse-key-manager.ui:74
+#: src/seahorse-key-manager.ui:314
+msgid "Search for a key or password"
+msgstr "搜索密钥或密码"
+
+#: src/seahorse-key-manager.ui:361
 msgid "Filter"
 msgstr "过滤器"
 
-#: src/seahorse-key-manager.ui:124
-msgid "First time options:"
-msgstr "初次选项："
+#: src/seahorse-key-manager.ui:455
+#, fuzzy
+msgid "This collection seems to be empty"
+msgstr "此集合似乎为空"
 
-#: src/seahorse-key-manager.ui:179
-msgid "Generate a new key of your own: "
-msgstr "生成您自己的新密钥："
+#: src/seahorse-key-manager-widgets.ui:6
+msgid "Export…"
+msgstr "导出…"
 
-#: src/seahorse-key-manager.ui:250
-msgid "Import existing keys from a file:"
-msgstr "从文件导入已存在的密钥："
+#: src/seahorse-key-manager-widgets.ui:19
+msgid "Properties"
+msgstr "属性"
 
-#: src/seahorse-key-manager.ui:282
-msgid "To get started with encryption you will need keys."
-msgstr "您需要密钥以开始加密。"
+#: src/seahorse-key-manager-widgets.ui:23
+msgid "Configure Key for Secure Shell…"
+msgstr "为 SSH 配置密钥…"
 
-#: src/sidebar.vala:589
+#: src/sidebar.vala:586
 msgid "Couldn’t lock"
 msgstr "无法锁定"
 
-#: src/sidebar.vala:606
-msgid "Couldn’t unlock"
-msgstr "无法解锁"
-
 #. Lock and unlock items
-#: src/sidebar.vala:642
+#: src/sidebar.vala:637
 msgid "_Lock"
 msgstr "锁定(_L)"
 
-#: src/sidebar.vala:647
+#: src/sidebar.vala:642
 msgid "_Unlock"
 msgstr "解锁(_U)"
 
-#: ssh/actions.vala:26
-msgid "Configure Key for _Secure Shell…"
-msgstr "为 _SSH 配置密钥…"
-
-#: ssh/actions.vala:27
-msgid ""
-"Send public Secure Shell key to another machine, and enable logins using "
-"that key."
-msgstr "发送 SSH 公钥到另一个机器，并允许使用该密钥登录。"
+#. Properties item
+#: src/sidebar.vala:659
+msgid "_Properties"
+msgstr "属性(_P)"
 
 #: ssh/backend.vala:27
 msgid "Secure Shell"
@@ -2423,25 +2430,15 @@ msgstr "SSH 密钥"
 msgid "No public key file is available for this key."
 msgstr "此密钥的公钥文件不可用。"
 
-#. No comment, but loaded
-#: ssh/generate.vala:28 ssh/key.vala:120 ssh/key.vala:124
-#: ssh/seahorse-ssh-key-properties.ui:96
-msgid "Secure Shell Key"
-msgstr "SSH 密钥"
-
-#: ssh/generate.vala:29
-msgid "Used to access other computers (eg: via a terminal)"
-msgstr "用来访问其他计算机(例如：通过终端)"
-
-#: ssh/generate.vala:114
+#: ssh/generate.vala:94
 msgid "Couldn’t load newly generated Secure Shell key"
 msgstr "无法载入刚生成的 SSH 密钥"
 
-#: ssh/generate.vala:118
+#: ssh/generate.vala:98
 msgid "Couldn’t generate Secure Shell key"
 msgstr "无法生成 SSH 密钥"
 
-#: ssh/generate.vala:121
+#: ssh/generate.vala:101
 msgid "Creating Secure Shell Key"
 msgstr "创建 SSH 密钥"
 
@@ -2457,22 +2454,26 @@ msgstr "256 位"
 msgid "Unknown key type!"
 msgstr "未知密钥类型！"
 
-#: ssh/key-properties.vala:88
+#: ssh/key-properties.vala:75
 msgid "Unknown type"
 msgstr "未知类型"
 
-#: ssh/key-properties.vala:112
+#: ssh/key-properties.vala:99
 msgid "Couldn’t rename key."
 msgstr "无法重命名密钥。"
 
-#: ssh/key-properties.vala:138
+#: ssh/key-properties.vala:125
 msgid "Couldn’t change authorization for key."
 msgstr "无法更改此密钥的授权。"
 
-#: ssh/key-properties.vala:154
+#: ssh/key-properties.vala:141
 msgid "Couldn’t change passphrase for key."
 msgstr "无法更改此密钥的密码。"
 
+#: ssh/key-properties.vala:165
+msgid "Error deleting the SSH key."
+msgstr "删除 SSH 密钥时出错。"
+
 #: ssh/key.vala:45
 msgid "Personal SSH key"
 msgstr "个人 SSH 密钥"
@@ -2482,30 +2483,35 @@ msgid "SSH key"
 msgstr "SSH 密钥"
 
 #. No names when not even the fingerpint loaded
-#: ssh/key.vala:117
+#: ssh/key.vala:115
 msgid "(Unreadable Secure Shell Key)"
 msgstr "（不可读的 SSH 密钥）"
 
-#: ssh/operation.vala:215
+#. No comment, but loaded
+#: ssh/key.vala:118 ssh/key.vala:122
+msgid "Secure Shell Key"
+msgstr "SSH 密钥"
+
+#: ssh/operation.vala:219
 msgid "Remote Host Password"
 msgstr "远程主机密码"
 
-#: ssh/operation.vala:258
+#: ssh/operation.vala:262
 msgid "Enter Key Passphrase"
 msgstr "输入密钥密码"
 
-#: ssh/operation.vala:284
+#: ssh/operation.vala:288
 msgid "Passphrase for New Secure Shell Key"
 msgstr "新的 SSH 密钥的密码"
 
 #. No filename specified, make one up
 #. Add the comment to the output
-#: ssh/operation.vala:317
+#: ssh/operation.vala:321
 #, c-format
 msgid "Importing key: %s"
 msgstr "正在导入密钥：%s"
 
-#: ssh/operation.vala:317
+#: ssh/operation.vala:321
 msgid "Importing key. Enter passphrase"
 msgstr "正在导入密钥。输入密码"
 
@@ -2540,27 +2546,27 @@ msgstr "再次输入新密码：%s"
 msgid "New Secure Shell Key"
 msgstr "新 SSH 密钥"
 
-#: ssh/seahorse-ssh-generate.ui:66
+#: ssh/seahorse-ssh-generate.ui:55
 msgid "A Secure Shell (SSH) key lets you connect securely to other computers."
 msgstr "安全 Shell (SSH) 密钥允许您通过安全的连接到其它计算机。"
 
-#: ssh/seahorse-ssh-generate.ui:164
+#: ssh/seahorse-ssh-generate.ui:108
 msgid "Your email address, or a reminder of what this key is for."
 msgstr "使用您的电子邮件地址，或提示密钥的用途的词句。"
 
-#: ssh/seahorse-ssh-generate.ui:253
+#: ssh/seahorse-ssh-generate.ui:142
 msgid "DSA"
 msgstr "DSA"
 
-#: ssh/seahorse-ssh-generate.ui:254
+#: ssh/seahorse-ssh-generate.ui:143
 msgid "ECDSA"
 msgstr "ECDSA"
 
-#: ssh/seahorse-ssh-generate.ui:255
+#: ssh/seahorse-ssh-generate.ui:144
 msgid "ED25519"
 msgstr "ED25519"
 
-#: ssh/seahorse-ssh-generate.ui:293
+#: ssh/seahorse-ssh-generate.ui:186
 msgid ""
 "If there is a computer you want to use this key with, you can set up that "
 "computer to recognize your new key."
@@ -2568,54 +2574,53 @@ msgstr ""
 "如果您打算在一台计算机上使用此密钥，您现在可以将那台计算机设定为识别您的密"
 "钥。"
 
-#: ssh/seahorse-ssh-generate.ui:324
+#: ssh/seahorse-ssh-generate.ui:212
 msgid "_Just Create Key"
 msgstr "仅创建密钥(_J)"
 
-#: ssh/seahorse-ssh-generate.ui:338
+#: ssh/seahorse-ssh-generate.ui:226
 msgid "_Create and Set Up"
 msgstr "创建并设定(_C)"
 
+#: ssh/seahorse-ssh-key-properties.ui:16
+msgid "SSH Key Properties"
+msgstr "SSH 密钥属性"
+
 #. Name of key, often a persons name
-#: ssh/seahorse-ssh-key-properties.ui:54
+#: ssh/seahorse-ssh-key-properties.ui:55
 msgctxt "name-of-ssh-key"
-msgid "Name:"
-msgstr "名称："
-
-#: ssh/seahorse-ssh-key-properties.ui:108
-msgid "Identifier:"
-msgstr "标识符："
+msgid "Name"
+msgstr "名称"
 
-#: ssh/seahorse-ssh-key-properties.ui:197
-msgid "The owner of this key is _authorized to connect to this computer"
-msgstr "此密钥的拥有者已被授权连接到此计算机(_A)"
+#: ssh/seahorse-ssh-key-properties.ui:88
+msgid "Algorithm"
+msgstr "算法"
 
-#: ssh/seahorse-ssh-key-properties.ui:215
-#, c-format
-msgid "This only applies to the <i>%s</i> account."
-msgstr "仅用于<i>%s</i>帐户。"
+#: ssh/seahorse-ssh-key-properties.ui:115
+msgid "Key Length"
+msgstr "密钥长度"
 
-#: ssh/seahorse-ssh-key-properties.ui:279
-msgid "Algorithm:"
-msgstr "算法："
+#: ssh/seahorse-ssh-key-properties.ui:142
+msgid "Location"
+msgstr "位置"
 
-#: ssh/seahorse-ssh-key-properties.ui:294
-msgid "Key length:"
-msgstr "密钥长度："
+#: ssh/seahorse-ssh-key-properties.ui:220
+msgid "Remote Access"
+msgstr "远程访问"
 
-#: ssh/seahorse-ssh-key-properties.ui:342
-msgid "Location:"
-msgstr "位置："
+#: ssh/seahorse-ssh-key-properties.ui:233
+msgid "Allows accessing this computer remotely"
+msgstr "允许远程访问此计算机"
 
-#: ssh/seahorse-ssh-key-properties.ui:435
-msgid "E_xport Complete Key"
-msgstr "导出完整密钥(_X)"
+#: ssh/seahorse-ssh-key-properties.ui:311
+msgid "Delete SSH Key"
+msgstr "删除 SSH 密钥"
 
 #: ssh/seahorse-ssh-upload.ui:5
 msgid "Set Up Computer for SSH Connection"
 msgstr "为 SSH 连接设定计算机"
 
-#: ssh/seahorse-ssh-upload.ui:33
+#: ssh/seahorse-ssh-upload.ui:32
 msgid ""
 "To use your Secure Shell key with another computer that uses SSH, you must "
 "already have a login account on that computer."
@@ -2623,21 +2628,21 @@ msgstr ""
 "要在另一台使用 SSH 的计算机上使用您的 SSH 密钥，您必须在那台计算机上有已存在"
 "的登录帐户。"
 
-#: ssh/seahorse-ssh-upload.ui:74
-msgid "eg: fileserver.example.com:port"
-msgstr "例如： fireserver.example.com:端口"
-
-#: ssh/seahorse-ssh-upload.ui:99
+#: ssh/seahorse-ssh-upload.ui:48
 msgid "_Server address:"
 msgstr "服务器地址(_S)："
 
-#: ssh/seahorse-ssh-upload.ui:111
+#: ssh/seahorse-ssh-upload.ui:77
+msgid "eg: fileserver.example.com:port"
+msgstr "例如： fireserver.example.com:端口"
+
+#: ssh/seahorse-ssh-upload.ui:93
 msgid "_Login name:"
 msgstr "登录名(_L)："
 
-#: ssh/seahorse-ssh-upload.ui:162
+#: ssh/seahorse-ssh-upload.ui:129
 msgid "Set Up"
-msgstr "设定"
+msgstr "建立"
 
 #: ssh/source.vala:42
 msgid "OpenSSH keys"
@@ -2653,18 +2658,232 @@ msgstr "OpenSSH：%s"
 msgid "openssh://%s"
 msgstr "openssh://%s"
 
-#: ssh/source.vala:237
+#: ssh/source.vala:245
 msgid "No private key file is available for this key."
 msgstr "此密钥的私钥文件不可用。"
 
-#: ssh/upload.vala:66
+#: ssh/upload.vala:67
 msgid "Couldn’t configure Secure Shell keys on remote computer."
 msgstr "无法配置远程服务器上的 SSH 密钥。"
 
-#: ssh/upload.vala:70
+#: ssh/upload.vala:71
 msgid "Configuring Secure Shell Keys…"
 msgstr "正在配置 SSH 密钥…"
 
+#~ msgid "org.gnome.seahorse.Application"
+#~ msgstr "org.gnome.seahorse.Application"
+
+#~ msgid "_File"
+#~ msgstr "文件(_F)"
+
+#~ msgid "Export to a file"
+#~ msgstr "导出到文件"
+
+#~ msgid "_Edit"
+#~ msgstr "编辑(_E)"
+
+#~ msgid "Copy to the clipboard"
+#~ msgstr "复制到剪贴板"
+
+#~ msgid "Delete selected items"
+#~ msgstr "删除已选择的项目"
+
+#~ msgid "Show the properties of this item"
+#~ msgstr "显示此项目的属性"
+
+#~ msgid "Show the properties of this keyring"
+#~ msgstr "显示此密钥环的属性"
+
+#~ msgid "Prefere_nces"
+#~ msgstr "首选项(_N)"
+
+#~ msgid "Change preferences for this program"
+#~ msgstr "修改此程序的首选项"
+
+#~ msgid "_View"
+#~ msgstr "视图(_V)"
+
+#~ msgid "_About"
+#~ msgstr "关于(_A)"
+
+#~ msgid "About this program"
+#~ msgstr "关于此程序"
+
+#~ msgid "_Contents"
+#~ msgstr "内容(_C)"
+
+#~ msgid "Show Seahorse help"
+#~ msgstr "显示 Seahorse 帮助"
+
+#~ msgid "seahorse"
+#~ msgstr "seahorse"
+
+#~ msgid "New password keyring"
+#~ msgstr "新建密码密钥环"
+
+#~ msgid "New password…"
+#~ msgstr "新建密码…"
+
+#~ msgid "Stored Password"
+#~ msgstr "已储存的密码"
+
+#~ msgid "Applications usually store new passwords in the default keyring."
+#~ msgstr "应用程序通常将新密码存储在默认密钥环中。"
+
+#~ msgid "Change the unlock password of the password storage keyring"
+#~ msgstr "修改密码存储密钥环的解锁密码"
+
+#~ msgid "_Show Password"
+#~ msgstr "显示密码(_S)"
+
+#~ msgid "PGP Key"
+#~ msgstr "PGP 密钥"
+
+#~ msgid "Importing keys from key servers"
+#~ msgstr "从密钥服务器导入密钥"
+
+#~ msgid "_Remote"
+#~ msgstr "远程(_R)"
+
+#~ msgid "Close this window"
+#~ msgstr "关闭此窗口"
+
+#~ msgid "Search for keys on a key server"
+#~ msgstr "在密钥服务器搜索密钥"
+
+#~ msgid "_Import"
+#~ msgstr "导入(_I)"
+
+#~ msgid "Import selected keys to local key ring"
+#~ msgstr "将已选择的密钥导入到本地密钥环"
+
+#~ msgid "Publish and/or synchronize your keys with those online."
+#~ msgstr "与那些在线的密钥发布并/或同步您的密钥。"
+
+#~ msgid "Marginal"
+#~ msgstr "部分"
+
+#~ msgid "Full"
+#~ msgstr "完全"
+
+#~ msgid "Ultimate"
+#~ msgstr "彻底"
+
+#~ msgid "Photo "
+#~ msgstr "照片"
+
+#~ msgctxt "name-of-key"
+#~ msgid "Name:"
+#~ msgstr "名称："
+
+#~ msgid "Email:"
+#~ msgstr "电子邮件："
+
+#~ msgid "Decrypt files and email sent to you."
+#~ msgstr "解密发给您的文件和电子邮件。"
+
+#~ msgid "Private PGP Key"
+#~ msgstr "PGP 私钥"
+
+#~ msgid "Encrypt files and email to the key’s owner"
+#~ msgstr "加密文件并通过电子邮件发给密钥所有者"
+
+#~ msgid "Public PGP Key"
+#~ msgstr "PGP 公钥"
+
+#~ msgid "- System Settings"
+#~ msgstr "- 系统设置"
+
+#~ msgid "Don't display a window"
+#~ msgstr "不要显示窗口"
+
+#~ msgid "_New"
+#~ msgstr "新建(_N)"
+
+#~ msgid "_Quit"
+#~ msgstr "退出(_Q)"
+
+#~ msgid "Close this program"
+#~ msgstr "关闭此程序"
+
+#~ msgid "_New…"
+#~ msgstr "新建(_N)…"
+
+#~ msgid "Create a new key or item"
+#~ msgstr "创建新密钥或条目"
+
+#~ msgid "_Import…"
+#~ msgstr "导入(_I)…"
+
+#~ msgid "_Paste"
+#~ msgstr "粘贴(_P)"
+
+#~ msgid "Import from the clipboard"
+#~ msgstr "从剪贴板导入"
+
+#~ msgid "By _Keyring"
+#~ msgstr "根据密钥环(_K)"
+
+#~ msgid "Show sidebar listing keyrings"
+#~ msgstr "显示密钥环列表侧边栏"
+
+#~ msgid "Only show personal keys, certificates and passwords"
+#~ msgstr "只显示个人密钥、证书和密码"
+
+#~ msgid "Only show trusted keys, certificates and passwords"
+#~ msgstr "只显示信任的密钥、证书和密码"
+
+#~ msgid "Show all keys, certificates and passwords"
+#~ msgstr "显示全部密钥、证书和密码"
+
+#~ msgid "New item"
+#~ msgstr "新建条目"
+
+#~ msgid "_Select the type of item to create:"
+#~ msgstr "选择要创建的项目类型(_S)："
+
+#~ msgid "Continue"
+#~ msgstr "继续"
+
+#~ msgid "First time options:"
+#~ msgstr "初次选项："
+
+#~ msgid "To get started with encryption you will need keys."
+#~ msgstr "您需要密钥以开始加密。"
+
+#~ msgid "Import existing keys from a file:"
+#~ msgstr "从文件导入已存在的密钥："
+
+#~ msgid "Generate a new key of your own: "
+#~ msgstr "生成您自己的新密钥："
+
+#~ msgid ""
+#~ "Send public Secure Shell key to another machine, and enable logins using "
+#~ "that key."
+#~ msgstr "发送 SSH 公钥到另一个机器，并允许使用该密钥登录。"
+
+#~ msgid "Used to access other computers (eg: via a terminal)"
+#~ msgstr "用来访问其他计算机(例如：通过终端)"
+
+#~ msgctxt "name-of-ssh-key"
+#~ msgid "Name:"
+#~ msgstr "名称："
+
+#~ msgid "Identifier:"
+#~ msgstr "标识符："
+
+#~ msgid "The owner of this key is _authorized to connect to this computer"
+#~ msgstr "此密钥的拥有者已被授权连接到此计算机(_A)"
+
+#~ msgid "This only applies to the <i>%s</i> account."
+#~ msgstr "仅用于<i>%s</i>帐户。"
+
+#~ msgid "Key length:"
+#~ msgstr "密钥长度："
+
+#~ msgid "E_xport Complete Key"
+#~ msgstr "导出完整密钥(_X)"
+
 #~ msgid "The search provider is not loaded yet"
 #~ msgstr "尚未加载搜索提供者"
 
@@ -2677,9 +2896,6 @@ msgstr "正在配置 SSH 密钥…"
 #~ msgid "Keyring"
 #~ msgstr "密钥环"
 
-#~ msgid "Used to connect to other computers."
-#~ msgstr "用来连接到其他计算机。"
-
 #~ msgid "E_xport..."
 #~ msgstr "导出(_X)..."
 
@@ -2758,9 +2974,6 @@ msgstr "正在配置 SSH 密钥…"
 #~ msgid "<b>Strength:</b>"
 #~ msgstr "<b>保密强度：</b>"
 
-#~ msgid "Login keyring"
-#~ msgstr "登录密钥环"
-
 #~ msgid "Access to the key ring was denied"
 #~ msgstr "访问密钥环被拒绝"
 
@@ -2821,9 +3034,6 @@ msgstr "正在配置 SSH 密钥…"
 #~ msgid "Properties of the password."
 #~ msgstr "密码的属性。"
 
-#~ msgid "Delete the password."
-#~ msgstr "删除密码。"
-
 #~ msgid "Archive files"
 #~ msgstr "档案文件"
 
@@ -2869,15 +3079,9 @@ msgstr "正在配置 SSH 密钥…"
 #~ msgid "_Sign Key..."
 #~ msgstr "签署密钥(_S)..."
 
-#~ msgid "Sign public key"
-#~ msgstr "签署公钥"
-
 #~ msgid "Properties of the key."
 #~ msgstr "密钥的属性。"
 
-#~ msgid "Delete the key."
-#~ msgstr "删除密钥。"
-
 #~ msgid "Export Complete Key"
 #~ msgstr "导出完整密钥"
 
@@ -2914,11 +3118,6 @@ msgstr "正在配置 SSH 密钥…"
 #~ msgid "P_laces"
 #~ msgstr "位置(_L)"
 
-#, fuzzy
-#~| msgid "Show pass_word"
-#~ msgid "Show places sidebar"
-#~ msgstr "显示密码(_W)"
-
 #~ msgid "Couldn't delete key"
 #~ msgstr "无法删除密钥"
 
@@ -2931,9 +3130,6 @@ msgstr "正在配置 SSH 密钥…"
 #~ msgid "<b>Passwords:</b> %s"
 #~ msgstr "<b>密码：</b> %s"
 
-#~ msgid "New PGP Key"
-#~ msgstr "新 PGP 密钥"
-
 #~ msgid "Create New ..."
 #~ msgstr "新建..."
 
@@ -2949,27 +3145,15 @@ msgstr "正在配置 SSH 密钥…"
 #~ msgid "T_ypes"
 #~ msgstr "类型(_Y)"
 
-#~ msgid "Show type column"
-#~ msgstr "显示类型列"
-
 #~ msgid "_Expiry"
 #~ msgstr "过期(_E)"
 
-#~ msgid "Show expiry column"
-#~ msgstr "显示过期列"
-
 #~ msgid "_Trust"
 #~ msgstr "信任(_T)"
 
-#~ msgid "Show owner trust column"
-#~ msgstr "显示所有者信任列"
-
 #~ msgid "_Validity"
 #~ msgstr "有效性(_V)"
 
-#~ msgid "Show validity column"
-#~ msgstr "显示有效性列"
-
 #~ msgid "Other _Keys"
 #~ msgstr "其他密钥(_K)"
 
@@ -3003,9 +3187,6 @@ msgstr "正在配置 SSH 密钥…"
 #~ msgid "Enter a passphrase for your new Secure Shell key."
 #~ msgstr "为您的输入新 SSH 密钥输入密码"
 
-#~ msgid "Web Password"
-#~ msgstr "Web 密码"
-
 #~ msgid "Deleting items"
 #~ msgstr "正在删除项目"
 
@@ -3128,9 +3309,6 @@ msgstr "正在配置 SSH 密钥…"
 #~ "用于寻找远程 PGP 密钥的密钥服务器 URI 列表。在将来的版本中可通过在末尾附加"
 #~ "一个空格和名称来加入显示名称。"
 
-#~ msgid "Auto Retrieve Keys"
-#~ msgstr "自动获取密钥"
-
 #~ msgid "Auto Sync Keys"
 #~ msgstr "自动同步密钥"
 
@@ -3169,21 +3347,12 @@ msgstr "正在配置 SSH 密钥…"
 #~ "encryption recipients list."
 #~ msgstr "如果设置为真，默认密钥将总是被加入加密收件人列表中。"
 
-#~ msgid "Last key server search pattern"
-#~ msgstr "上次密钥服务器的搜索模式"
-
-#~ msgid "Last key servers used"
-#~ msgstr "上次使用的密钥服务器"
-
 #~ msgid "Last key used to sign a message."
 #~ msgstr "上次用来签署消息的密钥。"
 
 #~ msgid "PGP Key servers"
 #~ msgstr "PGP 密钥服务器"
 
-#~ msgid "Publish keys to this key server."
-#~ msgstr "将密钥发行至此密钥服务器"
-
 #~ msgid "Show expires column in key manager"
 #~ msgstr "显示密钥管理员的有效日期列"
 
@@ -3203,50 +3372,17 @@ msgstr "正在配置 SSH 密钥…"
 #~ msgstr ""
 #~ "指定一列来排序收件人窗口。列为：“名称”和“id”。在列名前加上“-”以逆排序。"
 
-#~ msgid ""
-#~ "Specify the column to sort the seahorse key manager main window by. "
-#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. "
-#~ "Put a '-' in front of the column name to sort in descending order."
-#~ msgstr ""
-#~ "指定一列来排序 seahorse 密钥管理器主窗口。列为：“名称”，“id”，“有效"
-#~ "性”，“有效日期”，“信任”和“类型”。在列名前加上“-”以逆排序。"
-
 #~ msgid "The ID of the last secret key used to sign a message."
 #~ msgstr "上次用来签署消息所使用的密钥 ID"
 
 #~ msgid "The column to sort the recipients by"
 #~ msgstr "用来排序收件人的列"
 
-#~ msgid "The column to sort the seahorse keys by"
-#~ msgstr "用来排序 seahorse 密钥的列"
-
-#~ msgid ""
-#~ "The key server to publish PGP keys to. Or empty to suppress publishing of "
-#~ "PGP keys."
-#~ msgstr "用来发行 PGP 密钥的服务器。留空以禁止发行 PGP 密钥。"
-
-#~ msgid ""
-#~ "The last key server a search was performed against or empty for all key "
-#~ "servers."
-#~ msgstr "上次搜索的密钥服务器，或留空以指定所有密钥服务器。"
-
-#~ msgid "The last search pattern searched for against a key server."
-#~ msgstr "上次在密钥服务器的搜索模式"
-
 #~ msgid ""
 #~ "This specifies the default key to use for certain operations, mainly "
 #~ "signing."
 #~ msgstr "这里指定操作所使用的默认密钥，主要用于签署。"
 
-#~ msgid ""
-#~ "Whether or not keys should be automatically retrieved from key servers."
-#~ msgstr "是否自动从密钥服务器获取密钥。"
-
-#~ msgid ""
-#~ "Whether or not modified keys should be automatically synced with the "
-#~ "default key server."
-#~ msgstr "已修改的密钥是否自动与默认密钥服务器同步。"
-
 #~ msgid "Whether to always encrypt to default key"
 #~ msgstr "是否总是用默认密钥来加密"
 
@@ -3346,10 +3482,6 @@ msgstr "正在配置 SSH 密钥…"
 #~ msgid "Show session management options"
 #~ msgstr "显示会话管理器选项"
 
-#~ msgid "Key Imported"
-#~ msgid_plural "Keys Imported"
-#~ msgstr[0] "密钥已导入"
-
 #~ msgid "Imported %i key"
 #~ msgid_plural "Imported %i keys"
 #~ msgstr[0] "已导入 %d 个密钥"
@@ -3382,9 +3514,6 @@ msgstr "正在配置 SSH 密钥…"
 #~ msgid "Retrieving keys..."
 #~ msgstr "正在获取密钥..."
 
-#~ msgid "Searching for keys on: %s"
-#~ msgstr "正在搜索这里的密钥：%s"
-
 #~ msgid "Searching for keys containing '%s'..."
 #~ msgstr "正在搜索包含“%s”的密钥..."