[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gsasl branch, master, updated. gsasl-1-7-6-3-g524db10
From: |
Simon Josefsson |
Subject: |
[SCM] GNU gsasl branch, master, updated. gsasl-1-7-6-3-g524db10 |
Date: |
Mon, 28 May 2012 17:55:50 +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 gsasl".
http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=524db10028ee3c2ea6f7f89ecf0be087b0dc7c2e
The branch, master has been updated
via 524db10028ee3c2ea6f7f89ecf0be087b0dc7c2e (commit)
via c8902ffa42a21ae4515990487915cb68ed57f425 (commit)
via afa54ac9480cec3d45d94f1821a053552df63bea (commit)
from 8dd0ec37fe0c97815cf3765847224aedf32fb48a (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 524db10028ee3c2ea6f7f89ecf0be087b0dc7c2e
Author: Simon Josefsson <address@hidden>
Date: Mon May 28 19:21:16 2012 +0200
Sync with TP.
commit c8902ffa42a21ae4515990487915cb68ed57f425
Author: Simon Josefsson <address@hidden>
Date: Mon May 28 19:20:16 2012 +0200
Version 1.8.0.
commit afa54ac9480cec3d45d94f1821a053552df63bea
Author: Simon Josefsson <address@hidden>
Date: Mon May 28 19:10:46 2012 +0200
Bump versions.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 13 ++++++
cfg.mk | 2 +-
configure.ac | 2 +-
lib/NEWS | 14 +++++++
lib/configure.ac | 4 +-
lib/po/sr.po.in | 34 +++++++++++-----
lib/src/gsasl.h | 8 ++--
po/sr.po.in | 110 ++++++++++++++++++++++++++++++------------------------
8 files changed, 119 insertions(+), 68 deletions(-)
diff --git a/NEWS b/NEWS
index bf73e2e..db32d99 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,19 @@ Note that changes to the GNU SASL Library is documented in
lib/NEWS.
This file track changes to the remaining, non-library, parts of GNU
SASL. That include the manual, the command line tool, and self tests.
+* Version 1.8.0 (released 2012-05-28) [stable]
+
+** This is a new major stable release. Brief changes compared to 1.6.x:
+
+*** SAML20 support following RFC 6595.
+
+*** OPENID20 support following RFC 6616.
+
+*** Added SMTP server examples (for e.g., SCRAM, SAML20, OPENID20).
+
+*** Various cleanups, portability and other bug fixes.
+See the NEWS entries during the 1.7.x branch for details.
+
* Version 1.7.6 (released 2012-05-23) [beta]
** i18n: Updated translations.
diff --git a/cfg.mk b/cfg.mk
index 47a9305..2cc6a06 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -201,7 +201,7 @@ release-check: syntax-check i18n tarball binaries
cyclo-copy gendoc-copy gtkdoc-
release-upload-www: cyclo-upload gendoc-upload gtkdoc-upload doxygen-upload
coverage-upload clang-upload
-site = alpha.gnu.org
+site = ftp.gnu.org
release-upload-ftp:
$(_build-aux)/gnupload --to $(site):$(PACKAGE) $(distdir).tar.gz
diff --git a/configure.ac b/configure.ac
index a862aea..02ebfda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl Process this file with autoconf to produce a configure
script.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.61)
-AC_INIT([GNU SASL], [1.7.6], address@hidden, [gsasl])
+AC_INIT([GNU SASL], [1.8.0], address@hidden, [gsasl])
AC_CONFIG_AUX_DIR([lib/build-aux])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/lib/NEWS b/lib/NEWS
index 17f7c01..6cca938 100644
--- a/lib/NEWS
+++ b/lib/NEWS
@@ -2,6 +2,20 @@ GNU SASL LIBRARY NEWS -- History of user-visible changes.
Copyright (C) 2002-2012 Simon Josefsson
See the end for copying conditions.
+* Version 1.8.0 (released 2012-05-28) [stable]
+
+** This is a new major stable release. Brief changes compared to 1.6.x:
+
+*** SAML20 support following RFC 6595.
+
+*** OPENID20 support following RFC 6616.
+
+*** Various cleanups, portability and other bug fixes.
+See the NEWS entries during the 1.7.x branch for details.
+
+** API and ABI modifications.
+No changes since last version.
+
* Version 1.7.6 (released 2012-05-23) [beta]
** i18n: Updated translations.
diff --git a/lib/configure.ac b/lib/configure.ac
index 6528763..009dfbb 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure
script.
# MA 02110-1301, USA.
AC_PREREQ(2.61)
-AC_INIT([libgsasl], [1.7.6], address@hidden)
+AC_INIT([libgsasl], [1.8.0], address@hidden)
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
@@ -29,7 +29,7 @@ AC_CONFIG_MACRO_DIR([m4])
# Interfaces added: AGE++
# Interfaces removed: AGE=0
AC_SUBST(LT_CURRENT, 16)
-AC_SUBST(LT_REVISION, 5)
+AC_SUBST(LT_REVISION, 6)
AC_SUBST(LT_AGE, 9)
# Used when creating libgsasl-XX.def.
diff --git a/lib/po/sr.po.in b/lib/po/sr.po.in
index 93c2458..d13b0fd 100644
--- a/lib/po/sr.po.in
+++ b/lib/po/sr.po.in
@@ -5,10 +5,10 @@
# ÐиÑоÑлав ÐÐ¸ÐºÐ¾Ð»Ð¸Ñ <address@hidden>, 2012.
msgid ""
msgstr ""
-"Project-Id-Version: libgsasl-1.6.1\n"
+"Project-Id-Version: libgsasl-1.7.4\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-05-01 17:34+0200\n"
-"PO-Revision-Date: 2012-02-05 11:31+0200\n"
+"POT-Creation-Date: 2012-05-16 00:55+0200\n"
+"PO-Revision-Date: 2012-05-24 22:26+0200\n"
"Last-Translator: ÐиÑоÑлав ÐÐ¸ÐºÐ¾Ð»Ð¸Ñ <address@hidden>\n"
"Language-Team: Serbian <address@hidden>\n"
"Language: sr\n"
@@ -163,23 +163,23 @@ msgstr "ФÑнкÑионалноÑÑ Ð½Ð° ÑÑÑани
ÑеÑвеÑа ниÑе
#: src/error.c:128
msgid "GSSAPI library could not deallocate memory in gss_release_buffer() in
SASL library. This is a serious internal error."
-msgstr "ÐССÐÐРбиблиоÑека не може да повÑаÑи
мемоÑиÑÑ Ñа gss_release_buffer() Ñ Ð¡ÐСРбиблиоÑеÑи.
Ðво Ñе озбиÑна ÑнÑÑÑаÑÑа гÑеÑка."
+msgstr "ÐССÐÐРбиблиоÑека не може да повÑаÑи
мемоÑиÑÑ Ñа gss_release_buffer() Ñ Ð¡ÐСРбиблиоÑеÑи.
Ðво Ñе озбиÑна ÑнÑÑÑаÑÑа гÑеÑка."
#: src/error.c:132
msgid "GSSAPI library could not understand a peer name in gss_import_name() in
SASL library. This is most likely due to incorrect service and/or hostnames."
-msgstr "ÐССÐÐРбиблиоÑека не ÑазÑме назив
паÑÑака Ñ gss_import_name() Ñ Ð¡ÐСРбиблиоÑеÑи. Ðво
Ñе наÑвеÑоваÑниÑе због погÑеÑне ÑÑлÑге
и/или назива ÑаÑÑнаÑа."
+msgstr "ÐССÐÐРбиблиоÑека не ÑазÑме назив
паÑÑака Ñ gss_import_name() Ñ Ð¡ÐСРбиблиоÑеÑи. Ðво
Ñе наÑвеÑоваÑниÑе због погÑеÑне ÑÑлÑге
и/или назива ÑаÑÑнаÑа."
#: src/error.c:136
msgid "GSSAPI error in client while negotiating security context in
gss_init_sec_context() in SASL library. This is most likely due insufficient
credentials or malicious interactions."
-msgstr "ÐССÐÐРгÑеÑка код клиÑенÑа Ñоком
ÑговаÑаÑа заÑÑиÑног Ñклопа Ñ gss_init_sec_context() Ñ
СÐСРбиблиоÑеÑи. Ðво Ñе наÑвеÑоваÑниÑе
због недовоÑниÑ
ÑвеÑеÑа или злонамеÑниÑ
акÑивноÑÑи."
+msgstr "ÐССÐÐРгÑеÑка код клиÑенÑа Ñоком
ÑговаÑаÑа заÑÑиÑног Ñклопа Ñ gss_init_sec_context() Ñ
СÐСРбиблиоÑеÑи. Ðво Ñе наÑвеÑоваÑниÑе
због недовоÑниÑ
ÑвеÑеÑа или злонамеÑниÑ
акÑивноÑÑи."
#: src/error.c:140
msgid "GSSAPI error in server while negotiating security context in
gss_accept_sec_context() in SASL library. This is most likely due insufficient
credentials or malicious interactions."
-msgstr "ÐССÐÐРгÑеÑка код ÑеÑвеÑа Ñоком
ÑговаÑаÑа заÑÑиÑног Ñклопа Ñ gss_accept_sec_context()
Ñ Ð¡ÐСРбиблиоÑеÑи. Ðво Ñе наÑвеÑоваÑниÑе
због недовоÑниÑ
ÑвеÑеÑа или злонамеÑниÑ
акÑивноÑÑи."
+msgstr "ÐССÐÐРгÑеÑка код ÑеÑвеÑа Ñоком
ÑговаÑаÑа заÑÑиÑног Ñклопа Ñ gss_accept_sec_context()
Ñ Ð¡ÐСРбиблиоÑеÑи. Ðво Ñе наÑвеÑоваÑниÑе
због недовоÑниÑ
ÑвеÑеÑа или злонамеÑниÑ
акÑивноÑÑи."
#: src/error.c:144
msgid "GSSAPI error while decrypting or decoding data in gss_unwrap() in SASL
library. This is most likely due to data corruption."
-msgstr "ÐССÐÐРгÑеÑка Ñоком деÑиÑÑоваÑа или
декодиÑаÑа подаÑака Ñ gss_unwrap() Ñ Ð¡ÐСÐ
библиоÑеÑи. Ðво Ñе наÑвеÑоваÑниÑе због
гÑеÑке Ñ Ð¿Ð¾Ð´Ð°Ñима."
+msgstr "ÐССÐÐРгÑеÑка Ñоком деÑиÑÑоваÑа или
декодиÑаÑа подаÑака Ñ gss_unwrap() Ñ Ð¡ÐСÐ
библиоÑеÑи. Ðво Ñе наÑвеÑоваÑниÑе због
гÑеÑке Ñ Ð¿Ð¾Ð´Ð°Ñима."
#: src/error.c:147
msgid "GSSAPI error while encrypting or encoding data in gss_wrap() in SASL
library."
@@ -187,11 +187,11 @@ msgstr "ÐССÐÐРгÑеÑка Ñоком
ÑиÑÑоваÑа или коди
#: src/error.c:150
msgid "GSSAPI error acquiring credentials in gss_acquire_cred() in SASL
library. This is most likely due to not having the proper Kerberos key
available in /etc/krb5.keytab on the server."
-msgstr "ÐССÐÐРгÑеÑка пÑи пÑибавÑаÑÑ ÑвеÑеÑа
Ñ gss_acquire_cred() Ñ Ð¡ÐСРбиблиоÑеÑи. Ðво Ñе
наÑвеÑоваÑниÑе заÑо ÑÑо Ñе немаÑÑ
одговаÑаÑÑÑи кеÑбеÑÐ¾Ñ ÐºÑÑÑеви Ñ
â/etc/krb5.keytabâ на ÑеÑвеÑÑ."
+msgstr "ÐССÐÐРгÑеÑка пÑи пÑибавÑаÑÑ ÑвеÑеÑа
Ñ gss_acquire_cred() Ñ Ð¡ÐСРбиблиоÑеÑи. ÑÐво Ñе
наÑвеÑоваÑниÑе заÑо ÑÑо Ñе немаÑÑ
одговаÑаÑÑÑи кеÑбеÑÐ¾Ñ ÐºÑÑÑеви Ñ
â/etc/krb5.keytabâ на ÑеÑвеÑÑ."
#: src/error.c:154
msgid "GSSAPI error creating a display name denoting the client in
gss_display_name() in SASL library. This is probably because the client
supplied bad data."
-msgstr "ÐССÐÐРгÑеÑка пÑиликом ÑÑваÑаÑа
пÑиказаног назива коÑе одÑеÑÑÑе клиÑенÑа Ñ
gss_display_name() Ñ Ð¡ÐСРбиблиоÑеÑи. Ðво Ñе
наÑвеÑоваÑниÑе заÑо ÑÑо Ñе клиÑенÑ
доÑÑавио лоÑе подаÑке."
+msgstr "ÐССÐÐРгÑеÑка пÑиликом ÑÑваÑаÑа
пÑиказаног назива коÑе одÑеÑÑÑе клиÑенÑа Ñ
gss_display_name() Ñ Ð¡ÐСРбиблиоÑеÑи. Ðво Ñе
наÑвеÑоваÑниÑе заÑо ÑÑо Ñе клиÑенÑ
доÑÑавио лоÑе подаÑке."
#: src/error.c:158
msgid "Other entity requested integrity or confidentiality protection in
GSSAPI mechanism but this is currently not implemented."
@@ -277,6 +277,18 @@ msgstr "ÐССÐÐРгÑеÑка пÑиликом
оÑпÑÑÑаÑа ÐÐÐ Ñ
msgid "Authentication failed because a tls-unique CB was not provided."
msgstr "ÐоÑвÑда иденÑиÑеÑа ниÑе ÑÑпела ÑеÑ
ниÑе даÑо ÑлÑ-ÑединÑÑвени ЦÐ."
-#: src/error.c:224
+#: src/error.c:204
+msgid "Callback failed to provide SAML20 IdP identifier."
+msgstr "ÐовÑаÑни позив ниÑе ÑÑпео да обезбеди
СÐÐÐ20 ÐдРознаÑаваÑ."
+
+#: src/error.c:206
+msgid "Callback failed to provide SAML20 redirect URL."
+msgstr "ÐовÑаÑни позив ниÑе ÑÑпео да обезбеди
СÐÐÐ20 адÑеÑÑ Ð¿ÑеÑÑмеÑеÑа."
+
+#: src/error.c:208
+msgid "Callback failed to provide OPENID20 redirect URL."
+msgstr "ÐовÑаÑни позив ниÑе ÑÑпео да обезбеди
ÐÐÐÐÐÐ20 адÑеÑÑ Ð¿ÑеÑÑмеÑеÑа."
+
+#: src/error.c:230
msgid "Libgsasl unknown error"
msgstr "ÐепознаÑа гÑеÑка ÐибгÑаÑла"
diff --git a/lib/src/gsasl.h b/lib/src/gsasl.h
index 5d6dbfc..5b060f9 100644
--- a/lib/src/gsasl.h
+++ b/lib/src/gsasl.h
@@ -51,7 +51,7 @@ extern "C"
* version number. Used together with gsasl_check_version() to
* verify header file and run-time library consistency.
*/
-#define GSASL_VERSION "1.7.6"
+#define GSASL_VERSION "1.8.0"
/**
* GSASL_VERSION_MAJOR
@@ -73,7 +73,7 @@ extern "C"
*
* Since: 1.1
*/
-#define GSASL_VERSION_MINOR 7
+#define GSASL_VERSION_MINOR 8
/**
* GSASL_VERSION_PATCH
@@ -84,7 +84,7 @@ extern "C"
*
* Since: 1.1
*/
-#define GSASL_VERSION_PATCH 6
+#define GSASL_VERSION_PATCH 0
/**
* GSASL_VERSION_NUMBER
@@ -95,7 +95,7 @@ extern "C"
*
* Since: 1.1
*/
-#define GSASL_VERSION_NUMBER 0x010706
+#define GSASL_VERSION_NUMBER 0x010800
/* RFC 2222: SASL mechanisms are named by strings, from 1 to 20
* characters in length, consisting of upper-case letters, digits,
diff --git a/po/sr.po.in b/po/sr.po.in
index b54e83a..84c7fd0 100644
--- a/po/sr.po.in
+++ b/po/sr.po.in
@@ -5,10 +5,10 @@
# ÐиÑоÑлав ÐÐ¸ÐºÐ¾Ð»Ð¸Ñ <address@hidden>, 2012.
msgid ""
msgstr ""
-"Project-Id-Version: gsasl-1.6.1\n"
+"Project-Id-Version: gsasl-1.7.4\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-05-01 17:35+0200\n"
-"PO-Revision-Date: 2012-01-05 01:21+0200\n"
+"POT-Creation-Date: 2012-05-16 00:55+0200\n"
+"PO-Revision-Date: 2012-05-24 22:19+0200\n"
"Last-Translator: ÐиÑоÑлав ÐÐ¸ÐºÐ¾Ð»Ð¸Ñ <address@hidden>\n"
"Language-Team: Serbian <address@hidden>\n"
"Language: sr\n"
@@ -22,23 +22,23 @@ msgstr ""
msgid "Chose SASL mechanisms:\n"
msgstr "ÐзабеÑиÑе СÐСРмеÑод:\n"
-#: src/imap.c:106 src/smtp.c:110 src/gsasl.c:206
+#: src/imap.c:106 src/smtp.c:113 src/gsasl.c:206
#, c-format
msgid "Using mechanism:\n"
msgstr "ÐоÑиÑÑим меÑод:\n"
-#: src/imap.c:156
+#: src/imap.c:180
#, c-format
msgid "error: server did not return a token\n"
-msgstr "гÑеÑка: ÑеÑÐ²ÐµÑ Ð½Ð¸Ñе вÑаÑио ........\n"
+msgstr "гÑеÑка: ÑеÑÐ²ÐµÑ Ð½Ð¸Ñе вÑаÑио Ñимбол\n"
-#: src/smtp.c:158
+#: src/smtp.c:192
#, c-format
msgid ""
-"error: Server did not return expected SASL data (it must begin with '334
'):\n"
+"error: could not parse server data:\n"
"%s\n"
msgstr ""
-"гÑеÑка: СеÑÐ²ÐµÑ Ð½Ð¸Ñе вÑаÑио оÑекиване
подаÑке СÐСÐ-а (моÑа поÑиÑаÑи Ñа â334 â):\n"
+"гÑеÑка: не Ð¼Ð¾Ð³Ñ Ð´Ð° ÑаÑÑланим подаÑке
ÑеÑвеÑа:\n"
"%s\n"
#: src/gsasl.c:178
@@ -61,205 +61,217 @@ msgstr "Ðзлаз ÑеÑвеÑа:\n"
msgid "Output from client:\n"
msgstr "Ðзлаз клиÑенÑа:\n"
-#: src/gsasl.c:281
+#: src/gsasl.c:272
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ÐÑобаÑÑе â%s --helpâ за виÑе подаÑака.\n"
-#: src/gsasl.c:336
+#: src/gsasl.c:327
#, c-format
msgid "missing argument"
msgstr "недоÑÑаÑе аÑгÑменÑ"
-#: src/gsasl.c:343
+#: src/gsasl.c:334
#, c-format
msgid "need both --x509-cert-file and --x509-key-file"
msgstr "поÑÑебни ÑÑ Ð¸ â--x509-cert-fileâ и
â--x509-key-fileâ"
-#: src/gsasl.c:347
+#: src/gsasl.c:338
#, c-format
msgid "cannot use both --starttls and --no-starttls"
msgstr "не Ð¼Ð¾Ð³Ñ Ð´Ð° коÑиÑÑим и â--starttlsâ и
â--no-starttlsâ"
-#: src/gsasl.c:350
+#: src/gsasl.c:341
#, c-format
msgid "cannot use both --smtp and --imap"
msgstr "не Ð¼Ð¾Ð³Ñ Ð´Ð° коÑиÑÑим и â--smtpâ и â--imapâ"
-#: src/gsasl.c:415
+#: src/gsasl.c:407
#, c-format
msgid "initialization failure: %s"
msgstr "неÑÑпеÑ
покÑеÑаÑа: %s"
-#: src/gsasl.c:430
+#: src/gsasl.c:422
#, c-format
msgid "error listing mechanisms: %s"
msgstr "гÑеÑка иÑпиÑиваÑа меÑода: %s"
-#: src/gsasl.c:437
+#: src/gsasl.c:429
#, c-format
msgid "This client supports the following mechanisms:\n"
msgstr "ÐÐ²Ð°Ñ ÐºÐ»Ð¸ÑÐµÐ½Ñ Ð¿Ð¾Ð´Ñжава ÑледеÑе
меÑоде:\n"
-#: src/gsasl.c:440
+#: src/gsasl.c:432
#, c-format
msgid "This server supports the following mechanisms:\n"
msgstr "ÐÐ²Ð°Ñ ÑеÑÐ²ÐµÑ Ð¿Ð¾Ð´Ñжава ÑледеÑе меÑоде:\n"
-#: src/gsasl.c:508
+#: src/gsasl.c:494
#, c-format
msgid "GnuTLS global initialization failed: %s"
msgstr "ниÑе ÑÑпело глобално ÐнÑТÐС
покÑеÑаÑе: %s"
-#: src/gsasl.c:513
+#: src/gsasl.c:499
#, c-format
msgid "GnuTLS initialization failed: %s"
msgstr "ниÑе ÑÑпело ÐнÑТÐС покÑеÑаÑе: %s"
-#: src/gsasl.c:518
+#: src/gsasl.c:504
#, c-format
msgid "setting GnuTLS defaults failed: %s"
msgstr "ниÑе ÑÑпело подеÑаваÑе оÑновниÑ
ÐнÑТÐС вÑедноÑÑи: %s"
-#: src/gsasl.c:524
+#: src/gsasl.c:510
#, c-format
msgid "allocating anonymous GnuTLS credential: %s"
msgstr "добавÑам анонимно ÐнÑТÐС ÑвеÑеÑе: %s"
-#: src/gsasl.c:529
+#: src/gsasl.c:515
#, c-format
msgid "setting anonymous GnuTLS credential: %s"
msgstr "задаÑем анонимно ÐнÑТÐС ÑвеÑеÑе: %s"
-#: src/gsasl.c:534
+#: src/gsasl.c:520
#, c-format
msgid "allocating X.509 GnuTLS credential: %s"
msgstr "добавÑам X.509 ÐнÑТÐС ÑвеÑеÑе: %s"
-#: src/gsasl.c:542
+#: src/gsasl.c:528
#, c-format
msgid "loading X.509 GnuTLS credential: %s"
msgstr "ÑÑиÑавам X.509 ÐнÑТÐС ÑвеÑеÑе: %s"
-#: src/gsasl.c:550
+#: src/gsasl.c:536
#, c-format
msgid "no X.509 CAs found: %s"
msgstr "ниÑам пÑонаÑао X.509 издаваÑе ÑвеÑеÑа: %s"
-#: src/gsasl.c:553
+#: src/gsasl.c:539
#, c-format
msgid "no X.509 CAs found"
msgstr "ниÑам пÑонаÑао Ð¥.509 издаваÑе ÑвеÑеÑа"
-#: src/gsasl.c:559
+#: src/gsasl.c:545
#, c-format
msgid "setting X.509 GnuTLS credential: %s"
msgstr "задаÑем X.509 ÐнÑТÐС ÑвеÑеÑе: %s"
-#: src/gsasl.c:570
+#: src/gsasl.c:556
#, c-format
msgid "setting GnuTLS cipher priority (%s): %s\n"
msgstr "задаÑем пÑиоÑиÑÐµÑ ÐнÑТÐС ÑиÑÑеÑа (%s):
%s\n"
-#: src/gsasl.c:582
+#: src/gsasl.c:568
#, c-format
msgid "GnuTLS handshake failed: %s"
msgstr "ниÑе ÑÑпело ÐнÑТÐС ÑÑковаÑе: %s"
-#: src/gsasl.c:591
+#: src/gsasl.c:577
#, c-format
msgid "verifying peer certificate: %s"
msgstr "пÑовеÑавам паÑÑаково ÑвеÑеÑе: %s"
-#: src/gsasl.c:595
+#: src/gsasl.c:581
#, c-format
msgid "server certificate is not trusted"
msgstr "ÑвеÑеÑе ÑеÑвеÑа ниÑе од повеÑеÑа"
-#: src/gsasl.c:599
+#: src/gsasl.c:585
#, c-format
msgid "server certificate hasn't got a known issuer"
msgstr "ÑвеÑеÑе ÑеÑвеÑа нема познаÑог
издаваÑа"
-#: src/gsasl.c:602
+#: src/gsasl.c:588
#, c-format
msgid "server certificate has been revoked"
msgstr "ÑвеÑеÑе ÑеÑвеÑа Ñе повÑÑено"
-#: src/gsasl.c:606
+#: src/gsasl.c:592
#, c-format
msgid "could not verify server certificate (rc=%d)"
msgstr "не Ð¼Ð¾Ð³Ñ Ð´Ð° пÑовеÑим ÑвеÑеÑе ÑеÑвеÑа
(rc=%d)"
-#: src/gsasl.c:617
+#: src/gsasl.c:603
#, c-format
msgid "getting channel binding failed: %s"
msgstr "ниÑе ÑÑпело добавÑаÑе везова канала: %s"
-#: src/gsasl.c:647
+#: src/gsasl.c:633
#, c-format
msgid "Cannot find mechanism...\n"
msgstr "Ðе Ð¼Ð¾Ð³Ñ Ð´Ð° пÑонаÑем меÑод...\n"
-#: src/gsasl.c:664
+#: src/gsasl.c:650
#, c-format
msgid "mechanism unavailable: %s"
msgstr "меÑод ниÑе доÑÑÑпан: %s"
-#: src/gsasl.c:693
+#: src/gsasl.c:678
#, c-format
msgid "Enter base64 authentication data from client (press RET if none):\n"
msgstr "УнеÑиÑе подаÑке за поÑвÑÐ´Ñ ÐºÐ»Ð¸ÑенÑа Ñ
оÑнови64 (пÑиÑиÑниÑе <RET> за ниÑÑа):\n"
-#: src/gsasl.c:696
+#: src/gsasl.c:681
#, c-format
msgid "Enter base64 authentication data from server (press RET if none):\n"
msgstr "УнеÑиÑе подаÑке за поÑвÑÐ´Ñ ÑеÑвеÑа Ñ
оÑнови64 (пÑиÑиÑниÑе <RET> за ниÑÑа):\n"
-#: src/gsasl.c:706
+#: src/gsasl.c:691
+#, c-format
+msgid "server error"
+msgstr "гÑеÑка ÑеÑвеÑа"
+
+#: src/gsasl.c:699
#, c-format
msgid "mechanism error: %s"
msgstr "гÑеÑка меÑода: %s"
-#: src/gsasl.c:715
+#: src/gsasl.c:705
#, c-format
msgid "Server authentication finished (client trusted)...\n"
msgstr "ÐоÑвÑÑиваÑе ÑеÑвеÑа Ñе завÑÑено
(клиÑенÑÑ Ñе веÑÑÑе)...\n"
-#: src/gsasl.c:718
+#: src/gsasl.c:708
#, c-format
msgid "Client authentication finished (server trusted)...\n"
msgstr "ÐоÑвÑÑиваÑе клиÑенÑа Ñе завÑÑено
(ÑеÑвеÑÑ Ñе веÑÑÑе)...\n"
-#: src/gsasl.c:742
+#: src/gsasl.c:733
#, c-format
msgid "Enter application data (EOF to finish):\n"
msgstr "УнеÑиÑе подаÑке за обÑÐ°Ð´Ñ (<EOF> за
кÑаÑ):\n"
-#: src/gsasl.c:814
+#: src/gsasl.c:804
#, c-format
msgid "Base64 encoded application data to send:\n"
msgstr "ÐодиÑани подаÑи пÑогÑама Ñ Ð¾Ñнови64 за
ÑлаÑе:\n"
-#: src/gsasl.c:859
+#: src/gsasl.c:850
#, c-format
msgid "SASL record too large: %zu\n"
msgstr "Снимак СÐСÐ-а Ñе пÑевелик: %zu\n"
-#: src/gsasl.c:883
+#: src/gsasl.c:874
#, c-format
msgid "encoding error: %s"
msgstr "гÑеÑка кодиÑаÑа: %s"
-#: src/gsasl.c:888
+#: src/gsasl.c:879
#, c-format
msgid "Session finished...\n"
msgstr "СеÑиÑа Ñе завÑÑена...\n"
-#: src/gsasl.c:904
+#: src/gsasl.c:895
#, c-format
msgid "terminating GnuTLS session failed: %s"
msgstr "ниÑе ÑÑпело завÑÑаваÑе ÐнÑТÐС ÑеÑиÑе:
%s"
+#~ msgid ""
+#~ "error: Server did not return expected SASL data (it must begin with '334
'):\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "гÑеÑка: СеÑÐ²ÐµÑ Ð½Ð¸Ñе вÑаÑио оÑекиване
подаÑке СÐСÐ-а (моÑа поÑиÑаÑи Ñа â334 â):\n"
+#~ "%s\n"
+
#~ msgid "Cannot initialize Windows sockets."
#~ msgstr "Ðе може иниÑиÑализоваÑи ÐиндоÑз
ÑокеÑе."
hooks/post-receive
--
GNU gsasl
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gsasl branch, master, updated. gsasl-1-7-6-3-g524db10,
Simon Josefsson <=