[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gsasl branch, master, updated. gsasl-1-7-5-10-g8dd0ec3
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gsasl branch, master, updated. gsasl-1-7-5-10-g8dd0ec3 |
|
Date: |
Wed, 23 May 2012 07:48:41 +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=8dd0ec37fe0c97815cf3765847224aedf32fb48a
The branch, master has been updated
via 8dd0ec37fe0c97815cf3765847224aedf32fb48a (commit)
via 44175948a171588fee41328b8f5986573050e12c (commit)
via d3d5cdd40d8e6bf235b75dce97d26557be5d1e40 (commit)
via 102296863216feec0925cf0d3a801a5c42385e93 (commit)
via 45d75c51eea16128450cdc4847593e388000591e (commit)
from 125aad681da65e3c980c53f0066f00a79e4b14dd (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 8dd0ec37fe0c97815cf3765847224aedf32fb48a
Author: Simon Josefsson <address@hidden>
Date: Wed May 23 09:12:27 2012 +0200
Version 1.7.6.
commit 44175948a171588fee41328b8f5986573050e12c
Author: Simon Josefsson <address@hidden>
Date: Wed May 23 08:58:02 2012 +0200
Sync with TP.
commit d3d5cdd40d8e6bf235b75dce97d26557be5d1e40
Author: Simon Josefsson <address@hidden>
Date: Wed May 23 08:57:47 2012 +0200
Add.
commit 102296863216feec0925cf0d3a801a5c42385e93
Author: Simon Josefsson <address@hidden>
Date: Wed May 23 08:27:19 2012 +0200
Need config.h for examples, due to gnulib overrides.
commit 45d75c51eea16128450cdc4847593e388000591e
Author: Simon Josefsson <address@hidden>
Date: Tue May 22 22:09:34 2012 +0200
Link with gnulib.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 6 ++-
examples/Makefile.am | 5 +-
examples/client-callback.c | 1 +
examples/client-mech.c | 1 +
examples/client-serverfirst.c | 1 +
examples/client-xmpp-saml20.c | 1 +
examples/client.c | 1 +
examples/server-xmpp-saml20.c | 1 +
examples/smtp-server.c | 1 +
lib/NEWS | 4 +-
lib/po/nl.po.in | 27 ++++++++--
po/nl.po.in | 114 +++++++++++++++++++++++------------------
12 files changed, 103 insertions(+), 60 deletions(-)
diff --git a/NEWS b/NEWS
index 832a296..bf73e2e 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,11 @@ 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.7.6 (unreleased) [beta]
+* Version 1.7.6 (released 2012-05-23) [beta]
+
+** i18n: Updated translations.
+
+** Build fixes.
* Version 1.7.5 (released 2012-05-22) [beta]
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 05b71ed..344174d 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -19,8 +19,9 @@
SUBDIRS = openid20 saml20
AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/lib/src -I../lib/src
-LDADD = ../lib/src/libgsasl.la
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl \
+ -I$(top_srcdir)/lib/src -I$(top_builddir)/lib/src
+LDADD = $(top_builddir)/lib/src/libgsasl.la $(top_builddir)/gl/libgl.la
EXTRA_DIST = README
diff --git a/examples/client-callback.c b/examples/client-callback.c
index 04b2b4c..6eedd0e 100644
--- a/examples/client-callback.c
+++ b/examples/client-callback.c
@@ -18,6 +18,7 @@
*
*/
+#include <config.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/examples/client-mech.c b/examples/client-mech.c
index e29e7dc..1db907f 100644
--- a/examples/client-mech.c
+++ b/examples/client-mech.c
@@ -18,6 +18,7 @@
*
*/
+#include <config.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/examples/client-serverfirst.c b/examples/client-serverfirst.c
index 0a3ac9a..82c7e97 100644
--- a/examples/client-serverfirst.c
+++ b/examples/client-serverfirst.c
@@ -18,6 +18,7 @@
*
*/
+#include <config.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/examples/client-xmpp-saml20.c b/examples/client-xmpp-saml20.c
index c4ce66f..a7480db 100644
--- a/examples/client-xmpp-saml20.c
+++ b/examples/client-xmpp-saml20.c
@@ -18,6 +18,7 @@
*
*/
+#include <config.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/examples/client.c b/examples/client.c
index c13a763..3b8866e 100644
--- a/examples/client.c
+++ b/examples/client.c
@@ -18,6 +18,7 @@
*
*/
+#include <config.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/examples/server-xmpp-saml20.c b/examples/server-xmpp-saml20.c
index ce0889f..5fb86ab 100644
--- a/examples/server-xmpp-saml20.c
+++ b/examples/server-xmpp-saml20.c
@@ -18,6 +18,7 @@
*
*/
+#include <config.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/examples/smtp-server.c b/examples/smtp-server.c
index a5c1e34..3948c1f 100644
--- a/examples/smtp-server.c
+++ b/examples/smtp-server.c
@@ -25,6 +25,7 @@
specifying the service name (i.e., a numerical port number or
/etc/services name). By default it listens on port "2000". */
+#include <config.h>
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
diff --git a/lib/NEWS b/lib/NEWS
index 54f2efc..17f7c01 100644
--- a/lib/NEWS
+++ b/lib/NEWS
@@ -2,7 +2,9 @@ GNU SASL LIBRARY NEWS -- History of user-visible changes.
Copyright (C) 2002-2012 Simon Josefsson
See the end for copying conditions.
-* Version 1.7.6 (unreleased) [beta]
+* Version 1.7.6 (released 2012-05-23) [beta]
+
+** i18n: Updated translations.
** API and ABI modifications.
No changes since last version.
diff --git a/lib/po/nl.po.in b/lib/po/nl.po.in
index d5d9656..cf78300 100644
--- a/lib/po/nl.po.in
+++ b/lib/po/nl.po.in
@@ -1,15 +1,18 @@
# Dutch translations for GNU libgsasl.
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the libgsasl package.
#
+# "VojaÄanto, prenu vian tempon.
+# Se ne, Äi prenas vin."
+#
# Taco Witte <address@hidden>, 2004, 2005, 2006.
-# Benno Schulenberg <address@hidden>, 2008, 2010, 2011.
+# Benno Schulenberg <address@hidden>, 2008, 2010, 2011, 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: 2011-05-04 21:11+0200\n"
+"POT-Creation-Date: 2012-05-16 00:55+0200\n"
+"PO-Revision-Date: 2012-05-22 21:18+0200\n"
"Last-Translator: Benno Schulenberg <address@hidden>\n"
"Language-Team: Dutch <address@hidden>\n"
"Language: nl\n"
@@ -279,6 +282,18 @@ msgstr "GSSAPI-fout bij vrijgeven van OID-set."
msgid "Authentication failed because a tls-unique CB was not provided."
msgstr "Authenticatie is mislukt omdat geen TLS-unieke CB opgegeven is."
-#: src/error.c:224
+#: src/error.c:204
+msgid "Callback failed to provide SAML20 IdP identifier."
+msgstr "Terugaanroep leverde geen SAML20-IdP-naam."
+
+#: src/error.c:206
+msgid "Callback failed to provide SAML20 redirect URL."
+msgstr "Terugaanroep leverde geen SAML20-doorverwijzings-URL."
+
+#: src/error.c:208
+msgid "Callback failed to provide OPENID20 redirect URL."
+msgstr "Terugaanroep leverde geen OPENID20-doorverwijzings-URL."
+
+#: src/error.c:230
msgid "Libgsasl unknown error"
msgstr "Libgsasl: onbekende fout"
diff --git a/po/nl.po.in b/po/nl.po.in
index 918c4d3..d110427 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -1,16 +1,18 @@
# Dutch translations for GNU gsasl.
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the gsasl package.
#
+# "Wie vrij wil zijn, moet zich niet aanpassen."
+#
# Taco Witte <address@hidden>, 2004, 2005, 2006.
# Erwin Poeze <address@hidden>, 2009, 2010.
-# Benno Schulenberg <address@hidden>, 2008, 2010, 2011.
+# Benno Schulenberg <address@hidden>, 2008, 2010, 2011, 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: 2011-05-04 21:02+0200\n"
+"POT-Creation-Date: 2012-05-16 00:55+0200\n"
+"PO-Revision-Date: 2012-05-22 21:18+0200\n"
"Last-Translator: Benno Schulenberg <address@hidden>\n"
"Language-Team: Dutch <address@hidden>\n"
"Language: nl\n"
@@ -25,23 +27,23 @@ msgstr ""
msgid "Chose SASL mechanisms:\n"
msgstr "Gekozen SASL-methoden:\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 "Gebruikte methode:\n"
-#: src/imap.c:156
+#: src/imap.c:180
#, c-format
msgid "error: server did not return a token\n"
msgstr "fout: server heeft geen token teruggegeven\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 ""
-"fout: server levert niet de verwachte SASL-gegevens (moet beginnen met '334
'):\n"
+"Fout: kan server-gegevens niet ontleden:\n"
"%s\n"
#: src/gsasl.c:178
@@ -64,207 +66,219 @@ msgstr "Serveruitvoer:\n"
msgid "Output from client:\n"
msgstr "Cliëntuitvoer:\n"
-#: src/gsasl.c:281
+#: src/gsasl.c:272
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Typ '%s --help' voor meer informatie.\n"
-#: src/gsasl.c:336
+#: src/gsasl.c:327
#, c-format
msgid "missing argument"
msgstr "ontbrekend argument"
-#: src/gsasl.c:343
+#: src/gsasl.c:334
#, c-format
msgid "need both --x509-cert-file and --x509-key-file"
msgstr "opties '--x509-cert-file' en '--x509-key-file' zijn beide nodig"
-#: src/gsasl.c:347
+#: src/gsasl.c:338
#, c-format
msgid "cannot use both --starttls and --no-starttls"
msgstr "opties '--starttls' en '--no-starttls' gaan niet samen"
-#: src/gsasl.c:350
+#: src/gsasl.c:341
#, c-format
msgid "cannot use both --smtp and --imap"
msgstr "opties '--smtp' en '--imap' gaan niet samen"
-#: src/gsasl.c:415
+#: src/gsasl.c:407
#, c-format
msgid "initialization failure: %s"
msgstr "initialisatiefout: %s"
-#: src/gsasl.c:430
+#: src/gsasl.c:422
#, c-format
msgid "error listing mechanisms: %s"
msgstr "fout bij opsommen van methoden: %s"
-#: src/gsasl.c:437
+#: src/gsasl.c:429
#, c-format
msgid "This client supports the following mechanisms:\n"
msgstr "Deze cliënt ondersteunt de volgende methoden:\n"
-#: src/gsasl.c:440
+#: src/gsasl.c:432
#, c-format
msgid "This server supports the following mechanisms:\n"
msgstr "Deze server ondersteunt de volgende methoden:\n"
-#: src/gsasl.c:508
+#: src/gsasl.c:494
#, c-format
msgid "GnuTLS global initialization failed: %s"
msgstr "algemene GnuTLS-initialisatie is mislukt: %s"
-#: src/gsasl.c:513
+#: src/gsasl.c:499
#, c-format
msgid "GnuTLS initialization failed: %s"
msgstr "GnuTLS-initialisatie is mislukt: %s"
-#: src/gsasl.c:518
+#: src/gsasl.c:504
#, c-format
msgid "setting GnuTLS defaults failed: %s"
msgstr "instellen van GnuTLS-standaardwaarden is mislukt: %s"
-#: src/gsasl.c:524
+#: src/gsasl.c:510
#, c-format
msgid "allocating anonymous GnuTLS credential: %s"
msgstr "reserveren van anonieme GnuTLS-vertrouwensgegevens: %s"
-#: src/gsasl.c:529
+#: src/gsasl.c:515
#, c-format
msgid "setting anonymous GnuTLS credential: %s"
msgstr "instellen van anonieme GnuTLS-vertrouwensgegevens: %s"
-#: src/gsasl.c:534
+#: src/gsasl.c:520
#, c-format
msgid "allocating X.509 GnuTLS credential: %s"
msgstr "reserveren van X.509 GnuTLS-vertrouwensgegevens: %s"
-#: src/gsasl.c:542
+#: src/gsasl.c:528
#, c-format
msgid "loading X.509 GnuTLS credential: %s"
msgstr "laden van X.509 GnuTLS-vertrouwensgegevens: %s"
-#: src/gsasl.c:550
+#: src/gsasl.c:536
#, c-format
msgid "no X.509 CAs found: %s"
msgstr "geen X.509 certificaatautoriteiten gevonden: %s"
-#: src/gsasl.c:553
+#: src/gsasl.c:539
#, c-format
msgid "no X.509 CAs found"
msgstr "geen X.509 certificaatautoriteiten gevonden"
-#: src/gsasl.c:559
+#: src/gsasl.c:545
#, c-format
msgid "setting X.509 GnuTLS credential: %s"
msgstr "instellen van X.509 GnuTLS-vertrouwensgegevens: %s"
-#: src/gsasl.c:570
+#: src/gsasl.c:556
#, c-format
msgid "setting GnuTLS cipher priority (%s): %s\n"
msgstr "instellen van GnuTLS-sleuteluitwisselingsprioriteit (%s): %s\n"
-#: src/gsasl.c:582
+#: src/gsasl.c:568
#, c-format
msgid "GnuTLS handshake failed: %s"
msgstr "GnuTLS-handshake is mislukt: %s"
-#: src/gsasl.c:591
+#: src/gsasl.c:577
#, c-format
msgid "verifying peer certificate: %s"
msgstr "verifiëren van certificaat van andere computer: %s"
-#: src/gsasl.c:595
+#: src/gsasl.c:581
#, c-format
msgid "server certificate is not trusted"
msgstr "servercertificaat wordt niet vertrouwd"
-#: src/gsasl.c:599
+#: src/gsasl.c:585
#, c-format
msgid "server certificate hasn't got a known issuer"
msgstr "servercertificaat heeft geen bekende uitgever"
-#: src/gsasl.c:602
+#: src/gsasl.c:588
#, c-format
msgid "server certificate has been revoked"
msgstr "servercertificaat is ingetrokken"
-#: src/gsasl.c:606
+#: src/gsasl.c:592
#, c-format
msgid "could not verify server certificate (rc=%d)"
msgstr "kan servercertificaat niet verifiëren (rc=%d)"
-#: src/gsasl.c:617
+#: src/gsasl.c:603
#, c-format
msgid "getting channel binding failed: %s"
msgstr "verkrijgen van kanaalbinding is mislukt: %s"
-#: src/gsasl.c:647
+#: src/gsasl.c:633
#, c-format
msgid "Cannot find mechanism...\n"
msgstr "Kan methode niet vinden...\n"
-#: src/gsasl.c:664
+#: src/gsasl.c:650
#, c-format
msgid "mechanism unavailable: %s"
msgstr "methode is onbeschikbaar: %s"
-#: src/gsasl.c:693
+#: src/gsasl.c:678
#, c-format
msgid "Enter base64 authentication data from client (press RET if none):\n"
msgstr "Geef base64-authenticatiegegevens van de cliënt (druk op Enter als
geen):\n"
-#: src/gsasl.c:696
+#: src/gsasl.c:681
#, c-format
msgid "Enter base64 authentication data from server (press RET if none):\n"
msgstr "Geef base64-authenticatiegegevens van de server (druk op Enter als
geen):\n"
-#: src/gsasl.c:706
+#: src/gsasl.c:691
+#, c-format
+msgid "server error"
+msgstr "serverfout"
+
+#: src/gsasl.c:699
#, c-format
msgid "mechanism error: %s"
msgstr "methodefout: %s"
-#: src/gsasl.c:715
+#: src/gsasl.c:705
#, c-format
msgid "Server authentication finished (client trusted)...\n"
msgstr "Serverauthenticatie is voltooid (cliënt wordt vertrouwd).\n"
-#: src/gsasl.c:718
+#: src/gsasl.c:708
#, c-format
msgid "Client authentication finished (server trusted)...\n"
msgstr "Cliëntauthenticatie is voltooid (server wordt vertrouwd).\n"
-#: src/gsasl.c:742
+#: src/gsasl.c:733
#, c-format
msgid "Enter application data (EOF to finish):\n"
msgstr "Voer toepassingsgegevens in (geef EOF om af te sluiten):\n"
-#: src/gsasl.c:814
+#: src/gsasl.c:804
#, c-format
msgid "Base64 encoded application data to send:\n"
msgstr "Te verzenden base64-gecodeerde toepassingsgegevens:\n"
-#: src/gsasl.c:859
+#: src/gsasl.c:850
#, c-format
msgid "SASL record too large: %zu\n"
msgstr "SASL-record is te lang: %zu\n"
-#: src/gsasl.c:883
+#: src/gsasl.c:874
#, c-format
msgid "encoding error: %s"
msgstr "coderingsfout: %s"
-#: src/gsasl.c:888
+#: src/gsasl.c:879
#, c-format
msgid "Session finished...\n"
msgstr "Sessie is voltooid.\n"
-#: src/gsasl.c:904
+#: src/gsasl.c:895
#, c-format
msgid "terminating GnuTLS session failed: %s"
msgstr "beëindigen van GnuTLS-sessie is mislukt: %s"
#~ msgid ""
+#~ "error: Server did not return expected SASL data (it must begin with '334
'):\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "fout: server levert niet de verwachte SASL-gegevens (moet beginnen met
'334 '):\n"
+#~ "%s\n"
+
+#~ msgid ""
#~ "error: Server did not return expected SASL data (it must begin with '+
'):\n"
#~ "%s\n"
#~ msgstr ""
hooks/post-receive
--
GNU gsasl
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gsasl branch, master, updated. gsasl-1-7-5-10-g8dd0ec3,
Simon Josefsson <=