[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".
http://git.savannah.gnu.org/cgit/gss.git/commit/?id=6ffd92dea5d8dadb7a1494cddd1e42485a2e6e4b
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
Reorder.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 10 +++---
po/zh_CN.po.in | 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/zh_CN.po.in b/po/zh_CN.po.in
index 75e5d62..c4f132b 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -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
inaccessible"
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() æ
gss_accept_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"
+"\n"
+msgstr ""
+"GSS å½ä»¤è¡æ¥å£ï¼ç¨äºè§£éé误代ç ã\n"
+"\n"
+
+#: src/gss.c:75
+msgid "Mandatory arguments to long options are mandatory for short options
too.\n"
+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
text.\n"
+" -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"
"\n"
+#: src/gss.c:122
#, c-format
msgid ""
" MSB LSB\n"
@@ -181,6 +259,7 @@ msgstr ""
" | è°ç¨é误 | è·¯ç±é误 | å¤æ³¨ä¿¡æ¯
|\n"
" | "
+#: src/gss.c:136
#, c-format
msgid ""
"|\n"
@@ -193,22 +272,30 @@ msgstr ""
"ä½å
31 24 23 16 15 0\n"
"\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"
hooks/post-receive
--
GNU gss
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gss branch, master, updated. gss-1-0-0-24-g6ffd92d,
Simon Josefsson <=