Sync with TP [ci skip]

2 files changed, 921 insertions, 536 deletions

diff --git a/po/LINGUAS b/po/LINGUAS
index 3aa129c735..acdd65a0e4 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,15 +1,2 @@
 en@boldquot
 en@quot
-cs
-de
-eo
-fi
-fr
-it
-ms
-nl
-pl
-sv
-uk
-vi
-zh_CN
diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index 6505039dc8..3ee6d8c385 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -3,562 +3,1002 @@
 # This file is distributed under the same license as the libgnutls package.
 # Tao Wei <weitao1979@gmail.com>, 2008.
 # Aron Xu <happyaron.xu@gmail.com>, 2009.
+# Tianze Wang <zwpwjwtz@126.com>, 2015.
+# Mingye Wang <arthur200126@gmail.com>, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgnutls 2.8.1\n"
+"Project-Id-Version: libgnutls 3.2.3\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2009-06-10 16:24+0200\n"
-"PO-Revision-Date: 2009-11-09 19:16+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"POT-Creation-Date: 2013-07-28 23:51+0200\n"
+"PO-Revision-Date: 2015-11-10 09:47-0500\n"
+"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
 "Language-Team: Chinese (simplified) <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"
+"X-Generator: Poedit 1.8.6\n"
 
-#: gnutls_errors.c:51
+#: lib/gnutls_alert.c:44
+msgid "Close notify"
+msgstr "关闭通知"
+
+#: lib/gnutls_alert.c:45
+msgid "Unexpected message"
+msgstr "未预料的消息"
+
+#: lib/gnutls_alert.c:46
+msgid "Bad record MAC"
+msgstr "记录 MAC 有误"
+
+#: lib/gnutls_alert.c:47
+msgid "Decryption failed"
+msgstr "解密失败"
+
+#: lib/gnutls_alert.c:48
+msgid "Record overflow"
+msgstr "记录溢出"
+
+#: lib/gnutls_alert.c:49
+msgid "Decompression failed"
+msgstr "解压缩失败"
+
+#: lib/gnutls_alert.c:50
+msgid "Handshake failed"
+msgstr "握手失败"
+
+#: lib/gnutls_alert.c:51
+msgid "Certificate is bad"
+msgstr "证书有误"
+
+#: lib/gnutls_alert.c:52
+msgid "Certificate is not supported"
+msgstr "证书不被支持"
+
+#: lib/gnutls_alert.c:53
+msgid "Certificate was revoked"
+msgstr "证书已吊销"
+
+#: lib/gnutls_alert.c:54
+msgid "Certificate is expired"
+msgstr "证书过期"
+
+#: lib/gnutls_alert.c:55
+msgid "Unknown certificate"
+msgstr "未知证书"
+
+#: lib/gnutls_alert.c:56
+msgid "Illegal parameter"
+msgstr "非法参数"
+
+#: lib/gnutls_alert.c:57
+msgid "CA is unknown"
+msgstr "未知 CA"
+
+#: lib/gnutls_alert.c:58
+msgid "Access was denied"
+msgstr "访问被拒绝"
+
+#: lib/gnutls_alert.c:59
+msgid "Decode error"
+msgstr "解码错误"
+
+#: lib/gnutls_alert.c:60
+msgid "Decrypt error"
+msgstr "解密出错"
+
+#: lib/gnutls_alert.c:61
+msgid "Export restriction"
+msgstr "导出受限"
+
+#: lib/gnutls_alert.c:62
+msgid "Error in protocol version"
+msgstr "协议版本出错"
+
+#: lib/gnutls_alert.c:63
+msgid "Insufficient security"
+msgstr "不够安全"
+
+#: lib/gnutls_alert.c:64
+msgid "User canceled"
+msgstr "用户已取消"
+
+#: lib/gnutls_alert.c:65
+msgid "No certificate (SSL 3.0)"
+msgstr "无证书（SSL 3.0）"
+
+#: lib/gnutls_alert.c:66
+msgid "Internal error"
+msgstr "内部错误"
+
+#: lib/gnutls_alert.c:67
+msgid "No renegotiation is allowed"
+msgstr "不允许二次协商"
+
+#: lib/gnutls_alert.c:69
+msgid "Could not retrieve the specified certificate"
+msgstr "无法获取指定的证书"
+
+#: lib/gnutls_alert.c:70
+msgid "An unsupported extension was sent"
+msgstr "发送了一个不支持的扩展"
+
+#: lib/gnutls_alert.c:72
+msgid "The server name sent was not recognized"
+msgstr "发送的服务器名未被识别"
+
+#: lib/gnutls_alert.c:74
+msgid "The SRP/PSK username is missing or not known"
+msgstr "SRP/PSK 用户名丢失或未知"
+
+#: lib/gnutls_alert.c:76
+msgid "No supported application protocol could be negotiated"
+msgstr "没有可用于协商的应用程序协议"
+
+#: lib/gnutls_errors.c:51
 msgid "Success."
 msgstr "成功。"
 
-#: gnutls_errors.c:52
+#: lib/gnutls_errors.c:52
 msgid "Could not negotiate a supported cipher suite."
 msgstr "无法协商受支持的密码算法。"
 
-#: gnutls_errors.c:54
+#: lib/gnutls_errors.c:54
+msgid "No or insufficient priorities were set."
+msgstr "未设置优先级，或优先级不够高。"
+
+#: lib/gnutls_errors.c:56
 msgid "The cipher type is unsupported."
 msgstr "密码类型不支持。"
 
-#: gnutls_errors.c:56
+#: lib/gnutls_errors.c:58
 msgid "The certificate and the given key do not match."
 msgstr "证书与密钥不匹配。"
 
-#: gnutls_errors.c:58
+#: lib/gnutls_errors.c:60
 msgid "Could not negotiate a supported compression method."
 msgstr "无法协商支持的压缩方法。"
 
-#: gnutls_errors.c:60
+#: lib/gnutls_errors.c:62
 msgid "An unknown public key algorithm was encountered."
 msgstr "遇到未知的公钥算法。"
 
-#: gnutls_errors.c:63
+#: lib/gnutls_errors.c:65
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "协商的算法未启用。"
 
-#: gnutls_errors.c:65
-msgid "A large TLS record packet was received."
-msgstr "收到大 TLS 记录数据包。"
-
-#: gnutls_errors.c:67
+#: lib/gnutls_errors.c:67
 msgid "A record packet with illegal version was received."
 msgstr "收到的记录包版本非法。"
 
-#: gnutls_errors.c:70
+#: lib/gnutls_errors.c:70
 msgid "The Diffie-Hellman prime sent by the server is not acceptable (not long enough)."
-msgstr ""
+msgstr "无法接受服务器发送的 Diffie-Hellman 素数（长度不够）。"
 
-#: gnutls_errors.c:72
+#: lib/gnutls_errors.c:72
 msgid "A TLS packet with unexpected length was received."
-msgstr "收到了意外长度的 TLS 数据包。"
+msgstr "收到了未预期长度的 TLS 数据包。"
+
+#: lib/gnutls_errors.c:74
+msgid "The TLS connection was non-properly terminated."
+msgstr "TLS 链接非正常地终止了。"
 
-#: gnutls_errors.c:75
+#: lib/gnutls_errors.c:77
 msgid "The specified session has been invalidated for some reason."
 msgstr "指定的会话已因故失效。"
 
-#: gnutls_errors.c:78
+#: lib/gnutls_errors.c:80
 msgid "GnuTLS internal error."
 msgstr "GnuTLS 内部错误。"
 
-#: gnutls_errors.c:79
+#: lib/gnutls_errors.c:81
 msgid "An illegal TLS extension was received."
 msgstr "收到一个非法的 TLS 扩展包。"
 
-#: gnutls_errors.c:81
+#: lib/gnutls_errors.c:83
 msgid "A TLS fatal alert has been received."
 msgstr "收到一个 TLS 致命错误警告。"
 
-#: gnutls_errors.c:83
+#: lib/gnutls_errors.c:85
 msgid "An unexpected TLS packet was received."
-msgstr "收到一个意外的 TLS 数据包。"
+msgstr "收到一个未预期的 TLS 数据包。"
 
-#: gnutls_errors.c:85
+#: lib/gnutls_errors.c:87
 msgid "A TLS warning alert has been received."
 msgstr "收到一个 TLS 警告信息。"
 
-#: gnutls_errors.c:88
+#: lib/gnutls_errors.c:90
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "在完成 TLS 数据包计算时出错。"
 
-#: gnutls_errors.c:90
-msgid "The peer did not send any certificate."
-msgstr "对方未发送任何证书。"
+#: lib/gnutls_errors.c:92
+msgid "No certificate was found."
+msgstr "找不到证书。"
 
