Update the languages and countries lists.

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index a43dac95472f8b1dd724cc8788a34113dc96d4ec..ce653575cd52ccd09d3140ee59ad8dc230e736c9 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-05  Bruno Haible  <bruno@clisp.org>
+
+       * ISO_639: Add Adangme. Fix the names of Western Frisian, Galician,
+       Marshallese, Sinhala.
+       * ISO_3166: Add AX, GG, IM, JE, ME, RS. Remove CS.
+
 2006-10-03  Bruno Haible  <bruno@clisp.org>
 
        * gettext.texi (PO Files): Document the "previous msgid" syntax.

diff --git a/gettext-tools/doc/ISO_3166 b/gettext-tools/doc/ISO_3166
index b4bafdb18244851fa865966436d7351423d2d609..4f21440183674fd96e86988ca17fd75b2d591a49 100644 (file)
--- a/gettext-tools/doc/ISO_3166
+++ b/gettext-tools/doc/ISO_3166
@@ -35,6 +35,7 @@ AS    Samoa (American)
 AT     Austria
 AU     Australia
 AW     Aruba
+AX     Åland Islands
 AZ     Azerbaijan
 BA     Bosnia & Herzegovina
 BB     Barbados
@@ -58,7 +59,7 @@ BZ    Belize
 CA     Canada
 CC     Cocos (Keeling) Islands
 CD     Congo (Dem. Rep.)
-CF     Central African Rep.
+CF     Central African Republic
 CG     Congo (Rep.)
 CH     Switzerland
 CI     Côte d'Ivoire
@@ -68,7 +69,6 @@ CM    Cameroon
 CN     China
 CO     Colombia
 CR     Costa Rica
-CS     Serbia & Montenegro
 CU     Cuba
 CV     Cape Verde
 CX     Christmas Island
@@ -94,10 +94,11 @@ FM  Micronesia
 FO     Faeroe Islands
 FR     France
 GA     Gabon
-GB     Britain (UK)
+GB     Britain (United Kingdom)
 GD     Grenada
 GE     Georgia
 GF     French Guiana
+GG     Guernsey
 GH     Ghana
 GI     Gibraltar
 GL     Greenland
@@ -120,12 +121,14 @@ HU        Hungary
 ID     Indonesia
 IE     Ireland
 IL     Israel
+IM     Isle of Man
 IN     India
 IO     British Indian Ocean Territory
 IQ     Iraq
 IR     Iran
 IS     Iceland
 IT     Italy
+JE     Jersey
 JM     Jamaica
 JO     Jordan
 JP     Japan
@@ -154,6 +157,7 @@ LY  Libya
 MA     Morocco
 MC     Monaco
 MD     Moldova
+ME     Montenegro
 MG     Madagascar
 MH     Marshall Islands
 MK     Macedonia
@@ -202,6 +206,7 @@ PY  Paraguay
 QA     Qatar
 RE     Réunion
 RO     Romania
+RS     Serbia
 RU     Russia
 RW     Rwanda
 SA     Saudi Arabia
@@ -246,7 +251,7 @@ US  United States
 UY     Uruguay
 UZ     Uzbekistan
 VA     Vatican City
-VC     St Vincent
+VC     St Vincent & the Grenadines
 VE     Venezuela
 VG     Virgin Islands (UK)
 VI     Virgin Islands (US)

diff --git a/gettext-tools/doc/ISO_639 b/gettext-tools/doc/ISO_639
index fa1f53b70a55c937c7e60f60f8f363db5efd28fd..8d91fce3a913c7f776fbbe90f78c1f1179c0639f 100644 (file)
--- a/gettext-tools/doc/ISO_639
+++ b/gettext-tools/doc/ISO_639
@@ -11,6 +11,8 @@ Sinhalese corrected, 1995-10-10 by Michael Everson
 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
 
 Two-letter lower-case symbols are used.
 The Registration Authority for ISO 639 is Infoterm, Osterreichisches
@@ -18,6 +20,7 @@ Normungsinstitut (ON), Postfach 130, A-1021 Vienna, Austria.
 
 aa Afar
 ab Abkhazian
