Update from ISO languages database.

6 files changed, 62 insertions, 51 deletions

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 0b8790f..36f6fe8 100644
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,16 @@
+2008-04-25  Bruno Haible  <bruno@clisp.org>
+
+	* ISO_639: Remove Adangme. Update Belarusian, Scottish Gaelic,
+	Interlingue, Sichuan Yi, Central Khmer, Pashto, Romansh.
+	* ISO_639-2: Add Adangme, Classical Syriac, Blissymbols. Update
+	Aramaic, Mapudungun, Asturian, Banda, Beja, Bini, Batak, Carib,
+	Chipewyan, Dayak, Swiss German, Ijo, Kachin, Karen, Kru, Miscellaneous,
+	Nahuatl, Pampanga, Rarotongan, Songhai, Sranan Tongo, Zande,
+	No linguistic content.
+	* iso-639.texi: Regenerate.
+	* iso-639-2.texi: Regenerate.
+	* gettext.texi (Header Entry): Update name of Belarusian.
+
 2008-04-20  Bruno Haible  <bruno@clisp.org>
 
 	* xgettext.texi: Clarify single-letter options that take an optional
diff --git a/gettext-tools/doc/ISO_639 b/gettext-tools/doc/ISO_639
index 8d91fce..4c7c3b0 100644
--- a/gettext-tools/doc/ISO_639
+++ b/gettext-tools/doc/ISO_639
@@ -12,7 +12,7 @@ Faeroese corrected to Faroese, 1995-11-18 by Keld Simonsen
 Updated from http://lcweb.loc.gov/standards/iso639-2/codechanges.html,
 2004-01-18 by Bruno Haible
 Updated from http://www.loc.gov/standards/iso639-2/index.html
-2006-10-05 by Bruno Haible
+2008-04-25 by Bruno Haible
 
 Two-letter lower-case symbols are used.
 The Registration Authority for ISO 639 is Infoterm, Osterreichisches
@@ -20,7 +20,6 @@ Normungsinstitut (ON), Postfach 130, A-1021 Vienna, Austria.
 
 aa Afar
 ab Abkhazian
-ad Adangme
 ae Avestan
 af Afrikaans
 ak Akan
@@ -33,7 +32,7 @@ ay Aymara
 az Azerbaijani
 
 ba Bashkir
-be Byelorussian; Belarusian
+be Belarusian
 bg Bulgarian
 bh Bihari
 bi Bislama
@@ -75,7 +74,7 @@ fr French
 fy Western Frisian
 
 ga Irish
-gd Scots; Gaelic
+gd Scottish Gaelic
 gl Galician
 gn Guarani
 gu Gujarati
@@ -93,9 +92,9 @@ hz Herero
 
 ia Interlingua
 id Indonesian (formerly in)
-ie Interlingue
+ie Interlingue; Occidental
 ig Igbo
-ii Sichuan Yi
+ii Sichuan Yi; Nuosu
 ik Inupiak; Inupiaq
 io Ido
 is Icelandic
@@ -111,7 +110,7 @@ ki Kikuyu; Gikuyu
 kj Kuanyama; Kwanyama
 kk Kazakh
 kl Kalaallisut; Greenlandic
-km Khmer; Cambodian
+km Central Khmer; Cambodian
 kn Kannada
 ko Korean
 kr Kanuri
@@ -164,12 +163,12 @@ os Ossetian; Ossetic
 pa Panjabi; Punjabi
 pi Pali
 pl Polish
-ps Pashto, Pushto
+ps Pashto; Pushto
 pt Portuguese
 
 qu Quechua
 
-rm Rhaeto-Romance
+rm Romansh
 rn Rundi; Kirundi
 ro Romanian
 ru Russian
diff --git a/gettext-tools/doc/ISO_639-2 b/gettext-tools/doc/ISO_639-2
index 715a1f8..e548328 100644
--- a/gettext-tools/doc/ISO_639-2
+++ b/gettext-tools/doc/ISO_639-2
@@ -1,12 +1,12 @@
 Technical contents of ISO 639-2
                                                             
 Updated from http://www.loc.gov/standards/iso639-2/code_list.html
-2006-10-05 by Bruno Haible
+2008-04-25 by Bruno Haible
 
 First column: ISO 639-2 code.
 Second column: ISO 639-2 English name.
 The remaining columns are not from ISO. They are mostly from
-www.ethnologue.com.
+www.ethnologue.com in 2006.
 Third column: Categorization
   F = Family of languages
   S = Synthetic / Artificial language