-#: gnutls_errors.c:93
+#: lib/gnutls_errors.c:94
+msgid "The given DSA key is incompatible with the selected TLS protocol."
+msgstr "指定的DSA密钥与所选TLS协议不兼容。"
+
+#: lib/gnutls_errors.c:96
+msgid "A heartbeat pong message was received."
+msgstr "收到了非常大的 pong（响应）消息。"
+
+#: lib/gnutls_errors.c:98
+msgid "A heartbeat ping message was received."
+msgstr "收到了非常大的 ping（请求）消息。"
+
+#: lib/gnutls_errors.c:100
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "已经有一个低优先级的加密算法。"
 
-#: gnutls_errors.c:96
+#: lib/gnutls_errors.c:103
 msgid "No temporary RSA parameters were found."
 msgstr "未发现 RSA 临时参数。"
 
-#: gnutls_errors.c:98
+#: lib/gnutls_errors.c:105
 msgid "No temporary DH parameters were found."
 msgstr "未发现临时 DH 参数。"
 
-#: gnutls_errors.c:100
+#: lib/gnutls_errors.c:107
 msgid "An unexpected TLS handshake packet was received."
-msgstr "收到意外的 TLS 握手数据包。"
+msgstr "收到未预期的 TLS 握手数据包。"
 
-#: gnutls_errors.c:102
+#: lib/gnutls_errors.c:109
 msgid "The scanning of a large integer has failed."
 msgstr "大整数扫描失败。"
 
-#: gnutls_errors.c:104
+#: lib/gnutls_errors.c:111
 msgid "Could not export a large integer."
 msgstr "无法输出大整数。"
 
-#: gnutls_errors.c:106
+#: lib/gnutls_errors.c:113
 msgid "Decryption has failed."
 msgstr "解密失败。"
 
-#: gnutls_errors.c:107
+#: lib/gnutls_errors.c:114
 msgid "Encryption has failed."
 msgstr "加密失败。"
 
-#: gnutls_errors.c:108
+#: lib/gnutls_errors.c:115
 msgid "Public key decryption has failed."
 msgstr "公钥解密失败。"
 
-#: gnutls_errors.c:110
+#: lib/gnutls_errors.c:117
 msgid "Public key encryption has failed."
 msgstr "公钥加密失败。"
 
-#: gnutls_errors.c:112
+#: lib/gnutls_errors.c:119
 msgid "Public key signing has failed."
 msgstr "公钥签名失败。"
 
-#: gnutls_errors.c:114
+#: lib/gnutls_errors.c:121
 msgid "Public key signature verification has failed."
 msgstr "公钥签名验证失败。"
 
-#: gnutls_errors.c:116
+#: lib/gnutls_errors.c:123
 msgid "Decompression of the TLS record packet has failed."
 msgstr "TLS 记录数据包解压缩失败。"
 
-#: gnutls_errors.c:118
+#: lib/gnutls_errors.c:125
 msgid "Compression of the TLS record packet has failed."
 msgstr "TLS 记录数据包压缩失败。"
 
-#: gnutls_errors.c:121
+#: lib/gnutls_errors.c:128
 msgid "Internal error in memory allocation."
 msgstr "在分配内存时发生内部错误。"
 
-#: gnutls_errors.c:123
+#: lib/gnutls_errors.c:130
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "所请求的特性尚未实现或已被禁用。"
 
-#: gnutls_errors.c:125
+#: lib/gnutls_errors.c:132
 msgid "Insufficient credentials for that request."
 msgstr "此请求的信任凭证不足。"
 
-#: gnutls_errors.c:127
+#: lib/gnutls_errors.c:134
 msgid "Error in password file."
 msgstr "密码文件错误。"
 
-#: gnutls_errors.c:128
+#: lib/gnutls_errors.c:135
 msgid "Wrong padding in PKCS1 packet."
 msgstr "PKC51 数据包填充错误。"
 
-#: gnutls_errors.c:130
+#: lib/gnutls_errors.c:137
 msgid "The requested session has expired."
 msgstr "请求的会话已过期。"
 
-#: gnutls_errors.c:131
+#: lib/gnutls_errors.c:138
 msgid "Hashing has failed."
 msgstr "散列运算失败。"
 
-#: gnutls_errors.c:132
+#: lib/gnutls_errors.c:139
 msgid "Base64 decoding error."
 msgstr "Base64 解码出错。"
 
-#: gnutls_errors.c:134
+#: lib/gnutls_errors.c:141
 msgid "Base64 unexpected header error."
-msgstr ""
+msgstr "Base64 头部出现未预期的错误。"
 
-#: gnutls_errors.c:137
+#: lib/gnutls_errors.c:144
 msgid "Base64 encoding error."
 msgstr "Base64 编码出错。"
 
-#: gnutls_errors.c:139
+#: lib/gnutls_errors.c:146
 msgid "Parsing error in password file."
 msgstr "密码文件解析出错。"
 
-#: gnutls_errors.c:141
+#: lib/gnutls_errors.c:148
 msgid "The requested data were not available."
 msgstr "请求的数据不可用。"
 
-#: gnutls_errors.c:143
+#: lib/gnutls_errors.c:150
 msgid "Error in the pull function."
 msgstr "在 pull 函数中出错。"
 
-#: gnutls_errors.c:144
+#: lib/gnutls_errors.c:151
 msgid "Error in the push function."
 msgstr "在 push 函数中出错。"
 
-#: gnutls_errors.c:146
+#: lib/gnutls_errors.c:153
 msgid "The upper limit of record packet sequence numbers has been reached. Wow!"
 msgstr "哦！记录数据包序列的上限值已到。"
 
-#: gnutls_errors.c:148
+#: lib/gnutls_errors.c:155
 msgid "Error in the certificate."
 msgstr "证书出错。"
 
-#: gnutls_errors.c:150
+#: lib/gnutls_errors.c:157
+msgid "Could not authenticate peer."
+msgstr "无法认证对方。"
+
+#: lib/gnutls_errors.c:159
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "X.509 证书中含有未知的主体代用名。"
 
-#: gnutls_errors.c:153
+#: lib/gnutls_errors.c:162
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "X.509 证书中含有不支持的关键性扩展。"
 
-#: gnutls_errors.c:155
+#: lib/gnutls_errors.c:164
+msgid "Unsupported extension in X.509 certificate."
+msgstr "X.509 证书中含有不支持的扩展。"
+
+#: lib/gnutls_errors.c:166
 msgid "Key usage violation in certificate has been detected."
 msgstr "在证书中检测到违规的密钥用法。"
 
-#: gnutls_errors.c:157
+#: lib/gnutls_errors.c:168
 msgid "Resource temporarily unavailable, try again."
 msgstr "资源临时不可用，请重试。"
 
-#: gnutls_errors.c:159
+#: lib/gnutls_errors.c:170
+msgid "The transmitted packet is too large (EMSGSIZE)."
+msgstr "传送的包太大（EMSGSIZE）。"
+
+#: lib/gnutls_errors.c:172
 msgid "Function was interrupted."
 msgstr "函数被中断。"
 
-#: gnutls_errors.c:160
+#: lib/gnutls_errors.c:173
 msgid "Rehandshake was requested by the peer."
 msgstr "按对方请求重新握手。"
 
-#: gnutls_errors.c:163
+#: lib/gnutls_errors.c:176
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "在期望接收 TLS 握手数据时接收到应用数据。"
 
-#: gnutls_errors.c:165
+#: lib/gnutls_errors.c:178
 msgid "Error in Database backend."
 msgstr "数据库后端出错。"
 
-#: gnutls_errors.c:166
+#: lib/gnutls_errors.c:179
 msgid "The certificate type is not supported."
 msgstr "不支持的证书类型。"
 
-#: gnutls_errors.c:168
+#: lib/gnutls_errors.c:181
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "给待处理参数预留的内存缓冲区过短。"
 
-#: gnutls_errors.c:170
+#: lib/gnutls_errors.c:183
 msgid "The request is invalid."
 msgstr "请求无效。"
 
-#: gnutls_errors.c:171
+#: lib/gnutls_errors.c:184
+msgid "The cookie was bad."
+msgstr "cookie 有误。"
+
+#: lib/gnutls_errors.c:185
 msgid "An illegal parameter has been received."
 msgstr "收到一个非法参数。"
 
-#: gnutls_errors.c:173
+#: lib/gnutls_errors.c:187
+msgid "An illegal parameter was found."
+msgstr "发现一个非法参数。"
+
+#: lib/gnutls_errors.c:189
 msgid "Error while reading file."
 msgstr "读取文件时出错。"
 
-#: gnutls_errors.c:175
+#: lib/gnutls_errors.c:191
 msgid "ASN1 parser: Element was not found."
 msgstr "ASN1 解析器：找不到元素。"
 
-#: gnutls_errors.c:177
+#: lib/gnutls_errors.c:193
 msgid "ASN1 parser: Identifier was not found"
 msgstr "ASN1 解析器：找不到标识。"
 
-#: gnutls_errors.c:179
+#: lib/gnutls_errors.c:195
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "ASN1 解析器：DER 解析时出错。"
 
-#: gnutls_errors.c:181
+#: lib/gnutls_errors.c:197
 msgid "ASN1 parser: Value was not found."
 msgstr "ASN1 解析器：找不到值。"
 