+ad Adangme
 ae Avestan
 af Afrikaans
 ak Akan
@@ -52,7 +55,7 @@ cy Welsh
 
 da Danish
 de German
-dv Divehi
+dv Divehi; Maldivian
 dz Dzongkha; Bhutani
 
 ee @'Ew@'e
@@ -69,16 +72,16 @@ fi Finnish
 fj Fijian; Fiji
 fo Faroese
 fr French
-fy Frisian
+fy Western Frisian
 
 ga Irish
 gd Scots; Gaelic
-gl Gallegan; Galician
+gl Galician
 gn Guarani
 gu Gujarati
 gv Manx
 
-ha Hausa (?)
+ha Hausa
 he Hebrew (formerly iw)
 hi Hindi
 ho Hiri Motu
@@ -93,7 +96,7 @@ id Indonesian (formerly in)
 ie Interlingue
 ig Igbo
 ii Sichuan Yi
-ik Inupiak
+ik Inupiak; Inupiaq
 io Ido
 is Icelandic
 it Italian
@@ -104,8 +107,8 @@ jv Javanese
 
 ka Georgian
 kg Kongo
-ki Kikuyu
-kj Kuanyama
+ki Kikuyu; Gikuyu
+kj Kuanyama; Kwanyama
 kk Kazakh
 kl Kalaallisut; Greenlandic
 km Khmer; Cambodian
@@ -119,7 +122,7 @@ kw Cornish
 ky Kirghiz
 
 la Latin
-lb Letzeburgesch
+lb Letzeburgesch; Luxembourgish
 lg Ganda
 li Limburgish; Limburger; Limburgan
 ln Lingala
@@ -129,7 +132,7 @@ lu Luba-Katanga
 lv Latvian; Lettish
 
 mg Malagasy
-mh Marshall
+mh Marshallese
 mi Maori
 mk Macedonian
 ml Malayalam
@@ -149,7 +152,7 @@ nl Dutch
 nn Norwegian Nynorsk
 no Norwegian
 nr Ndebele, South
-nv Navajo
+nv Navajo; Navaho
 ny Chichewa; Nyanja
 
 oc Occitan; Proven@,{c}al
@@ -177,7 +180,7 @@ sc Sardinian
 sd Sindhi
 se Northern Sami
 sg Sango; Sangro
-si Sinhalese
+si Sinhala; Sinhalese
 sk Slovak
 sl Slovenian
 sm Samoan
@@ -199,7 +202,7 @@ ti Tigrinya
 tk Turkmen
 tl Tagalog
 tn Tswana; Setswana
-to Tonga (?)
+to Tonga
 tr Turkish
 ts Tsonga
 tt Tatar

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 14b5a6dd5415ebbb36ba09cc5c7e82fb3b8eee34..31ade88261baa9c9ec73765114656dfb0debcf60 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-05  Bruno Haible  <bruno@clisp.org>
+
+       * lang-table.c (language_table): Add Adangme, Kashubian. Fix the
+       names of Western Frisian, Marshallese, Sinhala.
+       * msginit.c (catalogname_for_locale): Add entries for Kashubian,
+       Western Frisian, South Ndebele. Change entry for Serbian from sr_CS to
+       sr_RS.
+
 2006-10-06  Bruno Haible  <bruno@clisp.org>
 
        * write-java.c (msgdomain_write_java): Use fopen_temp, fwriteerror_temp