@@ -18,6 +18,7 @@ Fifth column: Country.
 
 ace   Achinese                                                 3000000  Indonesia
 ach   Acoli                                                     750000  Uganda
+ada   Adangme                                                   800000  Ghana
 ady   Adyghe; Adygei                                            500000  Russia
 afa   Afro-Asiatic (Other)                                  F
 afh   Afrihili                                              S
@@ -29,37 +30,37 @@ alt   Southern Altai                                             20000  Russia
 ang   English, Old (ca.450-1100)                            X
 anp   Angika                                                    740000  India
 apa   Apache languages                                      F
-arc   Aramaic                                               U      few  Syria, Turkey, Iraq, Iran
-arn   Araucanian                                                300000  Chile
+arc   Official Aramaic; Imperial Aramaic                    X      few  Syria, Turkey, Iraq, Iran
+arn   Mapudungun; Mapuche                                       300000  Chile
 arp   Arapaho                                                     1000  United States
 art   Artificial (Other)                                    S
 arw   Arawak                                                      2500  Suriname
-ast   Asturian; Bable                                           125000  Spain
+ast   Asturian; Bable; Leonese; Asturleonese                    125000  Spain
 ath   Athapascan languages                                  F
 aus   Australian languages                                  F
 awa   Awadhi                                                  20000000  India
-bad   Banda                                                 U  1100000  Central African Republic, Dem. Rep. Congo
+bad   Banda languages                                       F  1100000  Central African Republic, Dem. Rep. Congo
 bai   Bamileke languages                                    F
 bal   Baluchi                                               U  5000000  Pakistan, Iran, Afghanistan
 ban   Balinese                                                 3900000  Indonesia
 bas   Basa                                                      230000  Cameroon
 bat   Baltic (Other)                                        F
-bej   Beja                                                      950000  Sudan
+bej   Beja; Bedawiyet                                          1178000  Sudan
 bem   Bemba                                                    3600000  Zambia
 ber   Berber (Other)                                        F
 bho   Bhojpuri                                                26600000  India
 bik   Bikol                                                 U  3500000  Philippines
-bin   Bini                                                     1000000  Nigeria
+bin   Bini; Edo                                                1000000  Nigeria
 bla   Siksika                                                     5000  Canada
 bnt   Bantu (Other)                                         F
 bra   Braj                                                       44000  India
-btk   Batak (Indonesia)                                     U  6230000  Indonesia
+btk   Batak languages (Indonesia)                           F  6230000  Indonesia
 bua   Buriat                                                U   450000  Russia
 bug   Buginese                                                 3500000  Indonesia
 byn   Blin; Bilin                                                70000  Eritrea
 cad   Caddo                                                         25  United States
 cai   Central American Indian (Other)                       F
-car   Carib                                                      10000  Venezuela
+car   Galibi Carib                                               10000  Venezuela
 cau   Caucasian (Other)                                     F
 ceb   Cebuano                                                 20000000  Philippines
 cel   Celtic (Other)                                        F
@@ -69,7 +70,7 @@ chk   Chuukese                                                   38000  Micrones
 chm   Mari                                                  U   590000  Russia
 chn   Chinook jargon                                               100  Canada
 cho   Choctaw                                                     9000  United States
-chp   Chipewyan                                                   4000  Canada
+chp   Chipewyan; Dene Suline                                      4000  Canada
 chr   Cherokee                                                   20000  United States
 chy   Cheyenne                                                    2000  United States
 cmc   Chamic languages                                      F
@@ -83,7 +84,7 @@ csb   Kashubian                                                   3000  Poland
 cus   Cushitic (Other)                                      F
 dak   Dakota                                                     15000  United States
 dar   Dargwa                                                    370000  Russia
-day   Dayak                                                 U           Malaysia, Indonesia
+day   Land Dayak languages                                  F           Malaysia, Indonesia
 del   Delaware                                              U        7  United States
 den   Slave (Athapascan)                                    U           United States, Canada
 dgr   Dogrib                                                      2000  Dogrib
@@ -123,7 +124,7 @@ gor   Gorontalo                                                 900000  Indonesi
 got   Gothic                                                X
 grb   Grebo                                                 U   220000  Liberia
 grc   Greek, Ancient (to 1453)                              X
-gsw   Alemani; Swiss German                                    6000000  Switzerland
+gsw   Swiss German; Alemannic; Alsatian                        6000000  Switzerland
 gwi   Gwich´in                                                     700  Canada
 hai   Haida                                                 U     3000  Canada, United States
 haw   Hawaiian                                                    1000  United States