-#: gnutls_errors.c:183
+#: lib/gnutls_errors.c:199
 msgid "ASN1 parser: Generic parsing error."
 msgstr "ASN1 解析器：常规解析中出错。"
 
-#: gnutls_errors.c:185
+#: lib/gnutls_errors.c:201
 msgid "ASN1 parser: Value is not valid."
 msgstr "ASN1 解析器：无效的值。"
 
-#: gnutls_errors.c:187
+#: lib/gnutls_errors.c:203
 msgid "ASN1 parser: Error in TAG."
 msgstr "ASN1 解析器：标签中出错。"
 
-#: gnutls_errors.c:188
+#: lib/gnutls_errors.c:204
 msgid "ASN1 parser: error in implicit tag"
 msgstr "ASN1 解析器：隐式标签中出错。"
 
-#: gnutls_errors.c:190
+#: lib/gnutls_errors.c:206
 msgid "ASN1 parser: Error in type 'ANY'."
-msgstr "ASN1 解析器：‘ANY’类型中出错。"
+msgstr "ASN1 解析器：“ANY”类型中出错。"
 
-#: gnutls_errors.c:192
+#: lib/gnutls_errors.c:208
 msgid "ASN1 parser: Syntax error."
 msgstr "ASN1 解析器：语法出错。"
 
-#: gnutls_errors.c:194
+#: lib/gnutls_errors.c:210
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "ASN1 解析器：DER 解析中出现溢出。"
 
-#: gnutls_errors.c:197
+#: lib/gnutls_errors.c:213
 msgid "Too many empty record packets have been received."
 msgstr "收到了过多的空记录包。"
 
-#: gnutls_errors.c:199
-msgid "The initialization of GnuTLS-extra has failed."
-msgstr "GnuTLS-extra 初始化失败。"
-
-#: gnutls_errors.c:202
-msgid "The GnuTLS library version does not match the GnuTLS-extra library version."
-msgstr "GnuTLS 和 GnuTLS-extra 的库版本不相吻合。"
+#: lib/gnutls_errors.c:215
+msgid "Too many handshake packets have been received."
+msgstr "收到了过多的握手包。"
 
-#: gnutls_errors.c:204
-msgid "The gcrypt library version is too old."
-msgstr "gcrypt 库的版本过旧。"
+#: lib/gnutls_errors.c:217
+msgid "The crypto library version is too old."
+msgstr "加密库的版本过旧。"
 
-#: gnutls_errors.c:207
+#: lib/gnutls_errors.c:220
 msgid "The tasn1 library version is too old."
 msgstr "tasn1 库的版本过旧。"
 
-#: gnutls_errors.c:209
+#: lib/gnutls_errors.c:222
 msgid "The OpenPGP User ID is revoked."
 msgstr "OpenPGP 用户 ID 已吊销。"
 
-#: gnutls_errors.c:211
+#: lib/gnutls_errors.c:224
+msgid "The OpenPGP key has not a preferred key set."
+msgstr "未给OpenPGP指定首选密钥。"
+
+#: lib/gnutls_errors.c:226
 msgid "Error loading the keyring."
 msgstr "载入密钥环时出错。"
 
-#: gnutls_errors.c:213
-msgid "The initialization of LZO has failed."
-msgstr "LZO 算法初始化失败。"
+#: lib/gnutls_errors.c:228
+msgid "The initialization of crypto backend has failed."
+msgstr "加密后端初始化失败。"
 
-#: gnutls_errors.c:215
+#: lib/gnutls_errors.c:230
 msgid "No supported compression algorithms have been found."
 msgstr "找不到支持的压缩算法。"
 
-#: gnutls_errors.c:217
+#: lib/gnutls_errors.c:232
 msgid "No supported cipher suites have been found."
 msgstr "找不到支持的密码机制。"
 
-#: gnutls_errors.c:219
+#: lib/gnutls_errors.c:234
 msgid "Could not get OpenPGP key."
 msgstr "无法获得 OpenPGP 密钥。"
 
-#: gnutls_errors.c:221
+#: lib/gnutls_errors.c:236
 msgid "Could not find OpenPGP subkey."
-msgstr ""
+msgstr "找不到 OpenPGP 子密钥。"
+
+#: lib/gnutls_errors.c:238
+msgid "Safe renegotiation failed."
+msgstr "二次安全协商失败。"
 
-#: gnutls_errors.c:224
+#: lib/gnutls_errors.c:240
+msgid "Unsafe renegotiation denied."
+msgstr "二次安全协商被拒绝。"
+
+#: lib/gnutls_errors.c:243
 msgid "The SRP username supplied is illegal."
 msgstr "提供的 SRP 用户名非法。"
 
-#: gnutls_errors.c:227
+#: lib/gnutls_errors.c:245
+msgid "The SRP username supplied is unknown."
+msgstr "提供的 SRP 用户名未知。"
+
+#: lib/gnutls_errors.c:248
 msgid "The OpenPGP fingerprint is not supported."
-msgstr "不支持 OpenPGP 指纹。"
+msgstr "OpenPGP 指纹不被支持。"
 
-#: gnutls_errors.c:229
+#: lib/gnutls_errors.c:250
+msgid "The signature algorithm is not supported."
+msgstr "签名算法不被支持。"
+
+#: lib/gnutls_errors.c:252
 msgid "The certificate has unsupported attributes."
 msgstr "证书中含有不支持的属性。"
 
-#: gnutls_errors.c:231
+#: lib/gnutls_errors.c:254
 msgid "The OID is not supported."
 msgstr "不支持 OID。"
 
-#: gnutls_errors.c:233
+#: lib/gnutls_errors.c:256
 msgid "The hash algorithm is unknown."
 msgstr "未知的散列算法。"
 
-#: gnutls_errors.c:235
+#: lib/gnutls_errors.c:258
 msgid "The PKCS structure's content type is unknown."
 msgstr "未知的 PKCS 内容类型结构。"
 
-#: gnutls_errors.c:237
+#: lib/gnutls_errors.c:260
 msgid "The PKCS structure's bag type is unknown."
 msgstr "未知的 PKCS 包类型结构。"
 
-#: gnutls_errors.c:239
+#: lib/gnutls_errors.c:262
 msgid "The given password contains invalid characters."
 msgstr "给出的密码中包含无效字符。"
 
-#: gnutls_errors.c:241
+#: lib/gnutls_errors.c:264
 msgid "The Message Authentication Code verification failed."
 msgstr "消息认证代码确认失败。"
 
-#: gnutls_errors.c:243
+#: lib/gnutls_errors.c:266
 msgid "Some constraint limits were reached."
 msgstr "已达到某些约束限定。"
 
-#: gnutls_errors.c:245
+#: lib/gnutls_errors.c:268
 msgid "Failed to acquire random data."
 msgstr "获取随机数据失败。"
 
-#: gnutls_errors.c:248
+#: lib/gnutls_errors.c:271
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "收到 TLS/IA 中间相位完成信息。"
 
-#: gnutls_errors.c:250
+#: lib/gnutls_errors.c:273
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "收到 TLS/IA 末尾相位完成信息。"
 
-#: gnutls_errors.c:252
+#: lib/gnutls_errors.c:275
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "校验 TLS/IA 相位和失败。"
 
-#: gnutls_errors.c:255
+#: lib/gnutls_errors.c:278
 msgid "The specified algorithm or protocol is unknown."
 msgstr "指定的算法或协议未知。"
 
