[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-147-gfcd9115

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=fcd91158bcacd969caf983e43265f42dd5b8d92d

The branch, master has been updated
       via  fcd91158bcacd969caf983e43265f42dd5b8d92d (commit)
       via  6ec3077a5edc945a9420c41fd1774dc813b0ac3f (commit)
       via  f4e2c68fca1bd90aa5a83adc1c7230db1674c1de (commit)
      from  1f71576c44bdbabd6c2783fc31d8fc4bfda816ad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fcd91158bcacd969caf983e43265f42dd5b8d92d
Author: Simon Josefsson <address@hidden>
Date:   Thu Feb 18 10:36:15 2010 +0100

    Update.

commit 6ec3077a5edc945a9420c41fd1774dc813b0ac3f
Author: Simon Josefsson <address@hidden>
Date:   Thu Feb 18 10:33:56 2010 +0100

    Remove.

commit f4e2c68fca1bd90aa5a83adc1c7230db1674c1de
Author: Simon Josefsson <address@hidden>
Date:   Thu Feb 18 10:31:39 2010 +0100

    Fix -lrt usage.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore      |   32 +--
 lib/po/zh_CN.po | 1098 -------------------------------------------------------
 src/Makefile.am |    2 +-
 3 files changed, 4 insertions(+), 1128 deletions(-)
 delete mode 100644 lib/po/zh_CN.po

diff --git a/.gitignore b/.gitignore
index 3257c6d..4449b69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,9 +63,9 @@ doc/gnutls.info-1
 doc/gnutls.info-2
 doc/gnutls.info-3
 doc/ia-api.texi
+doc/manpages/*.3
 doc/manpages/Makefile
 doc/manpages/Makefile.in
-doc/manpages/*.3
 doc/pgp-api.texi
 doc/printlist
 doc/reference/Makefile
@@ -279,6 +279,8 @@ lib/opencdk/libminiopencdk.la
 lib/openpgp/Makefile
 lib/openpgp/Makefile.in
 lib/openpgp/libgnutls_openpgp.la
+lib/po/*.gmo
+lib/po/*.po
 lib/po/Makefile
 lib/po/Makefile.in
 lib/po/Makefile.in.in
@@ -286,44 +288,16 @@ lib/po/Makevars.template
 lib/po/POTFILES
 lib/po/Rules-quot
 lib/po/boldquot.sed
-lib/po/cs.gmo
-lib/po/cs.po
-lib/po/cs.po~
-lib/po/de.gmo
-lib/po/de.po
-lib/po/de.po~
-lib/po/address@hidden
 lib/po/address@hidden
 lib/po/address@hidden
-lib/po/address@hidden
-lib/po/address@hidden
 lib/po/address@hidden
 lib/po/address@hidden
-lib/po/address@hidden
-lib/po/fr.gmo
-lib/po/fr.po
-lib/po/fr.po~
 lib/po/insert-header.sin
 lib/po/libgnutls.pot
-lib/po/ms.gmo
-lib/po/ms.po
-lib/po/ms.po~
-lib/po/nl.gmo
-lib/po/nl.po
-lib/po/nl.po~
-lib/po/pl.gmo
-lib/po/pl.po
-lib/po/pl.po~
 lib/po/quot.sed
 lib/po/remove-potcdate.sed
 lib/po/remove-potcdate.sin
 lib/po/stamp-po
-lib/po/sv.gmo
-lib/po/sv.po
-lib/po/sv.po~
-lib/po/vi.gmo
-lib/po/vi.po
-lib/po/vi.po~
 lib/stamp-h1
 lib/x509/Makefile
 lib/x509/Makefile.in
diff --git a/lib/po/zh_CN.po b/lib/po/zh_CN.po
deleted file mode 100644
index 6505039..0000000
--- a/lib/po/zh_CN.po
+++ /dev/null
@@ -1,1098 +0,0 @@
-# Simplified Chinese translation for libgnutls
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libgnutls package.
-# Tao Wei <address@hidden>, 2008.
-# Aron Xu <address@hidden>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: libgnutls 2.8.1\n"
-"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2009-06-10 16:24+0200\n"
-"PO-Revision-Date: 2009-11-09 19:16+0800\n"
-"Last-Translator: Aron Xu <address@hidden>\n"
-"Language-Team: Chinese (simplified) <address@hidden>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: gnutls_errors.c:51
-msgid "Success."
-msgstr "成功。"
-
-#: gnutls_errors.c:52
-msgid "Could not negotiate a supported cipher suite."
-msgstr "æ— æ³•åå•†å—æ”¯æŒçš„å¯†ç ç®—æ³•ã€‚"
-
-#: gnutls_errors.c:54
-msgid "The cipher type is unsupported."
-msgstr "å¯†ç ç±»åž‹ä¸æ”¯æŒã€‚"
-
-#: gnutls_errors.c:56
-msgid "The certificate and the given key do not match."
-msgstr "证书与密钥不匹配。"
-
-#: gnutls_errors.c:58
-msgid "Could not negotiate a supported compression method."
-msgstr "æ— æ³•åå•†æ”¯æŒçš„åŽ‹ç¼©æ–¹æ³•ã€‚"
-
-#: gnutls_errors.c:60
-msgid "An unknown public key algorithm was encountered."
-msgstr "遇到未知的公钥算法。"
-
-#: gnutls_errors.c:63
-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
-msgid "A record packet with illegal version was received."
-msgstr "收到的记录包版本非法。"
-
-#: gnutls_errors.c:70
-msgid "The Diffie-Hellman prime sent by the server is not acceptable (not long 
enough)."
-msgstr ""
-
-#: gnutls_errors.c:72
-msgid "A TLS packet with unexpected length was received."
-msgstr "收到了意外长度的 TLS 数据包。"
-
-#: gnutls_errors.c:75
-msgid "The specified session has been invalidated for some reason."
-msgstr "æŒ‡å®šçš„ä¼šè¯å·²å› æ•…å¤±æ•ˆã€‚"
-
-#: gnutls_errors.c:78
-msgid "GnuTLS internal error."
-msgstr "GnuTLS 内部错误。"
-
-#: gnutls_errors.c:79
-msgid "An illegal TLS extension was received."
-msgstr "收到一个非法的 TLS 扩展包。"
-
-#: gnutls_errors.c:81
-msgid "A TLS fatal alert has been received."
-msgstr "收到一个 TLS 致命错误警告。"
-
-#: gnutls_errors.c:83
-msgid "An unexpected TLS packet was received."
-msgstr "收到一个意外的 TLS 数据包。"
-
-#: gnutls_errors.c:85
-msgid "A TLS warning alert has been received."
-msgstr "收到一个 TLS 警告信息。"
-
-#: gnutls_errors.c:88
-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 "对方未发送任何证书。"
-
-#: gnutls_errors.c:93
-msgid "There is already a crypto algorithm with lower priority."
-msgstr "å·²ç»æœ‰ä¸€ä¸ªä½Žä¼˜å…ˆçº§çš„åŠ å¯†ç®—æ³•ã€‚"
-
-#: gnutls_errors.c:96
-msgid "No temporary RSA parameters were found."
-msgstr "未发现 RSA 临时参数。"
-
-#: gnutls_errors.c:98
-msgid "No temporary DH parameters were found."
-msgstr "未发现临时 DH 参数。"
-
-#: gnutls_errors.c:100
-msgid "An unexpected TLS handshake packet was received."
-msgstr "收到意外的 TLS 握手数据包。"
-
-#: gnutls_errors.c:102
-msgid "The scanning of a large integer has failed."
-msgstr "大整数扫描失败。"
-
-#: gnutls_errors.c:104
-msgid "Could not export a large integer."
-msgstr "æ— æ³•è¾“å‡ºå¤§æ•´æ•°ã€‚"
-
-#: gnutls_errors.c:106
-msgid "Decryption has failed."
-msgstr "解密失败。"
-
-#: gnutls_errors.c:107
-msgid "Encryption has failed."
-msgstr "åŠ å¯†å¤±è´¥ã€‚"
-
-#: gnutls_errors.c:108
-msgid "Public key decryption has failed."
-msgstr "公钥解密失败。"
-
-#: gnutls_errors.c:110
-msgid "Public key encryption has failed."
-msgstr "å…¬é’¥åŠ å¯†å¤±è´¥ã€‚"
-
-#: gnutls_errors.c:112
-msgid "Public key signing has failed."
-msgstr "公钥签名失败。"
-
-#: gnutls_errors.c:114
-msgid "Public key signature verification has failed."
-msgstr "公钥签名验证失败。"
-
-#: gnutls_errors.c:116
-msgid "Decompression of the TLS record packet has failed."
-msgstr "TLS 记录数据包解压缩失败。"
-
-#: gnutls_errors.c:118
-msgid "Compression of the TLS record packet has failed."
-msgstr "TLS 记录数据包压缩失败。"
-
-#: gnutls_errors.c:121
-msgid "Internal error in memory allocation."
-msgstr "在分配内存时发生内部错误。"
-
-#: gnutls_errors.c:123
-msgid "An unimplemented or disabled feature has been requested."
-msgstr "所请求的特性尚未实现或已被禁用。"
-
-#: gnutls_errors.c:125
-msgid "Insufficient credentials for that request."
-msgstr "此请求的信任凭证不足。"
-
-#: gnutls_errors.c:127
-msgid "Error in password file."
-msgstr "å¯†ç æ–‡ä»¶é”™è¯¯ã€‚"
-
-#: gnutls_errors.c:128
-msgid "Wrong padding in PKCS1 packet."
-msgstr "PKC51 数据包填充错误。"
-
-#: gnutls_errors.c:130
-msgid "The requested session has expired."
-msgstr "请求的会话已过期。"
-
-#: gnutls_errors.c:131
-msgid "Hashing has failed."
-msgstr "散列运算失败。"
-
-#: gnutls_errors.c:132
-msgid "Base64 decoding error."
-msgstr "Base64 è§£ç å‡ºé”™ã€‚"
-
-#: gnutls_errors.c:134
-msgid "Base64 unexpected header error."
-msgstr ""
-
-#: gnutls_errors.c:137
-msgid "Base64 encoding error."
-msgstr "Base64 ç¼–ç å‡ºé”™ã€‚"
-
-#: gnutls_errors.c:139
-msgid "Parsing error in password file."
-msgstr "å¯†ç æ–‡ä»¶è§£æžå‡ºé”™ã€‚"
-
-#: gnutls_errors.c:141
-msgid "The requested data were not available."
-msgstr "请求的数据不可用。"
-
-#: gnutls_errors.c:143
-msgid "Error in the pull function."
-msgstr "在 pull 函数中出错。"
-
-#: gnutls_errors.c:144
-msgid "Error in the push function."
-msgstr "在 push 函数中出错。"
-
-#: gnutls_errors.c:146
-msgid "The upper limit of record packet sequence numbers has been reached. 
Wow!"
-msgstr "哦！记录数据包序列的上限值已到。"
-
-#: gnutls_errors.c:148
-msgid "Error in the certificate."
-msgstr "证书出错。"
-
-#: gnutls_errors.c:150
-msgid "Unknown Subject Alternative name in X.509 certificate."
-msgstr "X.509 证书中含有未知的主体代用名。"
-
-#: gnutls_errors.c:153
-msgid "Unsupported critical extension in X.509 certificate."
-msgstr "X.509 证书中含有不支持的关键性扩展。"
-
-#: gnutls_errors.c:155
-msgid "Key usage violation in certificate has been detected."
-msgstr "在证书中检测到违规的密钥用法。"
-
-#: gnutls_errors.c:157
-msgid "Resource temporarily unavailable, try again."
-msgstr "资源临时不可用，请重试。"
-
-#: gnutls_errors.c:159
-msgid "Function was interrupted."
-msgstr "函数被中断。"
-
-#: gnutls_errors.c:160
-msgid "Rehandshake was requested by the peer."
-msgstr "按对方请求重新握手。"
-
-#: gnutls_errors.c:163
-msgid "TLS Application data were received, while expecting handshake data."
-msgstr "在期望接收 TLS 握手数据时接收到应用数据。"
-
-#: gnutls_errors.c:165
-msgid "Error in Database backend."
-msgstr "数据库后端出错。"
-
-#: gnutls_errors.c:166
-msgid "The certificate type is not supported."
-msgstr "不支持的证书类型。"
-
-#: gnutls_errors.c:168
-msgid "The given memory buffer is too short to hold parameters."
-msgstr "给待处理参数预留的内存缓冲区过短。"
-
-#: gnutls_errors.c:170
-msgid "The request is invalid."
-msgstr "è¯·æ±‚æ— æ•ˆã€‚"
-
-#: gnutls_errors.c:171
-msgid "An illegal parameter has been received."
-msgstr "收到一个非法参数。"
-
-#: gnutls_errors.c:173
-msgid "Error while reading file."
-msgstr "读取文件时出错。"
-
-#: gnutls_errors.c:175
-msgid "ASN1 parser: Element was not found."
-msgstr "ASN1 è§£æžå™¨ï¼šæ‰¾ä¸åˆ°å…ƒç´ ã€‚"
-
-#: gnutls_errors.c:177
-msgid "ASN1 parser: Identifier was not found"
-msgstr "ASN1 è§£æžå™¨ï¼šæ‰¾ä¸åˆ°æ ‡è¯†ã€‚"
-
-#: gnutls_errors.c:179
-msgid "ASN1 parser: Error in DER parsing."
-msgstr "ASN1 解析器：DER 解析时出错。"
-
-#: gnutls_errors.c:181
-msgid "ASN1 parser: Value was not found."
-msgstr "ASN1 解析器：找不到值。"
-
-#: gnutls_errors.c:183
-msgid "ASN1 parser: Generic parsing error."
-msgstr "ASN1 解析器：常规解析中出错。"
-
-#: gnutls_errors.c:185
-msgid "ASN1 parser: Value is not valid."
-msgstr "ASN1 è§£æžå™¨ï¼šæ— æ•ˆçš„å€¼ã€‚"
-
-#: gnutls_errors.c:187
-msgid "ASN1 parser: Error in TAG."
-msgstr "ASN1 è§£æžå™¨ï¼šæ ‡ç­¾ä¸­å‡ºé”™ã€‚"
-
-#: gnutls_errors.c:188
-msgid "ASN1 parser: error in implicit tag"
-msgstr "ASN1 è§£æžå™¨ï¼šéšå¼æ ‡ç­¾ä¸­å‡ºé”™ã€‚"
-
-#: gnutls_errors.c:190
-msgid "ASN1 parser: Error in type 'ANY'."
-msgstr "ASN1 解析器：‘ANY’类型中出错。"
-
-#: gnutls_errors.c:192
-msgid "ASN1 parser: Syntax error."
-msgstr "ASN1 解析器：语法出错。"
-
-#: gnutls_errors.c:194
-msgid "ASN1 parser: Overflow in DER parsing."
-msgstr "ASN1 解析器：DER 解析中出现溢出。"
-
-#: gnutls_errors.c:197
-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 的库版本不相吻合。"
-
-#: gnutls_errors.c:204
-msgid "The gcrypt library version is too old."
-msgstr "gcrypt 库的版本过旧。"
-
-#: gnutls_errors.c:207
-msgid "The tasn1 library version is too old."
-msgstr "tasn1 库的版本过旧。"
-
-#: gnutls_errors.c:209
-msgid "The OpenPGP User ID is revoked."
-msgstr "OpenPGP 用户 ID 已吊销。"
-
-#: gnutls_errors.c:211
-msgid "Error loading the keyring."
-msgstr "载入密钥环时出错。"
-
-#: gnutls_errors.c:213
-msgid "The initialization of LZO has failed."
-msgstr "LZO 算法初始化失败。"
-
-#: gnutls_errors.c:215
-msgid "No supported compression algorithms have been found."
-msgstr "找不到支持的压缩算法。"
-
-#: gnutls_errors.c:217
-msgid "No supported cipher suites have been found."
-msgstr "æ‰¾ä¸åˆ°æ”¯æŒçš„å¯†ç æœºåˆ¶ã€‚"
-
-#: gnutls_errors.c:219
-msgid "Could not get OpenPGP key."
-msgstr "æ— æ³•èŽ·å¾— OpenPGP 密钥。"
-
-#: gnutls_errors.c:221
-msgid "Could not find OpenPGP subkey."
-msgstr ""
-
-#: gnutls_errors.c:224
-msgid "The SRP username supplied is illegal."
-msgstr "提供的 SRP 用户名非法。"
-
-#: gnutls_errors.c:227
-msgid "The OpenPGP fingerprint is not supported."
-msgstr "不支持 OpenPGP 指纹。"
-
-#: gnutls_errors.c:229
-msgid "The certificate has unsupported attributes."
-msgstr "证书中含有不支持的属性。"
-
-#: gnutls_errors.c:231
-msgid "The OID is not supported."
-msgstr "不支持 OID。"
-
-#: gnutls_errors.c:233
-msgid "The hash algorithm is unknown."
-msgstr "未知的散列算法。"
-
-#: gnutls_errors.c:235
-msgid "The PKCS structure's content type is unknown."
-msgstr "未知的 PKCS 内容类型结构。"
-
-#: gnutls_errors.c:237
-msgid "The PKCS structure's bag type is unknown."
-msgstr "未知的 PKCS 包类型结构。"
-
-#: gnutls_errors.c:239
-msgid "The given password contains invalid characters."
-msgstr "ç»™å‡ºçš„å¯†ç ä¸­åŒ…å«æ— æ•ˆå­—ç¬¦ã€‚"
-
-#: gnutls_errors.c:241
-msgid "The Message Authentication Code verification failed."
-msgstr "æ¶ˆæ¯è®¤è¯ä»£ç ç¡®è®¤å¤±è´¥ã€‚"
-
-#: gnutls_errors.c:243
-msgid "Some constraint limits were reached."
-msgstr "已达到某些约束限定。"
-
-#: gnutls_errors.c:245
-msgid "Failed to acquire random data."
-msgstr "获取随机数据失败。"
-
-#: gnutls_errors.c:248
-msgid "Received a TLS/IA Intermediate Phase Finished message"
-msgstr "收到 TLS/IA 中间相位完成信息。"
-
-#: gnutls_errors.c:250
-msgid "Received a TLS/IA Final Phase Finished message"
-msgstr "收到 TLS/IA 末尾相位完成信息。"
-
-#: gnutls_errors.c:252
-msgid "Verifying TLS/IA phase checksum failed"
-msgstr "æ ¡éªŒ TLS/IA 相位和失败。"
-
-#: gnutls_errors.c:255
-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 ""
-
-#: gnutls_errors.c:347
-msgid "(unknown error code)"
-msgstr "(æœªçŸ¥é”™è¯¯ä»£ç )"
-
-#: gnutls_alert.c:42
-msgid "Close notify"
-msgstr ""
-
-#: gnutls_alert.c:43
-msgid "Unexpected message"
-msgstr "未预料的消息"
-
-#: gnutls_alert.c:44
-msgid "Bad record MAC"
-msgstr ""
-
-#: gnutls_alert.c:45
-msgid "Decryption failed"
-msgstr "解密失败"
-
-#: gnutls_alert.c:46
-msgid "Record overflow"
-msgstr "记录溢出"
-
-#: gnutls_alert.c:47
-msgid "Decompression failed"
-msgstr "解压缩失败"
-
-#: gnutls_alert.c:48
-msgid "Handshake failed"
-msgstr "握手失败"
-
-#: gnutls_alert.c:49
-msgid "Certificate is bad"
-msgstr "è¯ä¹¦æ— æ•ˆ"
-
-#: gnutls_alert.c:50
-msgid "Certificate is not supported"
-msgstr "证书不被支持"
-
-#: gnutls_alert.c:51
-msgid "Certificate was revoked"
-msgstr "证书已吊销"
-
-#: gnutls_alert.c:52
-msgid "Certificate is expired"
-msgstr "证书过期"
-
-#: gnutls_alert.c:53
-msgid "Unknown certificate"
-msgstr "未知证书"
-
-#: gnutls_alert.c:54
-msgid "Illegal parameter"
-msgstr "非法参数"
-
-#: gnutls_alert.c:55
-msgid "CA is unknown"
-msgstr "未知 CA"
-
-#: gnutls_alert.c:56
-msgid "Access was denied"
-msgstr "访问被拒绝"
-
-#: gnutls_alert.c:57
-msgid "Decode error"
-msgstr "è§£ç é”™è¯¯"
-
-#: gnutls_alert.c:58
-msgid "Decrypt error"
-msgstr "解密出错"
-
-#: gnutls_alert.c:59
-msgid "Export restriction"
-msgstr "导出受限"
-
-#: gnutls_alert.c:60
-msgid "Error in protocol version"
-msgstr "协议版本出错"
-
-#: gnutls_alert.c:61
-msgid "Insufficient security"
-msgstr "不够安全"
-
-#: gnutls_alert.c:62
-msgid "User canceled"
-msgstr "用户已取消"
-
-#: gnutls_alert.c:63
-msgid "Internal error"
-msgstr "内部错误"
-
-#: gnutls_alert.c:64
-msgid "No renegotiation is allowed"
-msgstr ""
-
-#: gnutls_alert.c:66
-msgid "Could not retrieve the specified certificate"
-msgstr ""
-
-#: gnutls_alert.c:67
-msgid "An unsupported extension was sent"
-msgstr "发送了一个不支持的扩展"
-
-#: gnutls_alert.c:69
-msgid "The server name sent was not recognized"
-msgstr "发送的服务器名未被识别"
-
-#: gnutls_alert.c:71
-msgid "The SRP/PSK username is missing or not known"
-msgstr "SRP/PSK 用户名丢失或未知"
-
-#: gnutls_alert.c:73
-msgid "Inner application negotiation failed"
-msgstr ""
-
-#: gnutls_alert.c:75
-msgid "Inner application verification failed"
-msgstr "内部应用程序验证失败"
-
-#: x509/output.c:156
-#, c-format
-msgid "\t\t\tPath Length Constraint: %d\n"
-msgstr "\t\t\t路径长度常数: %d\n"
-
-#: x509/output.c:157
-#, c-format
-msgid "\t\t\tPolicy Language: %s"
-msgstr "\t\t\t策略语言： %s"
-
-#: x509/output.c:166
-msgid ""
-"\t\t\tPolicy:\n"
-"\t\t\t\tASCII: "
-msgstr ""
-"\t\t\t策略：\n"
-"\t\t\t\tASCII:： "
-
-#: x509/output.c:168
-msgid ""
-"\n"
-"\t\t\t\tHexdump: "
-msgstr ""
-"\n"
-"\t\t\t\t十六进制输出 "
-
-#: x509/output.c:295
-#, c-format
-msgid "%s\t\t\tDigital signature.\n"
-msgstr "%s\t\t\t数字签名。\n"
-
-#: x509/output.c:297
-#, c-format
-msgid "%s\t\t\tNon repudiation.\n"
-msgstr ""
-
-#: x509/output.c:299
-#, c-format
-msgid "%s\t\t\tKey encipherment.\n"
-msgstr ""
-
-#: x509/output.c:301
-#, c-format
-msgid "%s\t\t\tData encipherment.\n"
-msgstr ""
-
-#: x509/output.c:303
-#, c-format
-msgid "%s\t\t\tKey agreement.\n"
-msgstr ""
-
-#: x509/output.c:305
-#, c-format
-msgid "%s\t\t\tCertificate signing.\n"
-msgstr "%s\t\t\t证书签名。\n"
-
-#: x509/output.c:307
-#, c-format
-msgid "%s\t\t\tCRL signing.\n"
-msgstr "%s\t\t\tCRL 签名。\n"
-
-#: x509/output.c:309
-#, c-format
-msgid "%s\t\t\tKey encipher only.\n"
-msgstr ""
-
-#: x509/output.c:311
-#, c-format
-msgid "%s\t\t\tKey decipher only.\n"
-msgstr ""
-
-#: x509/output.c:443
-#, c-format
-msgid "%s\t\t\tTLS WWW Server.\n"
-msgstr "%s\t\t\tTLS WWW 服务器。\n"
-
-#: x509/output.c:445
-#, c-format
-msgid "%s\t\t\tTLS WWW Client.\n"
-msgstr "%s\t\t\tTLS WWW 客户端。\n"
-
-#: x509/output.c:447
-#, c-format
-msgid "%s\t\t\tCode signing.\n"
-msgstr ""
-
-#: x509/output.c:449
-#, c-format
-msgid "%s\t\t\tEmail protection.\n"
-msgstr "%s\t\t\tEmail 保护。\n"
-
-#: x509/output.c:451
-#, c-format
-msgid "%s\t\t\tTime stamping.\n"
-msgstr "%s\t\t\t时间戳。\n"
-
-#: x509/output.c:453
-#, c-format
-msgid "%s\t\t\tOCSP signing.\n"
-msgstr "%s\t\t\tOCSP 签名。\n"
-
-#: x509/output.c:455
-#, c-format
-msgid "%s\t\t\tAny purpose.\n"
-msgstr ""
-
-#: x509/output.c:488
-#, c-format
-msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
-msgstr ""
-
-#: x509/output.c:490
-#, c-format
-msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
-msgstr ""
-
-#: x509/output.c:493
-#, c-format
-msgid "%s\t\t\tPath Length Constraint: %d\n"
-msgstr "%s\t\t\t路径长度限制： %d\n"
-
-#: x509/output.c:626
-#, c-format
-msgid "%s\t\t\tXMPP Address: %.*s\n"
-msgstr "%s\t\t\tXMPP 地址：%.*s\n"
-
-#: x509/output.c:630
-#, c-format
-msgid "%s\t\t\totherName OID: %.*s\n"
-msgstr ""
-
-#: x509/output.c:632
-#, c-format
-msgid "%s\t\t\totherName DER: "
-msgstr ""
-
-#: x509/output.c:634
-#, c-format
-msgid ""
-"\n"
-"%s\t\t\totherName ASCII: "
-msgstr ""
-
-#: x509/output.c:696
-#, c-format
-msgid "%s\tExtensions:\n"
-msgstr "%s\t扩展：\n"
-
-#: x509/output.c:706
-#, 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
-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
-msgid "not critical"
-msgstr "非关键"
-
-#: x509/output.c:721
-#, c-format
-msgid "%s\t\tSubject Key Identifier (%s):\n"
-msgstr ""
-
-#: x509/output.c:738
-#, c-format
-msgid "%s\t\tAuthority Key Identifier (%s):\n"
-msgstr ""
-
-#: x509/output.c:754
-#, c-format
-msgid "%s\t\tKey Usage (%s):\n"
-msgstr ""
-
-#: x509/output.c:769
-#, c-format
-msgid "%s\t\tKey Purpose (%s):\n"
-msgstr ""
-
-#: x509/output.c:786
-#, c-format
-msgid "%s\t\tSubject Alternative Name (%s):\n"
-msgstr ""
-
-#: x509/output.c:801
-#, c-format
-msgid "%s\t\tCRL Distribution points (%s):\n"
-msgstr ""
-
-#: x509/output.c:819
-#, c-format
-msgid "%s\t\tProxy Certificate Information (%s):\n"
-msgstr "%s\t\t代理证书信息(%s)：\n"
-
-#: x509/output.c:832
-#, c-format
-msgid "%s\t\tUnknown extension %s (%s):\n"
-msgstr "%s\t\t未知扩展 %s (%s):\n"
-
-#: x509/output.c:878
-#, c-format
-msgid "%s\t\t\tASCII: "
-msgstr "%s\t\t\tASCII: "
-
-#: x509/output.c:882
-#, c-format
-msgid "%s\t\t\tHexdump: "
-msgstr ""
-
-#: x509/output.c:900 x509/output.c:1385 x509/output.c:1698
-#: openpgp/output.c:323
-#, c-format
-msgid "\tVersion: %d\n"
-msgstr "\t版本：%d\n"
-
-#: x509/output.c:914
-msgid "\tSerial Number (hex): "
-msgstr "\t序列号(16进制)： "
-
-#: x509/output.c:931 x509/output.c:1399
-#, c-format
-msgid "\tIssuer: %s\n"
-msgstr "\t发行者：%s\n"
-
-#: x509/output.c:938
-msgid "\tValidity:\n"
-msgstr "\t有效性：\n"
-
-#: x509/output.c:951
-#, c-format
-msgid "\t\tNot Before: %s\n"
-msgstr "\t\t不早于： %s\n"
-
-#: x509/output.c:965
-#, c-format
-msgid "\t\tNot After: %s\n"
-msgstr "\t\t不晚于： %s\n"
-
-#: x509/output.c:979 x509/output.c:1711
-#, c-format
-msgid "\tSubject: %s\n"
-msgstr "\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 "未知"
-
-#: x509/output.c:996 x509/output.c:1728
-#, c-format
-msgid "\tSubject Public Key Algorithm: %s\n"
-msgstr "\t主公钥算法： %s\n"
-
-#: 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"
-
-#: x509/output.c:1012
-#, c-format
-msgid "\t\tExponent (bits %d):\n"
-msgstr ""
-
-#: x509/output.c:1032 x509/output.c:1763 openpgp/output.c:284
-#, c-format
-msgid "\t\tPublic key (bits %d):\n"
-msgstr "\t\t公钥 (位 %d)：\n"
-
-#: x509/output.c:1034 x509/output.c:1765 openpgp/output.c:286
-msgid "\t\tP:\n"
-msgstr "\t\tP:\n"
-
-#: x509/output.c:1036 x509/output.c:1767 openpgp/output.c:288
-msgid "\t\tQ:\n"
-msgstr "\t\tQ:\n"
-
-#: x509/output.c:1038 x509/output.c:1769 openpgp/output.c:290
-msgid "\t\tG:\n"
-msgstr "\t\tG:\n"
-
-#: x509/output.c:1082 x509/output.c:1617
-#, c-format
-msgid "\tSignature Algorithm: %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"
-
-#: x509/output.c:1112 x509/output.c:1647
-msgid "\tSignature:\n"
-msgstr "\t签名：\n"
-
-#: x509/output.c:1135
-msgid ""
-"\tMD5 fingerprint:\n"
-"\t\t"
-msgstr ""
-"\tMD5 指纹：\n"
-"\t\t"
-
-#: x509/output.c:1137
-msgid ""
-"\tSHA-1 fingerprint:\n"
-"\t\t"
-msgstr ""
-"\tSHA-1 指纹：\n"
-"\t\t"
-
-#: x509/output.c:1156 x509/output.c:1924
-msgid ""
-"\tPublic Key Id:\n"
-"\t\t"
-msgstr ""
-"\t公钥 Id：\n"
-"\t\t"
-
-#: x509/output.c:1226
-#, c-format
-msgid "signed using %s (broken!), "
-msgstr ""
-
-#: x509/output.c:1228
-#, c-format
-msgid "signed using %s, "
-msgstr ""
-
-#: x509/output.c:1341
-msgid "X.509 Certificate Information:\n"
-msgstr "X.509 证书信息：\n"
-
-#: x509/output.c:1345 x509/output.c:1961
-msgid "Other Information:\n"
-msgstr "其它信息：\n"
-
-#: x509/output.c:1381
-msgid "\tVersion: 1 (default)\n"
-msgstr "\t版本：1 (默认)\n"
-
-#: x509/output.c:1406
-msgid "\tUpdate dates:\n"
-msgstr "\t更新日期：\n"
-
-#: x509/output.c:1419
-#, c-format
-msgid "\t\tIssued: %s\n"
-msgstr "\t\t发行：%s\n"
-
-#: x509/output.c:1435
-#, c-format
-msgid "\t\tNext at: %s\n"
-msgstr "\t\t下一个位于：%s\n"
-
-#: x509/output.c:1466
-msgid "\tExtensions:\n"
-msgstr "\t扩展：\n"
-
-#: x509/output.c:1481
-#, c-format
-msgid "\t\tCRL Number (%s): "
-msgstr "\t\tCRL 号(%s): "
-
-#: x509/output.c:1504
-#, c-format
-msgid "\t\tAuthority Key Identifier (%s):\n"
-msgstr "\t\t授权密钥识别器 (%s):\n"
-
-#: x509/output.c:1517
-#, 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十六进制转储： "
-
-#: x509/output.c:1566
-#, c-format
-msgid "\tRevoked certificates (%d):\n"
-msgstr "\t撤销的证书（%d）：\n"
-
-#: x509/output.c:1568
-msgid "\tNo revoked certificates.\n"
-msgstr "\t没有撤销的证书。\n"
-
-#: x509/output.c:1587
-msgid "\t\tSerial Number (hex): "
-msgstr "\t\t序列号(hex)： "
-
-#: x509/output.c:1596
-#, c-format
-msgid "\t\tRevoked at: %s\n"
-msgstr "\t\t撤销于：%s\n"
-
-#: x509/output.c:1678
-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
-msgid "\tAttributes:\n"
-msgstr ""
-
-#: x509/output.c:1845
-#, c-format
-msgid "\t\tChallenge password: %s\n"
-msgstr ""
-
-#: x509/output.c:1854
-#, c-format
-msgid "\t\tUnknown attribute %s:\n"
-msgstr ""
-
-#: x509/output.c:1957
-msgid "PKCS #10 Certificate Request Information:\n"
-msgstr ""
-
-#: openpgp/output.c:84
-msgid "\t\tKey Usage:\n"
-msgstr ""
-
-#: openpgp/output.c:93
-#, c-format
-msgid "error: get_key_usage: %s\n"
-msgstr "错误：get_key_usage: %s\n"
-
-#: openpgp/output.c:98
-msgid "\t\t\tDigital signatures.\n"
-msgstr "\t\t\t数字签名。\n"
-
-#: openpgp/output.c:100
-msgid "\t\t\tCommunications encipherment.\n"
-msgstr ""
-
-#: openpgp/output.c:102
-msgid "\t\t\tStorage data encipherment.\n"
-msgstr ""
-
-#: openpgp/output.c:104
-msgid "\t\t\tAuthentication.\n"
-msgstr "\t\t\t认证。\n"
-
-#: openpgp/output.c:106
-msgid "\t\t\tCertificate signing.\n"
-msgstr "\t\t\t证书签名。\n"
-
-#: openpgp/output.c:127
-msgid "\tID (hex): "
-msgstr "\tID (hex): "
-
-#: 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"
-
-#: 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"
diff --git a/src/Makefile.am b/src/Makefile.am
index a551cf2..8b61d88 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,7 +63,7 @@ libcmd_psk_la_CFLAGS =
 libcmd_psk_la_SOURCES = psk.gaa psk-gaa.h psk-gaa.c
 
 benchmark_SOURCES = benchmark.c
-benchmark_LDADD = ../lib/libgnutls.la ../gl/libgnu.la -lrt
+benchmark_LDADD = ../lib/libgnutls.la ../gl/libgnu.la $(LIB_CLOCK_GETTIME)
 
 gnutls_cli_SOURCES = cli.c common.h common.c
 gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la


hooks/post-receive
-- 
GNU gnutls