diff --git a/gettext-tools/src/lang-table.c b/gettext-tools/src/lang-table.c
index edf57376c44518187bf1b000bb823db5fd938b9a..18c03f610dd243413494543de9162c58a09f72db 100644 (file)
--- a/gettext-tools/src/lang-table.c
+++ b/gettext-tools/src/lang-table.c
@@ -1,5 +1,5 @@
 /* Table of languages.
-   Copyright (C) 2001-2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2005.
 
    This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@ struct language_table_entry language_table[] =
   {
     { "aa", "Afar" },
     { "ab", "Abkhazian" },
+    { "ad", "Adangme" },
     { "ae", "Avestan" },
     { "af", "Afrikaans" },
     { "ak", "Akan" },
@@ -55,6 +56,7 @@ struct language_table_entry language_table[] =
     { "co", "Corsican" },
     { "cr", "Cree" },
     { "cs", "Czech" },
+    { "csb", "Kashubian" },
     { "cu", "Church Slavic" },
     { "cv", "Chuvash" },
     { "cy", "Welsh" },
@@ -75,7 +77,7 @@ struct language_table_entry language_table[] =
     { "fj", "Fijian" },
     { "fo", "Faroese" },
     { "fr", "French" },
-    { "fy", "Frisian" },
+    { "fy", "Western Frisian" },
     { "ga", "Irish" },
     { "gd", "Scots" },
     { "gl", "Galician" },
@@ -133,7 +135,7 @@ struct language_table_entry language_table[] =
     { "lv", "Latvian" },
     { "mai", "Maithili" },
     { "mg", "Malagasy" },
-    { "mh", "Marshall" },
+    { "mh", "Marshallese" },
     { "mi", "Maori" },
     { "mk", "Macedonian" },
     { "ml", "Malayalam" },
@@ -181,7 +183,7 @@ struct language_table_entry language_table[] =
     { "sd", "Sindhi" },
     { "se", "Northern Sami" },
     { "sg", "Sango" },
-    { "si", "Sinhalese" },
+    { "si", "Sinhala" },
     { "sk", "Slovak" },
     { "sl", "Slovenian" },
     { "sm", "Samoan" },

diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index 02167f1e5990157d6ab1e33da3fa652578237901..9d462cebcba780b3e361c7814699d4e11bf8feb0 100644 (file)
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -499,6 +499,7 @@ catalogname_for_locale (const char *locale)
     "co_FR",   /* Corsican     France */
     "cr_CA",   /* Cree         Canada */
     "cs_CZ",   /* Czech        Czech Republic */
+    "csb_PL",  /* Kashubian    Poland */
     "cy_GB",   /* Welsh        Britain */
     "da_DK",   /* Danish       Denmark */
     "de_DE",   /* German       Germany */
@@ -515,6 +516,7 @@ catalogname_for_locale (const char *locale)
     "fj_FJ",   /* Fijian       Fiji */
     "fo_FO",   /* Faroese      Faeroe Islands */
     "fr_FR",   /* French       France */
+    "fy_NL",   /* Western Frisian      Netherlands */
     "ga_IE",   /* Irish        Ireland */
     "gd_GB",   /* Scots        Britain */
     "gu_IN",   /* Gujarati     India */
@@ -568,6 +570,7 @@ catalogname_for_locale (const char *locale)
     "nl_NL",   /* Dutch        Netherlands */
     "nn_NO",   /* Norwegian Nynorsk    Norway */
     "no_NO",   /* Norwegian    Norway */
+    "nr_ZA",   /* South Ndebele        South Africa */
     "nso_ZA",  /* Northern Sotho       South Africa */
     "oc_FR",   /* Occitan      France */
     "oj_CA",   /* Ojibwa       Canada */
@@ -583,13 +586,13 @@ catalogname_for_locale (const char *locale)
     "ru_RU",   /* Russian      Russia */
     "sa_IN",   /* Sanskrit     India */
     "sc_IT",   /* Sardinian    Italy */
-    "sg_CF",   /* Sango        Central African Rep. */
-    "si_LK",   /* Sinhalese    Sri Lanka */
+    "sg_CF",   /* Sango        Central African Republic */
+    "si_LK",   /* Sinhala      Sri Lanka */
     "sk_SK",   /* Slovak       Slovakia */
     "sl_SI",   /* Slovenian    Slovenia */
     "so_SO",   /* Somali       Somalia */
     "sq_AL",   /* Albanian     Albania */
-    "sr_CS",   /* Serbian      Serbia & Montenegro */
+    "sr_RS",   /* Serbian      Serbia */
     "sr_YU",   /* Serbian      Yugoslavia */
     "sv_SE",   /* Swedish      Sweden */
     "te_IN",   /* Telugu       India */