-#: gnutls_errors.c:258
-msgid "The handshake data size is too large (DoS?), check gnutls_handshake_set_max_packet_length()."
-msgstr ""
+#: lib/gnutls_errors.c:281
+msgid "The handshake data size is too large."
+msgstr "握手数据的尺寸太大。"
+
+#: lib/gnutls_errors.c:284
+msgid "Error opening /dev/crypto"
+msgstr "打开 /dev/crypto 时出错"
+
+#: lib/gnutls_errors.c:287
+msgid "Error interfacing with /dev/crypto"
+msgstr "与 /dev/crypto 交互时出错"
+
+#: lib/gnutls_errors.c:289
+msgid "Peer has terminated the connection"
+msgstr "对方终止了链接"
+
+#: lib/gnutls_errors.c:291
+msgid "Channel binding data not available"
+msgstr "通道绑定的数据不可用"
+
+#: lib/gnutls_errors.c:294
+msgid "TPM error."
+msgstr "TPM 错误。"
+
+#: lib/gnutls_errors.c:296
+msgid "TPM is not initialized."
+msgstr "TPM 未初始化。"
+
+#: lib/gnutls_errors.c:298
+msgid "TPM key was not found in persistent storage."
+msgstr "永久存储中找不到 TPM 密钥。"
+
+#: lib/gnutls_errors.c:300
+msgid "Cannot initialize a session with the TPM."
+msgstr "无法用 TPM 初始化会话。"
+
+#: lib/gnutls_errors.c:302
+msgid "PKCS #11 error."
+msgstr "PKCS #11 错误。"
+
+#: lib/gnutls_errors.c:304
+msgid "PKCS #11 initialization error."
+msgstr "PKCS #11 初始化错误。"
+
+#: lib/gnutls_errors.c:306
+msgid "Error in parsing."
+msgstr "解析错误。"
+
+#: lib/gnutls_errors.c:308
+msgid "Error in provided PIN."
+msgstr "给定的 PIN 中有错。"
+
+#: lib/gnutls_errors.c:310
+msgid "Error in provided SRK password for TPM."
+msgstr "用于 TPM 的 SRK 密码有错。"
+
+#: lib/gnutls_errors.c:312
+msgid "Error in provided password for key to be loaded in TPM."
+msgstr "用于载入 TPM 的密钥密码有错。"
+
+#: lib/gnutls_errors.c:314
+msgid "PKCS #11 error in slot"
+msgstr "PKCS #11 插槽错误"
+
+#: lib/gnutls_errors.c:316
+msgid "Thread locking error"
+msgstr "锁定线程出错"
+
+#: lib/gnutls_errors.c:318
+msgid "PKCS #11 error in attribute"
+msgstr "PKCS #11 属性错误"
+
+#: lib/gnutls_errors.c:320
+msgid "PKCS #11 error in device"
+msgstr "PKCS #11 设备错误"
+
+#: lib/gnutls_errors.c:322
+msgid "PKCS #11 error in data"
+msgstr "PKCS #11 数据错误"
+
+#: lib/gnutls_errors.c:324
+msgid "PKCS #11 unsupported feature"
+msgstr "PKCS #11 属性不支持"
+
+#: lib/gnutls_errors.c:326
+msgid "PKCS #11 error in key"
+msgstr "PKCS #11 密钥错误"
+
+#: lib/gnutls_errors.c:328
+msgid "PKCS #11 PIN expired"
+msgstr "PKCS #11 PIN过期"
+
+#: lib/gnutls_errors.c:330
+msgid "PKCS #11 PIN locked"
+msgstr "PKCS #11 PIN被锁定"
+
+#: lib/gnutls_errors.c:332
+msgid "PKCS #11 error in session"
+msgstr "PKCS #11 会话错误"
 
-#: gnutls_errors.c:347
+#: lib/gnutls_errors.c:334
+msgid "PKCS #11 error in signature"
+msgstr "PKCS #11 签名错误"
+
+#: lib/gnutls_errors.c:336
+msgid "PKCS #11 error in token"
+msgstr "PKCS #11 口令错误"
+
+#: lib/gnutls_errors.c:338
+msgid "PKCS #11 user error"
+msgstr "PKCS #11 用户错误"
+
+#: lib/gnutls_errors.c:340
+msgid "The operation timed out"
+msgstr "操作超时"
+
+#: lib/gnutls_errors.c:342
+msgid "The operation was cancelled due to user error"
+msgstr "由于用户错误，操作被取消"
+
+#: lib/gnutls_errors.c:344
+msgid "No supported ECC curves were found"
+msgstr "找不到支持的 ECC 曲线"
+
+#: lib/gnutls_errors.c:346
+msgid "The curve is unsupported"
+msgstr "不支持该曲线"
+
+#: lib/gnutls_errors.c:348
+msgid "The requested PKCS #11 object is not available"
+msgstr "请求的 PKCS #11 不可用"
+
+#: lib/gnutls_errors.c:350
+msgid "The provided X.509 certificate list is not sorted (in subject to issuer order)"
+msgstr "提供的 X.509 证书列表未被排序（应当按照从“主题”到“发行者”的顺序）"
+
+#: lib/gnutls_errors.c:352
+msgid "The OCSP response is invalid"
+msgstr "OCSP 响应无效"
+
+#: lib/gnutls_errors.c:354
+msgid "There is no certificate status (OCSP)."
+msgstr "没有证书状态（OCSP）。"
+
+#: lib/gnutls_errors.c:356
+msgid "Error in the system's randomness device."
+msgstr "系统随机化设备错误。"
+
+#: lib/gnutls_errors.c:358
+msgid "No common application protocol could be negotiated."
+msgstr "没有可用于协商的通用应用程序协议。"
+
+#: lib/gnutls_errors.c:445
 msgid "(unknown error code)"
-msgstr "(未知错误代码)"
+msgstr "（未知错误代码）"
 
-#: gnutls_alert.c:42
-msgid "Close notify"
-msgstr ""
+#: lib/openpgp/output.c:41
+msgid "\t\tKey Usage:\n"
+msgstr "\t\t密钥用法：\n"
 
-#: gnutls_alert.c:43
-msgid "Unexpected message"
-msgstr "未预料的消息"
+#: lib/openpgp/output.c:50
+#, c-format
+msgid "error: get_key_usage: %s\n"
+msgstr "错误：get_key_usage：%s\n"
 
-#: gnutls_alert.c:44
-msgid "Bad record MAC"
-msgstr ""
+#: lib/openpgp/output.c:55
+msgid "\t\t\tDigital signatures.\n"
+msgstr "\t\t\t数字签名。\n"
 
-#: gnutls_alert.c:45
-msgid "Decryption failed"
-msgstr "解密失败"
+#: lib/openpgp/output.c:57
+msgid "\t\t\tCommunications encipherment.\n"
+msgstr "\t\t\t通讯加密。\n"
 
-#: gnutls_alert.c:46
-msgid "Record overflow"
-msgstr "记录溢出"
+#: lib/openpgp/output.c:59
+msgid "\t\t\tStorage data encipherment.\n"
+msgstr "\t\t\t存储数据加密。\n"
 
-#: gnutls_alert.c:47
-msgid "Decompression failed"
-msgstr "解压缩失败"
+#: lib/openpgp/output.c:61
+msgid "\t\t\tAuthentication.\n"
+msgstr "\t\t\t认证。\n"
 
-#: gnutls_alert.c:48
-msgid "Handshake failed"
-msgstr "握手失败"
+#: lib/openpgp/output.c:63
+msgid "\t\t\tCertificate signing.\n"
+msgstr "\t\t\t证书签名。\n"
 
-#: gnutls_alert.c:49
-msgid "Certificate is bad"
-msgstr "证书无效"
+#: lib/openpgp/output.c:84
+msgid "\tID (hex): "
+msgstr "\tID（hex）： "
 
-#: gnutls_alert.c:50
-msgid "Certificate is not supported"
-msgstr "证书不被支持"
+#: lib/openpgp/output.c:109
+msgid "\tFingerprint (hex): "
+msgstr "\t指纹（hex）： "
 
-#: gnutls_alert.c:51
-msgid "Certificate was revoked"
-msgstr "证书已吊销"
+#: lib/openpgp/output.c:126
+msgid "\tFingerprint's random art:\n"
+msgstr "\t指纹对应的随机图像：\n"
 
-#: gnutls_alert.c:52
-msgid "Certificate is expired"
-msgstr "证书过期"
+#: lib/openpgp/output.c:144
+msgid "\tRevoked: True\n"
+msgstr "\t是否被撤销：是\n"
 
-#: gnutls_alert.c:53
-msgid "Unknown certificate"
-msgstr "未知证书"
+#: lib/openpgp/output.c:146
+msgid "\tRevoked: False\n"
+msgstr "\t是否被撤销：没有\n"
 
-#: gnutls_alert.c:54
-msgid "Illegal parameter"
-msgstr "非法参数"
+#: lib/openpgp/output.c:154
+msgid "\tTime stamps:\n"
+msgstr "\t时间戳：\n"
 
-#: gnutls_alert.c:55
-msgid "CA is unknown"
-msgstr "未知 CA"
+#: lib/openpgp/output.c:171
+#, c-format
+msgid "\t\tCreation: %s\n"
+msgstr "\t\t创建于：%s\n"
 
-#: gnutls_alert.c:56
-msgid "Access was denied"
-msgstr "访问被拒绝"
+#: lib/openpgp/output.c:185
+msgid "\t\tExpiration: Never\n"
+msgstr "\t\t过期：永不过期\n"
 
-#: gnutls_alert.c:57
-msgid "Decode error"
-msgstr "解码错误"
+#: lib/openpgp/output.c:194
+#, c-format
+msgid "\t\tExpiration: %s\n"
+msgstr "\t\t过期：%s\n"
 
-#: gnutls_alert.c:58
-msgid "Decrypt error"
-msgstr "解密出错"
+#: lib/openpgp/output.c:216 lib/x509/ocsp_output.c:513 lib/x509/output.c:1233
+#: lib/x509/output.c:1532 lib/x509/output.c:1721 lib/x509/output.c:2143
+msgid "unknown"
+msgstr "未知"
 
-#: gnutls_alert.c:59
-msgid "Export restriction"
-msgstr "导出受限"
+#: lib/openpgp/output.c:218
+#, c-format
+msgid "\tPublic Key Algorithm: %s\n"
+msgstr "\t公钥算法：%s\n"
 
