[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU libidn branch, master, updated. libidn-1-30-11-g40c9ae4
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU libidn branch, master, updated. libidn-1-30-11-g40c9ae4 |
|
Date: |
Wed, 08 Jul 2015 21:19:26 +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 libidn".
http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=40c9ae4f4b7a8fab025c0833119d52b60d3cde6e
The branch, master has been updated
via 40c9ae4f4b7a8fab025c0833119d52b60d3cde6e (commit)
via d63262d500f3d09265b48465e287930f754bbe29 (commit)
via 84ebd65d2b9b4c2ef49653f7cbc5d20bf4c700e5 (commit)
via 4e4d3660f622ccdfc002852ed58dba3b0830fc77 (commit)
via 6c89ccd5f4aa5a2d8a0e85944a1e3d7a8917bb07 (commit)
from 2e97c2796581c27213962c77f5a8571a598f9a2e (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 40c9ae4f4b7a8fab025c0833119d52b60d3cde6e
Author: Simon Josefsson <address@hidden>
Date: Wed Jul 8 23:01:04 2015 +0200
Version 1.31.
commit d63262d500f3d09265b48465e287930f754bbe29
Author: Simon Josefsson <address@hidden>
Date: Wed Jul 8 23:00:48 2015 +0200
Add.
commit 84ebd65d2b9b4c2ef49653f7cbc5d20bf4c700e5
Author: Simon Josefsson <address@hidden>
Date: Wed Jul 8 22:45:34 2015 +0200
Update gnulib files.
commit 4e4d3660f622ccdfc002852ed58dba3b0830fc77
Author: Simon Josefsson <address@hidden>
Date: Wed Jul 8 22:43:10 2015 +0200
Add.
commit 6c89ccd5f4aa5a2d8a0e85944a1e3d7a8917bb07
Author: Simon Josefsson <address@hidden>
Date: Wed Jul 8 22:19:33 2015 +0200
Sync with TP.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 9 ++-
THANKS | 3 +
lib/gl/m4/localename.m4 | 5 ++
lib/gltests/localename.c | 4 +-
po/da.po.in | 162 ++++++++++++++++++++++------------------------
5 files changed, 96 insertions(+), 87 deletions(-)
diff --git a/NEWS b/NEWS
index 22821d6..c25e2f6 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ Libidn NEWS -- History of user-visible changes.
-*- outline -*-
Copyright (C) 2002-2015 Simon Josefsson
See the end for copying conditions.
-* Version 1.31 (unreleased) [beta]
+* Version 1.31 (released 2015-07-08) [beta]
** libidn: stringprep_utf8_to_ucs4 now rejects invalid UTF-8. CVE-2015-2059
This function has always been documented to not validate that the
@@ -38,6 +38,13 @@ Valgrind reported a 'Invalid read of size 4' that was caused
by
optimized strlen implementation. Reported and patch by Alessandro
Ghedini <address@hidden>.
+** build: Use LOG_COMPILER instead of TESTS_ENVIRONMENT to fix valgrind use.
+Errors caught by valgrind did not always trigger 'make check' failures
+before.
+
+** i18n: Updated Danish translation.
+Thanks to Joe Hansen.
+
** API and ABI is backwards compatible with the previous version.
* Version 1.30 (released 2015-03-02) [stable]
diff --git a/THANKS b/THANKS
index 1f0bceb..4403488 100644
--- a/THANKS
+++ b/THANKS
@@ -105,6 +105,9 @@ Jon Nelson <address@hidden>
Bartosz Brachaczek <address@hidden>
Sarat Chandra Addepalli <address@hidden>
Jeffrey Frey <address@hidden>
+Thijs Alkemade <address@hidden>
+Nikos Mavrogiannopoulos <address@hidden>
+Gustavo Grieco <address@hidden>
----------------------------------------------------------------------
Copying and distribution of this file, with or without modification,
diff --git a/lib/gl/m4/localename.m4 b/lib/gl/m4/localename.m4
index ef5dd5f..2bdf31e 100644
--- a/lib/gl/m4/localename.m4
+++ b/lib/gl/m4/localename.m4
@@ -9,4 +9,9 @@ AC_DEFUN([gl_LOCALENAME],
AC_REQUIRE([gt_LC_MESSAGES])
AC_REQUIRE([gt_INTL_MACOSX])
AC_CHECK_FUNCS([setlocale uselocale])
+ dnl Solaris 12 provides getlocalename_l, while Illumos doesn't have
+ dnl it nor the equivalent.
+ if test $ac_cv_func_uselocale = yes; then
+ AC_CHECK_FUNCS([getlocalename_l])
+ fi
])
diff --git a/lib/gltests/localename.c b/lib/gltests/localename.c
index 35b6de4..3932e4a 100644
--- a/lib/gltests/localename.c
+++ b/lib/gltests/localename.c
@@ -42,7 +42,7 @@
# if !defined IN_LIBINTL
# include "glthread/lock.h"
# endif
-# if defined __sun
+# if defined __sun && HAVE_GETLOCALENAME_L
/* Solaris >= 12. */
extern char * getlocalename_l(int, locale_t);
# endif
@@ -2727,7 +2727,7 @@ gl_locale_name_thread_unsafe (int category, const char
*categoryname)
return "";
}
return querylocale (mask, thread_locale);
-# elif defined __sun
+# elif defined __sun && HAVE_GETLOCALENAME_L
/* Solaris >= 12. */
return getlocalename_l (category, thread_locale);
# elif defined __ANDROID__
diff --git a/po/da.po.in b/po/da.po.in
index 4c8828b..52e4556 100644
--- a/po/da.po.in
+++ b/po/da.po.in
@@ -1,163 +1,152 @@
# Danish translation of the libidn gettext message catalogue
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2015 Free Software Foundation, Inc.
# This file is distributed under the same license as the libidn package.
-# Morten Bo Johansen <address@hidden>, 2004-2011
+# Morten Bo Johansen <address@hidden>, 2004-2011.
+# Joe Hansen <address@hidden>, 2015.
+#
msgid ""
msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.29\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2011-01-03 17:38+0100\n"
-"Last-Translator: Morten Bo Johansen <address@hidden>\n"
+"POT-Creation-Date: 2014-08-10 22:50+0200\n"
+"PO-Revision-Date: 2015-05-01 17:38+0100\n"
+"Last-Translator: Joe Hansen <address@hidden>\n"
"Language-Team: Danish <address@hidden>\n"
+"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Jed w/po-mode (http://jedsoft.org)\n"
-#: lib/strerror-idna.c:74 lib/strerror-pr29.c:58 lib/strerror-punycode.c:58
-#: lib/strerror-stringprep.c:78 lib/strerror-tld.c:60
+#: lib/strerror-idna.c:82 lib/strerror-pr29.c:66 lib/strerror-punycode.c:66
+#: lib/strerror-stringprep.c:86 lib/strerror-tld.c:68
msgid "Success"
msgstr "Lykkedes"
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:86 lib/strerror-pr29.c:74
msgid "String preparation failed"
msgstr "Dannelse af tekststreng mislykkedes"
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:90
msgid "Punycode failed"
msgstr "Punycode mislykkedes"
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:94
msgid "Non-digit/letter/hyphen in input"
msgstr "Ikke-ciffer/bogstav/bindestreg i inddata"
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:98
msgid "Forbidden leading or trailing minus sign (`-')"
msgstr "MÃ¥ ikke begynde eller slutte med minustegn (\"-\")"
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:102
msgid "Output would be too large or too small"
msgstr "Mængden af uddata ville blive for stor eller lille"
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:106
msgid "Input does not start with ACE prefix (`xn--')"
msgstr "Inddata begynder ikke med et ACE-præfiks (\"xn--\")"
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:110
msgid "String not idempotent under ToASCII"
msgstr "Tekststreng er ikke idempotent under ToASCII"
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:114
msgid "Input already contain ACE prefix (`xn--')"
msgstr "Inddata indeholder allerede et ACE-præfiks (\"xn--\")"
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:118 lib/strerror-tld.c:84
msgid "System iconv failed"
msgstr "Systemkald til iconv mislykkedes"
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:122 lib/strerror-stringprep.c:130 lib/strerror-tld.c:80
msgid "Cannot allocate memory"
msgstr "Kan ikke tildele hukommelse"
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:126
msgid "System dlopen failed"
msgstr "Systemkald til dlopen mislykkedes"
-#: lib/strerror-idna.c:122 lib/strerror-pr29.c:70 lib/strerror-punycode.c:74
-#: lib/strerror-stringprep.c:126 lib/strerror-tld.c:84
+#: lib/strerror-idna.c:130 lib/strerror-pr29.c:78 lib/strerror-punycode.c:82
+#: lib/strerror-stringprep.c:134 lib/strerror-tld.c:92
msgid "Unknown error"
msgstr "Ukendt fejl"
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:70
msgid "String not idempotent under Unicode NFKC normalization"
msgstr "Tekststreng er ikke idempotent under Unicode NFKC-normalisering"
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:70
msgid "Invalid input"
msgstr "Ugyldige inddata"
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:74 lib/strerror-stringprep.c:110
msgid "Output would exceed the buffer space provided"
msgstr "Størrelse på uddata ville overstige tildelt plads i buffer"
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:78
msgid "String size limit exceeded"
msgstr "Grænse for størrelse på tekststreng overskredet"
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:90
msgid "Forbidden unassigned code points in input"
msgstr "Der er forbudte, ikke-tildelte kodepunkter i inddata"
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:94
msgid "Prohibited code points in input"
msgstr "Der er forbudte kodepunkter i inddata"
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:98
msgid "Conflicting bidirectional properties in input"
msgstr "Konflikter mellem tovejsegenskaber i inddata"
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:102
msgid "Malformed bidirectional string"
msgstr "Misdannet tovejstekststreng"
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:106
msgid "Prohibited bidirectional code points in input"
msgstr "Forbudte tovejskodepunkter i inddata"
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:114
msgid "Error in stringprep profile definition"
msgstr "Fejl i definition af stringprep-profil"
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:118
msgid "Flag conflict with profile"
msgstr "Konflikt mellem flag og profil"
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:122
msgid "Unknown profile"
msgstr "Ukendt profil"
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:126
msgid "Unicode normalization failed (internal error)"
msgstr "Normalisering af unicode mislykkedes (intern fejl)"
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:72
msgid "Code points prohibited by top-level domain"
msgstr "Kodepunkter ikke tilladt af top-domæne"
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:76
msgid "Missing input"
msgstr "Manglende inddata"
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:88
msgid "No top-level domain found in input"
msgstr "Fandt ikke et top-domæne i inddata"
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package. Please add _another line_ saying
-#. "Report translation bugs to <...>\n" with the address for translation
-#. bugs (typically your translation team's web or email address).
-#: src/idn.c:68
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <%s>.\n"
-msgstr ""
-"\n"
-"Send fejlrapporter til <%s>.\n"
-
-#: src/idn.c:75
+#: src/idn.c:65
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv \"%s --help\" for yderligere information.\n"
-#: src/idn.c:79
+#: src/idn.c:69
#, c-format
msgid "Usage: %s [OPTION]... [STRINGS]...\n"
msgstr "Brug: %s [TILVALG]... [STRENGE]...\n"
-#: src/idn.c:82
+#: src/idn.c:72
msgid ""
"Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
"\n"
@@ -165,7 +154,7 @@ msgstr ""
"Internationalized Domain Name (IDN) - omdan STRENGE, eller standardinddata.\n"
"\n"
-#: src/idn.c:86
+#: src/idn.c:76
msgid ""
"Command line interface to the internationalized domain name library.\n"
"\n"
@@ -192,7 +181,7 @@ msgstr ""
"Obligatoriske parametre som gælder for langforms-tilvalg er ligeledes\n"
"obligatoriske for kortforms-tilvalg.\n"
-#: src/idn.c:98
+#: src/idn.c:88
msgid ""
" -h, --help Print help and exit\n"
" -V, --version Print version and exit\n"
@@ -202,7 +191,7 @@ msgstr ""
# ACE = ASCII Compatible Encoding
# IDNA = Internationalizing Domain Names in Applications
-#: src/idn.c:102
+#: src/idn.c:92
msgid ""
" -s, --stringprep Prepare string according to nameprep profile\n"
" -d, --punycode-decode Decode Punycode\n"
@@ -216,27 +205,27 @@ msgstr ""
" -a, --idna-to-ascii Omdan til ACE ifølge IDNA (standardtilstand)\n"
" -u, --idna-to-unicode Omdan fra ACE ifølge IDNA\n"
-#: src/idn.c:109
+#: src/idn.c:99
msgid ""
-" --allow-unassigned Toggle IDNA AllowUnassigned flag\n"
-" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag\n"
+" --allow-unassigned Toggle IDNA AllowUnassigned flag (default off)\n"
+" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
msgstr ""
-" --allow-unassigned Slå IDNA AllowUnassigned til/fra\n"
-" --usestd3asciirules Slå IDNA UseSTD3ASCIIRules til/fra\n"
+" --allow-unassigned Slå IDNA AllowUnassigned til/fra (standard fra)\n"
+" --usestd3asciirules Slå IDNA UseSTD3ASCIIRules til/fra (standard
fra)\n"
-#: src/idn.c:113
+#: src/idn.c:103
msgid ""
-" -t, --tld Check string for TLD specific rules\n"
+" --no-tld Don't check string for TLD specific rules\n"
" Only for --idna-to-ascii and --idna-to-unicode\n"
msgstr ""
-" -t, --tld Kontrollér tekststring for TLD-specifikke
regler\n"
+" --no-tld Kontroller ikke tekststring for TLD-specifikke
regler\n"
" Gælder kun --idna-to-ascii og
--idna-to-unicode\n"
-#: src/idn.c:117
+#: src/idn.c:107
msgid " -n, --nfkc Normalize string according to Unicode v3.2
NFKC\n"
msgstr " -n, --nfkc Normalisér tekststreng i.h.t. Unicode v3.2
NFKC\n"
-#: src/idn.c:120
+#: src/idn.c:110
msgid ""
" -p, --profile=STRING Use specified stringprep profile instead\n"
" Valid stringprep profiles: `Nameprep',\n"
@@ -248,7 +237,7 @@ msgstr ""
" \"iSCSI\", \"Nodeprep\", \"Resourceprep\", \n"
" \"trace\", \"SASLprep\"\n"
-#: src/idn.c:126
+#: src/idn.c:116
msgid ""
" --debug Print debugging information\n"
" --quiet Silent operation\n"
@@ -256,12 +245,12 @@ msgstr ""
" --debug Udskriv fejlsøgnings-information\n"
" --quiet Ingen uddata under udførelse\n"
-#: src/idn.c:176
+#: src/idn.c:172
#, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "Kun ét af argumenterne -s, -e, -d, -a, -u eller -n kan angives."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "Kun ét af argumenterne -s, -e, -d, -a, -u eller -n kan angives"
-#: src/idn.c:184
+#: src/idn.c:182
#, c-format
msgid "Charset `%s'.\n"
msgstr "Tegnsæt \"%s\".\n"
@@ -273,19 +262,19 @@ msgstr "Indtast hver streng på en særskilt linje,
afsluttet med et nylinje-teg
#: src/idn.c:202
#, c-format
-msgid "Input error"
-msgstr "Fejl i inddata"
+msgid "input error"
+msgstr "fejl i inddata"
#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
#, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "Kunne ikke omdanne fra %s til UTF-8."
+msgid "could not convert from %s to UTF-8"
+msgstr "kunne ikke omdanne fra %s til UTF-8"
#: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
#: src/idn.c:551
#, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "Kunne ikke omdanne fra UTF-8 til UCS-4."
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "kunne ikke omdanne fra UTF-8 til UCS-4"
#: src/idn.c:237
#, c-format
@@ -294,14 +283,19 @@ msgstr "stringprep_profile: %s"
#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
#, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "Kunne ikke omdanne fra UTF-8 til %s."
+msgid "could not convert from UTF-8 to %s"
+msgstr "kunne ikke omdanne fra UTF-8 til %s"
#: src/idn.c:295
#, c-format
msgid "punycode_encode: %s"
msgstr "punycode_encode: %s"
+#: src/idn.c:317
+#, c-format
+msgid "malloc"
+msgstr "malloc"
+
#: src/idn.c:323
#, c-format
msgid "punycode_decode: %s"
@@ -309,8 +303,8 @@ msgstr "punycode_decode: %s"
#: src/idn.c:340 src/idn.c:364 src/idn.c:442
#, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "Kunne ikke omdanne fra UCS-4 til UTF-8."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "kunne ikke omdanne fra UCS-4 til UTF-8"
#: src/idn.c:381
#, c-format
@@ -339,5 +333,5 @@ msgstr "idna_to_unicode_8z4z: %s"
#: src/idn.c:540
#, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Kunne ikke udføre NFKC-normalisering."
+msgid "could not do NFKC normalization"
+msgstr "kunne ikke udføre NFKC-normalisering"
hooks/post-receive
--
GNU libidn
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU libidn branch, master, updated. libidn-1-30-11-g40c9ae4,
Simon Josefsson <=