[Top][All Lists]

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

[SCM] GNU gss branch, master, updated. gss-1-0-0-24-g6ffd92d

From: Simon Josefsson
Subject: [SCM] GNU gss branch, master, updated. gss-1-0-0-24-g6ffd92d
Date: Thu, 20 May 2010 12:22:06 +0000

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 gss".

The branch, master has been updated
       via  6ffd92dea5d8dadb7a1494cddd1e42485a2e6e4b (commit)
       via  2e80f313afba7ba21d9a130be1b2e98d8ed6460f (commit)
      from  cb6c0a5aa938c5696c10317dcf1fcbabc61d64bf (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 6ffd92dea5d8dadb7a1494cddd1e42485a2e6e4b
Author: Simon Josefsson <address@hidden>
Date:   Thu May 20 14:21:36 2010 +0200

    Sync with TP.

commit 2e80f313afba7ba21d9a130be1b2e98d8ed6460f
Author: Simon Josefsson <address@hidden>
Date:   Thu May 20 14:21:32 2010 +0200



Summary of changes:
 NEWS           |   10 +++---
 po/ |  101 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 99 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index dd97745..c8781c2 100644
--- a/NEWS
+++ b/NEWS
@@ -4,17 +4,17 @@ See the end for copying conditions.
 * Version 1.0.1 (unreleased)
-** The check for GNU Shishi now requires 0.0.42 or later.
-Earlier versions had bugs that caused the self-checks to fail.
-** Update gnulib files.
 ** gss: Added parameter --list-mechanisms (-l) to list supported mechanisms.
 ** doc: Added section documenting command-line tool "gss".
 ** i18n: Translations were updated.
+** build: The check for GNU Shishi now requires 0.0.42 or later.
+Earlier Shishi versions had bugs that caused the self-checks to fail.
+** build: Update gnulib files.
 ** API and ABI modifications.
 No changes since last version.
diff --git a/po/ b/po/
index 75e5d62..c4f132b 100644
--- a/po/
+++ b/po/
@@ -5,162 +5,239 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: gss 0.0.22\n"
+"Project-Id-Version: gss 0.1.5\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-29 17:37+0200\n"
-"PO-Revision-Date: 2008-07-15 10:01+0800\n"
+"POT-Creation-Date: 2010-03-22 10:38+0100\n"
+"PO-Revision-Date: 2010-04-20 16:43中国标准时间\n"
 "Last-Translator: Ji ZhengYu <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"
+#: lib/meta.c:43
+msgid "Kerberos V5 GSS-API mechanism"
+msgstr "Kerberos V5 GSS-API 机制"
+#: lib/error.c:43
 msgid "A required input parameter could not be read"
 msgstr "无法读取所需的输入参数"
+#: lib/error.c:45
 msgid "A required output parameter could not be written"
 msgstr "无法写入所需的输出参数"
+#: lib/error.c:47
 msgid "A parameter was malformed"
 msgstr "参数形式错误"
+#: lib/error.c:52
 msgid "An unsupported mechanism was requested"
 msgstr "请求了一个不支持的机制"
+#: lib/error.c:54
 msgid "An invalid name was supplied"
 msgstr "提供了无效的名称"
+#: lib/error.c:56
 msgid "A supplied name was of an unsupported type"
 msgstr "所提供的名字是一种不支持的类型"
+#: lib/error.c:58
 msgid "Incorrect channel bindings were supplied"
 msgstr "提供了错误的绑定通道"
+#: lib/error.c:60
 msgid "An invalid status code was supplied"
 msgstr "提供了无效的状态码"
+#: lib/error.c:62
 msgid "A token had an invalid MIC"
 msgstr "有个标识拥有无效的 MIC"
+#: lib/error.c:64
 msgid "No credentials were supplied, or the credentials were unavailable or 
 msgstr "未提供证书,或是证书不可用或无法访问"
+#: lib/error.c:67
 msgid "No context has been established"
 msgstr "尚未创建内容"
+#: lib/error.c:69
 msgid "A token was invalid"
 msgstr "标识无效"
+#: lib/error.c:71
 msgid "A credential was invalid"
 msgstr "证书无效"
+#: lib/error.c:73
 msgid "The referenced credentials have expired"
 msgstr "关联证书过期了"
+#: lib/error.c:75
 msgid "The context has expired"
 msgstr "内容过期了"
+#: lib/error.c:77
 msgid "Unspecified error in underlying mechanism"
 msgstr "底层机制中有不明错误"
+#: lib/error.c:79
 msgid "The quality-of-protection requested could not be provided"
 msgstr "无法提供所需要的保护等级"
+#: lib/error.c:81
 msgid "The operation is forbidden by local security policy"
 msgstr "本地安全机制禁止了此项操作"
+#: lib/error.c:83
 msgid "The operation or option is unavailable"
 msgstr "此操作或选项不可用"
+#: lib/error.c:85
 msgid "The requested credential element already exists"
 msgstr "所需证书组件已经存在"
+#: lib/error.c:87
 msgid "The provided name was not a mechanism name"
 msgstr "所提供的名称不是保护机制的名称"
+#: lib/error.c:92
 msgid "The gss_init_sec_context() or gss_accept_sec_context() function must be 
called again to complete its function"
 msgstr "要完成它的功能必须再次调用 gss_init_sec_context() 或 
+#: lib/error.c:95
 msgid "The token was a duplicate of an earlier token"
 msgstr "此标识是一个更早期标识的镜像"
+#: lib/error.c:97
 msgid "The token's validity period has expired"
 msgstr "标识已超过了有效期"
+#: lib/error.c:99
 msgid "A later token has already been processed"
 msgstr "已经处理了一个较新的标识"
+#: lib/error.c:101
 msgid "An expected per-message token was not received"
 msgstr "所需的 per-message 标识不被接受"
+#: lib/error.c:318
 msgid "No error"
 msgstr "没有错误"
+#: lib/krb5/error.c:42
 msgid "No @ in SERVICE-NAME name string"
 msgstr "在 SERVICE-NAME 字符串中没有 @"
+#: lib/krb5/error.c:44
 msgid "STRING-UID-NAME contains nondigits"
 msgstr "STRING-UID-NAME 包含非数字字符"
+#: lib/krb5/error.c:46
 msgid "UID does not resolve to username"
 msgstr "UID 无法解析为用户名"
+#: lib/krb5/error.c:48
 msgid "Validation error"
 msgstr "验证错误"
+#: lib/krb5/error.c:50
 msgid "Couldn't allocate gss_buffer_t data"
 msgstr "无法分配 gss_buffer_t data"
+#: lib/krb5/error.c:52
 msgid "Message context invalid"
 msgstr "信息内容无效"
+#: lib/krb5/error.c:54
 msgid "Buffer is the wrong size"
 msgstr "缓冲区大小错误"
+#: lib/krb5/error.c:56
 msgid "Credential usage type is unknown"
 msgstr "证书使用类型未知"
+#: lib/krb5/error.c:58
 msgid "Unknown quality of protection specified"
 msgstr "所指定的保护等级未知"
+#: lib/krb5/error.c:61
 msgid "Principal in credential cache does not match desired name"
 msgstr "证书缓存中的委托人与所要的名字不匹配"
+#: lib/krb5/error.c:63
 msgid "No principal in keytab matches desired name"
 msgstr "keytab 中的委托人没有一个与所要的名字匹配的"
+#: lib/krb5/error.c:65
 msgid "Credential cache has no TGT"
 msgstr "证书缓存无 TGT"
+#: lib/krb5/error.c:67
 msgid "Authenticator has no subkey"
 msgstr "验证方没有子密钥"
+#: lib/krb5/error.c:69
 msgid "Context is already fully established"
 msgstr "内容已经完全创建好了"
+#: lib/krb5/error.c:71
 msgid "Unknown signature type in token"
 msgstr "标识中的签名类型未知"
+#: lib/krb5/error.c:73
 msgid "Invalid field length in token"
 msgstr "标识中的域长度无效"
+#: lib/krb5/error.c:75
 msgid "Attempt to use incomplete security context"
 msgstr "尝试使用不完整的安全内容"
+#: lib/krb5/error.c:92
 msgid "No krb5 error"
 msgstr "错误: 找不到 krb5 服务器"
+#: lib/krb5/error.c:133
 msgid "Unknown krb5 error"
 msgstr "错误: 未知的 krb5 服务器"
-#, c-format
-msgid "%s: missing parameter\n"
-msgstr "%s: 缺少参数\n"
+#: src/gss.c:64
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "尝试用‘%s --help’来获取更多信息。\n"
+#: src/gss.c:68
+#, c-format
+msgid "Usage: %s OPTIONS...\n"
+msgstr "用法: %s 选项...\n"
+#: src/gss.c:71
+msgid ""
+"Command line interface to GSS, used to explain error codes.\n"
+msgstr ""
+"GSS 命令行接口,用于解释错误代码。\n"
+#: src/gss.c:75
+msgid "Mandatory arguments to long options are mandatory for short options 
+msgstr "长选项所必须的参数短选项也是必须的。\n"
+#: src/gss.c:78
+msgid ""
+"  -h, --help        Print help and exit\n"
+"  -V, --version     Print version and exit\n"
+"  -m, --major=LONG  Describe a `major status' error code vaue in plain 
+"  -q, --quiet       Silent operation  (default=off)\n"
+msgstr ""
+"  -h, --help        打印帮助并退出\n"
+"  -V, --version     打印版本并退出\n"
+"  -m, --major=LONG  以普通文件描述`主状态错误代码。\n"
+"  -q, --quiet       无输出模式(默认=off)\n"
+#: src/gss.c:119
 #, c-format
 msgid ""
 "GSS-API major status code %ld (0x%lx).\n"
@@ -169,6 +246,7 @@ msgstr ""
 "GSS-API 主状态码 %ld (0x%lx)。\n"
+#: src/gss.c:122
 #, c-format
 msgid ""
 "   MSB                                                                 LSB\n"
@@ -181,6 +259,7 @@ msgstr ""
 "   |    调用错误     |    路由错误     |              备注信息    
 "   | "
+#: src/gss.c:136
 #, c-format
 msgid ""
@@ -193,22 +272,30 @@ msgstr ""
 "位元31            24  23            16  15                             0\n"
+#: src/gss.c:146
 #, c-format
 msgid "Masked routine error %ld (0x%lx) shifted into %ld (0x%lx):\n"
 msgstr "隐蔽的路由错误 %ld (0x%lx) 被移入 %ld (0x%lx):\n"
+#: src/gss.c:163 src/gss.c:198 src/gss.c:236
 #, c-format
 msgid "%s: displaying status code failed\n"
 msgstr "%s: 显示状态码失败\n"
+#: src/gss.c:184
 #, c-format
 msgid "Masked calling error %ld (0x%lx) shifted into %ld (0x%lx):\n"
 msgstr "隐蔽的调用错误 %ld (0x%lx) 被移入 %ld (0x%lx):\n"
+#: src/gss.c:218
 #, c-format
 msgid "Masked supplementary info %ld (0x%lx) shifted into %ld (0x%lx):\n"
 msgstr "隐蔽的备注信息错误 %ld (0x%lx) 被移入 %ld (0x%lx):\n"
+#: src/gss.c:254
 #, c-format
 msgid "No error\n"
 msgstr "没有错误\n"
+#~ msgid "%s: missing parameter\n"
+#~ msgstr "%s: 缺少参数\n"

GNU gss

reply via email to

[Prev in Thread] Current Thread [Next in Thread]