-#: gnutls_alert.c:60
-msgid "Error in protocol version"
-msgstr "协议版本出错"
+#: lib/openpgp/output.c:219
+#, c-format
+msgid "\tKey Security Level: %s\n"
+msgstr "\t密钥安全级别：%s\n"
 
-#: gnutls_alert.c:61
-msgid "Insufficient security"
-msgstr "不够安全"
+#: lib/openpgp/output.c:240 lib/x509/output.c:1263
+#, c-format
+msgid "\t\tModulus (bits %d):\n"
+msgstr "\t\t模块(位 %d)：\n"
 
-#: gnutls_alert.c:62
-msgid "User canceled"
-msgstr "用户已取消"
+#: lib/openpgp/output.c:242
+msgid "\t\tExponent:\n"
+msgstr "\t\t说明：\n"
 
-#: gnutls_alert.c:63
-msgid "Internal error"
-msgstr "内部错误"
+#: lib/openpgp/output.c:267 lib/x509/output.c:1337
+#, c-format
+msgid "\t\tPublic key (bits %d):\n"
+msgstr "\t\t公钥（位 %d）：\n"
 
-#: gnutls_alert.c:64
-msgid "No renegotiation is allowed"
-msgstr ""
+#: lib/openpgp/output.c:269 lib/x509/output.c:1339
+msgid "\t\tP:\n"
+msgstr "\t\tP：\n"
 
-#: gnutls_alert.c:66
-msgid "Could not retrieve the specified certificate"
-msgstr ""
+#: lib/openpgp/output.c:271 lib/x509/output.c:1341
+msgid "\t\tQ:\n"
+msgstr "\t\tQ：\n"
 
-#: gnutls_alert.c:67
-msgid "An unsupported extension was sent"
-msgstr "发送了一个不支持的扩展"
+#: lib/openpgp/output.c:273 lib/x509/output.c:1343
+msgid "\t\tG:\n"
+msgstr "\t\tG：\n"
 
-#: gnutls_alert.c:69
-msgid "The server name sent was not recognized"
-msgstr "发送的服务器名未被识别"
+#: lib/openpgp/output.c:304 lib/x509/ocsp_output.c:53
+#: lib/x509/ocsp_output.c:284 lib/x509/output.c:1392 lib/x509/output.c:1896
+#: lib/x509/output.c:2250
+#, c-format
+msgid "\tVersion: %d\n"
+msgstr "\t版本：%d\n"
 
-#: gnutls_alert.c:71
-msgid "The SRP/PSK username is missing or not known"
-msgstr "SRP/PSK 用户名丢失或未知"
+#: lib/openpgp/output.c:337
+#, c-format
+msgid "\tName[%d]: %s\n"
+msgstr "\t名字[%d]：%s\n"
 
-#: gnutls_alert.c:73
-msgid "Inner application negotiation failed"
+#: lib/openpgp/output.c:339
+#, c-format
+msgid "\tRevoked Name[%d]: %s\n"
+msgstr "\t吊销名称[%d]：%s\n"
+
+#: lib/openpgp/output.c:360
+#, c-format
+msgid ""
+"\n"
+"\tSubkey[%d]:\n"
 msgstr ""
+"\n"
+"\t子密钥[%d]：\n"
+
+#: lib/openpgp/output.c:400
+#, c-format
+msgid "name[%d]: %s, "
+msgstr "名称[%d]：%s， "
+
+#: lib/openpgp/output.c:402
+#, c-format
+msgid "revoked name[%d]: %s, "
+msgstr "吊销名称[%d]：%s，"
+
+#: lib/openpgp/output.c:422
+msgid "fingerprint: "
+msgstr "指纹："
+
+#: lib/openpgp/output.c:442
+#, c-format
+msgid "created: %s, "
+msgstr "已创建：%s， "
+
+#: lib/openpgp/output.c:452
+msgid "never expires, "
+msgstr "永不过期， "
+
+#: lib/openpgp/output.c:460
+#, c-format
+msgid "expires: %s, "
+msgstr "过期：%s， "
+
+#: lib/openpgp/output.c:472
+#, c-format
+msgid "key algorithm %s (%d bits)"
+msgstr "密钥算法 %s（%d 位）"
+
+#: lib/openpgp/output.c:474
+#, c-format
+msgid "unknown key algorithm (%d)"
+msgstr "未知密钥算法（%d）"
+
+#: lib/openpgp/output.c:515
+msgid "OpenPGP Certificate Information:\n"
+msgstr "OpenPGP 证书信息：\n"
+
+#: lib/x509/ocsp_output.c:139 lib/x509/ocsp_output.c:487
+#: lib/x509/output.c:2073 lib/x509/output.c:2406
+msgid "\t\t\tASCII: "
+msgstr "\t\t\tASCII： "
 
-#: gnutls_alert.c:75
-msgid "Inner application verification failed"
-msgstr "内部应用程序验证失败"
+#: lib/x509/ocsp_output.c:143 lib/x509/ocsp_output.c:491
+#: lib/x509/output.c:2077 lib/x509/output.c:2410
+msgid "\t\t\tHexdump: "
+msgstr "\t\t\t十六进制转储： "
+
+#: lib/x509/ocsp_output.c:188
+msgid "OCSP Request Information:\n"
+msgstr "OCSP 请求信息：\n"
+
+#: lib/x509/ocsp_output.c:298
+#, c-format
+msgid "\tResponder ID: %.*s\n"
+msgstr "\t响应者 ID：%.*s\n"
+
+#: lib/x509/ocsp_output.c:316
+#, c-format
+msgid "\tProduced At: %s\n"
+msgstr "\t\t产生于：%s\n"
+
+#: lib/x509/ocsp_output.c:410
+#, c-format
+msgid "\t\tRevocation time: %s\n"
+msgstr "\t\t吊销时间：%s\n"
+
+#: lib/x509/ocsp_output.c:425
+#, c-format
+msgid "\t\tThis Update: %s\n"
+msgstr "\t\t本次更新：%s\n"
+
+#: lib/x509/ocsp_output.c:440
+#, c-format
+msgid "\t\tNext Update: %s\n"
+msgstr "\t\t下一次更新：%s\n"
 
-#: x509/output.c:156
+#: lib/x509/ocsp_output.c:514 lib/x509/output.c:1533 lib/x509/output.c:2144
+#, c-format
+msgid "\tSignature Algorithm: %s\n"
+msgstr "\t签名算法：%s\n"
+
+#: lib/x509/ocsp_output.c:518 lib/x509/output.c:1537 lib/x509/output.c:2148
+msgid "warning: signed using a broken signature algorithm that can be forged.\n"
+msgstr "警告：使用可伪造的签名算法进行了签名。\n"
+
+#: lib/x509/ocsp_output.c:527 lib/x509/output.c:1564 lib/x509/output.c:2175
+msgid "\tSignature:\n"
+msgstr "\t签名：\n"
+
+#: lib/x509/ocsp_output.c:619
+msgid "OCSP Response Information:\n"
+msgstr "OCSP 响应信息：\n"
+
+#: lib/x509/output.c:92 lib/x509/output.c:808
+msgid "warning: altname contains an embedded NUL, replacing with '!'\n"
+msgstr "警告：altname 内含 NUL，使用“!”代替\n"
+
+#: lib/x509/output.c:148
 #, c-format
 msgid "\t\t\tPath Length Constraint: %d\n"
-msgstr "\t\t\t路径长度常数: %d\n"
+msgstr "\t\t\t路径长度常数：%d\n"
 
-#: x509/output.c:157
+#: lib/x509/output.c:149
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
 msgstr "\t\t\t策略语言： %s"
 
-#: x509/output.c:166
+#: lib/x509/output.c:158
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
 msgstr ""
 "\t\t\t策略：\n"
-"\t\t\t\tASCII:： "
+"\t\t\t\tASCII： "
 
-#: x509/output.c:168
+#: lib/x509/output.c:160
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
@@ -566,280 +1006,338 @@ msgstr ""
 "\n"
 "\t\t\t\t十六进制输出 "
 
-#: x509/output.c:295
+#: lib/x509/output.c:185
 #, c-format
-msgid "%s\t\t\tDigital signature.\n"
-msgstr "%s\t\t\t数字签名。\n"
+msgid "\t\t\tAccess Method: %.*s"
+msgstr "\t\t\t访问方式：%.*s"
 
-#: x509/output.c:297
+#: lib/x509/output.c:428
 #, c-format
-msgid "%s\t\t\tNon repudiation.\n"
-msgstr ""
+msgid "%sDigital signature.\n"
+msgstr "%s数字签名。\n"
 
-#: x509/output.c:299
+#: lib/x509/output.c:430
 #, c-format
-msgid "%s\t\t\tKey encipherment.\n"
-msgstr ""
+msgid "%sNon repudiation.\n"
+msgstr "%s无法否认。\n"
 
-#: x509/output.c:301
+#: lib/x509/output.c:432
 #, c-format
-msgid "%s\t\t\tData encipherment.\n"
-msgstr ""
+msgid "%sKey encipherment.\n"
+msgstr "%s密钥加密。\n"
 
