From MAILER-DAEMON Sat Oct 01 16:15:53 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RA5yT-000579-RE
	for mharc-libidn-commit@gnu.org; Sat, 01 Oct 2011 16:15:53 -0400
Received: from eggs.gnu.org ([140.186.70.92]:41345)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RA5yP-00056m-RQ
	for libidn-commit@gnu.org; Sat, 01 Oct 2011 16:15:52 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RA5yM-0005IV-PQ
	for libidn-commit@gnu.org; Sat, 01 Oct 2011 16:15:49 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:41975)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RA5yM-0005I9-M1
	for libidn-commit@gnu.org; Sat, 01 Oct 2011 16:15:46 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RA5yM-0001lI-3q
	for libidn-commit@gnu.org; Sat, 01 Oct 2011 20:15:46 +0000
Date: Sat, 01 Oct 2011 20:15:46 +0000
Message-Id: <E1RA5yM-0001lI-3q@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-22-8-gd42c7be
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c94a98797af16d2cfc6d46701495cab129b4a9e9
X-Git-Newrev: d42c7be5b2905a75397fc64fee246b19ea4cb93b
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
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: Sat, 01 Oct 2011 20:15:52 -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=d42c7be5b2905a75397fc64fee246b19ea4cb93b

The branch, master has been updated
       via  d42c7be5b2905a75397fc64fee246b19ea4cb93b (commit)
       via  f94a4ccdebe61b961517bfa5df33f6bd781a9c21 (commit)
       via  b1b1a2d547b60f86a7e117f2f5933ab2b4aa44e5 (commit)
      from  c94a98797af16d2cfc6d46701495cab129b4a9e9 (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 d42c7be5b2905a75397fc64fee246b19ea4cb93b
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Oct 1 22:15:35 2011 +0200

    Mention TLD URL patch.

commit f94a4ccdebe61b961517bfa5df33f6bd781a9c21
Author: Thomas Jacob <jacob@internet24.de>
Date:   Fri Sep 30 17:53:43 2011 +0200

    Moved extra TLD tables to github
    
    Signed-off-by: Thomas Jacob <jacob@internet24.de>
    Signed-off-by: Simon Josefsson <simon@josefsson.org>

commit b1b1a2d547b60f86a7e117f2f5933ab2b4aa44e5
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Aug 13 11:48:30 2011 +0200

    Sync with TP.

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

Summary of changes:
 NEWS            |    3 +
 doc/libidn.texi |    2 +-
 doc/tld/README  |    2 +-
 po/fr.po.in     |  360 +++++++++++++++++++++++++------------------------------
 4 files changed, 167 insertions(+), 200 deletions(-)

diff --git a/NEWS b/NEWS
index 2023144..3121bd5 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ See the end for copying conditions.
 
 * Version 1.23 (unreleased) [?]
 
+** doc: Update link to experimental TLD tables.
+The new link is <https://github.com/gnuthor/tldchk>.
+
 ** Update translations.
 
 ** API and ABI is backwards compatible with the previous version.
diff --git a/doc/libidn.texi b/doc/libidn.texi
index 044b726..ee47442 100644
--- a/doc/libidn.texi
+++ b/doc/libidn.texi
@@ -1244,7 +1244,7 @@ step provided by the IETF standards.
 The TLD functionality rely on up-to-date tables.  The latest version
 of Libidn aim to provide these, but tables with unclear copying
 conditions, or generally experimental tables, are not included.  Some
-such tables can be found at @url{http://tldchk.berlios.de}.
+such tables can be found at @url{https://github.com/gnuthor/tldchk}.
 
 @section Header file @code{tld.h}
 
diff --git a/doc/tld/README b/doc/tld/README
index 7918c44..02bed1e 100644
--- a/doc/tld/README
+++ b/doc/tld/README
@@ -14,7 +14,7 @@ install a file you only need to remove lib/tlds.c and type 'make' and
 it will be incorporated in the library.
 
 Experimental tables for various TLDs can be found at
-<http://tldchk.berlios.de>.
+<https://github.com/gnuthor/tldchk>.
 
 The format for the files are as follows.  Empty lines or those
 starting with '#' are ignored.  It is highly recommended to discuss
diff --git a/po/fr.po.in b/po/fr.po.in
index 7dbf8f1..52bb24a 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -1,171 +1,160 @@
-# Messages français pour GNU concernant libidn.
-# Copyright © 1996 Free Software Foundation, Inc.
+# Messages franÃ§ais pour GNU concernant libidn.
+# Copyright Â© 1996 Free Software Foundation, Inc.
 # This file is distributed under the same licence as the libidn package.
 # Marc Veillet <scouigne@gmail.com>, 2008.
+# Jean-Philippe GuÃ©rard <jean-philippe.guerard@corbeaunoir.org>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU libidn-1.9\n"
+"Project-Id-Version: GNU 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-09-15 09:32-0500\n"
-"Last-Translator: Marc Veillet <scouigne@gmail.com>\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-06-28 00:12+0200\n"
+"Last-Translator: Jean-Philippe GuÃ©rard <jean-philippe.guerard@corbeaunoir.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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 "Succès"
+msgstr "SuccÃ¨s"
 
-#: 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 "La préparation de la chaîne a échoué"
+msgstr "Ã‰chec de la prÃ©paration de la chaÃ®ne"
 
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
 msgid "Punycode failed"
-msgstr "Punycode a échoué"
+msgstr "Ã‰chec du Punycode"
 
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
 msgid "Non-digit/letter/hyphen in input"
-msgstr "Pas de chiffre/lettre/tirait fourni dans l'entrée"
+msgstr "Un non chiffre, lettre ou tiret a Ã©tÃ© fourni en entrÃ©e"
 
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
 msgid "Forbidden leading or trailing minus sign (`-')"
-msgstr "Signe de négation (`-') en préfixe ou en suffixe interdit"
+msgstr "Signe de nÃ©gation (Â«Â -Â Â») interdit comme prÃ©fixe ou suffixe"
 
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
 msgid "Output would be too large or too small"
 msgstr "La sortie serait trop grande ou trop petite"
 
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
 msgid "Input does not start with ACE prefix (`xn--')"
-msgstr "L'entrée ne débute pas par un préfixe ACE (`xn--')"
+msgstr "L'entrÃ©e ne dÃ©bute pas par le prÃ©fixe ACE (Â«Â xn--Â Â»)"
 
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
 msgid "String not idempotent under ToASCII"
-msgstr "La chaîne n'est pas idempotente sous ToASCII"
+msgstr "ChaÃ®ne non idempotente avec ToASCII"
 
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
 msgid "Input already contain ACE prefix (`xn--')"
-msgstr "L'entrée contient déjà un préfixe ACE (`xn--')"
+msgstr "L'entrÃ©e contient dÃ©jÃ  un prÃ©fixe 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 "La fonction système icon() a échoué"
+msgstr "Ã‰chec du iconv systÃ¨me"
 
-#: 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 "Ne peut allouer de la mémoire"
+msgstr "Impossible d'allouer la mÃ©moire"
 
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
 msgid "System dlopen failed"
-msgstr "La fonction système dlopen() a échoué"
+msgstr "Ã‰chec du dlopen systÃ¨me"
 
-#: 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 "Erreur inconnue"
 
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
 msgid "String not idempotent under Unicode NFKC normalization"
-msgstr "La chaîne n'est pas idempotente sous la normalisation Unicode NFKC"
+msgstr "ChaÃ®ne non idempotente en normalisation NFKC Unicode"
 
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
 msgid "Invalid input"
-msgstr "Entrée invalide"
+msgstr "EntrÃ©e invalide"
 
-#: 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 "La sortie excèderait l'espace tampon fourni"
+msgstr "La sortie dÃ©passe l'espace tampon fourni"
 
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
 msgid "String size limit exceeded"
-msgstr "La limite de  la taille de la chaîne est dépassée"
+msgstr "La taille limite des chaÃ®nes est dÃ©passÃ©e"
 
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
 msgid "Forbidden unassigned code points in input"
-msgstr "Interdiction de codes points non affectées dans l'entrée"
+msgstr "L'entrÃ©e contient des codes caractÃ¨res non attribuÃ©s interdits"
 
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
 msgid "Prohibited code points in input"
-msgstr "Codes points prohibés dans l'entrée"
+msgstr "L'entrÃ©e contient des codes caractÃ¨res prohibÃ©s"
 
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
 msgid "Conflicting bidirectional properties in input"
-msgstr "Propriétés bidirectionnelles conflictuelles dans l'entrée"
+msgstr "L'entrÃ©e contient des propriÃ©tÃ©s bidirectionnelles en conflit"
 
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
 msgid "Malformed bidirectional string"
-msgstr "Chaîne bidirectionnelle mal composée"
+msgstr "ChaÃ®ne bidirectionnelle mal composÃ©e"
 
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
 msgid "Prohibited bidirectional code points in input"
-msgstr "Codes points bidirectionnels prohibés dans l'entrée"
+msgstr "L'entrÃ©e contient des codes caractÃ¨res bidirectionnels prohibÃ©s"
 
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
 msgid "Error in stringprep profile definition"
-msgstr "Erreur dans la définition de profil de stringprep"
+msgstr "Erreur dans la dÃ©finition de profil stringprep"
 
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
 msgid "Flag conflict with profile"
-msgstr "Conflit de fanions avec le profil"
+msgstr "Le drapeau est en conflit avec le profil"
 
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
 msgid "Unknown profile"
 msgstr "Profil inconnu"
 
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
 msgid "Unicode normalization failed (internal error)"
-msgstr "La normalisation Unicode a échoué (erreur interne)"
+msgstr "La normalisation Unicode a Ã©chouÃ© (erreur interne)"
 
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
 msgid "Code points prohibited by top-level domain"
-msgstr "Codes points prohibés par le domaine de haut niveau"
+msgstr "Le domaine de premier niveau prohibe ces codes caractÃ¨res"
 
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
 msgid "Missing input"
-msgstr "Entrée manquante"
+msgstr "EntrÃ©e manquante"
 
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
 msgid "No top-level domain found in input"
-msgstr "Aucun domaine de haut niveau n'a été repéré dans l'entrée"
+msgstr "Aucun domaine de premier niveau n'a Ã©tÃ© identifiÃ© dans l'entrÃ©e"
 
-#. 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"
-"Rapporter les anomalies à <%s>.\n"
-
-#: src/idn.c:75
-#, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "Essayer `%s --help' pour plus d'information.\n"
+msgstr "Essayez Â«Â %s --helpÂ Â» pour plus d'information.\n"
 
-#: src/idn.c:79
+#: src/idn.c:72
 #, c-format
 msgid "Usage: %s [OPTION]... [STRINGS]...\n"
-msgstr "Usage : %s [OPTION]... [STRINGS]...\n"
+msgstr "UtilisationÂ : %s [OPTION]... [CHAÃŽNES]...\n"
 
-#: src/idn.c:82
+#: src/idn.c:75
 msgid ""
 "Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
 "\n"
 msgstr ""
-"Nom de domaine internationalisé (IDN) convertit les STRINGS, ou les entrées standards.\n"
+"IDN converti des CHAÃŽNES ou l'entrÃ©e standard.\n"
 "\n"
 
-#: src/idn.c:86
+#: src/idn.c:79
 msgid ""
 "Command line interface to the internationalized domain name library.\n"
 "\n"
@@ -178,26 +167,31 @@ msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"Interface de ligne de commande pour la bibliothèque de nom de domaine internationalisé.\n"
+"Interface en ligne de commande de la bibliothÃ¨que libidn (noms de\n"
+"domaines internationalisÃ©s).\n"
 "\n"
-"Toutes les chaînes doivent être encodées dans le format préféré de table de caractères\n"
-"défini sur le système local.  Utilisez `--debug' pour déterminer de quelle table de caractère il s'agit.  Vous\n"
-"pourvez outrepasser cette table de caractères en utilisant une variable d'environnement CHARSET.\n"
+"Toutes les chaÃ®nes sont supposÃ©es Ãªtre codÃ©es avec le jeu de\n"
+"caractÃ¨re principal de vos paramÃ¨tres rÃ©gionaux (les Â«Â localesÂ Â»).\n"
+"Utilisez Â«Â --debugÂ Â» pour identifier le jeu de caractÃ¨res en\n"
+"question. Vous pouvez modifier le jeu de caractÃ¨re utilisÃ© en\n"
+"dÃ©finissant la variable d'environnement CHARSET.\n"
 "\n"
-"Pour traiter une chaîne qui commence par `-', par exemple `-foo', utilisez `--'\n"
-"afin de signaler la fin des paramètres, comme dans `idn --quiet -a -- -foo'.\n"
+"Pour traiter une chaÃ®ne commenÃ§ant par Â«Â -Â Â», comme Â«Â -fooÂ Â»,\n"
+"utilisez Â«Â --Â Â» pour indiquer la fin des options. Par exempleÂ :\n"
+"Â«Â idn --quiet -a -- -fooÂ Â».\n"
 "\n"
-"Les arguments obligatoires des options longues sont également obligatoires pour les options courtes.\n"
+"Les arguments obligatoires des options longues sont Ã©galement\n"
+"obligatoires pour les options courtes.\n"
 
-#: src/idn.c:98
+#: src/idn.c:91
 msgid ""
 "  -h, --help               Print help and exit\n"
 "  -V, --version            Print version and exit\n"
 msgstr ""
-"  -h, --help               Imprime l'aide et quitte\n"
-"  -V, --version            Imprime la version et quitte\n"
+"  -h, --help               Imprime l'aide et s'arrÃªte\n"
+"  -V, --version            Imprime la version et s'arrÃªte\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"
@@ -205,173 +199,143 @@ msgid ""
 "  -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         Traite la chaîne en fonction du profil nameprep\n"
-"  -d, --punycode-decode    Décode le Punycode\n"
-"  -e, --punycode-encode    Encode le Punycode\n"
-"  -a, --idna-to-ascii      Convertit vers ACE selon le mode IDNA (mode par défaut)\n"
-"  -u, --idna-to-unicode    Convertit depuis ACE selon IDNA\n"
+"  -s, --stringprep         PrÃ©pare la chaÃ®ne selon le profil nameprep\n"
+"  -d, --punycode-decode    DÃ©code le Punycode\n"
+"  -e, --punycode-encode    Code en Punycode\n"
+"  -a, --idna-to-ascii      Conversion IDNA vers un codage ACE\n"
+"  -u, --idna-to-unicode    Conversion IDNA depuis un codage 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   Permute le fanion IDNA AllowUnassigned\n"
-"      --usestd3asciirules  Permute le fanion IDNA UseSTD3ASCIIRules\n"
+"      --allow-unassigned   Bascule le drapeau AllowUnassigned d'IDNA\n"
+"                             (dÃ©sactivÃ© par dÃ©faut).\n"
+"      --usestd3asciirules  Bascule le drapeau UseSTD3ASCIIRules d'IDNA\n"
+"                             (dÃ©sactivÃ© par dÃ©faut).\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                Vérifie la chaîne pour des règles TLD spéficiques\n"
-"                             Seulement pour --idna-to-ascii et --idna-to-unicode\n"
+"      --no-tld             Ne pas vÃ©rifier les rÃ¨gles spÃ©cifiques aux domaines\n"
+"                             de premier niveau (TLD). Uniquement valable pour\n"
+"                             --idna-to-ascii et --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               Uniformise la chaîne en fonction de Unicode v3.2 NFKC\n"
+msgstr ""
+"  -n, --nfkc               Applique Ã  la chaÃ®ne la normalisation NFKC\n"
+"                             d'Unicode 3.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"
 "                             `iSCSI', `Nodeprep', `Resourceprep', \n"
 "                             `trace', `SASLprep'\n"
 msgstr ""
-"  -p, --profile=STRING     Utilise un profil stringprep à la place\n"
-"                             Profils stringprep valides : `Nameprep',\n"
-"                             `iSCSI', `Nodeprep', `Resourceprep', \n"
-"                             `trace', `SASLprep'\n"
+"  -p, --profile=CHAÃŽNE     Utilise Ã  la place le profil stringprep indiquÃ©\n"
+"                            Les profils valides sontÂ :\n"
+"                            Â«Â NameprepÂ Â», Â«Â iSCSIÂ Â», Â«Â NodeprepÂ Â»,\n"
+"                            Â«Â ResourceprepÂ Â», Â«Â traceÂ Â», Â«Â SASLprepÂ Â»\n"
 
-#: src/idn.c:126
+#: src/idn.c:119
 msgid ""
 "      --debug              Print debugging information\n"
 "      --quiet              Silent operation\n"
 msgstr ""
-"      --debug              Imprime les données de débogage\n"
+"      --debug              Affiche des informations de dÃ©bogage\n"
 "      --quiet              Mode silencieux\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 "Seulement une option parmi -s, -e, -d, -a ou -u peut être spécifiée."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "Une seule option parmi -s, -e, -d, -a, -u et -n peut Ãªtre indiquÃ©e"
 
-#: src/idn.c:184
+#: src/idn.c:185
 #, c-format
 msgid "Charset `%s'.\n"
-msgstr "Jeu de caractères `%s'.\n"
+msgstr "Jeu de caractÃ¨res Â«Â %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 "Tapez chaque chaque chaîne sur une seule ligne terminée par un retour de chariot.\n"
+msgstr "Saisissez une chaÃ®ne par ligne, terminÃ©e par un passage Ã  la ligne.\n"
 
-#: src/idn.c:202
+#: src/idn.c:205
 #, c-format
-msgid "Input error"
-msgstr "Erreur de saisie"
+msgid "input error"
+msgstr "entrÃ©e erronÃ©e"
 
-#: 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 "Ne peut effectuer la conversion à partir de %s vers UTF-8."
+msgid "could not convert from %s to UTF-8"
+msgstr "Conversion impossible en UTF-8 depuis %s"
 
-#: 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 "Ne peut effectuer la conversion à partir de UTF-8 vers UCS-4."
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "Conversion impossible en UCS-4 depuis UTF-8"
 
-#: src/idn.c:237
+#: src/idn.c:240
 #, c-format
 msgid "stringprep_profile: %s"
-msgstr "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 "Ne peut effectuer la conversion à partir de UTF-8 vers %s."
+msgid "could not convert from UTF-8 to %s"
+msgstr "Conversion impossible en %s depuis UTF-8"
 
-#: src/idn.c:295
+#: src/idn.c:298
 #, c-format
 msgid "punycode_encode: %s"
-msgstr "punycode_encode : %s"
+msgstr "punycode_encodeÂ : %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 : %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 "Ne peut effectuer la conversion à partir de UCS-4 vers UTF-8."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "Conversion impossible en UTF-8 depuis UCS-4"
 
-#: src/idn.c:381
+#: src/idn.c:384
 #, c-format
 msgid "idna_to_ascii_4z: %s"
-msgstr "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"
+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"
+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"
+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"
+msgstr "idna_to_unicode_8z4zÂ : %s"
 
-#: src/idn.c:540
+#: src/idn.c:543
 #, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Ne peut compléter l'uniformisation NFKC"
-
-#~ msgid "input[%d] = U+%04x\n"
-#~ msgstr "entrée[%d] = U+%04x\n"
-
-#~ msgid "output[%d] = U+%04x\n"
-#~ msgstr "sortie[%d] = U+%04x\n"
-
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
-#~ msgid "tld[%d] = U+%04x\n"
-#~ msgstr "tld[%d] = U+%04x\n"
-
-#~ msgid "%s: fgets() failed: "
-#~ msgstr "%s: fgets() a échoué: "
-
-#~ msgid "%s: stringprep_profile() failed with error %d.\n"
-#~ msgstr "%s: stringprep_profile() a échoué avec l'erreur %d.\n"
-
-#~ msgid "%s: punycode_encode() failed with error %d.\n"
-#~ msgstr "%s: punycode_encode() a échoué avec l'erreur %d.\n"
-
-#~ msgid "%s: malloc() failed: "
-#~ msgstr "%s: malloc() a échoué: "
-
-#~ msgid "%s: punycode_decode() failed with error %d.\n"
-#~ msgstr "%s: punycode_decode() a échoué avec l'erreur %d.\n"
-
-#~ msgid "%s: idna_to_ascii_4z() failed with error %d.\n"
-#~ msgstr "%s: idna_to_ascii_4z() a échoué avec l'erreur %d.\n"
-
-#~ msgid "%s: TLD idna_to_unicode_8z8z() failed with error %d.\n"
-#~ msgstr "%s: TLD idna_to_unicode_8z8z() a échoué avec l'erreur %d.\n"
-
-#~ msgid "%s: string rejected by TLD test (Unicode position %d)\n"
-#~ msgstr "%s: chaîne rejeté par TLD test (Unicode position %d)\n"
-
-#~ msgid "%s: tld_check_4z failed with error %d.\n"
-#~ msgstr "%s: tld_check_4z a échoué avec l'erreur %d.\n"
+msgid "could not do NFKC normalization"
+msgstr "Ã‰chec de la normalisation NFKC"


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Wed Oct 19 05:06:01 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RGS65-0006Ap-Ls
	for mharc-libidn-commit@gnu.org; Wed, 19 Oct 2011 05:06:01 -0400
Received: from eggs.gnu.org ([140.186.70.92]:39209)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RGS62-0006AG-9h
	for libidn-commit@gnu.org; Wed, 19 Oct 2011 05:05:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RGS5w-0003TJ-Mg
	for libidn-commit@gnu.org; Wed, 19 Oct 2011 05:05:58 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60363)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RGS5w-0003T4-JM
	for libidn-commit@gnu.org; Wed, 19 Oct 2011 05:05:52 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RGS5v-0000Jt-RV
	for libidn-commit@gnu.org; Wed, 19 Oct 2011 09:05:52 +0000
Date: Wed, 19 Oct 2011 09:05:51 +0000
Message-Id: <E1RGS5v-0000Jt-RV@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-22-9-gc83100d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d42c7be5b2905a75397fc64fee246b19ea4cb93b
X-Git-Newrev: c83100d1a9884c6d78cd411b6ef0383eae95afe2
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
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, 19 Oct 2011 09:05:59 -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=c83100d1a9884c6d78cd411b6ef0383eae95afe2

The branch, master has been updated
       via  c83100d1a9884c6d78cd411b6ef0383eae95afe2 (commit)
      from  d42c7be5b2905a75397fc64fee246b19ea4cb93b (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 c83100d1a9884c6d78cd411b6ef0383eae95afe2
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Oct 19 11:05:39 2011 +0200

    idn-free.h: Protect prototypes with 'extern "C"' marker.
    
    Reported by Bittner Ede <bittner.ede@euronetrt.hu>.

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

Summary of changes:
 NEWS           |    3 +++
 THANKS         |    1 +
 lib/idn-free.h |    9 +++++++++
 3 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index 3121bd5..748952d 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ See the end for copying conditions.
 
 * Version 1.23 (unreleased) [?]
 
+** idn-free.h: Protect prototypes with 'extern "C"' marker.
+Reported by Bittner Ede <bittner.ede@euronetrt.hu>.
+
 ** doc: Update link to experimental TLD tables.
 The new link is <https://github.com/gnuthor/tldchk>.
 
diff --git a/THANKS b/THANKS
index 635dce5..a230091 100644
--- a/THANKS
+++ b/THANKS
@@ -97,6 +97,7 @@ Waqas Hussain <waqas20@gmail.com>
 Guido Trentalancia <guido@trentalancia.com>
 Volker Grabsch <vog@notjusthosting.com>
 Olga Limburg <olimburg@gmail.com>
+Bittner Ede <bittner.ede@euronetrt.hu>
 
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
diff --git a/lib/idn-free.h b/lib/idn-free.h
index 973cdd0..90f5d1b 100644
--- a/lib/idn-free.h
+++ b/lib/idn-free.h
@@ -36,6 +36,11 @@
 #  endif
 # endif
 
+# ifdef __cplusplus
+extern "C"
+{
+# endif
+
 /* I don't recommend using this interface in general.  Use `free'.
  *
  * I'm told Microsoft Windows may use one set of `malloc' and `free'
@@ -56,4 +61,8 @@
 
 extern void IDNAPI idn_free (void *ptr);
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif /* IDN_FREE_H */


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Wed Oct 19 05:21:43 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RGSLH-0000em-9V
	for mharc-libidn-commit@gnu.org; Wed, 19 Oct 2011 05:21:43 -0400
Received: from eggs.gnu.org ([140.186.70.92]:42438)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RGSLE-0000dy-Gd
	for libidn-commit@gnu.org; Wed, 19 Oct 2011 05:21:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RGSLC-0007cQ-Va
	for libidn-commit@gnu.org; Wed, 19 Oct 2011 05:21:40 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:56744)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RGSLC-0007cK-Ov
	for libidn-commit@gnu.org; Wed, 19 Oct 2011 05:21:38 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RGSLC-0002lU-3e
	for libidn-commit@gnu.org; Wed, 19 Oct 2011 09:21:38 +0000
Date: Wed, 19 Oct 2011 09:21:38 +0000
Message-Id: <E1RGSLC-0002lU-3e@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-22-10-g5f79ec0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c83100d1a9884c6d78cd411b6ef0383eae95afe2
X-Git-Newrev: 5f79ec02b76ed7f552d875a38a9915d5b4f977dc
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
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, 19 Oct 2011 09:21:41 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=5f79ec02b76ed7f552d875a38a9915d5b4f977dc

The branch, master has been updated
       via  5f79ec02b76ed7f552d875a38a9915d5b4f977dc (commit)
      from  c83100d1a9884c6d78cd411b6ef0383eae95afe2 (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 5f79ec02b76ed7f552d875a38a9915d5b4f977dc
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Oct 19 11:13:43 2011 +0200

    Doc fix.

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

Summary of changes:
 lib/nfkc.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/lib/nfkc.c b/lib/nfkc.c
index 8f4c079..9004bda 100644
--- a/lib/nfkc.c
+++ b/lib/nfkc.c
@@ -980,8 +980,7 @@ stringprep_utf8_to_ucs4 (const char *str, ssize_t len, size_t * items_written)
  *
  * Return value: a pointer to a newly allocated UTF-8 string.
  *               This value must be deallocated by the caller.
- *               If an error occurs, %NULL will be returned and @error
- *               set.
+ *               If an error occurs, %NULL will be returned.
  **/
 char *
 stringprep_ucs4_to_utf8 (const uint32_t * str, ssize_t len,


hooks/post-receive
-- 
GNU libidn