@@ -134,7 +135,7 @@ hmn   Hmong                                                 U  4000000  China, L
 hsb   Upper Sorbian                                              15000  Germany
 hup   Hupa                                                           8  United States
 iba   Iban                                                      400000  Malaysia
-ijo   Ijo                                                   U
+ijo   Ijo languages                                         F
 ilo   Iloko                                                    8000000  Philippines
 inc   Indic (Other)                                         F
 ine   Indo-European (Other)                                 F
@@ -146,9 +147,9 @@ jpr   Judeo-Persian                                              80000  Israel
 jrb   Judeo-Arabic                                          U
 kaa   Kara-Kalpak                                               410000  Uzbekistan
 kab   Kabyle                                                   3100000  Algeria
-kac   Kachin                                                    940000  Myanmar
+kac   Kachin; Jingpho                                           940000  Myanmar
 kam   Kamba                                                    2400000  Kenya
-kar   Karen                                                 U           Myanmar
+kar   Karen languages                                       F           Myanmar
 kaw   Kawi                                                  U
 kbd   Kabardian                                                1000000  Turkey, Russia
 kha   Khasi                                                     865000  India
@@ -160,7 +161,7 @@ kos   Kosraean                                                    8000  Micrones
 kpe   Kpelle                                                U           Liberia
 krc   Karachay-Balkar                                           240000  Russia
 krl   Karelian                                                  128000  Russia
-kro   Kru                                                   U           Côte d'Ivoire
+kro   Kru languages                                         F           Côte d'Ivoire
 kru   Kurukh                                                   2000000  India
 kum   Kumyk                                                     280000  Russia
 kut   Kutenai                                                        6  Canada
@@ -188,7 +189,7 @@ men   Mende                                                    1480000  Sierra L
 mga   Irish, Middle (900-1200)                              X
 mic   Mi'kmaq; Micmac                                             8500  Canada
 min   Minangkabau                                              8500000  Indonesia
-mis   Miscellaneous languages                               F
+mis   Uncoded languages                                     F
 mkh   Mon-Khmer (Other)                                     F
 mnc   Manchu                                                        60  China
 mni   Manipuri                                                 1260000  India
@@ -202,7 +203,7 @@ mwl   Mirandese                                                  15000  Portugal
 mwr   Marwari                                               U millions  India
 myn   Mayan languages                                       F
 myv   Erzya                                                     520000  Russia
-nah   Nahuatl                                               X
+nah   Nahuatl languages                                     FX
 nai   North American Indian                                 F
 nap   Neapolitan                                               7000000  Italy
 nds   Low German; Low Saxon; German, Low; Saxon, Low              1000  Germany
@@ -226,7 +227,7 @@ oto   Otomian languages                                     F
 paa   Papuan (Other)                                        F
 pag   Pangasinan                                               1160000  Philippines
 pal   Pahlavi                                               X
-pam   Pampanga                                                 1900000  Philippines
+pam   Pampanga; Kapampangan                                    1900000  Philippines
 pap   Papiamento                                                320000  Netherlands Antilles
 pau   Palauan                                                    15000  Palau
 peo   Persian, Old (ca.600-400 B.C.)                        X
@@ -238,7 +239,7 @@ pro   Provençal, Old (to 1500)                              X
 qaa-qtz   Reserved for local use                            Z
 raj   Rajasthani                                            U millions  India
 rap   Rapanui                                                     3400  Chile
-rar   Rarotongan                                                 17000  Cook Islands
+rar   Rarotongan; Cook Islands Maori                             17000  Cook Islands
 roa   Romance (Other)                                       F
 rom   Romany                                                U           Czech, Slovakia, ...
 rup   Aromanian; Arumanian; Macedo-Romanian                     300000  Greece
@@ -267,13 +268,14 @@ smn   Inari Sami                                                   250  Finland
 sms   Skolt Sami                                                   300  Finland
 snk   Soninke                                                   700000  Mali
 sog   Sogdian                                               X
-son   Songhai                                               U           Niger
-srn   Sranan Togo                                               120000  Suriname
+son   Songhai languages                                     F           Niger
+srn   Sranan Tongo                                              120000  Suriname
 srr   Serer                                                    1200000  Senegal
 ssa   Nilo-Saharan (Other)                                  F
 suk   Sukuma                                                   3200000  Tanzania
 sus   Susu                                                     1000000  Guinea
 sux   Sumerian                                              X