-#: x509/output.c:303
+#: lib/x509/output.c:434
 #, c-format
-msgid "%s\t\t\tKey agreement.\n"
-msgstr ""
+msgid "%sData encipherment.\n"
+msgstr "%s数据加密。\n"
 
-#: x509/output.c:305
+#: lib/x509/output.c:436
 #, c-format
-msgid "%s\t\t\tCertificate signing.\n"
-msgstr "%s\t\t\t证书签名。\n"
+msgid "%sKey agreement.\n"
+msgstr "%s密钥协议。\n"
 
-#: x509/output.c:307
+#: lib/x509/output.c:438
 #, c-format
-msgid "%s\t\t\tCRL signing.\n"
-msgstr "%s\t\t\tCRL 签名。\n"
+msgid "%sCertificate signing.\n"
+msgstr "%s证书签名。\n"
 
-#: x509/output.c:309
+#: lib/x509/output.c:440
 #, c-format
-msgid "%s\t\t\tKey encipher only.\n"
-msgstr ""
+msgid "%sCRL signing.\n"
+msgstr "%sCRL 签名。\n"
 
-#: x509/output.c:311
+#: lib/x509/output.c:442
 #, c-format
-msgid "%s\t\t\tKey decipher only.\n"
-msgstr ""
+msgid "%sKey encipher only.\n"
+msgstr "%s仅密钥加密。\n"
 
-#: x509/output.c:443
+#: lib/x509/output.c:444
+#, c-format
+msgid "%sKey decipher only.\n"
+msgstr "%s仅密钥解密。\n"
+
+#: lib/x509/output.c:482
+#, c-format
+msgid "\t\t\tNot Before: %s\n"
+msgstr "\t\t\t不早于： %s\n"
+
+#: lib/x509/output.c:489
+#, c-format
+msgid "\t\t\tNot After: %s\n"
+msgstr "\t\t\t不晚于： %s\n"
+
+#: lib/x509/output.c:539
+msgid "warning: distributionPoint contains an embedded NUL, replacing with '!'\n"
+msgstr "警告：distributionPoint 含有内嵌的NUL，使用“!”代替\n"
+
+#: lib/x509/output.c:632
 #, c-format
 msgid "%s\t\t\tTLS WWW Server.\n"
 msgstr "%s\t\t\tTLS WWW 服务器。\n"
 
-#: x509/output.c:445
+#: lib/x509/output.c:634
 #, c-format
 msgid "%s\t\t\tTLS WWW Client.\n"
 msgstr "%s\t\t\tTLS WWW 客户端。\n"
 
-#: x509/output.c:447
+#: lib/x509/output.c:636
 #, c-format
 msgid "%s\t\t\tCode signing.\n"
-msgstr ""
+msgstr "%s\t\t\t代码签名。\n"
 
-#: x509/output.c:449
+#: lib/x509/output.c:638
 #, c-format
 msgid "%s\t\t\tEmail protection.\n"
 msgstr "%s\t\t\tEmail 保护。\n"
 
-#: x509/output.c:451
+#: lib/x509/output.c:640
 #, c-format
 msgid "%s\t\t\tTime stamping.\n"
 msgstr "%s\t\t\t时间戳。\n"
 
-#: x509/output.c:453
+#: lib/x509/output.c:642
 #, c-format
 msgid "%s\t\t\tOCSP signing.\n"
 msgstr "%s\t\t\tOCSP 签名。\n"
 
-#: x509/output.c:455
+#: lib/x509/output.c:644
+#, c-format
+msgid "%s\t\t\tIpsec IKE.\n"
+msgstr "%s\t\t\tIpsec 内部密钥交换（IKE）。\n"
+
+#: lib/x509/output.c:646
 #, c-format
 msgid "%s\t\t\tAny purpose.\n"
-msgstr ""
+msgstr "%s\t\t\t任何目的。\n"
 
-#: x509/output.c:488
+#: lib/x509/output.c:677
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
-msgstr ""
+msgstr "%s\t\t\t证书颁发机构（CA）：FALSE\n"
 
-#: x509/output.c:490
+#: lib/x509/output.c:679
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
-msgstr ""
+msgstr "%s\t\t\t证书颁发机构（CA）：TRUE\n"
 
-#: x509/output.c:493
+#: lib/x509/output.c:682
 #, c-format
 msgid "%s\t\t\tPath Length Constraint: %d\n"
 msgstr "%s\t\t\t路径长度限制： %d\n"
 
-#: x509/output.c:626
+#: lib/x509/output.c:814
 #, c-format
 msgid "%s\t\t\tXMPP Address: %.*s\n"
 msgstr "%s\t\t\tXMPP 地址：%.*s\n"
 
-#: x509/output.c:630
+#: lib/x509/output.c:819
 #, c-format
 msgid "%s\t\t\totherName OID: %.*s\n"
-msgstr ""
+msgstr "%s\t\t\totherName 对象标识符（OID）：%.*s\n"
 
-#: x509/output.c:632
+#: lib/x509/output.c:821
 #, c-format
 msgid "%s\t\t\totherName DER: "
-msgstr ""
+msgstr "%s\t\t\totherName 区分编码规则（DER）： "
 
-#: x509/output.c:634
+#: lib/x509/output.c:823
 #, c-format
 msgid ""
 "\n"
 "%s\t\t\totherName ASCII: "
 msgstr ""
+"\n"
+"%s\t\t\totherName ASCII："
 
-#: x509/output.c:696
+#: lib/x509/output.c:945
 #, c-format
 msgid "%s\tExtensions:\n"
 msgstr "%s\t扩展：\n"
 
-#: x509/output.c:706
+#: lib/x509/output.c:955
 #, c-format
 msgid "%s\t\tBasic Constraints (%s):\n"
-msgstr "%s\t\t基本限制(%s)：\n"
-
-#: x509/output.c:707 x509/output.c:722 x509/output.c:739 x509/output.c:755
-#: x509/output.c:770 x509/output.c:787 x509/output.c:802 x509/output.c:820
-#: x509/output.c:833 x509/output.c:1482 x509/output.c:1505 x509/output.c:1518
+msgstr "%s\t\t基本限制（%s）：\n"
+
+#: lib/x509/output.c:956 lib/x509/output.c:971 lib/x509/output.c:1000
+#: lib/x509/output.c:1029 lib/x509/output.c:1045 lib/x509/output.c:1062
+#: lib/x509/output.c:1077 lib/x509/output.c:1091 lib/x509/output.c:1106
+#: lib/x509/output.c:1121 lib/x509/output.c:1136 lib/x509/output.c:1147
+#: lib/x509/output.c:1158 lib/x509/output.c:2008 lib/x509/output.c:2031
+#: lib/x509/output.c:2044
 msgid "critical"
 msgstr "关键"
 
-#: x509/output.c:707 x509/output.c:722 x509/output.c:739 x509/output.c:755
-#: x509/output.c:770 x509/output.c:787 x509/output.c:802 x509/output.c:820
-#: x509/output.c:833 x509/output.c:1482 x509/output.c:1505 x509/output.c:1518
+#: lib/x509/output.c:956 lib/x509/output.c:971 lib/x509/output.c:1000
+#: lib/x509/output.c:1029 lib/x509/output.c:1045 lib/x509/output.c:1062
+#: lib/x509/output.c:1077 lib/x509/output.c:1091 lib/x509/output.c:1106
+#: lib/x509/output.c:1121 lib/x509/output.c:1136 lib/x509/output.c:1147
+#: lib/x509/output.c:1158 lib/x509/output.c:2008 lib/x509/output.c:2031
+#: lib/x509/output.c:2044
 msgid "not critical"
 msgstr "非关键"
 
-#: x509/output.c:721
+#: lib/x509/output.c:970
 #, c-format
 msgid "%s\t\tSubject Key Identifier (%s):\n"
-msgstr ""
+msgstr "%s\t\t主题密钥标识符（%s）：\n"
 
-#: x509/output.c:738
+#: lib/x509/output.c:1028
 #, c-format
 msgid "%s\t\tAuthority Key Identifier (%s):\n"
-msgstr ""
+msgstr "%s\t\t作者密钥标识符（%s）：\n"
 
-#: x509/output.c:754
+#: lib/x509/output.c:1044
 #, c-format
 msgid "%s\t\tKey Usage (%s):\n"
-msgstr ""
+msgstr "%s\t\t密钥用法（%s）：\n"
 
-#: x509/output.c:769
+#: lib/x509/output.c:1061
+#, c-format
+msgid "%s\t\tPrivate Key Usage Period (%s):\n"
+msgstr "%s\t\t密钥使用期（%s）：\n"
+
+#: lib/x509/output.c:1076
 #, c-format
 msgid "%s\t\tKey Purpose (%s):\n"
-msgstr ""
+msgstr "%s\t\t密钥目的（%s）：\n"
 
-#: x509/output.c:786
+#: lib/x509/output.c:1090
 #, c-format
 msgid "%s\t\tSubject Alternative Name (%s):\n"
