[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. iso-codes/3.10.3-20-g119a10f

[Christian Perrier]

The following commit has been merged in the master branch:
commit 119a10f87d1cbb0e5cbe7ec553b730be25b974ea
Author: Christian Perrier <bubulle at debian.org>
Date:   Sun Sep 27 18:07:59 2009 +0200

    Merge conflicts

diff --git a/ChangeLog b/ChangeLog
index 0197a58..9301216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ iso-codes X.X.X
   * Polish by Jakub Bogusz (TP)
   * Brazilian Portuguese by Leonardo Ferreira Fontenelle (TP)
   * Czech by Miroslav Kure
+  * French by Christian Perrier
 
   [ ISO 639-3 translations ]
   * Polish by Jakub Bogusz (TP)
diff --git a/iso_639/fr.po b/iso_639/fr.po
index 7654ab7..0f0ad60 100644
--- a/iso_639/fr.po
+++ b/iso_639/fr.po
@@ -16,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
 "POT-Creation-Date: 2009-09-24 08:42+0200\n"
-"PO-Revision-Date: 2009-03-04 22:36+0100\n"
+"PO-Revision-Date: 2009-09-24 08:45+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -235,9 +235,8 @@ msgid "Bhojpuri"
 msgstr "Bhojpuri"
 
 #. name for bih, bh
-#, fuzzy
 msgid "Bihari languages"
-msgstr "Tai, langues"
+msgstr "biharies, langues"
 
 #. name for bik
 msgid "Bikol"
@@ -731,7 +730,7 @@ msgstr "Hiligaynon"
 
 #. name for him
 msgid "Himachali languages; Western Pahari languages"
-msgstr ""
+msgstr "himachalies, langues; paharies occidentales, langues"
 
 #. name for hin, hi
 msgid "Hindi"

-- 
ISO language, territory, currency, script codes and their translations