From MAILER-DAEMON Sun May 01 11:56:01 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QGZ05-0002Tp-FR
	for mharc-libidn-commit@gnu.org; Sun, 01 May 2011 11:56:01 -0400
Received: from eggs.gnu.org ([140.186.70.92]:53050)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QGZ03-0002Ta-MS
	for libidn-commit@gnu.org; Sun, 01 May 2011 11:56:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QGZ02-0005AD-IG
	for libidn-commit@gnu.org; Sun, 01 May 2011 11:55:59 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:33502)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QGZ02-0005A9-FQ
	for libidn-commit@gnu.org; Sun, 01 May 2011 11:55:58 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QGZ02-00054w-8t
	for libidn-commit@gnu.org; Sun, 01 May 2011 15:55:58 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QGZ02-0003pY-0V
	for libidn-commit@gnu.org; Sun, 01 May 2011 15:55:58 +0000
Date: Sun, 01 May 2011 15:55:58 +0000
Message-Id: <E1QGZ02-0003pY-0V@vcs-noshell.in.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-21-7-gb7d9eb0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5a28dceb8876178a11f8dbb9148aed8e14b4e3a4
X-Git-Newrev: b7d9eb019700f8e311bcc97f325344c437bb665d
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 01 May 2011 15:56:00 -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=b7d9eb019700f8e311bcc97f325344c437bb665d