-msgstr ""
+msgstr "%s\t\t主题备用名（%s）：\n"
 
-#: x509/output.c:801
+#: lib/x509/output.c:1105
+#, c-format
+msgid "%s\t\tIssuer Alternative Name (%s):\n"
+msgstr "%s\t\t发行人备用名（%s）：\n"
+
+#: lib/x509/output.c:1120
 #, c-format
 msgid "%s\t\tCRL Distribution points (%s):\n"
-msgstr ""
+msgstr "%s\t\tCRL 分发点（%s）：\n"
 
-#: x509/output.c:819
+#: lib/x509/output.c:1135
 #, c-format
 msgid "%s\t\tProxy Certificate Information (%s):\n"
 msgstr "%s\t\t代理证书信息(%s)：\n"
 
-#: x509/output.c:832
+#: lib/x509/output.c:1145
+#, c-format
+msgid "%s\t\tAuthority Information Access (%s):\n"
+msgstr "%s\t\t作者信息入口（%s）：\n"
+
+#: lib/x509/output.c:1157
 #, c-format
 msgid "%s\t\tUnknown extension %s (%s):\n"
-msgstr "%s\t\t未知扩展 %s (%s):\n"
+msgstr "%s\t\t未知扩展 %s（%s）：\n"
 
-#: x509/output.c:878
+#: lib/x509/output.c:1204
 #, c-format
 msgid "%s\t\t\tASCII: "
-msgstr "%s\t\t\tASCII: "
+msgstr "%s\t\t\tASCII： "
 
-#: x509/output.c:882
+#: lib/x509/output.c:1208
 #, c-format
 msgid "%s\t\t\tHexdump: "
-msgstr ""
+msgstr "%s\t\t\t十六进制转储： "
 
-#: x509/output.c:900 x509/output.c:1385 x509/output.c:1698
-#: openpgp/output.c:323
+#: lib/x509/output.c:1237
 #, c-format
-msgid "\tVersion: %d\n"
-msgstr "\t版本：%d\n"
-
-#: x509/output.c:914
-msgid "\tSerial Number (hex): "
-msgstr "\t序列号(16进制)： "
+msgid "\t%sPublic Key Algorithm: %s\n"
+msgstr "\t%s公钥算法：%s\n"
 
-#: x509/output.c:931 x509/output.c:1399
+#: lib/x509/output.c:1238
 #, c-format
-msgid "\tIssuer: %s\n"
-msgstr "\t发行者：%s\n"
+msgid "\tAlgorithm Security Level: %s (%d bits)\n"
+msgstr "\t算法安全级别：%s（%d 位）\n"
 
-#: x509/output.c:938
-msgid "\tValidity:\n"
-msgstr "\t有效性：\n"
+#: lib/x509/output.c:1254
+#, c-format
+msgid "\t\tModulus (bits %d): "
+msgstr "\t\t模数（位 %d）："
 
-#: x509/output.c:951
+#: lib/x509/output.c:1257
 #, c-format
-msgid "\t\tNot Before: %s\n"
-msgstr "\t\t不早于： %s\n"
+msgid "\t\tExponent (bits %d): "
+msgstr "\t\t指数（位 %d）："
 
-#: x509/output.c:965
+#: lib/x509/output.c:1265
 #, c-format
-msgid "\t\tNot After: %s\n"
-msgstr "\t\t不晚于： %s\n"
+msgid "\t\tExponent (bits %d):\n"
+msgstr "\t\t指数（位 %d）：\n"
 
-#: x509/output.c:979 x509/output.c:1711
+#: lib/x509/output.c:1286
 #, c-format
-msgid "\tSubject: %s\n"
-msgstr "\t主题：%s\n"
+msgid "\t\tCurve:\t%s\n"
+msgstr "\t\t曲线：\t%s\n"
 
-#: x509/output.c:994 x509/output.c:1081 x509/output.c:1224 x509/output.c:1616
-#: x509/output.c:1726 openpgp/output.c:237
-msgid "unknown"
-msgstr "未知"
+#: lib/x509/output.c:1290
+msgid "\t\tX: "
+msgstr "\t\tX："
 
-#: x509/output.c:996 x509/output.c:1728
-#, c-format
-msgid "\tSubject Public Key Algorithm: %s\n"
-msgstr "\t主公钥算法： %s\n"
+#: lib/x509/output.c:1293
+msgid "\t\tY: "
+msgstr "\t\tY："
 
-#: x509/output.c:1010 x509/output.c:1741 openpgp/output.c:257
-#, c-format
-msgid "\t\tModulus (bits %d):\n"
-msgstr "\t\t模块(位 %d)：\n"
+#: lib/x509/output.c:1299
+msgid "\t\tX:\n"
+msgstr "\t\tX：\n"
 
-#: x509/output.c:1012
-#, c-format
-msgid "\t\tExponent (bits %d):\n"
-msgstr ""
+#: lib/x509/output.c:1301
+msgid "\t\tY:\n"
+msgstr "\t\tY：\n"
 
-#: x509/output.c:1032 x509/output.c:1763 openpgp/output.c:284
+#: lib/x509/output.c:1322
 #, c-format
-msgid "\t\tPublic key (bits %d):\n"
-msgstr "\t\t公钥 (位 %d)：\n"
+msgid "\t\tPublic key (bits %d): "
+msgstr "\t\t公钥（位 %d）："
 
-#: x509/output.c:1034 x509/output.c:1765 openpgp/output.c:286
-msgid "\t\tP:\n"
-msgstr "\t\tP:\n"
+#: lib/x509/output.c:1325
+msgid "\t\tP: "
+msgstr "\t\tP："
 
-#: x509/output.c:1036 x509/output.c:1767 openpgp/output.c:288
-msgid "\t\tQ:\n"
-msgstr "\t\tQ:\n"
+#: lib/x509/output.c:1328
+msgid "\t\tQ: "
+msgstr "\t\tQ："
 
-#: x509/output.c:1038 x509/output.c:1769 openpgp/output.c:290
-msgid "\t\tG:\n"
-msgstr "\t\tG:\n"
+#: lib/x509/output.c:1331
+msgid "\t\tG: "
+msgstr "\t\tG："
+
+#: lib/x509/output.c:1375 lib/x509/output.c:2234
+msgid "Subject "
+msgstr "主题 "
+
+#: lib/x509/output.c:1406
+msgid "\tSerial Number (hex): "
+msgstr "\t序列号（16进制）： "
 
-#: x509/output.c:1082 x509/output.c:1617
+#: lib/x509/output.c:1435 lib/x509/output.c:1922
 #, c-format
-msgid "\tSignature Algorithm: %s\n"
-msgstr "\t签名算法：%s\n"
+msgid "\tIssuer: %s\n"
+msgstr "\t发行者：%s\n"
 
-#: x509/output.c:1086 x509/output.c:1621
-msgid "warning: signed using a broken signature algorithm that can be forged.\n"
-msgstr "警告：使用可伪造的签名算法进行了签名。\n"
+#: lib/x509/output.c:1445
+msgid "\tValidity:\n"
+msgstr "\t有效性：\n"
 
-#: x509/output.c:1112 x509/output.c:1647
-msgid "\tSignature:\n"
-msgstr "\t签名：\n"
+#: lib/x509/output.c:1458
+#, c-format
+msgid "\t\tNot Before: %s\n"
+msgstr "\t\t不早于： %s\n"
 
-#: x509/output.c:1135
+#: lib/x509/output.c:1472
+#, c-format
+msgid "\t\tNot After: %s\n"
+msgstr "\t\t不晚于： %s\n"
+
+#: lib/x509/output.c:1497 lib/x509/output.c:2274
+#, c-format
+msgid "\tSubject: %s\n"
+msgstr "\t主题：%s\n"
+
+#: lib/x509/output.c:1587
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -847,7 +1345,7 @@ msgstr ""
 "\tMD5 指纹：\n"
 "\t\t"
 
-#: x509/output.c:1137
+#: lib/x509/output.c:1589
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -855,7 +1353,7 @@ msgstr ""
 "\tSHA-1 指纹：\n"
 "\t\t"
 
-#: x509/output.c:1156 x509/output.c:1924
+#: lib/x509/output.c:1611 lib/x509/output.c:2450
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -863,236 +1361,136 @@ msgstr ""
 "\t公钥 Id：\n"
 "\t\t"
 
-#: x509/output.c:1226
+#: lib/x509/output.c:1627
+msgid "\tPublic key's random art:\n"
+msgstr ""
+"\t公钥对应的随机图像：\n"
+"\n"
+
+#: lib/x509/output.c:1723
 #, c-format
 msgid "signed using %s (broken!), "
-msgstr ""
+msgstr "使用 %s 签名（已破损！）， "
 
-#: x509/output.c:1228
+#: lib/x509/output.c:1725
 #, c-format
 msgid "signed using %s, "
-msgstr ""
+msgstr "使用 %s 签名， "
 