+syc   Classical Syriac                                      X
 syr   Syriac                                                X
 tai   Tai (Other)                                           F
 tem   Timne                                                    1200000  Sierra Leone
@@ -309,8 +311,9 @@ yao   Yao                                                      1942000  Malawi
 yap   Yapese                                                      6600  Micronesia
 ypk   Yupik languages                                       F
 zap   Zapotec                                               X
+zbl   Blissymbols                                           S
 zen   Zenaga                                                       200  Mauritania
-znd   Zande                                                 U
+znd   Zande languages                                       F
 zun   Zuni                                                        9700  United States
-zxx   No linguistic content                                 Z
+zxx   No linguistic content; Not applicable                 Z
 zza   Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki        U
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 7d04715..d7dcce6 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -3028,7 +3028,7 @@ Italian, Portuguese, Spanish, Swedish, Walloon,
 @item @code{KOI8-R} for Russian,
 @item @code{KOI8-U} for Ukrainian,
 @item @code{KOI8-T} for Tajik,
-@item @code{CP1251} for Bulgarian, Byelorussian,
+@item @code{CP1251} for Bulgarian, Belarusian,
 @item @code{GB2312}, @code{GBK}, @code{GB18030}
 for simplified writing of Chinese,
 @item @code{BIG5}, @code{BIG5-HKSCS}
diff --git a/gettext-tools/doc/iso-639-2.texi b/gettext-tools/doc/iso-639-2.texi
index 33a445c..d7bb568 100644
--- a/gettext-tools/doc/iso-639-2.texi
+++ b/gettext-tools/doc/iso-639-2.texi
@@ -2,12 +2,12 @@
 Achinese.
 @item awa
 Awadhi.
-@item bad
-Banda.
 @item bal
 Baluchi.
 @item ban
 Balinese.
+@item bej
+Beja; Bedawiyet.
 @item bem
 Bemba.
 @item bho
@@ -15,9 +15,7 @@ Bhojpuri.
 @item bik
 Bikol.
 @item bin
-Bini.
-@item btk
-Batak (Indonesia).
+Bini; Edo.
 @item bug
 Buginese.
 @item ceb
@@ -33,7 +31,7 @@ Fon.
 @item gon
 Gondi.
 @item gsw
-Alemani; Swiss German.
+Swiss German; Alemannic; Alsatian.
 @item hil
 Hiligaynon.
 @item hmn
@@ -87,7 +85,7 @@ Nyankole.
 @item pag
 Pangasinan.
 @item pam
-Pampanga.
+Pampanga; Kapampangan.
 @item raj
 Rajasthani.
 @item sas
diff --git a/gettext-tools/doc/iso-639.texi b/gettext-tools/doc/iso-639.texi
index 989ae4c..7e9e4ea 100644
--- a/gettext-tools/doc/iso-639.texi
+++ b/gettext-tools/doc/iso-639.texi
@@ -2,8 +2,6 @@
 Afar.
 @item ab
 Abkhazian.
-@item ad
-Adangme.
 @item ae
 Avestan.
 @item af
@@ -27,7 +25,7 @@ Azerbaijani.
 @item ba
 Bashkir.
 @item be
-Byelorussian; Belarusian.
+Belarusian.
 @item bg
 Bulgarian.
 @item bh
@@ -101,7 +99,7 @@ Western Frisian.
 @item ga
 Irish.
 @item gd
-Scots; Gaelic.
+Scottish Gaelic.
 @item gl
 Galician.
 @item gn
@@ -133,11 +131,11 @@ Interlingua.
 @item id
 Indonesian (formerly in).
 @item ie
-Interlingue.
+Interlingue; Occidental.
 @item ig
 Igbo.
 @item ii
-Sichuan Yi.
+Sichuan Yi; Nuosu.
 @item ik
 Inupiak; Inupiaq.
 @item io
@@ -165,7 +163,7 @@ Kazakh.
 @item kl
 Kalaallisut; Greenlandic.
 @item km
-Khmer; Cambodian.
+Central Khmer; Cambodian.
 @item kn
 Kannada.
 @item ko
@@ -261,13 +259,13 @@ Pali.
 @item pl
 Polish.
 @item ps
-Pashto, Pushto.
+Pashto; Pushto.
 @item pt
 Portuguese.
 @item qu
 Quechua.
 @item rm
-Rhaeto-Romance.
+Romansh.
 @item rn
 Rundi; Kirundi.
 @item ro