The branch, master has been updated
       via  b7d9eb019700f8e311bcc97f325344c437bb665d (commit)
      from  5a28dceb8876178a11f8dbb9148aed8e14b4e3a4 (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 b7d9eb019700f8e311bcc97f325344c437bb665d
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sun May 1 17:55:50 2011 +0200

    Improve coverage rule names.  Drop mingw rules (see win32/libidn4win.mk).

-----------------------------------------------------------------------

Summary of changes:
 cfg.mk |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index a841714..44ac0a0 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -59,18 +59,17 @@ update-po: refresh-po
 bootstrap: autoreconf
 	./configure $(CFGFLAGS)
 
-web-coverage:
+# Coverage
+
+coverage-web:
 	rm -fv `find $(htmldir)/coverage -type f | grep -v CVS`
 	cp -rv $(COVERAGE_OUT)/* $(htmldir)/coverage/
 
-upload-web-coverage:
+coverage-web-upload:
 	cd $(htmldir) && \
 		cvs commit -m "Update." coverage
 
-W32ROOT ?= $(HOME)/gnutls4win/inst
-
-mingw32: autoreconf
-	./configure --enable-gtk-doc --host=i586-mingw32msvc --build=`build-aux/config.guess` --prefix=$(W32ROOT)
+# Release
 
 ChangeLog:
 	git2cl > ChangeLog


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Mon May 02 02:44:17 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QGmrh-0004F7-3C
	for mharc-libidn-commit@gnu.org; Mon, 02 May 2011 02:44:17 -0400
Received: from eggs.gnu.org ([140.186.70.92]:50413)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>) id 1QGmre-0004Em-HY
	for libidn-commit@gnu.org; Mon, 02 May 2011 02:44:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>) id 1QGmrd-00043n-1h
	for libidn-commit@gnu.org; Mon, 02 May 2011 02:44:14 -0400
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:46230)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>)
	id 1QGmrb-00043D-Lt; Mon, 02 May 2011 02:44:11 -0400
Received: from lucifer (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.14.4/8.14.4) with SMTP id
	p426i9f5027803; Mon, 2 May 2011 08:44:09 +0200
Message-Id: <201105020644.p426i9f5027803@proliant.st.ewi.tudelft.nl>
Received: by lucifer (sSMTP sendmail emulation);
	Mon, 02 May 2011 08:44:08 +0200
To: libidn-commit@gnu.org, Ludovic Courtès <ludo@gnu.org>
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Subject: Hydra job gnu:libidn-master:tarball build 1065032: Success
X-Hydra-Instance: lucifer
X-Hydra-Project: gnu
X-Hydra-Jobset: libidn-master
X-Hydra-Job: tarball
Date: Mon, 2 May 2011 08:44:08 +0200
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 130.161.158.3
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 May 2011 06:44:15 -0000

Hi,

This is to let you know that Hydra build 1065032 of job gnu:libidn-master:tarball has changed from 'Failed' to 'Success'.

Complete build information can be found on this page: http://hydra.nixos.org/build/1065032

A summary of the build information follows:

Build ID:              | 1065032
Nix name:              | libidn-tarball-0preb7d9eb019700f8e311bcc97f325344c437bb665d
Short description:     | Build of a source distribution from a checkout
Maintainer(s):         | libidn-commit@gnu.org, Ludovic Courtès <ludo@gnu.org>
System:                | x86_64-linux
Derivation store path: | /nix/store/fk87lwip2s2qf7pnxkrgmlv06acq8qln-libidn-tarball-0preb7d9eb019700f8e311bcc97f325344c437bb665d.drv
Output store path:     | /nix/store/lbz5qq53c5hjcflmxqy2a1g7dl8naclp-libidn-tarball-0preb7d9eb019700f8e311bcc97f325344c437bb665d
Time added:            | 2011-05-02 08:44:08
Build started:         | 2011-05-02 08:41:39
Build finished:        | 2011-05-02 08:44:08
Duration:              | 149s

The build inputs were:

Name        | Type | Value
------------+------+-------------------------------------------------------------------------
hydraConfig | svn  | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:27079
nixpkgs     | svn  | https://svn.nixos.org/repos/nix/nixpkgs/trunk:27078
libidnSrc   | git  | git://git.sv.gnu.org/libidn.git:b7d9eb019700f8e311bcc97f325344c437bb665d

Regards,

The Hydra build daemon.


From MAILER-DAEMON Tue May 03 03:34:56 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QHA8G-0000pf-HD
	for mharc-libidn-commit@gnu.org; Tue, 03 May 2011 03:34:56 -0400
Received: from eggs.gnu.org ([140.186.70.92]:40736)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHA8A-0000pB-9D
	for libidn-commit@gnu.org; Tue, 03 May 2011 03:34:52 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHA85-0003gM-PO
	for libidn-commit@gnu.org; Tue, 03 May 2011 03:34:50 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:52352)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHA85-0003gI-NP
	for libidn-commit@gnu.org; Tue, 03 May 2011 03:34:45 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHA85-0007Qa-Dm
	for libidn-commit@gnu.org; Tue, 03 May 2011 07:34:45 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHA84-0007xu-HZ
	for libidn-commit@gnu.org; Tue, 03 May 2011 07:34:45 +0000
Date: Tue, 03 May 2011 07:34:44 +0000
Message-Id: <E1QHA84-0007xu-HZ@vcs-noshell.in.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-21-9-g7649dc2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b7d9eb019700f8e311bcc97f325344c437bb665d
X-Git-Newrev: 7649dc2bb9598e2909692d648de85282fb0c1ddb
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 May 2011 07:34:53 -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=7649dc2bb9598e2909692d648de85282fb0c1ddb

The branch, master has been updated
       via  7649dc2bb9598e2909692d648de85282fb0c1ddb (commit)
       via  4ac381cad6b3eec6198c58ac78047907d5768056 (commit)
      from  b7d9eb019700f8e311bcc97f325344c437bb665d (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 7649dc2bb9598e2909692d648de85282fb0c1ddb
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue May 3 09:33:37 2011 +0200

    libidn: Fix memory leak when idna_to_ascii_4i fails.
    
    Reported by and tiny patch from Olga Limburg <olimburg@gmail.com>.

commit 4ac381cad6b3eec6198c58ac78047907d5768056
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue May 3 09:13:16 2011 +0200

    Update gnulib files.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                          |    6 +
 NEWS                                |    3 +
 THANKS                              |    1 +
 build-aux/vc-list-files             |   14 ++--
 cfg.mk                              |    2 +-
 gl/m4/dup2.m4                       |   17 +++-
 gl/m4/gnulib-comp.m4                |  178 ++++++++++++++--------------------
 gl/m4/manywarnings.m4               |  180 ++++++++++++++++++++++-------------
 gl/m4/stdio_h.m4                    |    4 +-
 gltests/stdlib.in.h                 |    3 +-
 lib/gl/m4/gnulib-comp.m4            |  131 +++++++++++---------------
 lib/gltests/stdlib.in.h             |    3 +-
 lib/idna.c                          |    5 +-
 lib/stringprep.h                    |    2 +-
 maint.mk                            |   16 ++-
 tests/Makefile.am                   |    3 +-
 tests/{tst_toutf8.c => tst_idna4.c} |   44 ++++-----
 17 files changed, 312 insertions(+), 300 deletions(-)
 copy tests/{tst_toutf8.c => tst_idna4.c} (50%)

diff --git a/.gitignore b/.gitignore
index 09fbd60..f67a268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,7 +82,9 @@ doc/reference/html-build.stamp
 doc/reference/html.stamp
 doc/reference/html/
 doc/reference/libidn-decl-list.txt
+doc/reference/libidn-decl-list.txt.bak
 doc/reference/libidn-decl.txt
+doc/reference/libidn-decl.txt.bak
 doc/reference/libidn-overrides.txt
 doc/reference/libidn-sections.txt
 doc/reference/libidn-undeclared.txt
@@ -385,6 +387,7 @@ libidn-*.tar.gz.sig
 libidn.pc
 libtool
 m4/codeset.m4
+m4/fcntl-o.m4
 m4/gettext.m4
 m4/glibc2.m4
 m4/glibc21.m4
@@ -413,6 +416,7 @@ m4/printf-posix.m4
 m4/progtest.m4
 m4/size_max.m4
 m4/stdint_h.m4
+m4/threadlib.m4
 m4/uintmax_t.m4
 m4/visibility.m4
 m4/wchar_t.m4
@@ -460,6 +464,8 @@ tests/tst_idna2
 tests/tst_idna2.o
 tests/tst_idna3
 tests/tst_idna3.o
+tests/tst_idna4
+tests/tst_idna4.o
 tests/tst_nfkc
 tests/tst_nfkc.o
 tests/tst_pr29
diff --git a/NEWS b/NEWS
index 982755b..75b1916 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ See the end for copying conditions.
 ** libidn: Add -liconv as static library requirement in libidn.pc, for MinGW.
 Reported by Volker Grabsch <vog@notjusthosting.com>.
 
+** libidn: Fix memory leak when idna_to_ascii_4i fails.
+Reported by and tiny patch from Olga Limburg <olimburg@gmail.com>.
+
 ** build: Really distribute win32/libidn4win.mk.
 
 ** API and ABI is backwards compatible with the previous version.
diff --git a/THANKS b/THANKS
index bd38273..635dce5 100644
--- a/THANKS
+++ b/THANKS
@@ -96,6 +96,7 @@ Roman Mamedov <rm@romanrm.ru>
 Waqas Hussain <waqas20@gmail.com>
 Guido Trentalancia <guido@trentalancia.com>
 Volker Grabsch <vog@notjusthosting.com>
+Olga Limburg <olimburg@gmail.com>
 
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
index 9bb6fe6..2fced25 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -2,7 +2,7 @@
 # List version-controlled file names.
 
 # Print a version string.
-scriptversion=2010-04-23.22; # UTC
+scriptversion=2011-04-29.20; # UTC
 
 # Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
@@ -94,12 +94,12 @@ elif test -d CVS; then
     eval cvsu --find --types=AFGM '"$dir"' $postprocess
   else
     eval awk -F/ \''{			\
-	if (!$1 && $3 !~ /^-/) {	\
-	  f=FILENAME;			\
-	  if (f ~ /CVS\/Entries$/)	\
-	    f = substr(f, 1, length(f)-11); \
-	  print f $2;			\
-	}}'\''				\
+        if (!$1 && $3 !~ /^-/) {	\
+          f=FILENAME;			\
+          if (f ~ /CVS\/Entries$/)	\
+            f = substr(f, 1, length(f)-11); \
+          print f $2;			\
+        }}'\''				\
       `find "$dir" -name Entries -print` /dev/null' $postprocess
   fi
 elif test -d .svn; then
diff --git a/cfg.mk b/cfg.mk
index 44ac0a0..f0d9c2e 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -29,7 +29,7 @@ local-checks-to-skip = sc_prohibit_strcmp sc_prohibit_have_config_h	\
 	sc_prohibit_HAVE_MBRTOWC sc_program_name sc_trailing_blank	\
 	sc_GPL_version sc_immutable_NEWS
 VC_LIST_ALWAYS_EXCLUDE_REGEX = \
-	^(gtk-doc.make|m4/pkg.m4|doc/specifications|contrib/doxygen/Doxyfile|doc/fdl-1.3.texi|csharp/libidn.*suo|(lib/)?(gl|gltests|build-aux)/)
+	^(maint.mk|gtk-doc.make|m4/pkg.m4|doc/specifications|contrib/doxygen/Doxyfile|doc/fdl-1.3.texi|csharp/libidn.*suo|(lib/)?(gl|gltests|build-aux)/)
 update-copyright-env = UPDATE_COPYRIGHT_HOLDER="Simon Josefsson"
 
 # Explicit syntax-check exceptions.
diff --git a/gl/m4/dup2.m4 b/gl/m4/dup2.m4
index def263b..62e31a8 100644
--- a/gl/m4/dup2.m4
+++ b/gl/m4/dup2.m4
@@ -8,11 +8,17 @@ AC_DEFUN([gl_FUNC_DUP2],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS_ONCE([dup2 fcntl])
-  if test $ac_cv_func_dup2 = no; then
-    HAVE_DUP2=0
-    AC_LIBOBJ([dup2])
-  else
+  m4_ifdef([gl_FUNC_DUP2_OBSOLETE], [
+    AC_CHECK_FUNCS_ONCE([dup2])
+    if test $ac_cv_func_dup2 = no; then
+      HAVE_DUP2=0
+      AC_LIBOBJ([dup2])
+    fi
+  ], [
+    AC_DEFINE([HAVE_DUP2], [1], [Define to 1 if you have the 'dup2' function.])
+  ])
+  AC_CHECK_FUNCS_ONCE([fcntl])
+  if test $HAVE_DUP2 = 1; then
     AC_CACHE_CHECK([whether dup2 works], [gl_cv_func_dup2_works],
       [AC_RUN_IFELSE([
          AC_LANG_PROGRAM([[#include <unistd.h>
@@ -63,6 +69,7 @@ AC_DEFUN([gl_FUNC_DUP2],
 AC_DEFUN([gl_REPLACE_DUP2],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([dup2])
   if test $ac_cv_func_dup2 = yes; then
     REPLACE_DUP2=1
   fi
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index af2cd0d..88181c1 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -130,76 +130,42 @@ AC_DEFUN([gl_INIT],
   m4_pushdef([gl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='gl'
-  # Code from module arg-nonnull:
-  # Code from module autobuild:
-  # Code from module c++defs:
-  # Code from module csharpcomp-script:
-  AC_REQUIRE([gt_CSHARPCOMP])
-  AC_CONFIG_FILES([csharpcomp.sh:build-aux/csharpcomp.sh.in])
-  # Code from module errno:
-  gl_HEADER_ERRNO_H
-  # Code from module error:
-  gl_ERROR
-  m4_ifdef([AM_XGETTEXT_OPTION],
-    [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
-     AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
-  # Code from module extensions:
-  # Code from module fdl-1.3:
-  # Code from module gendocs:
-  # Code from module getopt-gnu:
-  gl_FUNC_GETOPT_GNU
-  gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
-  # Code from module getopt-posix:
-  gl_FUNC_GETOPT_POSIX
-  # Code from module gettext-h:
-  AC_SUBST([LIBINTL])
-  AC_SUBST([LTLIBINTL])
-  # Code from module gnumakefile:
-  # Autoconf 2.61a.99 and earlier don't support linking a file only
-  # in VPATH builds.  But since GNUmakefile is for maintainer use
-  # only, it does not matter if we skip the link with older autoconf.
-  # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
-  # builds, so use a shell variable to bypass this.
-  GNUmakefile=GNUmakefile
-  m4_if(m4_version_compare([2.61a.100],
-  	m4_defn([m4_PACKAGE_VERSION])), [1], [],
-        [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
-  	[GNUmakefile=$GNUmakefile])])
-  # Code from module gnupload:
-  # Code from module gpl-3.0:
-  # Code from module include_next:
-  # Code from module intprops:
-  # Code from module lgpl-2.1:
-  # Code from module maintainer-makefile:
-  AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER],
-    [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])])
-  # Code from module manywarnings:
-  # Code from module pmccabe2html:
-  AC_PATH_PROG([PMCCABE], [pmccabe], [false])
-  # Code from module progname:
-  AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
-  AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
-  # Code from module stdarg:
-  gl_STDARG_H
-  # Code from module stddef:
-  gl_STDDEF_H
-  # Code from module strerror:
-  gl_FUNC_STRERROR
-  gl_STRING_MODULE_INDICATOR([strerror])
-  # Code from module string:
-  gl_HEADER_STRING_H
-  # Code from module unistd:
-  gl_UNISTD_H
-  # Code from module update-copyright:
-  # Code from module useless-if-before-free:
-  # Code from module valgrind-tests:
-  gl_VALGRIND_TESTS
-  # Code from module vc-list-files:
-  # Code from module version-etc:
-  gl_VERSION_ETC
-  # Code from module warn-on-use:
-  # Code from module warnings:
-  AC_SUBST([WARN_CFLAGS])
+AC_REQUIRE([gt_CSHARPCOMP])
+AC_CONFIG_FILES([csharpcomp.sh:build-aux/csharpcomp.sh.in])
+gl_HEADER_ERRNO_H
+gl_ERROR
+m4_ifdef([AM_XGETTEXT_OPTION],
+  [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
+   AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
+gl_FUNC_GETOPT_GNU
+gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
+gl_FUNC_GETOPT_POSIX
+AC_SUBST([LIBINTL])
+AC_SUBST([LTLIBINTL])
+# Autoconf 2.61a.99 and earlier don't support linking a file only
+# in VPATH builds.  But since GNUmakefile is for maintainer use
+# only, it does not matter if we skip the link with older autoconf.
+# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
+# builds, so use a shell variable to bypass this.
+GNUmakefile=GNUmakefile
+m4_if(m4_version_compare([2.61a.100],
+        m4_defn([m4_PACKAGE_VERSION])), [1], [],
+      [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
+        [GNUmakefile=$GNUmakefile])])
+AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER],
+  [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])])
+AC_PATH_PROG([PMCCABE], [pmccabe], [false])
+AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
+AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
+gl_STDARG_H
+gl_STDDEF_H
+gl_FUNC_STRERROR
+gl_STRING_MODULE_INDICATOR([strerror])
+gl_HEADER_STRING_H
+gl_UNISTD_H
+gl_VALGRIND_TESTS
+gl_VERSION_ETC
+AC_SUBST([WARN_CFLAGS])
   # End of code from modules
   m4_ifval(gl_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
@@ -246,42 +212,42 @@ changequote([, ])dnl
   AC_SUBST([gltests_WITNESS])
   gl_module_indicator_condition=$gltests_WITNESS
   m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
-  gl_FUNC_ALLOCA
-  gl_FUNC_DUP2
-  gl_UNISTD_MODULE_INDICATOR([dup2])
-  gl_ENVIRON
-  gl_UNISTD_MODULE_INDICATOR([environ])
-  gl_FCNTL_H
-  AC_REQUIRE([AC_C_INLINE])
-  gl_FUNC_LSTAT
-  gl_SYS_STAT_MODULE_INDICATOR([lstat])
-  gl_FUNC_MALLOC_POSIX
-  gl_STDLIB_MODULE_INDICATOR([malloc-posix])
-  gl_MALLOCA
-  gl_FUNC_OPEN
-  gl_FCNTL_MODULE_INDICATOR([open])
-  gl_PATHMAX
-  gl_FUNC_PUTENV
-  gl_STDLIB_MODULE_INDICATOR([putenv])
-  gl_FUNC_SETENV
-  gl_STDLIB_MODULE_INDICATOR([setenv])
-  gl_FUNC_STAT
-  gl_SYS_STAT_MODULE_INDICATOR([stat])
-  AM_STDBOOL_H
-  gl_STDIO_H
-  gl_STDLIB_H
-  gl_FUNC_SYMLINK
-  gl_UNISTD_MODULE_INDICATOR([symlink])
-  gl_HEADER_SYS_STAT_H
-  AC_PROG_MKDIR_P
-  gl_HEADER_TIME_H
-  gl_FUNC_UNSETENV
-  gl_STDLIB_MODULE_INDICATOR([unsetenv])
-  abs_aux_dir=`cd "$ac_aux_dir"; pwd`
-  AC_SUBST([abs_aux_dir])
-  gl_VALGRIND_TESTS
-  abs_aux_dir=`cd "$ac_aux_dir"; pwd`
-  AC_SUBST([abs_aux_dir])
+gl_FUNC_ALLOCA
+gl_FUNC_DUP2
+gl_UNISTD_MODULE_INDICATOR([dup2])
+gl_ENVIRON
+gl_UNISTD_MODULE_INDICATOR([environ])
+gl_FCNTL_H
+AC_REQUIRE([AC_C_INLINE])
+gl_FUNC_LSTAT
+gl_SYS_STAT_MODULE_INDICATOR([lstat])
+gl_FUNC_MALLOC_POSIX
+gl_STDLIB_MODULE_INDICATOR([malloc-posix])
+gl_MALLOCA
+gl_FUNC_OPEN
+gl_FCNTL_MODULE_INDICATOR([open])
+gl_PATHMAX
+gl_FUNC_PUTENV
+gl_STDLIB_MODULE_INDICATOR([putenv])
+gl_FUNC_SETENV
+gl_STDLIB_MODULE_INDICATOR([setenv])
+gl_FUNC_STAT
+gl_SYS_STAT_MODULE_INDICATOR([stat])
+AM_STDBOOL_H
+gl_STDIO_H
+gl_STDLIB_H
+gl_FUNC_SYMLINK
+gl_UNISTD_MODULE_INDICATOR([symlink])
+gl_HEADER_SYS_STAT_H
+AC_PROG_MKDIR_P
+gl_HEADER_TIME_H
+gl_FUNC_UNSETENV
+gl_STDLIB_MODULE_INDICATOR([unsetenv])
+abs_aux_dir=`cd "$ac_aux_dir"; pwd`
+AC_SUBST([abs_aux_dir])
+gl_VALGRIND_TESTS
+abs_aux_dir=`cd "$ac_aux_dir"; pwd`
+AC_SUBST([abs_aux_dir])
   m4_popdef([gl_MODULE_INDICATOR_CONDITION])
   m4_ifval(gltests_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
diff --git a/gl/m4/manywarnings.m4 b/gl/m4/manywarnings.m4
index e928821..67db064 100644
--- a/gl/m4/manywarnings.m4
+++ b/gl/m4/manywarnings.m4
@@ -35,74 +35,124 @@ AC_DEFUN([gl_MANYWARN_COMPLEMENT],
 # using gl_WARN_ADD if you want to make sure your gcc understands it.
 AC_DEFUN([gl_MANYWARN_ALL_GCC],
 [
- gl_manywarn_set=
- for gl_manywarn_item in \
-   -Wall \
-   -W \
-   -Wformat-y2k \
-   -Wformat-nonliteral \
-   -Wformat-security \
-   -Winit-self \
-   -Wmissing-include-dirs \
-   -Wswitch-default \
-   -Wswitch-enum \
-   -Wunused \
-   -Wunknown-pragmas \
-   -Wstrict-aliasing \
-   -Wstrict-overflow \
-   -Wsystem-headers \
-   -Wfloat-equal \
-   -Wtraditional \
-   -Wtraditional-conversion \
-   -Wdeclaration-after-statement \
-   -Wundef \
-   -Wshadow \
-   -Wunsafe-loop-optimizations \
-   -Wpointer-arith \
-   -Wbad-function-cast \
-   -Wc++-compat \
-   -Wcast-qual \
-   -Wcast-align \
-   -Wwrite-strings \
-   -Wconversion \
-   -Wsign-conversion \
-   -Wlogical-op \
-   -Waggregate-return \
-   -Wstrict-prototypes \
-   -Wold-style-definition \
-   -Wmissing-prototypes \
-   -Wmissing-declarations \
-   -Wmissing-noreturn \
-   -Wmissing-format-attribute \
-   -Wpacked \
-   -Wpadded \
-   -Wredundant-decls \
-   -Wnested-externs \
-   -Wunreachable-code \
-   -Winline \
-   -Winvalid-pch \
-   -Wlong-long \
-   -Wvla \
-   -Wvolatile-register-var \
-   -Wdisabled-optimization \
-   -Wstack-protector \
-   -Woverlength-strings \
-   -Wbuiltin-macro-redefined \
-   -Wmudflap \
-   -Wpacked-bitfield-compat \
-   -Wsync-nand \
-  ; do
+  dnl First, check if -Wno-missing-field-initializers is needed.
+  dnl -Wmissing-field-initializers is implied by -W, but that issues
+  dnl warnings with GCC version before 4.7, for the common idiom
+  dnl of initializing types on the stack to zero, using { 0, }
+  AC_REQUIRE([AC_PROG_CC])
+  if test -n "$GCC"; then
+
+    dnl First, check -W -Werror -Wno-missing-field-initializers is supported
+    dnl with the current $CC $CFLAGS $CPPFLAGS.
+    AC_MSG_CHECKING([whether -Wno-missing-field-initializers is supported])
+    AC_CACHE_VAL([gl_cv_cc_nomfi_supported], [
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -W -Werror -Wno-missing-field-initializers"
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([[]], [[]])],
+        [gl_cv_cc_nomfi_supported=yes],
+        [gl_cv_cc_nomfi_supported=no])
+      CFLAGS="$gl_save_CFLAGS"])
+    AC_MSG_RESULT([$gl_cv_cc_nomfi_supported])
+
+    if test "$gl_cv_cc_nomfi_supported" = yes; then
+      dnl Now check whether -Wno-missing-field-initializers is needed
+      dnl for the { 0, } construct.
+      AC_MSG_CHECKING([whether -Wno-missing-field-initializers is needed])
+      AC_CACHE_VAL([gl_cv_cc_nomfi_needed], [
+        gl_save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS -W -Werror"
+        AC_COMPILE_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[void f (void)
+               {
+                 typedef struct { int a; int b; } s_t;
+                 s_t s1 = { 0, };
+               }
+             ]],
+             [[]])],
+          [gl_cv_cc_nomfi_needed=no],
+          [gl_cv_cc_nomfi_needed=yes])
+        CFLAGS="$gl_save_CFLAGS"
+      ])
+      AC_MSG_RESULT([$gl_cv_cc_nomfi_needed])
+    fi
+  fi
+
+  gl_manywarn_set=
+  for gl_manywarn_item in \
+    -Wall \
+    -W \
+    -Wformat-y2k \
+    -Wformat-nonliteral \
+    -Wformat-security \
+    -Winit-self \
+    -Wmissing-include-dirs \
+    -Wswitch-default \
+    -Wswitch-enum \
+    -Wunused \
+    -Wunknown-pragmas \
+    -Wstrict-aliasing \
+    -Wstrict-overflow \
+    -Wsystem-headers \
+    -Wfloat-equal \
+    -Wtraditional \
+    -Wtraditional-conversion \
+    -Wdeclaration-after-statement \
+    -Wundef \
+    -Wshadow \
+    -Wunsafe-loop-optimizations \
+    -Wpointer-arith \
+    -Wbad-function-cast \
+    -Wc++-compat \
+    -Wcast-qual \
+    -Wcast-align \
+    -Wwrite-strings \
+    -Wconversion \
+    -Wsign-conversion \
+    -Wlogical-op \
+    -Waggregate-return \
+    -Wstrict-prototypes \
+    -Wold-style-definition \
+    -Wmissing-prototypes \
+    -Wmissing-declarations \
+    -Wmissing-noreturn \
+    -Wmissing-format-attribute \
+    -Wpacked \
+    -Wpadded \
+    -Wredundant-decls \
+    -Wnested-externs \
+    -Wunreachable-code \
+    -Winline \
+    -Winvalid-pch \
+    -Wlong-long \
+    -Wvla \
+    -Wvolatile-register-var \
+    -Wdisabled-optimization \
+    -Wstack-protector \
+    -Woverlength-strings \
+    -Wbuiltin-macro-redefined \
+    -Wmudflap \
+    -Wpacked-bitfield-compat \
+    -Wsync-nand \
+    ; do
     gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
   done
- # The following are not documented in the manual but are included in
- # output from gcc --help=warnings.
- for gl_manywarn_item in \
-   -Wattributes \
-   -Wcoverage-mismatch \
-   -Wmultichar \
-   -Wunused-macros \
-  ; do
+  # The following are not documented in the manual but are included in
+  # output from gcc --help=warnings.
+  for gl_manywarn_item in \
+    -Wattributes \
+    -Wcoverage-mismatch \
+    -Wmultichar \
+    -Wunused-macros \
+    ; do
     gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
   done
+
+  # Disable the missing-field-initializers warning if needed
+  if test "$gl_cv_cc_nomfi_needed" = yes; then
+    gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers"
+  fi
+
   $1=$gl_manywarn_set
 ])
diff --git a/gl/m4/stdio_h.m4 b/gl/m4/stdio_h.m4
index 8b013c2..a8326f3 100644
--- a/gl/m4/stdio_h.m4
+++ b/gl/m4/stdio_h.m4
@@ -1,4 +1,4 @@
-# stdio_h.m4 serial 36
+# stdio_h.m4 serial 37
 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -14,8 +14,6 @@ AC_DEFUN([gl_STDIO_H],
   dnl <stdio.h> likely needs them.
   GNULIB_FSCANF=1
   GNULIB_SCANF=1
-  GNULIB_VFSCANF=1
-  GNULIB_VSCANF=1
   GNULIB_FGETC=1
   GNULIB_GETC=1
   GNULIB_GETCHAR=1
diff --git a/gltests/stdlib.in.h b/gltests/stdlib.in.h
index b9ada2c..7513553 100644
--- a/gltests/stdlib.in.h
+++ b/gltests/stdlib.in.h
@@ -81,8 +81,9 @@ struct random_data
 # endif
 #endif
 
-#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
 /* On MacOS X 10.3, only <unistd.h> declares mkstemp.  */
+/* On MacOS X 10.5, only <unistd.h> declares mkstemps.  */
 /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt.  */
 /* But avoid namespace pollution on glibc systems and native Windows.  */
 # include <unistd.h>
diff --git a/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4
index 313c2bf..58a4ff7 100644
--- a/lib/gl/m4/gnulib-comp.m4
+++ b/lib/gl/m4/gnulib-comp.m4
@@ -106,50 +106,27 @@ AC_DEFUN([lgl_INIT],
   m4_pushdef([lgl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='lib/gl'
-  # Code from module arg-nonnull:
-  # Code from module c++defs:
-  # Code from module c-ctype:
-  # Code from module c-strcase:
-  # Code from module extensions:
-  # Code from module gettext-h:
-  AC_SUBST([LIBINTL])
-  AC_SUBST([LTLIBINTL])
-  # Code from module gperf:
-  # Code from module havelib:
-  # Code from module iconv:
-  AM_ICONV
-  m4_ifdef([gl_ICONV_MODULE_INDICATOR],
-    [gl_ICONV_MODULE_INDICATOR([iconv])])
-  # Code from module iconv-h:
-  gl_ICONV_H
-  # Code from module iconv_open:
-  gl_FUNC_ICONV_OPEN
-  # Code from module include_next:
-  # Code from module lib-msvc-compat:
-  gl_LD_OUTPUT_DEF
-  # Code from module lib-symbol-versions:
-  gl_LD_VERSION_SCRIPT
-  # Code from module lib-symbol-visibility:
-  gl_VISIBILITY
-  # Code from module multiarch:
-  gl_MULTIARCH
-  # Code from module stdbool:
-  AM_STDBOOL_H
-  # Code from module stddef:
-  gl_STDDEF_H
-  # Code from module stdint:
-  gl_STDINT_H
-  # Code from module striconv:
-  if test $gl_cond_libtool = false; then
-    gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
-    gl_libdeps="$gl_libdeps $LIBICONV"
-  fi
-  # Code from module string:
-  gl_HEADER_STRING_H
-  # Code from module strverscmp:
-  gl_FUNC_STRVERSCMP
-  gl_STRING_MODULE_INDICATOR([strverscmp])
-  # Code from module warn-on-use:
+AC_SUBST([LIBINTL])
+AC_SUBST([LTLIBINTL])
+AM_ICONV
+m4_ifdef([gl_ICONV_MODULE_INDICATOR],
+  [gl_ICONV_MODULE_INDICATOR([iconv])])
+gl_ICONV_H
+gl_FUNC_ICONV_OPEN
+gl_LD_OUTPUT_DEF
+gl_LD_VERSION_SCRIPT
+gl_VISIBILITY
+gl_MULTIARCH
+AM_STDBOOL_H
+gl_STDDEF_H
+gl_STDINT_H
+if test $gl_cond_libtool = false; then
+  gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
+  gl_libdeps="$gl_libdeps $LIBICONV"
+fi
+gl_HEADER_STRING_H
+gl_FUNC_STRVERSCMP
+gl_STRING_MODULE_INDICATOR([strverscmp])
   # End of code from modules
   m4_ifval(lgl_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([lgl_LIBSOURCES_DIR])[ ||
@@ -196,39 +173,39 @@ changequote([, ])dnl
   AC_SUBST([lgltests_WITNESS])
   gl_module_indicator_condition=$lgltests_WITNESS
   m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
-  gl_FUNC_ALLOCA
-  gt_LOCALE_FR
-  gt_LOCALE_TR_UTF8
-  gl_ENVIRON
-  gl_UNISTD_MODULE_INDICATOR([environ])
-  gl_LOCALE_H
-  AC_CHECK_FUNCS_ONCE([newlocale])
-  gl_LOCALENAME
-  AC_CHECK_FUNCS_ONCE([newlocale])
-  gl_LOCK
-  gl_FUNC_MALLOC_POSIX
-  gl_STDLIB_MODULE_INDICATOR([malloc-posix])
-  gl_MALLOCA
-  gl_FUNC_PUTENV
-  gl_STDLIB_MODULE_INDICATOR([putenv])
-  gl_FUNC_SETENV
-  gl_STDLIB_MODULE_INDICATOR([setenv])
-  gl_FUNC_SETLOCALE
-  gl_LOCALE_MODULE_INDICATOR([setlocale])
-  gt_LOCALE_FR
-  gt_LOCALE_FR_UTF8
-  gt_LOCALE_JA
-  gt_LOCALE_ZH_CN
-  gt_TYPE_WCHAR_T
-  gt_TYPE_WINT_T
-  gl_STDLIB_H
-  gl_THREAD
-  gl_THREADLIB
-  gl_UNISTD_H
-  gl_FUNC_UNSETENV
-  gl_STDLIB_MODULE_INDICATOR([unsetenv])
-  gl_WCHAR_H
-  gl_YIELD
+gl_FUNC_ALLOCA
+gt_LOCALE_FR
+gt_LOCALE_TR_UTF8
+gl_ENVIRON
+gl_UNISTD_MODULE_INDICATOR([environ])
+gl_LOCALE_H
+AC_CHECK_FUNCS_ONCE([newlocale])
+gl_LOCALENAME
+AC_CHECK_FUNCS_ONCE([newlocale])
+gl_LOCK
+gl_FUNC_MALLOC_POSIX
+gl_STDLIB_MODULE_INDICATOR([malloc-posix])
+gl_MALLOCA
+gl_FUNC_PUTENV
+gl_STDLIB_MODULE_INDICATOR([putenv])
+gl_FUNC_SETENV
+gl_STDLIB_MODULE_INDICATOR([setenv])
+gl_FUNC_SETLOCALE
+gl_LOCALE_MODULE_INDICATOR([setlocale])
+gt_LOCALE_FR
+gt_LOCALE_FR_UTF8
+gt_LOCALE_JA
+gt_LOCALE_ZH_CN
+gt_TYPE_WCHAR_T
+gt_TYPE_WINT_T
+gl_STDLIB_H
+gl_THREAD
+gl_THREADLIB
+gl_UNISTD_H
+gl_FUNC_UNSETENV
+gl_STDLIB_MODULE_INDICATOR([unsetenv])
+gl_WCHAR_H
+gl_YIELD
   m4_popdef([gl_MODULE_INDICATOR_CONDITION])
   m4_ifval(lgltests_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([lgltests_LIBSOURCES_DIR])[ ||
diff --git a/lib/gltests/stdlib.in.h b/lib/gltests/stdlib.in.h
index b9ada2c..7513553 100644
--- a/lib/gltests/stdlib.in.h
+++ b/lib/gltests/stdlib.in.h
@@ -81,8 +81,9 @@ struct random_data
 # endif
 #endif
 
-#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
 /* On MacOS X 10.3, only <unistd.h> declares mkstemp.  */
+/* On MacOS X 10.5, only <unistd.h> declares mkstemps.  */
 /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt.  */
 /* But avoid namespace pollution on glibc systems and native Windows.  */
 # include <unistd.h>
diff --git a/lib/idna.c b/lib/idna.c
index e666439..906faa5 100644
--- a/lib/idna.c
+++ b/lib/idna.c
@@ -508,7 +508,10 @@ idna_to_ascii_4z (const uint32_t * input, char **output, int flags)
 	{
 	  rc = idna_to_ascii_4i (start, (size_t) (end - start), buf, flags);
 	  if (rc != IDNA_SUCCESS)
-	    return rc;
+	    {
+	      free (out);
+	      return rc;
+	    }
 	}
 
       if (out)
diff --git a/lib/stringprep.h b/lib/stringprep.h
index 6e51961..e2542a7 100644
--- a/lib/stringprep.h
+++ b/lib/stringprep.h
@@ -44,7 +44,7 @@ extern "C"
 {
 # endif
 
-# define STRINGPREP_VERSION "1.21"
+# define STRINGPREP_VERSION "1.22"
 
 /* Error codes. */
   typedef enum
diff --git a/maint.mk b/maint.mk
index 07a7773..8727b3f 100644
--- a/maint.mk
+++ b/maint.mk
@@ -33,7 +33,6 @@ GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
 
 GIT = git
 VC = $(GIT)
-VC-tag = git tag -s -m '$(VERSION)' 'v$(VERSION)' -u '$(gpg_key_ID)'
 
 VC_LIST = $(build_aux)/vc-list-files -C $(srcdir)
 
@@ -942,16 +941,23 @@ update-NEWS-hash: NEWS
 # Ensure that we use only the standard $(VAR) notation,
 # not @...@ in Makefile.am, now that we can rely on automake
 # to emit a definition for each substituted variable.
-# We use perl rather than "grep -nE ..." to exempt a single
-# use of an @...@-delimited variable name in src/Makefile.am.
+# However, there is still one case in which @VAR@ use is not just
+# legitimate, but actually required: when augmenting an automake-defined
+# variable with a prefix.  For example, gettext uses this:
+# MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
+# otherwise, makeinfo would put German or French (current locale)
+# navigation hints in the otherwise-English documentation.
+#
 # Allow the package to add exceptions via a hook in cfg.mk;
 # for example, @PRAGMA_SYSTEM_HEADER@ can be permitted by
 # setting this to ' && !/PRAGMA_SYSTEM_HEADER/'.
 _makefile_at_at_check_exceptions ?=
 sc_makefile_at_at_check:
-	@perl -ne '/\@[A-Z_0-9]+\@/'$(_makefile_at_at_check_exceptions)	\
+	@perl -ne '/\@[A-Z_0-9]+\@/'					\
+          -e ' && !/([A-Z_0-9]+)\s+=.*\@\1\@$$/'			\
+          -e ''$(_makefile_at_at_check_exceptions)			\
 	  -e 'and (print "$$ARGV:$$.: $$_"), $$m=1; END {exit !$$m}'	\
-	    $$($(VC_LIST_EXCEPT) | grep -E '(^|/)Makefile\.am$$')	\
+	    $$($(VC_LIST_EXCEPT) | grep -E '(^|/)(Makefile\.am|[^/]+\.mk)$$') \
 	  && { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :
 
 news-check: NEWS
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 29c1efe..5bdaf04 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,8 @@ check_LIBRARIES = libutils.a
 libutils_a_SOURCES = utils.h utils.c
 
 ctests = tst_stringprep tst_punycode tst_idna tst_idna2 tst_idna3	\
-	tst_nfkc tst_pr29 tst_strerror tst_toutf8 tst_symbols
+	tst_idna4 tst_nfkc tst_pr29 tst_strerror tst_toutf8		\
+	tst_symbols
 if TLD
 ctests += tst_tld
 endif
diff --git a/tests/tst_toutf8.c b/tests/tst_idna4.c
similarity index 50%
copy from tests/tst_toutf8.c
copy to tests/tst_idna4.c
index 99289a7..8ec69fb 100644
--- a/tests/tst_toutf8.c
+++ b/tests/tst_idna4.c
@@ -1,6 +1,5 @@
-/* tst_toutf8.c --- Self tests for UTF-8 conversion functions.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+/* tst_idna4.c --- Self tests for memory leak regression.
+ * Copyright (C) 2011 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
@@ -28,33 +27,26 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include <stringprep.h>
+#include <idna.h>
+#include <idn-free.h>
 
 #include "utils.h"
 
 void
 doit (void)
 {
-  char *p;
-  const char *q;
-
-  q = stringprep_locale_charset ();
-  if (q == NULL)
-    fail ("FAIL: stringprep_locale_charset == NULL\n");
-  if (debug)
-    printf ("PASS: stringprep_locale_charset == %s\n", q);
-
-  p = stringprep_locale_to_utf8 ("foo");
-  if (!p || memcmp (p, "foo", 4) != 0)
-    fail ("FAIL: stringprep_locale_to_utf8(\"foo\") == %s\n", p);
-  if (debug)
-    printf ("PASS: stringprep_locale_to_utf8(\"foo\") == %s\n", p);
-  free (p);
-
-  p = stringprep_utf8_to_locale ("foo");
-  if (!p || memcmp (p, "foo", 4) != 0)
-    fail ("FAIL: stringprep_utf8_to_locale(\"foo\") == %s\n", p);
-  if (debug)
-    printf ("PASS: stringprep_utf8_to_locale(\"foo\") == %s\n", p);
-  free (p);
+  int rc;
+  char *out = NULL;
+
+  rc = idna_to_ascii_8z("search...", &out, 0);
+  if (rc != IDNA_INVALID_LENGTH)
+    fail ("unexpected rc %d\n", rc);
+
+  rc = idna_to_ascii_8z("google.com................point", &out, 0);
+  if (rc != IDNA_INVALID_LENGTH)
+    fail ("unexpected rc %d\n", rc);
+
+  rc = idna_to_ascii_8z("Loading...°°°°°°°°°°°°°°]", &out, 0);
+  if (rc != IDNA_INVALID_LENGTH)
+    fail ("unexpected rc %d\n", rc);
 }


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Wed May 04 14:40:40 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QHh04-0004mX-6G
	for mharc-libidn-commit@gnu.org; Wed, 04 May 2011 14:40:40 -0400
Received: from eggs.gnu.org ([140.186.70.92]:53949)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHh01-0004hD-Tn
	for libidn-commit@gnu.org; Wed, 04 May 2011 14:40:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHh00-0007AR-23
	for libidn-commit@gnu.org; Wed, 04 May 2011 14:40:37 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:50610)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHh00-0007AM-0O
	for libidn-commit@gnu.org; Wed, 04 May 2011 14:40:36 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHgzz-0006qC-Ji
	for libidn-commit@gnu.org; Wed, 04 May 2011 18:40:35 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHgzz-0005Pm-FI
	for libidn-commit@gnu.org; Wed, 04 May 2011 18:40:35 +0000
Date: Wed, 04 May 2011 18:40:35 +0000
Message-Id: <E1QHgzz-0005Pm-FI@vcs-noshell.in.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-21-13-gfc88e80
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7649dc2bb9598e2909692d648de85282fb0c1ddb
X-Git-Newrev: fc88e8024de9c5dee992fabd1316124b2a4e5d02
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2011 18:40:39 -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=fc88e8024de9c5dee992fabd1316124b2a4e5d02

The branch, master has been updated
       via  fc88e8024de9c5dee992fabd1316124b2a4e5d02 (commit)
       via  4a6756337bad5f7e0e3da80587b0248d86a0b710 (commit)
       via  c44b1d7ae5949f544841de43aefdc1ba0d131058 (commit)
       via  00abe824ec272c7cd00a0371317499195f79bde4 (commit)
      from  7649dc2bb9598e2909692d648de85282fb0c1ddb (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 fc88e8024de9c5dee992fabd1316124b2a4e5d02
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 4 20:40:02 2011 +0200

    Generated.

commit 4a6756337bad5f7e0e3da80587b0248d86a0b710
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 4 20:35:32 2011 +0200

    Version 1.22.

commit c44b1d7ae5949f544841de43aefdc1ba0d131058
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 4 20:25:29 2011 +0200

    dev: Ran clang-analyze on the code.
    
    Fixed some dead assignments/initializations.

commit 00abe824ec272c7cd00a0371317499195f79bde4
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 4 19:42:55 2011 +0200

    Doc fix.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog  |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NEWS       |    7 +++++--
 cfg.mk     |   14 ++++++++++++++
 lib/idna.c |   11 +++++------
 lib/nfkc.c |    7 ++-----
 5 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31f610d..69ef23d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+2011-05-04  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS: Version 1.22.
+
+2011-05-04  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, cfg.mk, lib/idna.c, lib/nfkc.c: dev: Ran clang-analyze on
+	the code.  Fixed some dead assignments/initializations.
+
+2011-05-04  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS: Doc fix.
+
+2011-05-03  Simon Josefsson <simon@josefsson.org>
+
+	* .gitignore, NEWS, THANKS, lib/idna.c, lib/stringprep.h,
+	tests/Makefile.am, tests/tst_idna4.c: libidn: Fix memory leak when
+	idna_to_ascii_4i fails.  Reported by and tiny patch from Olga Limburg <olimburg@gmail.com>.
+
+2011-05-03  Simon Josefsson <simon@josefsson.org>
+
+	* build-aux/vc-list-files, cfg.mk, gl/m4/dup2.m4,
+	gl/m4/gnulib-comp.m4, gl/m4/manywarnings.m4, gl/m4/stdio_h.m4,
+	gltests/stdlib.in.h, lib/gl/m4/gnulib-comp.m4,
+	lib/gltests/stdlib.in.h, maint.mk: Update gnulib files.
+
+2011-05-01  Simon Josefsson <simon@josefsson.org>
+
+	* cfg.mk: Improve coverage rule names.  Drop mingw rules (see
+	win32/libidn4win.mk).
+
+2011-04-28  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, THANKS, libidn.pc.in: libidn: Add -liconv as static library
+	requirement in libidn.pc, for MinGW.  Reported by Volker Grabsch <vog@notjusthosting.com>.
+
+2011-04-25  Simon Josefsson <simon@josefsson.org>
+
+	* THANKS, doc/libidn.texi: Document --disable-valgrind-tests.  Suggested by Guido Trentalancia <guido@trentalancia.com>.
+
+2011-04-24  Simon Josefsson <simon@josefsson.org>
+
+	* doc/announce.txt: Update for 1.21.
+
+2011-04-24  Simon Josefsson <simon@josefsson.org>
+
+	* win32/libidn4win.mk: Fix.
+
+2011-04-24  Simon Josefsson <simon@josefsson.org>
+
+	* Makefile.am, NEWS: build: Really distribute win32/libidn4win.mk.
+
+2011-04-24  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, configure.ac: Bump version.
+
+2011-04-24  Simon Josefsson <simon@josefsson.org>
+
+	* ChangeLog: Generated.
+
 2011-04-24  Simon Josefsson <simon@josefsson.org>
 
 	* NEWS: Version 1.21.
diff --git a/NEWS b/NEWS
index 75b1916..c9f1f17 100644
--- a/NEWS
+++ b/NEWS
@@ -2,14 +2,17 @@ Libidn NEWS -- History of user-visible changes.                 -*- outline -*-
 Copyright (C) 2002-2011 Simon Josefsson
 See the end for copying conditions.
 
-* Version 1.22 (unreleased) [?]
+* Version 1.22 (released 2011-05-04) [stable]
 
 ** libidn: Add -liconv as static library requirement in libidn.pc, for MinGW.
 Reported by Volker Grabsch <vog@notjusthosting.com>.
 
-** libidn: Fix memory leak when idna_to_ascii_4i fails.
+** libidn: Fix memory leak in idna_to_ascii_4z when idna_to_ascii_4i fails.
 Reported by and tiny patch from Olga Limburg <olimburg@gmail.com>.
 
+** libidn: Ran clang-analyze on the code.
+Fixed some dead assignments/initializations.
+
 ** build: Really distribute win32/libidn4win.mk.
 
 ** API and ABI is backwards compatible with the previous version.
diff --git a/cfg.mk b/cfg.mk
index f0d9c2e..22eeb16 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -69,6 +69,20 @@ coverage-web-upload:
 	cd $(htmldir) && \
 		cvs commit -m "Update." coverage
 
+# Clang analyzis.
+clang:
+	make clean
+	scan-build ./configure
+	rm -rf scan.tmp
+	scan-build -o scan.tmp make
+clang-web:
+	rm -fv `find $(htmldir)/clang-analyzer -type f | grep -v CVS`
+	cp -rv scan.tmp/*/* $(htmldir)/clang-analyzer/
+clang-web-upload:
+	cd $(htmldir) && \
+		cvs add clang-analyzer/*.html || true && \
+		cvs commit -m "Update." clang-analyzer
+
 # Release
 
 ChangeLog:
diff --git a/lib/idna.c b/lib/idna.c
index 906faa5..e875d3e 100644
--- a/lib/idna.c
+++ b/lib/idna.c
@@ -461,7 +461,7 @@ int
 idna_to_ascii_4z (const uint32_t * input, char **output, int flags)
 {
   const uint32_t *start = input;
-  const uint32_t *end = input;
+  const uint32_t *end;
   char buf[64];
   char *out = NULL;
   int rc;
@@ -624,12 +624,11 @@ int
 idna_to_unicode_4z4z (const uint32_t * input, uint32_t ** output, int flags)
 {
   const uint32_t *start = input;
-  const uint32_t *end = input;
+  const uint32_t *end;
   uint32_t *buf;
   size_t buflen;
   uint32_t *out = NULL;
   size_t outlen = 0;
-  int rc;
 
   *output = NULL;
 
@@ -645,9 +644,9 @@ idna_to_unicode_4z4z (const uint32_t * input, uint32_t ** output, int flags)
       if (!buf)
 	return IDNA_MALLOC_ERROR;
 
-      rc = idna_to_unicode_44i (start, (size_t) (end - start),
-				buf, &buflen, flags);
-      /* don't check rc as per specification! */
+      /* don't check return code as per specification! */
+      idna_to_unicode_44i (start, (size_t) (end - start),
+			   buf, &buflen, flags);
 
       if (out)
 	{
diff --git a/lib/nfkc.c b/lib/nfkc.c
index d5ccf48..8f4c079 100644
--- a/lib/nfkc.c
+++ b/lib/nfkc.c
@@ -814,11 +814,8 @@ _g_utf8_normalize_wc (const gchar * str, gssize max_len, GNormalizeMode mode)
     }
 
   if (n_wc > 0)
-    {
-      g_unicode_canonical_ordering (wc_buffer + last_start,
-				    n_wc - last_start);
-      last_start = n_wc;
-    }
+    g_unicode_canonical_ordering (wc_buffer + last_start,
+				  n_wc - last_start);
 
   wc_buffer[n_wc] = 0;
 


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Wed May 04 14:40:42 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QHh06-0004oS-8y
	for mharc-libidn-commit@gnu.org; Wed, 04 May 2011 14:40:42 -0400
Received: from eggs.gnu.org ([140.186.70.92]:53960)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHh03-0004kl-Be
	for libidn-commit@gnu.org; Wed, 04 May 2011 14:40:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHh02-0007Ai-Go
	for libidn-commit@gnu.org; Wed, 04 May 2011 14:40:39 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:50611)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHh02-0007Ae-EW
	for libidn-commit@gnu.org; Wed, 04 May 2011 14:40:38 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHh02-0006qF-BP
	for libidn-commit@gnu.org; Wed, 04 May 2011 18:40:38 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHh02-0005R6-6k
	for libidn-commit@gnu.org; Wed, 04 May 2011 18:40:38 +0000
Date: Wed, 04 May 2011 18:40:38 +0000
Message-Id: <E1QHh02-0005R6-6k@vcs-noshell.in.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn annotated tag, libidn-1-22, created. libidn-1-22
X-Git-Refname: refs/tags/libidn-1-22
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 25de04bcbcce6f3d68706ea0bd668f000cae1fd0
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2011 18:40:40 -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=25de04bcbcce6f3d68706ea0bd668f000cae1fd0

The annotated tag, libidn-1-22 has been created
        at  25de04bcbcce6f3d68706ea0bd668f000cae1fd0 (tag)
   tagging  fc88e8024de9c5dee992fabd1316124b2a4e5d02 (commit)
  replaces  libidn-1-21
 tagged by  Simon Josefsson
        on  Wed May 4 20:40:02 2011 +0200

- Log -----------------------------------------------------------------
1.22
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iO4EAAECADgFAk3BnYIxFIAAAAAAFQATcGthLWFkZHJlc3NAZ251cGcub3Jnc2lt
b25Aam9zZWZzc29uLm9yZwAKCRDtoh6UtWVxb3zoBQCNkuKC7ZU/eKSCdcFScT/v
ahaLxckZPnRFbpDiewi0b5H5mAYVMR4k/eHaiLLjw8RPL5XOUMeDIdAZxLe7/TaB
D1lapfmNll+FvLnJVzcQz5I9EhGrKEVIX7vZ6hXq5QZISK1m2dxx8fY9RUdOH6x8
6wf2RpKU5cvYBYewCKETNveLOZZB2c3YBzZg66We7pv/cCt09vGNuPfFMpxoPJGH
=iFcv
-----END PGP SIGNATURE-----

Simon Josefsson (13):
      Bump version.
      build: Really distribute win32/libidn4win.mk.
      Fix.
      Update for 1.21.
      Document --disable-valgrind-tests.
      libidn: Add -liconv as static library requirement in libidn.pc, for MinGW.
      Improve coverage rule names.  Drop mingw rules (see win32/libidn4win.mk).
      Update gnulib files.
      libidn: Fix memory leak when idna_to_ascii_4i fails.
      Doc fix.
      dev: Ran clang-analyze on the code.
      Version 1.22.
      Generated.

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Wed May 04 16:20:40 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QHiYq-0006gW-9h
	for mharc-libidn-commit@gnu.org; Wed, 04 May 2011 16:20:40 -0400
Received: from eggs.gnu.org ([140.186.70.92]:34919)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHiYn-0006gQ-Tu
	for libidn-commit@gnu.org; Wed, 04 May 2011 16:20:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHiYm-0008Ed-RE
	for libidn-commit@gnu.org; Wed, 04 May 2011 16:20:37 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:40987)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHiYm-0008EX-Pd
	for libidn-commit@gnu.org; Wed, 04 May 2011 16:20:36 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHiYm-000816-6n
	for libidn-commit@gnu.org; Wed, 04 May 2011 20:20:36 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHiYm-0003ta-26
	for libidn-commit@gnu.org; Wed, 04 May 2011 20:20:36 +0000
Date: Wed, 04 May 2011 20:20:36 +0000
Message-Id: <E1QHiYm-0003ta-26@vcs-noshell.in.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-22-1-g7508dd5
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fc88e8024de9c5dee992fabd1316124b2a4e5d02
X-Git-Newrev: 7508dd5dd90b4933ec342297057b519997507de8
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2011 20:20:38 -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=7508dd5dd90b4933ec342297057b519997507de8

The branch, master has been updated
       via  7508dd5dd90b4933ec342297057b519997507de8 (commit)
      from  fc88e8024de9c5dee992fabd1316124b2a4e5d02 (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 7508dd5dd90b4933ec342297057b519997507de8
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 4 22:20:31 2011 +0200

    Bump versions.

-----------------------------------------------------------------------

Summary of changes:
 NEWS             |    4 ++++
 configure.ac     |    4 ++--
 lib/stringprep.h |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index c9f1f17..999b4e6 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ Libidn NEWS -- History of user-visible changes.                 -*- outline -*-
 Copyright (C) 2002-2011 Simon Josefsson
 See the end for copying conditions.
 
+* Version 1.23 (unreleased) [?]
+
+** API and ABI is backwards compatible with the previous version.
+
 * Version 1.22 (released 2011-05-04) [stable]
 
 ** libidn: Add -liconv as static library requirement in libidn.pc, for MinGW.
diff --git a/configure.ac b/configure.ac
index 8dbdb66..caadeef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([GNU Libidn], [1.22], [bug-libidn@gnu.org])
+AC_INIT([GNU Libidn], [1.23], [bug-libidn@gnu.org])
 AC_COPYRIGHT([Copyright (c) 2002-2011 Simon Josefsson <simon@josefsson.org>.])
 
 # Library code modified:                              REVISION++
@@ -27,7 +27,7 @@ AC_COPYRIGHT([Copyright (c) 2002-2011 Simon Josefsson <simon@josefsson.org>.])
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
 AC_SUBST(LT_CURRENT, 17)
-AC_SUBST(LT_REVISION, 5)
+AC_SUBST(LT_REVISION, 6)
 AC_SUBST(LT_AGE, 6)
 
 # For DEF file.
diff --git a/lib/stringprep.h b/lib/stringprep.h
index e2542a7..9fcc068 100644
--- a/lib/stringprep.h
+++ b/lib/stringprep.h
@@ -44,7 +44,7 @@ extern "C"
 {
 # endif
 
-# define STRINGPREP_VERSION "1.22"
+# define STRINGPREP_VERSION "1.23"
 
 /* Error codes. */
   typedef enum


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Wed May 04 17:05:22 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QHjG6-0006QY-Nj
	for mharc-libidn-commit@gnu.org; Wed, 04 May 2011 17:05:22 -0400
Received: from eggs.gnu.org ([140.186.70.92]:50796)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHjG3-0006QC-Jt
	for libidn-commit@gnu.org; Wed, 04 May 2011 17:05:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHjG1-0007WR-U3
	for libidn-commit@gnu.org; Wed, 04 May 2011 17:05:19 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:60615)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHjG1-0007WL-RE
	for libidn-commit@gnu.org; Wed, 04 May 2011 17:05:17 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHjG1-00005d-AO
	for libidn-commit@gnu.org; Wed, 04 May 2011 21:05:17 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHjG1-0005y0-32
	for libidn-commit@gnu.org; Wed, 04 May 2011 21:05:17 +0000
Date: Wed, 04 May 2011 21:05:17 +0000
Message-Id: <E1QHjG1-0005y0-32@vcs-noshell.in.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-22-2-gacba907
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7508dd5dd90b4933ec342297057b519997507de8
X-Git-Newrev: acba907a5861ae21dd72f3cd330407cadf8d1440
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2011 21:05:20 -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=acba907a5861ae21dd72f3cd330407cadf8d1440

The branch, master has been updated
       via  acba907a5861ae21dd72f3cd330407cadf8d1440 (commit)
      from  7508dd5dd90b4933ec342297057b519997507de8 (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 acba907a5861ae21dd72f3cd330407cadf8d1440
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 4 23:05:06 2011 +0200

    Update for 1.22.

-----------------------------------------------------------------------

Summary of changes:
 doc/announce.txt |   58 ++++++++++++++++++++++++++---------------------------
 1 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/doc/announce.txt b/doc/announce.txt
index 3da7af8..eff9117 100644
--- a/doc/announce.txt
+++ b/doc/announce.txt
@@ -1,5 +1,5 @@
 To: help-libidn@gnu.org, info-gnu@gnu.org
-Subject: Libidn 1.21 released
+Subject: Libidn 1.22 released
 <#part sign=pgpmime>
 GNU Libidn is a fully documented implementation of the Stringprep,
 Punycode and IDNA specifications.  Libidn's purpose is to encode and
@@ -9,17 +9,18 @@ version 2.1 or later.
 
 Noteworthy changes since the last release (from NEWS file):
 
-* Version 1.21 (released 2011-04-24) [stable]
+* Version 1.22 (released 2011-05-04) [stable]
 
-** build/gettext: Demand gettext >= 0.18.1 in order to get newer M4 files.
-The old M4 files associated with 0.17 caused problems on Solaris,
-hopefully now fixed.  Reported by Dagobert Michelsen <dam@opencsw.org>
-in <http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/25522>.
+** libidn: Add -liconv as static library requirement in libidn.pc, for MinGW.
+Reported by Volker Grabsch <vog@notjusthosting.com>.
 
-** build: Improve MinGW cross-compile makefile, see win32/libidn4win.mk.
+** libidn: Fix memory leak in idna_to_ascii_4z when idna_to_ascii_4i fails.
+Reported by and tiny patch from Olga Limburg <olimburg@gmail.com>.
 
-** build: Visual Studio files fixed to define LIBIDN_BUILDING.
-Tiny patch from Waqas Hussain <waqas20@gmail.com>.
+** libidn: Ran clang-analyze on the code.
+Fixed some dead assignments/initializations.
+
+** build: Really distribute win32/libidn4win.mk.
 
 ** API and ABI is backwards compatible with the previous version.
 
@@ -76,39 +77,36 @@ JavaDoc output for the Java API:
 
 If you need help to use Libidn, or want to help others, you are
 invited to join our help-libidn mailing list, see:
-<http://lists.gnu.org/mailman/listinfo/help-libidn>.
+  http://lists.gnu.org/mailman/listinfo/help-libidn
 
-Here are the compressed sources (3.2MB):
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.21.tar.gz
-  http://ftp.gnu.org/gnu/libidn/libidn-1.21.tar.gz
+Here are the compressed sources (3.3MB):
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22.tar.gz
+  http://ftp.gnu.org/gnu/libidn/libidn-1.22.tar.gz
 
 Here are GPG detached signatures:
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.21.tar.gz.sig
-  http://ftp.gnu.org/gnu/libidn/libidn-1.21.tar.gz.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22.tar.gz.sig
+  http://ftp.gnu.org/gnu/libidn/libidn-1.22.tar.gz.sig
 
 Here are the SHA-1 and SHA-224 signatures:
 
-991d5d4e24118d7672d53ed692a8a6ab87212f8f  libidn-1.21.tar.gz
-
-869fbfb08f55a6350bf83217176ba3f927eda7fb20348133162e818c  libidn-1.21.tar.gz
+8358e897c24d534438f6b5694c25e85889d860c3  libidn-1.22.tar.gz
+72a452464252655803331e744c7ea3b5a06f88cc33b2c310377fe040  libidn-1.22.tar.gz
 
 We also provide Windows binaries built using MinGW-w64 with the build
 script win32/libidn4win.mk, for 32-bit and 64-bit x86 architecures:
 
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.21-win32.zip
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.21-win32.zip.sig
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.21-win64.zip
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.21-win64.zip.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22-win32.zip
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22-win32.zip.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22-win64.zip
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22-win64.zip.sig
 
 Here are the SHA-1 and SHA-224 signatures:
 
-be2a73cc60ae4b539fd3e658e21ba985824d1f02  libidn-1.21-win32.zip
-
-6f39fe3fedf27774945b0fece60921a0e147f95e72284c81543aaa82  libidn-1.21-win32.zip
-
-11fbcd142e824babc9088009dbfca71e3f4fbe2b  libidn-1.21-win64.zip
+eccd416edb3ce60573da5c8264df77b780d00a80  libidn-1.22-win32.zip
+57d64a348a2b3a8782e729ecad1f8e10d1b721ec1196e1ca0a8ca5d3  libidn-1.22-win32.zip
 
-b0f5bcd7a306a6f8a87a68baf8603deefe71e1197fc46cffcfb05ef8  libidn-1.21-win64.zip
+b7b138a1c146e64aa6d6047786766a849237732d  libidn-1.22-win64.zip
+ddaa613848bbdc37199dfa3c9b4c04f77db8d506427213f55cee4934  libidn-1.22-win64.zip
 
 The software is cryptographically signed by the author using an
 OpenPGP key identified by the following information:
@@ -116,7 +114,6 @@ OpenPGP key identified by the following information:
 pub   1280R/B565716F 2002-05-05 [expires: 2012-01-24]
       Key fingerprint = 0424 D4EE 81A0 E3D1 19C6  F835 EDA2 1E94 B565 716F
 uid                  Simon Josefsson <simon@josefsson.org>
-uid                  Simon Josefsson <jas@extundo.com>
 sub   1280R/4D5D40AE 2002-05-05 [expires: 2012-01-24]
 
 The key is available from:
@@ -129,8 +126,9 @@ Here are the build reports for various platforms:
 Daily builds of the package are available from:
   http://daily.josefsson.org/libidn/
 
-For code coverage and cyclomatic code complexity charts:
+Code coverage, clang-analyzer output, and cyclomatic code complexity charts:
   http://www.gnu.org/software/libidn/coverage/
+  http://www.gnu.org/software/libidn/clang-analyzer/
   http://www.gnu.org/software/libidn/cyclo/cyclo-libidn.html
 
 Happy hacking,


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Thu May 05 01:58:29 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QHra1-0007CG-Qa
	for mharc-libidn-commit@gnu.org; Thu, 05 May 2011 01:58:29 -0400
Received: from eggs.gnu.org ([140.186.70.92]:36846)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHrZu-0007AT-0E
	for libidn-commit@gnu.org; Thu, 05 May 2011 01:58:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHrZn-0006GH-4I
	for libidn-commit@gnu.org; Thu, 05 May 2011 01:58:21 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:60698)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHrZm-0006G5-VZ
	for libidn-commit@gnu.org; Thu, 05 May 2011 01:58:15 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHrZm-00068D-B7
	for libidn-commit@gnu.org; Thu, 05 May 2011 05:58:14 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHrZl-0002Wn-I3
	for libidn-commit@gnu.org; Thu, 05 May 2011 05:58:14 +0000
Date: Thu, 05 May 2011 05:58:13 +0000
Message-Id: <E1QHrZl-0002Wn-I3@vcs-noshell.in.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-22-4-gdf400d4
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: acba907a5861ae21dd72f3cd330407cadf8d1440
X-Git-Newrev: df400d4501e3ce89e86812fd49da64a1f62bbffc
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 May 2011 05:58:28 -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=df400d4501e3ce89e86812fd49da64a1f62bbffc

The branch, master has been updated
       via  df400d4501e3ce89e86812fd49da64a1f62bbffc (commit)
       via  ce5c0cc0b1239ca9f324819d2cc364fd38693d93 (commit)
      from  acba907a5861ae21dd72f3cd330407cadf8d1440 (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 df400d4501e3ce89e86812fd49da64a1f62bbffc
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu May 5 07:58:01 2011 +0200

    Update translations.

commit ce5c0cc0b1239ca9f324819d2cc364fd38693d93
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu May 5 07:56:56 2011 +0200

    Sync with TP.

-----------------------------------------------------------------------

Summary of changes:
 NEWS           |    2 +
 po/LINGUAS     |    1 +
 po/cs.po.in    |  208 +++++++++++++++++------------------
 po/de.po.in    |  178 +++++++++++++++---------------
 po/fi.po.in    |  198 ++++++++++++++++-----------------
 po/nl.po.in    |  208 ++++++++++++++++++-----------------
 po/pl.po.in    |  183 +++++++++++++++----------------
 po/uk.po.in    |  332 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/zh_CN.po.in |  190 ++++++++++++++++----------------
 9 files changed, 909 insertions(+), 591 deletions(-)
 create mode 100644 po/uk.po.in

diff --git a/NEWS b/NEWS
index 999b4e6..2023144 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ See the end for copying conditions.
 
 * Version 1.23 (unreleased) [?]
 
+** Update translations.
+
 ** API and ABI is backwards compatible with the previous version.
 
 * Version 1.22 (released 2011-05-04) [stable]
diff --git a/po/LINGUAS b/po/LINGUAS
index 7d6b991..27686a9 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -13,5 +13,6 @@ nl
 pl
 ro
 sr
+uk
 vi
 zh_CN
diff --git a/po/cs.po.in b/po/cs.po.in
index dce0ce1..f3cf89e 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -1,163 +1,150 @@
 # Czech translation for libidn.
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libidn package.
-# Petr Pisar <petr.pisar@atlas.cz>, 2007, 2008
+# Petr Pisar <petr.pisar@atlas.cz>, 2007, 2008, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.21\n"
 "Report-Msgid-Bugs-To: bug-libidn@gnu.org\n"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2008-07-03 08:28+0200\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-28 20:24+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
 msgid "Success"
 msgstr "Úspěch"
 
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
 msgid "String preparation failed"
 msgstr "Příprava řetězce selhala"
 
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
 msgid "Punycode failed"
 msgstr "Punycode selhal"
 
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
 msgid "Non-digit/letter/hyphen in input"
 msgstr "Znak jiný než číslice/písmeno/spojovník na vstupu"
 
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
 msgid "Forbidden leading or trailing minus sign (`-')"
 msgstr "Zakázaný úvodní nebo závěrečný spojovník („-“)"
 
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
 msgid "Output would be too large or too small"
 msgstr "Výstup by byl příliš dlouhý nebo příliš krátký"
 
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
 msgid "Input does not start with ACE prefix (`xn--')"
-msgstr "Vstup nezačíná předponou ACE („xn--“)"
+msgstr "Vstup nezačíná předponou ACE („xn--“)"
 
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
 msgid "String not idempotent under ToASCII"
 msgstr "Řetězec není po ToASCII idempotentní"
 
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
 msgid "Input already contain ACE prefix (`xn--')"
-msgstr "Vstup již obsahuje předponu ACE („xn--“)"
+msgstr "Vstup již obsahuje předponu ACE („xn--“)"
 
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
 msgid "System iconv failed"
 msgstr "Selhal systémový iconv"
 
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
 msgid "Cannot allocate memory"
 msgstr "Nelze vyhradit paměť"
 
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
 msgid "System dlopen failed"
 msgstr "Selhalo volání systému dlopen"
 
-#: 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:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
 msgid "String not idempotent under Unicode NFKC normalization"
-msgstr "Řetězec není po unicodové NFKC normalizaci idempotentní"
+msgstr "Řetězec není po unicodové NFKC normalizaci idempotentní"
 
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
 msgid "Invalid input"
 msgstr "Neplatný vstup"
 
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
 msgid "Output would exceed the buffer space provided"
 msgstr "Výstup by se nevešel do poskytnuté vyrovnávací paměti"
 
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
 msgid "String size limit exceeded"
 msgstr "Omezení délky řetězce bylo překonáno"
 
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
 msgid "Forbidden unassigned code points in input"
 msgstr "Na vstupu zakázaná nepřiřazená ordinární čísla"
 
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
 msgid "Prohibited code points in input"
 msgstr "Na vstupu zakázaná ordinární čísla"
 
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
 msgid "Conflicting bidirectional properties in input"
 msgstr "Na vstupu rozporné příkazy pro směr textu"
 
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
 msgid "Malformed bidirectional string"
 msgstr "Chybně utvořený obousměrný řetězec"
 
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
 msgid "Prohibited bidirectional code points in input"
 msgstr "Na vstupu zakázaná ordinární čísla pro obousměrný text"
 
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
 msgid "Error in stringprep profile definition"
 msgstr "Chyba v definici profilu pro stringprep"
 
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
 msgid "Flag conflict with profile"
 msgstr "Příznak neslučitelný s profilem"
 
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
 msgid "Unknown profile"
 msgstr "Neznámý profil"
 
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
 msgid "Unicode normalization failed (internal error)"
 msgstr "Unicodová normalizace selhala (vnitřní chyba)"
 
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
 msgid "Code points prohibited by top-level domain"
 msgstr "Ordinární čísla zakázaná vrcholovou doménou"
 
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
 msgid "Missing input"
 msgstr "Postrádám vstup"
 
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
 msgid "No top-level domain found in input"
 msgstr "Ve vstupu chybí vrcholová doména"
 
-#. 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"
-"Chyby programu hlaste na <%s> (pouze anglicky),\n"
-"chyby překladu na <translation-team-cs@lists.sourceforge.net> (česky).\n"
-
-#: src/idn.c:75
-#, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Další informace získáte příkazem „%s --help“.\n"
 
-#: src/idn.c:79
+#: src/idn.c:72
 #, c-format
 msgid "Usage: %s [OPTION]... [STRINGS]...\n"
 msgstr "Použití: %s [PŘEPÍNAČ]… [ŘETĚZEC]…\n"
 
-#: src/idn.c:82
+#: src/idn.c:75
 msgid ""
 "Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
 "\n"
@@ -165,7 +152,7 @@ msgstr ""
 "IDN (internacionalizovaná doménová jména) převádí ŘETĚZCE nebo standardní vstup.\n"
 "\n"
 
-#: src/idn.c:86
+#: src/idn.c:79
 msgid ""
 "Command line interface to the internationalized domain name library.\n"
 "\n"
@@ -191,7 +178,7 @@ msgstr ""
 "Povinné argumenty dlouhých přepínačů jsou rovněž povinné u odpovídajících\n"
 "krátkých přepínačů.\n"
 
-#: src/idn.c:98
+#: src/idn.c:91
 msgid ""
 "  -h, --help               Print help and exit\n"
 "  -V, --version            Print version and exit\n"
@@ -199,7 +186,7 @@ msgstr ""
 "  -h, --help               Vypíše nápovědu a skončí\n"
 "  -V, --version            Vypíše verzi a skončí\n"
 
-#: src/idn.c:102
+#: src/idn.c:95
 msgid ""
 "  -s, --stringprep         Prepare string according to nameprep profile\n"
 "  -d, --punycode-decode    Decode Punycode\n"
@@ -213,27 +200,29 @@ msgstr ""
 "  -a, --idna-to-ascii      Převede do ACE podle IDNA (implicitní režim)\n"
 "  -u, --idna-to-unicode    Převede z ACE podle IDNA\n"
 
-#: src/idn.c:109
+#: src/idn.c:102
 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   Přepne příznak IDNA AllowUnassigned\n"
-"      --usestd3asciirules  Přepne příznak IDNA UseSTD3ASCIIRules\n"
+"      --allow-unassigned   Přepne příznak IDNA AllowUnassigned (implicitně\n"
+"                           vypnut)\n"
+"      --usestd3asciirules  Přepne příznak IDNA UseSTD3ASCIIRules (implicitně\n"
+"                           vypnut)\n"
 
-#: src/idn.c:113
+#: src/idn.c:106
 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                Zkontroluje řetězec podle pravidel pro TLD.\n"
+"      --no-tld             Nekontroluje řetězec podle pravidel dané TLD.\n"
 "                           Jen u --idna-to-ascii a --idna-to-unicode\n"
 
-#: src/idn.c:117
+#: src/idn.c:110
 msgid "  -n, --nfkc               Normalize string according to Unicode v3.2 NFKC\n"
 msgstr "  -n, --nfkc               Normalizuje řetězec podle Unicode v3.2 NFKC\n"
 
-#: src/idn.c:120
+#: src/idn.c:113
 msgid ""
 "  -p, --profile=STRING     Use specified stringprep profile instead\n"
 "                             Valid stringprep profiles: `Nameprep',\n"
@@ -245,7 +234,7 @@ msgstr ""
 "                           „iSCSI“, „Nodeprep“, „Resourceprep“, „trace“ a \n"
 "                           „SASLprep“\n"
 
-#: src/idn.c:126
+#: src/idn.c:119
 msgid ""
 "      --debug              Print debugging information\n"
 "      --quiet              Silent operation\n"
@@ -253,91 +242,103 @@ msgstr ""
 "      --debug              Vypíše ladicí informace\n"
 "      --quiet              Pracuje potichu\n"
 
-#: src/idn.c:176
+#: src/idn.c:175
 #, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "Pouze jeden přepínač z -s, -e, -d, -a, -u nebo -n smí být zadán."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "Pouze jeden přepínač z -s, -e, -d, -a, -u nebo -n smí být zadán."
 
-#: src/idn.c:184
+#: src/idn.c:185
 #, c-format
 msgid "Charset `%s'.\n"
 msgstr "Znaková sada „%s“.\n"
 
-#: src/idn.c:187
+#: src/idn.c:190
 #, c-format
 msgid "Type each input string on a line by itself, terminated by a newline character.\n"
 msgstr "Pište po jednom vstupním řetězci na jednom řádku zakončeným znakem nového řádku.\n"
 
-#: src/idn.c:202
+#: src/idn.c:205
 #, c-format
-msgid "Input error"
-msgstr "Chyba na vstupu"
+msgid "input error"
+msgstr "chyba na vstupu"
 
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
 #, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "Nelze převést z %s do UTF-8."
+msgid "could not convert from %s to UTF-8"
+msgstr "nelze převést z %s do 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
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
 #, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "Nelze převést z UTF-8 do UCS-4."
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "nelze převést z UTF-8 do UCS-4"
 
-#: src/idn.c:237
+#: src/idn.c:240
 #, c-format
 msgid "stringprep_profile: %s"
 msgstr "stringprep_profile (profil pro přípravu řetězce): %s"
 
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
 #, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "Z UTF-8 do %s nelze převést."
+msgid "could not convert from UTF-8 to %s"
+msgstr "nelze převést z UTF-8 do %s"
 
-#: src/idn.c:295
+#: src/idn.c:298
 #, c-format
 msgid "punycode_encode: %s"
-msgstr "punycode_encode (zakódování do Punycodu): %s"
+msgstr "punycode_encode (zakódování do Punycodu): %s"
+
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc"
 
-#: src/idn.c:323
+#: src/idn.c:326
 #, c-format
 msgid "punycode_decode: %s"
-msgstr "punycode_decode (dekódování Punycodu): %s"
+msgstr "punycode_decode (dekódování Punycodu): %s"
 
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
 #, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "Nelze převést z UCS-4 do UTF-8."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "nelze převést z UCS-4 do UTF-8"
 
-#: src/idn.c:381
+#: src/idn.c:384
 #, c-format
 msgid "idna_to_ascii_4z: %s"
 msgstr "idna_to_ascii_4z: %s"
 
-#: src/idn.c:395
+#: src/idn.c:398
 #, c-format
 msgid "idna_to_unicode_8z4z (TLD): %s"
 msgstr "idna_to_unicode_8z4z (TLD): %s"
 
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
 #, c-format
 msgid "tld_check_4z (position %lu): %s"
 msgstr "tld_check_4z (pozice %lu): %s"
 
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
 #, c-format
 msgid "tld_check_4z: %s"
 msgstr "tld_check_4z: %s"
 
-#: src/idn.c:461
+#: src/idn.c:464
 #, c-format
 msgid "idna_to_unicode_8z4z: %s"
 msgstr "idna_to_unicode_8z4z: %s"
 
-#: src/idn.c:540
+#: src/idn.c:543
 #, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Normalizaci do NFKC nebylo možné provézt"
+msgid "could not do NFKC normalization"
+msgstr "nebylo možné znormalizovat do NFKC"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Chyby programu hlaste na <%s> (pouze anglicky),\n"
+#~ "chyby překladu na <translation-team-cs@lists.sourceforge.net> (česky).\n"
 
 #~ msgid "input[%lu] = U+%04x\n"
 #~ msgstr "vstup[%lu] = U+%04x\n"
@@ -345,9 +346,6 @@ msgstr "Normalizaci do NFKC nebylo možné provézt"
 #~ msgid "output[%lu] = U+%04x\n"
 #~ msgstr "výstup[%lu] = U+%04x\n"
 
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
 #~ msgid "tld[%lu] = U+%04x\n"
 #~ msgstr "vrcholová_doména[%lu] = U+%04x\n"
 
diff --git a/po/de.po.in b/po/de.po.in
index 7cf0c25..7135419 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -3,162 +3,150 @@
 # This file is distributed under the same license as the libidn package.
 # Roland Illig <roland.illig@gmx.de>, 2004.
 # Roland Illig <roland.illig@gmx.de>, 2009.
+# Roland Illig <roland.illig@gmx.de>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.21\n"
 "Report-Msgid-Bugs-To: bug-libidn@gnu.org\n"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2009-11-08 23:34+0100\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-05-02 18:51+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\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:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
 msgid "Success"
 msgstr "Erfolg"
 
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
 msgid "String preparation failed"
 msgstr "String-Vorbereitung fehlgeschlagen"
 
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
 msgid "Punycode failed"
 msgstr "Punycode fehlgeschlagen"
 
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
 msgid "Non-digit/letter/hyphen in input"
 msgstr "Unerlaubtes Zeichen in der Eingabe"
 
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
 msgid "Forbidden leading or trailing minus sign (`-')"
 msgstr "Verbotenes Minuszeichen am Anfang oder am Ende"
 
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
 msgid "Output would be too large or too small"
 msgstr "Ergebnis wäre zu groß oder zu klein"
 
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
 msgid "Input does not start with ACE prefix (`xn--')"
 msgstr "Eingabe beginnt nicht mit dem ACE-Präfix (»xn--«)"
 
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
 msgid "String not idempotent under ToASCII"
 msgstr "String verändert sich durch ToASCII"
 
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
 msgid "Input already contain ACE prefix (`xn--')"
 msgstr "Eingabe enthält bereits das ACE-Präfix (»xn--«)"
 
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
 msgid "System iconv failed"
 msgstr "System-iconv fehlgeschlagen"
 
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
 msgid "Cannot allocate memory"
 msgstr "Nicht genug Speicher"
 
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
 msgid "System dlopen failed"
 msgstr "System-dlopen fehlgeschlagen"
 
-#: 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:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
 msgid "String not idempotent under Unicode NFKC normalization"
 msgstr "String verändert sich durch Unicode-NFKC-Normalisierung"
 
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
 msgid "Invalid input"
 msgstr "Ungültige Eingabe"
 
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
 msgid "Output would exceed the buffer space provided"
 msgstr "Ausgabe würde den vorhandenen Pufferspeicher überfluten"
 
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
 msgid "String size limit exceeded"
 msgstr "String-Größenbegrenzung überschritten"
 
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
 msgid "Forbidden unassigned code points in input"
 msgstr "Verbotene unzugeordnete Codepunkte in der Eingabe"
 
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
 msgid "Prohibited code points in input"
 msgstr "Verbotene Codepunkte in der Eingabe"
 
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
 msgid "Conflicting bidirectional properties in input"
 msgstr "Widersprüchliche bidirektional-Eigenschaften in der Eingabe"
 
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
 msgid "Malformed bidirectional string"
 msgstr "Ungültiger Bidirektional-String"
 
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
 msgid "Prohibited bidirectional code points in input"
 msgstr "Verbotene bidirektionale Codepunkte in der Eingabe"
 
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
 msgid "Error in stringprep profile definition"
 msgstr "Fehler in der Stringprep-Profildefinition"
 
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
 msgid "Flag conflict with profile"
 msgstr "Flag-Konflikt mit dem Profil"
 
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
 msgid "Unknown profile"
 msgstr "Unbekanntes Profil"
 
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
 msgid "Unicode normalization failed (internal error)"
 msgstr "Unicode-Normalisierung fehlgeschlagen (Interner Fehler)"
 
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
 msgid "Code points prohibited by top-level domain"
 msgstr "Codepunkte sind von der Top-Level-Domain verboten"
 
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
 msgid "Missing input"
 msgstr "Fehlende Eingabe"
 
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
 msgid "No top-level domain found in input"
 msgstr "Keine Top-Level-Domain in der Eingabe gefunden"
 
-#. 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"
-"Melden Sie Fehler an <%s>.\n"
-"Melden Sie Übersetzungsfehler an <translation-team-de@lists.sourceforge.net>.\n"
-
-#: src/idn.c:75
-#, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Versuchen Sie »%s --help« für mehr Informationen.\n"
 
-#: src/idn.c:79
+#: src/idn.c:72
 #, c-format
 msgid "Usage: %s [OPTION]... [STRINGS]...\n"
 msgstr "Aufruf: %s [OPTION]... [STRINGS]...\n"
 
-#: src/idn.c:82
+#: src/idn.c:75
 msgid ""
 "Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
 "\n"
@@ -166,7 +154,7 @@ msgstr ""
 "Internationalized Domain Name (IDN) konvertiert STRINGS oder die Standardeingabe.\n"
 "\n"
 
-#: src/idn.c:86
+#: src/idn.c:79
 msgid ""
 "Command line interface to the internationalized domain name library.\n"
 "\n"
@@ -193,7 +181,7 @@ msgstr ""
 "Notwendige Argumente für die langen Optionen gelten genau so für die\n"
 "kurzen Optionen.\n"
 
-#: src/idn.c:98
+#: src/idn.c:91
 msgid ""
 "  -h, --help               Print help and exit\n"
 "  -V, --version            Print version and exit\n"
@@ -201,7 +189,7 @@ msgstr ""
 "  -h, --help               Hilfe ausgeben und beenden\n"
 "  -V, --version            Version ausgeben und beenden\n"
 
-#: src/idn.c:102
+#: src/idn.c:95
 msgid ""
 "  -s, --stringprep         Prepare string according to nameprep profile\n"
 "  -d, --punycode-decode    Decode Punycode\n"
@@ -215,27 +203,27 @@ msgstr ""
 "  -a, --idna-to-ascii      Gemäß IDNA in ACE konvertieren (Standardmodus)\n"
 "  -u, --idna-to-unicode    Gemäß IDNA aus ACE heraus konvertieren\n"
 
-#: src/idn.c:109
+#: src/idn.c:102
 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   Option \"IDNA AllowUnassigned\" umschalten\n"
-"      --usestd3asciirules  Option \"IDNA UseSTD3ASCIIRules\" umschalten\n"
+"      --allow-unassigned   Option \"IDNA AllowUnassigned\" umschalten (Vorgabe: aus)\n"
+"      --usestd3asciirules  Option \"IDNA UseSTD3ASCIIRules\" umschalten (Vorgabe: aus)\n"
 
-#: src/idn.c:113
+#: src/idn.c:106
 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                String auf TLD-spezifische Regeln überprüfen\n"
+"      --no-tld             String nicht auf TLD-spezifische Regeln überprüfen\n"
 "                             Nur für --idna-to-ascii und --idna-to-unicode\n"
 
-#: src/idn.c:117
+#: src/idn.c:110
 msgid "  -n, --nfkc               Normalize string according to Unicode v3.2 NFKC\n"
 msgstr "  -n, --nfkc               String gemäß Unicode v3.2 NFKC normalisieren\n"
 
-#: src/idn.c:120
+#: src/idn.c:113
 msgid ""
 "  -p, --profile=STRING     Use specified stringprep profile instead\n"
 "                             Valid stringprep profiles: `Nameprep',\n"
@@ -247,7 +235,7 @@ msgstr ""
 "                             `iSCSI', `Nodeprep', `Resourceprep', \n"
 "                             `trace', `SASLprep'\n"
 
-#: src/idn.c:126
+#: src/idn.c:119
 msgid ""
 "      --debug              Print debugging information\n"
 "      --quiet              Silent operation\n"
@@ -255,92 +243,104 @@ msgstr ""
 "      --debug              Debugging-Informationen ausgeben\n"
 "      --quiet              Ruhig arbeiten\n"
 
-#: src/idn.c:176
+#: src/idn.c:175
 #, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
 msgstr "Nur eins von »-s«, »-e«, »-d«, »-a«, »-u« oder »-n« kann angegeben werden."
 
-#: src/idn.c:184
+#: src/idn.c:185
 #, c-format
 msgid "Charset `%s'.\n"
 msgstr "Zeichensatz »%s«.\n"
 
-#: src/idn.c:187
+#: src/idn.c:190
 #, c-format
 msgid "Type each input string on a line by itself, terminated by a newline character.\n"
 msgstr "Geben Sie jede Eingabezeichenkette in einer eigenen Zeile ein, durch einen Zeilenumbruch abgeschlossen.\n"
 
-#: src/idn.c:202
+#: src/idn.c:205
 #, c-format
-msgid "Input error"
+msgid "input error"
 msgstr "Eingabefehler"
 
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
 #, c-format
-msgid "Could not convert from %s to UTF-8."
+msgid "could not convert from %s to UTF-8"
 msgstr "Konnte nicht von %s nach UTF-8 konvertieren."
 
-#: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
-#: src/idn.c:551
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
 #, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
+msgid "could not convert from UTF-8 to UCS-4"
 msgstr "Konnte nicht von UTF-8 nach UCS-4 konvertieren."
 
-#: src/idn.c:237
+#: src/idn.c:240
 #, c-format
 msgid "stringprep_profile: %s"
 msgstr "stringprep_profile: %s"
 
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
 #, c-format
-msgid "Could not convert from UTF-8 to %s."
+msgid "could not convert from UTF-8 to %s"
 msgstr "Konnte nicht von UTF-8 nach %s konvertieren."
 
-#: src/idn.c:295
+#: src/idn.c:298
 #, c-format
 msgid "punycode_encode: %s"
 msgstr "punycode_encode: %s"
 
-#: src/idn.c:323
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc"
+
+#: src/idn.c:326
 #, c-format
 msgid "punycode_decode: %s"
 msgstr "punycode_decode: %s"
 
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
 #, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
+msgid "could not convert from UCS-4 to UTF-8"
 msgstr "Konnte nicht von UCS-4 nach UTF-8 konvertieren."
 
-#: src/idn.c:381
+#: src/idn.c:384
 #, c-format
 msgid "idna_to_ascii_4z: %s"
 msgstr "idna_to_ascii_4z: %s"
 
-#: src/idn.c:395
+#: src/idn.c:398
 #, c-format
 msgid "idna_to_unicode_8z4z (TLD): %s"
 msgstr "idna_to_unicode_8z4z (TLD): %s"
 
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
 #, c-format
 msgid "tld_check_4z (position %lu): %s"
 msgstr "tld_check_4z (position %lu): %s"
 
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
 #, c-format
 msgid "tld_check_4z: %s"
 msgstr "tld_check_4z: %s"
 
-#: src/idn.c:461
+#: src/idn.c:464
 #, c-format
 msgid "idna_to_unicode_8z4z: %s"
 msgstr "idna_to_unicode_8z4z: %s"
 
-#: src/idn.c:540
+#: src/idn.c:543
 #, c-format
-msgid "Could not do NFKC normalization."
+msgid "could not do NFKC normalization"
 msgstr "Konnte die NFKC-Normalisierung nicht ausführen."
 
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Melden Sie Fehler an <%s>.\n"
+#~ "Melden Sie Übersetzungsfehler an <translation-team-de@lists.sourceforge.net>.\n"
+
 #~ msgid "%s: fgets() failed: "
 #~ msgstr "%s: fgets() fehlgeschlagen: "
 
diff --git a/po/fi.po.in b/po/fi.po.in
index 7725124..9caadca 100644
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -1,171 +1,158 @@
 # translation of libidn-1.9.pot to Finnish
-# Copyright © 2008, 2009 Free Software Foundation, Inc.
+# Copyright © 2008, 2009, 2011 Free Software Foundation, Inc.
 # Copyright © 2007 Simon Josefsson
 # This file is distributed under the same license as the libidn package.
 # Jorma Karvonen <karvjorm@users.sf.net>, 2008.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.21\n"
 "Report-Msgid-Bugs-To: bug-libidn@gnu.org\n"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2009-09-30 00:44+0200\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-30 15:25+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
+"Language: fi\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: KBabel 1.11.4\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:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
 msgid "Success"
 msgstr "Onnistui"
 
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
 msgid "String preparation failed"
 msgstr "Merkkijonon valmistelu ei onnistunut"
 
 #  Wikipedia: Punycode is a computer programming encoding syntax by which a Unicode string of characters can be translated into the more-limited character set permitted in network host names.
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
 msgid "Punycode failed"
 msgstr "Punycode-koodaus ei onnistunut"
 
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
 msgid "Non-digit/letter/hyphen in input"
 msgstr "Syötteessä on merkki, joka ei ole numero/kirjain/tavuviiva"
 
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
 msgid "Forbidden leading or trailing minus sign (`-')"
 msgstr "Ei saa alkaa tai loppua miinusmerkillä (”-”)"
 
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
 msgid "Output would be too large or too small"
 msgstr "Tuloste olisi liian suuri tai liian pieni"
 
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
 msgid "Input does not start with ACE prefix (`xn--')"
 msgstr "Syöte ei ala ACE-prefiksillä (”xn--”)"
 
 #  Yksinkertaisesti selitettynä idempotentti on matemaattinen termi, joka tarkoittaa, että jonkun toiminnon tulos on aina sama kun toiminto toistetaan kahdesti (tai useammin).
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
 msgid "String not idempotent under ToASCII"
 msgstr "Merkkijono ei ole idempotentti ToASCII-toiminnon aikana"
 
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
 msgid "Input already contain ACE prefix (`xn--')"
 msgstr "Syöte jo sisältää ACE-prefiksin (”xn--”)"
 
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
 msgid "System iconv failed"
 msgstr "Järjestelmän iconv-käsky ei onnistunut"
 
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
 msgid "Cannot allocate memory"
 msgstr "Ei voida varata muistia"
 
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
 msgid "System dlopen failed"
 msgstr "Järjestelmän dlopen-käsky ei onnistunut"
 
-#: 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:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
 msgid "String not idempotent under Unicode NFKC normalization"
 msgstr "Merkkijono ei ole idempotentti Unicode NFKC-normeerauksen aikana"
 
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
 msgid "Invalid input"
 msgstr "Virheellinen syöte"
 
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
 msgid "Output would exceed the buffer space provided"
 msgstr "Tuloste ylittäisi varatun puskurin tilan"
 
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
 msgid "String size limit exceeded"
 msgstr "Merkkijonon koko ylitettiin"
 
 #  Code point is any value in the Unicode codespace; that is, the range of integers from 0 to hexadecimal 10FFFF.
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
 msgid "Forbidden unassigned code points in input"
 msgstr "Kiellettyjä määräämättömiä code points-skalaariarvoja syötteessä"
 
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
 msgid "Prohibited code points in input"
 msgstr "Kiellettyjä code points-skalaariarvoja syötteessä"
 
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
 msgid "Conflicting bidirectional properties in input"
 msgstr "Ristiriitaisia kaksisuuntaisia ominaisuuksia syötteessä"
 
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
 msgid "Malformed bidirectional string"
 msgstr "Väärän muotoinen kaksisuuntainen merkkijono"
 
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
 msgid "Prohibited bidirectional code points in input"
 msgstr "Kiellettyjä kaksisuuntaisia code points-skalaariarvoja syötteessä"
 
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
 msgid "Error in stringprep profile definition"
 msgstr "Virhe strngprep-profiilimäärittelyssä"
 
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
 msgid "Flag conflict with profile"
 msgstr "Lippu ristiriidassa profiilin kanssa"
 
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
 msgid "Unknown profile"
 msgstr "Tuntematon profiili"
 
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
 msgid "Unicode normalization failed (internal error)"
 msgstr "Unicode-normeeraus ei onnistunut (sisäinen virhe)"
 
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
 msgid "Code points prohibited by top-level domain"
 msgstr "Code points-skalaariarvot kiellettyjä ylätason toimialueessa"
 
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
 msgid "Missing input"
 msgstr "Syöte puuttuu"
 
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
 msgid "No top-level domain found in input"
 msgstr "Syötteestä ei löytynyt ylätason toimialuetta"
 
-#. 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"
-"Ilmoita virheistä osoitteeseen <%s>.\n"
-"Ilmoita käännösvirheistä osoitteeseen <translation-team-fi@lists.sourceforge.net>.\n"
-
-#: src/idn.c:75
-#, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Lisätietoja käskyllä ”%s --help”.\n"
 
-#: src/idn.c:79
+#: src/idn.c:72
 #, c-format
 msgid "Usage: %s [OPTION]... [STRINGS]...\n"
 msgstr "Käyttö: %s [VALITSIN]... [MERKKIJONOT]...\n"
 
 #  convert -> converts ?
-#: src/idn.c:82
+#: src/idn.c:75
 msgid ""
 "Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
 "\n"
@@ -173,7 +160,7 @@ msgstr ""
 "Kansainvälistetty verkkotunnus (IDN) muuntaa MERKKIJONOT tai vakiosyötteen.\n"
 "\n"
 
-#: src/idn.c:86
+#: src/idn.c:79
 msgid ""
 "Command line interface to the internationalized domain name library.\n"
 "\n"
@@ -200,7 +187,7 @@ msgstr ""
 "Pakolliset argumentit pitkille valitsimille ovat pakollisia myös lyhyille\n"
 "valitsimille.\n"
 
-#: src/idn.c:98
+#: src/idn.c:91
 msgid ""
 "  -h, --help               Print help and exit\n"
 "  -V, --version            Print version and exit\n"
@@ -208,7 +195,7 @@ msgstr ""
 "  -h, --help               Tulosta ohje ja poistu\n"
 "  -V, --version            Tulosta versio ja poistu\n"
 
-#: src/idn.c:102
+#: src/idn.c:95
 msgid ""
 "  -s, --stringprep         Prepare string according to nameprep profile\n"
 "  -d, --punycode-decode    Decode Punycode\n"
@@ -222,27 +209,27 @@ msgstr ""
 "  -a, --idna-to-ascii      Muunna ACE-koodiksi IDNA-koodista (oletustila)\n"
 "  -u, --idna-to-unicode    Muunna ACE-koodista IDNA-koodiksi\n"
 
-#: src/idn.c:109
+#: src/idn.c:102
 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   Vaihda ”IDNA AllowUnassigned”-lipun tilaa\n"
-"      --usestd3asciirules  Vaihda ”IDNA UseSTD3ASCIIRules”-lipun tilaa\n"
+"      --allow-unassigned   Vaihda ”IDNA AllowUnassigned”-lipun tilaa (oletus off)\n"
+"      --usestd3asciirules  Vaihda ”IDNA UseSTD3ASCIIRules”-lipun tilaa (oletus off)\n"
 
-#: src/idn.c:113
+#: src/idn.c:106
 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                Etsi merkkijonosta TLD-kohtaisia sääntöjä\n"
+"      --no-tld             Älä etsi merkkijonosta TLD-kohtaisia sääntöjä\n"
 "                             Vain valitsimille ”--idna-to-ascii” ja ”--idna-to-unicode”\n"
 
-#: src/idn.c:117
+#: src/idn.c:110
 msgid "  -n, --nfkc               Normalize string according to Unicode v3.2 NFKC\n"
 msgstr "  -n, --nfkc               Normeeraa merkkijono ”Unicode v3.2 NFKC”-koodauksen mukaisesti\n"
 
-#: src/idn.c:120
+#: src/idn.c:113
 msgid ""
 "  -p, --profile=STRING     Use specified stringprep profile instead\n"
 "                             Valid stringprep profiles: `Nameprep',\n"
@@ -254,7 +241,7 @@ msgstr ""
 "                             ”iSCSI”, ”Nodeprep”, ”Resourceprep”, \n"
 "                             ”trace”, ”SASLprep”\n"
 
-#: src/idn.c:126
+#: src/idn.c:119
 msgid ""
 "      --debug              Print debugging information\n"
 "      --quiet              Silent operation\n"
@@ -262,91 +249,103 @@ msgstr ""
 "      --debug              Tulosta virheenjäljitystiedot\n"
 "      --quiet              Hiljainen toiminta\n"
 
-#: src/idn.c:176
+#: src/idn.c:175
 #, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "Vain yksi valitsimista -s, -e, -d, -a, -u tai -n voidaan määritellä"
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "vain yksi valitsimista -s, -e, -d, -a, -u tai -n voidaan määritellä"
 
-#: src/idn.c:184
+#: src/idn.c:185
 #, c-format
 msgid "Charset `%s'.\n"
 msgstr "Merkistö ”%s”\n"
 
-#: src/idn.c:187
+#: src/idn.c:190
 #, c-format
 msgid "Type each input string on a line by itself, terminated by a newline character.\n"
 msgstr "Kirjoita jokainen merkkijono omalle rivilleen ja lopeta rivi rivinvaihdolla.\n"
 
-#: src/idn.c:202
+#: src/idn.c:205
 #, c-format
-msgid "Input error"
-msgstr "Syötevirhe"
+msgid "input error"
+msgstr "syötevirhe"
 
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
 #, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "Ei voitu muuntaa %s-merkistöstä UTF-8-merkistöön"
+msgid "could not convert from %s to UTF-8"
+msgstr "ei voitu muuntaa %s-merkistöstä UTF-8-merkistöön"
 
-#: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
-#: src/idn.c:551
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
 #, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "Ei voitu muuntaa UTF-8-merkistöstä UCS-4-merkistöön"
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "ei voitu muuntaa UTF-8-merkistöstä UCS-4-merkistöön"
 
-#: src/idn.c:237
+#: src/idn.c:240
 #, c-format
 msgid "stringprep_profile: %s"
 msgstr "stringprep_profile: %s"
 
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
 #, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "Ei voitu muuntaa UTF-8-merkistöstä %s-merkistöön."
+msgid "could not convert from UTF-8 to %s"
+msgstr "ei voitu muuntaa UTF-8-merkistöstä %s-merkistöön."
 
-#: src/idn.c:295
+#: src/idn.c:298
 #, c-format
 msgid "punycode_encode: %s"
 msgstr "punycode_encode: %s"
 
-#: src/idn.c:323
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc-käsky"
+
+#: src/idn.c:326
 #, c-format
 msgid "punycode_decode: %s"
 msgstr "punycode_decode: %s"
 
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
 #, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "Ei voitu muuntaa UCS-4-merkistöstä UTF-8-merkistöön."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "ei voitu muuntaa UCS-4-merkistöstä UTF-8-merkistöön."
 
-#: src/idn.c:381
+#: src/idn.c:384
 #, c-format
 msgid "idna_to_ascii_4z: %s"
 msgstr "idna_to_ascii_4z: %s"
 
-#: src/idn.c:395
+#: src/idn.c:398
 #, c-format
 msgid "idna_to_unicode_8z4z (TLD): %s"
 msgstr "idna_to_unicode_8z4z (TLD): %s"
 
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
 #, c-format
 msgid "tld_check_4z (position %lu): %s"
 msgstr "tld_check_4z (sijainti %lu): %s"
 
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
 #, c-format
 msgid "tld_check_4z: %s"
 msgstr "tld_check_4z: %s"
 
-#: src/idn.c:461
+#: src/idn.c:464
 #, c-format
 msgid "idna_to_unicode_8z4z: %s"
 msgstr "idna_to_unicode_8z4z: %s"
 
-#: src/idn.c:540
+#: src/idn.c:543
 #, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Ei voitu tehdä NFKC-normeerausta."
+msgid "could not do NFKC normalization"
+msgstr "ei voitu tehdä NFKC-normeerausta."
+
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ilmoita virheistä osoitteeseen <%s>.\n"
+#~ "Ilmoita käännösvirheistä osoitteeseen <translation-team-fi@lists.sourceforge.net>.\n"
 
 #~ msgid "input[%lu] = U+%04x\n"
 #~ msgstr "syöte[%lu] = U+%04x\n"
@@ -354,8 +353,5 @@ msgstr "Ei voitu tehdä NFKC-normeerausta."
 #~ msgid "output[%lu] = U+%04x\n"
 #~ msgstr "tuloste[%lu] = U+%04x\n"
 
-#~ msgid "malloc"
-#~ msgstr "malloc-käsky"
-
 #~ msgid "tld[%lu] = U+%04x\n"
 #~ msgstr "tld[%lu] = U+%04x\n"
diff --git a/po/nl.po.in b/po/nl.po.in
index 77bb0d7..8b0f8f2 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -1,178 +1,168 @@
-# Dutch translations for libidn.
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Dutch translations for GNU libidn.
+# Copyright (C) 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libidn package.
 #
+# De vertalingen die beginnen met "## " zijn debug-tekstjes
+# die eigenlijk niet in dit bestand thuishoren.
+#
+# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2007, 2008, 2011.
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
-# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: libidn-1.9\n"
+"Project-Id-Version: libidn-1.21\n"
 "Report-Msgid-Bugs-To: bug-libidn@gnu.org\n"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2008-07-02 22:58+0200\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-28 11:27+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
 msgid "Success"
 msgstr "Gelukt"
 
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
 msgid "String preparation failed"
 msgstr "Voorbewerken van tekenreeks is mislukt"
 
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
 msgid "Punycode failed"
 msgstr "Punycodering is mislukt"
 
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
 msgid "Non-digit/letter/hyphen in input"
 msgstr "Iets anders dan cijfer/letter/verbindingsstreepje in invoer"
 
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
 msgid "Forbidden leading or trailing minus sign (`-')"
 msgstr "Ongeoorloofd minteken ('-') aan begin of eind"
 
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
 msgid "Output would be too large or too small"
 msgstr "Uitvoer zou te groot of te klein worden"
 
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
 msgid "Input does not start with ACE prefix (`xn--')"
 msgstr "Invoer begint niet met een ACE-voorvoegsel ('xn--')"
 
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
 msgid "String not idempotent under ToASCII"
 msgstr "Tekenreeks is niet hetzelfde na retourconversie (van ASCII naar Unicode en terug)"
 
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
 msgid "Input already contain ACE prefix (`xn--')"
 msgstr "Invoer bevat al een ACE-voorvoegsel ('xn--')"
 
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
 msgid "System iconv failed"
 msgstr "De iconv()-systeemfunctie is mislukt"
 
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
 msgid "Cannot allocate memory"
 msgstr "Onvoldoende geheugen beschikbaar"
 
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
 msgid "System dlopen failed"
 msgstr "De dlopen()-systeemfunctie is mislukt"
 
-#: 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:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
 msgid "String not idempotent under Unicode NFKC normalization"
 msgstr ""
 "Tekenreeks is problematisch bij normalisering volgens Unicode-NFKC:\n"
 "er zijn verschillende mogelijkheden"
 
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
 msgid "Invalid input"
 msgstr "Ongeldige invoer"
 
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
 msgid "Output would exceed the buffer space provided"
 msgstr "Uitvoer zou niet in toegewezen bufferruimte passen"
 
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
 msgid "String size limit exceeded"
 msgstr "Tekenreeks is te lang"
 
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
 msgid "Forbidden unassigned code points in input"
 msgstr "Ongeoorloofde niet-toegewezen tekencodes in invoer"
 
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
 msgid "Prohibited code points in input"
 msgstr "Ongeoorloofde tekencodes in invoer"
 
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
 msgid "Conflicting bidirectional properties in input"
 msgstr "Tegenstrijdige eigenschappen voor tweerichtingentekst in invoer"
 
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
 msgid "Malformed bidirectional string"
 msgstr "Ongeldige tekenreeks voor tweerichtingentekst"
 
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
 msgid "Prohibited bidirectional code points in input"
 msgstr "Ongeoorloofde tekencodes (bij tweerichtingentekst) in invoer"
 
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
 msgid "Error in stringprep profile definition"
 msgstr "Fout in profieldefinitie voor 'stringprep'"
 
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
 msgid "Flag conflict with profile"
 msgstr "Vlag botst met profiel"
 
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
 msgid "Unknown profile"
 msgstr "Onbekend profiel"
 
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
 msgid "Unicode normalization failed (internal error)"
 msgstr "Normalisatie van Unicode is mislukt (*interne fout*)"
 
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
 msgid "Code points prohibited by top-level domain"
 msgstr "Ongeoorloofde tekencodes voor gegeven topdomein"
 
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
 msgid "Missing input"
 msgstr "Ontbrekende invoer"
 
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
 msgid "No top-level domain found in input"
 msgstr "Geen topdomein gevonden in de invoer"
 
-#. 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"
-"Rapporteer gebreken in het programma aan <%s>;\n"
-"meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
-
-#: src/idn.c:75
-#, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Typ '%s --help' voor meer informatie.\n"
 
-#: src/idn.c:79
+#: src/idn.c:72
 #, c-format
 msgid "Usage: %s [OPTION]... [STRINGS]...\n"
 msgstr "Gebruik:  %s [OPTIE]... [TEKENREEKS]...\n"
 
-#: src/idn.c:82
+#: src/idn.c:75
 msgid ""
 "Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
 "\n"
 msgstr ""
 "  \n"
 "De gegeven TEKENREEKS (of standaardinvoer) omzetten volgens de regels\n"
-"die gelden voor geïnternationaliseerde domeinnamen.\n"
+"die gelden voor geïnternationaliseerde domeinnamen (IDN).\n"
 "\n"
 
-#: src/idn.c:86
+#: src/idn.c:79
 msgid ""
 "Command line interface to the internationalized domain name library.\n"
 "\n"
@@ -194,7 +184,7 @@ msgstr ""
 "\n"
 "(Een verplicht argument bij een lange optie geldt ook voor de korte vorm.)\n"
 
-#: src/idn.c:98
+#: src/idn.c:91
 msgid ""
 "  -h, --help               Print help and exit\n"
 "  -V, --version            Print version and exit\n"
@@ -202,7 +192,7 @@ msgstr ""
 "  -h, --help               deze hulptekst tonen en stoppen\n"
 "  -V, --version            programmaversie tonen en stoppen\n"
 
-#: src/idn.c:102
+#: src/idn.c:95
 msgid ""
 "  -s, --stringprep         Prepare string according to nameprep profile\n"
 "  -d, --punycode-decode    Decode Punycode\n"
@@ -216,27 +206,27 @@ msgstr ""
 "  -a, --idna-to-ascii      naar ACE omzetten volgens IDNA (standaardmodus)\n"
 "  -u, --idna-to-unicode    uit ACE omzetten volgens IDNA\n"
 
-#: src/idn.c:109
+#: src/idn.c:102
 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   de IDNA-vlag 'AllowUnassigned' omschakelen\n"
-"      --usestd3asciirules  de IDNA-vlag 'UseSTD3ASCIIRules' omschakelen\n"
+"      --allow-unassigned   de IDNA-vlag 'AllowUnassigned' inschakelen\n"
+"      --usestd3asciirules  de IDNA-vlag 'UseSTD3ASCIIRules' inschakelen\n"
 
-#: src/idn.c:113
+#: src/idn.c:106
 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                tekst aan topleveldomein-specifieke regels toetsen;\n"
-"                             alleen bij --idna-to-ascii en --idna-to-unicode\n"
+"      --no-tld             tekst niet aan TLD-specifieke regels toetsen;\n"
+"                             alleen bij '--idna-to-ascii' en '--idna-to-unicode'\n"
 
-#: src/idn.c:117
+#: src/idn.c:110
 msgid "  -n, --nfkc               Normalize string according to Unicode v3.2 NFKC\n"
 msgstr "  -n, --nfkc               tekenreeks normaliseren volgens Unicode-NFKC ver3.2\n"
 
-#: src/idn.c:120
+#: src/idn.c:113
 msgid ""
 "  -p, --profile=STRING     Use specified stringprep profile instead\n"
 "                             Valid stringprep profiles: `Nameprep',\n"
@@ -247,96 +237,108 @@ msgstr ""
 "                             geldige profielnamen zijn: 'Nameprep', 'iSCSI',\n"
 "                             'Nodeprep', 'Resourceprep', 'trace', 'SASLprep'\n"
 
-#: src/idn.c:126
+#: src/idn.c:119
 msgid ""
 "      --debug              Print debugging information\n"
 "      --quiet              Silent operation\n"
 msgstr ""
-"      --debug              debuginformatie weergeven\n"
+"      --debug              debug-informatie weergeven\n"
 "      --quiet              geen meldingen produceren\n"
 
-#: src/idn.c:176
+#: src/idn.c:175
 #, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "Slechts één van de opties '-s', '-e', '-d', '-a', '-u' of '-n' is mogelijk."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "slechts één van de opties '-s', '-e', '-d', '-a', '-u' of '-n' is mogelijk"
 
-#: src/idn.c:184
+#: src/idn.c:185
 #, c-format
 msgid "Charset `%s'.\n"
 msgstr "Tekenset '%s'.\n"
 
-#: src/idn.c:187
+#: src/idn.c:190
 #, c-format
 msgid "Type each input string on a line by itself, terminated by a newline character.\n"
 msgstr "Typ elke invoertekenreeks op een afzonderlijke regel, afgesloten met Enter.\n"
 
-#: src/idn.c:202
+#: src/idn.c:205
 #, c-format
-msgid "Input error"
-msgstr "Invoerfout"
+msgid "input error"
+msgstr "invoerfout"
 
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
 #, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "Conversie van %s naar UTF-8 is mislukt."
+msgid "could not convert from %s to UTF-8"
+msgstr "conversie van %s naar UTF-8 is mislukt"
 
-#: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
-#: src/idn.c:551
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
 #, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "Conversie van UTF-8 naar UCS-4 is mislukt."
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "conversie van UTF-8 naar UCS-4 is mislukt"
 
-#: src/idn.c:237
+#: src/idn.c:240
 #, c-format
 msgid "stringprep_profile: %s"
 msgstr "## stringprep_profile(): %s"
 
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
 #, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "Conversie van UTF-8 naar %s is mislukt."
+msgid "could not convert from UTF-8 to %s"
+msgstr "conversie van UTF-8 naar %s is mislukt"
 
-#: src/idn.c:295
+#: src/idn.c:298
 #, c-format
 msgid "punycode_encode: %s"
 msgstr "## punycode_encode(): %s"
 
-#: src/idn.c:323
+#: src/idn.c:320
+msgid "malloc"
+msgstr "onvoldoende geheugen beschikbaar"
+
+#: src/idn.c:326
 #, c-format
 msgid "punycode_decode: %s"
 msgstr "## punycode_decode(): %s"
 
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
 #, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "Conversie van UCS-4 naar UTF-8 is mislukt."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "conversie van UCS-4 naar UTF-8 is mislukt"
 
-#: src/idn.c:381
+#: src/idn.c:384
 #, c-format
 msgid "idna_to_ascii_4z: %s"
 msgstr "## idna_to_ascii_4z(): %s"
 
-#: src/idn.c:395
+#: src/idn.c:398
 #, c-format
 msgid "idna_to_unicode_8z4z (TLD): %s"
 msgstr "## idna_to_unicode_8z4z (TLD): %s"
 
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
 #, c-format
 msgid "tld_check_4z (position %lu): %s"
 msgstr "## tld_check_4z (positie %lu): %s"
 
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
 #, c-format
 msgid "tld_check_4z: %s"
 msgstr "## tld_check_4z(): %s"
 
-#: src/idn.c:461
+#: src/idn.c:464
 #, c-format
 msgid "idna_to_unicode_8z4z: %s"
 msgstr "## idna_to_unicode_8z4z(): %s"
 
-#: src/idn.c:540
+#: src/idn.c:543
 #, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Kan NFKC-normalisering niet uitvoeren."
+msgid "could not do NFKC normalization"
+msgstr "kan NFKC-normalisering niet uitvoeren"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Rapporteer gebreken in het programma aan <%s>;\n"
+#~ "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
diff --git a/po/pl.po.in b/po/pl.po.in
index d1a3ac7..c225c03 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -1,163 +1,150 @@
 # Polish translation for libidn.
-# Copyright (C) 2004, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2007, 2008, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libidn package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2004-2008.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2004-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.21\n"
 "Report-Msgid-Bugs-To: bug-libidn@gnu.org\n"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2008-07-02 22:10+0200\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-28 20:02+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\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:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
 msgid "Success"
 msgstr "Sukces"
 
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
 msgid "String preparation failed"
 msgstr "Przygotowanie ³añcucha nie powiod³o siê"
 
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
 msgid "Punycode failed"
 msgstr "Punycode zawiod³o"
 
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
 msgid "Non-digit/letter/hyphen in input"
 msgstr "Znak nie bêd±cy cyfr±, liter± ani kresk± na wej¶ciu"
 
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
 msgid "Forbidden leading or trailing minus sign (`-')"
 msgstr "Zabroniony wiod±cy lub koñcz±cy znak minus (`-')"
 
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
 msgid "Output would be too large or too small"
 msgstr "Wyj¶cie mo¿e byæ zbyt du¿e lub zbyt ma³e"
 
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
 msgid "Input does not start with ACE prefix (`xn--')"
 msgstr "Wej¶cie nie zaczyna siê przedrostkiem ACE (`xn--')"
 
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
 msgid "String not idempotent under ToASCII"
 msgstr "£añcuch nie idempotentny wzglêdem ToASCII"
 
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
 msgid "Input already contain ACE prefix (`xn--')"
 msgstr "Wej¶cie ju¿ zawiera przedrostek ACE (`xn--')"
 
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
 msgid "System iconv failed"
 msgstr "Systemowa funkcja iconv nie powiod³a siê"
 
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
 msgid "Cannot allocate memory"
 msgstr "Nie mo¿na przydzieliæ pamiêci"
 
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
 msgid "System dlopen failed"
 msgstr "Systemowa funkcja dlopen nie powiod³a siê"
 
-#: 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:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
 msgid "Unknown error"
 msgstr "Nieznany b³±d"
 
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
 msgid "String not idempotent under Unicode NFKC normalization"
 msgstr "£añcuch nie idempotentny wzglêdem normalizacji Unikodu NFKC"
 
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
 msgid "Invalid input"
 msgstr "B³êdne wej¶cie"
 
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
 msgid "Output would exceed the buffer space provided"
 msgstr "Wyj¶cie przekroczy³oby dostarczone miejsce w buforze"
 
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
 msgid "String size limit exceeded"
 msgstr "Przekroczony limit rozmiaru ³añcucha"
 
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
 msgid "Forbidden unassigned code points in input"
 msgstr "Zabronione nieprzypisane znaki na wej¶ciu"
 
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
 msgid "Prohibited code points in input"
 msgstr "Zabronione znaki na wej¶ciu"
 
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
 msgid "Conflicting bidirectional properties in input"
 msgstr "Konfliktowe w³asno¶ci dwukierunkowego pisma na wej¶ciu"
 
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
 msgid "Malformed bidirectional string"
 msgstr "¬le sformu³owany ³añcuch dwukierunkowy"
 
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
 msgid "Prohibited bidirectional code points in input"
 msgstr "Zabronione znaki dwukierunkowe na wej¶ciu"
 
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
 msgid "Error in stringprep profile definition"
 msgstr "B³±d w definicji profilu stringprep"
 
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
 msgid "Flag conflict with profile"
 msgstr "Konflikt flag z profilem"
 
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
 msgid "Unknown profile"
 msgstr "Nieznany profil"
 
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
 msgid "Unicode normalization failed (internal error)"
 msgstr "Normalizacja Unikodu nie powiod³a siê (b³±d wewnêtrzny)"
 
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
 msgid "Code points prohibited by top-level domain"
 msgstr "Znaki zabronione przez domenê najwy¿szego poziomu"
 
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
 msgid "Missing input"
 msgstr "Brak wej¶cia"
 
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
 msgid "No top-level domain found in input"
 msgstr "Nie znaleziono domeny najwy¿szego poziomu na wej¶ciu"
 
-#. 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"
-"Prosimy zg³aszaæ b³êdy na adres <%s>.\n"
-"B³êdy w t³umaczeniu prosimy zg³aszaæ na adres <translation-team-pl@lists.sourceforge.net>.\n"
-
-#: src/idn.c:75
-#, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Polecenie `%s --help' pozwoli uzyskaæ wiêcej informacji.\n"
 
-#: src/idn.c:79
+#: src/idn.c:72
 #, c-format
 msgid "Usage: %s [OPTION]... [STRINGS]...\n"
 msgstr "Sk³adnia: %s [OPCJA]... [£AÑCUCHY]...\n"
 
-#: src/idn.c:82
+#: src/idn.c:75
 msgid ""
 "Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
 "\n"
@@ -166,7 +153,7 @@ msgstr ""
 "dla umiêdzynarodowionych nazw domen (IDN - Internationalized Domain Name).\n"
 "\n"
 
-#: src/idn.c:86
+#: src/idn.c:79
 msgid ""
 "Command line interface to the internationalized domain name library.\n"
 "\n"
@@ -191,7 +178,7 @@ msgstr ""
 "Argumenty obowi±zkowe dla d³ugich opcji s± równie¿ obowi±zkowe dla odpowiednich\n"
 "krótkich opcji.\n"
 
-#: src/idn.c:98
+#: src/idn.c:91
 msgid ""
 "  -h, --help               Print help and exit\n"
 "  -V, --version            Print version and exit\n"
@@ -199,7 +186,7 @@ msgstr ""
 "  -h, --help               Wypisanie opisu i zakoñczenie\n"
 "  -V, --version            Wypisanie wersji i zakoñczenie\n"
 
-#: src/idn.c:102
+#: src/idn.c:95
 msgid ""
 "  -s, --stringprep         Prepare string according to nameprep profile\n"
 "  -d, --punycode-decode    Decode Punycode\n"
@@ -213,28 +200,28 @@ msgstr ""
 "  -a, --idna-to-ascii      Konwersja do ACE zgodnie z IDNA (tryb domy¶lny)\n"
 "  -u, --idna-to-unicode    Konwersja z ACE zgodnie z IDNA\n"
 
-#: src/idn.c:109
+#: src/idn.c:102
 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   W³±czenie flagi IDNA AllowUnassigned\n"
 "      --usestd3asciirules  W³±czenie flagi IDNA UseSTD3ASCIIRules\n"
 
-#: src/idn.c:113
+#: src/idn.c:106
 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                Sprawdzenie ³añcucha pod k±tem regu³ specyficznych\n"
+"      --no-tld             Niesprawdzenie ³añcucha pod k±tem regu³ specyficznych\n"
 "                             dla TLD;\n"
 "                             tylko dla --idna-to-ascii and --idna-to-unicode\n"
 
-#: src/idn.c:117
+#: src/idn.c:110
 msgid "  -n, --nfkc               Normalize string according to Unicode v3.2 NFKC\n"
 msgstr "  -n, --nfkc               Normalizacja ³añcucha zgodnie z Unicode v3.2 NFKC\n"
 
-#: src/idn.c:120
+#: src/idn.c:113
 msgid ""
 "  -p, --profile=STRING     Use specified stringprep profile instead\n"
 "                             Valid stringprep profiles: `Nameprep',\n"
@@ -246,7 +233,7 @@ msgstr ""
 "                             `iSCSI', `Nodeprep', `Resourceprep',\n"
 "                             `trace', `SASLprep'\n"
 
-#: src/idn.c:126
+#: src/idn.c:119
 msgid ""
 "      --debug              Print debugging information\n"
 "      --quiet              Silent operation\n"
@@ -254,88 +241,92 @@ msgstr ""
 "      --debug              Wypisywanie informacji diagnostycznych\n"
 "      --quiet              Dzia³enie po cichu\n"
 
-#: src/idn.c:176
+#: src/idn.c:175
 #, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "Mo¿na podaæ tylko jedno z -s, -e, -d, -a, -u lub -n."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "Mo¿na podaæ tylko jedno z -s, -e, -d, -a, -u lub -n"
 
-#: src/idn.c:184
+#: src/idn.c:185
 #, c-format
 msgid "Charset `%s'.\n"
 msgstr "Zestaw znaków `%s'.\n"
 
-#: src/idn.c:187
+#: src/idn.c:190
 #, c-format
 msgid "Type each input string on a line by itself, terminated by a newline character.\n"
 msgstr "Nale¿y podaæ ka¿dy ³añcuch w osobnej linii, zakoñczony znakiem nowej linii.\n"
 
-#: src/idn.c:202
+#: src/idn.c:205
 #, c-format
-msgid "Input error"
-msgstr "B³±d wej¶cia"
+msgid "input error"
+msgstr "b³±d wej¶cia"
 
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
 #, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "Nie mo¿na przekonwertowaæ z %s na UTF-8."
+msgid "could not convert from %s to UTF-8"
+msgstr "nie mo¿na przekonwertowaæ z %s na 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
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
 #, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "Nie mo¿na przekonwertowaæ z UTF-8 na UCS-4."
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "nie mo¿na przekonwertowaæ z UTF-8 na UCS-4"
 
-#: src/idn.c:237
+#: src/idn.c:240
 #, c-format
 msgid "stringprep_profile: %s"
 msgstr "stringprep_profile: %s"
 
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
 #, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "Nie mo¿na przekonwertowaæ z UTF-8 na %s."
+msgid "could not convert from UTF-8 to %s"
+msgstr "nie mo¿na przekonwertowaæ z UTF-8 na %s"
 
-#: src/idn.c:295
+#: src/idn.c:298
 #, c-format
 msgid "punycode_encode: %s"
 msgstr "punycode_encode: %s"
 
-#: src/idn.c:323
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc"
+
+#: src/idn.c:326
 #, c-format
 msgid "punycode_decode: %s"
 msgstr "punycode_decode: %s"
 
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
 #, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "Nie mo¿na przekonwertowaæ z UCS-4 na UTF-8."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "nie mo¿na przekonwertowaæ z UCS-4 na UTF-8"
 
-#: src/idn.c:381
+#: src/idn.c:384
 #, c-format
 msgid "idna_to_ascii_4z: %s"
 msgstr "idna_to_ascii_4z: %s"
 
-#: src/idn.c:395
+#: src/idn.c:398
 #, c-format
 msgid "idna_to_unicode_8z4z (TLD): %s"
 msgstr "idna_to_unicode_8z4z (TLD): %s"
 
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
 #, c-format
 msgid "tld_check_4z (position %lu): %s"
 msgstr "tld_check_4z (pozycja %lu): %s"
 
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
 #, c-format
 msgid "tld_check_4z: %s"
 msgstr "tld_check_4z: %s"
 
-#: src/idn.c:461
+#: src/idn.c:464
 #, c-format
 msgid "idna_to_unicode_8z4z: %s"
 msgstr "idna_to_unicode_8z4z: %s"
 
-#: src/idn.c:540
+#: src/idn.c:543
 #, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Normalizacja NFKC nie powiod³a siê."
+msgid "could not do NFKC normalization"
+msgstr "normalizacja NFKC nie powiod³a siê"
diff --git a/po/uk.po.in b/po/uk.po.in
new file mode 100644
index 0000000..f0203b3
--- /dev/null
+++ b/po/uk.po.in
@@ -0,0 +1,332 @@
+# Ukrainian translation of libidn.
+# Copyright (C) 2011 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libidn package.
+#
+# Yuri Chornoivan <yurchor@ukr.net>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: libidn 1.21\n"
+"Report-Msgid-Bugs-To: bug-libidn@gnu.org\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-30 13:44+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
+msgid "Success"
+msgstr "Виконано"
+
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
+msgid "String preparation failed"
+msgstr "Помилка під час спроби приготування рядка"
+
+#: lib/strerror-idna.c:83
+msgid "Punycode failed"
+msgstr "Помилка punycode"
+
+#: lib/strerror-idna.c:87
+msgid "Non-digit/letter/hyphen in input"
+msgstr "Символ, відмінний від цифри, літери або дефіса у вхідних даних"
+
+#: lib/strerror-idna.c:91
+msgid "Forbidden leading or trailing minus sign (`-')"
+msgstr "Некоректний початковий або кінцевий дефіс («-»)"
+
+#: lib/strerror-idna.c:95
+msgid "Output would be too large or too small"
+msgstr "Виведені дані будуть занадто об’ємними або занадто малими"
+
+#: lib/strerror-idna.c:99
+msgid "Input does not start with ACE prefix (`xn--')"
+msgstr "Вхідні дані не починаються з префікса ACE («xn--»)"
+
+#: lib/strerror-idna.c:103
+msgid "String not idempotent under ToASCII"
+msgstr "Рядок не є ідемпотентним у ToASCII"
+
+#: lib/strerror-idna.c:107
+msgid "Input already contain ACE prefix (`xn--')"
+msgstr "Вхідні дані вже містять префікс ACE («xn--»)"
+
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
+msgid "System iconv failed"
+msgstr "Помилка системного iconv"
+
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
+msgid "Cannot allocate memory"
+msgstr "Не вдалося виділити пам’ять"
+
+#: lib/strerror-idna.c:119
+msgid "System dlopen failed"
+msgstr "Помилка системного dlopen"
+
+#: lib/strerror-idna.c:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
+msgid "Unknown error"
+msgstr "Невідома помилка"
+
+#: lib/strerror-pr29.c:63
+msgid "String not idempotent under Unicode NFKC normalization"
+msgstr "Рядок не є ідемпотентним після NFKC-нормалізації Unicode"
+
+#: lib/strerror-punycode.c:63
+msgid "Invalid input"
+msgstr "Некоректні вхідні дані"
+
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
+msgid "Output would exceed the buffer space provided"
+msgstr "Об’єм виведених даних перевищує наданий об’єм буфера"
+
+#: lib/strerror-punycode.c:71
+msgid "String size limit exceeded"
+msgstr "Перевищено обмеження на довжину рядка"
+
+#: lib/strerror-stringprep.c:83
+msgid "Forbidden unassigned code points in input"
+msgstr "Некоректні непов’язані символи коду у вхідних даних"
+
+#: lib/strerror-stringprep.c:87
+msgid "Prohibited code points in input"
+msgstr "Некоректні символи коду у вхідних даних"
+
+#: lib/strerror-stringprep.c:91
+msgid "Conflicting bidirectional properties in input"
+msgstr "Суперечливі двонапрямні властивості у вхідних даних"
+
+#: lib/strerror-stringprep.c:95
+msgid "Malformed bidirectional string"
+msgstr "Помилка у форматуванні двонаправленого рядка"
+
+#: lib/strerror-stringprep.c:99
+msgid "Prohibited bidirectional code points in input"
+msgstr "Некоректні двонапрямні символи коду у вхідних даних"
+
+#: lib/strerror-stringprep.c:107
+msgid "Error in stringprep profile definition"
+msgstr "Помилка у визначені профілю stringprep"
+
+#: lib/strerror-stringprep.c:111
+msgid "Flag conflict with profile"
+msgstr "Прапорець конфліктує з профілем"
+
+#: lib/strerror-stringprep.c:115
+msgid "Unknown profile"
+msgstr "Невідомий профіль"
+
+#: lib/strerror-stringprep.c:119
+msgid "Unicode normalization failed (internal error)"
+msgstr "Помилка під час спроби нормалізації Unicode (внутрішня помилка)"
+
+#: lib/strerror-tld.c:65
+msgid "Code points prohibited by top-level domain"
+msgstr "Символи коду, заборонені доменом вищого рівня"
+
+#: lib/strerror-tld.c:69
+msgid "Missing input"
+msgstr "Не вказано вхідних даних"
+
+#: lib/strerror-tld.c:81
+msgid "No top-level domain found in input"
+msgstr "У вхідних даних не знайдено домену вищого рівня"
+
+#: src/idn.c:68
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Виконайте команду «%s --help», щоб дізнатися більше.\n"
+
+#: src/idn.c:72
+#, c-format
+msgid "Usage: %s [OPTION]... [STRINGS]...\n"
+msgstr "Використання: %s [ПАРАМЕТР]... [РЯДКИ]...\n"
+
+#: src/idn.c:75
+msgid ""
+"Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
+"\n"
+msgstr ""
+"Перетворення Internationalized Domain Name (IDN) РЯДКІВ або даних зі стандартного джерела вхідних даних.\n"
+"\n"
+
+#: src/idn.c:79
+msgid ""
+"Command line interface to the internationalized domain name library.\n"
+"\n"
+"All strings are expected to be encoded in the preferred charset used\n"
+"by your locale.  Use `--debug' to find out what this charset is.  You\n"
+"can override the charset used by setting environment variable CHARSET.\n"
+"\n"
+"To process a string that starts with `-', for example `-foo', use `--'\n"
+"to signal the end of parameters, as in `idn --quiet -a -- -foo'.\n"
+"\n"
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Інтерфейс командного рядка до бібліотеки інтернаціоналізованих назв доменів.\n"
+"\n"
+"Програма вважає, що кодуванням всіх рядків є основне кодування вашої\n"
+"локалі. Скористайтеся параметром «--debug», щоб переглянути дані щодо кодування.\n"
+"Змінити набір символів можна за допомогою змінної середовища CHARSET.\n"
+"\n"
+"Для обробки рядка, що починається з «-», наприклад, «-foo» додайте у команду «--»\n"
+"для позначення завершення параметрів. Приклад: «idn --quiet -a -- -foo».\n"
+"\n"
+"Обов’язкові аргументи для параметрів у розгорнутому записів є обов’язковими і для\n"
+"скорочених форм запису.\n"
+
+#: src/idn.c:91
+msgid ""
+"  -h, --help               Print help and exit\n"
+"  -V, --version            Print version and exit\n"
+msgstr ""
+"  -h, --help               вивести довідкові дані і завершити роботу\n"
+"  -V, --version            вивести дані щодо версії і завершити роботу\n"
+
+#: src/idn.c:95
+msgid ""
+"  -s, --stringprep         Prepare string according to nameprep profile\n"
+"  -d, --punycode-decode    Decode Punycode\n"
+"  -e, --punycode-encode    Encode Punycode\n"
+"  -a, --idna-to-ascii      Convert to ACE according to IDNA (default mode)\n"
+"  -u, --idna-to-unicode    Convert from ACE according to IDNA\n"
+msgstr ""
+"  -s, --stringprep         обробити рядок відповідно до профілю nameprep\n"
+"  -d, --punycode-decode    декодувати Punycode\n"
+"  -e, --punycode-encode    закодувати у Punycode\n"
+"  -a, --idna-to-ascii      перетворити на ACE відповідно до IDNA (типовий режим)\n"
+"  -u, --idna-to-unicode    перетворити з ACE відповідно до IDNA\n"
+
+#: src/idn.c:102
+msgid ""
+"      --allow-unassigned   Toggle IDNA AllowUnassigned flag (default off)\n"
+"      --usestd3asciirules  Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
+msgstr ""
+"      --allow-unassigned   увімкнути або вимкнути прапорець AllowUnassigned IDNA (типово вимкнено)\n"
+"      --usestd3asciirules  увімкнути або вимкнути прапорець UseSTD3ASCIIRules IDNA (типово вимкнено)\n"
+
+#: src/idn.c:106
+msgid ""
+"      --no-tld             Don't check string for TLD specific rules\n"
+"                             Only for --idna-to-ascii and --idna-to-unicode\n"
+msgstr ""
+"      --no-tld             не перевіряти рядок на використання специфічних правил TLD\n"
+"                             Лише для параметрів --idna-to-ascii і --idna-to-unicode\n"
+
+#: src/idn.c:110
+msgid "  -n, --nfkc               Normalize string according to Unicode v3.2 NFKC\n"
+msgstr "  -n, --nfkc               нормалізувати рядок відповідно до NFKC Unicode версії 3.2\n"
+
+#: src/idn.c:113
+msgid ""
+"  -p, --profile=STRING     Use specified stringprep profile instead\n"
+"                             Valid stringprep profiles: `Nameprep',\n"
+"                             `iSCSI', `Nodeprep', `Resourceprep', \n"
+"                             `trace', `SASLprep'\n"
+msgstr ""
+"  -p, --profile=РЯДОК      використовувати вказаний профіль stringprep profile instead\n"
+"                             Можливі значення профілів stringprep: «Nameprep»,\n"
+"                             «iSCSI», «Nodeprep», «Resourceprep», \n"
+"                             «trace», «SASLprep»\n"
+
+#: src/idn.c:119
+msgid ""
+"      --debug              Print debugging information\n"
+"      --quiet              Silent operation\n"
+msgstr ""
+"      --debug              вивести діагностичні дані\n"
+"      --quiet              обробка без додаткових повідомлень\n"
+
+#: src/idn.c:175
+#, c-format
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "можна використовувати лише один з параметрів -s, -e, -d, -a, -u або -n"
+
+#: src/idn.c:185
+#, c-format
+msgid "Charset `%s'.\n"
+msgstr "Набір символів «%s».\n"
+
+#: src/idn.c:190
+#, c-format
+msgid "Type each input string on a line by itself, terminated by a newline character.\n"
+msgstr "Виводити кожен рядок у окремому рядку, розділяти рядки символом нового рядка.\n"
+
+#: src/idn.c:205
+#, c-format
+msgid "input error"
+msgstr "помилка у вхідних даних"
+
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
+#, c-format
+msgid "could not convert from %s to UTF-8"
+msgstr "не вдалося перетворити дані з формату %s на UTF-8"
+
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
+#, c-format
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "не вдалося перетворити дані з формату UTF-8 на UCS-4"
+
+#: src/idn.c:240
+#, c-format
+msgid "stringprep_profile: %s"
+msgstr "stringprep_profile: %s"
+
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
+#, c-format
+msgid "could not convert from UTF-8 to %s"
+msgstr "не вдалося перетворити дані з формату UTF-8 на %s"
+
+#: src/idn.c:298
+#, c-format
+msgid "punycode_encode: %s"
+msgstr "punycode_encode: %s"
+
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc"
+
+#: src/idn.c:326
+#, c-format
+msgid "punycode_decode: %s"
+msgstr "punycode_decode: %s"
+
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
+#, c-format
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "не вдалося перетворити дані з формату UCS-4 на UTF-8"
+
+#: src/idn.c:384
+#, c-format
+msgid "idna_to_ascii_4z: %s"
+msgstr "idna_to_ascii_4z: %s"
+
+#: src/idn.c:398
+#, c-format
+msgid "idna_to_unicode_8z4z (TLD): %s"
+msgstr "idna_to_unicode_8z4z (TLD): %s"
+
+#: src/idn.c:412 src/idn.c:485
+#, c-format
+msgid "tld_check_4z (position %lu): %s"
+msgstr "tld_check_4z (позиція %lu): %s"
+
+#: src/idn.c:415 src/idn.c:491
+#, c-format
+msgid "tld_check_4z: %s"
+msgstr "tld_check_4z: %s"
+
+#: src/idn.c:464
+#, c-format
+msgid "idna_to_unicode_8z4z: %s"
+msgstr "idna_to_unicode_8z4z: %s"
+
+#: src/idn.c:543
+#, c-format
+msgid "could not do NFKC normalization"
+msgstr "не вдалося виконати NFKC-нормалізацію"
diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index f6d61d8..4c587b6 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -2,162 +2,150 @@
 # Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libidn package.
 # Meng Jie <zuxyhere@eastday.com>, 2005.
-# Ji ZhengYu <zhengyuji@gmail.com>, 2008.
+# Ji ZhengYu <zhengyuji@gmail.com>, 2011
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.21\n"
 "Report-Msgid-Bugs-To: bug-libidn@gnu.org\n"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2008-07-06 09:28中国标准时间\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-28 20:17+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\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:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
 msgid "Success"
 msgstr "成功"
 
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
 msgid "String preparation failed"
 msgstr "预备字符串失败"
 
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
 msgid "Punycode failed"
 msgstr "Punycode 失败"
 
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
 msgid "Non-digit/letter/hyphen in input"
 msgstr "输入中出现非数字/字母/连字符"
 
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
 msgid "Forbidden leading or trailing minus sign (`-')"
 msgstr "不能使用‘-’作为起始或终止符"
 
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
 msgid "Output would be too large or too small"
 msgstr "输出太大或太小"
 
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
 msgid "Input does not start with ACE prefix (`xn--')"
 msgstr "输入未以 ACE 前缀(‘xn--’)开头"
 
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
 msgid "String not idempotent under ToASCII"
 msgstr "ToASCII 中字符串不是幂等的"
 
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
 msgid "Input already contain ACE prefix (`xn--')"
 msgstr "输入已经包含 ACE前缀(‘xn--’)"
 
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
 msgid "System iconv failed"
 msgstr "系统 iconv 失败"
 
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
 msgid "Cannot allocate memory"
 msgstr "无法分配内存"
 
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
 msgid "System dlopen failed"
 msgstr "系统 dlopen 失败"
 
-#: 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:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
 msgid "String not idempotent under Unicode NFKC normalization"
 msgstr "Unicode NFKC 正规化过程中字符串不是幂等的"
 
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
 msgid "Invalid input"
 msgstr "无效输入"
 
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
 msgid "Output would exceed the buffer space provided"
 msgstr "输入将溢出所提供的缓冲区"
 
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
 msgid "String size limit exceeded"
 msgstr "字符串大小越界"
 
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
 msgid "Forbidden unassigned code points in input"
 msgstr "输入中不能出现未赋值的代码点"
 
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
 msgid "Prohibited code points in input"
 msgstr "输入中不能出现代码点"
 
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
 msgid "Conflicting bidirectional properties in input"
 msgstr "输入中出现相互冲突的双向属性"
 
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
 msgid "Malformed bidirectional string"
 msgstr "双向字符串格式错误"
 
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
 msgid "Prohibited bidirectional code points in input"
 msgstr "输入中不能出现双向的代码点"
 
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
 msgid "Error in stringprep profile definition"
 msgstr "Stringpref 配置文件定义出错"
 
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
 msgid "Flag conflict with profile"
 msgstr "标识与配置文件冲突"
 
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
 msgid "Unknown profile"
 msgstr "未知的配置文件"
 
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
 msgid "Unicode normalization failed (internal error)"
 msgstr "Unicode 正规化失败(内部错误)"
 
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
 msgid "Code points prohibited by top-level domain"
 msgstr "顶级域不接受代码点"
 
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
 msgid "Missing input"
 msgstr "输入缺失"
 
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
 msgid "No top-level domain found in input"
 msgstr "输入中未发现顶级域"
 
-#. 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"
-"发送错误报告至 <%s>。发送翻译错误至 Chinese (simplified) <translation-team-zh-cn@lists.sourceforge.net>\n"
-
-#: src/idn.c:75
-#, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "尝试用‘%s --help’获取更多信息。\n"
 
-#: src/idn.c:79
+#: src/idn.c:72
 #, c-format
 msgid "Usage: %s [OPTION]... [STRINGS]...\n"
 msgstr "用法: %s [选项]... [字符串]...\n"
 
-#: src/idn.c:82
+#: src/idn.c:75
 msgid ""
 "Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
 "\n"
@@ -165,7 +153,7 @@ msgstr ""
 "字符串或是标准输入的国际化域名(IDN)转化。\n"
 "\n"
 
-#: src/idn.c:86
+#: src/idn.c:79
 msgid ""
 "Command line interface to the internationalized domain name library.\n"
 "\n"
@@ -189,7 +177,7 @@ msgstr ""
 "\n"
 "长选项所必需的参数对于短选项来说也是必需的。\n"
 
-#: src/idn.c:98
+#: src/idn.c:91
 msgid ""
 "  -h, --help               Print help and exit\n"
 "  -V, --version            Print version and exit\n"
@@ -197,7 +185,7 @@ msgstr ""
 "  -h, --help               打印此帮助并退出\n"
 "  -V, --version            打印程序版本并退出\n"
 
-#: src/idn.c:102
+#: src/idn.c:95
 msgid ""
 "  -s, --stringprep         Prepare string according to nameprep profile\n"
 "  -d, --punycode-decode    Decode Punycode\n"
@@ -211,27 +199,27 @@ msgstr ""
 "  -a, --idna-to-ascii      按 IDNA 转换为 ACE (默认方式)\n"
 "  -u, --idna-to-unicode    按 IDNA 从 ACE 转换\n"
 
-#: src/idn.c:109
+#: src/idn.c:102
 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   切换 IDNA AllowUnassigned 标识\n"
-"      --usestd3asciirules  切换 IDNA UseSTD3ASCIIRules 标识\n"
+"      --allow-unassigned   切换 IDNA AllowUnassigned 标识(默认关闭)\n"
+"      --usestd3asciirules  切换 IDNA UseSTD3ASCIIRules 标识(默认关闭)\n"
 
-#: src/idn.c:113
+#: src/idn.c:106
 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                按 TLD 指定的规则检查字符串\n"
+"     --no-tld                不按 TLD 指定的规则检查字符串\n"
 "                             仅对 --idna-to-ascii 和 --idna-to-unicode 有效\n"
 
-#: src/idn.c:117
+#: src/idn.c:110
 msgid "  -n, --nfkc               Normalize string according to Unicode v3.2 NFKC\n"
 msgstr "  -n, --nfkc               按 Unicode v3.2 NFKC 正规化字符串\n"
 
-#: src/idn.c:120
+#: src/idn.c:113
 msgid ""
 "  -p, --profile=STRING     Use specified stringprep profile instead\n"
 "                             Valid stringprep profiles: `Nameprep',\n"
@@ -243,7 +231,7 @@ msgstr ""
 "                             `iSCSI', `Nodeprep', `Resourceprep', \n"
 "                             `trace', `SASLprep'\n"
 
-#: src/idn.c:126
+#: src/idn.c:119
 msgid ""
 "      --debug              Print debugging information\n"
 "      --quiet              Silent operation\n"
@@ -251,100 +239,108 @@ msgstr ""
 "      --debug              打印调试信息\n"
 "      --quiet              处理时不显示信息\n"
 
-#: src/idn.c:176
+#: src/idn.c:175
 #, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "只能指定 -s，-e，-d，-a，-u 或 -n 中的一个。"
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "只能指定 -s, -e, -d, -a, -u 或是 -n 中的一个"
 
-#: src/idn.c:184
+#: src/idn.c:185
 #, c-format
 msgid "Charset `%s'.\n"
 msgstr "字符集‘%s’。\n"
 
-#: src/idn.c:187
+#: src/idn.c:190
 #, c-format
 msgid "Type each input string on a line by itself, terminated by a newline character.\n"
 msgstr "输入时，每个字符串单占一行。\n"
 
-#: src/idn.c:202
+#: src/idn.c:205
 #, c-format
-msgid "Input error"
+msgid "input error"
 msgstr "输入错误"
 
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
 #, c-format
-msgid "Could not convert from %s to UTF-8."
+msgid "could not convert from %s to UTF-8"
 msgstr "无法将 %s 转为 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
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
 #, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "无法将 UTF-8 转为 UCS-4。"
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "无法将 UTF-8 转为 UCS-4"
 
-#: src/idn.c:237
+#: src/idn.c:240
 #, c-format
 msgid "stringprep_profile: %s"
 msgstr "stringprep_profile：%s"
 
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
 #, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "无法将 UTF-8 转为 %s。"
+msgid "could not convert from UTF-8 to %s"
+msgstr "无法将 UTF-8 转为 %s"
 
-#: src/idn.c:295
+#: src/idn.c:298
 #, c-format
 msgid "punycode_encode: %s"
 msgstr "punycode_encode：%s"
 
-#: src/idn.c:323
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc"
+
+#: src/idn.c:326
 #, c-format
 msgid "punycode_decode: %s"
 msgstr "punycode_decode: %s"
 
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
 #, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "无法将 UCS-4 转为 UTF-8。"
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "无法将 UCS-4 转为 UTF-8"
 
-#: src/idn.c:381
+#: src/idn.c:384
 #, c-format
 msgid "idna_to_ascii_4z: %s"
 msgstr "idna_to_ascii_4z：%s"
 
-#: src/idn.c:395
+#: src/idn.c:398
 #, c-format
 msgid "idna_to_unicode_8z4z (TLD): %s"
 msgstr "idna_to_unicode_8z4z (TLD)：%s"
 
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
 #, c-format
 msgid "tld_check_4z (position %lu): %s"
 msgstr "tld_check_4z (位置 %lu)：%s"
 
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
 #, c-format
 msgid "tld_check_4z: %s"
 msgstr "tld_check_4z：%s"
 
-#: src/idn.c:461
+#: src/idn.c:464
 #, c-format
 msgid "idna_to_unicode_8z4z: %s"
 msgstr "idna_to_unicode_8z4z：%s"
 
-#: src/idn.c:540
-#, c-format
-msgid "Could not do NFKC normalization."
+#: src/idn.c:543
+#, fuzzy, c-format
+msgid "could not do NFKC normalization"
 msgstr "不能进行 NFKC 正规化过程。"
 
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "发送错误报告至 <%s>。发送翻译错误至 Chinese (simplified) <translation-team-zh-cn@lists.sourceforge.net>\n"
+
 #~ msgid "input[%lu] = U+%04x\n"
 #~ msgstr "输入[%lu] = U+%04x\n"
 
 #~ msgid "output[%lu] = U+%04x\n"
 #~ msgstr "输出[%lu] = U+%04x\n"
 
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
 #~ msgid "tld[%lu] = U+%04x\n"
 #~ msgstr "tld[%lu] = U+%04x\n"


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Thu May 05 02:56:29 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QHsU9-0004fN-FL
	for mharc-libidn-commit@gnu.org; Thu, 05 May 2011 02:56:29 -0400
Received: from eggs.gnu.org ([140.186.70.92]:33647)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHsU7-0004fG-DF
	for libidn-commit@gnu.org; Thu, 05 May 2011 02:56:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHsU6-0006Ye-II
	for libidn-commit@gnu.org; Thu, 05 May 2011 02:56:27 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:52197)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHsU6-0006Ya-CS
	for libidn-commit@gnu.org; Thu, 05 May 2011 02:56:26 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHsU5-0006qw-SO
	for libidn-commit@gnu.org; Thu, 05 May 2011 06:56:25 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1QHsU5-0007Ue-II
	for libidn-commit@gnu.org; Thu, 05 May 2011 06:56:25 +0000
Date: Thu, 05 May 2011 06:56:25 +0000
Message-Id: <E1QHsU5-0007Ue-II@vcs-noshell.in.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-22-5-gc94a987
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: df400d4501e3ce89e86812fd49da64a1f62bbffc
X-Git-Newrev: c94a98797af16d2cfc6d46701495cab129b4a9e9
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 May 2011 06:56:28 -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=c94a98797af16d2cfc6d46701495cab129b4a9e9

The branch, master has been updated
       via  c94a98797af16d2cfc6d46701495cab129b4a9e9 (commit)
      from  df400d4501e3ce89e86812fd49da64a1f62bbffc (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 c94a98797af16d2cfc6d46701495cab129b4a9e9
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu May 5 08:56:18 2011 +0200

    Add some pre-release rules.

-----------------------------------------------------------------------

Summary of changes:
 cfg.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 22eeb16..a66d330 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -92,7 +92,7 @@ ChangeLog:
 tag = $(PACKAGE)-`echo $(VERSION) | sed 's/\./-/g'`
 htmldir = ../www-$(PACKAGE)
 
-release: prepare upload web upload-web
+release: syntax-check update-po prepare upload web upload-web
 
 prepare:
 	! git tag -l $(tag) | grep $(PACKAGE) > /dev/null


hooks/post-receive
-- 
GNU libidn