-#: x509/output.c:1341
+#: lib/x509/output.c:1867
 msgid "X.509 Certificate Information:\n"
 msgstr "X.509 证书信息：\n"
 
-#: x509/output.c:1345 x509/output.c:1961
+#: lib/x509/output.c:1871 lib/x509/output.c:2488
 msgid "Other Information:\n"
 msgstr "其它信息：\n"
 
-#: x509/output.c:1381
+#: lib/x509/output.c:1892
 msgid "\tVersion: 1 (default)\n"
-msgstr "\t版本：1 (默认)\n"
+msgstr "\t版本：1（默认）\n"
 
-#: x509/output.c:1406
+#: lib/x509/output.c:1932
 msgid "\tUpdate dates:\n"
 msgstr "\t更新日期：\n"
 
-#: x509/output.c:1419
+#: lib/x509/output.c:1945
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\t发行：%s\n"
 
-#: x509/output.c:1435
+#: lib/x509/output.c:1961
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\t下一个位于：%s\n"
 
-#: x509/output.c:1466
+#: lib/x509/output.c:1992
 msgid "\tExtensions:\n"
 msgstr "\t扩展：\n"
 
-#: x509/output.c:1481
+#: lib/x509/output.c:2007
 #, c-format
 msgid "\t\tCRL Number (%s): "
-msgstr "\t\tCRL 号(%s): "
+msgstr "\t\tCRL 号（%s）： "
 
-#: x509/output.c:1504
+#: lib/x509/output.c:2030
 #, c-format
 msgid "\t\tAuthority Key Identifier (%s):\n"
-msgstr "\t\t授权密钥识别器 (%s):\n"
+msgstr "\t\t授权密钥识别器（%s）：\n"
 
-#: x509/output.c:1517
+#: lib/x509/output.c:2043
 #, c-format
 msgid "\t\tUnknown extension %s (%s):\n"
-msgstr "\t\t未知扩展 %s (%s)：\n"
-
-#: x509/output.c:1546 x509/output.c:1881
-msgid "\t\t\tASCII: "
-msgstr "\t\t\tASCII: "
-
-#: x509/output.c:1550 x509/output.c:1885
-msgid "\t\t\tHexdump: "
-msgstr "\t\t\t十六进制转储： "
+msgstr "\t\t未知扩展 %s（%s）：\n"
 
-#: x509/output.c:1566
+#: lib/x509/output.c:2093
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\t撤销的证书（%d）：\n"
 
-#: x509/output.c:1568
+#: lib/x509/output.c:2095
 msgid "\tNo revoked certificates.\n"
 msgstr "\t没有撤销的证书。\n"
 
-#: x509/output.c:1587
+#: lib/x509/output.c:2114
 msgid "\t\tSerial Number (hex): "
-msgstr "\t\t序列号(hex)： "
+msgstr "\t\t序列号（hex）： "
 
-#: x509/output.c:1596
+#: lib/x509/output.c:2123
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\t撤销于：%s\n"
 
-#: x509/output.c:1678
+#: lib/x509/output.c:2207
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "X.509 证书撤销列表信息：\n"
 
-#: x509/output.c:1743 openpgp/output.c:259
-msgid "\t\tExponent:\n"
-msgstr "\t\t说明：\n"
-
-#: x509/output.c:1810
+#: lib/x509/output.c:2315
 msgid "\tAttributes:\n"
-msgstr ""
+msgstr "\t属性：\n"
 
-#: x509/output.c:1845
+#: lib/x509/output.c:2367
 #, c-format
 msgid "\t\tChallenge password: %s\n"
-msgstr ""
+msgstr "\t\t质询密码：%s\n"
 
-#: x509/output.c:1854
+#: lib/x509/output.c:2378
 #, c-format
 msgid "\t\tUnknown attribute %s:\n"
-msgstr ""
+msgstr "\t\t未知属性 %s：\n"
 
-#: x509/output.c:1957
+#: lib/x509/output.c:2484
 msgid "PKCS #10 Certificate Request Information:\n"
-msgstr ""
+msgstr "PKCS #10 证书请求信息：\n"
 
-#: openpgp/output.c:84
-msgid "\t\tKey Usage:\n"
-msgstr ""
+#: lib/x509/output.c:2520
+msgid "Public Key Usage:\n"
+msgstr "公钥用法：\n"
 
-#: openpgp/output.c:93
-#, c-format
-msgid "error: get_key_usage: %s\n"
-msgstr "错误：get_key_usage: %s\n"
+#: lib/x509/output.c:2531
+msgid "Public Key ID: "
+msgstr "公钥 ID："
 
-#: openpgp/output.c:98
-msgid "\t\t\tDigital signatures.\n"
-msgstr "\t\t\t数字签名。\n"
+#: lib/x509/output.c:2565
+msgid "Public Key Information:\n"
+msgstr "公钥信息：\n"
 
-#: openpgp/output.c:100
-msgid "\t\t\tCommunications encipherment.\n"
-msgstr ""
+#~ msgid "The peer did not send any certificate."
+#~ msgstr "对方未发送任何证书。"
 
-#: openpgp/output.c:102
-msgid "\t\t\tStorage data encipherment.\n"
-msgstr ""
+#~ msgid "The initialization of GnuTLS-extra has failed."
+#~ msgstr "GnuTLS-extra 初始化失败。"
 
-#: openpgp/output.c:104
-msgid "\t\t\tAuthentication.\n"
-msgstr "\t\t\t认证。\n"
+#~ msgid "The GnuTLS library version does not match the GnuTLS-extra library version."
+#~ msgstr "GnuTLS 和 GnuTLS-extra 的库版本不相吻合。"
 
-#: openpgp/output.c:106
-msgid "\t\t\tCertificate signing.\n"
-msgstr "\t\t\t证书签名。\n"
+#~ msgid "Inner application verification failed"
+#~ msgstr "内部应用程序验证失败"
 
-#: openpgp/output.c:127
-msgid "\tID (hex): "
-msgstr "\tID (hex): "
+#~ msgid "\tSubject Public Key Algorithm: %s\n"
+#~ msgstr "\t主公钥算法：%s\n"
 
-#: openpgp/output.c:148
-msgid "\tFingerprint (hex): "
-msgstr "\t指纹（hex）： "
-
-#: openpgp/output.c:165
-msgid "\tRevoked: True\n"
-msgstr "\t是否被撤销：是\n"
-
-#: openpgp/output.c:167
-msgid "\tRevoked: False\n"
-msgstr "\t是否被撤销：没有\n"
+#~ msgid "PKCS #11 error in PIN."
+#~ msgstr "PKCS #11 PIN错误。"
 
-#: openpgp/output.c:175
-msgid "\tTime stamps:\n"
-msgstr "\t时间戳：\n"
-
-#: openpgp/output.c:192
-#, c-format
-msgid "\t\tCreation: %s\n"
-msgstr "\t\t创建于：%s\n"
-
-#: openpgp/output.c:206
-msgid "\t\tExpiration: Never\n"
-msgstr "\t\t过期：永不过期\n"
-
-#: openpgp/output.c:215
-#, c-format
-msgid "\t\tExpiration: %s\n"
-msgstr "\t\t过期：%s\n"
-
-#: openpgp/output.c:239
-#, c-format
-msgid "\tPublic Key Algorithm: %s\n"
-msgstr "\t公钥算法：%s\n"
-
-#: openpgp/output.c:346
-#, c-format
-msgid "\tName[%d]: %s\n"
-msgstr "\t名字[%d]：%s\n"
-
-#: openpgp/output.c:349
-#, c-format
-msgid "\tRevoked Name[%d]: %s\n"
-msgstr "\t吊销名称[%d]：%s\n"
-
-#: openpgp/output.c:366
-#, c-format
-msgid ""
-"\n"
-"\tSubkey[%d]:\n"
-msgstr ""
-
-#: openpgp/output.c:399
-#, c-format
-msgid "name[%d]: %s, "
-msgstr "名称[%d]：%s， "
-
-#: openpgp/output.c:401
-#, c-format
-msgid "revoked name[%d]: %s, "
-msgstr ""
-
-#: openpgp/output.c:415
-msgid "fingerprint: "
-msgstr "指纹："
-
-#: openpgp/output.c:435
-#, c-format
-msgid "created: %s, "
-msgstr "已创建：%s, "
-
-#: openpgp/output.c:445
-msgid "never expires, "
-msgstr "永不过期, "
-
-#: openpgp/output.c:453
-#, c-format
-msgid "expires: %s, "
-msgstr "过期：%s, "
-
-#: openpgp/output.c:465
-#, c-format
-msgid "key algorithm %s (%d bits)"
-msgstr ""
-
-#: openpgp/output.c:467
-#, c-format
-msgid "unknown key algorithm (%d)"
-msgstr ""
-
-#: openpgp/output.c:499
-msgid "OpenPGP Certificate Information:\n"
-msgstr "OpenPGP 证书信息：\n"
+#~ msgid "PKCS #11 PIN should be saved."
+#~ msgstr "PKCS #11 应当保存PIN。"