[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. iso-codes/3.6-38-g88e04e9

Christian Perrier bubulle at debian.org
Wed Mar 4 21:39:31 UTC 2009


The following commit has been merged in the master branch:
commit f6bdd61bf436b2f4f7d3d7e55d3a0f533f493e1a
Author: Christian Perrier <bubulle at debian.org>
Date:   Wed Mar 4 22:23:34 2009 +0100

    Refresh PO files

diff --git a/iso_639/af.po b/iso_639/af.po
index be74f48..c976bed 100644
--- a/iso_639/af.po
+++ b/iso_639/af.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2007-1116 22:3+0200\n"
 "Last-Translator: Friedel Wolff <friedel at translate.org.za>\n"
 "Language-Team: Afrikaans <translate-discuss-af at lists.sourceforge.net>\n"
@@ -48,8 +48,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-Asiaties (ander)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apache-tale"
 
 #. name for afh
 msgid "Afrihili"
@@ -131,8 +132,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Kunsmatig (ander)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Sorbiese tale"
 
 #. name for arw
 msgid "Arawak"
@@ -213,8 +215,9 @@ msgid "Basa"
 msgstr "Hausa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Balties (ander)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Veelvuldige tale"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -233,8 +236,9 @@ msgid "Bengali"
 msgstr "Bengalees"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berber (ander)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Koreaans"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -262,8 +266,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantoe (ander)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Koreaans"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -308,8 +313,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Australiese tale"
 
 #. name for car
 #, fuzzy
@@ -321,16 +327,18 @@ msgid "Catalan; Valencian"
 msgstr "Katalaans"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Australiese tale"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Kelties (ander)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Veelvuldige tale"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -410,15 +418,15 @@ msgid "Corsican"
 msgstr "Korsikaans"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -431,7 +439,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -439,8 +447,9 @@ msgid "Kashubian"
 msgstr "Kasjoebies"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Australiese tale"
 
 #. name for ces, cs
 msgid "Czech"
@@ -490,8 +499,9 @@ msgid "Dogri"
 msgstr "Maori"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidies (ander)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Sorbiese tale"
 
 #. name for dsb
 #, fuzzy
@@ -585,8 +595,9 @@ msgid "Finnish"
 msgstr "Fins"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Sorbiese tale"
 
 #. name for fon
 msgid "Fon"
@@ -638,8 +649,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germaans (ander)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Sorbiese tale"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -837,16 +849,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indies (ander)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Ongekodeerde tale"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesies"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indo-Europees (ander)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Sorbiese tale"
 
 #. name for inh
 #, fuzzy
@@ -858,8 +872,9 @@ msgid "Inupiaq"
 msgstr "Inupiak"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Irannees (ander)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Sorbiese tale"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -948,8 +963,9 @@ msgid "Khasi"
 msgstr "Tais"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Sorbiese tale"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1169,8 +1185,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Australiese tale"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1216,8 +1233,9 @@ msgid "Uncoded languages"
 msgstr "Ongekodeerde tale"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Koreaans"
 
 #. name for mlg, mg
 #, fuzzy
@@ -1296,7 +1314,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Noord-Sami"
 
 #. name for nap
@@ -1341,8 +1359,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Sorbiese tale"
 
 #. name for niu
 #, fuzzy
@@ -1440,8 +1459,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Majatale"
 
 #. name for pag
 #, fuzzy
@@ -1478,8 +1498,9 @@ msgid "Persian"
 msgstr "Persies"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Veelvuldige tale"
 
 #. name for phn
 #, fuzzy
@@ -1538,8 +1559,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romaans (ander)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Apache-tale"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1580,8 +1602,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Noord-Sami"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1618,8 +1641,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semities (ander)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Gebaretale"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1648,12 +1672,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Sorbiese tale"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slawies (ander)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Apache-tale"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1672,8 +1698,9 @@ msgid "Northern Sami"
 msgstr "Noord-Sami"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Gebaretale"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1744,8 +1771,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Sorbiese tale"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1791,8 +1819,9 @@ msgid "Tahitian"
 msgstr "Letties"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Koreaans"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1909,8 +1938,9 @@ msgid "Turkish"
 msgstr "Turks"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaïes (ander)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apache-tale"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/am.po b/iso_639/am.po
index 48c72cc..122959c 100644
--- a/iso_639/am.po
+++ b/iso_639/am.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-08-07 22:10+0100\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Amharic\n"
@@ -43,7 +43,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -123,8 +123,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "ኮሪያኛ"
 
 #. name for arw
 msgid "Arawak"
@@ -199,8 +200,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "ኮሪያኛ"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -219,8 +221,9 @@ msgid "Bengali"
 msgstr "በንጋሊኛ"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "ኮሪያኛ"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -247,8 +250,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "ኮሪያኛ"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -291,8 +295,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "ፍሪስኛ"
 
 #. name for car
 #, fuzzy
@@ -304,16 +309,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "ኮሪያኛ"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "ኮሪያኛ"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -391,15 +398,15 @@ msgid "Corsican"
 msgstr "ኮርሲካኛ"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -411,7 +418,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -419,8 +426,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "ኮሪያኛ"
 
 #. name for ces, cs
 msgid "Czech"
@@ -467,8 +475,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "ኮሪያኛ"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -559,8 +568,9 @@ msgid "Finnish"
 msgstr "ፊኒሽ"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "ኮሪያኛ"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +624,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "ኮሪያኛ"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -803,16 +814,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "ኮሪያኛ"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "እንዶኒሲኛ"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "ኮሪያኛ"
 
 #. name for inh
 msgid "Ingush"
@@ -823,8 +836,9 @@ msgid "Inupiaq"
 msgstr "እኑፒያቅኛ"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "ኮሪያኛ"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -909,8 +923,9 @@ msgid "Khasi"
 msgstr "ታይኛ"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "ኮሪያኛ"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1111,8 +1126,9 @@ msgid "Maori"
 msgstr "ማዮሪኛ"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "ኮሪያኛ"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1156,8 +1172,9 @@ msgid "Uncoded languages"
 msgstr "ኮሪያኛ"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "ኮሪያኛ"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1231,7 +1248,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "ፍሪስኛ"
 
 #. name for nap
@@ -1275,8 +1292,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "ኮሪያኛ"
 
 #. name for niu
 msgid "Niuean"
@@ -1371,8 +1389,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "ኮሪያኛ"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1407,8 +1426,9 @@ msgid "Persian"
 msgstr "ፐርሲያኛ"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "ኮሪያኛ"
 
 #. name for phn
 msgid "Phoenician"
@@ -1463,8 +1483,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "ኮሪያኛ"
 
 #. name for roh, rm
 #, fuzzy
@@ -1504,8 +1525,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "ፍሪስኛ"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1540,8 +1562,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "ኮሪያኛ"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1569,12 +1592,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "ኮሪያኛ"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "ኮሪያኛ"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1593,8 +1618,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "ኮሪያኛ"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1662,8 +1688,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "ኮሪያኛ"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1706,8 +1733,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "ኮሪያኛ"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1818,8 +1846,9 @@ msgid "Turkish"
 msgstr "ቱርክኛ"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "ኮሪያኛ"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/ar.po b/iso_639/ar.po
index 581c845..3cb7507 100644
--- a/iso_639/ar.po
+++ b/iso_639/ar.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2002-01-04 22:08+0000\n"
 "Last-Translator: Mohammad Gamal <f2c2001 at yahoo.com>\n"
 "Language-Team: Arabic <support at arabeyes.org>\n"
@@ -48,7 +48,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -134,8 +134,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "الكورية"
 
 #. name for arw
 msgid "Arawak"
@@ -213,8 +214,9 @@ msgid "Basa"
 msgstr "الباسك"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "الكورية"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -233,8 +235,9 @@ msgid "Bengali"
 msgstr "البنغالية"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "الكورية"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -263,8 +266,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "الكورية"
 
 #. name for bos, bs
 #, fuzzy
@@ -310,8 +314,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "الأوكرانية"
 
 #. name for car
 #, fuzzy
@@ -323,16 +328,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "الكورية"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "الكورية"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -414,15 +421,15 @@ msgid "Corsican"
 msgstr "البوسنية"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -435,7 +442,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -443,8 +450,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "الكورية"
 
 #. name for ces, cs
 msgid "Czech"
@@ -493,8 +501,9 @@ msgid "Dogri"
 msgstr "الموري"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "الكورية"
 
 #. name for dsb
 #, fuzzy
@@ -587,8 +596,9 @@ msgid "Finnish"
 msgstr "الفنلندية"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "الكورية"
 
 #. name for fon
 msgid "Fon"
@@ -643,8 +653,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "الكورية"
 
 #. name for kat, ka
 #, fuzzy
@@ -841,16 +852,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "الكورية"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "الإندونيسية"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "الكورية"
 
 #. name for inh
 #, fuzzy
@@ -862,8 +875,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "الكورية"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -952,8 +966,9 @@ msgid "Khasi"
 msgstr "التايلاندية"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "الكورية"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1166,8 +1181,9 @@ msgid "Maori"
 msgstr "الموري"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "الكورية"
 
 #. name for mar, mr
 #, fuzzy
@@ -1213,8 +1229,9 @@ msgid "Uncoded languages"
 msgstr "الكورية"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "الكورية"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1293,7 +1310,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "الأوكرانية"
 
 #. name for nap
@@ -1338,8 +1355,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "الكورية"
 
 #. name for niu
 msgid "Niuean"
@@ -1437,8 +1455,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "الكورية"
 
 #. name for pag
 #, fuzzy
@@ -1474,8 +1493,9 @@ msgid "Persian"
 msgstr "الفارسي"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "الكورية"
 
 #. name for phn
 #, fuzzy
@@ -1533,8 +1553,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "الكورية"
 
 #. name for roh, rm
 #, fuzzy
@@ -1575,8 +1596,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "الأوكرانية"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1613,8 +1635,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "الكورية"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1643,12 +1666,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "الكورية"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "الكورية"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1667,8 +1692,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "الكورية"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1740,8 +1766,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "الكورية"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1787,8 +1814,9 @@ msgid "Tahitian"
 msgstr "اللاتفية"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "الكورية"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1903,8 +1931,9 @@ msgid "Turkish"
 msgstr "التركية"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "الكورية"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/ast.po b/iso_639/ast.po
index 1de2e78..657fcaa 100644
--- a/iso_639/ast.po
+++ b/iso_639/ast.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-12-18 08:22+0000\n"
 "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales at gmail."
 "com>\n"
@@ -46,8 +46,9 @@ msgid "Adyghe; Adygei"
 msgstr "Adyghe; Adygei"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-Asiaticu (Otru)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Llingües Apaches"
 
 #. name for afh
 msgid "Afrihili"
@@ -126,8 +127,9 @@ msgid "Arapaho"
 msgstr "Arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Artificial (Otru)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Llingües Otomianes"
 
 #. name for arw
 msgid "Arawak"
@@ -202,8 +204,9 @@ msgid "Basa"
 msgstr "Basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Bálticu (Otru)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Llingües Batak"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -222,8 +225,9 @@ msgid "Bengali"
 msgstr "Bengalí"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Bereber (Otres)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Llingües Karen"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -250,8 +254,9 @@ msgid "Siksika"
 msgstr "Siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantú (Otru)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Llingües Banda"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -294,7 +299,8 @@ msgid "Caddo"
 msgstr "Caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Indíxena d'América Central (Otru)"
 
 #. name for car
@@ -306,16 +312,18 @@ msgid "Catalan; Valencian"
 msgstr "Catalán"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Caucasianu (Otru)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Llingües Wakashanes"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuanu"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Célticu (Otru)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Llingües Chamic"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -394,15 +402,18 @@ msgid "Corsican"
 msgstr "Corsu"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Creoles y pidgins, basaos nel inglés (Otros)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Creoles y pidgins, basaos nel francés (Otros)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Creoles y pidgins, basaos nel pertués (Otros)"
 
 #. name for cre, cr
@@ -414,7 +425,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Turcu de Crimea"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Creoles y pidgins (Otros)"
 
 #. name for csb
@@ -422,8 +434,9 @@ msgid "Kashubian"
 msgstr "Kashubianu"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Cushiticu (Otru)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Llingües Chamic"
 
 #. name for ces, cs
 msgid "Czech"
@@ -470,8 +483,9 @@ msgid "Dogri"
 msgstr "Dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidiques (Otres)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Llingües Sorbies"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -562,8 +576,9 @@ msgid "Finnish"
 msgstr "Finlandés"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Fino-Ugrianu (Otru)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Llingües Sorbies"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +629,9 @@ msgid "Gbaya"
 msgstr "Gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Xermánicu (Otru)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Llingües Chamic"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -803,16 +819,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua (Asociación de la Llingua Auxiliar Internacional)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Índiques (Otres)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Llingües Banda"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesiu"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indoeuropees (Otres)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Llingües Iroqueses"
 
 #. name for inh
 msgid "Ingush"
@@ -823,8 +841,9 @@ msgid "Inupiaq"
 msgstr "Inupiaq"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iranies (Otres)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Llingües Iroqueses"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -907,8 +926,9 @@ msgid "Khasi"
 msgstr "Khasi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Khoisan (Otres)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Llingües Otomianes"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1108,8 +1128,9 @@ msgid "Maori"
 msgstr "Maorí"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Austronesiu (Otru)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Llingües Australianes"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1152,8 +1173,9 @@ msgid "Uncoded languages"
 msgstr "Idiomes ensin codificar"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-Jemer (Otru)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Llingües Kru"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1224,7 +1246,8 @@ msgid "Nahuatl languages"
 msgstr "Llingües Nahuatl"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Indíxenes d'América del Norte"
 
 #. name for nap
@@ -1268,7 +1291,8 @@ msgid "Nias"
 msgstr "Nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Niger-Kordofanianu (Otru)"
 
 #. name for niu
@@ -1366,8 +1390,9 @@ msgid "Otomian languages"
 msgstr "Llingües Otomianes"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papuanu (Otru)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Llingües Maya"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1402,8 +1427,9 @@ msgid "Persian"
 msgstr "Persa"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipinu (Otru)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Llingües múltiples"
 
 #. name for phn
 msgid "Phoenician"
@@ -1460,8 +1486,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "Rarotonganu; Maori de les Islles Cook"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romance (Otru)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Llingües Otomianes"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1500,7 +1527,8 @@ msgid "Yakut"
 msgstr "Yakut"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Indíxenes d'América del Sur (Otru)"
 
 #. name for sal
@@ -1536,8 +1564,9 @@ msgid "Selkup"
 msgstr "Selkup"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semíticu (Otru)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Llingües Chamic"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1564,12 +1593,14 @@ msgid "Siouan languages"
 msgstr "Llingües Siouan"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-Tibetanu (Otru)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Llingües Siouan"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Eslavu (Otru)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Llingües Chamic"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1588,8 +1619,9 @@ msgid "Northern Sami"
 msgstr "Sami del Norte"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Llingües Sami (Otru)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Llingües Chamic"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1656,8 +1688,9 @@ msgid "Serer"
 msgstr "Serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-Saharianu (Otru)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Llingües Salishan"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1700,8 +1733,9 @@ msgid "Tahitian"
 msgstr "Tahitianu"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tai (Otru)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Llingües Tupi"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1812,8 +1846,9 @@ msgid "Turkish"
 msgstr "Turcu"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaicu (Otru)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Llingües Apaches"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/az.po b/iso_639/az.po
index ec9b73e..1d7a054 100644
--- a/iso_639/az.po
+++ b/iso_639/az.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2001-07-28 11:19GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu <azerb_linux at hotmail.com>\n"
 "Language-Team: Azerbaijani Turkish <linuxaz at azerimail.net>\n"
@@ -47,7 +47,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -133,8 +133,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Korecə"
 
 #. name for arw
 msgid "Arawak"
@@ -214,8 +215,9 @@ msgid "Basa"
 msgstr "Balsa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Korecə"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -236,8 +238,9 @@ msgid "Bengali"
 msgstr "Baltik"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Korecə"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -266,8 +269,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Korecə"
 
 #. name for bos, bs
 #, fuzzy
@@ -315,8 +319,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Ukraynaca"
 
 #. name for car
 #, fuzzy
@@ -328,16 +333,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Korecə"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Korecə"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -418,15 +425,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -439,7 +446,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -447,8 +454,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Korecə"
 
 #. name for ces, cs
 #, fuzzy
@@ -499,8 +507,9 @@ msgid "Dogri"
 msgstr "Kənarlar"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Korecə"
 
 #. name for dsb
 #, fuzzy
@@ -600,8 +609,9 @@ msgid "Finnish"
 msgstr "Fincə"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Korecə"
 
 #. name for fon
 msgid "Fon"
@@ -656,8 +666,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Korecə"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -860,16 +871,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Korecə"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "İndoneziyaca"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Korecə"
 
 #. name for inh
 #, fuzzy
@@ -882,8 +895,9 @@ msgid "Inupiaq"
 msgstr "Hintcə"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Korecə"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -972,8 +986,9 @@ msgid "Khasi"
 msgstr "Thai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Korecə"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1185,8 +1200,9 @@ msgid "Maori"
 msgstr "Kənarlar"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Korecə"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1233,8 +1249,9 @@ msgid "Uncoded languages"
 msgstr "Korecə"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Korecə"
 
 #. name for mlg, mg
 #, fuzzy
@@ -1314,7 +1331,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Ukraynaca"
 
 #. name for nap
@@ -1360,8 +1377,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Korecə"
 
 #. name for niu
 msgid "Niuean"
@@ -1460,8 +1478,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Korecə"
 
 #. name for pag
 #, fuzzy
@@ -1498,8 +1517,9 @@ msgid "Persian"
 msgstr "Çap Et"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Korecə"
 
 #. name for phn
 #, fuzzy
@@ -1557,8 +1577,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Korecə"
 
 #. name for roh, rm
 #, fuzzy
@@ -1600,8 +1621,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Ukraynaca"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1639,8 +1661,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Korecə"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1668,12 +1691,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Korecə"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Korecə"
 
 #. name for slk, sk
 #, fuzzy
@@ -1694,8 +1719,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Korecə"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1768,8 +1794,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Korecə"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1816,8 +1843,9 @@ msgid "Tahitian"
 msgstr "Latviya"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Korecə"
 
 #. name for tam, ta
 #, fuzzy
@@ -1933,8 +1961,9 @@ msgid "Turkish"
 msgstr "Türkcə"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Korecə"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/be.po b/iso_639/be.po
index ecc8eb5..67b0c58 100644
--- a/iso_639/be.po
+++ b/iso_639/be.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2007-10-04 01:38+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
@@ -41,8 +41,9 @@ msgid "Adyghe; Adygei"
 msgstr "Адыгейская"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Афра-азіяцкая (іншая)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Мовы апачы"
 
 #. name for afh
 msgid "Afrihili"
@@ -121,8 +122,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Штучная (іншая)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Сорбскія мовы"
 
 #. name for arw
 msgid "Arawak"
@@ -197,8 +199,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Балтыйская (іншая)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Некалькі моў"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -217,8 +220,9 @@ msgid "Bengali"
 msgstr "Бенгальская"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Сорбскія мовы"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -245,8 +249,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Банту (іншая)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Нубійскія мовы"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -289,7 +294,8 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Індзейская цэнтральна-амерыканская (іншая)"
 
 #. name for car
@@ -301,16 +307,18 @@ msgid "Catalan; Valencian"
 msgstr "Каталонская; Валенсія"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Каўказская (іншая)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Нубійскія мовы"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Кельцкая (іншая)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Некалькі моў"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -387,15 +395,18 @@ msgid "Corsican"
 msgstr "Карсіканская"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Трасянкі, на базе англійскай (іншая)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Трасянкі, на базе французскай (іншая)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Трасянкі, на базе партугальская (іншая)"
 
 #. name for cre, cr
@@ -407,7 +418,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Крымскіх татараў"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Трасянкі (іншая)"
 
 #. name for csb
@@ -415,8 +427,9 @@ msgid "Kashubian"
 msgstr "Кашубская"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Аўстралійскія мовы"
 
 #. name for ces, cs
 msgid "Czech"
@@ -463,8 +476,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Сорбскія мовы"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -555,8 +569,9 @@ msgid "Finnish"
 msgstr "Фінская"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Фіна-вугорская (іншая)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Сорбскія мовы"
 
 #. name for fon
 msgid "Fon"
@@ -607,8 +622,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Германская (іншая)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Сорбскія мовы"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -795,16 +811,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Індыйская (іншая)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Мовы без коду"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Інданезійская"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Інда-еўрапейская (іншая)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Сорбскія мовы"
 
 #. name for inh
 msgid "Ingush"
@@ -815,8 +833,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Іранская (іншая)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Сорбскія мовы"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -899,8 +918,9 @@ msgid "Khasi"
 msgstr ""
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Сорбскія мовы"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1099,8 +1119,9 @@ msgid "Maori"
 msgstr "Маоры"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Аўстранезійская (іншая)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Аўстралійскія мовы"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1143,8 +1164,9 @@ msgid "Uncoded languages"
 msgstr "Мовы без коду"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Мовы апачы"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1215,7 +1237,8 @@ msgid "Nahuatl languages"
 msgstr ""
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Індзейская паўночна-амерыканская"
 
 #. name for nap
@@ -1259,8 +1282,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Сорбскія мовы"
 
 #. name for niu
 msgid "Niuean"
@@ -1355,8 +1379,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Нубійскія мовы"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1391,8 +1416,9 @@ msgid "Persian"
 msgstr "Персідская"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Філіпінская (іншая)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Некалькі моў"
 
 #. name for phn
 msgid "Phoenician"
@@ -1447,8 +1473,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Раманская (іншая)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Мовы апачы"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1487,7 +1514,8 @@ msgid "Yakut"
 msgstr "Якуцкая"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Індзейская паўднёва-амерыканская (іншая)"
 
 #. name for sal
@@ -1523,8 +1551,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Семіцкая (іншая)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Мовы знакаў"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1551,12 +1580,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Сорбскія мовы"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Славянская (іншая)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Мовы апачы"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1575,8 +1606,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Мовы знакаў"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1643,8 +1675,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Нубійскія мовы"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1687,8 +1720,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Мовы апачы"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1799,8 +1833,9 @@ msgid "Turkish"
 msgstr "Турэцкая"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Алтайская (іншая)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Мовы апачы"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/bg.po b/iso_639/bg.po
index 85491a5..7ec427a 100644
--- a/iso_639/bg.po
+++ b/iso_639/bg.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2001-09-08 18:10+0200\n"
 "Last-Translator: Borislav Aleksandrov <boby_a_ at web.bg>\n"
 "Language-Team: Bulgarian <bg at li.org>\n"
@@ -46,7 +46,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -131,8 +131,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Корейски"
 
 #. name for arw
 msgid "Arawak"
@@ -210,8 +211,9 @@ msgid "Basa"
 msgstr "Balsa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Корейски"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -231,8 +233,9 @@ msgid "Bengali"
 msgstr "Балтийски"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Корейски"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -261,8 +264,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Корейски"
 
 #. name for bos, bs
 #, fuzzy
@@ -308,8 +312,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Украински"
 
 #. name for car
 #, fuzzy
@@ -321,16 +326,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Корейски"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Корейски"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -411,15 +418,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -432,7 +439,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -440,8 +447,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Корейски"
 
 #. name for ces, cs
 msgid "Czech"
@@ -490,8 +498,9 @@ msgid "Dogri"
 msgstr "Граници"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Корейски"
 
 #. name for dsb
 #, fuzzy
@@ -587,8 +596,9 @@ msgid "Finnish"
 msgstr "Финландски"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Корейски"
 
 #. name for fon
 msgid "Fon"
@@ -643,8 +653,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Корейски"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -846,16 +857,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Корейски"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Индонезийски"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Корейски"
 
 #. name for inh
 #, fuzzy
@@ -868,8 +881,9 @@ msgid "Inupiaq"
 msgstr "Индийски"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Корейски"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -958,8 +972,9 @@ msgid "Khasi"
 msgstr "Тайландски"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Корейски"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1171,8 +1186,9 @@ msgid "Maori"
 msgstr "Граници"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Корейски"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1219,8 +1235,9 @@ msgid "Uncoded languages"
 msgstr "Корейски"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Корейски"
 
 #. name for mlg, mg
 #, fuzzy
@@ -1300,7 +1317,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Украински"
 
 #. name for nap
@@ -1346,8 +1363,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Корейски"
 
 #. name for niu
 msgid "Niuean"
@@ -1446,8 +1464,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Корейски"
 
 #. name for pag
 #, fuzzy
@@ -1484,8 +1503,9 @@ msgid "Persian"
 msgstr "Печат"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Корейски"
 
 #. name for phn
 #, fuzzy
@@ -1543,8 +1563,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Корейски"
 
 #. name for roh, rm
 #, fuzzy
@@ -1585,8 +1606,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Украински"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1625,8 +1647,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Корейски"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1654,12 +1677,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Корейски"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Корейски"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1678,8 +1703,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Корейски"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1751,8 +1777,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Корейски"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1798,8 +1825,9 @@ msgid "Tahitian"
 msgstr "Латвийски"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Корейски"
 
 #. name for tam, ta
 #, fuzzy
@@ -1915,8 +1943,9 @@ msgid "Turkish"
 msgstr "Турски"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Корейски"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/br.po b/iso_639/br.po
index 853b358..1bab3e5 100644
--- a/iso_639/br.po
+++ b/iso_639/br.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2002-01-04 23:27+0000\n"
 "Last-Translator: Jañ-Mai Drapier <jan-mai.drapierj at mail.dotcom.fr>\n"
 "Language-Team:L Brezhoneg <ofisk.bzh at wanadoo.fr>\n"
@@ -48,7 +48,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -134,8 +134,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Koreeg"
 
 #. name for arw
 msgid "Arawak"
@@ -214,8 +215,9 @@ msgid "Basa"
 msgstr "Euskareg"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Koreeg"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -235,8 +237,9 @@ msgid "Bengali"
 msgstr ""
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Koreeg"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -265,8 +268,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Koreeg"
 
 #. name for bos, bs
 #, fuzzy
@@ -312,8 +316,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Ukrainiek"
 
 #. name for car
 #, fuzzy
@@ -325,16 +330,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Koreeg"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Koreeg"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -416,15 +423,15 @@ msgid "Corsican"
 msgstr "Estoneg"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -437,7 +444,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -445,8 +452,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Koreeg"
 
 #. name for ces, cs
 msgid "Czech"
@@ -495,8 +503,9 @@ msgid "Dogri"
 msgstr "Maorieg"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Koreeg"
 
 #. name for dsb
 #, fuzzy
@@ -590,8 +599,9 @@ msgid "Finnish"
 msgstr "Finneg"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Koreeg"
 
 #. name for fon
 msgid "Fon"
@@ -646,8 +656,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Koreeg"
 
 #. name for kat, ka
 #, fuzzy
@@ -844,8 +855,9 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Koreeg"
 
 #. name for ind, id
 #, fuzzy
@@ -853,8 +865,9 @@ msgid "Indonesian"
 msgstr "Estoneg"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Koreeg"
 
 #. name for inh
 #, fuzzy
@@ -866,8 +879,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Koreeg"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -956,8 +970,9 @@ msgid "Khasi"
 msgstr "Thai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Koreeg"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1173,8 +1188,9 @@ msgid "Maori"
 msgstr "Maorieg"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Koreeg"
 
 #. name for mar, mr
 #, fuzzy
@@ -1220,8 +1236,9 @@ msgid "Uncoded languages"
 msgstr "Koreeg"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Koreeg"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1301,7 +1318,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Ukrainiek"
 
 #. name for nap
@@ -1346,8 +1363,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Koreeg"
 
 #. name for niu
 msgid "Niuean"
@@ -1446,8 +1464,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Koreeg"
 
 #. name for pag
 #, fuzzy
@@ -1484,8 +1503,9 @@ msgid "Persian"
 msgstr "Serbeg"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Koreeg"
 
 #. name for phn
 #, fuzzy
@@ -1543,8 +1563,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Koreeg"
 
 #. name for roh, rm
 #, fuzzy
@@ -1585,8 +1606,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Ukrainiek"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1622,8 +1644,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Koreeg"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1652,12 +1675,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Koreeg"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Koreeg"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1676,8 +1701,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Koreeg"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1749,8 +1775,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Koreeg"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1796,8 +1823,9 @@ msgid "Tahitian"
 msgstr "Kroatia"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Koreeg"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1912,8 +1940,9 @@ msgid "Turkish"
 msgstr "Turkeg"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Koreeg"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/bs.po b/iso_639/bs.po
index 00b7d3c..0e2f0cc 100644
--- a/iso_639/bs.po
+++ b/iso_639/bs.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2002-01-05 19:06:0000\n"
 "Last-Translator: Nesiren Armin <bianchi at lugbih.org>\n"
 "Language-Team: Bosanski <kde at lugbih.org>\n"
@@ -48,7 +48,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -132,8 +132,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Korejski"
 
 #. name for arw
 msgid "Arawak"
@@ -211,8 +212,9 @@ msgid "Basa"
 msgstr "Baskijski"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Korejski"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -231,8 +233,9 @@ msgid "Bengali"
 msgstr ""
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Korejski"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -259,8 +262,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Korejski"
 
 #. name for bos, bs
 #, fuzzy
@@ -306,7 +310,7 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+msgid "Central American Indian languages"
 msgstr ""
 
 #. name for car
@@ -319,16 +323,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Korejski"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Korejski"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -409,15 +415,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -430,7 +436,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -439,8 +445,9 @@ msgid "Kashubian"
 msgstr "Makedonski"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Korejski"
 
 #. name for ces, cs
 msgid "Czech"
@@ -489,8 +496,9 @@ msgid "Dogri"
 msgstr "Maorski"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Korejski"
 
 #. name for dsb
 #, fuzzy
@@ -582,8 +590,9 @@ msgid "Finnish"
 msgstr "Finski"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Korejski"
 
 #. name for fon
 msgid "Fon"
@@ -635,8 +644,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Korejski"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -831,16 +841,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Korejski"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Infoneziski"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Korejski"
 
 #. name for inh
 #, fuzzy
@@ -852,8 +864,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Korejski"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -942,8 +955,9 @@ msgid "Khasi"
 msgstr "Tajlandski"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Korejski"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1153,8 +1167,9 @@ msgid "Maori"
 msgstr "Maorski"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Korejski"
 
 #. name for mar, mr
 #, fuzzy
@@ -1200,8 +1215,9 @@ msgid "Uncoded languages"
 msgstr "Korejski"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Korejski"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1277,7 +1293,7 @@ msgid "Nahuatl languages"
 msgstr ""
 
 #. name for nai
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr ""
 
 #. name for nap
@@ -1322,8 +1338,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Korejski"
 
 #. name for niu
 msgid "Niuean"
@@ -1421,8 +1438,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Korejski"
 
 #. name for pag
 #, fuzzy
@@ -1460,8 +1478,9 @@ msgid "Persian"
 msgstr "Srpski"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Korejski"
 
 #. name for phn
 #, fuzzy
@@ -1519,8 +1538,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Korejski"
 
 #. name for roh, rm
 #, fuzzy
@@ -1561,7 +1581,7 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
+msgid "South American Indian languages"
 msgstr ""
 
 #. name for sal
@@ -1597,8 +1617,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Korejski"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1627,12 +1648,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Korejski"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Korejski"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1651,8 +1674,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Korejski"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1725,8 +1749,9 @@ msgid "Serer"
 msgstr "Hebrejski"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Korejski"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1772,8 +1797,9 @@ msgid "Tahitian"
 msgstr "Latviski"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Korejski"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1889,8 +1915,9 @@ msgid "Turkish"
 msgstr "Turski"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Korejski"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/byn.po b/iso_639/byn.po
index b740c2b..06e93d3 100644
--- a/iso_639/byn.po
+++ b/iso_639/byn.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-08-07 21:21+0100\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Blin\n"
@@ -43,7 +43,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -123,8 +123,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "ኮሪያኛ"
 
 #. name for arw
 msgid "Arawak"
@@ -199,8 +200,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "ኮሪያኛ"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -219,8 +221,9 @@ msgid "Bengali"
 msgstr "በንጋሊኛ"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "ኮሪያኛ"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -247,8 +250,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "ኮሪያኛ"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -291,8 +295,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "ፍሪስኛ"
 
 #. name for car
 #, fuzzy
@@ -304,16 +309,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "ኮሪያኛ"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "ኮሪያኛ"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -391,15 +398,15 @@ msgid "Corsican"
 msgstr "ኮርሲካኛ"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -411,7 +418,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -419,8 +426,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "ኮሪያኛ"
 
 #. name for ces, cs
 msgid "Czech"
@@ -467,8 +475,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "ኮሪያኛ"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -559,8 +568,9 @@ msgid "Finnish"
 msgstr "ፊኒሽ"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "ኮሪያኛ"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +624,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "ኮሪያኛ"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -803,16 +814,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "ኮሪያኛ"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "እንዶኒሲኛ"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "ኮሪያኛ"
 
 #. name for inh
 msgid "Ingush"
@@ -823,8 +836,9 @@ msgid "Inupiaq"
 msgstr "እኑፒያቅኛ"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "ኮሪያኛ"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -909,8 +923,9 @@ msgid "Khasi"
 msgstr "ታይኛ"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "ኮሪያኛ"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1111,8 +1126,9 @@ msgid "Maori"
 msgstr "ማዮሪኛ"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "ኮሪያኛ"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1156,8 +1172,9 @@ msgid "Uncoded languages"
 msgstr "ኮሪያኛ"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "ኮሪያኛ"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1231,7 +1248,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "ፍሪስኛ"
 
 #. name for nap
@@ -1275,8 +1292,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "ኮሪያኛ"
 
 #. name for niu
 msgid "Niuean"
@@ -1371,8 +1389,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "ኮሪያኛ"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1407,8 +1426,9 @@ msgid "Persian"
 msgstr "ፐርሲያኛ"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "ኮሪያኛ"
 
 #. name for phn
 msgid "Phoenician"
@@ -1463,8 +1483,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "ኮሪያኛ"
 
 #. name for roh, rm
 #, fuzzy
@@ -1504,8 +1525,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "ፍሪስኛ"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1540,8 +1562,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "ኮሪያኛ"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1569,12 +1592,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "ኮሪያኛ"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "ኮሪያኛ"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1593,8 +1618,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "ኮሪያኛ"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1662,8 +1688,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "ኮሪያኛ"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1706,8 +1733,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "ኮሪያኛ"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1818,8 +1846,9 @@ msgid "Turkish"
 msgstr "ቱርክኛ"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "ኮሪያኛ"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/ca.po b/iso_639/ca.po
index dfb5a2f..5c9c216 100644
--- a/iso_639/ca.po
+++ b/iso_639/ca.po
@@ -9,10 +9,10 @@
 #   Alastair McKinstry <mckinstry at computer.org>, 2001.
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2001-06-23 18:09+0200\n"
 "Last-Translator: Softcatalà <tradgnome at softcatala.org>\n"
 "Language-Team: Catalan <linux at softcatala.org>\n"
@@ -46,7 +46,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -131,8 +131,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Coreà"
 
 #. name for arw
 msgid "Arawak"
@@ -210,8 +211,9 @@ msgid "Basa"
 msgstr "Balsa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Coreà"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -231,8 +233,9 @@ msgid "Bengali"
 msgstr "Bàltic"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Coreà"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -261,8 +264,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Coreà"
 
 #. name for bos, bs
 #, fuzzy
@@ -308,8 +312,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Ucraïnès"
 
 #. name for car
 #, fuzzy
@@ -321,16 +326,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Coreà"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Coreà"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -411,15 +418,15 @@ msgid "Corsican"
 msgstr "cors"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -432,7 +439,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -440,8 +447,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Coreà"
 
 #. name for ces, cs
 msgid "Czech"
@@ -490,8 +498,9 @@ msgid "Dogri"
 msgstr "Marges"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Coreà"
 
 #. name for dsb
 #, fuzzy
@@ -585,8 +594,9 @@ msgid "Finnish"
 msgstr "Finès"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Coreà"
 
 #. name for fon
 msgid "Fon"
@@ -641,8 +651,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Coreà"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -844,16 +855,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Coreà"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesi"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Coreà"
 
 #. name for inh
 #, fuzzy
@@ -865,8 +878,9 @@ msgid "Inupiaq"
 msgstr "inupiak"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Coreà"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -956,8 +970,9 @@ msgid "Khasi"
 msgstr "Tai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Coreà"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1173,8 +1188,9 @@ msgid "Maori"
 msgstr "Marges"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Coreà"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1221,8 +1237,9 @@ msgid "Uncoded languages"
 msgstr "Coreà"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Coreà"
 
 #. name for mlg, mg
 #, fuzzy
@@ -1302,7 +1319,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Ucraïnès"
 
 #. name for nap
@@ -1348,8 +1365,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Coreà"
 
 #. name for niu
 msgid "Niuean"
@@ -1448,8 +1466,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Coreà"
 
 #. name for pag
 #, fuzzy
@@ -1486,8 +1505,9 @@ msgid "Persian"
 msgstr "Imprimeix"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Coreà"
 
 #. name for phn
 #, fuzzy
@@ -1545,8 +1565,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Coreà"
 
 #. name for roh, rm
 #, fuzzy
@@ -1587,8 +1608,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Ucraïnès"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1627,8 +1649,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Coreà"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1656,12 +1679,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Coreà"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Coreà"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1680,8 +1705,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Coreà"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1752,8 +1778,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Coreà"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1799,8 +1826,9 @@ msgid "Tahitian"
 msgstr "Croat (hr)"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Coreà"
 
 #. name for tam, ta
 #, fuzzy
@@ -1916,8 +1944,9 @@ msgid "Turkish"
 msgstr "Turc"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Coreà"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/cs.po b/iso_639/cs.po
index 841a122..5b62fc4 100644
--- a/iso_639/cs.po
+++ b/iso_639/cs.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-05-18 14:53+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -47,8 +47,9 @@ msgid "Adyghe; Adygei"
 msgstr "adygejština"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "afroasijské jazyky, ostatní"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "apačské jazyky"
 
 #. name for afh
 msgid "Afrihili"
@@ -129,8 +130,9 @@ msgid "Arapaho"
 msgstr "arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "umělé jazyky (ostatní)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "osmanské jazyky"
 
 #. name for arw
 msgid "Arawak"
@@ -205,8 +207,9 @@ msgid "Basa"
 msgstr "basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "baltské jazyky (ostatní)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "batacké jazyky"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -225,8 +228,9 @@ msgid "Bengali"
 msgstr "bengálština"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "berberské jazyky, ostatní"
+#, fuzzy
+msgid "Berber languages"
+msgstr "karenské jazyky"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -253,8 +257,9 @@ msgid "Siksika"
 msgstr "siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "bantuské jazyky, ostatní"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "bandské jazyky"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -297,7 +302,8 @@ msgid "Caddo"
 msgstr "caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "indiánské jazyky střední Ameriky, ostatní"
 
 #. name for car
@@ -309,16 +315,18 @@ msgid "Catalan; Valencian"
 msgstr "katalánština"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "kavkazské jazyky, ostatní"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "wakashské jazyky"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "cebuánština"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "keltské jazyky, ostatní"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "čamské jazyky"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -395,15 +403,18 @@ msgid "Corsican"
 msgstr "korsičtina"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "kreolština a jiné pidginy na základě angličtiny, ostatní"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "kreolština a jiné pidginy na základě francouzštiny, ostatní"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "kreolština a jiné pidginy na základě portugalštiny, ostatní"
 
 #. name for cre, cr
@@ -415,7 +426,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "krymská tatarština; krymská turečtina"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "kreolština a jiné pidginy, ostatní"
 
 #. name for csb
@@ -423,8 +435,9 @@ msgid "Kashubian"
 msgstr "kašubština"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "kušitské jazyky, ostatní"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "čamské jazyky"
 
 #. name for ces, cs
 msgid "Czech"
@@ -471,8 +484,9 @@ msgid "Dogri"
 msgstr "dógrí"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "drávidské jazyky, ostatní"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "lužická srbština"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -563,8 +577,9 @@ msgid "Finnish"
 msgstr "finština"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "ugrofinské jazyky, ostatní"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "lužická srbština"
 
 #. name for fon
 msgid "Fon"
@@ -615,8 +630,9 @@ msgid "Gbaya"
 msgstr "gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "germánské jazyky, ostatní"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "čamské jazyky"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -803,16 +819,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua (Mezinárodní pomocná jazyková asociace)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "indické jazyky, ostatní"
+#, fuzzy
+msgid "Indic languages"
+msgstr "bandské jazyky"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "indonéština"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "indoevropské jazyky, ostatní"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "irokézské jazyky"
 
 #. name for inh
 msgid "Ingush"
@@ -823,8 +841,9 @@ msgid "Inupiaq"
 msgstr "inupiak"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "íránština, ostatní"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "irokézské jazyky"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -907,8 +926,9 @@ msgid "Khasi"
 msgstr "khásí"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "khoisanské jazyky, ostatní"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "osmanské jazyky"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1108,8 +1128,9 @@ msgid "Maori"
 msgstr "maorština"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "malajsko-polynéské jazyky, ostatní"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "australské jazyky"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1152,8 +1173,9 @@ msgid "Uncoded languages"
 msgstr "nekatalogizované jazyky"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "mon-khmerské jazyky, ostatní"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "kruské jazyky"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1224,7 +1246,8 @@ msgid "Nahuatl languages"
 msgstr "nahuatlské jazyky"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "severoamerické indiánské jazyky"
 
 #. name for nap
@@ -1268,7 +1291,8 @@ msgid "Nias"
 msgstr "nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "nigersko-konžské jazyky, ostatní"
 
 #. name for niu
@@ -1365,8 +1389,9 @@ msgid "Otomian languages"
 msgstr "osmanské jazyky"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "papuánské jazyky, ostatní"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "májské jazyky"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1401,8 +1426,9 @@ msgid "Persian"
 msgstr "perština"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "filipínské jazyky, ostatní"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "více jazyků"
 
 #. name for phn
 msgid "Phoenician"
@@ -1459,8 +1485,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "rarotongština; maorština na Cookových ostrovech"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "románské jazyky, ostatní"
+#, fuzzy
+msgid "Romance languages"
+msgstr "osmanské jazyky"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1499,7 +1526,8 @@ msgid "Yakut"
 msgstr "jakutština"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "jihoamerické indiánské jazyky, ostatní"
 
 #. name for sal
@@ -1535,8 +1563,9 @@ msgid "Selkup"
 msgstr "selkupština"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "semitské jazyky, ostatní"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "čamské jazyky"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1563,12 +1592,14 @@ msgid "Siouan languages"
 msgstr "siouxské jazyky"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "sinotibetské jazyky, ostatní"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "siouxské jazyky"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "slovanské jazyky, ostatní"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "čamské jazyky"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1587,8 +1618,9 @@ msgid "Northern Sami"
 msgstr "sami jazyky, severní"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "sami jayzky, ostatní"
+#, fuzzy
+msgid "Sami languages"
+msgstr "čamské jazyky"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1655,8 +1687,9 @@ msgid "Serer"
 msgstr "serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "nilsko-saharské jazyky, ostatní"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "salishské jazyky"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1699,8 +1732,9 @@ msgid "Tahitian"
 msgstr "tahitština"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "thajské jazyky, ostatní"
+#, fuzzy
+msgid "Tai languages"
+msgstr "tupi jazyky"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1811,8 +1845,9 @@ msgid "Turkish"
 msgstr "turečtina"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "altajské jazyky (ostatní)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "apačské jazyky"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/cy.po b/iso_639/cy.po
index e0504bf..484f70f 100644
--- a/iso_639/cy.po
+++ b/iso_639/cy.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2002-08-14 20:57+0100\n"
 "Last-Translator: Dafydd Tomos <dafydd.tomos at imaginet.co.uk>\n"
 "Language-Team: Welsh <cy at li.org>\n"
@@ -46,8 +46,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Malagasi"
 
 #. name for afh
 msgid "Afrihili"
@@ -130,8 +131,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Malagasi"
 
 #. name for arw
 msgid "Arawak"
@@ -214,8 +216,9 @@ msgid "Basa"
 msgstr "Hawsa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Malagasi"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -234,8 +237,9 @@ msgid "Bengali"
 msgstr "Bengaleg"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Malagasi"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -263,8 +267,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Malagasi"
 
 #. name for bos, bs
 #, fuzzy
@@ -311,8 +316,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Ffriseg"
 
 #. name for car
 #, fuzzy
@@ -324,16 +330,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Malagasi"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Malagasi"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -413,15 +421,15 @@ msgid "Corsican"
 msgstr "Corseg"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -434,7 +442,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -443,8 +451,9 @@ msgid "Kashubian"
 msgstr "Canareg"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Malagasi"
 
 #. name for ces, cs
 msgid "Czech"
@@ -495,8 +504,9 @@ msgid "Dogri"
 msgstr "Maori"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Malagasi"
 
 #. name for dsb
 #, fuzzy
@@ -592,8 +602,9 @@ msgid "Finnish"
 msgstr "Ffinneg"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Malagasi"
 
 #. name for fon
 msgid "Fon"
@@ -648,8 +659,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Malagasi"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -849,16 +861,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Malagasi"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indoneseg"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Malagasi"
 
 #. name for inh
 #, fuzzy
@@ -870,8 +884,9 @@ msgid "Inupiaq"
 msgstr "Inwpiac"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Malagasi"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -960,8 +975,9 @@ msgid "Khasi"
 msgstr "Tai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Malagasi"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1183,8 +1199,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Malagasi"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1230,8 +1247,9 @@ msgid "Uncoded languages"
 msgstr "Malagasi"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Malagasi"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1313,7 +1331,7 @@ msgstr "Malagasi"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Ffriseg"
 
 #. name for nap
@@ -1359,8 +1377,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Malagasi"
 
 #. name for niu
 #, fuzzy
@@ -1459,8 +1478,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Malagasi"
 
 #. name for pag
 #, fuzzy
@@ -1498,8 +1518,9 @@ msgid "Persian"
 msgstr "Perseg"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Malagasi"
 
 #. name for phn
 #, fuzzy
@@ -1558,8 +1579,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Malagasi"
 
 #. name for roh, rm
 #, fuzzy
@@ -1601,8 +1623,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Ffriseg"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1641,8 +1664,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Malagasi"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1673,12 +1697,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Malagasi"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Malagasi"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1697,8 +1723,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Malagasi"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1770,8 +1797,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Malagasi"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1817,8 +1845,9 @@ msgid "Tahitian"
 msgstr "Latfieg"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Malagasi"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1935,8 +1964,9 @@ msgid "Turkish"
 msgstr "Tyrceg"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Malagasi"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/da.po b/iso_639/da.po
index 357792a..1555c04 100644
--- a/iso_639/da.po
+++ b/iso_639/da.po
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-05-21 13:48+0200\n"
 "Last-Translator: Frederik 'Freso' S. Olesen <freso.dk at gmail.com>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -58,8 +58,9 @@ msgid "Adyghe; Adygei"
 msgstr "Adygé; Adygei"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-asiatiske sprog (øvrige)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apachesprog"
 
 #. name for afh
 msgid "Afrihili"
@@ -140,8 +141,9 @@ msgid "Arapaho"
 msgstr "Arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Kunstsprog (øvrige)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Otomi sprog"
 
 #. name for arw
 msgid "Arawak"
@@ -216,8 +218,9 @@ msgid "Basa"
 msgstr "Basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltisk (Andre)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Batak-sprog"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -236,8 +239,9 @@ msgid "Bengali"
 msgstr "Bengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berberiske sprog (øvrige)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Karen-sprog"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -264,8 +268,9 @@ msgid "Siksika"
 msgstr "Siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantu (øvrige)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Banda-sprog"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -308,7 +313,8 @@ msgid "Caddo"
 msgstr "Caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Mellemamerikanske indianske sprog (øvrige)"
 
 #. name for car
@@ -320,16 +326,18 @@ msgid "Catalan; Valencian"
 msgstr "Catalansk; Valensisk"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Kaukasiske sprog (øvrige)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Wakashan sprog"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Keltiske sprog (øvrige)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Chamiksprog"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -406,15 +414,18 @@ msgid "Corsican"
 msgstr "Korsikansk"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Kreolsk og Pidgin, baseret på engelsk (øvrige)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Kreolsk og Pidgin, baseret på fransk (øvrige)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Kreolsk og Pidgin, baseret på portugisisk (øvrige)"
 
 #. name for cre, cr
@@ -426,7 +437,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Krim-tatarisk; Krim-tyrkisk"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Kreolsk og Pidgin (øvrige)"
 
 #. name for csb
@@ -434,8 +446,9 @@ msgid "Kashubian"
 msgstr "Kashubisk"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Kusjitiske sprog (øvrige)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Chamiksprog"
 
 #. name for ces, cs
 msgid "Czech"
@@ -483,8 +496,9 @@ msgid "Dogri"
 msgstr "Dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidiske sprog (øvrige)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Vendiske sprog"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -575,8 +589,9 @@ msgid "Finnish"
 msgstr "Finsk"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Finsk-ugriske sprog (øvrige)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Vendiske sprog"
 
 #. name for fon
 msgid "Fon"
@@ -627,8 +642,9 @@ msgid "Gbaya"
 msgstr "Gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germanske sprog (øvrige)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Chamiksprog"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -815,16 +831,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indiske sprog (øvrige)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Banda-sprog"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesisk"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indo-europæiske sprog (øvrige)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Irokesiske sprog"
 
 #. name for inh
 #, fuzzy
@@ -836,8 +854,9 @@ msgid "Inupiaq"
 msgstr "Inupiaq"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iransk (øvrige)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Irokesiske sprog"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -920,8 +939,9 @@ msgid "Khasi"
 msgstr "Khasi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Khoisan (øvrige)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Otomi sprog"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1122,8 +1142,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Malajo-polynesiske sprog (øvrige)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Australske sprog"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1166,8 +1187,9 @@ msgid "Uncoded languages"
 msgstr "Ukodede sprog"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-Khmer (øvrige)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Kru-sprog"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1238,7 +1260,8 @@ msgid "Nahuatl languages"
 msgstr "Nahuatl-sprog; Aztekiske sprog"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Nordamerikansk indiansk"
 
 #. name for nap
@@ -1283,7 +1306,8 @@ msgid "Nias"
 msgstr "Nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Niger-Congo sprog (øvrige)"
 
 #. name for niu
@@ -1380,8 +1404,9 @@ msgid "Otomian languages"
 msgstr "Otomi sprog"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papua-australske sprog (øvrige)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Maya sprog"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1416,8 +1441,9 @@ msgid "Persian"
 msgstr "Persisk"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipinsk (øvrige)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Flere sprog"
 
 #. name for phn
 msgid "Phoenician"
@@ -1473,8 +1499,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romanske sprog (øvrige)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Otomi sprog"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1513,7 +1540,8 @@ msgid "Yakut"
 msgstr "Yakut"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Sydamerikansk indiansk (øvrige)"
 
 #. name for sal
@@ -1549,8 +1577,9 @@ msgid "Selkup"
 msgstr "Selkupisk"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semitiske sprog (øvrige)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Chamiksprog"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1577,12 +1606,14 @@ msgid "Siouan languages"
 msgstr "Siouan sprog"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-tibetanske sprog (øvrige)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Siouan sprog"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slavisk (Andre)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Chamiksprog"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1601,8 +1632,9 @@ msgid "Northern Sami"
 msgstr "Sydsamisk"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Samiske sprog (øvrige)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Chamiksprog"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1669,8 +1701,9 @@ msgid "Serer"
 msgstr "Serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Afrikanske sprog syd for Sahara (øvrige)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Salishan sprog"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1713,8 +1746,9 @@ msgid "Tahitian"
 msgstr "Tahitiansk"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tai (øvrige)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Tupi-sprog"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1825,8 +1859,9 @@ msgid "Turkish"
 msgstr "Tyrkisk"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Tyrkisk-tatariske sprog (øvrige)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apachesprog"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/de.po b/iso_639/de.po
index 3170428..e8bfb8f 100644
--- a/iso_639/de.po
+++ b/iso_639/de.po
@@ -10,10 +10,10 @@
 # Tobias Quathamer <t.quathamer at gmx.net>, 2006, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-11-27 12:40+0100\n"
 "Last-Translator: Tobias Quathamer <t.quathamer at gmx.net>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -48,8 +48,9 @@ msgid "Adyghe; Adygei"
 msgstr "Adygisch"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Hamitosemitische Sprachen (Andere)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apachen-Sprachen"
 
 #. name for afh
 msgid "Afrihili"
@@ -128,8 +129,9 @@ msgid "Arapaho"
 msgstr "Arapaho-Sprache"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Kunstsprachen (Andere)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Otomangue-Sprachen"
 
 #. name for arw
 msgid "Arawak"
@@ -204,8 +206,9 @@ msgid "Basa"
 msgstr "Basaa-Sprache"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltische Sprachen (Andere)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Batak-Sprachen"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -224,8 +227,9 @@ msgid "Bengali"
 msgstr "Bengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berbersprachen (Andere)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Karenisch"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -252,8 +256,9 @@ msgid "Siksika"
 msgstr "Blackfoot-Sprache"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantusprachen (Andere)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Banda-Sprachen"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -296,7 +301,8 @@ msgid "Caddo"
 msgstr "Caddo-Sprachen"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Indianersprachen, Zentralamerika (Andere)"
 
 #. name for car
@@ -308,16 +314,18 @@ msgid "Catalan; Valencian"
 msgstr "Katalanisch"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Kaukasische Sprachen (Andere)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Wakash-Sprachen"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Keltische Sprachen (Andere)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Cham-Sprachen"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -394,15 +402,18 @@ msgid "Corsican"
 msgstr "Korsisch"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Kreolisch-Englisch (Andere)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Kreolisch-Französisch (Andere)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Kreolisch-Portugiesisch (Andere)"
 
 #. name for cre, cr
@@ -414,7 +425,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Krimtatarisch; Krimtürkisch"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Kreolische Sprachen; Pidginsprachen (Andere)"
 
 #. name for csb
@@ -422,8 +434,9 @@ msgid "Kashubian"
 msgstr "Kaschubisch"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Kuschitische Sprachen (Andere)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Cham-Sprachen"
 
 #. name for ces, cs
 msgid "Czech"
@@ -470,8 +483,9 @@ msgid "Dogri"
 msgstr "Dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Drawidische Sprachen (Andere)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Sorbische Sprachen"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -562,8 +576,9 @@ msgid "Finnish"
 msgstr "Finnisch"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Finnougrische Sprachen (Andere)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Sorbische Sprachen"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +629,9 @@ msgid "Gbaya"
 msgstr "Gbaya-Sprache"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germanische Sprachen (Andere)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Cham-Sprachen"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -802,16 +818,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua (Internationale Hilfssprachen-Vereinigung)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indoarische Sprachen (Andere)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Banda-Sprachen"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesisch"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indogermanische Sprachen (Andere)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Irokesische Sprachen (Andere)"
 
 #. name for inh
 msgid "Ingush"
@@ -822,8 +840,9 @@ msgid "Inupiaq"
 msgstr "Inupik"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iranische Sprachen (Andere)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Irokesische Sprachen (Andere)"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -906,8 +925,9 @@ msgid "Khasi"
 msgstr "Khasi-Sprache"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Khoisan-Sprachen (Andere)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Otomangue-Sprachen"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1106,8 +1126,9 @@ msgid "Maori"
 msgstr "Maori-Sprache"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Austronesische Sprachen (Andere)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Australische Sprachen"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1150,8 +1171,9 @@ msgid "Uncoded languages"
 msgstr "Einzelne andere Sprachen"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-Khmer-Sprachen (Andere)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Kru-Sprachen"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1222,7 +1244,8 @@ msgid "Nahuatl languages"
 msgstr "Nahuatl"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Indianersprachen, Nordamerika"
 
 #. name for nap
@@ -1266,7 +1289,8 @@ msgid "Nias"
 msgstr "Nias-Sprache"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Nigerkordofanische Sprachen (Andere)"
 
 #. name for niu
@@ -1362,8 +1386,9 @@ msgid "Otomian languages"
 msgstr "Otomangue-Sprachen"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papuasprachen (Andere)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Maya-Sprachen"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1398,8 +1423,9 @@ msgid "Persian"
 msgstr "Persisch"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Philippinen-Austronesisch (Andere)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Mehrere Sprachen"
 
 #. name for phn
 msgid "Phoenician"
@@ -1454,8 +1480,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "Rarotonganisch"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romanische Sprachen (Andere)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Otomangue-Sprachen"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1494,7 +1521,8 @@ msgid "Yakut"
 msgstr "Jakutisch"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Indianersprachen, Südamerika (Andere)"
 
 #. name for sal
@@ -1530,8 +1558,9 @@ msgid "Selkup"
 msgstr "Selkupisch"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semitische Sprachen (Andere)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Cham-Sprachen"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1558,12 +1587,14 @@ msgid "Siouan languages"
 msgstr "Sioux-Sprachen"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sinotibetische Sprachen (Andere)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Sioux-Sprachen"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slawische Sprachen (Andere)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Cham-Sprachen"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1582,8 +1613,9 @@ msgid "Northern Sami"
 msgstr "Nordsaamisch"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Saamisch (Andere)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Cham-Sprachen"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1650,8 +1682,9 @@ msgid "Serer"
 msgstr "Serer-Sprache"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilosaharanische Sprachen (Andere)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Salish-Sprache"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1694,8 +1727,9 @@ msgid "Tahitian"
 msgstr "Tahitisch"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Thaisprachen (Andere)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Tupi-Sprachen"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1806,8 +1840,9 @@ msgid "Turkish"
 msgstr "Türkisch"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaische Sprachen (Andere)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apachen-Sprachen"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/el.po b/iso_639/el.po
index 98ab098..f6a5e19 100644
--- a/iso_639/el.po
+++ b/iso_639/el.po
@@ -8,10 +8,10 @@
 # Athanasios Lefteris <alefteris at gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-10-04 20:04+0300\n"
 "Last-Translator: Athanasios Lefteris <alefteris at gmail.com>\n"
 "Language-Team: Greek <debian-l10n-greek at lists.debian.org>\n"
@@ -45,8 +45,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Αυστραλέζικες γλώσσες"
 
 #. name for afh
 msgid "Afrihili"
@@ -126,8 +127,9 @@ msgid "Arapaho"
 msgstr "Αραπάχο"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Αυστραλέζικες γλώσσες"
 
 #. name for arw
 msgid "Arawak"
@@ -204,8 +206,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Βαλτικής (άλλη)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Αυστραλέζικες γλώσσες"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -224,8 +227,9 @@ msgid "Bengali"
 msgstr "Βεγκάζης"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -253,8 +257,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -298,7 +303,8 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Ινδιάνικα Κεντρικής Αμερικής (άλλη)"
 
 #. name for car
@@ -310,16 +316,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Καυκασίας (άλλη)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Αυστραλέζικες γλώσσες"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Κέλτικα (άλλη)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Πολλαπλές γλώσσες"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -399,17 +407,17 @@ msgstr "Κορσικανικά"
 
 #. name for cpe
 #, fuzzy
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr "Βασισμένη στην Αγγλική (άλλη)"
 
 #. name for cpf
 #, fuzzy
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr "Βασισμένη στην Γαλλική (άλλη)"
 
 #. name for cpp
 #, fuzzy
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Βασισμένη στην Πορτογαλική (άλλη)"
 
 #. name for cre, cr
@@ -422,16 +430,18 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Τουρκικά Κριμαίας, Ταταρικά Κριμαίας"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
-msgstr ""
+#, fuzzy
+msgid "Creoles and pidgins"
+msgstr "Βασισμένη στην Γαλλική (άλλη)"
 
 #. name for csb
 msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Αυστραλέζικες γλώσσες"
 
 #. name for ces, cs
 msgid "Czech"
@@ -479,8 +489,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Αυστραλέζικες γλώσσες"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -572,8 +583,9 @@ msgid "Finnish"
 msgstr "Φινλανδικά"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Αυστραλέζικες γλώσσες"
 
 #. name for fon
 msgid "Fon"
@@ -627,8 +639,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Γερμανικά (άλλη)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -822,16 +835,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Ινδονησιακά"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Ινδοευρωπαϊκά (άλλη)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for inh
 msgid "Ingush"
@@ -842,8 +857,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Ιρανικά (άλλη)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -930,8 +946,9 @@ msgid "Khasi"
 msgstr "Ταϊλανδέζικη"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1134,8 +1151,9 @@ msgid "Maori"
 msgstr ""
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Αυστραλέζικες γλώσσες"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1179,8 +1197,9 @@ msgid "Uncoded languages"
 msgstr "Νοηματικές γλώσσες"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Πολλαπλές γλώσσες"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1255,7 +1274,7 @@ msgstr "Πολλαπλές γλώσσες"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Ινδιάνικα Νότιας Αμερικής (άλλη)"
 
 #. name for nap
@@ -1300,8 +1319,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Αυστραλέζικες γλώσσες"
 
 #. name for niu
 msgid "Niuean"
@@ -1397,8 +1417,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Πολλαπλές γλώσσες"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1434,8 +1455,9 @@ msgid "Persian"
 msgstr "Περσικά"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Πολλαπλές γλώσσες"
 
 #. name for phn
 msgid "Phoenician"
@@ -1491,8 +1513,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for roh, rm
 #, fuzzy
@@ -1532,7 +1555,8 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Ινδιάνικα Νότιας Αμερικής (άλλη)"
 
 #. name for sal
@@ -1568,8 +1592,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Σημιτικά (άλλη)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1597,12 +1622,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Σλαβικά (άλλη)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1621,8 +1648,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1692,8 +1720,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Πολλαπλές γλώσσες"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1736,8 +1765,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Νοηματικές γλώσσες"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1850,8 +1880,9 @@ msgid "Turkish"
 msgstr "Τουρκικά"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Αυστραλέζικες γλώσσες"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/eo.po b/iso_639/eo.po
index 18b6509..eacf6c4 100644
--- a/iso_639/eo.po
+++ b/iso_639/eo.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-12-01 09:27+0000\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo at rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@ -42,8 +42,9 @@ msgid "Adyghe; Adygei"
 msgstr "Adigea"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-aziaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apaĉa"
 
 #. name for afh
 msgid "Afrihili"
@@ -122,8 +123,9 @@ msgid "Arapaho"
 msgstr "Arapaha"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Planlingvoj (aliaj)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Otomiaj lingvoj"
 
 #. name for arw
 msgid "Arawak"
@@ -198,8 +200,9 @@ msgid "Basa"
 msgstr "Basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Batakaj lingvoj"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -218,8 +221,9 @@ msgid "Bengali"
 msgstr "Bengala"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berberaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Karenaj lingvoj"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -246,8 +250,9 @@ msgid "Siksika"
 msgstr "Siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantuaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Bandaj lingvoj"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -290,7 +295,8 @@ msgid "Caddo"
 msgstr "Kada"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Indianaj lingvoj de Centr-Ameriko (aliaj)"
 
 #. name for car
@@ -302,16 +308,18 @@ msgid "Catalan; Valencian"
 msgstr "Kataluna; Valencia"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Kaŭkazaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Vakaŝaj lingvoj"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuana"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Keltaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Ĉamaj lingvoj"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -388,15 +396,18 @@ msgid "Corsican"
 msgstr "Korsika"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Kreolaj kaj piĝinaj lingvoj, anglabazaj (aliaj)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Kreolaj kaj piĝinaj lingvoj, francabazaj (aliaj)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Kreolaj kaj piĝinaj lingvoj, portugalbazaj (aliaj)"
 
 #. name for cre, cr
@@ -408,7 +419,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Krimea tatara"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Kreolaj kaj piĝinaj lingvoj (aliaj)"
 
 #. name for csb
@@ -416,8 +428,9 @@ msgid "Kashubian"
 msgstr "Kaŝuba"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Kuŝidaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Ĉamaj lingvoj"
 
 #. name for ces, cs
 msgid "Czech"
@@ -464,8 +477,9 @@ msgid "Dogri"
 msgstr "Dogra"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Sorabaj lingvoj"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -556,8 +570,9 @@ msgid "Finnish"
 msgstr "Finna"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Finno-ugraj lingvoj (aliaj)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Sorabaj lingvoj"
 
 #. name for fon
 msgid "Fon"
@@ -608,8 +623,9 @@ msgid "Gbaya"
 msgstr "Gbaja"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Ĝermanaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Ĉamaj lingvoj"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -796,16 +812,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingvao (IALA)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Hindaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Bandaj lingvoj"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonezia"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Hindeŭropaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Irokezaj lingvoj"
 
 #. name for inh
 msgid "Ingush"
@@ -816,8 +834,9 @@ msgid "Inupiaq"
 msgstr "Inupiaka"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iranaj (aliaj)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Irokezaj lingvoj"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -900,8 +919,9 @@ msgid "Khasi"
 msgstr "Kasia"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Kojsanaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Otomiaj lingvoj"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1100,8 +1120,9 @@ msgid "Maori"
 msgstr "Maoria"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Aŭstroneziaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Aŭstraliaj lingvoj"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1144,8 +1165,9 @@ msgid "Uncoded languages"
 msgstr "Nekoditaj lingvoj"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-kmeraj lingvoj (aliaj)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Kruaj lingvoj"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1216,7 +1238,8 @@ msgid "Nahuatl languages"
 msgstr "Nahuatlaj lingvoj"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Indianaj lingvoj de Nord-Ameriko"
 
 #. name for nap
@@ -1260,7 +1283,8 @@ msgid "Nias"
 msgstr "Niasa"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Niĝerkongaj lingvoj (aliaj)"
 
 #. name for niu
@@ -1356,8 +1380,9 @@ msgid "Otomian languages"
 msgstr "Otomiaj lingvoj"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papuaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Majaaj lingvoj"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1392,8 +1417,9 @@ msgid "Persian"
 msgstr "Persa"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipinaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Plurlingva"
 
 #. name for phn
 msgid "Phoenician"
@@ -1448,8 +1474,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "Rarotonga"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Latinidaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Otomiaj lingvoj"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1488,7 +1515,8 @@ msgid "Yakut"
 msgstr "Jakuta"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Indianaj lingvoj de Sud-Ameriko (aliaj)"
 
 #. name for sal
@@ -1524,8 +1552,9 @@ msgid "Selkup"
 msgstr "Selkupa"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semidaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Ĉamaj lingvoj"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1552,12 +1581,14 @@ msgid "Siouan languages"
 msgstr "Siuaj lingvoj"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Ĉino-tibetaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Siuaj lingvoj"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slavaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Ĉamaj lingvoj"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1576,8 +1607,9 @@ msgid "Northern Sami"
 msgstr "Norda samea"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Sameaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Ĉamaj lingvoj"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1644,8 +1676,9 @@ msgid "Serer"
 msgstr "Serera"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-saharaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Saliŝaj lingvoj"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1688,8 +1721,9 @@ msgid "Tahitian"
 msgstr "Tahitia"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tajaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Tupiaj lingvoj"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1800,8 +1834,9 @@ msgid "Turkish"
 msgstr "Turka"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altajaj lingvoj (aliaj)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apaĉa"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/es.po b/iso_639/es.po
index 1f7528d..11ae371 100644
--- a/iso_639/es.po
+++ b/iso_639/es.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2007-08-10 19:37+0200\n"
 "Last-Translator: Javier Fernández-Sanguino Peña <jfs at debian.org>\n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -46,8 +46,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afroasiática (Otras)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apache, lenguas"
 
 #. name for afh
 msgid "Afrihili"
@@ -126,8 +127,9 @@ msgid "Arapaho"
 msgstr "Arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Artificiales (Otras)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Otomanas, lenguas"
 
 #. name for arw
 msgid "Arawak"
@@ -202,8 +204,9 @@ msgid "Basa"
 msgstr "Basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Bálticas (Otras)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Batak, lenguas"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -222,8 +225,9 @@ msgid "Bengali"
 msgstr "Bengalí"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Bereber (Otras)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Karen, lenguas"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -250,8 +254,9 @@ msgid "Siksika"
 msgstr "Siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantú (Otras)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Banda, lenguas"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -294,7 +299,8 @@ msgid "Caddo"
 msgstr "Caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Indígenas Centro Americanas (Otras)"
 
 #. name for car
@@ -307,16 +313,18 @@ msgid "Catalan; Valencian"
 msgstr "Catalán, Valenciano"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Caucasianas (Otras)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Wakashas, lenguas"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Celtas (Otras)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Chamic, lenguas"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -393,15 +401,18 @@ msgid "Corsican"
 msgstr "Corso"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Creoles y pidgins, basadas en inglés (Otras)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Creoles y pidgins, basadas en francés (Otras)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Creoles y pidgins, basadas en portugués (Otras)"
 
 #. name for cre, cr
@@ -414,7 +425,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Turco crimeano (Tatar crimeano)"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Creoles y pidgins (Otras)"
 
 #. name for csb
@@ -422,8 +434,9 @@ msgid "Kashubian"
 msgstr "Kashubiano"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Cushitic (Otras)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Chamic, lenguas"
 
 #. name for ces, cs
 msgid "Czech"
@@ -471,8 +484,9 @@ msgid "Dogri"
 msgstr "Dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidicas (Otras)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Sorabianas, lenguas"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -563,8 +577,9 @@ msgid "Finnish"
 msgstr "Finés"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Finno-Ugrian (Otras)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Sorabianas, lenguas"
 
 #. name for fon
 msgid "Fon"
@@ -616,8 +631,9 @@ msgid "Gbaya"
 msgstr "Gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germánicas (Otras)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Chamic, lenguas"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -806,16 +822,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua (Asociación de la Lengua Auxiliar Internacional)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Índicas (Otras)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Banda, lenguas"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesio"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indoeuropeas (Otras)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Iroquíes, lenguas"
 
 #. name for inh
 msgid "Ingush"
@@ -826,8 +844,9 @@ msgid "Inupiaq"
 msgstr "Inupiak"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iranias (Otras)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Iroquíes, lenguas"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -910,8 +929,9 @@ msgid "Khasi"
 msgstr "Khasi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Khoisan (Otras)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Otomanas, lenguas"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1114,8 +1134,9 @@ msgid "Maori"
 msgstr "Maorí"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Austronesias (Otras)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Australianas, lenguas"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1159,8 +1180,9 @@ msgid "Uncoded languages"
 msgstr "Zande, lenguas"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-Jémer (Otras)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Kru, lenguas"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1232,7 +1254,8 @@ msgid "Nahuatl languages"
 msgstr "Náhuatl, lenguas"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Indígenas de Norte América"
 
 #. name for nap
@@ -1276,7 +1299,8 @@ msgid "Nias"
 msgstr "Nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Niger-Kordofanias (Otras)"
 
 #. name for niu
@@ -1376,8 +1400,9 @@ msgid "Otomian languages"
 msgstr "Otomanas, lenguas"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papuas (Otras)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Mayas, lenguas"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1412,8 +1437,9 @@ msgid "Persian"
 msgstr "Persa"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipino (Otras)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Multiples lenguas"
 
 #. name for phn
 msgid "Phoenician"
@@ -1470,8 +1496,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romance (Otras)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Otomanas, lenguas"
 
 #. name for roh, rm
 #, fuzzy
@@ -1511,7 +1538,8 @@ msgid "Yakut"
 msgstr "Yakut"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Indígenas Sudamericanas (Otras)"
 
 #. name for sal
@@ -1547,8 +1575,9 @@ msgid "Selkup"
 msgstr "Selkup"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semíticas (Otras)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Chamic, lenguas"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1575,12 +1604,14 @@ msgid "Siouan languages"
 msgstr "Siouan, lenguas"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-Tibetano (Otras)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Siouan, lenguas"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Eslavas (Otras)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Chamic, lenguas"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1599,8 +1630,9 @@ msgid "Northern Sami"
 msgstr "Sami del Norte"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Sami, lenguas (Otras)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Chamic, lenguas"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1668,8 +1700,9 @@ msgid "Serer"
 msgstr "Serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-Saharianas (Otras)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Salishan, lenguas"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1712,8 +1745,9 @@ msgid "Tahitian"
 msgstr "Tahitiano"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tai (Otras)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Tupi, lenguas"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1824,8 +1858,9 @@ msgid "Turkish"
 msgstr "Turco"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaic (Otras)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apache, lenguas"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/et.po b/iso_639/et.po
index 36db466..6c7a2fa 100644
--- a/iso_639/et.po
+++ b/iso_639/et.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2001-12-02 00:10+0200\n"
 "Last-Translator: Tõivo Leedjärv <leedjarv at interest.ee>\n"
 "Language-Team: Estonian <gnome-et at linux.ee>\n"
@@ -47,7 +47,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -132,8 +132,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Korea"
 
 #. name for arw
 msgid "Arawak"
@@ -211,8 +212,9 @@ msgid "Basa"
 msgstr "Paus"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Korea"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -233,8 +235,9 @@ msgid "Bengali"
 msgstr "Balti"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Korea"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -263,8 +266,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Korea"
 
 #. name for bos, bs
 #, fuzzy
@@ -310,8 +314,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Ukraina"
 
 # src/trans.h:7
 #
@@ -326,16 +331,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Korea"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Korea"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -416,15 +423,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -437,7 +444,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -445,8 +452,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Korea"
 
 #. name for ces, cs
 msgid "Czech"
@@ -495,8 +503,9 @@ msgid "Dogri"
 msgstr "Ääred"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Korea"
 
 #. name for dsb
 #, fuzzy
@@ -592,8 +601,9 @@ msgid "Finnish"
 msgstr "Soome"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Korea"
 
 #. name for fon
 msgid "Fon"
@@ -648,8 +658,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Korea"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -853,16 +864,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Korea"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indoneesia"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Korea"
 
 #. name for inh
 #, fuzzy
@@ -875,8 +888,9 @@ msgid "Inupiaq"
 msgstr "India"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Korea"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -965,8 +979,9 @@ msgid "Khasi"
 msgstr "Tai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Korea"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1182,8 +1197,9 @@ msgid "Maori"
 msgstr "Ääred"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Korea"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1228,8 +1244,9 @@ msgid "Uncoded languages"
 msgstr "Korea"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Korea"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1309,7 +1326,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Ukraina"
 
 #. name for nap
@@ -1353,8 +1370,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Korea"
 
 #. name for niu
 msgid "Niuean"
@@ -1453,8 +1471,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Korea"
 
 #. name for pag
 #, fuzzy
@@ -1491,8 +1510,9 @@ msgid "Persian"
 msgstr "Prindi"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Korea"
 
 #. name for phn
 #, fuzzy
@@ -1550,8 +1570,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Korea"
 
 #. name for roh, rm
 #, fuzzy
@@ -1592,8 +1613,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Ukraina"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1635,8 +1657,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Korea"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1664,12 +1687,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Korea"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Korea"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1688,8 +1713,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Korea"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1761,8 +1787,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Korea"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1808,8 +1835,9 @@ msgid "Tahitian"
 msgstr "Läti"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Korea"
 
 #. name for tam, ta
 #, fuzzy
@@ -1925,8 +1953,9 @@ msgid "Turkish"
 msgstr "Türgi"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Korea"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/eu.po b/iso_639/eu.po
index 025e7b0..62f9c74 100644
--- a/iso_639/eu.po
+++ b/iso_639/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: xd-ISO_639-eu\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-07-14 18:20+0200\n"
 "Last-Translator: Xabier Bilbao <xabidu at gmail.com>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -48,8 +48,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-asiatikoak (beste batzuk)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apache hizkuntzak"
 
 #. name for afh
 msgid "Afrihili"
@@ -128,8 +129,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Artifizialak (beste batzuk)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Otomandar hizkuntzak"
 
 #. name for arw
 msgid "Arawak"
@@ -204,8 +206,9 @@ msgid "Basa"
 msgstr "Basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltikokoak (beste batzuk)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Batak hizkuntzak"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -224,8 +227,9 @@ msgid "Bengali"
 msgstr "Bengalera"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berbereak (beste batzuk)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Karen hizkuntzak"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -252,8 +256,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantuarrak (beste batzuk)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Bandar hizkuntzak"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -296,7 +301,8 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Erdi Amerikar Indiarrak (beste batzuk)"
 
 #. name for car
@@ -308,16 +314,18 @@ msgid "Catalan; Valencian"
 msgstr "Katalana"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Kaukasiarrak (beste batzuk)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Wakashar hizkuntzak"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuera"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Zeltak (beste batzuk)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Chamic hizkuntzak"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -394,15 +402,18 @@ msgid "Corsican"
 msgstr "Korsikera"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Ingelesean oinarritutako kreolera eta pidgin-ak (beste batzuk)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Frantsesean oinarritutako kreolera eta pidgin-ak (beste batzuk)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Portugaleran oinarritutako kreolera eta pidgin-ak (beste batzuk)"
 
 #. name for cre, cr
@@ -414,7 +425,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Krimear tatariera; krimear turkiera"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Kreolera eta pidgin-ak (beste batzuk)"
 
 #. name for csb
@@ -422,8 +434,9 @@ msgid "Kashubian"
 msgstr "Kashubiera"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Cushitikoak (beste batzuk)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Chamic hizkuntzak"
 
 #. name for ces, cs
 msgid "Czech"
@@ -470,8 +483,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Drabidikoak (beste batzuk)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Sorbiar hizkuntzak"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -562,8 +576,9 @@ msgid "Finnish"
 msgstr "Finlandiera"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Ugrofinlandiarrak (beste batzuk)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Sorbiar hizkuntzak"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +629,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germanikoak (beste batzuk)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Chamic hizkuntzak"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -802,16 +818,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua (IALAren nazioarteko hizkuntza)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indikoak (beste batzuk)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Bandar hizkuntzak"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesiera"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indo-europarrak (beste batzuk)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Irokes hizkuntzak"
 
 #. name for inh
 msgid "Ingush"
@@ -822,8 +840,9 @@ msgid "Inupiaq"
 msgstr "Inupiaq"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Irandarrak (beste batzuk)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Irokes hizkuntzak"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -906,8 +925,9 @@ msgid "Khasi"
 msgstr ""
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Khoisar hizkuntzak (beste batzuk)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Otomandar hizkuntzak"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1106,8 +1126,9 @@ msgid "Maori"
 msgstr "Maoria"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Austronesiarrak (beste batzuk)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Australiar hizkuntzak"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1150,8 +1171,9 @@ msgid "Uncoded languages"
 msgstr "Kodetu gabeko hizkuntzak"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-Khmerarrak (beste batzuk)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Kru hizkuntzak"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1222,7 +1244,8 @@ msgid "Nahuatl languages"
 msgstr "Nahuatl hizkuntzak"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Ipar Amerikako indiar hizkuntzak"
 
 #. name for nap
@@ -1266,8 +1289,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Irokes hizkuntzak"
 
 #. name for niu
 msgid "Niuean"
@@ -1363,8 +1387,9 @@ msgid "Otomian languages"
 msgstr "Otomandar hizkuntzak"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papuarrak (beste batzuk)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Maia hizkuntzak"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1399,8 +1424,9 @@ msgid "Persian"
 msgstr "Persiera"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipinarrak (beste batzuk)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Ingelesa ez beste hizkuntzak"
 
 #. name for phn
 msgid "Phoenician"
@@ -1457,8 +1483,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "Cook uharteko maoriera"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Erromantzeak (beste batzuk)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Otomandar hizkuntzak"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1497,7 +1524,8 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Hego Amerikako indiar hizkuntzak (beste batzuk)"
 
 #. name for sal
@@ -1533,8 +1561,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semitikoak (beste batzuk)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Chamic hizkuntzak"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1561,12 +1590,14 @@ msgid "Siouan languages"
 msgstr "Sioux hizkuntzak"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Txinotibetarrak (beste batzuk)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Sioux hizkuntzak"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Eslavikoak (beste batzuk)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Chamic hizkuntzak"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1585,8 +1616,9 @@ msgid "Northern Sami"
 msgstr "Iparraldeko samiera"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Sami hizkuntzak (beste batzuk)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Chamic hizkuntzak"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1653,8 +1685,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-sahararrak (beste batzuk)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Hizkuntza salisharrak"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1697,8 +1730,9 @@ msgid "Tahitian"
 msgstr "Tahitiera"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Thailandiarrak (beste batzuk)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Tupi hizkuntzak"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1809,8 +1843,9 @@ msgid "Turkish"
 msgstr "Turkiera"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaiarrak (beste batzuk)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apache hizkuntzak"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/fa.po b/iso_639/fa.po
index 0fe1914..57f6bcb 100644
--- a/iso_639/fa.po
+++ b/iso_639/fa.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2005-08-02 17:35+0430\n"
 "Last-Translator: Roozbeh Pournader <roozbeh at farsiweb.info>\n"
 "Language-Team: Persian <translation-team-fa at lists.sourceforge.net>\n"
@@ -46,8 +46,9 @@ msgid "Adyghe; Adygei"
 msgstr "آدیجیایی"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "افریقا و آسیایی (غیره)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "زبانهای آپاچی"
 
 #. name for afh
 msgid "Afrihili"
@@ -127,8 +128,9 @@ msgid "Arapaho"
 msgstr "آراپاهویی"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "ساختگی (غیره)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "زبانهای اتومیایی"
 
 #. name for arw
 msgid "Arawak"
@@ -205,8 +207,9 @@ msgid "Basa"
 msgstr "باسایی"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "بالتیکی (غیره)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "زبان‌های مایاییک"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -225,8 +228,9 @@ msgid "Bengali"
 msgstr "بنگالی"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "بربری (غیره)‏"
+#, fuzzy
+msgid "Berber languages"
+msgstr "زبان‌های مایاییک"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -253,8 +257,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "بانتویی (غیره)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "زبانهای موندایی"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -298,7 +303,8 @@ msgid "Caddo"
 msgstr "کادویی"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "سرخپوستی امریکای مرکزی (غیره)‏"
 
 #. name for car
@@ -310,16 +316,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "قفقازی (غیره)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "زبانهای واکاشی"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "سبویی"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "سلتی (غیره)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "زبانهای چامی"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -398,17 +406,17 @@ msgstr ""
 
 #. name for cpe
 #, fuzzy
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr "کریولی و پیجینی (غیره)"
 
 #. name for cpf
 #, fuzzy
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr "کریولی و پیجینی (غیره)"
 
 #. name for cpp
 #, fuzzy
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "کریولی و پیجینی (غیره)"
 
 #. name for cre, cr
@@ -421,7 +429,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "ترکی کریمه؛ تاتاری کریمه"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "کریولی و پیجینی (غیره)"
 
 #. name for csb
@@ -429,8 +438,9 @@ msgid "Kashubian"
 msgstr "کاشوبی"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "کوشی (غیره)‏"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "زبانهای چامی"
 
 #. name for ces, cs
 msgid "Czech"
@@ -478,8 +488,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "دراویدی (غیره)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "زبانهای صُربی"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -570,8 +581,9 @@ msgid "Finnish"
 msgstr "فنلاندی"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "فین و اوگرایی (غیره)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "زبانهای صُربی"
 
 #. name for fon
 msgid "Fon"
@@ -627,8 +639,9 @@ msgid "Gbaya"
 msgstr "گبایایی"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "ژرمنی (غیره)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "زبانهای چامی"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -820,16 +833,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "هندیک (غیره)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "زبانهای موندایی"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "اندونزیایی"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "هند و اروپایی (غیره)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "زبانهای ایروکوایی"
 
 #. name for inh
 msgid "Ingush"
@@ -840,8 +855,9 @@ msgid "Inupiaq"
 msgstr "اینوپیک"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "ایرانی (غیره)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "زبانهای ایروکوایی"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -926,8 +942,9 @@ msgid "Khasi"
 msgstr "خازیایی"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "خواسی (غیره)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "زبانهای اتومیایی"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1132,8 +1149,9 @@ msgid "Maori"
 msgstr "مائوریایی"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "آسترونیزیایی‌ (غیره)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "زبان‌های استرالیایی"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1177,8 +1195,9 @@ msgid "Uncoded languages"
 msgstr "زبانهای موندایی"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "مون‌خمری (غیره)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "زبانهای توپیایی"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1252,7 +1271,7 @@ msgstr "زبانهای نوبیایی"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "سرخپوستی امریکای شمالی (غیره)"
 
 #. name for nap
@@ -1299,8 +1318,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "زبانهای ایروکوایی"
 
 #. name for niu
 msgid "Niuean"
@@ -1399,8 +1419,9 @@ msgid "Otomian languages"
 msgstr "زبانهای اتومیایی"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "پاپوایی (غیره)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "زبان‌های مایاییک"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1437,8 +1458,9 @@ msgid "Persian"
 msgstr "فارسی"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "فیایپینی (غیره)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "چندین زبان"
 
 #. name for phn
 msgid "Phoenician"
@@ -1494,8 +1516,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "رومیایی (غیره)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "زبانهای اتومیایی"
 
 #. name for roh, rm
 #, fuzzy
@@ -1535,7 +1558,8 @@ msgid "Yakut"
 msgstr "یاقوتی"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "سرخپوستی امریکای جنوبی (غیره)"
 
 #. name for sal
@@ -1571,8 +1595,9 @@ msgid "Selkup"
 msgstr "سلکوپی"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "سامی (غیره)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "زبانهای چامی"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1600,12 +1625,14 @@ msgid "Siouan languages"
 msgstr "زبانهای سویی"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "چین و تبتی (غیره)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "زبانهای سویی"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "اسلاوی (غیره)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "زبانهای چامی"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1624,8 +1651,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "زبانهای چامی"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1694,8 +1722,9 @@ msgid "Serer"
 msgstr "سریری"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "نیلی و صحرایی (غیره)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "زبانهای سالیشی"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1738,8 +1767,9 @@ msgid "Tahitian"
 msgstr "تاهیتیایی"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "تایی (غیره)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "زبانهای توپیایی"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1851,8 +1881,9 @@ msgid "Turkish"
 msgstr "ترکی"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "آلتاییک (غیره)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "زبانهای آپاچی"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/fi.po b/iso_639/fi.po
index 3a58cad..8307bb7 100644
--- a/iso_639/fi.po
+++ b/iso_639/fi.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-11-04 22:22+0200\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen at iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -42,8 +42,9 @@ msgid "Adyghe; Adygei"
 msgstr "agyde"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "muut afroaasialaiset kielet"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "apaššikielet"
 
 #. name for afh
 msgid "Afrihili"
@@ -122,8 +123,9 @@ msgid "Arapaho"
 msgstr "arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "muut keinotekoiset kielet"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "otomikielet"
 
 #. name for arw
 msgid "Arawak"
@@ -198,8 +200,9 @@ msgid "Basa"
 msgstr "basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "muut balttilaiset kielet"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "batak"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -218,8 +221,9 @@ msgid "Bengali"
 msgstr "bengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "muut berberikielet"
+#, fuzzy
+msgid "Berber languages"
+msgstr "karen"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -246,8 +250,9 @@ msgid "Siksika"
 msgstr "mustajalka (siksika)"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "muut bantukielet"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "banda"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -290,7 +295,8 @@ msgid "Caddo"
 msgstr "caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "muut Keski-Amerikan intiaanikielet"
 
 #. name for car
@@ -302,16 +308,18 @@ msgid "Catalan; Valencian"
 msgstr "katalaani"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "muut kaukasialaiset kielet"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "wakashkielet"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "cebuano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "muut kelttiläiset kielet"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "cham-kielet"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -388,15 +396,18 @@ msgid "Corsican"
 msgstr "korsika"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "muut englantiin perustuvat kreolit ja pidginit"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "muut ranskaan perustuvat kreolit ja pidginit"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "muut portugaliin perustuvat kreolit ja pidginit"
 
 #. name for cre, cr
@@ -408,7 +419,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "krimintataari; kriminturkki"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "muut englantiin perustuvat kreolit ja pidginit"
 
 #. name for csb
@@ -416,8 +428,9 @@ msgid "Kashubian"
 msgstr "kašubi"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "muut kuušilaiskielet"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "cham-kielet"
 
 #. name for ces, cs
 msgid "Czech"
@@ -463,9 +476,11 @@ msgstr "divehi"
 msgid "Dogri"
 msgstr "dogri"
 
+# teknisesti on yksi puhekieli mutta kaksi kirjakieltä, joille omat koodit...
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "muut dravidakielet"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "sorbi"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -555,9 +570,11 @@ msgstr "filippiino"
 msgid "Finnish"
 msgstr "suomi"
 
+# teknisesti on yksi puhekieli mutta kaksi kirjakieltä, joille omat koodit...
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "muut suomalais-ugrilaiset kielet"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "sorbi"
 
 #. name for fon
 msgid "Fon"
@@ -608,8 +625,9 @@ msgid "Gbaya"
 msgstr "gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "muut germaaniset kielet"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "cham-kielet"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -796,16 +814,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "interlingua"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "muut indoarjalaiset kielet"
+#, fuzzy
+msgid "Indic languages"
+msgstr "banda"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "indonesia"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "muut indoeurooppalaiset kielet"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "irokeesikielet"
 
 #. name for inh
 msgid "Ingush"
@@ -816,8 +836,9 @@ msgid "Inupiaq"
 msgstr "iñupiaq"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "muut iranilaiskielet"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "irokeesikielet"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -900,8 +921,9 @@ msgid "Khasi"
 msgstr "khasi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "muut khoisan-kielet"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "otomikielet"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1102,8 +1124,9 @@ msgid "Maori"
 msgstr "maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "muut austronesialaiset kielet"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "australialaiset kielet"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1146,8 +1169,9 @@ msgid "Uncoded languages"
 msgstr "kooditon kieli"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "mut mon-khmer-kielet"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "kru-kielet"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1218,7 +1242,8 @@ msgid "Nahuatl languages"
 msgstr "nahuatl"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Pohjois-Amerikan intiaanikielet"
 
 #. name for nap
@@ -1262,7 +1287,8 @@ msgid "Nias"
 msgstr "nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "muut nigeriläis-kongolaiset kielet"
 
 #. name for niu
@@ -1358,8 +1384,9 @@ msgid "Otomian languages"
 msgstr "otomikielet"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "muut papuakielet"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "mayakielet"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1394,8 +1421,9 @@ msgid "Persian"
 msgstr "persia"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "muut filippiiniläiset kielet"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "monia kieliä"
 
 #. name for phn
 msgid "Phoenician"
@@ -1450,8 +1478,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "rarotonga"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "muut romaaniset kielet"
+#, fuzzy
+msgid "Romance languages"
+msgstr "otomikielet"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1490,7 +1519,8 @@ msgid "Yakut"
 msgstr "jakuutti"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "muut Etelä-Amerikan intiaanikielet"
 
 #. name for sal
@@ -1526,8 +1556,9 @@ msgid "Selkup"
 msgstr "selkuppi"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "muut seemiläiset kielet"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "cham-kielet"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1554,12 +1585,14 @@ msgid "Siouan languages"
 msgstr "sioux-kielet"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "muut sinotiibettiläiset kielet"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "sioux-kielet"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "muut slaavilaiset kielet"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "cham-kielet"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1578,8 +1611,9 @@ msgid "Northern Sami"
 msgstr "pohjoissaame"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "muut saamelaiskielet"
+#, fuzzy
+msgid "Sami languages"
+msgstr "cham-kielet"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1646,8 +1680,9 @@ msgid "Serer"
 msgstr "serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "muut niililäis-saharalaiset kielet"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "sališilaiset kielet"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1691,8 +1726,9 @@ msgid "Tahitian"
 msgstr "tahiti"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "muut thaikielet"
+#, fuzzy
+msgid "Tai languages"
+msgstr "tupikielet"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1803,8 +1839,9 @@ msgid "Turkish"
 msgstr "turkki"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "muut altailaiset kielet"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "apaššikielet"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/fr.po b/iso_639/fr.po
index ab5695a..aed3360 100644
--- a/iso_639/fr.po
+++ b/iso_639/fr.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-08-26 22:53+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -52,8 +52,9 @@ msgid "Adyghe; Adygei"
 msgstr "Adyghé"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-asiatiques, autres langues"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apache"
 
 #. name for afh
 msgid "Afrihili"
@@ -132,8 +133,9 @@ msgid "Arapaho"
 msgstr "Arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Artificielles, autres langues"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Otomangue, langues"
 
 #. name for arw
 msgid "Arawak"
@@ -208,8 +210,9 @@ msgid "Basa"
 msgstr "Basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltiques, autres langues"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Batak, langues"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -228,8 +231,9 @@ msgid "Bengali"
 msgstr "Bengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berbères, autres langues"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Karen, langues"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -256,8 +260,9 @@ msgid "Siksika"
 msgstr "Blackfoot"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantoues, autres langues"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Banda, langues"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -300,7 +305,8 @@ msgid "Caddo"
 msgstr "Caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Indiennes d'Amérique centrale, autres langues"
 
 #. name for car
@@ -312,16 +318,18 @@ msgid "Catalan; Valencian"
 msgstr "Catalan"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Caucasiennes, autres langues"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Wakashennes, langues"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Celtiques, autres langues"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Chames, langues"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -398,15 +406,18 @@ msgid "Corsican"
 msgstr "Corse"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Créoles et pidgins anglais, autres"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Créoles et pidgins français, autres"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Créoles et pidgins portugais, autres"
 
 #. name for cre, cr
@@ -418,7 +429,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Tatar de Crimée"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Créoles et pidgins"
 
 #. name for csb
@@ -426,8 +438,9 @@ msgid "Kashubian"
 msgstr "Kachoube"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Couchitiques, autres langues"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Chames, langues"
 
 #. name for ces, cs
 msgid "Czech"
@@ -474,8 +487,9 @@ msgid "Dogri"
 msgstr "Dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidiennes, autres langues"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Sorabes, langues"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -566,8 +580,9 @@ msgid "Finnish"
 msgstr "Finnois"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Finno-ougriennes, autres langues"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Sorabes, langues"
 
 #. name for fon
 msgid "Fon"
@@ -618,8 +633,9 @@ msgid "Gbaya"
 msgstr "Gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germaniques, autres langues"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Chames, langues"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -806,16 +822,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua (langue auxiliaire internationale)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indo-aryennes, autres langues"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Banda, langues"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonésien"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indo-européennes, autres langues"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Iroquoises, langues (famille)"
 
 #. name for inh
 msgid "Ingush"
@@ -826,8 +844,9 @@ msgid "Inupiaq"
 msgstr "Inupiaq"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iraniennes, autres langues"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Iroquoises, langues (famille)"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -910,8 +929,9 @@ msgid "Khasi"
 msgstr "Khasi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Khoisan, autres langues"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Otomangue, langues"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1110,8 +1130,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Malayo-polynésiennes, autres langues"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Australiennes, langues"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1154,8 +1175,9 @@ msgid "Uncoded languages"
 msgstr "Langues non codées"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Môn-khmer, autres langues"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Krou, langues"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1226,7 +1248,8 @@ msgid "Nahuatl languages"
 msgstr "Nahuatl, langues"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Indiennes d'Amérique du Nord, autres langues"
 
 #. name for nap
@@ -1270,7 +1293,8 @@ msgid "Nias"
 msgstr "Nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Nigéro-congolaises, autres langues"
 
 #. name for niu
@@ -1366,8 +1390,9 @@ msgid "Otomian languages"
 msgstr "Otomangue, langues"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papoues, autres langues"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Maya, langues"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1402,8 +1427,9 @@ msgid "Persian"
 msgstr "Persan"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Philippines, autres langues"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Multilingue"
 
 #. name for phn
 msgid "Phoenician"
@@ -1458,8 +1484,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "Rarotonga; Maori des îles Cook"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romanes, autres langues"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Otomangue, langues"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1498,7 +1525,8 @@ msgid "Yakut"
 msgstr "Iakoute"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Indiennes d'Amérique du Sud, autres langues"
 
 #. name for sal
@@ -1534,8 +1562,9 @@ msgid "Selkup"
 msgstr "Selkoupe"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Sémitiques, autres langues"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Chames, langues"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1562,12 +1591,14 @@ msgid "Siouan languages"
 msgstr "Sioux, langues"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-tibétaines, autres langues"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Sioux, langues"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slaves, autres langues"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Chames, langues"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1586,8 +1617,9 @@ msgid "Northern Sami"
 msgstr "Sami du Nord"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Sami, autres langues"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Chames, langues"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1654,8 +1686,9 @@ msgid "Serer"
 msgstr "Sérère"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-sahariennes, autres langues"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Salish, langues"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1698,8 +1731,9 @@ msgid "Tahitian"
 msgstr "Tahitien"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Thaïes, autres langues"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Tupi, langues"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1810,8 +1844,9 @@ msgid "Turkish"
 msgstr "Turc"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaïques, autres langues"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apache"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/ga.po b/iso_639/ga.po
index edb319e..69b3023 100644
--- a/iso_639/ga.po
+++ b/iso_639/ga.po
@@ -12,10 +12,10 @@
 #   free to fill in gaps but please continue to mark coinages as such.  --KPS
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-08-31 07:10-0600\n"
 "Last-Translator: Kevin Scannell <kscanne at gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux at lists.sourceforge.net>\n"
@@ -48,9 +48,11 @@ msgstr ""
 msgid "Adyghe; Adygei"
 msgstr ""
 
+# de Bhaldraithe "Apáis"
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afra-Áisic (Eile)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Teangacha Apáiseacha"
 
 #. name for afh
 msgid "Afrihili"
@@ -134,8 +136,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Saorga (Eile)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Teangacha Sorbacha"
 
 #. name for arw
 msgid "Arawak"
@@ -215,8 +218,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltach (Eile)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Teangacha iomadúla"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -235,8 +239,9 @@ msgid "Bengali"
 msgstr "Beangáilis"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Beirbeireach (Eile)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Teangacha Sorbacha"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -265,8 +270,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantúch (Eile)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Teangacha Máigeacha"
 
 # google
 #. name for bos, bs
@@ -310,8 +316,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Teangacha Astrálacha"
 
 #. name for car
 msgid "Galibi Carib"
@@ -322,16 +329,18 @@ msgid "Catalan; Valencian"
 msgstr "Catalóinis; Vaileinsis"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Cugasach (Eile)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Teangacha Núibiacha"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Ceilteach (Eile)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Teangacha iomadúla"
 
 # Firefox
 #. name for cha, ch
@@ -411,15 +420,18 @@ msgid "Corsican"
 msgstr "Corsaicis"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Crióil agus teangacha briotaireachta, bunaithe ar an mBéarla (Eile)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Crióil agus teangacha briotaireachta, bunaithe ar an bhFraincis (Eile)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 "Crióil agus teangacha briotaireachta, bunaithe ar an bPortaingéilis (Eile)"
 
@@ -433,7 +445,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Tatairis Chriméach; Tuircis Chriméach"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Crióil agus teangacha briotaireachta (Eile)"
 
 #. name for csb
@@ -441,8 +454,9 @@ msgid "Kashubian"
 msgstr "Caisiúibis"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Teangacha Astrálacha"
 
 #. name for ces, cs
 msgid "Czech"
@@ -489,8 +503,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dráivideach (Eile)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Teangacha Sorbacha"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -583,8 +598,9 @@ msgid "Finnish"
 msgstr "Fionlainnis"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Fionn-Úgrach (Eile)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Teangacha Sorbacha"
 
 #. name for fon
 msgid "Fon"
@@ -635,8 +651,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Gearmánach (Eile)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Teangacha Sorbacha"
 
 # google
 #. name for kat, ka
@@ -830,16 +847,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Idirtheanga (International Auxiliary Language Association)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indiach (Eile)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Teangacha gan chód"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indinéisis"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Ind-Eorpach (Eile)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Teangacha Sorbacha"
 
 #. name for inh
 msgid "Ingush"
@@ -850,8 +869,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iaránach (Eile)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Teangacha Sorbacha"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -936,8 +956,9 @@ msgid "Khasi"
 msgstr ""
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Cóíseach (Eile)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Teangacha Sorbacha"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1146,8 +1167,9 @@ msgid "Maori"
 msgstr "Maorais"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Teangacha Astrálacha"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1191,8 +1213,9 @@ msgid "Uncoded languages"
 msgstr "Teangacha gan chód"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Teangacha Máigeacha"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1264,8 +1287,9 @@ msgid "Nahuatl languages"
 msgstr ""
 
 #. name for nai
-msgid "North American Indian"
-msgstr ""
+#, fuzzy
+msgid "North American Indian languages"
+msgstr "Teangacha Astrálacha"
 
 # Naipleach a1/nm1 in de Bhaldraithe
 #. name for nap
@@ -1313,8 +1337,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Teangacha Sorbacha"
 
 #. name for niu
 msgid "Niuean"
@@ -1411,8 +1436,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papuach (Eile)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Teangacha Máigeacha"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1448,8 +1474,9 @@ msgid "Persian"
 msgstr "Peirsis"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipíneach (Eile)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Teangacha iomadúla"
 
 # dicts have Féiníceach --kps
 #. name for phn
@@ -1506,9 +1533,11 @@ msgstr ""
 msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
+# de Bhaldraithe "Apáis"
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Rómánsach (Eile)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Teangacha Apáiseacha"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1548,8 +1577,9 @@ msgid "Yakut"
 msgstr "Iacúitis"
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Teangacha Astrálacha"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1584,8 +1614,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Seimíteach (Eile)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Teangacha Comharthaí"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1612,12 +1643,15 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Teangacha Sorbacha"
 
+# de Bhaldraithe "Apáis"
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slavach (Eile)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Teangacha Apáiseacha"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1636,8 +1670,9 @@ msgid "Northern Sami"
 msgstr "Sáimis Thuaidh"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Teangacha Sáimise (Eile)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Teangacha Comharthaí"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1707,8 +1742,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Teangacha Núibiacha"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1756,8 +1792,9 @@ msgid "Tahitian"
 msgstr "Taihítis"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Teangacha Máigeacha"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1873,9 +1910,11 @@ msgstr ""
 msgid "Turkish"
 msgstr "Tuircis"
 
+# de Bhaldraithe "Apáis"
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaech (Eile)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Teangacha Apáiseacha"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/gez.po b/iso_639/gez.po
index a64be4b..fe904e1 100644
--- a/iso_639/gez.po
+++ b/iso_639/gez.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-08-07 21:21+0100\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Geez\n"
@@ -43,7 +43,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -123,8 +123,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "ኮሪያኛ"
 
 #. name for arw
 msgid "Arawak"
@@ -199,8 +200,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "ኮሪያኛ"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -219,8 +221,9 @@ msgid "Bengali"
 msgstr "በንጋሊኛ"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "ኮሪያኛ"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -247,8 +250,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "ኮሪያኛ"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -291,8 +295,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "ፍሪስኛ"
 
 #. name for car
 #, fuzzy
@@ -304,16 +309,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "ኮሪያኛ"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "ኮሪያኛ"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -391,15 +398,15 @@ msgid "Corsican"
 msgstr "ኮርሲካኛ"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -411,7 +418,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -419,8 +426,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "ኮሪያኛ"
 
 #. name for ces, cs
 msgid "Czech"
@@ -467,8 +475,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "ኮሪያኛ"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -559,8 +568,9 @@ msgid "Finnish"
 msgstr "ፊኒሽ"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "ኮሪያኛ"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +624,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "ኮሪያኛ"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -803,16 +814,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "ኮሪያኛ"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "እንዶኒሲኛ"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "ኮሪያኛ"
 
 #. name for inh
 msgid "Ingush"
@@ -823,8 +836,9 @@ msgid "Inupiaq"
 msgstr "እኑፒያቅኛ"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "ኮሪያኛ"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -909,8 +923,9 @@ msgid "Khasi"
 msgstr "ታይኛ"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "ኮሪያኛ"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1111,8 +1126,9 @@ msgid "Maori"
 msgstr "ማዮሪኛ"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "ኮሪያኛ"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1156,8 +1172,9 @@ msgid "Uncoded languages"
 msgstr "ኮሪያኛ"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "ኮሪያኛ"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1231,7 +1248,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "ፍሪስኛ"
 
 #. name for nap
@@ -1275,8 +1292,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "ኮሪያኛ"
 
 #. name for niu
 msgid "Niuean"
@@ -1371,8 +1389,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "ኮሪያኛ"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1407,8 +1426,9 @@ msgid "Persian"
 msgstr "ፐርሲያኛ"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "ኮሪያኛ"
 
 #. name for phn
 msgid "Phoenician"
@@ -1463,8 +1483,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "ኮሪያኛ"
 
 #. name for roh, rm
 #, fuzzy
@@ -1504,8 +1525,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "ፍሪስኛ"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1540,8 +1562,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "ኮሪያኛ"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1569,12 +1592,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "ኮሪያኛ"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "ኮሪያኛ"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1593,8 +1618,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "ኮሪያኛ"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1662,8 +1688,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "ኮሪያኛ"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1706,8 +1733,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "ኮሪያኛ"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1818,8 +1846,9 @@ msgid "Turkish"
 msgstr "ቱርክኛ"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "ኮሪያኛ"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/gl.po b/iso_639/gl.po
index f3f1f6b..4dcea8b 100644
--- a/iso_639/gl.po
+++ b/iso_639/gl.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2005-02-21 17:19+0100\n"
 "Last-Translator: Jacobo Tarrío <jtarrio at debian.org>\n"
 "Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -46,8 +46,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-Asiático (Outro)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Idiomas apaches"
 
 #. name for afh
 msgid "Afrihili"
@@ -127,8 +128,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Artificial (Outro)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Idioma atapascano"
 
 #. name for arw
 msgid "Arawak"
@@ -205,8 +207,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Báltico (Outro)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Idiomas maias"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -225,8 +228,9 @@ msgid "Bengali"
 msgstr "Bengalí"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Idiomas maias"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -253,8 +257,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantú (Outro)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Idiomas maias"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -298,7 +303,8 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Indio centroamericano (Outro)"
 
 #. name for car
@@ -311,16 +317,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Caucasiano (Outro)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Idiomas nubios"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Celta (Outro)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Varios idiomas"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -399,17 +407,17 @@ msgstr "Corso"
 
 #. name for cpe
 #, fuzzy
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr "Baseado no inglés (Outro)"
 
 #. name for cpf
 #, fuzzy
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr "Baseado no francés (Outro)"
 
 #. name for cpp
 #, fuzzy
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Baseado no portugués (Outro)"
 
 #. name for cre, cr
@@ -422,16 +430,18 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Turco de Crimea; tártaro de Crimea"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
-msgstr ""
+#, fuzzy
+msgid "Creoles and pidgins"
+msgstr "Baseado no francés (Outro)"
 
 #. name for csb
 msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Idiomas australianos"
 
 #. name for ces, cs
 msgid "Czech"
@@ -479,8 +489,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Idiomas australianos"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -571,8 +582,9 @@ msgid "Finnish"
 msgstr "Finés"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Idiomas nubios"
 
 #. name for fon
 msgid "Fon"
@@ -628,8 +640,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Xermánico (Outro)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Idiomas maias"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -820,16 +833,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Índico (Outro)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Idiomas maias"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesio"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indo-Europeo (Outro)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Idiomas iroqueses"
 
 #. name for inh
 msgid "Ingush"
@@ -840,8 +855,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iraní (Outro)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Idiomas iroqueses"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -926,8 +942,9 @@ msgid "Khasi"
 msgstr "Thai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Idiomas maias"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1129,8 +1146,9 @@ msgid "Maori"
 msgstr "Maorí"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Austronesio (Outro)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Idiomas australianos"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1174,8 +1192,9 @@ msgid "Uncoded languages"
 msgstr "Idiomas maias"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Idiomas nubios"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1249,7 +1268,7 @@ msgstr "Idiomas nubios"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Indio norteamericano (Outro)"
 
 #. name for nap
@@ -1293,8 +1312,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Idiomas iroqueses"
 
 #. name for niu
 msgid "Niuean"
@@ -1391,8 +1411,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papuano (Outro)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Idiomas maias"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1428,8 +1449,9 @@ msgid "Persian"
 msgstr "Persa"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipino (Outro)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Varios idiomas"
 
 #. name for phn
 msgid "Phoenician"
@@ -1485,8 +1507,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romance (Outro)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Idiomas maias"
 
 #. name for roh, rm
 #, fuzzy
@@ -1526,7 +1549,8 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Indio suramericano (Outro)"
 
 #. name for sal
@@ -1562,8 +1586,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semítico (Outro)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Idiomas de signos"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1591,12 +1616,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-tibetano (Outro)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Idiomas nubios"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Eslavo (Outro)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Idiomas de signos"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1615,8 +1642,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Idiomas de signos"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1685,8 +1713,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Idiomas nubios"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1729,8 +1758,9 @@ msgid "Tahitian"
 msgstr "Tahitiano"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Idiomas de signos"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1841,8 +1871,9 @@ msgid "Turkish"
 msgstr "Turco"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaico (Outro)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Idiomas apaches"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/he.po b/iso_639/he.po
index 3194586..f8e861f 100644
--- a/iso_639/he.po
+++ b/iso_639/he.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-08-07 19:12+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Hebrew <kde-il at yahoogroups.com>\n"
@@ -48,7 +48,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -134,8 +134,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "קוריאנית"
 
 #. name for arw
 msgid "Arawak"
@@ -213,8 +214,9 @@ msgid "Basa"
 msgstr "בסקית"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "קוריאנית"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -234,8 +236,9 @@ msgid "Bengali"
 msgstr ""
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "קוריאנית"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -264,8 +267,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "קוריאנית"
 
 #. name for bos, bs
 #, fuzzy
@@ -311,8 +315,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "אוקראינית"
 
 #. name for car
 #, fuzzy
@@ -324,16 +329,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "קוריאנית"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "קוריאנית"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -415,15 +422,15 @@ msgid "Corsican"
 msgstr "בוסנית"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -436,7 +443,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -444,8 +451,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "קוריאנית"
 
 #. name for ces, cs
 msgid "Czech"
@@ -494,8 +502,9 @@ msgid "Dogri"
 msgstr "מאורית"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "קוריאנית"
 
 #. name for dsb
 #, fuzzy
@@ -589,8 +598,9 @@ msgid "Finnish"
 msgstr "פינית"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "קוריאנית"
 
 #. name for fon
 msgid "Fon"
@@ -645,8 +655,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "קוריאנית"
 
 #. name for kat, ka
 #, fuzzy
@@ -843,16 +854,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "קוריאנית"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "אינדונזית"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "קוריאנית"
 
 #. name for inh
 #, fuzzy
@@ -864,8 +877,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "קוריאנית"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -954,8 +968,9 @@ msgid "Khasi"
 msgstr "תאילנדית"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "קוריאנית"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1168,8 +1183,9 @@ msgid "Maori"
 msgstr "מאורית"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "קוריאנית"
 
 #. name for mar, mr
 #, fuzzy
@@ -1215,8 +1231,9 @@ msgid "Uncoded languages"
 msgstr "קוריאנית"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "קוריאנית"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1295,7 +1312,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "אוקראינית"
 
 #. name for nap
@@ -1340,8 +1357,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "קוריאנית"
 
 #. name for niu
 msgid "Niuean"
@@ -1440,8 +1458,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "קוריאנית"
 
 #. name for pag
 #, fuzzy
@@ -1478,8 +1497,9 @@ msgid "Persian"
 msgstr "סרבית"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "קוריאנית"
 
 #. name for phn
 #, fuzzy
@@ -1537,8 +1557,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "קוריאנית"
 
 #. name for roh, rm
 #, fuzzy
@@ -1579,8 +1600,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "אוקראינית"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1616,8 +1638,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "קוריאנית"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1646,12 +1669,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "קוריאנית"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "קוריאנית"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1670,8 +1695,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "קוריאנית"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1743,8 +1769,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "קוריאנית"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1790,8 +1817,9 @@ msgid "Tahitian"
 msgstr "לטבית"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "קוריאנית"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1906,8 +1934,9 @@ msgid "Turkish"
 msgstr "טורקית"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "קוריאנית"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/hi.po b/iso_639/hi.po
index a6d2012..0cea89b 100644
--- a/iso_639/hi.po
+++ b/iso_639/hi.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-08-07 21:21+0100\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Hindi\n"
@@ -43,7 +43,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -123,8 +123,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "कोरीयन्"
 
 #. name for arw
 msgid "Arawak"
@@ -199,8 +200,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "कोरीयन्"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -219,8 +221,9 @@ msgid "Bengali"
 msgstr "बँगाली"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "कोरीयन्"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -247,8 +250,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "कोरीयन्"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -291,8 +295,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "फ्रीज़न्"
 
 #. name for car
 #, fuzzy
@@ -304,16 +309,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "कोरीयन्"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "कोरीयन्"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -391,15 +398,15 @@ msgid "Corsican"
 msgstr "कोर्सीकन"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -411,7 +418,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -419,8 +426,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "कोरीयन्"
 
 #. name for ces, cs
 msgid "Czech"
@@ -467,8 +475,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "कोरीयन्"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -559,8 +568,9 @@ msgid "Finnish"
 msgstr "फिनिश"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "कोरीयन्"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +624,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "कोरीयन्"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -803,16 +814,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "कोरीयन्"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "इन्डोनेशियन्"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "कोरीयन्"
 
 #. name for inh
 msgid "Ingush"
@@ -823,8 +836,9 @@ msgid "Inupiaq"
 msgstr "इनुपियाक्"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "कोरीयन्"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -909,8 +923,9 @@ msgid "Khasi"
 msgstr "थाई"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "कोरीयन्"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1111,8 +1126,9 @@ msgid "Maori"
 msgstr "मेओरी"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "कोरीयन्"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1156,8 +1172,9 @@ msgid "Uncoded languages"
 msgstr "कोरीयन्"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "कोरीयन्"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1231,7 +1248,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "फ्रीज़न्"
 
 #. name for nap
@@ -1275,8 +1292,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "कोरीयन्"
 
 #. name for niu
 msgid "Niuean"
@@ -1371,8 +1389,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "कोरीयन्"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1407,8 +1426,9 @@ msgid "Persian"
 msgstr "पर्शियन्"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "कोरीयन्"
 
 #. name for phn
 msgid "Phoenician"
@@ -1463,8 +1483,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "कोरीयन्"
 
 #. name for roh, rm
 #, fuzzy
@@ -1504,8 +1525,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "फ्रीज़न्"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1540,8 +1562,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "कोरीयन्"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1569,12 +1592,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "कोरीयन्"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "कोरीयन्"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1593,8 +1618,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "कोरीयन्"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1662,8 +1688,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "कोरीयन्"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1706,8 +1733,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "कोरीयन्"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1818,8 +1846,9 @@ msgid "Turkish"
 msgstr "तुक्रीश"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "कोरीयन्"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/hr.po b/iso_639/hr.po
index 3eda570..875df81 100644
--- a/iso_639/hr.po
+++ b/iso_639/hr.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: Thu Aug 24 2000 13:00:35+0200\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Croatian <lokalizacija at linux.hr>\n"
@@ -48,7 +48,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -135,8 +135,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Korejski"
 
 #. name for arw
 msgid "Arawak"
@@ -215,8 +216,9 @@ msgid "Basa"
 msgstr "Baskijski"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Korejski"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -237,8 +239,9 @@ msgid "Bengali"
 msgstr "Natrag"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Korejski"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -267,8 +270,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Korejski"
 
 #. name for bos, bs
 #, fuzzy
@@ -314,8 +318,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Ukrajinski"
 
 #. name for car
 #, fuzzy
@@ -327,16 +332,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Korejski"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Korejski"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -418,15 +425,15 @@ msgid "Corsican"
 msgstr "Estonski"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -439,7 +446,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -447,8 +454,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Korejski"
 
 #. name for ces, cs
 msgid "Czech"
@@ -497,8 +505,9 @@ msgid "Dogri"
 msgstr "Maorski"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Korejski"
 
 #. name for dsb
 #, fuzzy
@@ -593,8 +602,9 @@ msgid "Finnish"
 msgstr "Finski"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Korejski"
 
 #. name for fon
 msgid "Fon"
@@ -649,8 +659,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Korejski"
 
 #. name for kat, ka
 #, fuzzy
@@ -848,8 +859,9 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Korejski"
 
 #. name for ind, id
 #, fuzzy
@@ -857,8 +869,9 @@ msgid "Indonesian"
 msgstr "Estonski"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Korejski"
 
 #. name for inh
 #, fuzzy
@@ -870,8 +883,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Korejski"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -960,8 +974,9 @@ msgid "Khasi"
 msgstr "Tajlandski"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Korejski"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1177,8 +1192,9 @@ msgid "Maori"
 msgstr "Maorski"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Korejski"
 
 #. name for mar, mr
 #, fuzzy
@@ -1224,8 +1240,9 @@ msgid "Uncoded languages"
 msgstr "Korejski"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Korejski"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1305,7 +1322,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Ukrajinski"
 
 #. name for nap
@@ -1351,8 +1368,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Korejski"
 
 #. name for niu
 msgid "Niuean"
@@ -1451,8 +1469,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Korejski"
 
 #. name for pag
 #, fuzzy
@@ -1489,8 +1508,9 @@ msgid "Persian"
 msgstr "Srpski"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Korejski"
 
 #. name for phn
 #, fuzzy
@@ -1548,8 +1568,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Korejski"
 
 #. name for roh, rm
 #, fuzzy
@@ -1590,8 +1611,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Ukrajinski"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1630,8 +1652,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Korejski"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1660,12 +1683,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Korejski"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Korejski"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1684,8 +1709,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Korejski"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1757,8 +1783,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Korejski"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1804,8 +1831,9 @@ msgid "Tahitian"
 msgstr "Hrvatska"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Korejski"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1920,8 +1948,9 @@ msgid "Turkish"
 msgstr "Turski"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Korejski"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/hu.po b/iso_639/hu.po
index 6521876..647646a 100644
--- a/iso_639/hu.po
+++ b/iso_639/hu.po
@@ -9,10 +9,10 @@
 #   Kálmán Kéménczy <kkemenczy at novell.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2007-09-13 10:43+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@ -47,8 +47,9 @@ msgid "Adyghe; Adygei"
 msgstr "cserkesz"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "afro-ázsiai (egyéb)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "apacs nyelvek"
 
 #. name for afh
 msgid "Afrihili"
@@ -127,8 +128,9 @@ msgid "Arapaho"
 msgstr "arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "mesterséges (egyéb)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "otomi nyelvek"
 
 #. name for arw
 msgid "Arawak"
@@ -203,8 +205,9 @@ msgid "Basa"
 msgstr "basza"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "balti (egyéb)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "batak nyelvek"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -223,8 +226,9 @@ msgid "Bengali"
 msgstr "bengáli"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "berber (egyéb)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "karen nyelvek"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -251,8 +255,9 @@ msgid "Siksika"
 msgstr "siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "bantu (egyéb)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "banda nyelvek"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -295,7 +300,8 @@ msgid "Caddo"
 msgstr "kaddó"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "közép-amerikai indián (egyéb)"
 
 #. name for car
@@ -307,16 +313,18 @@ msgid "Catalan; Valencian"
 msgstr "katalán; valenciai"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "kaukázusi (egyéb)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "vakas nyelvek"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "szebuano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "kelta (egyéb)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "csami nyelvek"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -393,15 +401,18 @@ msgid "Corsican"
 msgstr "korzikai"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "kreol és pidzsin, angol alapú (egyéb)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "kreol és pidzsin, francia alapú (egyéb)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "kreol és pidzsin, portugál alapú (egyéb)"
 
 #. name for cre, cr
@@ -413,7 +424,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "krími tatár; krími török"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "kreol és pidzsin (egyéb)"
 
 #. name for csb
@@ -421,8 +433,9 @@ msgid "Kashubian"
 msgstr "kasub"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "kúsita (egyéb)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "csami nyelvek"
 
 #. name for ces, cs
 msgid "Czech"
@@ -469,8 +482,9 @@ msgid "Dogri"
 msgstr "dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "dravida (egyéb)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "szorb nyelvek"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -561,8 +575,9 @@ msgid "Finnish"
 msgstr "finn"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "finnugor (egyéb)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "szorb nyelvek"
 
 #. name for fon
 msgid "Fon"
@@ -613,8 +628,9 @@ msgid "Gbaya"
 msgstr "gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "német (egyéb)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "csami nyelvek"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -804,16 +820,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "interlingva (Nemzetközi Segédnyelv Egyesület)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "indoárja (egyéb)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "banda nyelvek"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "indonéz"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "indo-európai (egyéb)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "irokéz nyelvek"
 
 #. name for inh
 msgid "Ingush"
@@ -824,8 +842,9 @@ msgid "Inupiaq"
 msgstr "inupiak"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "iráni (egyéb)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "irokéz nyelvek"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -908,8 +927,9 @@ msgid "Khasi"
 msgstr "khaszi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "koiszan (egyéb)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "otomi nyelvek"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1109,8 +1129,9 @@ msgid "Maori"
 msgstr "maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "ausztroázsiai (egyéb)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "ausztrál nyelvek"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1154,8 +1175,9 @@ msgid "Uncoded languages"
 msgstr "zande nyelvek"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "mon-khmer (egyéb)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "kru nyelvek"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1226,7 +1248,8 @@ msgid "Nahuatl languages"
 msgstr "núbiai nyelvek"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "észak-amerikai indián"
 
 #. name for nap
@@ -1270,7 +1293,8 @@ msgid "Nias"
 msgstr "nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "niger-kordofáni (egyéb)"
 
 #. name for niu
@@ -1367,8 +1391,9 @@ msgid "Otomian languages"
 msgstr "otomi nyelvek"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "pápua (egyéb)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "maja nyelvek"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1403,8 +1428,9 @@ msgid "Persian"
 msgstr "perzsa"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "fülöp-szigeteki (egyéb)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "több nyelv"
 
 #. name for phn
 msgid "Phoenician"
@@ -1462,8 +1488,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "rarotonga; Cook-szigeteki maori"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "újlatin nyelvek (egyéb)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "otomi nyelvek"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1502,7 +1529,8 @@ msgid "Yakut"
 msgstr "jakut"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "dél-amerikai indián (egyéb)"
 
 #. name for sal
@@ -1538,8 +1566,9 @@ msgid "Selkup"
 msgstr "szelkup"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "sémi nyelvek (egyéb)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "csami nyelvek"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1566,12 +1595,14 @@ msgid "Siouan languages"
 msgstr "sziú nyelvek"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "sino-tibeti (egyéb)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "sziú nyelvek"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "szláv (egyéb)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "csami nyelvek"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1590,8 +1621,9 @@ msgid "Northern Sami"
 msgstr "északi lapp"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "lapp nyelvek (egyéb)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "csami nyelvek"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1658,8 +1690,9 @@ msgid "Serer"
 msgstr "szerer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "nílus-szaharai (egyéb)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "szalis nyelvek"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1702,8 +1735,9 @@ msgid "Tahitian"
 msgstr "tahiti"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "thai (egyéb)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "tupi nyelvek"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1814,8 +1848,9 @@ msgid "Turkish"
 msgstr "török"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "altaji (egyéb)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "apacs nyelvek"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/id.po b/iso_639/id.po
index 081fc6d..f94a99d 100644
--- a/iso_639/id.po
+++ b/iso_639/id.po
@@ -12,8 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639 3.6\n"
-"Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
+"debian.org>\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2009-02-02 22:55+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@ -46,8 +47,9 @@ msgid "Adyghe; Adygei"
 msgstr "Adyghe; Adygei"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-Asiatik (Lainnya)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Bahasa Apache"
 
 #. name for afh
 msgid "Afrihili"
@@ -126,8 +128,9 @@ msgid "Arapaho"
 msgstr "Arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Buatan (Lainnya)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Bahasa Otomia"
 
 #. name for arw
 msgid "Arawak"
@@ -202,8 +205,9 @@ msgid "Basa"
 msgstr "Basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltik (Lainnya)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Bahasa Batak"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -222,8 +226,9 @@ msgid "Bengali"
 msgstr "Bengal"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berber (Lainnya)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Bahasa Karen"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -250,8 +255,9 @@ msgid "Siksika"
 msgstr "Siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantu (Lainnya)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Bahasa Banda"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -294,7 +300,8 @@ msgid "Caddo"
 msgstr "Caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "India Amerika Tengah (Lainnnya)"
 
 #. name for car
@@ -306,16 +313,18 @@ msgid "Catalan; Valencian"
 msgstr "Catalan; Valencian"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Kaukasia (Lainnya)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Bahasa Wakashan"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Celtic (Lainnya)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Bahasa Chamic"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -362,8 +371,12 @@ msgid "Cherokee"
 msgstr "Cherokee"
 
 #. name for chu, cu
-msgid "Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic"
-msgstr "Gereja Slavic; Slavonic Kuno; Gereja Slavonic; Bulgaria Kuno; Gereja Tua Slavonic"
+msgid ""
+"Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church "
+"Slavonic"
+msgstr ""
+"Gereja Slavic; Slavonic Kuno; Gereja Slavonic; Bulgaria Kuno; Gereja Tua "
+"Slavonic"
 
 #. name for chv, cv
 msgid "Chuvash"
@@ -390,15 +403,18 @@ msgid "Corsican"
 msgstr "Korsika"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Creoles dan pidgins, berbasis Inggris (Lainnya)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Creoles dan pidgins, berbasis Prancis (Lainnya)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Creoles dan pidgins, berbasis Portugis (Lainnya)"
 
 #. name for cre, cr
@@ -410,7 +426,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Crimean Tatar; Crimean Turkish"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Creoles dan pidgins (Lainnya)"
 
 #. name for csb
@@ -418,8 +435,9 @@ msgid "Kashubian"
 msgstr "Kashubian"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Cushitic (Lainnya)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Bahasa Chamic"
 
 #. name for ces, cs
 msgid "Czech"
@@ -466,8 +484,9 @@ msgid "Dogri"
 msgstr "Dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidian (Lainnya)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Bahasa Sorbia"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -558,8 +577,9 @@ msgid "Finnish"
 msgstr "Finlandia"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Finno-Ugrian (Lainnya)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Bahasa Sorbia"
 
 #. name for fon
 msgid "Fon"
@@ -610,8 +630,9 @@ msgid "Gbaya"
 msgstr "Gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Jermanik (Lainnya)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Bahasa Chamic"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -798,16 +819,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua (Asosiasi Bahasa Auxilari Internasional)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indic (Lainnya)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Bahasa Banda"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Bahasa Indonesia"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indo-Eropa (Lainnya)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Bahasa Iroquoian"
 
 #. name for inh
 msgid "Ingush"
@@ -818,8 +841,9 @@ msgid "Inupiaq"
 msgstr "Inupiaq"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iran (Lainnya)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Bahasa Iroquoian"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -902,8 +926,9 @@ msgid "Khasi"
 msgstr "Khasi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Khoisan (Lainnya)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Bahasa Otomia"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1102,8 +1127,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Austronesia (Lainnya)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Bahasa Australian"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1146,8 +1172,9 @@ msgid "Uncoded languages"
 msgstr "Bahasa tak tersandi"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-Khmer (Lainnya)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Bahasa Kru"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1218,7 +1245,8 @@ msgid "Nahuatl languages"
 msgstr "Bahaya Nahuatl"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "India Amerika Utara"
 
 #. name for nap
@@ -1262,7 +1290,8 @@ msgid "Nias"
 msgstr "Nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Niger-Kordofanian (Lainnya)"
 
 #. name for niu
@@ -1358,8 +1387,9 @@ msgid "Otomian languages"
 msgstr "Bahasa Otomia"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papuan (Lainnya)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Bahasa Maya"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1394,8 +1424,9 @@ msgid "Persian"
 msgstr "Persia"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipina (Lainnya)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Banyak bahasa"
 
 #. name for phn
 msgid "Phoenician"
@@ -1450,8 +1481,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "Rarotongan; Kepulauan Cook Maori"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romance (Lainnya)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Bahasa Otomia"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1490,7 +1522,8 @@ msgid "Yakut"
 msgstr "Yakut"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Indian Amerika Selatan (Lainnya)"
 
 #. name for sal
@@ -1526,8 +1559,9 @@ msgid "Selkup"
 msgstr "Selkup"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semitic (Lainnya)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Bahasa Chamic"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1554,12 +1588,14 @@ msgid "Siouan languages"
 msgstr "Bahasa Sioua"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-Tibetan (Lainnya)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Bahasa Sioua"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slavic (Lainnya)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Bahasa Chamic"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1578,8 +1614,9 @@ msgid "Northern Sami"
 msgstr "Northern Sami"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Bahasa Sami (Lainnya)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Bahasa Chamic"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1646,8 +1683,9 @@ msgid "Serer"
 msgstr "Serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-Saharan (Lainnya)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Bahasa Salishan"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1690,8 +1728,9 @@ msgid "Tahitian"
 msgstr "Tahiti"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tai (Lainnya)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Bahasa Tupi"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1802,8 +1841,9 @@ msgid "Turkish"
 msgstr "Turki"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaic (Lainnya)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Bahasa Apache"
 
 #. name for tvl
 msgid "Tuvalu"
@@ -1964,15 +2004,3 @@ msgstr "Tak ada isi linguistik; Tak dapat diterapkan"
 #. name for zza
 msgid "Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki"
 msgstr "Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki"
-
-#, fuzzy
-#~ msgid "Norwegian Bokmål; Bokmål, Norwegian"
-#~ msgstr "Korea"
-
-#, fuzzy
-#~ msgid "Walamo"
-#~ msgstr "Wallon"
-
-#, fuzzy
-#~ msgid "Aramaic"
-#~ msgstr "Arab"
diff --git a/iso_639/is.po b/iso_639/is.po
index 70b3574..1f0cce6 100644
--- a/iso_639/is.po
+++ b/iso_639/is.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2002-01-05 19:27+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Icelandic <kde-isl at molar.is>\n"
@@ -48,7 +48,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -134,8 +134,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Kóreska"
 
 #. name for arw
 msgid "Arawak"
@@ -213,8 +214,9 @@ msgid "Basa"
 msgstr "Baskamál"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Kóreska"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -234,8 +236,9 @@ msgid "Bengali"
 msgstr ""
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Kóreska"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -264,8 +267,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Kóreska"
 
 #. name for bos, bs
 #, fuzzy
@@ -311,8 +315,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Úkraínska"
 
 #. name for car
 #, fuzzy
@@ -324,16 +329,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Kóreska"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Kóreska"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -415,15 +422,15 @@ msgid "Corsican"
 msgstr "Bosníska"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -436,7 +443,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -444,8 +451,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Kóreska"
 
 #. name for ces, cs
 msgid "Czech"
@@ -494,8 +502,9 @@ msgid "Dogri"
 msgstr "Maori"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Kóreska"
 
 #. name for dsb
 #, fuzzy
@@ -589,8 +598,9 @@ msgid "Finnish"
 msgstr "Finnska"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Kóreska"
 
 #. name for fon
 msgid "Fon"
@@ -645,8 +655,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Kóreska"
 
 #. name for kat, ka
 #, fuzzy
@@ -843,16 +854,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Kóreska"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indónesíska"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Kóreska"
 
 #. name for inh
 #, fuzzy
@@ -864,8 +877,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Kóreska"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -954,8 +968,9 @@ msgid "Khasi"
 msgstr "Tælenska"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Kóreska"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1168,8 +1183,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Kóreska"
 
 #. name for mar, mr
 #, fuzzy
@@ -1215,8 +1231,9 @@ msgid "Uncoded languages"
 msgstr "Kóreska"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Kóreska"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1295,7 +1312,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Úkraínska"
 
 #. name for nap
@@ -1340,8 +1357,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Kóreska"
 
 #. name for niu
 msgid "Niuean"
@@ -1440,8 +1458,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Kóreska"
 
 #. name for pag
 #, fuzzy
@@ -1478,8 +1497,9 @@ msgid "Persian"
 msgstr "Serbneska"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Kóreska"
 
 #. name for phn
 #, fuzzy
@@ -1537,8 +1557,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Kóreska"
 
 #. name for roh, rm
 #, fuzzy
@@ -1579,8 +1600,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Úkraínska"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1616,8 +1638,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Kóreska"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1646,12 +1669,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Kóreska"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Kóreska"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1670,8 +1695,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Kóreska"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1743,8 +1769,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Kóreska"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1790,8 +1817,9 @@ msgid "Tahitian"
 msgstr "Léttlenska"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Kóreska"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1906,8 +1934,9 @@ msgid "Turkish"
 msgstr "Tyrkneska"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Kóreska"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/it.po b/iso_639/it.po
index 82dcaa5..ecc834d 100644
--- a/iso_639/it.po
+++ b/iso_639/it.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-11-04 21:14+0100\n"
 "Last-Translator: Milo Casagrande <milo_casagrande at yahoo.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -47,8 +47,9 @@ msgid "Adyghe; Adygei"
 msgstr "Adyghe; Adygei"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-asiatica (altra lingua)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Lingue Apache"
 
 #. name for afh
 msgid "Afrihili"
@@ -127,8 +128,9 @@ msgid "Arapaho"
 msgstr "Arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Artificiale (altra lingua)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Lingue ottomanne"
 
 #. name for arw
 msgid "Arawak"
@@ -203,8 +205,9 @@ msgid "Basa"
 msgstr "Basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltico (altra lingua)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Lingue Batak"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -223,8 +226,9 @@ msgid "Bengali"
 msgstr "Bengalese"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berbero (altra lingua)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Lingue karen"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -251,8 +255,9 @@ msgid "Siksika"
 msgstr "Siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantu (altra lingua)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Lingue Banda"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -295,7 +300,8 @@ msgid "Caddo"
 msgstr "Caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Indiana dell’America Centrale (altra lingua)"
 
 #. name for car
@@ -307,16 +313,18 @@ msgid "Catalan; Valencian"
 msgstr "Catalano, Valenciano"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Caucasico (altra lingua)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Lingue wakashan"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Celtico (altra lingua)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Lingue Chamic"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -393,15 +401,18 @@ msgid "Corsican"
 msgstr "Corso"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Creolo e pidgin, basati sull'inglese (altra lingua)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Creolo e pidgin, basati sul francese (altra lingua)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Creolo e pidgin, basati sul portoghese (altra lingua)"
 
 #. name for cre, cr
@@ -413,7 +424,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Tatar crimeo; Turco crimeo"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Creolo e pidgin (altra lingua)"
 
 #. name for csb
@@ -421,8 +433,9 @@ msgid "Kashubian"
 msgstr "Kashubian"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Cuscitico (altra lingua)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Lingue Chamic"
 
 #. name for ces, cs
 msgid "Czech"
@@ -469,8 +482,9 @@ msgid "Dogri"
 msgstr "Dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidiano (altra lingua)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Lingue sorabe"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -561,8 +575,9 @@ msgid "Finnish"
 msgstr "Finlandese"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Finno-Ugrian (altra lingua)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Lingue sorabe"
 
 #. name for fon
 msgid "Fon"
@@ -613,8 +628,9 @@ msgid "Gbaya"
 msgstr "Gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germanico (altra lingua)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Lingue Chamic"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -801,16 +817,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua (International Auxiliary Language Association)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indic (altra lingua)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Lingue Banda"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesiano"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indoeuropeo (altra lingua)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Lingue irochesi"
 
 #. name for inh
 msgid "Ingush"
@@ -821,8 +839,9 @@ msgid "Inupiaq"
 msgstr "Inupiaq"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iraniano (altra lingua)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Lingue irochesi"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -905,8 +924,9 @@ msgid "Khasi"
 msgstr "Khasi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Khoisan (altra lingua)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Lingue ottomanne"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1105,8 +1125,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Austronesiano (altra lingua)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Lingue australi"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1149,8 +1170,9 @@ msgid "Uncoded languages"
 msgstr "Lingue non codificate"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-khmer (altra lingua)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Lingue kru"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1221,7 +1243,8 @@ msgid "Nahuatl languages"
 msgstr "Lingue salish"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Indiano del Nord America"
 
 #. name for nap
@@ -1265,7 +1288,8 @@ msgid "Nias"
 msgstr "Nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Niger-Kordofanian (altra lingua)"
 
 #. name for niu
@@ -1361,8 +1385,9 @@ msgid "Otomian languages"
 msgstr "Lingue ottomanne"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papuano (altra lingua)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Lungue maya"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1397,8 +1422,9 @@ msgid "Persian"
 msgstr "Persiano"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filippino (altra lingua)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Lingue multiple"
 
 #. name for phn
 msgid "Phoenician"
@@ -1453,8 +1479,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "Rarotongan; Maori dell'Isola di Cook"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Lingua romanza (altra lingua)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Lingue ottomanne"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1493,7 +1520,8 @@ msgid "Yakut"
 msgstr "Yakut"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Indiano del Sud America (altra lingua)"
 
 #. name for sal
@@ -1529,8 +1557,9 @@ msgid "Selkup"
 msgstr "Selkup"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semitico (altra lingua)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Lingue Chamic"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1557,12 +1586,14 @@ msgid "Siouan languages"
 msgstr "Lingue siouan"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-tibetano (altra lingua)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Lingue siouan"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slavo (altra lingua)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Lingue Chamic"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1581,8 +1612,9 @@ msgid "Northern Sami"
 msgstr "Sami del Nord"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Lingue sami (altra lingua)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Lingue Chamic"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1649,8 +1681,9 @@ msgid "Serer"
 msgstr "Serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-Saharan (altra lingua)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Lingue salish"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1693,8 +1726,9 @@ msgid "Tahitian"
 msgstr "Thaitiano"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Thailandese (altra lingua)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Lingue tupi"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1805,8 +1839,9 @@ msgid "Turkish"
 msgstr "Turco"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaico (altra lingua)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Lingue Apache"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/ja.po b/iso_639/ja.po
index ac85704..f65d602 100644
--- a/iso_639/ja.po
+++ b/iso_639/ja.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2007-08-27 22:20+0900\n"
 "Last-Translator: IIDA Yosiaki <iida at gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja at lists.sourceforge.net>\n"
@@ -67,10 +67,12 @@ msgstr "アダングメ語"
 msgid "Adyghe; Adygei"
 msgstr "アディゲ語; アディジェイ語"
 
-# かつてセム・ハム〜、ハム・セム〜とも言われたが、現在では否定
+# 国国
+# 北米
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "アフロ・アジア諸語 (その他)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "アパッチ語族"
 
 # 鳥海訳、CLDR訳
 # アフリカ大陸の国際補助語
@@ -170,10 +172,13 @@ msgstr "Mapudungun; Mapuche"
 msgid "Arapaho"
 msgstr "アラパホー語"
 
-# 国国は「人工諸語」。言語はすべて人工だし、誤訳か
+# 国国
+# メキシコ
+# 中米インディアン
 #. name for art
-msgid "Artificial (Other)"
-msgstr "計画諸語 (その他)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "オトミ語族"
 
 # 国国
 # 北米インディアン
@@ -282,9 +287,11 @@ msgid "Basa"
 msgstr "バサ語"
 
 # 国国
+# 中米
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "バルト諸語 (その他)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "バタク語族"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -308,10 +315,11 @@ msgid "Bengali"
 msgstr "ベンガル語"
 
 # 国国
-# アフリカ北部
+# 中米
 #. name for ber
-msgid "Berber (Other)"
-msgstr "ベルベル諸語 (その他)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "カレン語族"
 
 # 国国
 #. name for bho
@@ -348,12 +356,14 @@ msgstr "ビスラマ語"
 msgid "Siksika"
 msgstr "シクシカ語"
 
-# 国国
-# アフリカ赤道周辺
-# バンツー〜とも
+# 国国は「Munda (Other) ムンダ諸語」
+# ISO, Ethnologueは「Munda languages」
+# インド
+# ムンダー〜とも
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "バントゥ諸語 (その他)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "バンダ語族"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -410,7 +420,8 @@ msgid "Caddo"
 msgstr "カドー語"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "中米インディアン諸語 (その他)"
 
 # スペイン北西
@@ -429,11 +440,11 @@ msgid "Catalan; Valencian"
 msgstr "カタロニア語; バレンシア語"
 
 # 国国
-# コーカサス地方
-# カフカス〜とも
+# 北・中央米インディアン
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "コーカサス諸語 (その他)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "ワカシ語族"
 
 # 国国
 # 広辞苑「セブアノ語(Sebuano)」の項
@@ -441,11 +452,11 @@ msgstr "コーカサス諸語 (その他)"
 msgid "Cebuano"
 msgstr "セブアノ語"
 
-# 国国
-# アイルランド島周辺
+# 中国、ベトナム、カンボジア
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "ケルト諸語 (その他)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "チャム語族"
 
 # 国国
 # ミクロネシア
@@ -548,15 +559,18 @@ msgid "Corsican"
 msgstr "コルシカ語"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "混成語・混合語 (その他), 英語基盤語 (その他)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "混成語・混合語 (その他), 仏語基盤語 (その他)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "混成語・混合語 (その他), 葡語基盤語 (その他)"
 
 # 国国
@@ -570,7 +584,8 @@ msgstr "クリミア・タタール語; クリミア・トルコ語"
 
 # 国国
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "混成語・混合語 (その他)"
 
 # CLDR訳
@@ -580,11 +595,11 @@ msgstr "混成語・混合語 (その他)"
 msgid "Kashubian"
 msgstr "カシューブ語"
 
-# 国国
-# アフリカの角
+# 中国、ベトナム、カンボジア
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "クシュ諸語 (その他)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "チャム語族"
 
 # 国国
 # チェック語とも
@@ -654,11 +669,11 @@ msgid "Dogri"
 msgstr "ドグリ語"
 
 # 国国
-# ドラビダ〜とも
-# インド南部
+# ドイツ
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "ドラヴィダ諸語 (その他)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "ソルビア語族"
 
 # CLDR訳
 # 低地ソルブ語、ソルビア語とも
@@ -785,10 +800,11 @@ msgid "Finnish"
 msgstr "フィン語"
 
 # 国国
-# フィンランドからロシア北西部、ハンガリー
+# ドイツ
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "フィン・ウゴル諸語 (その他)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "ソルビア語族"
 
 # ベナン (ダオメー) 南部
 #. name for fon
@@ -858,11 +874,11 @@ msgstr "ガヨ語"
 msgid "Gbaya"
 msgstr "バヤ語"
 
-# 国国
-# ドイツからイギリス、北欧
+# 中国、ベトナム、カンボジア
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "ゲルマン諸語 (その他)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "チャム語族"
 
 # 国国
 #. name for kat, ka
@@ -1144,10 +1160,14 @@ msgstr "イロカノ語"
 msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "インターリングア語 (国際補助語協会)"
 
-# 国国
+# 国国は「Munda (Other) ムンダ諸語」
+# ISO, Ethnologueは「Munda languages」
+# インド
+# ムンダー〜とも
 #. name for inc
-msgid "Indic (Other)"
-msgstr "インド諸語 (その他)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "バンダ語族"
 
 # 国国
 # インドネシア
@@ -1157,9 +1177,12 @@ msgid "Indonesian"
 msgstr "インドネシア語"
 
 # 国国
+# 北米
+# イロクォイ〜とも
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "印欧諸語 (その他)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "イロコイ語族"
 
 # CLDR訳
 # ロシア連邦南部北カフカス地方チェチェノ・イングーシ共和国
@@ -1176,9 +1199,12 @@ msgid "Inupiaq"
 msgstr "イヌピアック語"
 
 # 国国
+# 北米
+# イロクォイ〜とも
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "イラン諸語 (その他)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "イロコイ語族"
 
 # 国国
 # 北米
@@ -1292,10 +1318,12 @@ msgid "Khasi"
 msgstr "カシ語"
 
 # 国国
-# アフリカ南部
+# メキシコ
+# 中米インディアン
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "コイサン諸語 (その他)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "オトミ語族"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1604,11 +1632,10 @@ msgstr "マンディンゴ語"
 msgid "Maori"
 msgstr "マオリ語"
 
-# 国国
-# 太平洋からインド洋
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "オーストロネシア諸語 (その他)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "オーストラリア語族"
 
 # 国国
 #. name for mar, mr
@@ -1670,11 +1697,12 @@ msgstr "ミナンカバウ語"
 msgid "Uncoded languages"
 msgstr "ザンデ語族"
 
-# 南アジア
-# ニッポニカ「モン・クメール諸言語」の項
+# ブラジル
+# 南米インディアン
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "モン・クメール諸語 (その他)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "クルー語族"
 
 # 国国
 # KDE訳、CLDR訳は「マダガスカル語」
@@ -1794,7 +1822,8 @@ msgstr "ナワトル語族"
 
 # 国国
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "北米インディアン諸語"
 
 #. name for nap
@@ -1854,7 +1883,8 @@ msgstr "ニアス語"
 # 国国
 # アフリカ中央部
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "ニジェール・コルドファン諸語 (その他)"
 
 # 国国
@@ -1993,12 +2023,12 @@ msgstr "トルコ語, オスマン (1500-1928)"
 msgid "Otomian languages"
 msgstr "オトミ語族"
 
-# 国国は「Papuan-Australian」(ママ)「 (Other)」
-# ニューギニア島とその周辺
-# Ethnologueでは、non-Austronesianとしている
+# 国国
+# 中米
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "パプア諸語 (その他)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "マヤ語族"
 
 # 国国
 # CLDR訳は「パンガシナン語」
@@ -2043,9 +2073,11 @@ msgstr "ペルシア語, 古代 (紀元前約 600-400)"
 msgid "Persian"
 msgstr "ペルシア語"
 
+# 国国
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "フィリピン諸語 (その他)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "多言語"
 
 # 「Punic ポエニ語」とも
 #. name for phn
@@ -2132,10 +2164,12 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "ラロトンガ語; クック島マオリ語"
 
 # 国国
-# 西欧
+# メキシコ
+# 中米インディアン
 #. name for roa
-msgid "Romance (Other)"
-msgstr "ロマンス諸語 (その他)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "オトミ語族"
 
 # 国国
 # ニッポニカ「ジプシー」の項に「Romany」「ロマニー語」
@@ -2197,7 +2231,8 @@ msgstr "ヤクート語"
 
 # 国国
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "南米インディアン諸語 (その他)"
 
 # 国国
@@ -2244,11 +2279,11 @@ msgstr "スコットランド語"
 msgid "Selkup"
 msgstr "セリクプ語"
 
-# 国国
-# アフリカ北部からアラビア半島
+# 中国、ベトナム、カンボジア
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "セム諸語 (その他)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "チャム語族"
 
 # CLDR訳は「古期アイルランド語」
 #. name for sga
@@ -2287,18 +2322,18 @@ msgid "Siouan languages"
 msgstr "スー語族"
 
 # 国国
-# 中国からビルマ
+# 北米
+# ニッポニカ「スー族」→「ダコタ族」の項に「スー(シュー)族 Sioux」「スー語」
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "シナ・チベット諸語 (その他)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "スー語族"
 
-# 国国
-# ロシア西部からバルカン半島
-# 広辞苑「スラヴ語派 (Slavic)」の項
-# マイペディア、ニッポニカ「スラブ語派」の項
+# 中国、ベトナム、カンボジア
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "スラブ諸語 (その他)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "チャム語族"
 
 # 国国
 # KDE訳、CLDR訳は「スロバキア語」
@@ -2325,10 +2360,11 @@ msgstr "南サーミ語"
 msgid "Northern Sami"
 msgstr "北サーミ語"
 
-# 北欧、バルト海周辺
+# 中国、ベトナム、カンボジア
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "サーミ語族 (その他)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "チャム語族"
 
 #. name for smj
 msgid "Lule Sami"
@@ -2424,12 +2460,12 @@ msgid "Serer"
 msgstr "セレル語"
 
 # 国国
-# アフリカ中央部
-# CLDR訳は「ナイル・サハラ諸語」
-# ハム〜とも
+# CLDR訳は「セイリッシュ語族」
+# 北米インディアン。セーリッシ〜とも
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "ナイロ・サハラ諸語 (その他)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "サリシュ語族"
 
 # スワジランド王国
 # KDE訳は「スワート語」
@@ -2487,11 +2523,12 @@ msgstr "シリア語"
 msgid "Tahitian"
 msgstr "タヒチ語"
 
-# 国国
-# 南アジア
+# ブラジル
+# 南米インディアン
 #. name for tai
-msgid "Tai (Other)"
-msgstr "タイ諸語 (その他)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "トゥピ語族"
 
 # 国国
 # KDE訳、CLDR訳は「タミール語」
@@ -2656,10 +2693,12 @@ msgstr "トゥピ語族"
 msgid "Turkish"
 msgstr "トルコ語"
 
-# ロシア中央から極東
+# 国国
+# 北米
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "アルタイ諸語 (その他)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "アパッチ語族"
 
 # 国国
 #. name for tvl
diff --git a/iso_639/ko.po b/iso_639/ko.po
index 1e80b81..170845b 100644
--- a/iso_639/ko.po
+++ b/iso_639/ko.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2001-06-13 15:46+0900\n"
 "Last-Translator: Eungkyu Song <eungkyu at sparcs.org>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -47,7 +47,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -132,8 +132,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "한국어"
 
 #. name for arw
 msgid "Arawak"
@@ -211,8 +212,9 @@ msgid "Basa"
 msgstr "Balsa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "한국어"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -232,8 +234,9 @@ msgid "Bengali"
 msgstr "발트어"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "한국어"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -262,8 +265,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "한국어"
 
 #. name for bos, bs
 #, fuzzy
@@ -309,8 +313,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "우크라이나어"
 
 #. name for car
 #, fuzzy
@@ -322,16 +327,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "한국어"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "한국어"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -412,15 +419,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -433,7 +440,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -441,8 +448,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "한국어"
 
 #. name for ces, cs
 msgid "Czech"
@@ -491,8 +499,9 @@ msgid "Dogri"
 msgstr "여백"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "한국어"
 
 #. name for dsb
 #, fuzzy
@@ -588,8 +597,9 @@ msgid "Finnish"
 msgstr "핀란드어"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "한국어"
 
 #. name for fon
 msgid "Fon"
@@ -644,8 +654,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "한국어"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -847,16 +858,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "한국어"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "인도네시아어"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "한국어"
 
 #. name for inh
 #, fuzzy
@@ -869,8 +882,9 @@ msgid "Inupiaq"
 msgstr "인도어"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "한국어"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -959,8 +973,9 @@ msgid "Khasi"
 msgstr "태국어"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "한국어"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1172,8 +1187,9 @@ msgid "Maori"
 msgstr "여백"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "한국어"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1220,8 +1236,9 @@ msgid "Uncoded languages"
 msgstr "한국어"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "한국어"
 
 #. name for mlg, mg
 #, fuzzy
@@ -1301,7 +1318,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "우크라이나어"
 
 #. name for nap
@@ -1346,8 +1363,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "한국어"
 
 #. name for niu
 msgid "Niuean"
@@ -1446,8 +1464,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "한국어"
 
 #. name for pag
 #, fuzzy
@@ -1484,8 +1503,9 @@ msgid "Persian"
 msgstr "출력"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "한국어"
 
 #. name for phn
 #, fuzzy
@@ -1543,8 +1563,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "한국어"
 
 #. name for roh, rm
 #, fuzzy
@@ -1585,8 +1606,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "우크라이나어"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1625,8 +1647,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "한국어"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1654,12 +1677,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "한국어"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "한국어"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1678,8 +1703,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "한국어"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1751,8 +1777,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "한국어"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1798,8 +1825,9 @@ msgid "Tahitian"
 msgstr "라트비아어"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "한국어"
 
 #. name for tam, ta
 #, fuzzy
@@ -1915,8 +1943,9 @@ msgid "Turkish"
 msgstr "터키어"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "한국어"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/kok.po b/iso_639/kok.po
index 88f24a7..d93e1a0 100644
--- a/iso_639/kok.po
+++ b/iso_639/kok.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-04-14 07:10+0100\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Konkani\n"
@@ -43,7 +43,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -123,8 +123,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for arw
 msgid "Arawak"
@@ -199,8 +200,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -219,8 +221,9 @@ msgid "Bengali"
 msgstr "॓ंग॥ली"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -247,8 +250,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -291,8 +295,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "॒ॴर०श०ॖनॴ"
 
 #. name for car
 #, fuzzy
@@ -304,16 +309,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -391,15 +398,15 @@ msgid "Corsican"
 msgstr "कॲरॴश०ॖन"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -411,7 +418,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -419,8 +426,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for ces, cs
 msgid "Czech"
@@ -467,8 +475,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -559,8 +568,9 @@ msgid "Finnish"
 msgstr "॒०नॴन०षॴ"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +624,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -804,16 +815,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "इनॴडॲनेष०ॖन"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for inh
 msgid "Ingush"
@@ -824,8 +837,9 @@ msgid "Inupiaq"
 msgstr "इनू॑ेॖ॥कॴ"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -910,8 +924,9 @@ msgid "Khasi"
 msgstr "थ॥ई"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1112,8 +1127,9 @@ msgid "Maori"
 msgstr "ॕ॥ओरी"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1157,8 +1173,9 @@ msgid "Uncoded languages"
 msgstr "कॲर०ॖनॴ"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1232,7 +1249,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "॒ॴर०श०ॖनॴ"
 
 #. name for nap
@@ -1276,8 +1293,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for niu
 msgid "Niuean"
@@ -1373,8 +1391,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1410,8 +1429,9 @@ msgid "Persian"
 msgstr "॑रॴष०ॖनॴ"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for phn
 msgid "Phoenician"
@@ -1467,8 +1487,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for roh, rm
 #, fuzzy
@@ -1508,8 +1529,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "॒ॴर०श०ॖनॴ"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1544,8 +1566,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1573,12 +1596,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1597,8 +1622,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1666,8 +1692,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1710,8 +1737,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1822,8 +1850,9 @@ msgid "Turkish"
 msgstr "तुरॴक०ष"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/lt.po b/iso_639/lt.po
index 047ace2..8e851a5 100644
--- a/iso_639/lt.po
+++ b/iso_639/lt.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-10-27 12:35+0200\n"
 "Last-Translator: Kęstutis Biliūnas <kebil at kaunas.init.lt>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
@@ -46,8 +46,9 @@ msgid "Adyghe; Adygei"
 msgstr "Adygėjų"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afrazinės kalbos (kitos)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apačių kalbos"
 
 #. name for afh
 msgid "Afrihili"
@@ -126,8 +127,9 @@ msgid "Arapaho"
 msgstr "Arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Dirbtinės (kitos)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Sorbų kalbos"
 
 #. name for arw
 msgid "Arawak"
@@ -202,8 +204,9 @@ msgid "Basa"
 msgstr "Basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltų (kitos)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Batakų kalbos"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -222,8 +225,9 @@ msgid "Bengali"
 msgstr "Bengalų"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berberų (kitos)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Kajinų kalbos"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -250,8 +254,9 @@ msgid "Siksika"
 msgstr "Siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantų (kitos)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Bandos kalbos"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -294,7 +299,8 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Centrinės Amerikos indenų (kitos)"
 
 #. name for car
@@ -306,16 +312,18 @@ msgid "Catalan; Valencian"
 msgstr "Katalonų; Valencijos"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Kaukaziečių (kitos)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Atapaskų kalbos"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Sebuanų"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Keltų (kitos)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Sudėtinės kalbos"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -392,15 +400,18 @@ msgid "Corsican"
 msgstr "Korsikiečių"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Kreolų ir pidžin, anglų kalbos pagrindu (kitos)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Kreolų ir pidžin, prancūzų kalbos pagrindu (kitos)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Kreolų ir pidžin, portugalų kalbos pagrindu (kitos)"
 
 #. name for cre, cr
@@ -412,7 +423,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Krymo totorių; Krymo turkų"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Kreolų ir pidžin (kitos)"
 
 #. name for csb
@@ -420,8 +432,9 @@ msgid "Kashubian"
 msgstr "Kašubų"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Kušitų (kitos)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Australų kalbos"
 
 #. name for ces, cs
 msgid "Czech"
@@ -468,8 +481,9 @@ msgid "Dogri"
 msgstr "Dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidų (kitos)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Sorbų kalbos"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -560,8 +574,9 @@ msgid "Finnish"
 msgstr "Suomių"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Finougrų kalbos (kitos)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Sorbų kalbos"
 
 #. name for fon
 msgid "Fon"
@@ -612,8 +627,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germanų (kitos)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Sorbų kalbos"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -800,16 +816,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua (tarpinė kalba) (Tarptautinė pagalbinės kalbos asociacija)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indų (kitos)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Bandos kalbos"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indoneziečių"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indoeuropiečių (kitos)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Irokėzų kalbos"
 
 #. name for inh
 msgid "Ingush"
@@ -820,8 +838,9 @@ msgid "Inupiaq"
 msgstr "Inupiakų"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iranėnų (kitos)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Irokėzų kalbos"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -904,8 +923,9 @@ msgid "Khasi"
 msgstr ""
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Sorbų kalbos"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1104,8 +1124,9 @@ msgid "Maori"
 msgstr "Maorių"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Australų kalbos"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1148,8 +1169,9 @@ msgid "Uncoded languages"
 msgstr "Kalbos, neturinčios suteikto kodo"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Kru kalbos"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1220,7 +1242,8 @@ msgid "Nahuatl languages"
 msgstr "Nahuatlių kalbos"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Šiaurės Amerikos indenų"
 
 #. name for nap
@@ -1264,8 +1287,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Irokėzų kalbos"
 
 #. name for niu
 msgid "Niuean"
@@ -1360,8 +1384,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papua (kitos)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Majų kalbos"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1396,8 +1421,9 @@ msgid "Persian"
 msgstr "Persų"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipiniečių (kitos)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Sudėtinės kalbos"
 
 #. name for phn
 msgid "Phoenician"
@@ -1452,8 +1478,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "Kuko salų maori"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romanų kalbos (kitos)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Apačių kalbos"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1492,7 +1519,8 @@ msgid "Yakut"
 msgstr "Jakutų"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Pietų Amerikos indenų (kitos)"
 
 #. name for sal
@@ -1528,8 +1556,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semitų (kitos)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Ženklų (gestų) kalbos"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1556,12 +1585,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Sorbų kalbos"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slavų (kitos)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Songajų kalbos"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1580,8 +1611,9 @@ msgid "Northern Sami"
 msgstr "Šiaurės sami"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Sami kalbos (kitos)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Songajų kalbos"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1648,8 +1680,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-Sacharos (kitos)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Sališų kalbos"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1692,8 +1725,9 @@ msgid "Tahitian"
 msgstr "Taitiečių"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tajų (kitos)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Songajų kalbos"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1804,8 +1838,9 @@ msgid "Turkish"
 msgstr "Turkų"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altajaus (kitos)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apačių kalbos"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/lv.po b/iso_639/lv.po
index 111857b..ebd9f2e 100644
--- a/iso_639/lv.po
+++ b/iso_639/lv.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2002-01-05 19:30+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Latvian\n"
@@ -48,7 +48,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -134,8 +134,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Korejiešu"
 
 #. name for arw
 msgid "Arawak"
@@ -213,8 +214,9 @@ msgid "Basa"
 msgstr "Basku"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Korejiešu"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -234,8 +236,9 @@ msgid "Bengali"
 msgstr ""
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Korejiešu"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -264,8 +267,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Korejiešu"
 
 #. name for bos, bs
 #, fuzzy
@@ -311,8 +315,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Ukraiņu"
 
 #. name for car
 #, fuzzy
@@ -324,16 +329,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Korejiešu"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Korejiešu"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -415,15 +422,15 @@ msgid "Corsican"
 msgstr "Bosniešu"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -436,7 +443,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -444,8 +451,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Korejiešu"
 
 #. name for ces, cs
 msgid "Czech"
@@ -494,8 +502,9 @@ msgid "Dogri"
 msgstr "Maoru"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Korejiešu"
 
 #. name for dsb
 #, fuzzy
@@ -589,8 +598,9 @@ msgid "Finnish"
 msgstr "Somu"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Korejiešu"
 
 #. name for fon
 msgid "Fon"
@@ -645,8 +655,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Korejiešu"
 
 #. name for kat, ka
 #, fuzzy
@@ -843,16 +854,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Korejiešu"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonēziešu"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Korejiešu"
 
 #. name for inh
 #, fuzzy
@@ -864,8 +877,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Korejiešu"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -954,8 +968,9 @@ msgid "Khasi"
 msgstr "Taizemiešu"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Korejiešu"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1168,8 +1183,9 @@ msgid "Maori"
 msgstr "Maoru"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Korejiešu"
 
 #. name for mar, mr
 #, fuzzy
@@ -1215,8 +1231,9 @@ msgid "Uncoded languages"
 msgstr "Korejiešu"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Korejiešu"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1295,7 +1312,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Ukraiņu"
 
 #. name for nap
@@ -1340,8 +1357,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Korejiešu"
 
 #. name for niu
 msgid "Niuean"
@@ -1440,8 +1458,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Korejiešu"
 
 #. name for pag
 #, fuzzy
@@ -1478,8 +1497,9 @@ msgid "Persian"
 msgstr "Serbu"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Korejiešu"
 
 #. name for phn
 #, fuzzy
@@ -1537,8 +1557,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Korejiešu"
 
 #. name for roh, rm
 #, fuzzy
@@ -1579,8 +1600,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Ukraiņu"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1616,8 +1638,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Korejiešu"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1646,12 +1669,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Korejiešu"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Korejiešu"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1670,8 +1695,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Korejiešu"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1743,8 +1769,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Korejiešu"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1790,8 +1817,9 @@ msgid "Tahitian"
 msgstr "Latviešu"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Korejiešu"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1906,8 +1934,9 @@ msgid "Turkish"
 msgstr "Turku"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Korejiešu"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/mi.po b/iso_639/mi.po
index 8b792f9..82397ec 100644
--- a/iso_639/mi.po
+++ b/iso_639/mi.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2002-01-05 19:35+0000\n"
 "Last-Translator: James Gasson <james.gasson at clear.net.nz>\n"
 "Language-Team: Maori <james.gasson at clear.net.nz>\n"
@@ -48,7 +48,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -134,8 +134,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Kaupapa"
 
 #. name for arw
 msgid "Arawak"
@@ -215,8 +216,9 @@ msgid "Basa"
 msgstr "Tüparu"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Kaupapa"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -236,8 +238,9 @@ msgid "Bengali"
 msgstr ""
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Kaupapa"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -266,8 +269,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Kaupapa"
 
 #. name for bos, bs
 #, fuzzy
@@ -313,8 +317,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Parani"
 
 #. name for car
 #, fuzzy
@@ -326,16 +331,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Kaupapa"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Kaupapa"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -417,15 +424,15 @@ msgid "Corsican"
 msgstr "Reo Etonia"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -438,7 +445,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -446,8 +453,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Kaupapa"
 
 #. name for ces, cs
 #, fuzzy
@@ -497,8 +505,9 @@ msgid "Dogri"
 msgstr "Reo Mäori"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Kaupapa"
 
 #. name for dsb
 #, fuzzy
@@ -593,8 +602,9 @@ msgid "Finnish"
 msgstr "Reo Whinarana"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Kaupapa"
 
 #. name for fon
 msgid "Fon"
@@ -649,8 +659,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Kaupapa"
 
 #. name for kat, ka
 #, fuzzy
@@ -847,8 +858,9 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Kaupapa"
 
 #. name for ind, id
 #, fuzzy
@@ -856,8 +868,9 @@ msgid "Indonesian"
 msgstr "Reo Etonia"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Kaupapa"
 
 #. name for inh
 #, fuzzy
@@ -869,8 +882,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Kaupapa"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -959,8 +973,9 @@ msgid "Khasi"
 msgstr "Reo Ïnia tonga"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Kaupapa"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1177,8 +1192,9 @@ msgid "Maori"
 msgstr "Reo Mäori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Kaupapa"
 
 #. name for mar, mr
 #, fuzzy
@@ -1224,8 +1240,9 @@ msgid "Uncoded languages"
 msgstr "Kaupapa"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Kaupapa"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1305,7 +1322,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Parani"
 
 #. name for nap
@@ -1350,8 +1367,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Kaupapa"
 
 #. name for niu
 msgid "Niuean"
@@ -1450,8 +1468,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Kaupapa"
 
 #. name for pag
 #, fuzzy
@@ -1488,8 +1507,9 @@ msgid "Persian"
 msgstr "Reo Koroätia"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Kaupapa"
 
 #. name for phn
 #, fuzzy
@@ -1547,8 +1567,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Kaupapa"
 
 #. name for roh, rm
 #, fuzzy
@@ -1589,8 +1610,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Parani"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1626,8 +1648,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Kaupapa"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1656,12 +1679,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Kaupapa"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Kaupapa"
 
 #. name for slk, sk
 #, fuzzy
@@ -1682,8 +1707,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Kaupapa"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1756,8 +1782,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Kaupapa"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1803,8 +1830,9 @@ msgid "Tahitian"
 msgstr "Reo Koroätia"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Kaupapa"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1921,8 +1949,9 @@ msgid "Turkish"
 msgstr "Reo Airana"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Kaupapa"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/mk.po b/iso_639/mk.po
index 49a9374..2c81905 100644
--- a/iso_639/mk.po
+++ b/iso_639/mk.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2002-01-05 19:35+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Macedonian\n"
@@ -48,7 +48,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -134,8 +134,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Корејски"
 
 #. name for arw
 msgid "Arawak"
@@ -214,8 +215,9 @@ msgid "Basa"
 msgstr "Баскиски"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Корејски"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -235,8 +237,9 @@ msgid "Bengali"
 msgstr ""
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Корејски"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -265,8 +268,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Корејски"
 
 #. name for bos, bs
 #, fuzzy
@@ -312,8 +316,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Украински"
 
 #. name for car
 #, fuzzy
@@ -325,16 +330,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Корејски"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Корејски"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -416,15 +423,15 @@ msgid "Corsican"
 msgstr "Естонски"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -437,7 +444,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -445,8 +452,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Корејски"
 
 #. name for ces, cs
 msgid "Czech"
@@ -495,8 +503,9 @@ msgid "Dogri"
 msgstr "Маорски"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Корејски"
 
 #. name for dsb
 #, fuzzy
@@ -590,8 +599,9 @@ msgid "Finnish"
 msgstr "Фински"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Корејски"
 
 #. name for fon
 msgid "Fon"
@@ -646,8 +656,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Корејски"
 
 #. name for kat, ka
 #, fuzzy
@@ -844,8 +855,9 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Корејски"
 
 #. name for ind, id
 #, fuzzy
@@ -853,8 +865,9 @@ msgid "Indonesian"
 msgstr "Естонски"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Корејски"
 
 #. name for inh
 #, fuzzy
@@ -866,8 +879,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Корејски"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -956,8 +970,9 @@ msgid "Khasi"
 msgstr "Таи"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Корејски"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1172,8 +1187,9 @@ msgid "Maori"
 msgstr "Маорски"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Корејски"
 
 #. name for mar, mr
 #, fuzzy
@@ -1219,8 +1235,9 @@ msgid "Uncoded languages"
 msgstr "Корејски"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Корејски"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1300,7 +1317,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Украински"
 
 #. name for nap
@@ -1345,8 +1362,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Корејски"
 
 #. name for niu
 msgid "Niuean"
@@ -1445,8 +1463,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Корејски"
 
 #. name for pag
 #, fuzzy
@@ -1483,8 +1502,9 @@ msgid "Persian"
 msgstr "Српски"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Корејски"
 
 #. name for phn
 #, fuzzy
@@ -1542,8 +1562,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Корејски"
 
 #. name for roh, rm
 #, fuzzy
@@ -1584,8 +1605,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Украински"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1621,8 +1643,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Корејски"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1651,12 +1674,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Корејски"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Корејски"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1675,8 +1700,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Корејски"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1748,8 +1774,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Корејски"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1795,8 +1822,9 @@ msgid "Tahitian"
 msgstr "Хрватска"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Корејски"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1911,8 +1939,9 @@ msgid "Turkish"
 msgstr "Турски"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Корејски"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/mn.po b/iso_639/mn.po
index a88bc49..a18f920 100644
--- a/iso_639/mn.po
+++ b/iso_639/mn.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2003-02-17 12:05+0100\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Mongolian <mn at li.org>\n"
@@ -48,8 +48,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Малагас"
 
 #. name for afh
 msgid "Afrihili"
@@ -134,8 +135,9 @@ msgid "Arapaho"
 msgstr "Навахо"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Малагас"
 
 #. name for arw
 msgid "Arawak"
@@ -217,8 +219,9 @@ msgid "Basa"
 msgstr "Хайза"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Малагас"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -237,8 +240,9 @@ msgid "Bengali"
 msgstr "Бенгаль"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Малагас"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -266,8 +270,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Малагас"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -313,8 +318,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Нордэрн Сами"
 
 #. name for car
 #, fuzzy
@@ -326,16 +332,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Малагас"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Малагас"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -415,15 +423,15 @@ msgid "Corsican"
 msgstr "Корсикан"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -435,7 +443,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -444,8 +452,9 @@ msgid "Kashubian"
 msgstr "Сардиниан"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Малагас"
 
 #. name for ces, cs
 msgid "Czech"
@@ -496,8 +505,9 @@ msgid "Dogri"
 msgstr "Маори"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Малагас"
 
 #. name for dsb
 #, fuzzy
@@ -592,8 +602,9 @@ msgid "Finnish"
 msgstr "Финнлянд"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Малагас"
 
 #. name for fon
 msgid "Fon"
@@ -648,8 +659,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Малагас"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -847,16 +859,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Малагас"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Индонези"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Малагас"
 
 #. name for inh
 #, fuzzy
@@ -868,8 +882,9 @@ msgid "Inupiaq"
 msgstr "Инупиак"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Малагас"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -959,8 +974,9 @@ msgid "Khasi"
 msgstr "Тай"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Малагас"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1182,8 +1198,9 @@ msgid "Maori"
 msgstr "Маори"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Малагас"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1231,8 +1248,9 @@ msgid "Uncoded languages"
 msgstr "Малагас"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Малагас"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1313,7 +1331,7 @@ msgstr "Малагас"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Нордэрн Сами"
 
 #. name for nap
@@ -1359,8 +1377,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Малагас"
 
 #. name for niu
 #, fuzzy
@@ -1460,8 +1479,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Малагас"
 
 #. name for pag
 #, fuzzy
@@ -1499,8 +1519,9 @@ msgid "Persian"
 msgstr "Перс"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Малагас"
 
 #. name for phn
 #, fuzzy
@@ -1558,8 +1579,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Малагас"
 
 #. name for roh, rm
 #, fuzzy
@@ -1601,8 +1623,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Нордэрн Сами"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1640,8 +1663,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Малагас"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1672,12 +1696,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Малагас"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Малагас"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1697,8 +1723,9 @@ msgid "Northern Sami"
 msgstr "Нордэрн Сами"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Малагас"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1771,8 +1798,9 @@ msgid "Serer"
 msgstr "Хереро"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Малагас"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1817,8 +1845,9 @@ msgid "Tahitian"
 msgstr "Тахит"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Малагас"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1935,8 +1964,9 @@ msgid "Turkish"
 msgstr "Турк"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Малагас"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/mr.po b/iso_639/mr.po
index acd776f..06d2fe7 100644
--- a/iso_639/mr.po
+++ b/iso_639/mr.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-02-15 07:35+0100\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Marathi\n"
@@ -43,7 +43,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -123,8 +123,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for arw
 msgid "Arawak"
@@ -199,8 +200,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -219,8 +221,9 @@ msgid "Bengali"
 msgstr "॓ंग॥ली"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -247,8 +250,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -291,8 +295,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "॒ॴर०स०ॖनॴ"
 
 #. name for car
 #, fuzzy
@@ -304,16 +309,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -391,15 +398,15 @@ msgid "Corsican"
 msgstr "कॲरॴस०कन"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -411,7 +418,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -419,8 +426,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for ces, cs
 msgid "Czech"
@@ -467,8 +475,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -559,8 +568,9 @@ msgid "Finnish"
 msgstr "॒०नॴन०ष"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +624,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -804,16 +815,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "इनॴडॲनेष०ॖन"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for inh
 msgid "Ingush"
@@ -824,8 +837,9 @@ msgid "Inupiaq"
 msgstr "इनू॑०ॖ॥क"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -910,8 +924,9 @@ msgid "Khasi"
 msgstr "थ॥ई"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1112,8 +1127,9 @@ msgid "Maori"
 msgstr "ॕ॥ओरी"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1157,8 +1173,9 @@ msgid "Uncoded languages"
 msgstr "कॲर०ॖनॴ"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1232,7 +1249,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "॒ॴर०स०ॖनॴ"
 
 #. name for nap
@@ -1276,8 +1293,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for niu
 msgid "Niuean"
@@ -1373,8 +1391,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1410,8 +1429,9 @@ msgid "Persian"
 msgstr "॑रॴष०ॖनॴ"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for phn
 msgid "Phoenician"
@@ -1467,8 +1487,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for roh, rm
 #, fuzzy
@@ -1508,8 +1529,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "॒ॴर०स०ॖनॴ"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1544,8 +1566,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1573,12 +1596,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1597,8 +1622,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1666,8 +1692,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1710,8 +1737,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1822,8 +1850,9 @@ msgid "Turkish"
 msgstr "तुरॴक०ष"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "कॲर०ॖनॴ"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/ms.po b/iso_639/ms.po
index 8cdd529..66b2ec8 100644
--- a/iso_639/ms.po
+++ b/iso_639/ms.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2001-11-10 19:58+0800\n"
 "Last-Translator: Hasbullah Bin Pit (sebol) <sebol at ikhlas.com>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang at lists.sourceforge.org>\n"
@@ -46,7 +46,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -132,8 +132,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Korean"
 
 #. name for arw
 msgid "Arawak"
@@ -211,8 +212,9 @@ msgid "Basa"
 msgstr "Tangguh"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Korean"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -232,8 +234,9 @@ msgid "Bengali"
 msgstr "Baltic"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Korean"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -262,8 +265,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Korean"
 
 # ui/galeon.glade.h:272
 #. name for bos, bs
@@ -310,8 +314,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Ukrainian"
 
 #. name for car
 #, fuzzy
@@ -323,16 +328,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Korean"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Korean"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -413,15 +420,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -434,7 +441,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -442,8 +449,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Korean"
 
 #. name for ces, cs
 msgid "Czech"
@@ -492,8 +500,9 @@ msgid "Dogri"
 msgstr "Margin"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Korean"
 
 #. name for dsb
 #, fuzzy
@@ -589,8 +598,9 @@ msgid "Finnish"
 msgstr "Finnish"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Korean"
 
 #. name for fon
 msgid "Fon"
@@ -645,8 +655,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Korean"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -849,16 +860,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Korean"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesia"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Korean"
 
 #. name for inh
 #, fuzzy
@@ -871,8 +884,9 @@ msgid "Inupiaq"
 msgstr "India"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Korean"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -961,8 +975,9 @@ msgid "Khasi"
 msgstr "Thai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Korean"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1174,8 +1189,9 @@ msgid "Maori"
 msgstr "Margin"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Korean"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1221,8 +1237,9 @@ msgid "Uncoded languages"
 msgstr "Korean"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Korean"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1301,7 +1318,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Ukrainian"
 
 #. name for nap
@@ -1347,8 +1364,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Korean"
 
 #. name for niu
 msgid "Niuean"
@@ -1448,8 +1466,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Korean"
 
 #. name for pag
 #, fuzzy
@@ -1486,8 +1505,9 @@ msgid "Persian"
 msgstr "Cetak"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Korean"
 
 #. name for phn
 #, fuzzy
@@ -1545,8 +1565,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Korean"
 
 # ui/galeon.glade.h:272
 #. name for roh, rm
@@ -1591,8 +1612,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Ukrainian"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1631,8 +1653,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Korean"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1660,12 +1683,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Korean"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Korean"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1684,8 +1709,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Korean"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1756,8 +1782,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Korean"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1803,8 +1830,9 @@ msgid "Tahitian"
 msgstr "Latvian"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Korean"
 
 #. name for tam, ta
 #, fuzzy
@@ -1920,8 +1948,9 @@ msgid "Turkish"
 msgstr "Turkish"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Korean"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/mt.po b/iso_639/mt.po
index 163310a..52be9db 100644
--- a/iso_639/mt.po
+++ b/iso_639/mt.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2002-01-05 19:35+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Maltese <mt at li.org>\n"
@@ -48,8 +48,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-Asjatiku (Oħra)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Lingwi Irogwjani"
 
 #. name for afh
 msgid "Afrihili"
@@ -136,8 +137,9 @@ msgid "Arapaho"
 msgstr "Arapaħo"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Artifiċjali (Oħra)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Salixan"
 
 #. name for arw
 msgid "Arawak"
@@ -217,8 +219,9 @@ msgid "Basa"
 msgstr "Bask"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltiku (Oħra)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Salixan"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -238,8 +241,9 @@ msgid "Bengali"
 msgstr "Bengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Salixan"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -268,8 +272,9 @@ msgid "Siksika"
 msgstr "Siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Salixan"
 
 #. name for bos, bs
 #, fuzzy
@@ -316,7 +321,8 @@ msgid "Caddo"
 msgstr "Kaddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Amerika Ċentrali (Oħra)"
 
 #. name for car
@@ -329,16 +335,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Kawkasu (Oħra)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Salixan"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Sibwano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Keltiku (Oħra)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Tupi languages"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -420,15 +428,15 @@ msgid "Corsican"
 msgstr "Bożniaku"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -442,7 +450,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Crimean Turkish; Crimean Tatar"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -450,8 +458,9 @@ msgid "Kashubian"
 msgstr "Kashubian"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Kuxtiku (Oħra)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Tupi languages"
 
 #. name for ces, cs
 msgid "Czech"
@@ -501,8 +510,9 @@ msgid "Dogri"
 msgstr "Maori"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidjan (Oħra)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Salixan"
 
 #. name for dsb
 #, fuzzy
@@ -596,8 +606,9 @@ msgid "Finnish"
 msgstr "Finlandiż"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Lingwi Irogwjani"
 
 #. name for fon
 msgid "Fon"
@@ -654,8 +665,9 @@ msgid "Gbaya"
 msgstr "Gbaja"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Ġermaniku (Oħra)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Salixan"
 
 #. name for kat, ka
 #, fuzzy
@@ -856,8 +868,9 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indjan (Oħra)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Salixan"
 
 #. name for ind, id
 #, fuzzy
@@ -865,8 +878,9 @@ msgid "Indonesian"
 msgstr "Bożniaku"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indo-Ewropew"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Lingwi Irogwjani"
 
 #. name for inh
 #, fuzzy
@@ -878,8 +892,9 @@ msgid "Inupiaq"
 msgstr "Inupjak"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Lingwi Irogwjani"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -968,8 +983,9 @@ msgid "Khasi"
 msgstr "Tai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Kojsan"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Salixan"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1188,8 +1204,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Lingwi Irogwjani"
 
 #. name for mar, mr
 #, fuzzy
@@ -1235,8 +1252,9 @@ msgid "Uncoded languages"
 msgstr "Salixan"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-Kmer (Oħra)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Tupi languages"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1316,7 +1334,7 @@ msgstr "Salixan"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Indjan tal-Amerika ta' Fuq (Oħra)"
 
 #. name for nap
@@ -1363,8 +1381,9 @@ msgid "Nias"
 msgstr "Nijas"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Lingwi Irogwjani"
 
 #. name for niu
 msgid "Niuean"
@@ -1463,8 +1482,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papwan (Oħra)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Salixan"
 
 #. name for pag
 #, fuzzy
@@ -1502,8 +1522,9 @@ msgid "Persian"
 msgstr "Serb"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filippin (Oħra)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Tupi languages"
 
 #. name for phn
 #, fuzzy
@@ -1562,8 +1583,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romanz (Oħra)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Salixan"
 
 #. name for roh, rm
 #, fuzzy
@@ -1604,7 +1626,8 @@ msgid "Yakut"
 msgstr "Jakut"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Indjan tal-Amerika t'Isfel (Oħra)"
 
 #. name for sal
@@ -1641,8 +1664,9 @@ msgid "Selkup"
 msgstr "Selkup"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semitiku"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Salixan"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1672,12 +1696,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-Tibetjani (Oħra)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Salixan"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slavic (Other)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Salixan"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1696,8 +1722,9 @@ msgid "Northern Sami"
 msgstr "Sami ta' Fuq"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Sami languages (Other)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Salixan"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1770,8 +1797,9 @@ msgid "Serer"
 msgstr "Serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Salixan"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1817,8 +1845,9 @@ msgid "Tahitian"
 msgstr "Latvjan"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tai (Oħra)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Tupi languages"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1933,8 +1962,9 @@ msgid "Turkish"
 msgstr "Tork"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altajk (Oħra)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Salixan"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/nb.po b/iso_639/nb.po
index 24825ba..35df5ab 100644
--- a/iso_639/nb.po
+++ b/iso_639/nb.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2002-01-05 19:40+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Norsk bokmål\n"
@@ -48,7 +48,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -135,8 +135,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Koreansk"
 
 #. name for arw
 msgid "Arawak"
@@ -214,8 +215,9 @@ msgid "Basa"
 msgstr "Baskisk"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Koreansk"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -235,8 +237,9 @@ msgid "Bengali"
 msgstr "bengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Koreansk"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -265,8 +268,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Koreansk"
 
 #. name for bos, bs
 #, fuzzy
@@ -312,8 +316,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "nordsamisk"
 
 #. name for car
 #, fuzzy
@@ -325,16 +330,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Koreansk"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Koreansk"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -416,15 +423,15 @@ msgid "Corsican"
 msgstr "Bosninsk"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -437,7 +444,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -445,8 +452,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Koreansk"
 
 #. name for ces, cs
 msgid "Czech"
@@ -495,8 +503,9 @@ msgid "Dogri"
 msgstr "Maori"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Koreansk"
 
 #. name for dsb
 #, fuzzy
@@ -590,8 +599,9 @@ msgid "Finnish"
 msgstr "Finsk"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Koreansk"
 
 #. name for fon
 msgid "Fon"
@@ -646,8 +656,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Koreansk"
 
 #. name for kat, ka
 #, fuzzy
@@ -845,8 +856,9 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Koreansk"
 
 #. name for ind, id
 #, fuzzy
@@ -854,8 +866,9 @@ msgid "Indonesian"
 msgstr "Bosninsk"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Koreansk"
 
 #. name for inh
 #, fuzzy
@@ -867,8 +880,9 @@ msgid "Inupiaq"
 msgstr "unupiak"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Koreansk"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -957,8 +971,9 @@ msgid "Khasi"
 msgstr "Thai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Koreansk"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1176,8 +1191,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Koreansk"
 
 #. name for mar, mr
 #, fuzzy
@@ -1223,8 +1239,9 @@ msgid "Uncoded languages"
 msgstr "Koreansk"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Koreansk"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1303,7 +1320,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "nordsamisk"
 
 #. name for nap
@@ -1350,8 +1367,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Koreansk"
 
 #. name for niu
 msgid "Niuean"
@@ -1450,8 +1468,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Koreansk"
 
 #. name for pag
 #, fuzzy
@@ -1488,8 +1507,9 @@ msgid "Persian"
 msgstr "Serbisk"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Koreansk"
 
 #. name for phn
 #, fuzzy
@@ -1547,8 +1567,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Koreansk"
 
 #. name for roh, rm
 #, fuzzy
@@ -1589,8 +1610,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "nordsamisk"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1626,8 +1648,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Koreansk"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1656,12 +1679,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Koreansk"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Koreansk"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1680,8 +1705,9 @@ msgid "Northern Sami"
 msgstr "nordsamisk"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Koreansk"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1753,8 +1779,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Koreansk"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1800,8 +1827,9 @@ msgid "Tahitian"
 msgstr "Latvisk"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Koreansk"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1916,8 +1944,9 @@ msgid "Turkish"
 msgstr "Tyrkisk"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Koreansk"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/nl.po b/iso_639/nl.po
index e813069..466ba21 100644
--- a/iso_639/nl.po
+++ b/iso_639/nl.po
@@ -9,10 +9,10 @@
 # Freek de Kruijf <f.de.kruijf at hetnet.nl>, 2006, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-11-05 00:43+0100\n"
 "Last-Translator: Freek de Kruijf <f.de.kruijf at hetnet.nl>\n"
 "Language-Team: Dutch <vertaling at vrijschrift.org>\n"
@@ -47,8 +47,9 @@ msgid "Adyghe; Adygei"
 msgstr "Adyghe, Circassisch"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-Aziatisch (Overige)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apache-talen"
 
 #. name for afh
 msgid "Afrihili"
@@ -128,8 +129,9 @@ msgid "Arapaho"
 msgstr "Arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Kunstmatig (Overige)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Otomiaanse talen"
 
 #. name for arw
 msgid "Arawak"
@@ -204,8 +206,9 @@ msgid "Basa"
 msgstr "Basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltisch (Overige)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Batak-talen"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -224,8 +227,9 @@ msgid "Bengali"
 msgstr "Bengaals"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berbers (Overige)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Karen-talen"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -252,8 +256,9 @@ msgid "Siksika"
 msgstr "Siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantu (Overige)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Banda-talen"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -296,7 +301,8 @@ msgid "Caddo"
 msgstr "Caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Centraal-Amerikaans Indiaans (Overige)"
 
 #. name for car
@@ -308,16 +314,18 @@ msgid "Catalan; Valencian"
 msgstr "Catalaans; Valenciaans"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Kaukasisch (Overige)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Wakasjaanse talen"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Keltisch (Overige)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Chamische talen"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -394,15 +402,18 @@ msgid "Corsican"
 msgstr "Corsicaans"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Creools en pidgins, Op het Engels gebaseerd (Overige)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Creools en pidgins, Op het Frans gebaseerd (Overige)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Creools en pidgins, Op het Portugees gebaseerd (Overige)"
 
 #. name for cre, cr
@@ -414,7 +425,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Krim Tataars; Krim Turks"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Creools en pidgins (Overige)"
 
 #. name for csb
@@ -422,8 +434,9 @@ msgid "Kashubian"
 msgstr "Kasjoebiaans"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Cusjitisch (Overige)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Chamische talen"
 
 #. name for ces, cs
 msgid "Czech"
@@ -470,8 +483,9 @@ msgid "Dogri"
 msgstr "Dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidiaans (Overige)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Sorbiaanse talen"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -562,8 +576,9 @@ msgid "Finnish"
 msgstr "Fins"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Fins-Oegrisch (Overige)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Sorbiaanse talen"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +629,9 @@ msgid "Gbaya"
 msgstr "Gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germaans (Overige)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Chamische talen"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -802,16 +818,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua (International Auxiliary Language Association)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indisch (Overige)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Banda-talen"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesisch"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indo-Europees (Overige)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Iroquoiaanse talen"
 
 #. name for inh
 msgid "Ingush"
@@ -822,8 +840,9 @@ msgid "Inupiaq"
 msgstr "Inupiak"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iraans (Overige)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Iroquoiaanse talen"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -906,8 +925,9 @@ msgid "Khasi"
 msgstr "Khasi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Khoisaans (Overige)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Otomiaanse talen"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1106,8 +1126,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Austronesisch (Overige)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Australische talen"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1150,8 +1171,9 @@ msgid "Uncoded languages"
 msgstr "Niet-gecodeerde talen"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-Khmer (Overige)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Kru-talen"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1222,7 +1244,8 @@ msgid "Nahuatl languages"
 msgstr "Nahuatl-talen"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Noord-Amerikaans Indiaans"
 
 #. name for nap
@@ -1266,7 +1289,8 @@ msgid "Nias"
 msgstr "Niaas"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Niger-Kordofaniaans (Overige)"
 
 #. name for niu
@@ -1362,8 +1386,9 @@ msgid "Otomian languages"
 msgstr "Otomiaanse talen"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papuaans (Overige)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Maja-talen"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1398,8 +1423,9 @@ msgid "Persian"
 msgstr "Perzisch"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipijns (Overige)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Meerdere talen"
 
 #. name for phn
 msgid "Phoenician"
@@ -1454,8 +1480,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "Rarotongan; Cook Island Maori"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romaans (Overige)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Otomiaanse talen"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1494,7 +1521,8 @@ msgid "Yakut"
 msgstr "Jakoets"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Zuid-Amerikaans Indiaans (Overige)"
 
 #. name for sal
@@ -1530,8 +1558,9 @@ msgid "Selkup"
 msgstr "Sulkoeps"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semitisch (Overige)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Chamische talen"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1558,12 +1587,14 @@ msgid "Siouan languages"
 msgstr "Siouaanse talen"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-Tibetaans (Overige)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Siouaanse talen"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slavisch (Overige)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Chamische talen"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1582,8 +1613,9 @@ msgid "Northern Sami"
 msgstr "Noord-Sami"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Sami-talen (Overige)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Chamische talen"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1650,8 +1682,9 @@ msgid "Serer"
 msgstr "Serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-Saharaans (Overige)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Salisjische talen"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1694,8 +1727,9 @@ msgid "Tahitian"
 msgstr "Tahitisch"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tai (Overige)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Tupi-talen"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1806,8 +1840,9 @@ msgid "Turkish"
 msgstr "Turks"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaïsch (Overige)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apache-talen"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/nn.po b/iso_639/nn.po
index 93a5d6e..82488d7 100644
--- a/iso_639/nn.po
+++ b/iso_639/nn.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2006-10-08 13:49+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -49,8 +49,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afroasiatiske språk"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apache"
 
 #. name for afh
 msgid "Afrihili"
@@ -131,8 +132,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Kunstspråk"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Osmanske språk"
 
 #. name for arw
 msgid "Arawak"
@@ -210,8 +212,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltiske språk"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "algonkin"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -230,8 +233,9 @@ msgid "Bengali"
 msgstr "Bengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berbiske språk"
+#, fuzzy
+msgid "Berber languages"
+msgstr "algonkin"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -258,8 +262,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantu-språk"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Munda"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -304,7 +309,7 @@ msgstr ""
 
 #. name for cai
 #, fuzzy
-msgid "Central American Indian (Other)"
+msgid "Central American Indian languages"
 msgstr "Sentralamerikansk indianske språk"
 
 #. name for car
@@ -317,16 +322,18 @@ msgid "Catalan; Valencian"
 msgstr "Katalansk"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Kaukasiske språk"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "algonkin"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Keltiske språk"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "algonkin"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -405,15 +412,18 @@ msgid "Corsican"
 msgstr "Korsikansk"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Kreolske engelskbaserte språk"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Kreolske franskbaserte språk"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Kreolske portugisiskbaserte språk"
 
 #. name for cre, cr
@@ -426,7 +436,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "tatarisk tyrkisk"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Kreolske språk"
 
 #. name for csb
@@ -435,8 +446,8 @@ msgstr ""
 
 #. name for cus
 #, fuzzy
-msgid "Cushitic (Other)"
-msgstr "kunstspråk (andre)"
+msgid "Cushitic languages"
+msgstr "algonkin"
 
 #. name for ces, cs
 msgid "Czech"
@@ -484,8 +495,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidiske språk"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Sorbisk"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -577,8 +589,9 @@ msgid "Finnish"
 msgstr "Finsk"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Finsk-ugriske språk"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Sorbisk"
 
 #. name for fon
 msgid "Fon"
@@ -629,8 +642,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germanske språk"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "algonkin"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -820,16 +834,17 @@ msgstr "Interlingua (International Auxiliary Language Association)"
 
 #. name for inc
 #, fuzzy
-msgid "Indic (Other)"
-msgstr "kunstspråk (andre)"
+msgid "Indic languages"
+msgstr "Munda"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesisk"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indoeuropeisk (andre)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "algonkin"
 
 #. name for inh
 msgid "Ingush"
@@ -841,8 +856,8 @@ msgstr "Inupiak"
 
 #. name for ira
 #, fuzzy
-msgid "Iranian (Other)"
-msgstr "kunstspråk (andre)"
+msgid "Iranian languages"
+msgstr "algonkin"
 
 #. name for iro
 #, fuzzy
@@ -931,8 +946,8 @@ msgstr "Thai"
 
 #. name for khi
 #, fuzzy
-msgid "Khoisan (Other)"
-msgstr "kunstspråk (andre)"
+msgid "Khoisan languages"
+msgstr "Osmanske språk"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1135,8 +1150,8 @@ msgstr "Maori"
 
 #. name for map
 #, fuzzy
-msgid "Austronesian (Other)"
-msgstr "kunstspråk (andre)"
+msgid "Austronesian languages"
+msgstr "Australske språk"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1181,8 +1196,8 @@ msgstr "Munda"
 
 #. name for mkh
 #, fuzzy
-msgid "Mon-Khmer (Other)"
-msgstr "khmer"
+msgid "Mon-Khmer languages"
+msgstr "Tupi-språk"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1259,7 +1274,8 @@ msgid "Nahuatl languages"
 msgstr "Nubiske språk"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Nordamerikansk indiansk"
 
 #. name for nap
@@ -1305,7 +1321,7 @@ msgstr ""
 
 #. name for nic
 #, fuzzy
-msgid "Niger-Kordofanian (Other)"
+msgid "Niger-Kordofanian languages"
 msgstr "finsk-ugrisk"
 
 #. name for niu
@@ -1403,8 +1419,8 @@ msgstr "Osmanske språk"
 
 #. name for paa
 #, fuzzy
-msgid "Papuan (Other)"
-msgstr "kunstspråk (andre)"
+msgid "Papuan languages"
+msgstr "algonkin"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1441,8 +1457,9 @@ msgid "Persian"
 msgstr "Persisk"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filippinske språk"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Fleire språk"
 
 #. name for phn
 msgid "Phoenician"
@@ -1499,8 +1516,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romanske språk"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Osmanske språk"
 
 #. name for roh, rm
 #, fuzzy
@@ -1541,8 +1559,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Nordamerikansk indiansk"
 
 #. name for sal
 #, fuzzy
@@ -1579,8 +1598,9 @@ msgid "Selkup"
 msgstr "Selkupisk"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semittiske språk"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "algonkin"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1608,12 +1628,14 @@ msgid "Siouan languages"
 msgstr "Sioux"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-tibetanske språk"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Sioux"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slaviske språk"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "algonkin"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1632,8 +1654,9 @@ msgid "Northern Sami"
 msgstr "Nordsamisk"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Samiske språk"
+#, fuzzy
+msgid "Sami languages"
+msgstr "algonkin"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1703,8 +1726,8 @@ msgstr ""
 
 #. name for ssa
 #, fuzzy
-msgid "Nilo-Saharan (Other)"
-msgstr "finsk-ugrisk"
+msgid "Nilo-Saharan languages"
+msgstr "algonkin"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1747,8 +1770,9 @@ msgid "Tahitian"
 msgstr "Tahitisk"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tai-språk"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Tupi-språk"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1860,8 +1884,9 @@ msgid "Turkish"
 msgstr "Tyrkisk"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaiske språk"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apache"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/nso.po b/iso_639/nso.po
index b9e7234..423e351 100644
--- a/iso_639/nso.po
+++ b/iso_639/nso.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2002-11-08 11:22+0200\n"
 "Last-Translator: Jerry Thobejane <jerry at translate.org.za>\n"
 "Language-Team: Northern Sotho <sepedi at translate.org.za>\n"
@@ -47,7 +47,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -130,8 +130,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Se-Korean"
 
 #. name for arw
 msgid "Arawak"
@@ -209,8 +210,9 @@ msgid "Basa"
 msgstr "Se-Basque"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Se-Korean"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -229,8 +231,9 @@ msgid "Bengali"
 msgstr ""
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Se-Korean"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -257,8 +260,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Se-Korean"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -303,8 +307,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Ya Lebowa la Sami"
 
 #. name for car
 msgid "Galibi Carib"
@@ -315,16 +320,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Se-Korean"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Se-Korean"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -403,15 +410,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -424,7 +431,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -433,8 +440,9 @@ msgid "Kashubian"
 msgstr "Se-Ukrainian"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Se-Korean"
 
 #. name for ces, cs
 msgid "Czech"
@@ -483,8 +491,9 @@ msgid "Dogri"
 msgstr "Se-Maori"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Se-Korean"
 
 #. name for dsb
 #, fuzzy
@@ -577,8 +586,9 @@ msgid "Finnish"
 msgstr "Se-Finnish"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Se-Korean"
 
 #. name for fon
 msgid "Fon"
@@ -631,8 +641,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Se-Korean"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -825,16 +836,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Se-Korean"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Se-Indonesian"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Se-Korean"
 
 #. name for inh
 #, fuzzy
@@ -846,8 +859,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Se-Korean"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -936,8 +950,9 @@ msgid "Khasi"
 msgstr "Se-Thai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Se-Korean"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1146,8 +1161,9 @@ msgid "Maori"
 msgstr "Se-Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Se-Korean"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1193,8 +1209,9 @@ msgid "Uncoded languages"
 msgstr "Se-Korean"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Se-Korean"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1271,7 +1288,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Ya Lebowa la Sami"
 
 #. name for nap
@@ -1315,8 +1332,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Se-Korean"
 
 #. name for niu
 msgid "Niuean"
@@ -1413,8 +1431,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Se-Korean"
 
 #. name for pag
 #, fuzzy
@@ -1450,8 +1469,9 @@ msgid "Persian"
 msgstr ""
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Se-Korean"
 
 #. name for phn
 #, fuzzy
@@ -1508,8 +1528,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Se-Korean"
 
 #. name for roh, rm
 #, fuzzy
@@ -1550,8 +1571,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Ya Lebowa la Sami"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1587,8 +1609,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Se-Korean"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1615,12 +1638,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Se-Korean"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Se-Korean"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1640,8 +1665,9 @@ msgid "Northern Sami"
 msgstr "Ya Lebowa la Sami"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Se-Korean"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1712,8 +1738,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Se-Korean"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1758,8 +1785,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Se-Korean"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1871,8 +1899,9 @@ msgid "Turkish"
 msgstr "Se-Turkish"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Se-Korean"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/oc.po b/iso_639/oc.po
index 0cad83b..e5aa2f2 100644
--- a/iso_639/oc.po
+++ b/iso_639/oc.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-11-10 00:58+0100\n"
 "Last-Translator: Joan Luc Labòrda <laborde at crpp.u-bordeaux.fr>\n"
 "Language-Team: OCCITAN <laborde at crpp.u-bordeaux.fr>\n"
@@ -46,7 +46,8 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
 msgstr "Afro-asiatic (autre)"
 
 #. name for afh
@@ -126,8 +127,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Artificial (autre)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Lengas nahuatl"
 
 #. name for arw
 msgid "Arawak"
@@ -202,8 +204,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltic (autre)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Lengas nahuatl"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -222,8 +225,9 @@ msgid "Bengali"
 msgstr "Bengalin"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Lengas nahuatl"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -250,8 +254,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Lengas nahuatl"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -294,7 +299,7 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+msgid "Central American Indian languages"
 msgstr ""
 
 #. name for car
@@ -306,16 +311,18 @@ msgid "Catalan; Valencian"
 msgstr "Catalan ; Valencian"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Lengas nahuatl"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Celtic (autre)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Lengas nahuatl"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -392,15 +399,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -412,7 +419,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -420,8 +427,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Lengas nahuatl"
 
 #. name for ces, cs
 msgid "Czech"
@@ -468,8 +476,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Lengas nahuatl"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -560,7 +569,7 @@ msgid "Finnish"
 msgstr "Finés"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
+msgid "Finno-Ugrian languages"
 msgstr ""
 
 #. name for fon
@@ -612,8 +621,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Lengas nahuatl"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -800,16 +810,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Lengas nahuatl"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesian"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Lengas nahuatl"
 
 #. name for inh
 msgid "Ingush"
@@ -820,8 +832,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Lengas nahuatl"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -904,8 +917,9 @@ msgid "Khasi"
 msgstr ""
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Lengas nahuatl"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1104,8 +1118,9 @@ msgid "Maori"
 msgstr ""
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Lengas nahuatl"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1148,8 +1163,9 @@ msgid "Uncoded languages"
 msgstr ""
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Lengas nahuatl"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1220,7 +1236,7 @@ msgid "Nahuatl languages"
 msgstr "Lengas nahuatl"
 
 #. name for nai
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr ""
 
 #. name for nap
@@ -1264,7 +1280,7 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+msgid "Niger-Kordofanian languages"
 msgstr ""
 
 #. name for niu
@@ -1360,8 +1376,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Lengas nahuatl"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1396,8 +1413,9 @@ msgid "Persian"
 msgstr ""
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Lengas nahuatl"
 
 #. name for phn
 msgid "Phoenician"
@@ -1452,8 +1470,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Lengas nahuatl"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1492,7 +1511,7 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
+msgid "South American Indian languages"
 msgstr ""
 
 #. name for sal
@@ -1528,8 +1547,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Lengas nahuatl"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1556,12 +1576,13 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
+msgid "Sino-Tibetan languages"
 msgstr ""
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Lengas nahuatl"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1580,8 +1601,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Lengas nahuatl"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1648,8 +1670,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Lengas nahuatl"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1692,8 +1715,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tai (autre)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Lengas nahuatl"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1804,8 +1828,9 @@ msgid "Turkish"
 msgstr "Turc"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Lengas nahuatl"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/pl.po b/iso_639/pl.po
index 25caea4..c257f1b 100644
--- a/iso_639/pl.po
+++ b/iso_639/pl.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2007-11-24 22:55+0200\n"
 "Last-Translator: Andrzej M. Krzysztofowicz <ankry at mif.pg.gda.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -47,7 +47,8 @@ msgid "Adyghe; Adygei"
 msgstr "adygejski"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
 msgstr "afroazjatyckie (inne)"
 
 #. name for afh
@@ -127,8 +128,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "sztuczne (inne)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "języki australijskie"
 
 #. name for arw
 msgid "Arawak"
@@ -203,8 +205,9 @@ msgid "Basa"
 msgstr "basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "bałtyckie (inne)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "wiele języków"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -223,8 +226,9 @@ msgid "Bengali"
 msgstr "bengalski"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "berberyjskie (inne)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "języki nubijskie"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -251,8 +255,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "bantu (inne)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "języki majańskie"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -295,7 +300,8 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Indian środkowoamerykańskich (inne)"
 
 #. name for car
@@ -307,16 +313,18 @@ msgid "Catalan; Valencian"
 msgstr "kataloński; walencki"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "kaukaskie (inne)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "języki nubijskie"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "celtyckie (inne)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "wiele języków"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -395,15 +403,18 @@ msgid "Corsican"
 msgstr "korsykański"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "kreolskie i pidżin, oparte na angielskim (inne)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "kreolskie i pidżin, oparte na francuskim (inne)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "kreolskie i pidżin, oparte na portugalskim (inne)"
 
 #. name for cre, cr
@@ -415,7 +426,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "kreolskie i pidżin (inne)"
 
 #. name for csb
@@ -423,8 +435,9 @@ msgid "Kashubian"
 msgstr "kaszubski"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "języki australijskie"
 
 #. name for ces, cs
 msgid "Czech"
@@ -471,8 +484,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "drawidyjskie (inne)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "języki australijskie"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -563,8 +577,9 @@ msgid "Finnish"
 msgstr "fiński"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "ugrofińskie (inne)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "języki siouańskie"
 
 #. name for fon
 msgid "Fon"
@@ -615,8 +630,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "germańskie (inne)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "języki majańskie"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -804,16 +820,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "interlingua (Międzynarodowe Stowarzyszenie Języków Sztucznych)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "języki majańskie"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "indonezyjski"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "indoeuropejskie (inne)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "języki siouańskie"
 
 #. name for inh
 msgid "Ingush"
@@ -824,8 +842,9 @@ msgid "Inupiaq"
 msgstr "inupiaq"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "irańskie (inne)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "języki majańskie"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -908,8 +927,9 @@ msgid "Khasi"
 msgstr ""
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "kojsańskie (inne)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "języki nubijskie"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1108,8 +1128,9 @@ msgid "Maori"
 msgstr "maoryski; maoryjski"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "języki australijskie"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1153,8 +1174,9 @@ msgid "Uncoded languages"
 msgstr "języki majańskie"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "języki majańskie"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1225,7 +1247,8 @@ msgid "Nahuatl languages"
 msgstr "języki nahuatl"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Indian północnoamerykańskich"
 
 #. name for nap
@@ -1269,8 +1292,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "języki algonkińskie"
 
 #. name for niu
 msgid "Niuean"
@@ -1366,8 +1390,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "papuaskie (inne)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "języki majańskie"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1402,8 +1427,9 @@ msgid "Persian"
 msgstr "perski; nowoperski; farsi"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "wiele języków"
 
 #. name for phn
 msgid "Phoenician"
@@ -1461,8 +1487,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "rarotonga; maoryski Wyspy Cooka"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "romańskie (inne)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "języki siouańskie"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1501,7 +1528,8 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Indian południowoamerykańskich (inne)"
 
 #. name for sal
@@ -1537,8 +1565,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "semickie (inne)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "języki siouańskie"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1565,12 +1594,14 @@ msgid "Siouan languages"
 msgstr "języki siouańskie"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "sinotybetańskie (inne)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "języki siouańskie"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "słowiańskie (inne)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "języki siouańskie"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1589,8 +1620,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "języki siouańskie"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1657,8 +1689,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "języki nubijskie"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1701,8 +1734,9 @@ msgid "Tahitian"
 msgstr "tahitański"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "języki majańskie"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1813,8 +1847,9 @@ msgid "Turkish"
 msgstr "turecki"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "ałtajskie (inne)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "języki australijskie"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/ps.po b/iso_639/ps.po
index 48f46a3..2fc715a 100644
--- a/iso_639/ps.po
+++ b/iso_639/ps.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-08-07 21:21+0100\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Pushto\n"
@@ -43,7 +43,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -123,8 +123,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "ایټالوي"
 
 #. name for arw
 msgid "Arawak"
@@ -199,8 +200,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "ایټالوي"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -219,8 +221,9 @@ msgid "Bengali"
 msgstr ""
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "ایټالوي"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -247,8 +250,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "ایټالوي"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -291,7 +295,7 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+msgid "Central American Indian languages"
 msgstr ""
 
 #. name for car
@@ -303,16 +307,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "ایټالوي"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "ایټالوي"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -390,15 +396,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -410,7 +416,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -418,8 +424,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "ایټالوي"
 
 #. name for ces, cs
 msgid "Czech"
@@ -466,8 +473,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "ایټالوي"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -558,8 +566,9 @@ msgid "Finnish"
 msgstr "فینلنډي"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "ایټالوي"
 
 #. name for fon
 msgid "Fon"
@@ -611,8 +620,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "ایټالوي"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -799,16 +809,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "ایټالوي"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr ""
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "هند و اروپایي"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "ایټالوي"
 
 #. name for inh
 msgid "Ingush"
@@ -819,8 +831,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "ایټالوي"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -904,8 +917,9 @@ msgid "Khasi"
 msgstr ""
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "ایټالوي"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1105,8 +1119,9 @@ msgid "Maori"
 msgstr ""
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "ایټالوي"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1150,8 +1165,9 @@ msgid "Uncoded languages"
 msgstr "ایټالوي"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "ایټالوي"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1223,7 +1239,7 @@ msgid "Nahuatl languages"
 msgstr ""
 
 #. name for nai
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr ""
 
 #. name for nap
@@ -1267,8 +1283,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "ایټالوي"
 
 #. name for niu
 msgid "Niuean"
@@ -1363,8 +1380,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "ایټالوي"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1399,8 +1417,9 @@ msgid "Persian"
 msgstr "فارسي"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "ایټالوي"
 
 #. name for phn
 msgid "Phoenician"
@@ -1455,8 +1474,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "ایټالوي"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1495,7 +1515,7 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
+msgid "South American Indian languages"
 msgstr ""
 
 #. name for sal
@@ -1531,8 +1551,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "ایټالوي"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1559,12 +1580,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "ایټالوي"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "ایټالوي"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1583,8 +1606,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "ایټالوي"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1651,8 +1675,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "ایټالوي"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1695,8 +1720,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "ایټالوي"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1807,8 +1833,9 @@ msgid "Turkish"
 msgstr ""
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "ایټالوي"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/pt.po b/iso_639/pt.po
index bea5d7a..b3c4e1a 100644
--- a/iso_639/pt.po
+++ b/iso_639/pt.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2001-12-02 18:25+0000\n"
 "Last-Translator: Filipe Maia <fmaia at gmx.net>\n"
 "Language-Team: Portuguese <pt at li.org>\n"
@@ -46,8 +46,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "afro-asiático (outros)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "idiomas iroqueses"
 
 #. name for afh
 msgid "Afrihili"
@@ -133,8 +134,9 @@ msgid "Arapaho"
 msgstr "arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "artificiais (outros)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "salishan languages"
 
 #. name for arw
 msgid "Arawak"
@@ -214,8 +216,9 @@ msgid "Basa"
 msgstr "Parar"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "bálticos (outros)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "salishan languages"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -235,8 +238,9 @@ msgid "Bengali"
 msgstr "Báltico"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "salishan languages"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -265,8 +269,9 @@ msgid "Siksika"
 msgstr "siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "salishan languages"
 
 #. name for bos, bs
 #, fuzzy
@@ -313,7 +318,8 @@ msgid "Caddo"
 msgstr "caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "indígenas centro-americanos (outros)"
 
 #. name for car
@@ -326,16 +332,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "caucasianos (outros)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "salishan languages"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "cebuano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "célticos (outros)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "idiomas tupi"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -416,15 +424,15 @@ msgid "Corsican"
 msgstr "córsico"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -438,7 +446,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "crimean turkish; crimean tatar"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -446,8 +454,9 @@ msgid "Kashubian"
 msgstr "kashubian"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "cuxitas (outros)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "idiomas tupi"
 
 #. name for ces, cs
 msgid "Czech"
@@ -497,8 +506,9 @@ msgid "Dogri"
 msgstr "Margens"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "dravídicos (outros)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "salishan languages"
 
 #. name for dsb
 #, fuzzy
@@ -591,8 +601,9 @@ msgid "Finnish"
 msgstr "Finlandês"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "idiomas iroqueses"
 
 #. name for fon
 msgid "Fon"
@@ -649,8 +660,9 @@ msgid "Gbaya"
 msgstr "gbaia"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "germânicos (outros)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "salishan languages"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -855,16 +867,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "índicos (outros)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "salishan languages"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonésio"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "indo-europeus (outros)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "idiomas iroqueses"
 
 #. name for inh
 #, fuzzy
@@ -877,8 +891,9 @@ msgid "Inupiaq"
 msgstr "Indiano"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "idiomas iroqueses"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -967,8 +982,9 @@ msgid "Khasi"
 msgstr "Tailandês"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "khoisan (other)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "salishan languages"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1185,8 +1201,9 @@ msgid "Maori"
 msgstr "Margens"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "idiomas iroqueses"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1232,8 +1249,9 @@ msgid "Uncoded languages"
 msgstr "salishan languages"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "mon-khmer (other)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "idiomas tupi"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1313,7 +1331,7 @@ msgstr "salishan languages"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "indígenas norte-americanos (outros)"
 
 #. name for nap
@@ -1361,8 +1379,9 @@ msgid "Nias"
 msgstr "nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "idiomas iroqueses"
 
 #. name for niu
 msgid "Niuean"
@@ -1461,8 +1480,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "papuanos (outros)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "salishan languages"
 
 #. name for pag
 #, fuzzy
@@ -1500,8 +1520,9 @@ msgid "Persian"
 msgstr "Imprimir"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "filipinos (outros)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "idiomas tupi"
 
 #. name for phn
 #, fuzzy
@@ -1560,8 +1581,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "romances (outros)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "salishan languages"
 
 #. name for roh, rm
 #, fuzzy
@@ -1602,7 +1624,8 @@ msgid "Yakut"
 msgstr "iacuto"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "indígenas sul-americanos (outros)"
 
 #. name for sal
@@ -1642,8 +1665,9 @@ msgid "Selkup"
 msgstr "selkup"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "semíticos (outros)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "salishan languages"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1672,12 +1696,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "sino-tibetanos (outros)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "salishan languages"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "salishan languages"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1696,8 +1722,9 @@ msgid "Northern Sami"
 msgstr "northern sami"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "salishan languages"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1769,8 +1796,9 @@ msgid "Serer"
 msgstr "serere"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "salishan languages"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1816,8 +1844,9 @@ msgid "Tahitian"
 msgstr "Letão"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "tai (outros)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "idiomas tupi"
 
 #. name for tam, ta
 #, fuzzy
@@ -1933,8 +1962,9 @@ msgid "Turkish"
 msgstr "Turco"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "altaicos (outros)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "salishan languages"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/pt_BR.po b/iso_639/pt_BR.po
index c648ecb..41a5eb5 100644
--- a/iso_639/pt_BR.po
+++ b/iso_639/pt_BR.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2005-08-02 18:03+0200\n"
 "Last-Translator: Juan Carlos Castro y Castro <jcastro at vialink.com.br>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -45,8 +45,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Idiomas Apache"
 
 #. name for afh
 msgid "Afrihili"
@@ -126,8 +127,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Artificial (Outros)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Idiomas Apache"
 
 #. name for arw
 msgid "Arawak"
@@ -204,8 +206,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Báltico (Outros)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Idiomas Maias"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -224,8 +227,9 @@ msgid "Bengali"
 msgstr "Bengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berbere (Outros)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Idiomas Maias"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -252,8 +256,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantu (Outros)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Idiomas Maias"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -297,7 +302,8 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Nativo Centro-Americano (Outros)"
 
 #. name for car
@@ -310,16 +316,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Caucasiano (Outris)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Idiomas Núbios"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Celta (Outros)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Idiomas múltiplos"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -398,17 +406,17 @@ msgstr "Corso"
 
 #. name for cpe
 #, fuzzy
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr "Baseados no Inglês (Outros)"
 
 #. name for cpf
 #, fuzzy
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr "Baseados no Francês (Outros)"
 
 #. name for cpp
 #, fuzzy
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Baseados no Português (Outros)"
 
 #. name for cre, cr
@@ -420,16 +428,18 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
-msgstr ""
+#, fuzzy
+msgid "Creoles and pidgins"
+msgstr "Baseados no Francês (Outros)"
 
 #. name for csb
 msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Idiomas Tupi"
 
 #. name for ces, cs
 msgid "Czech"
@@ -477,8 +487,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Idiomas Australianos"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -569,8 +580,9 @@ msgid "Finnish"
 msgstr "Finlandês"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Idiomas Núbios"
 
 #. name for fon
 msgid "Fon"
@@ -624,8 +636,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germânicos (Outros)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Idiomas Maias"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -816,16 +829,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Idiomas Maias"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonésio"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indo-Europeu (Outros)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Idiomas Maias"
 
 #. name for inh
 msgid "Ingush"
@@ -836,8 +851,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iraniano (Outros)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Idiomas Maias"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -922,8 +938,9 @@ msgid "Khasi"
 msgstr "Tailandês"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Idiomas Maias"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1125,8 +1142,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Austronésio (Outros)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Idiomas Australianos"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1170,8 +1188,9 @@ msgid "Uncoded languages"
 msgstr "Idiomas Maias"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Idiomas Tupi"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1245,7 +1264,7 @@ msgstr "Idiomas Núbios"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Nativo Norte-Americano (Outros)"
 
 #. name for nap
@@ -1289,8 +1308,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Idiomas Núbios"
 
 #. name for niu
 msgid "Niuean"
@@ -1387,8 +1407,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Idiomas Maias"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1424,8 +1445,9 @@ msgid "Persian"
 msgstr "Persa"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipino (Outros)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Idiomas múltiplos"
 
 #. name for phn
 msgid "Phoenician"
@@ -1481,8 +1503,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Idiomas Maias"
 
 #. name for roh, rm
 #, fuzzy
@@ -1522,7 +1545,8 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Nativo Sul-Americano (Outros)"
 
 #. name for sal
@@ -1558,8 +1582,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semita (Outros)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Idiomas de Sinais"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1587,12 +1612,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-Tibetano (Outros)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Idiomas Núbios"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Eslavo (Outros)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Idiomas de Sinais"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1611,8 +1638,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Idiomas de Sinais"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1681,8 +1709,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-Saariano (Outros)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Idiomas Núbios"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1725,8 +1754,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Idiomas Tupi"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1837,8 +1867,9 @@ msgid "Turkish"
 msgstr "Turco"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Idiomas Apache"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/ro.po b/iso_639/ro.po
index 73db1e5..930a69d 100644
--- a/iso_639/ro.po
+++ b/iso_639/ro.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2001-11-16 03:03+0200\n"
 "Last-Translator:  Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -47,7 +47,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -132,8 +132,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Coreean"
 
 #. name for arw
 msgid "Arawak"
@@ -211,8 +212,9 @@ msgid "Basa"
 msgstr "Balsa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Coreean"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -232,8 +234,9 @@ msgid "Bengali"
 msgstr "Baltic"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Coreean"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -262,8 +265,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Coreean"
 
 #. name for bos, bs
 #, fuzzy
@@ -309,8 +313,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Ucrainian"
 
 #. name for car
 #, fuzzy
@@ -322,16 +327,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Coreean"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Coreean"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -412,15 +419,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -433,7 +440,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -441,8 +448,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Coreean"
 
 #. name for ces, cs
 msgid "Czech"
@@ -491,8 +499,9 @@ msgid "Dogri"
 msgstr "Margini"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Coreean"
 
 #. name for dsb
 #, fuzzy
@@ -588,8 +597,9 @@ msgid "Finnish"
 msgstr "Finlandeză"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Coreean"
 
 #. name for fon
 msgid "Fon"
@@ -644,8 +654,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Coreean"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -847,16 +858,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Coreean"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indoneziană"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Coreean"
 
 #. name for inh
 #, fuzzy
@@ -869,8 +882,9 @@ msgid "Inupiaq"
 msgstr "Indian"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Coreean"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -959,8 +973,9 @@ msgid "Khasi"
 msgstr "Thailandeză"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Coreean"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1172,8 +1187,9 @@ msgid "Maori"
 msgstr "Margini"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Coreean"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1220,8 +1236,9 @@ msgid "Uncoded languages"
 msgstr "Coreean"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Coreean"
 
 #. name for mlg, mg
 #, fuzzy
@@ -1302,7 +1319,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Ucrainian"
 
 #. name for nap
@@ -1348,8 +1365,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Coreean"
 
 #. name for niu
 msgid "Niuean"
@@ -1449,8 +1467,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Coreean"
 
 #. name for pag
 #, fuzzy
@@ -1487,8 +1506,9 @@ msgid "Persian"
 msgstr "Tipărire"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Coreean"
 
 #. name for phn
 #, fuzzy
@@ -1546,8 +1566,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Coreean"
 
 #. name for roh, rm
 #, fuzzy
@@ -1588,8 +1609,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Ucrainian"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1628,8 +1650,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Coreean"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1657,12 +1680,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Coreean"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Coreean"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1681,8 +1706,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Coreean"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1754,8 +1780,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Coreean"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1801,8 +1828,9 @@ msgid "Tahitian"
 msgstr "Letonă"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Coreean"
 
 #. name for tam, ta
 #, fuzzy
@@ -1918,8 +1946,9 @@ msgid "Turkish"
 msgstr "Turcesc"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Coreean"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/ru.po b/iso_639/ru.po
index cc34abb..f51860d 100644
--- a/iso_639/ru.po
+++ b/iso_639/ru.po
@@ -18,9 +18,10 @@
 # Yuri Kozlov <yuray at komyakino.ru>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
-"Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"Project-Id-Version: iso_639 3.6\n"
+"Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
+"debian.org>\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2009-01-15 20:59+0300\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -28,7 +29,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. name for aar, aa
 msgid "Afar"
@@ -55,8 +57,9 @@ msgid "Adyghe; Adygei"
 msgstr "адыгейский"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "афразийские (другие)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "апачские языки"
 
 #. name for afh
 msgid "Afrihili"
@@ -137,8 +140,9 @@ msgid "Arapaho"
 msgstr "арапахо"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "искусственные (другие)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "отомангские языки"
 
 #. name for arw
 msgid "Arawak"
@@ -213,8 +217,9 @@ msgid "Basa"
 msgstr "баса"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "балтийские (другие)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "батакские языки"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -233,8 +238,9 @@ msgid "Bengali"
 msgstr "бенгальский"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "берберские (другие)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "каренские языки"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -261,8 +267,9 @@ msgid "Siksika"
 msgstr "сиксика"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "банту (другие)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "языки банда"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -305,7 +312,8 @@ msgid "Caddo"
 msgstr "каддо"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "языки индейцев Центральной Америки (другие)"
 
 #. name for car
@@ -317,16 +325,18 @@ msgid "Catalan; Valencian"
 msgstr "каталанский; валенсийский"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "кавказские (другие)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "вакашские языки"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "себуано"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "кельтские (другие)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "чамские языки"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -376,7 +386,8 @@ msgstr "чероки"
 msgid ""
 "Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church "
 "Slavonic"
-msgstr "церковнославянский; старославянский; староболгарский; староцерковнославянский"
+msgstr ""
+"церковнославянский; старославянский; староболгарский; староцерковнославянский"
 
 #. name for chv, cv
 msgid "Chuvash"
@@ -403,15 +414,18 @@ msgid "Corsican"
 msgstr "корсиканский"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "англо-креольские и пиджины (другие)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "франко-креольские и пиджины (другие)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "португало-креольские и пиджины (другие)"
 
 #. name for cre, cr
@@ -423,7 +437,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "крымскотатарский"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "креольские и пиджины (другие)"
 
 #. name for csb
@@ -431,8 +446,9 @@ msgid "Kashubian"
 msgstr "кашубианский"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "кушитские (другие)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "чамские языки"
 
 #. name for ces, cs
 msgid "Czech"
@@ -479,8 +495,9 @@ msgid "Dogri"
 msgstr "догри"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "дравидийские (другие)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "лужицкие языки"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -571,8 +588,9 @@ msgid "Finnish"
 msgstr "финский"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "финно-угорские (другие)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "лужицкие языки"
 
 #. name for fon
 msgid "Fon"
@@ -623,8 +641,9 @@ msgid "Gbaya"
 msgstr "гбая"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "германские (другие)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "чамские языки"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -811,16 +830,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "интерлингва (Ассоциация международного вспомогательного языка)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "индийские (другие)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "языки банда"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "индонезийский"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "индоевропейские (другие)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "ирокезские языки"
 
 #. name for inh
 msgid "Ingush"
@@ -831,8 +852,9 @@ msgid "Inupiaq"
 msgstr "инупиак"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "иранские (другие)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "ирокезские языки"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -915,8 +937,9 @@ msgid "Khasi"
 msgstr "кхаси"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "койсанские (другие)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "отомангские языки"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1115,8 +1138,9 @@ msgid "Maori"
 msgstr "маори"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "австронезийские (другие)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "австралийские языки"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1159,8 +1183,9 @@ msgid "Uncoded languages"
 msgstr "языки без присвоенного кода"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "монкхмерские (другие)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "языки кру"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1231,7 +1256,8 @@ msgid "Nahuatl languages"
 msgstr "астекские языки"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "язык индейцев Северной Америки"
 
 #. name for nap
@@ -1275,7 +1301,8 @@ msgid "Nias"
 msgstr "ниассийский"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "нигер-кордофанские (другие)"
 
 #. name for niu
@@ -1371,8 +1398,9 @@ msgid "Otomian languages"
 msgstr "отомангские языки"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "папуасские (другие)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "языки майя"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1407,8 +1435,9 @@ msgid "Persian"
 msgstr "персидский"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "филиппинские (другие)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "языки разных семей"
 
 #. name for phn
 msgid "Phoenician"
@@ -1463,8 +1492,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "раротонганский; маори островов Кука"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "романские (другие)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "отомангские языки"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1503,7 +1533,8 @@ msgid "Yakut"
 msgstr "якутский"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "языки индейцев Южной Америки (другие)"
 
 #. name for sal
@@ -1539,8 +1570,9 @@ msgid "Selkup"
 msgstr "селькупский"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "семитские (другие)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "чамские языки"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1567,12 +1599,14 @@ msgid "Siouan languages"
 msgstr "языки сиу"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "синотибетские (другие)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "языки сиу"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "славянские (другие)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "чамские языки"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1591,8 +1625,9 @@ msgid "Northern Sami"
 msgstr "северосаамский"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "саамские языки (другие)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "чамские языки"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1659,8 +1694,9 @@ msgid "Serer"
 msgstr "серер"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "нило-сахарские (другие)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "салишские языки"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1703,8 +1739,9 @@ msgid "Tahitian"
 msgstr "таитянский"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "тайские (другие)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "языки Тупи"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1815,8 +1852,9 @@ msgid "Turkish"
 msgstr "турецкий"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "алтайские (другие)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "апачские языки"
 
 #. name for tvl
 msgid "Tuvalu"
@@ -1977,4 +2015,3 @@ msgstr "нет языкового материала; не применяетс
 #. name for zza
 msgid "Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki"
 msgstr "заза; дымили; дымли; кирдки; кирманжики; зазаки"
-
diff --git a/iso_639/rw.po b/iso_639/rw.po
index 9d25a81..4b243b5 100644
--- a/iso_639/rw.po
+++ b/iso_639/rw.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2005-03-09 12:02+0700\n"
 "Last-Translator: Steve Murphy <murf at e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw at lists.sourceforge.net>\n"
@@ -45,8 +45,9 @@ msgid "Adyghe; Adygei"
 msgstr "Ikinyadugeyi"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Ikinyafuro-aziyatike (Ibindi)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Indimi z'Apashe"
 
 #. name for afh
 msgid "Afrihili"
@@ -128,8 +129,9 @@ msgid "Arapaho"
 msgstr "Icyarapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Ibyahanzwe (Ibindi)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Indimi za Otomiyani"
 
 #. name for arw
 msgid "Arawak"
@@ -206,8 +208,9 @@ msgid "Basa"
 msgstr "Ikibasa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Ikibalitike (Ibindi)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Indimi mayani"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -226,8 +229,9 @@ msgid "Bengali"
 msgstr "Ikibengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Ikiberiberi (Ibindi)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Indimi mayani"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -255,8 +259,9 @@ msgid "Siksika"
 msgstr "Igisikisika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Ikibantu (Ibindi)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Indimi munda"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -300,7 +305,8 @@ msgid "Caddo"
 msgstr "Ikinyakado"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Igihinde cy'Amerika yo Hagati (Ibindi)"
 
 #. name for car
@@ -313,16 +319,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Ikinyakokaze (Ibindi)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Indimi za wakashi"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Igisebuwano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Igiselitiki (Ibindi)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Indimi za camika"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -401,17 +409,17 @@ msgstr "Igikoruse"
 
 #. name for cpe
 #, fuzzy
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr "Ibikerewole n'Ibipigini"
 
 #. name for cpf
 #, fuzzy
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr "Ibikerewole n'Ibipigini"
 
 #. name for cpp
 #, fuzzy
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Ibikerewole n'Ibipigini"
 
 #. name for cre, cr
@@ -424,7 +432,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Kirimini nyaturukiya; Kirimini nyatatari"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Ibikerewole n'Ibipigini"
 
 #. name for csb
@@ -432,8 +441,9 @@ msgid "Kashubian"
 msgstr "Ikikashubiyani"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Igikashitika (Ibindi)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Indimi za camika"
 
 #. name for ces, cs
 msgid "Czech"
@@ -481,8 +491,9 @@ msgid "Dogri"
 msgstr "Ikidogiri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Ikidaravidiyani (Ibindi)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Indimi za sorubiyani"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -573,8 +584,9 @@ msgid "Finnish"
 msgstr "Ikinyafinilande"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Ikinyafino-ugiriya (Ibindi)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Indimi za sorubiyani"
 
 #. name for fon
 msgid "Fon"
@@ -630,8 +642,9 @@ msgid "Gbaya"
 msgstr "Ikigubaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Ndage (Ibindi)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Indimi za camika"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -826,16 +839,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Ikindika (Ibindi)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Indimi munda"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Ikinyendonisiya"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Igihinde-buraya (Ibindi)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Indimi za Irokwa"
 
 #. name for inh
 msgid "Ingush"
@@ -846,8 +861,9 @@ msgid "Inupiaq"
 msgstr "Ikinupiyake"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Ikinya-irani (Ibindi)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Indimi za Irokwa"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -932,8 +948,9 @@ msgid "Khasi"
 msgstr "Igikazi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Igikoyizani (Ibindi)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Indimi za Otomiyani"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1139,8 +1156,9 @@ msgid "Maori"
 msgstr "Ikimawori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Ikinyawositoroneziya (Ibindi)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Indimi za Ositaraliya"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1184,8 +1202,9 @@ msgid "Uncoded languages"
 msgstr "Indimi munda"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Ikomoni-kimeri"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Indimi za tupi"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1259,7 +1278,7 @@ msgstr "Indimi nubiyani"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Igihinde cy'Amerika y'Amajyaruguru"
 
 #. name for nap
@@ -1306,7 +1325,8 @@ msgid "Nias"
 msgstr "Ikiniyasi"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Ikinyanigeri (Ibindi)"
 
 #. name for niu
@@ -1407,8 +1427,9 @@ msgid "Otomian languages"
 msgstr "Indimi za Otomiyani"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Igipapuwani (Ibindi)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Indimi mayani"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1445,8 +1466,9 @@ msgid "Persian"
 msgstr "Ikinyaperisi"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Ikinyafilipine (Ibindi)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Indimi nyinshi"
 
 #. name for phn
 msgid "Phoenician"
@@ -1503,8 +1525,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Ikiromansi"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Indimi za Otomiyani"
 
 #. name for roh, rm
 #, fuzzy
@@ -1544,7 +1567,8 @@ msgid "Yakut"
 msgstr "Ikiyakuti"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Igihinde cy'Amerika y'Amajyepfo (Ibindi)"
 
 #. name for sal
@@ -1580,8 +1604,9 @@ msgid "Selkup"
 msgstr "Igiselikupe"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Ikinyasemiti (Ibindi)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Indimi za camika"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1609,12 +1634,14 @@ msgid "Siouan languages"
 msgstr "Indimi za siwu"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Ikinyasino-tibeti (Ibindi)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Indimi za siwu"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Ikinyasilave (ibindi)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Indimi za camika"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1633,8 +1660,9 @@ msgid "Northern Sami"
 msgstr "Igisami amajyaruguru"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Indimi za sami"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Indimi za camika"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1703,8 +1731,9 @@ msgid "Serer"
 msgstr "Igisera"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Ikinyanilosahara (Ibindi)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Indimi za salisha"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1747,8 +1776,9 @@ msgid "Tahitian"
 msgstr "Ikinyatahiti"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Igitayi"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Indimi za tupi"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1860,8 +1890,9 @@ msgid "Turkish"
 msgstr "Ikinyaturukiya"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Icyalitayike (Ibindi)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Indimi z'Apashe"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/sk.po b/iso_639/sk.po
index 53ac90f..1714906 100644
--- a/iso_639/sk.po
+++ b/iso_639/sk.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2007-08-08 14:37+0100\n"
 "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -43,8 +43,9 @@ msgid "Adyghe; Adygei"
 msgstr "adygčina; adygejčina"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "afroázijské jazyky (iné)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "apačské jazyky"
 
 #. name for afh
 msgid "Afrihili"
@@ -125,8 +126,9 @@ msgid "Arapaho"
 msgstr "arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "umelé jazyky (iné)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "oto-pameské jazyky okrem pameských jazykov"
 
 #. name for arw
 msgid "Arawak"
@@ -201,8 +203,9 @@ msgid "Basa"
 msgstr "basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "baltské jazyky (iné)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "batacké jazyky"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -221,8 +224,9 @@ msgid "Bengali"
 msgstr "bengálčina"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "berberské jazyky (iné)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "karenské jazyky"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -250,8 +254,9 @@ msgid "Siksika"
 msgstr "siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "bantuské jazyky (iné)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "jazyky banda"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -294,7 +299,8 @@ msgid "Caddo"
 msgstr "kaddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "indiánske jazyky strednej Ameriky (iné)"
 
 #. name for car
@@ -306,16 +312,18 @@ msgid "Catalan; Valencian"
 msgstr "katalánčina; valencijčina"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "kaukazské jazyky (iné)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "wakašské jazyky"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "cebuánčina"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "keltské jazyky (iné)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "čamaské jazyky"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -392,15 +400,18 @@ msgid "Corsican"
 msgstr "korzičtina"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "kreolské jazyky a pidžiny na základe angličtiny (iné)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "kreolské jazyky a pidžiny na základe francúzštiny (iné)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "kreolské jazyky a pidžiny na základe portugalčiny (iné)"
 
 #. name for cre, cr
@@ -412,7 +423,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "krymská tatárčina; krymská turečtina"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "kreolské jazyky a pidžiny (iné)"
 
 #. name for csb
@@ -420,8 +432,9 @@ msgid "Kashubian"
 msgstr "kašubčina"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "kušitské jazyky (iné)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "čamaské jazyky"
 
 #. name for ces, cs
 msgid "Czech"
@@ -470,8 +483,9 @@ msgid "Dogri"
 msgstr "dógrí"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "drávidské jazyky (iné)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "lužickosrbské jazyky"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -562,8 +576,9 @@ msgid "Finnish"
 msgstr "fínčina"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "ugrofínske jazyky (iné)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "lužickosrbské jazyky"
 
 #. name for fon
 msgid "Fon"
@@ -615,8 +630,9 @@ msgid "Gbaya"
 msgstr "gbaja"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "germánske jazyky (iné)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "čamaské jazyky"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -811,16 +827,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "interlingua (International Auxiliary Language Association)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "indické jazyky (iné)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "jazyky banda"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "indonézština"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "indoeurópske jazyky (iné)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "irokézske jazyky"
 
 #. name for inh
 msgid "Ingush"
@@ -831,8 +849,9 @@ msgid "Inupiaq"
 msgstr "inupiaq"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "iránske jazyky (iné)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "irokézske jazyky"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -915,8 +934,9 @@ msgid "Khasi"
 msgstr "khasijčina"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "khoisanské jazyky (iné)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "oto-pameské jazyky okrem pameských jazykov"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1117,8 +1137,9 @@ msgid "Maori"
 msgstr "maorčina"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "austronézske (iné)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "austrálske jazyky"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1162,8 +1183,9 @@ msgid "Uncoded languages"
 msgstr "zandské jazyky"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "monsko-khmérske jazyky (iné)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "jazyky kru"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1235,7 +1257,8 @@ msgstr "nahuaské jazyky"
 
 # keď si dal indiánske jazyky strednej Ameriky namiesto mezoamerické jazyky strednej Ameriky (čo nemusí byť nevyhnutne to isté) tak aby to bolo konzistentné
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "indiánske jazyky severnej Ameriky"
 
 #. name for nap
@@ -1279,7 +1302,8 @@ msgid "Nias"
 msgstr "niasánčina"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "nigersko-kordofánske jazyky (iné)"
 
 #. name for niu
@@ -1376,8 +1400,9 @@ msgid "Otomian languages"
 msgstr "oto-pameské jazyky okrem pameských jazykov"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "papuánske jazyky (iné)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "mayské jazyky"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1412,8 +1437,9 @@ msgid "Persian"
 msgstr "perzština"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "filipínske jazyky (iné)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "viaceré jazyky"
 
 #. name for phn
 msgid "Phoenician"
@@ -1471,8 +1497,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "rarotongská maorijčina; maorijčina Cookových ostrovov"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "románske jazyky (iné)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "oto-pameské jazyky okrem pameských jazykov"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1512,7 +1539,8 @@ msgstr "jakutčina"
 
 # tu platí to isté ako pre severoamerické
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "indiánske jazyky južnej Ameriky (iné)"
 
 #. name for sal
@@ -1548,8 +1576,9 @@ msgid "Selkup"
 msgstr "selkupčina"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "semitské jazyky (iné)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "čamaské jazyky"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1576,12 +1605,14 @@ msgid "Siouan languages"
 msgstr "siouské jazyky"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "sino-tibetské jazyky (iné)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "siouské jazyky"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "slovanské jazyky (iné)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "čamaské jazyky"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1600,8 +1631,9 @@ msgid "Northern Sami"
 msgstr "severná saamčina"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "saamské jazyky (iné)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "čamaské jazyky"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1668,8 +1700,9 @@ msgid "Serer"
 msgstr "serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "nílsko-saharské jazyky (iné)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "sališské jazyky"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1712,8 +1745,9 @@ msgid "Tahitian"
 msgstr "tahitčina"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "thajské jazyky (iné)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "jazyky tupi"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1824,8 +1858,9 @@ msgid "Turkish"
 msgstr "turečtina"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "altajské jazyky"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "apačské jazyky"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/sl.po b/iso_639/sl.po
index 30f9a89..33f92e7 100644
--- a/iso_639/sl.po
+++ b/iso_639/sl.po
@@ -6,10 +6,10 @@
 # $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2007-10-19 10:30+0200\n"
 "Last-Translator: Primož Peterlin <primoz.peterlin at biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl at lists.sourceforge.net>\n"
@@ -42,8 +42,9 @@ msgid "Adyghe; Adygei"
 msgstr "adigejščina"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "afriško-azijski, drugi"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "apaški jeziki"
 
 #. name for afh
 msgid "Afrihili"
@@ -124,8 +125,9 @@ msgid "Arapaho"
 msgstr "arapaščina"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "umetni, drugi"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "lužiška srbščina"
 
 #. name for arw
 msgid "Arawak"
@@ -200,8 +202,9 @@ msgid "Basa"
 msgstr "basa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "baltski, drugi"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "bataški jeziki"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -220,8 +223,9 @@ msgid "Bengali"
 msgstr "bengalščina"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "berberski, drugi"
+#, fuzzy
+msgid "Berber languages"
+msgstr "karenski jeziki"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -248,8 +252,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "bantujski, drugi"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "bandaški jeziki"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -292,7 +297,8 @@ msgid "Caddo"
 msgstr "kadoščina"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "srednjeameriški indijanski, drugi"
 
 #. name for car
@@ -304,16 +310,18 @@ msgid "Catalan; Valencian"
 msgstr "katalonščina"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "kavzaški, drugi"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "vakaški jeziki"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "cebuanščina"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "keltski, drugi"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "čamalski jeziki?"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -390,15 +398,18 @@ msgid "Corsican"
 msgstr "korzijščina"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "angleške kreolščine in pidžini"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "francoske kreolščine in pidžini"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "portugalske kreolščine in pidžini"
 
 #. name for cre, cr
@@ -410,7 +421,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "krimska tatarščina"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "kreolščine in pidžini, drugi"
 
 #. name for csb
@@ -418,8 +430,9 @@ msgid "Kashubian"
 msgstr "kašubščina"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "kušitski, drugi"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "čamalski jeziki?"
 
 #. name for ces, cs
 msgid "Czech"
@@ -466,8 +479,9 @@ msgid "Dogri"
 msgstr "dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "dravidski, drugi"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "lužiška srbščina"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -558,8 +572,9 @@ msgid "Finnish"
 msgstr "finščina"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "ugrofinski, drugi"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "lužiška srbščina"
 
 #. name for fon
 msgid "Fon"
@@ -610,8 +625,9 @@ msgid "Gbaya"
 msgstr "gbajščina"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "germanski, drugi"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "čamalski jeziki?"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -801,16 +817,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "interlingva (Mednarodna zveza za pomožne jezike)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "indijski, drugi"
+#, fuzzy
+msgid "Indic languages"
+msgstr "bandaški jeziki"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "indonezijščina"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "indoevropski, drugi"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "irokeščina"
 
 #. name for inh
 msgid "Ingush"
@@ -821,8 +839,9 @@ msgid "Inupiaq"
 msgstr "inupiaščina"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "iranski, drugi"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "irokeščina"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -905,8 +924,9 @@ msgid "Khasi"
 msgstr "kasi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "kojsanski, drugi"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "lužiška srbščina"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1106,8 +1126,9 @@ msgid "Maori"
 msgstr "maorščina"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "avstronezijski, drugi"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "avstralski jeziki"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1150,8 +1171,9 @@ msgid "Uncoded languages"
 msgstr "nekodirani jeziki"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "monsko-kmerski, drugi"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "jeziki kru"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1222,7 +1244,8 @@ msgid "Nahuatl languages"
 msgstr "nahuatl"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "severnoameriški indijanski"
 
 #. name for nap
@@ -1266,7 +1289,8 @@ msgid "Nias"
 msgstr "niaščina"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "nigrsko-kordofanski, drugi"
 
 #. name for niu
@@ -1363,8 +1387,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "papuanski, drugi"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "majevski jeziki"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1399,8 +1424,9 @@ msgid "Persian"
 msgstr "perzijščina"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "filipinski, drugi"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "več jezikov"
 
 #. name for phn
 msgid "Phoenician"
@@ -1457,8 +1483,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "romanski, drugi"
+#, fuzzy
+msgid "Romance languages"
+msgstr "zandejski jeziki"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1497,7 +1524,8 @@ msgid "Yakut"
 msgstr "jakutščina"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "južnoameriški indijanski, drugi"
 
 #. name for sal
@@ -1533,8 +1561,9 @@ msgid "Selkup"
 msgstr "selkupščina"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "semitski, drugi"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "čamalski jeziki?"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1561,12 +1590,14 @@ msgid "Siouan languages"
 msgstr "sjujščina"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "kitajsko-tibetanski, drugi"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "sjujščina"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "slovanski, drugi"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "čamalski jeziki?"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1585,8 +1616,9 @@ msgid "Northern Sami"
 msgstr "severna samijščina"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "samijski, drugi"
+#, fuzzy
+msgid "Sami languages"
+msgstr "čamalski jeziki?"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1653,8 +1685,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "nilsko-saharski, drugi"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "nubijski jeziki"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1697,8 +1730,9 @@ msgid "Tahitian"
 msgstr "tahitijščina"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "tupijski jeziki"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1809,8 +1843,9 @@ msgid "Turkish"
 msgstr "turščina"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "altajski, drugi"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "apaški jeziki"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/sr.po b/iso_639/sr.po
index 97d1008..9a6c3e6 100644
--- a/iso_639/sr.po
+++ b/iso_639/sr.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2005-12-16 21:27-0500\n"
 "Last-Translator: Danilo Segan <dsegan at gmx.net>\n"
 "Language-Team: Serbian <gnu at prevod.org>\n"
@@ -40,8 +40,9 @@ msgid "Adyghe; Adygei"
 msgstr "адиге; адигеи"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "афроазијски (остали)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "језици Апача"
 
 #. name for afh
 msgid "Afrihili"
@@ -121,9 +122,11 @@ msgstr ""
 msgid "Arapaho"
 msgstr "арапахо"
 
+# ???
 #. name for art
-msgid "Artificial (Other)"
-msgstr "вештачки (остали)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "отомијански језици"
 
 #. name for arw
 msgid "Arawak"
@@ -200,8 +203,9 @@ msgid "Basa"
 msgstr "баса"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "балтички (остали)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "језици маја"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -220,8 +224,9 @@ msgid "Bengali"
 msgstr "бенгалски"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "бербер (остали)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "језици маја"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -249,8 +254,9 @@ msgid "Siksika"
 msgstr "сиксика"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "банту (остали)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "мунда језици"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -294,7 +300,8 @@ msgid "Caddo"
 msgstr "кадо"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "централноамерички индијански (остали)"
 
 #. name for car
@@ -307,16 +314,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "кавкаски (остали)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "вакашан језици"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "цебуано"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "келтски (остали)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "чамски језици"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -395,17 +404,17 @@ msgstr "корзикански"
 
 #. name for cpe
 #, fuzzy
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr "креолски и пиџински (остали)"
 
 #. name for cpf
 #, fuzzy
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr "креолски и пиџински (остали)"
 
 #. name for cpp
 #, fuzzy
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "креолски и пиџински (остали)"
 
 #. name for cre, cr
@@ -418,7 +427,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "кримски турски; кримски татарски"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "креолски и пиџински (остали)"
 
 #. name for csb
@@ -426,8 +436,9 @@ msgid "Kashubian"
 msgstr "кашубијски"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "кушитски (остали)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "чамски језици"
 
 #. name for ces, cs
 msgid "Czech"
@@ -474,9 +485,11 @@ msgstr ""
 msgid "Dogri"
 msgstr "догри"
 
+# моравско српски?
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "дравижански (остали)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "сорбски језици"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -566,9 +579,11 @@ msgstr "филипински; пилипински"
 msgid "Finnish"
 msgstr "фински"
 
+# моравско српски?
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "фино-угарски (остали)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "сорбски језици"
 
 #. name for fon
 msgid "Fon"
@@ -624,8 +639,9 @@ msgid "Gbaya"
 msgstr "гбаја"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "германски (остали)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "чамски језици"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -821,16 +837,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "индијски (остали)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "мунда језици"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "индонежански"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "индоевропски (остали)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "ироквојански језици"
 
 #. name for inh
 msgid "Ingush"
@@ -841,8 +859,9 @@ msgid "Inupiaq"
 msgstr "инупијак"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "ирански (остали)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "ироквојански језици"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -926,9 +945,11 @@ msgstr "кабардијански"
 msgid "Khasi"
 msgstr "кази"
 
+# ???
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "косијански (остали)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "отомијански језици"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1135,8 +1156,9 @@ msgid "Maori"
 msgstr "маори"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "аустронежански (остали)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "аустралијски језици"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1180,8 +1202,9 @@ msgid "Uncoded languages"
 msgstr "мунда језици"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "мон-кмер (остали)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "тупи језици"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1255,7 +1278,7 @@ msgstr "нубијски језици"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "северноамерички индијански (остали)"
 
 #. name for nap
@@ -1302,7 +1325,8 @@ msgid "Nias"
 msgstr "нијас"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "нигер-кордофански (остали)"
 
 #. name for niu
@@ -1405,8 +1429,9 @@ msgid "Otomian languages"
 msgstr "отомијански језици"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "папуан (остали)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "језици маја"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1443,8 +1468,9 @@ msgid "Persian"
 msgstr "персијски"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "филипински (остали)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "вишејезички"
 
 #. name for phn
 msgid "Phoenician"
@@ -1500,9 +1526,11 @@ msgstr "рапануји"
 msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
+# ???
 #. name for roa
-msgid "Romance (Other)"
-msgstr "романски (остали)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "отомијански језици"
 
 # овако каже Мортон-Бенсон, или „језик Рома“
 #. name for roh, rm
@@ -1544,7 +1572,8 @@ msgid "Yakut"
 msgstr "јакут"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "јужноамерички индијански (остали)"
 
 #. name for sal
@@ -1580,8 +1609,9 @@ msgid "Selkup"
 msgstr "селкуп"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "семитски (остали)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "чамски језици"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1609,12 +1639,14 @@ msgid "Siouan languages"
 msgstr "сијуан језици"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "сино-тибетски (остали)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "сијуан језици"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "словенски (остали)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "чамски језици"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1633,8 +1665,9 @@ msgid "Northern Sami"
 msgstr "северни сами"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "сами језици (остали)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "чамски језици"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1703,8 +1736,9 @@ msgid "Serer"
 msgstr "серер"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "нило-сахарски (остали)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "салишан језици"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1747,8 +1781,9 @@ msgid "Tahitian"
 msgstr "тахићански"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "тајландски (остали)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "тупи језици"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1860,8 +1895,9 @@ msgid "Turkish"
 msgstr "турски"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "алтајски (остали)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "језици Апача"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/sv.po b/iso_639/sv.po
index 3751514..c17be19 100644
--- a/iso_639/sv.po
+++ b/iso_639/sv.po
@@ -26,10 +26,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-07-29 21:59+0200\n"
 "Last-Translator: Christian Rose <menthos at menthos.com>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -64,8 +64,9 @@ msgid "Adyghe; Adygei"
 msgstr "Adygeiska"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-asiatiska språk (övriga)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apachiska språk"
 
 #. name for afh
 msgid "Afrihili"
@@ -147,8 +148,9 @@ msgid "Arapaho"
 msgstr "Arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Konstgjorda språk (övriga)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Otomispråk"
 
 #. name for arw
 msgid "Arawak"
@@ -226,8 +228,9 @@ msgid "Basa"
 msgstr "Basa (bantuspråk)"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltiska språk (övriga)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Mayaspråk"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -246,8 +249,9 @@ msgid "Bengali"
 msgstr "Bengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berberspråk (övriga)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Mayaspråk"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -277,8 +281,9 @@ msgid "Siksika"
 msgstr "Svartfotindianernas språk (siksika)"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantuspråk (övriga)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Mundaspråk"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -325,7 +330,8 @@ msgid "Caddo"
 msgstr "Caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Centralamerikanska indianspråk (övriga)"
 
 #. name for car
@@ -337,16 +343,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Kaukasiska språk (övriga)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Wakusjiska språk"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Keltiska språk (övriga)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Chamicspråk"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -428,17 +436,17 @@ msgstr "Korsikanska"
 
 #. name for cpe
 #, fuzzy
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr "Kreol- och pidginspråk (övriga)"
 
 #. name for cpf
 #, fuzzy
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr "Kreol- och pidginspråk (övriga)"
 
 #. name for cpp
 #, fuzzy
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Kreol- och pidginspråk (övriga)"
 
 #. name for cre, cr
@@ -453,7 +461,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Krimturkiska; krimtatariska"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Kreol- och pidginspråk (övriga)"
 
 # Osäker
@@ -463,8 +472,9 @@ msgid "Kashubian"
 msgstr "Kasjubianska"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Kusjitiska språk (övriga)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Chamicspråk"
 
 #. name for ces, cs
 msgid "Czech"
@@ -513,8 +523,9 @@ msgid "Dogri"
 msgstr "Dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidiska språk (övriga)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Sorbiska (vendiska) språk"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -610,8 +621,9 @@ msgid "Finnish"
 msgstr "Finska"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Finsk-ugriska språk (övriga)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Sorbiska (vendiska) språk"
 
 #. name for fon
 msgid "Fon"
@@ -665,8 +677,9 @@ msgid "Gbaya"
 msgstr "Gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germanska språk (övriga)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Chamicspråk"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -870,16 +883,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indo-ariska språk (övriga)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Mundaspråk"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesiska"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indoeuropeiska språk (övriga)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Irokesiska språk"
 
 #. name for inh
 msgid "Ingush"
@@ -890,8 +905,9 @@ msgid "Inupiaq"
 msgstr "Inupiaq"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iranska språk (övriga)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Irokesiska språk"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -981,8 +997,9 @@ msgid "Khasi"
 msgstr "Khasi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Khoisanspråk (övriga)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Otomispråk"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1200,8 +1217,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Austronesiska språk (övriga)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Australiska språk"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1247,8 +1265,9 @@ msgid "Uncoded languages"
 msgstr "Mundaspråk"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-khmerspråk (övriga)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Tupíspråk"
 
 # Libris vill ha det så.
 #. name for mlg, mg
@@ -1329,7 +1348,7 @@ msgstr "Nubiska språk"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Nordamerikanska indianspråk (övriga)"
 
 # Libris vill ha det så.
@@ -1377,7 +1396,8 @@ msgid "Nias"
 msgstr "Nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Niger-/Kongospråk (övriga)"
 
 #. name for niu
@@ -1483,8 +1503,9 @@ msgid "Otomian languages"
 msgstr "Otomispråk"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papuanska språk (övriga)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Mayaspråk"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1522,8 +1543,9 @@ msgid "Persian"
 msgstr "Persiska"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filippinska språk (övriga)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Flerspråkigt"
 
 #. name for phn
 msgid "Phoenician"
@@ -1581,8 +1603,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Romanska språk (övriga)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Otomispråk"
 
 #. name for roh, rm
 #, fuzzy
@@ -1622,7 +1645,8 @@ msgid "Yakut"
 msgstr "Jakutiska"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Sydamerikanska indianspråk (övriga)"
 
 #. name for sal
@@ -1659,8 +1683,9 @@ msgid "Selkup"
 msgstr "Selkup"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semitiska språk (övriga)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Chamicspråk"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1689,12 +1714,14 @@ msgid "Siouan languages"
 msgstr "Siouxspråk"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-tibetanska språk (övriga)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Siouxspråk"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Slaviska språk (övriga)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Chamicspråk"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1713,8 +1740,9 @@ msgid "Northern Sami"
 msgstr "Nordsamiska"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Samiska språk (övriga)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Chamicspråk"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1784,8 +1812,9 @@ msgid "Serer"
 msgstr "Serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-sahariska språk (övriga)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Saliska språk"
 
 # Libris vill ha det så.
 #. name for ssw, ss
@@ -1830,8 +1859,9 @@ msgid "Tahitian"
 msgstr "Tahitiska"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Thaispråk (övriga)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Tupíspråk"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1944,8 +1974,9 @@ msgid "Turkish"
 msgstr "Turkiska"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altaiska språk (övriga)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apachiska språk"
 
 # Libris vill ha det så.
 #. name for tvl
diff --git a/iso_639/ta.po b/iso_639/ta.po
index cd7cd90..a25d782 100644
--- a/iso_639/ta.po
+++ b/iso_639/ta.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2007-11-17 06:27+0000\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -51,7 +51,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -131,7 +131,7 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
+msgid "Artificial languages"
 msgstr ""
 
 #. name for arw
@@ -207,7 +207,7 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
+msgid "Baltic languages"
 msgstr ""
 
 #. name for bej
@@ -227,7 +227,7 @@ msgid "Bengali"
 msgstr "வங்காளம்"
 
 #. name for ber
-msgid "Berber (Other)"
+msgid "Berber languages"
 msgstr ""
 
 #. name for bho
@@ -255,7 +255,7 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
+msgid "Bantu languages"
 msgstr ""
 
 #. name for bos, bs
@@ -299,7 +299,7 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+msgid "Central American Indian languages"
 msgstr ""
 
 #. name for car
@@ -311,7 +311,7 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
+msgid "Caucasian languages"
 msgstr ""
 
 #. name for ceb
@@ -319,7 +319,7 @@ msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
+msgid "Celtic languages"
 msgstr ""
 
 #. name for cha, ch
@@ -397,15 +397,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -417,7 +417,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -425,7 +425,7 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
+msgid "Cushitic languages"
 msgstr ""
 
 #. name for ces, cs
@@ -473,7 +473,7 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
+msgid "Dravidian languages"
 msgstr ""
 
 #. name for dsb
@@ -565,7 +565,7 @@ msgid "Finnish"
 msgstr ""
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
+msgid "Finno-Ugrian languages"
 msgstr ""
 
 #. name for fon
@@ -617,7 +617,7 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
+msgid "Germanic languages"
 msgstr ""
 
 #. name for kat, ka
@@ -806,7 +806,7 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
+msgid "Indic languages"
 msgstr ""
 
 #. name for ind, id
@@ -814,7 +814,7 @@ msgid "Indonesian"
 msgstr ""
 
 #. name for ine
-msgid "Indo-European (Other)"
+msgid "Indo-European languages"
 msgstr ""
 
 #. name for inh
@@ -826,7 +826,7 @@ msgid "Inupiaq"
 msgstr "இனுபெக்"
 
 #. name for ira
-msgid "Iranian (Other)"
+msgid "Iranian languages"
 msgstr ""
 
 #. name for iro
@@ -910,7 +910,7 @@ msgid "Khasi"
 msgstr ""
 
 #. name for khi
-msgid "Khoisan (Other)"
+msgid "Khoisan languages"
 msgstr ""
 
 #. name for khm, km
@@ -1111,7 +1111,7 @@ msgid "Maori"
 msgstr ""
 
 #. name for map
-msgid "Austronesian (Other)"
+msgid "Austronesian languages"
 msgstr ""
 
 #. name for mar, mr
@@ -1155,7 +1155,7 @@ msgid "Uncoded languages"
 msgstr ""
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
+msgid "Mon-Khmer languages"
 msgstr ""
 
 #. name for mlg, mg
@@ -1227,7 +1227,7 @@ msgid "Nahuatl languages"
 msgstr ""
 
 #. name for nai
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr ""
 
 #. name for nap
@@ -1271,7 +1271,7 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+msgid "Niger-Kordofanian languages"
 msgstr ""
 
 #. name for niu
@@ -1367,7 +1367,7 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
+msgid "Papuan languages"
 msgstr ""
 
 #. name for pag
@@ -1403,7 +1403,7 @@ msgid "Persian"
 msgstr ""
 
 #. name for phi
-msgid "Philippine (Other)"
+msgid "Philippine languages"
 msgstr ""
 
 #. name for phn
@@ -1459,7 +1459,7 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
+msgid "Romance languages"
 msgstr ""
 
 #. name for roh, rm
@@ -1499,7 +1499,7 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
+msgid "South American Indian languages"
 msgstr ""
 
 #. name for sal
@@ -1535,7 +1535,7 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
+msgid "Semitic languages"
 msgstr ""
 
 #. name for sga
@@ -1563,11 +1563,11 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
+msgid "Sino-Tibetan languages"
 msgstr ""
 
 #. name for sla
-msgid "Slavic (Other)"
+msgid "Slavic languages"
 msgstr ""
 
 #. name for slk, sk
@@ -1587,7 +1587,7 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
+msgid "Sami languages"
 msgstr ""
 
 #. name for smj
@@ -1655,7 +1655,7 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
+msgid "Nilo-Saharan languages"
 msgstr ""
 
 #. name for ssw, ss
@@ -1699,7 +1699,7 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
+msgid "Tai languages"
 msgstr ""
 
 #. name for tam, ta
@@ -1811,7 +1811,7 @@ msgid "Turkish"
 msgstr ""
 
 #. name for tut
-msgid "Altaic (Other)"
+msgid "Altaic languages"
 msgstr ""
 
 #. name for tvl
diff --git a/iso_639/th.po b/iso_639/th.po
index 85a69c1..8a456f3 100644
--- a/iso_639/th.po
+++ b/iso_639/th.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2009-01-12 15:16+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep at linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n at googlegroup.com>\n"
@@ -46,8 +46,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "ภาษาปรากฤต"
 
 #. name for afh
 msgid "Afrihili"
@@ -126,8 +127,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "ภาษาประดิษฐ์ (อื่นๆ)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "หลายภาษา"
 
 #. name for arw
 msgid "Arawak"
@@ -202,8 +204,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "บอลติก (อื่นๆ)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "หลายภาษา"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -222,8 +225,9 @@ msgid "Bengali"
 msgstr "เบ็งกาลี"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "ภาษากะเหรี่ยง"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -250,8 +254,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "ภาษากะเหรี่ยง"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -294,7 +299,7 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
+msgid "Central American Indian languages"
 msgstr ""
 
 #. name for car
@@ -306,16 +311,18 @@ msgid "Catalan; Valencian"
 msgstr "คาตะลาน; บาเลนเซีย"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "ตระกูลภาษาคอเคเซียน (อื่นๆ)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "ภาษามายัน"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "เซลติก (อื่นๆ)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "หลายภาษา"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -393,15 +400,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -413,7 +420,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -421,8 +428,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "หลายภาษา"
 
 #. name for ces, cs
 msgid "Czech"
@@ -469,8 +477,9 @@ msgid "Dogri"
 msgstr "โฑครี"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "ทราวิฑ (อื่นๆ)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "ภาษามายัน"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -562,8 +571,9 @@ msgid "Finnish"
 msgstr "ฟินแลนด์"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "ภาษามือ"
 
 #. name for fon
 msgid "Fon"
@@ -615,8 +625,8 @@ msgstr ""
 
 #. name for gem
 #, fuzzy
-msgid "Germanic (Other)"
-msgstr "เยอรมนิก (อื่นๆ)"
+msgid "Germanic languages"
+msgstr "ภาษาปรากฤต"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -805,16 +815,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "อินเทอร์ลิงกวา (องค์การภาษาช่วยสื่อสารนานาชาติ)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "ตระกูลอินเดีย (อื่นๆ)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "ภาษาที่ยังไม่กำหนดรหัส"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "อินโดนีเซีย"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "ตระกูลอินเดีย-ยุโรป (อื่นๆ)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "ภาษากะเหรี่ยง"
 
 #. name for inh
 msgid "Ingush"
@@ -825,8 +837,9 @@ msgid "Inupiaq"
 msgstr "ไอนูเปียก"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "ตระกูลอิหร่าน (อื่นๆ)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "ภาษามายัน"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -909,8 +922,9 @@ msgid "Khasi"
 msgstr "ขาสี"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "ภาษากะเหรี่ยง"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1110,8 +1124,8 @@ msgstr "เมารี"
 
 #. name for map
 #, fuzzy
-msgid "Austronesian (Other)"
-msgstr "ออสโตรเนเชียน (อื่นๆ)"
+msgid "Austronesian languages"
+msgstr "ภาษากะเหรี่ยง"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1154,8 +1168,9 @@ msgid "Uncoded languages"
 msgstr "ภาษาที่ยังไม่กำหนดรหัส"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "มอญ-เขมร (อื่นๆ)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "ภาษากะเหรี่ยง"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1226,7 +1241,7 @@ msgid "Nahuatl languages"
 msgstr ""
 
 #. name for nai
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr ""
 
 #. name for nap
@@ -1270,8 +1285,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "ภาษากะเหรี่ยง"
 
 #. name for niu
 msgid "Niuean"
@@ -1367,8 +1383,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "ปาปัว (อื่นๆ)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "ภาษามายัน"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1403,8 +1420,9 @@ msgid "Persian"
 msgstr "เปอร์เซีย"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "ฟิลิปปินส์ (อื่นๆ)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "หลายภาษา"
 
 #. name for phn
 msgid "Phoenician"
@@ -1459,8 +1477,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "โรมานซ์ (อื่นๆ)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "ภาษาที่ยังไม่กำหนดรหัส"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1499,7 +1518,7 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
+msgid "South American Indian languages"
 msgstr ""
 
 #. name for sal
@@ -1535,8 +1554,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "เซมิติก (อื่นๆ)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "ภาษามือ"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1563,12 +1583,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "จีน-ทิเบต (อื่นๆ)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "ภาษาที่ยังไม่กำหนดรหัส"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "สลาฟ (อื่นๆ)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "ภาษามือ"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1587,8 +1609,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "ภาษามือ"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1656,8 +1679,8 @@ msgstr ""
 
 #. name for ssa
 #, fuzzy
-msgid "Nilo-Saharan (Other)"
-msgstr "ไนล์-ซาฮารา (อื่นๆ)"
+msgid "Nilo-Saharan languages"
+msgstr "ภาษากะเหรี่ยง"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1700,8 +1723,9 @@ msgid "Tahitian"
 msgstr "ตาฮิติ"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "ไท (อื่นๆ)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "ภาษาปรากฤต"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1812,8 +1836,9 @@ msgid "Turkish"
 msgstr "ตุรกี"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "อัลไตอิก (อื่นๆ)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "หลายภาษา"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/ti.po b/iso_639/ti.po
index 8eb31d1..8b5baa0 100644
--- a/iso_639/ti.po
+++ b/iso_639/ti.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-08-07 21:21+0100\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Tigrinya\n"
@@ -43,7 +43,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -123,8 +123,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "ኮሪያኛ"
 
 #. name for arw
 msgid "Arawak"
@@ -199,8 +200,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "ኮሪያኛ"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -219,8 +221,9 @@ msgid "Bengali"
 msgstr "በንጋሊኛ"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "ኮሪያኛ"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -247,8 +250,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "ኮሪያኛ"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -291,8 +295,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "ፍሪስኛ"
 
 #. name for car
 #, fuzzy
@@ -304,16 +309,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "ኮሪያኛ"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "ኮሪያኛ"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -391,15 +398,15 @@ msgid "Corsican"
 msgstr "ኮርሲካኛ"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -411,7 +418,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -419,8 +426,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "ኮሪያኛ"
 
 #. name for ces, cs
 msgid "Czech"
@@ -467,8 +475,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "ኮሪያኛ"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -559,8 +568,9 @@ msgid "Finnish"
 msgstr "ፊኒሽ"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "ኮሪያኛ"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +624,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "ኮሪያኛ"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -803,16 +814,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "ኮሪያኛ"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "እንዶኒሲኛ"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "ኮሪያኛ"
 
 #. name for inh
 msgid "Ingush"
@@ -823,8 +836,9 @@ msgid "Inupiaq"
 msgstr "እኑፒያቅኛ"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "ኮሪያኛ"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -909,8 +923,9 @@ msgid "Khasi"
 msgstr "ታይኛ"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "ኮሪያኛ"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1111,8 +1126,9 @@ msgid "Maori"
 msgstr "ማዮሪኛ"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "ኮሪያኛ"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1156,8 +1172,9 @@ msgid "Uncoded languages"
 msgstr "ኮሪያኛ"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "ኮሪያኛ"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1231,7 +1248,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "ፍሪስኛ"
 
 #. name for nap
@@ -1275,8 +1292,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "ኮሪያኛ"
 
 #. name for niu
 msgid "Niuean"
@@ -1371,8 +1389,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "ኮሪያኛ"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1407,8 +1426,9 @@ msgid "Persian"
 msgstr "ፐርሲያኛ"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "ኮሪያኛ"
 
 #. name for phn
 msgid "Phoenician"
@@ -1463,8 +1483,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "ኮሪያኛ"
 
 #. name for roh, rm
 #, fuzzy
@@ -1504,8 +1525,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "ፍሪስኛ"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1540,8 +1562,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "ኮሪያኛ"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1569,12 +1592,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "ኮሪያኛ"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "ኮሪያኛ"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1593,8 +1618,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "ኮሪያኛ"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1662,8 +1688,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "ኮሪያኛ"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1706,8 +1733,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "ኮሪያኛ"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1818,8 +1846,9 @@ msgid "Turkish"
 msgstr "ቱርክኛ"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "ኮሪያኛ"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/tig.po b/iso_639/tig.po
index b731d77..07069fd 100644
--- a/iso_639/tig.po
+++ b/iso_639/tig.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-08-07 21:21+0100\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Tigre\n"
@@ -43,7 +43,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -123,8 +123,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "ኮሪያኛ"
 
 #. name for arw
 msgid "Arawak"
@@ -199,8 +200,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "ኮሪያኛ"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -219,8 +221,9 @@ msgid "Bengali"
 msgstr "በንጋሊኛ"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "ኮሪያኛ"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -247,8 +250,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "ኮሪያኛ"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -291,8 +295,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "ፍሪስኛ"
 
 #. name for car
 #, fuzzy
@@ -304,16 +309,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "ኮሪያኛ"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "ኮሪያኛ"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -391,15 +398,15 @@ msgid "Corsican"
 msgstr "ኮርሲካኛ"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -411,7 +418,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -419,8 +426,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "ኮሪያኛ"
 
 #. name for ces, cs
 msgid "Czech"
@@ -467,8 +475,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "ኮሪያኛ"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -559,8 +568,9 @@ msgid "Finnish"
 msgstr "ፊኒሽ"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "ኮሪያኛ"
 
 #. name for fon
 msgid "Fon"
@@ -614,8 +624,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "ኮሪያኛ"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -803,16 +814,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "ኮሪያኛ"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "እንዶኒሲኛ"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "ኮሪያኛ"
 
 #. name for inh
 msgid "Ingush"
@@ -823,8 +836,9 @@ msgid "Inupiaq"
 msgstr "እኑፒያቅኛ"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "ኮሪያኛ"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -909,8 +923,9 @@ msgid "Khasi"
 msgstr "ታይኛ"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "ኮሪያኛ"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1111,8 +1126,9 @@ msgid "Maori"
 msgstr "ማዮሪኛ"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "ኮሪያኛ"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1156,8 +1172,9 @@ msgid "Uncoded languages"
 msgstr "ኮሪያኛ"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "ኮሪያኛ"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1231,7 +1248,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "ፍሪስኛ"
 
 #. name for nap
@@ -1275,8 +1292,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "ኮሪያኛ"
 
 #. name for niu
 msgid "Niuean"
@@ -1371,8 +1389,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "ኮሪያኛ"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1407,8 +1426,9 @@ msgid "Persian"
 msgstr "ፐርሲያኛ"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "ኮሪያኛ"
 
 #. name for phn
 msgid "Phoenician"
@@ -1463,8 +1483,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "ኮሪያኛ"
 
 #. name for roh, rm
 #, fuzzy
@@ -1504,8 +1525,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "ፍሪስኛ"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1540,8 +1562,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "ኮሪያኛ"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1569,12 +1592,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "ኮሪያኛ"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "ኮሪያኛ"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1593,8 +1618,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "ኮሪያኛ"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1662,8 +1688,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "ኮሪያኛ"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1706,8 +1733,9 @@ msgid "Tahitian"
 msgstr ""
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "ኮሪያኛ"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1818,8 +1846,9 @@ msgid "Turkish"
 msgstr "ቱርክኛ"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "ኮሪያኛ"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/tr.po b/iso_639/tr.po
index a6d95d9..993da0e 100644
--- a/iso_639/tr.po
+++ b/iso_639/tr.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-04-05 01:37+0300\n"
 "Last-Translator: Alastair McKinstry <mckinstry at debian.org>\n"
 "Language-Team: Turkish <gnome-turk at gnome.org>\n"
@@ -47,8 +47,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Apaçi dilleri (Apaçi yerlileri)"
 
 #. name for afh
 msgid "Afrihili"
@@ -129,8 +130,9 @@ msgid "Arapaho"
 msgstr "Arapaho (Kuzey Amerika yerlileri)"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Yapay (Diğer)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Athapascan dili (Kuzey Amerika yerlileri)"
 
 #. name for arw
 msgid "Arawak"
@@ -207,8 +209,9 @@ msgid "Basa"
 msgstr "Basa (Nijerya)"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltık (Diğer)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Bamileke dilleri (Afrika)"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -227,8 +230,9 @@ msgid "Bengali"
 msgstr "Bengalce"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berberice (Diğer)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Apaçi dilleri (Apaçi yerlileri)"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -257,8 +261,9 @@ msgid "Siksika"
 msgstr "Siksika (Kuzey Amerika yerlileri)"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantu; Zaire dili (Diğer)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Bamileke dilleri (Afrika)"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -302,7 +307,8 @@ msgid "Caddo"
 msgstr "Caddo (Kuzey Amerika yerlileri)"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Orta Amerika Yerlileri (Diğer)"
 
 #. name for car
@@ -315,16 +321,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Kafkas dilleri (Diğer)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Athapascan dili (Kuzey Amerika yerlileri)"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebuano (Filipinler)"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Kelt dili (Diğer)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Chamic dilleri (Malay)"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -403,17 +411,17 @@ msgstr "Korsikaca"
 
 #. name for cpe
 #, fuzzy
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr "İngilizce orijinli (Diğer)"
 
 #. name for cpf
 #, fuzzy
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr "Fransızca orijinli (Diğer)"
 
 #. name for cpp
 #, fuzzy
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Portekizce orijinli (Diğer)"
 
 #. name for cre, cr
@@ -426,16 +434,18 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Kırım Türkçesi; Kırım Tatarcası"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
-msgstr ""
+#, fuzzy
+msgid "Creoles and pidgins"
+msgstr "Fransızca orijinli (Diğer)"
 
 #. name for csb
 msgid "Kashubian"
 msgstr "Kashubian (Lehçe diyalekti)"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Cushitic; Etiyopya (Diğer)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Chamic dilleri (Malay)"
 
 #. name for ces, cs
 msgid "Czech"
@@ -483,8 +493,9 @@ msgid "Dogri"
 msgstr "Dogri (Hindistan)"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidian (Diğer; Hindistan ve Sri Lanka)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Avustralya dilleri"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -578,8 +589,9 @@ msgid "Finnish"
 msgstr "Fince"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Fin-Ural (Diğer)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Algonquian dilleri (Kuzey Amerika yerlileri)"
 
 #. name for fon
 msgid "Fon"
@@ -635,8 +647,9 @@ msgid "Gbaya"
 msgstr "Gbaya (Sudan)"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Germence (Diğer)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Chamic dilleri (Malay)"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -841,16 +854,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Bamileke dilleri (Afrika)"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Endonezyaca"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Bamileke dilleri (Afrika)"
 
 #. name for inh
 #, fuzzy
@@ -864,8 +879,9 @@ msgid "Inupiaq"
 msgstr "Hinduca"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Bamileke dilleri (Afrika)"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -954,8 +970,9 @@ msgid "Khasi"
 msgstr "Taylandça"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Apaçi dilleri (Apaçi yerlileri)"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1171,8 +1188,9 @@ msgid "Maori"
 msgstr "Kenarlar"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Avustralya dilleri"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1219,8 +1237,9 @@ msgid "Uncoded languages"
 msgstr "Apaçi dilleri (Apaçi yerlileri)"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Apaçi dilleri (Apaçi yerlileri)"
 
 #. name for mlg, mg
 #, fuzzy
@@ -1303,7 +1322,7 @@ msgstr "Apaçi dilleri (Apaçi yerlileri)"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Orta Amerika Yerlileri (Diğer)"
 
 # src/bookmarks_editor.c:822
@@ -1351,8 +1370,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Algonquian dilleri (Kuzey Amerika yerlileri)"
 
 #. name for niu
 msgid "Niuean"
@@ -1452,8 +1472,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Apaçi dilleri (Apaçi yerlileri)"
 
 #. name for pag
 #, fuzzy
@@ -1491,8 +1512,9 @@ msgid "Persian"
 msgstr "Yazdır"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Apaçi dilleri (Apaçi yerlileri)"
 
 #. name for phn
 #, fuzzy
@@ -1550,8 +1572,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Apaçi dilleri (Apaçi yerlileri)"
 
 #. name for roh, rm
 #, fuzzy
@@ -1592,8 +1615,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Orta Amerika Yerlileri (Diğer)"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1633,8 +1657,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Chamic dilleri (Malay)"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1664,12 +1689,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Algonquian dilleri (Kuzey Amerika yerlileri)"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Chamic dilleri (Malay)"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1688,8 +1715,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Chamic dilleri (Malay)"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1763,8 +1791,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Apaçi dilleri (Apaçi yerlileri)"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1810,8 +1839,9 @@ msgid "Tahitian"
 msgstr "Letonyaca"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Chamic dilleri (Malay)"
 
 #. name for tam, ta
 #, fuzzy
@@ -1927,8 +1957,9 @@ msgid "Turkish"
 msgstr "Türkçe"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Apaçi dilleri (Apaçi yerlileri)"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/tt.po b/iso_639/tt.po
index b24159a..9574901 100644
--- a/iso_639/tt.po
+++ b/iso_639/tt.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2005-10-21 15:20+0300\n"
 "Last-Translator: Albert Fazlí <tatarish.l10n at gmail.com>\n"
 "Language-Team: Tatarish\n"
@@ -43,8 +43,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Ğosman telläre"
 
 #. name for afh
 msgid "Afrihili"
@@ -123,8 +124,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Ğosman telläre"
 
 #. name for arw
 msgid "Arawak"
@@ -201,8 +203,9 @@ msgid "Basa"
 msgstr ""
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Ğosman telläre"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -221,8 +224,9 @@ msgid "Bengali"
 msgstr "Bengalça"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Ğosman telläre"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -249,8 +253,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Ğosman telläre"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -294,8 +299,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Tönyaq Sami"
 
 #. name for car
 #, fuzzy
@@ -307,16 +313,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Ğosman telläre"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Ğosman telläre"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -394,15 +402,15 @@ msgid "Corsican"
 msgstr "Korsikça"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -414,7 +422,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -422,8 +430,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Ğosman telläre"
 
 #. name for ces, cs
 msgid "Czech"
@@ -471,8 +480,9 @@ msgid "Dogri"
 msgstr ""
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Ğosman telläre"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -563,8 +573,9 @@ msgid "Finnish"
 msgstr "Finçä"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Ğosman telläre"
 
 #. name for fon
 msgid "Fon"
@@ -618,8 +629,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Ğosman telläre"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -808,16 +820,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Ğosman telläre"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "İndonesçä"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Ğosman telläre"
 
 #. name for inh
 msgid "Ingush"
@@ -828,8 +842,9 @@ msgid "Inupiaq"
 msgstr "İnupiaqça"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Ğosman telläre"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -914,8 +929,9 @@ msgid "Khasi"
 msgstr "Tayça"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Ğosman telläre"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1119,8 +1135,9 @@ msgid "Maori"
 msgstr "Maoriça"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Ğosman telläre"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1164,8 +1181,9 @@ msgid "Uncoded languages"
 msgstr "Ğosman telläre"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Ğosman telläre"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1239,7 +1257,7 @@ msgstr "Ğosman telläre"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Tönyaq Sami"
 
 #. name for nap
@@ -1285,8 +1303,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Ğosman telläre"
 
 #. name for niu
 msgid "Niuean"
@@ -1383,8 +1402,9 @@ msgid "Otomian languages"
 msgstr "Ğosman telläre"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Ğosman telläre"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1420,8 +1440,9 @@ msgid "Persian"
 msgstr "Farsıça"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Ğosman telläre"
 
 #. name for phn
 msgid "Phoenician"
@@ -1477,8 +1498,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Ğosman telläre"
 
 #. name for roh, rm
 #, fuzzy
@@ -1518,8 +1540,9 @@ msgid "Yakut"
 msgstr "Yaqutça"
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Tönyaq Sami"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1554,8 +1577,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Ğosman telläre"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1583,12 +1607,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Ğosman telläre"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Ğosman telläre"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1607,8 +1633,9 @@ msgid "Northern Sami"
 msgstr "Tönyaq Sami"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Ğosman telläre"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1677,8 +1704,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Ğosman telläre"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1721,8 +1749,9 @@ msgid "Tahitian"
 msgstr "Tahitçä"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Ğosman telläre"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1833,8 +1862,9 @@ msgid "Turkish"
 msgstr "Törekçä"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Ğosman telläre"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/uk.po b/iso_639/uk.po
index 5ffcd6e..9071198 100644
--- a/iso_639/uk.po
+++ b/iso_639/uk.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2004-04-01 14:30+0300\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen at univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -49,8 +49,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Афроазійські (інші)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Апачі, мови"
 
 #. name for afh
 msgid "Afrihili"
@@ -131,8 +132,9 @@ msgid "Arapaho"
 msgstr "Арапахо"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Штучні (інші)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Отомі, мови"
 
 #. name for arw
 msgid "Arawak"
@@ -209,8 +211,9 @@ msgid "Basa"
 msgstr "Баса"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Балтійська (інша)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Маянські мови"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -229,8 +232,9 @@ msgid "Bengali"
 msgstr "Бенгалі"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Берберські (інші)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Маянські мови"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -258,8 +262,9 @@ msgid "Siksika"
 msgstr "Блекфут"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Банту (інші)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Мунда, мови"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -303,7 +308,8 @@ msgid "Caddo"
 msgstr "Каддо"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Центральноамериканських індіанців (інші)"
 
 #. name for car
@@ -316,16 +322,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Іберокавказькі (інші)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Вакашські мови"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Себуанська"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Кельтські (інші)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Хамітські мови"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -404,17 +412,17 @@ msgstr "Корсіканська"
 
 #. name for cpe
 #, fuzzy
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr "Креольські та піджінізовані мови (інші)"
 
 #. name for cpf
 #, fuzzy
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr "Креольські та піджінізовані мови (інші)"
 
 #. name for cpp
 #, fuzzy
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Креольські та піджінізовані мови (інші)"
 
 #. name for cre, cr
@@ -426,7 +434,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Креольські та піджінізовані мови (інші)"
 
 #. name for csb
@@ -434,8 +443,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Кушітські (інші)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Хамітські мови"
 
 #. name for ces, cs
 msgid "Czech"
@@ -483,8 +493,9 @@ msgid "Dogri"
 msgstr "Догрі"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Дравідійські (інші)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Лужицькі (сорбські, вендські) мови"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -575,8 +586,9 @@ msgid "Finnish"
 msgstr "Фінська"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "фіно-угорські (інші)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Лужицькі (сорбські, вендські) мови"
 
 #. name for fon
 msgid "Fon"
@@ -632,8 +644,9 @@ msgid "Gbaya"
 msgstr "Гбайа"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Германські (інші)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Хамітські мови"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -827,16 +840,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Індійські (інші)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Мунда, мови"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Індонезійська"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Індоєвропейські (інші)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Ірокезькі (інші)"
 
 #. name for inh
 msgid "Ingush"
@@ -847,8 +862,9 @@ msgid "Inupiaq"
 msgstr "Інуп'як"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Іранські (інші)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Ірокезькі (інші)"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -933,8 +949,9 @@ msgid "Khasi"
 msgstr "Кхасі"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Койсанські (інші)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Отомі, мови"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1139,8 +1156,9 @@ msgid "Maori"
 msgstr "Маорі"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Аустронезійські (інші)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Австралійські мови"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1184,8 +1202,9 @@ msgid "Uncoded languages"
 msgstr "Мунда, мови"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Мон-кхмерські (інші)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Мунда, мови"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1260,7 +1279,7 @@ msgstr "Нуба, мови"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Північноамериканських індіанців (інші)"
 
 #. name for nap
@@ -1307,7 +1326,8 @@ msgid "Nias"
 msgstr "Ніаська"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Нігеро-кордофанські (інші)"
 
 #. name for niu
@@ -1407,8 +1427,9 @@ msgid "Otomian languages"
 msgstr "Отомі, мови"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Папуасько-австралійські (інші)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Маянські мови"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1445,8 +1466,9 @@ msgid "Persian"
 msgstr "Перська"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Філіпінські (інші)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Багатомовність"
 
 #. name for phn
 msgid "Phoenician"
@@ -1503,8 +1525,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Романські (інші)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Отомі, мови"
 
 #. name for roh, rm
 #, fuzzy
@@ -1544,7 +1567,8 @@ msgid "Yakut"
 msgstr "Якутська"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Південноамериканських індіанців (інші)"
 
 #. name for sal
@@ -1581,8 +1605,9 @@ msgid "Selkup"
 msgstr "Селькупська"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Семітичні (інші)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Хамітські мови"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1611,12 +1636,14 @@ msgid "Siouan languages"
 msgstr "Сіу мови"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Китайсько-тибетські (інші)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Сіу мови"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Слов’янські (інші)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Хамітські мови"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1635,8 +1662,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Саамські мови (інші)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Хамітські мови"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1705,8 +1733,9 @@ msgid "Serer"
 msgstr "Серер"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Ніло-сахарські (інші)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Салішські мови"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1749,8 +1778,9 @@ msgid "Tahitian"
 msgstr "Таїтянська"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Тайські (інші)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Хамітські мови"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1862,8 +1892,9 @@ msgid "Turkish"
 msgstr "Турецька"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Алтайські (інші)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Апачі, мови"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/ve.po b/iso_639/ve.po
index 268c6ac..9fa3926 100644
--- a/iso_639/ve.po
+++ b/iso_639/ve.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2003-01-07 11:39SAST\n"
 "Last-Translator: Fhatuwani Rambau <fhatuwani at translate.org.za>\n"
 "Language-Team: Venda <venda at translate.org.za>\n"
@@ -47,8 +47,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Malagasy"
 
 #. name for afh
 msgid "Afrihili"
@@ -134,8 +135,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Malagasy"
 
 #. name for arw
 msgid "Arawak"
@@ -217,8 +219,9 @@ msgid "Basa"
 msgstr "Hausa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Malagasy"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -237,8 +240,9 @@ msgid "Bengali"
 msgstr "Bengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Malagasy"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -266,8 +270,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Malagasy"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -314,8 +319,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Sami ya Devhula"
 
 #. name for car
 #, fuzzy
@@ -327,16 +333,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Malagasy"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Malagasy"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -418,15 +426,15 @@ msgid "Corsican"
 msgstr "Corsican"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -438,7 +446,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -447,8 +455,9 @@ msgid "Kashubian"
 msgstr "Sardinian"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Malagasy"
 
 #. name for ces, cs
 msgid "Czech"
@@ -499,8 +508,9 @@ msgid "Dogri"
 msgstr "Maori"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Malagasy"
 
 #. name for dsb
 #, fuzzy
@@ -598,8 +608,9 @@ msgid "Finnish"
 msgstr "Finnish"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Malagasy"
 
 #. name for fon
 msgid "Fon"
@@ -654,8 +665,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Malagasy"
 
 #. name for kat, ka
 #, fuzzy
@@ -863,16 +875,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Malagasy"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonesian"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Malagasy"
 
 #. name for inh
 #, fuzzy
@@ -884,8 +898,9 @@ msgid "Inupiaq"
 msgstr "Inupiaq"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Malagasy"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -979,8 +994,9 @@ msgid "Khasi"
 msgstr "Thai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Malagasy"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1212,8 +1228,9 @@ msgid "Maori"
 msgstr "Maori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Malagasy"
 
 #. name for mar, mr
 #, fuzzy
@@ -1262,8 +1279,9 @@ msgid "Uncoded languages"
 msgstr "Malagasy"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Malagasy"
 
 #. name for mlg, mg
 #, fuzzy
@@ -1348,7 +1366,7 @@ msgstr "Malagasy"
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Sami ya Devhula"
 
 #. name for nap
@@ -1396,8 +1414,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Malagasy"
 
 #. name for niu
 #, fuzzy
@@ -1499,8 +1518,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Malagasy"
 
 #. name for pag
 #, fuzzy
@@ -1538,8 +1558,9 @@ msgid "Persian"
 msgstr "Persian"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Malagasy"
 
 #. name for phn
 #, fuzzy
@@ -1601,8 +1622,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Malagasy"
 
 #. name for roh, rm
 #, fuzzy
@@ -1648,8 +1670,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Sami ya Devhula"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1688,8 +1711,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Malagasy"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1720,12 +1744,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Malagasy"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Malagasy"
 
 #. name for slk, sk
 #, fuzzy
@@ -1748,8 +1774,9 @@ msgid "Northern Sami"
 msgstr "Sami ya Devhula"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Malagasy"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1829,8 +1856,9 @@ msgid "Serer"
 msgstr "Herero"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Malagasy"
 
 #. name for ssw, ss
 #, fuzzy
@@ -1880,8 +1908,9 @@ msgid "Tahitian"
 msgstr "Tahitian"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Malagasy"
 
 #. name for tam, ta
 #, fuzzy
@@ -2006,8 +2035,9 @@ msgid "Turkish"
 msgstr "Turkish"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Malagasy"
 
 #. name for tvl
 #, fuzzy
diff --git a/iso_639/vi.po b/iso_639/vi.po
index b90784b..dffb884 100644
--- a/iso_639/vi.po
+++ b/iso_639/vi.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639 3.6\n"
-"Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
+"debian.org>\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2009-02-04 15:03+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -43,8 +44,9 @@ msgid "Adyghe; Adygei"
 msgstr "Tiếng A-đy-gei"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Châu Phi/A (khác)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Hệ ngôn ngữ A-pa-chi"
 
 #. name for afh
 msgid "Afrihili"
@@ -123,8 +125,9 @@ msgid "Arapaho"
 msgstr "Tiếng A-ra-pa-hô"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Hệ ngôn ngữ nhân tạo (khác)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Hệ ngôn ngữ O-tom"
 
 #. name for arw
 msgid "Arawak"
@@ -199,8 +202,9 @@ msgid "Basa"
 msgstr "Tiếng Ba-xa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Ngôn ngữ thuộc biển Ban-tích (khác)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Những ngôn ngữ Ba-tác"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -219,8 +223,9 @@ msgid "Bengali"
 msgstr "Tiếng Băng Gan"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Tiếng Bơ-bơ (khác)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Những ngôn ngữ Ka-ren"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -247,8 +252,9 @@ msgid "Siksika"
 msgstr "Tiếng Xich-xich-a"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Tiếng Ban-tu (khác)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Hệ ngôn ngữ Ban-đa"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -291,7 +297,8 @@ msgid "Caddo"
 msgstr "Tiếng Ca-đô"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Thổ Dân Vùng Trung Mỹ (khác)"
 
 #. name for car
@@ -303,16 +310,18 @@ msgid "Catalan; Valencian"
 msgstr "Tiếng Ca-ta-lan"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Ngôn ngữ Châu Âu (khác)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Hệ ngôn ngữ Oua-ca-sa"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Tiếng Xe-bu-a-nô"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Ngôn ngư Xen-tơ (khác)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Hệ ngôn ngữ Cha-mic"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -359,7 +368,9 @@ msgid "Cherokee"
 msgstr "Tiếng Che-rô-ki"
 
 #. name for chu, cu
-msgid "Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic"
+msgid ""
+"Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church "
+"Slavonic"
 msgstr "Xla-vợ cũ"
 
 #. name for chv, cv
@@ -387,15 +398,18 @@ msgid "Corsican"
 msgstr "Tiếng Coa-si-ca"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Ngôn ngữ pha và « bồi » đựa vào tiếng Anh (khác)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Ngôn ngữ pha và « bồi » đựa vào tiếng Pháp (khác)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Ngôn ngữ pha và « bồi » đựa vào tiếng Bồ Đào Nha (khác)"
 
 #. name for cre, cr
@@ -407,7 +421,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Tiếng Tác-ta thuộc Cợ-ri-me-a; tiếng Thổ Nhĩ Kỳ thuộc Cợ-ri-me-a"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Ngôn ngữ pha và « bồi » (khác)"
 
 #. name for csb
@@ -415,8 +430,9 @@ msgid "Kashubian"
 msgstr "Tiếng Kha-su-bi"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Tiếng Cu-si-ti (khác)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Hệ ngôn ngữ Cha-mic"
 
 #. name for ces, cs
 msgid "Czech"
@@ -463,8 +479,9 @@ msgid "Dogri"
 msgstr "Tiếng Đoc-ri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Tiếng Đợ-ra-vi-đi (khác)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Hệ ngôn ngữ Xoa-bi-a"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -555,8 +572,9 @@ msgid "Finnish"
 msgstr "Tiếng Phần Lan"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Tiếng Phần Lan - U-gơ-ri (khác)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Hệ ngôn ngữ Xoa-bi-a"
 
 #. name for fon
 msgid "Fon"
@@ -607,8 +625,9 @@ msgid "Gbaya"
 msgstr "Tiếng G-bay-a"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Ngôn ngữ thuộc Đức (khác)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Hệ ngôn ngữ Cha-mic"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -795,16 +814,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Ngôn ngữ lẫn nhau In-tơ-lin-gua (Liên Hiệp Ngôn Ngữ Bổ Trợ Quốc Tế)"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Tiếng thuộc Ấn độ (khác)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Hệ ngôn ngữ Ban-đa"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Tiếng Nam Dương"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Ngôn ngữ miền giữa Ấn-độ và Châu Âu (khác)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Hệ ngôn ngữ I-ro-coi"
 
 #. name for inh
 msgid "Ingush"
@@ -815,8 +836,9 @@ msgid "Inupiaq"
 msgstr "Tiếng In-u-pi-ac"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Ngôn ngữ Ba Tư (khác)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Hệ ngôn ngữ I-ro-coi"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -899,8 +921,9 @@ msgid "Khasi"
 msgstr "Tiếng Kha-xi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Tiếng Khoi-san (khác)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Hệ ngôn ngữ O-tom"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1099,8 +1122,9 @@ msgid "Maori"
 msgstr "Tiếng Mao-ri"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Ngôn ngữ phía Đông Úc (khác)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Hệ ngôn ngữ Úc"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1143,8 +1167,9 @@ msgid "Uncoded languages"
 msgstr "Các ngôn ngữ chưa có mã"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Tiếng Mon-Khơ-me (khác)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Hệ ngôn ngữ Khợ-ru"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1215,7 +1240,8 @@ msgid "Nahuatl languages"
 msgstr "Hệ ngôn ngữ Na-hu-at-l"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Thổ dân Bắc Mỹ"
 
 #. name for nap
@@ -1259,7 +1285,8 @@ msgid "Nias"
 msgstr "Tiếng Ni-as"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Tiếng Nai-giơ-Koa-do-pha-ni (khác)"
 
 #. name for niu
@@ -1355,8 +1382,9 @@ msgid "Otomian languages"
 msgstr "Hệ ngôn ngữ O-tom"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Tiếng Pa-pu-a (khác)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Những ngôn ngữ Ma-ya"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1391,8 +1419,9 @@ msgid "Persian"
 msgstr "Tiếng Ba Tư"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Tiếng Phi-li-pi-nô (khác)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Đa ngôn ngữ"
 
 #. name for phn
 msgid "Phoenician"
@@ -1420,7 +1449,8 @@ msgstr "Hệ ngôn ngữ Pợ-ra-cợ-rit"
 
 #. name for pro
 msgid "Provençal, Old (to 1500); Occitan, Old (to 1500)"
-msgstr "Tiếng Pợ-ro-ven-san Cũ (đến năm 1500); Tiếng Ô-xi-tan Cũ (đến năm 1500)"
+msgstr ""
+"Tiếng Pợ-ro-ven-san Cũ (đến năm 1500); Tiếng Ô-xi-tan Cũ (đến năm 1500)"
 
 #. name for pus, ps
 msgid "Pushto; Pashto"
@@ -1447,8 +1477,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "Tiếng Rarotongan; Tiếng Mao-ri của Quần Đảo Cook"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Ngôn ngữ Rô-man (khác)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Hệ ngôn ngữ O-tom"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1487,7 +1518,8 @@ msgid "Yakut"
 msgstr "Tiếng Ia-cut"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Thổ Dân Nam Mỹ (khác)"
 
 #. name for sal
@@ -1523,8 +1555,9 @@ msgid "Selkup"
 msgstr "Tiếng Xen-cup"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Tiếng Xê-mít (khác)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Hệ ngôn ngữ Cha-mic"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1551,12 +1584,14 @@ msgid "Siouan languages"
 msgstr "Hệ ngôn ngữ Xiou"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Ngôn ngữ Trung Hoa - Tây-Tạng (khác)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Hệ ngôn ngữ Xiou"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Tiếng Xla-vơ (khác)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Hệ ngôn ngữ Cha-mic"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1575,8 +1610,9 @@ msgid "Northern Sami"
 msgstr "Tiếng Bắc Xa-mi"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Tiếng Xa-mi (khác)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Hệ ngôn ngữ Cha-mic"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1643,8 +1679,9 @@ msgid "Serer"
 msgstr "Tiếng Xe-re"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Ngôn ngữ miền giữa sông Nile và sa mạc Sa-ha-ra (khác)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Hệ ngôn ngữ Xa-lis"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1687,8 +1724,9 @@ msgid "Tahitian"
 msgstr "Tiếng Ta-hi-ti"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tiếng Tai (khác)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Hệ ngôn ngữ Tu-pi"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1799,8 +1837,9 @@ msgid "Turkish"
 msgstr "Tiếng Thổ Nhĩ Kỳ"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Tiếng Al-tai (khác)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Hệ ngôn ngữ A-pa-chi"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/wa.po b/iso_639/wa.po
index f7ae1ef..67d767b 100644
--- a/iso_639/wa.po
+++ b/iso_639/wa.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2007-08-28 14:15+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo at walon.org>\n"
 "Language-Team: Walloon <linux-wa at walon.org>\n"
@@ -47,8 +47,9 @@ msgid "Adyghe; Adygei"
 msgstr "Adiguès"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "Afro-Aziyatike (ôtes)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "Lingaedjes apache"
 
 #. name for afh
 msgid "Afrihili"
@@ -127,8 +128,9 @@ msgid "Arapaho"
 msgstr "Arapaho"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "Constrût (ôtes)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Lingaedjes otomyins"
 
 #. name for arw
 msgid "Arawak"
@@ -203,8 +205,9 @@ msgid "Basa"
 msgstr "Bassa"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "Baltike (ôtes)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Lingaedjes batak"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -223,8 +226,9 @@ msgid "Bengali"
 msgstr "Bengali"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "Berbere (ôtes)"
+#, fuzzy
+msgid "Berber languages"
+msgstr "Lingaedjes karen"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -251,8 +255,9 @@ msgid "Siksika"
 msgstr "Siksika"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "Bantou (ôtes)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Lingaedjes banda"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -295,7 +300,8 @@ msgid "Caddo"
 msgstr "Caddo"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "Amerindyin di l' Amerike cintråle (ôtes)"
 
 #. name for car
@@ -307,16 +313,18 @@ msgid "Catalan; Valencian"
 msgstr "Catalan"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "Cocåzyin (ôtes)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Lingaedjes wakashan"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "Cebwano"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "Celtike (ôtes)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Lingaedjes xhamitikes"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -393,15 +401,18 @@ msgid "Corsican"
 msgstr "Corse"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "Creyoles et pidjines, båzés so l' inglès (ôtes)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "Creyoles et pidjines, båzés sol francès (ôtes)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "Creyoles et pidjines, båzés sol portuguès (ôtes)"
 
 #. name for cre, cr
@@ -413,7 +424,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "Tatår del Crimêye"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "Creyoles et pidjines (ôtes)"
 
 #. name for csb
@@ -421,8 +433,9 @@ msgid "Kashubian"
 msgstr "Cachoube"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "Couchitike (ôtes)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Lingaedjes xhamitikes"
 
 #. name for ces, cs
 msgid "Czech"
@@ -469,8 +482,9 @@ msgid "Dogri"
 msgstr "Dogri"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "Dravidyin (ôtes)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Lingaedjes sorbyins"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -561,8 +575,9 @@ msgid "Finnish"
 msgstr "Finwès"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "Fino-ougryin (ôtes)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Lingaedjes sorbyins"
 
 #. name for fon
 msgid "Fon"
@@ -613,8 +628,9 @@ msgid "Gbaya"
 msgstr "Gbaya"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "Tîxhon (ôtes)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Lingaedjes xhamitikes"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -804,16 +820,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "Indyin (ôtes)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "Lingaedjes banda"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indonezyin"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "Indo-uropeyin (ôtes)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Lingaedjes irocwès"
 
 #. name for inh
 msgid "Ingush"
@@ -824,8 +842,9 @@ msgid "Inupiaq"
 msgstr "Inyupiak"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "Iranyin (ôtes)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Lingaedjes irocwès"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -908,8 +927,9 @@ msgid "Khasi"
 msgstr "Xhassi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "Xhoisan (ôtes)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Lingaedjes otomyins"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1109,8 +1129,9 @@ msgid "Maori"
 msgstr "Mawori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "Ostronezyin (ôtes)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Lingaedjes ostralyins"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1154,8 +1175,9 @@ msgid "Uncoded languages"
 msgstr "Lingaedjes zandè"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "Mon-Xhmer (ôtes)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Lingaedjes krou"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1226,7 +1248,8 @@ msgid "Nahuatl languages"
 msgstr "Lingaedjes nawatl"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "Amerindyin d' Amerike bijhrece (ôtes)"
 
 #. name for nap
@@ -1270,7 +1293,8 @@ msgid "Nias"
 msgstr "Nias"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "Nidjer-Kordofanyin (ôtes)"
 
 #. name for niu
@@ -1367,8 +1391,9 @@ msgid "Otomian languages"
 msgstr "Lingaedjes otomyins"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "Papouwazyin (ôtes)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Lingaedjes maya"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1403,8 +1428,9 @@ msgid "Persian"
 msgstr "Farsi"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "Filipin (ôtes)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Multipes lingaedjes"
 
 #. name for phn
 msgid "Phoenician"
@@ -1462,8 +1488,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "Rarotongyin; Mawori d' l' Iye Cook"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "Roman (ôtes)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "Lingaedjes otomyins"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1502,7 +1529,8 @@ msgid "Yakut"
 msgstr "Yakoute"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "Amerindyins d' Amerike nonnrece (ôtes)"
 
 #. name for sal
@@ -1538,8 +1566,9 @@ msgid "Selkup"
 msgstr "Selkup"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "Semitike (ôtes)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Lingaedjes xhamitikes"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1566,12 +1595,14 @@ msgid "Siouan languages"
 msgstr "Lingaedjes siwouan"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "Sino-Tibetin (ôtes)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Lingaedjes siwouan"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "Eslåve (ôtes)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Lingaedjes xhamitikes"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1590,8 +1621,9 @@ msgid "Northern Sami"
 msgstr "Såmi bijhrece"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "Lingaedjes såmi (ôtes)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "Lingaedjes xhamitikes"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1658,8 +1690,9 @@ msgid "Serer"
 msgstr "Serer"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "Nilo-Sara (ôtes)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Lingaedjes salishan"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1702,8 +1735,9 @@ msgid "Tahitian"
 msgstr "Tahityin"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "Tay (ôtes)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "Lingaedjes toupi"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1814,8 +1848,9 @@ msgid "Turkish"
 msgstr "Turk"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "Altayike (ôtes)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Lingaedjes apache"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/xh.po b/iso_639/xh.po
index f093a4d..69ff133 100644
--- a/iso_639/xh.po
+++ b/iso_639/xh.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2001-12-10 14:55SAST\n"
 "Last-Translator: Antoinette Dekeni <antoinette at translate.org.za>\n"
 "Language-Team: Xhosa <xhosa at translate.org.za>\n"
@@ -49,8 +49,9 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "isiBosnian"
 
 #. name for afh
 msgid "Afrihili"
@@ -135,8 +136,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "isiBosnian"
 
 #. name for arw
 msgid "Arawak"
@@ -214,8 +216,9 @@ msgid "Basa"
 msgstr "isiBasque"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "isiBosnian"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -235,8 +238,9 @@ msgid "Bengali"
 msgstr ""
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "isiMaori"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -265,8 +269,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "isiBosnian"
 
 #. name for bos, bs
 #, fuzzy
@@ -313,8 +318,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "isi-Ukranian"
 
 #. name for car
 #, fuzzy
@@ -326,16 +332,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "isiBosnian"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "isiBosnian"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -416,15 +424,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -437,7 +445,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -445,8 +453,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "isiTurkish"
 
 #. name for ces, cs
 msgid "Czech"
@@ -495,8 +504,9 @@ msgid "Dogri"
 msgstr "isiMaori"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "isiBosnian"
 
 #. name for dsb
 #, fuzzy
@@ -590,8 +600,9 @@ msgid "Finnish"
 msgstr "isiFinnish"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "isiMaori"
 
 #. name for fon
 msgid "Fon"
@@ -646,8 +657,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "isiMaori"
 
 #. name for kat, ka
 #, fuzzy
@@ -844,16 +856,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "isiMaori"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "isiBosnian"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "isiMaori"
 
 #. name for inh
 #, fuzzy
@@ -865,8 +879,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "isiBosnian"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -955,8 +970,9 @@ msgid "Khasi"
 msgstr "isiThai"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "isiMaori"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1170,8 +1186,9 @@ msgid "Maori"
 msgstr "isiMaori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "isiMaori"
 
 #. name for mar, mr
 #, fuzzy
@@ -1217,8 +1234,9 @@ msgid "Uncoded languages"
 msgstr "isiMaori"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "isiTurkish"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1297,7 +1315,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "isi-Ukranian"
 
 #. name for nap
@@ -1343,8 +1361,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "isiMaori"
 
 #. name for niu
 msgid "Niuean"
@@ -1444,8 +1463,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "isiBosnian"
 
 #. name for pag
 #, fuzzy
@@ -1482,8 +1502,9 @@ msgid "Persian"
 msgstr "isi-Ukranian"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "isiMaori"
 
 #. name for phn
 #, fuzzy
@@ -1541,8 +1562,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "isiMaori"
 
 #. name for roh, rm
 #, fuzzy
@@ -1583,8 +1605,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "isi-Ukranian"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1620,8 +1643,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "isiBosnian"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1649,12 +1673,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "isiMaori"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "isiBosnian"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1673,8 +1699,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "isiBosnian"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1746,8 +1773,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "isiMaori"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1793,8 +1821,9 @@ msgid "Tahitian"
 msgstr "isiLatvian"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "isiBosnian"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1910,8 +1939,9 @@ msgid "Turkish"
 msgstr "isiTurkish"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "isiBosnian"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/zh_CN.po b/iso_639/zh_CN.po
index 71f9e08..2244678 100644
--- a/iso_639/zh_CN.po
+++ b/iso_639/zh_CN.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2008-11-04 23:35+0800\n"
 "Last-Translator: LI Daobing <lidaobing at gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn at lists."
@@ -46,8 +46,9 @@ msgid "Adyghe; Adygei"
 msgstr "阿迪格语"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "亚非诸语言 (其他)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "阿帕切诸语言"
 
 #. name for afh
 msgid "Afrihili"
@@ -126,8 +127,9 @@ msgid "Arapaho"
 msgstr "阿拉帕霍语"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "人工语言 (其他)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "奥托米诸语言"
 
 #. name for arw
 msgid "Arawak"
@@ -202,8 +204,9 @@ msgid "Basa"
 msgstr "巴萨语"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "波罗的诸语言 (其他)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "巴塔克语 (印度尼西亚)"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -222,8 +225,9 @@ msgid "Bengali"
 msgstr "孟加拉语"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "柏柏尔语"
+#, fuzzy
+msgid "Berber languages"
+msgstr "克伦语"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -250,8 +254,9 @@ msgid "Siksika"
 msgstr "西克西卡语"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "班图诸语言 (其他)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "班达语"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -294,7 +299,8 @@ msgid "Caddo"
 msgstr "卡多语"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "中美洲印第安诸语言 (其他)"
 
 #. name for car
@@ -306,16 +312,18 @@ msgid "Catalan; Valencian"
 msgstr "加泰罗尼亚语"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "高加索诸语言 (其他)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "瓦卡什诸语言"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "宿务语"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "凯尔特诸语言 (其他)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "占语诸语言"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -392,15 +400,18 @@ msgid "Corsican"
 msgstr "科西嘉语"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "英语克里奥尔混合语 (其他)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "法语克里奥尔混合语 (其他)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "葡萄牙语克里奥尔混合语 (其他)"
 
 #. name for cre, cr
@@ -412,7 +423,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "克里米亚鞑靼语"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "克里奥尔混合语 (其他)"
 
 #. name for csb
@@ -420,8 +432,9 @@ msgid "Kashubian"
 msgstr "卡舒比语"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "库施特诸语言 (其他)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "占语诸语言"
 
 #. name for ces, cs
 msgid "Czech"
@@ -468,8 +481,9 @@ msgid "Dogri"
 msgstr "多格拉语"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "达罗毗荼诸语言 (其他)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "索布诸语言"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -560,8 +574,9 @@ msgid "Finnish"
 msgstr "芬兰语"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "芬兰-乌戈尔诸语言 (其他)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "索布诸语言"
 
 #. name for fon
 msgid "Fon"
@@ -612,8 +627,9 @@ msgid "Gbaya"
 msgstr "巴亚语"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "日尔曼诸语言 (其他)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "占语诸语言"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -800,16 +816,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "拉丁国际语"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "印度诸语言 (其他)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "班达语"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "印尼语"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "印欧诸语言 (其他)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "易洛魁语"
 
 #. name for inh
 msgid "Ingush"
@@ -820,8 +838,9 @@ msgid "Inupiaq"
 msgstr "依努庇克语"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "伊朗诸语言 (其他)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "易洛魁语"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -904,8 +923,9 @@ msgid "Khasi"
 msgstr "卡西语"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "科伊桑诸语言 (其他)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "奥托米诸语言"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1104,8 +1124,9 @@ msgid "Maori"
 msgstr "毛利语"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "澳斯特罗尼西亚诸语言 (其他)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "澳大利亚诸语言"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1148,8 +1169,9 @@ msgid "Uncoded languages"
 msgstr "未编码语言"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "孟-高棉诸语言 (其他)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "克鲁语"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1220,7 +1242,8 @@ msgid "Nahuatl languages"
 msgstr "纳瓦特尔语"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "北美洲土著诸语言 (其他)"
 
 #. name for nap
@@ -1264,7 +1287,8 @@ msgid "Nias"
 msgstr "尼亚斯语"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "尼日尔-科尔多凡诸语言 (其他)"
 
 #. name for niu
@@ -1360,8 +1384,9 @@ msgid "Otomian languages"
 msgstr "奥托米诸语言"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "巴布亚诸语言 (其他)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "玛雅诸语言"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1396,8 +1421,9 @@ msgid "Persian"
 msgstr "波斯语"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "菲律宾诸语言 (其他)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "多语种"
 
 #. name for phn
 msgid "Phoenician"
@@ -1452,8 +1478,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "拉罗汤加语"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "罗曼诸语言 (其他)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "奥托米诸语言"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1492,7 +1519,8 @@ msgid "Yakut"
 msgstr "雅库特语"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "南美洲土著诸语言 (其他)"
 
 #. name for sal
@@ -1528,8 +1556,9 @@ msgid "Selkup"
 msgstr "塞尔库普语"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "闪语诸语言 (其他)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "占语诸语言"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1556,12 +1585,14 @@ msgid "Siouan languages"
 msgstr "苏语诸语言"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "汉藏诸语言 (其他)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "苏语诸语言"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "斯拉夫诸语言 (其他)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "占语诸语言"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1580,8 +1611,9 @@ msgid "Northern Sami"
 msgstr "北萨莫斯语"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "萨莫斯诸语言 (其他)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "占语诸语言"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1648,8 +1680,9 @@ msgid "Serer"
 msgstr "塞雷尔语"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "尼罗-撒哈拉诸语言 (其他)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "萨利什诸语言"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1692,8 +1725,9 @@ msgid "Tahitian"
 msgstr "塔希提语"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "傣语诸语言 (其他)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "图皮语诸语言"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1804,8 +1838,9 @@ msgid "Turkish"
 msgstr "土耳其语"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "阿尔泰诸语言 (其他)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "阿帕切诸语言"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/zh_HK.po b/iso_639/zh_HK.po
index 730362e..abd7c2f 100644
--- a/iso_639/zh_HK.po
+++ b/iso_639/zh_HK.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2007-09-05 20:47+0800\n"
 "Last-Translator: Abel Cheung <abelcheung at gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community at linuxhall.org>\n"
@@ -49,8 +49,9 @@ msgid "Adyghe; Adygei"
 msgstr "阿迪格語"
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
-msgstr "亞非諸語言 (其他)"
+#, fuzzy
+msgid "Afro-Asiatic languages"
+msgstr "阿帕切諸語言"
 
 #. name for afh
 msgid "Afrihili"
@@ -130,8 +131,9 @@ msgid "Arapaho"
 msgstr "阿拉帕霍語"
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr "人工語言 (其他)"
+#, fuzzy
+msgid "Artificial languages"
+msgstr "奧托米諸語言"
 
 #. name for arw
 msgid "Arawak"
@@ -206,8 +208,9 @@ msgid "Basa"
 msgstr "巴薩語"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr "波羅的諸語言 (其他)"
+#, fuzzy
+msgid "Baltic languages"
+msgstr "巴塔克語"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -226,8 +229,9 @@ msgid "Bengali"
 msgstr "孟加拉語"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr "柏柏爾語"
+#, fuzzy
+msgid "Berber languages"
+msgstr "克倫語"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -254,8 +258,9 @@ msgid "Siksika"
 msgstr "西克西卡語"
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr "班圖諸語言 (其他)"
+#, fuzzy
+msgid "Bantu languages"
+msgstr "班達語"
 
 #. name for bos, bs
 msgid "Bosnian"
@@ -298,7 +303,8 @@ msgid "Caddo"
 msgstr "卡多語"
 
 #. name for cai
-msgid "Central American Indian (Other)"
+#, fuzzy
+msgid "Central American Indian languages"
 msgstr "中美洲印第安諸語言 (其他)"
 
 #. name for car
@@ -310,16 +316,18 @@ msgid "Catalan; Valencian"
 msgstr "加泰羅尼亞語"
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr "高加索諸語言 (其他)"
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "瓦卡什諸語言"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr "宿霧語"
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr "塞爾特諸語言 (其他)"
+#, fuzzy
+msgid "Celtic languages"
+msgstr "占語諸語言"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -396,15 +404,18 @@ msgid "Corsican"
 msgstr "科西嘉語"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, English based"
 msgstr "英語克里奧爾混合語 (其他)"
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, French-based"
 msgstr "法語克里奧爾混合語 (其他)"
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+#, fuzzy
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr "葡萄牙語克里奧爾混合語 (其他)"
 
 #. name for cre, cr
@@ -416,7 +427,8 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr "克里米亞韃靼語"
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+#, fuzzy
+msgid "Creoles and pidgins"
 msgstr "克里奧爾混合語 (其他)"
 
 #. name for csb
@@ -424,8 +436,9 @@ msgid "Kashubian"
 msgstr "卡舒比語"
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr "庫施特諸語言 (其他)"
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "占語諸語言"
 
 #. name for ces, cs
 msgid "Czech"
@@ -472,8 +485,9 @@ msgid "Dogri"
 msgstr "多格拉語"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr "達羅毗荼諸語言 (其他)"
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "索布諸語言"
 
 #. name for dsb
 msgid "Lower Sorbian"
@@ -564,8 +578,9 @@ msgid "Finnish"
 msgstr "芬蘭語"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr "芬蘭-烏戈爾諸語言 (其他)"
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "索布諸語言"
 
 #. name for fon
 msgid "Fon"
@@ -616,8 +631,9 @@ msgid "Gbaya"
 msgstr "巴亞語"
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr "日爾曼諸語言 (其他)"
+#, fuzzy
+msgid "Germanic languages"
+msgstr "占語諸語言"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -807,16 +823,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "拉丁國際語"
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr "印度諸語言 (其他)"
+#, fuzzy
+msgid "Indic languages"
+msgstr "班達語"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "印尼語"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr "印歐諸語言 (其他)"
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "易洛魁語"
 
 #. name for inh
 msgid "Ingush"
@@ -827,8 +845,9 @@ msgid "Inupiaq"
 msgstr "依努庇克語"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr "伊朗諸語言 (其他)"
+#, fuzzy
+msgid "Iranian languages"
+msgstr "易洛魁語"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -911,8 +930,9 @@ msgid "Khasi"
 msgstr "卡西語"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr "科伊桑諸語言 (其他)"
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "奧托米諸語言"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1112,8 +1132,9 @@ msgid "Maori"
 msgstr "毛利語"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr "澳斯特羅尼西亞諸語言 (其他)"
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "澳大利亞諸語言"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1157,8 +1178,9 @@ msgid "Uncoded languages"
 msgstr "贊德語"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr "孟-高棉諸語言 (其他)"
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "克魯語"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1229,7 +1251,8 @@ msgid "Nahuatl languages"
 msgstr "納瓦特爾語"
 
 #. name for nai
-msgid "North American Indian"
+#, fuzzy
+msgid "North American Indian languages"
 msgstr "北美洲土著諸語言 (其他)"
 
 #. name for nap
@@ -1273,7 +1296,8 @@ msgid "Nias"
 msgstr "尼亞斯語"
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
+#, fuzzy
+msgid "Niger-Kordofanian languages"
 msgstr "尼日爾-科爾多凡諸語言 (其他)"
 
 #. name for niu
@@ -1370,8 +1394,9 @@ msgid "Otomian languages"
 msgstr "奧托米諸語言"
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr "巴布亞諸語言 (其他)"
+#, fuzzy
+msgid "Papuan languages"
+msgstr "瑪雅諸語言"
 
 #. name for pag
 msgid "Pangasinan"
@@ -1406,8 +1431,9 @@ msgid "Persian"
 msgstr "波斯語"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr "菲律賓諸語言 (其他)"
+#, fuzzy
+msgid "Philippine languages"
+msgstr "多語種"
 
 #. name for phn
 msgid "Phoenician"
@@ -1465,8 +1491,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr "拉羅湯加語"
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr "羅曼諸語言 (其他)"
+#, fuzzy
+msgid "Romance languages"
+msgstr "奧托米諸語言"
 
 #. name for roh, rm
 msgid "Romansh"
@@ -1505,7 +1532,8 @@ msgid "Yakut"
 msgstr "雅庫特語"
 
 #. name for sai
-msgid "South American Indian (Other)"
+#, fuzzy
+msgid "South American Indian languages"
 msgstr "南美洲土著諸語言 (其他)"
 
 #. name for sal
@@ -1541,8 +1569,9 @@ msgid "Selkup"
 msgstr "塞爾庫普語"
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr "閃語諸語言 (其他)"
+#, fuzzy
+msgid "Semitic languages"
+msgstr "占語諸語言"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1569,12 +1598,14 @@ msgid "Siouan languages"
 msgstr "蘇語諸語言"
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr "漢藏諸語言 (其他)"
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "蘇語諸語言"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr "斯拉夫諸語言 (其他)"
+#, fuzzy
+msgid "Slavic languages"
+msgstr "占語諸語言"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1593,8 +1624,9 @@ msgid "Northern Sami"
 msgstr "北薩莫斯語"
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr "薩莫斯諸語言 (其他)"
+#, fuzzy
+msgid "Sami languages"
+msgstr "占語諸語言"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1661,8 +1693,9 @@ msgid "Serer"
 msgstr "塞雷爾語"
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr "尼羅-撒哈拉諸語言 (其他)"
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "薩利什諸語言"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1705,8 +1738,9 @@ msgid "Tahitian"
 msgstr "塔希提語"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr "傣語諸語言 (其他)"
+#, fuzzy
+msgid "Tai languages"
+msgstr "圖皮語諸語言"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1817,8 +1851,9 @@ msgid "Turkish"
 msgstr "土耳其語"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr "阿爾泰諸語言 (其他)"
+#, fuzzy
+msgid "Altaic languages"
+msgstr "阿帕切諸語言"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/zh_TW.po b/iso_639/zh_TW.po
index 4d2f3ef..a291e9f 100644
--- a/iso_639/zh_TW.po
+++ b/iso_639/zh_TW.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2001-11-27 12:07+0800\n"
 "Last-Translator: Joe Man <trmetal at yahoo.com.hk>\n"
 "Language-Team: Traditional Chinese <zh-l10n at linux.org.tw>\n"
@@ -46,7 +46,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -131,8 +131,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "韓國"
 
 #. name for arw
 msgid "Arawak"
@@ -210,8 +211,9 @@ msgid "Basa"
 msgstr "暫停"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "韓國"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -231,8 +233,9 @@ msgid "Bengali"
 msgstr "波羅的海"
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "韓國"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -261,8 +264,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "韓國"
 
 #. name for bos, bs
 #, fuzzy
@@ -308,8 +312,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "烏黑蘭文"
 
 #. name for car
 #, fuzzy
@@ -321,16 +326,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "韓國"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "韓國"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -411,15 +418,15 @@ msgid "Corsican"
 msgstr ""
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -432,7 +439,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -440,8 +447,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "韓國"
 
 #. name for ces, cs
 msgid "Czech"
@@ -490,8 +498,9 @@ msgid "Dogri"
 msgstr "邊界"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "韓國"
 
 #. name for dsb
 #, fuzzy
@@ -584,8 +593,9 @@ msgid "Finnish"
 msgstr "芬蘭文"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "韓國"
 
 #. name for fon
 msgid "Fon"
@@ -640,8 +650,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "韓國"
 
 #. name for kat, ka
 msgid "Georgian"
@@ -843,16 +854,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "韓國"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "印尼文"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "韓國"
 
 #. name for inh
 #, fuzzy
@@ -865,8 +878,9 @@ msgid "Inupiaq"
 msgstr "印度"
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "韓國"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -955,8 +969,9 @@ msgid "Khasi"
 msgstr "泰國"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "韓國"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1168,8 +1183,9 @@ msgid "Maori"
 msgstr "邊界"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "韓國"
 
 #. name for mar, mr
 msgid "Marathi"
@@ -1215,8 +1231,9 @@ msgid "Uncoded languages"
 msgstr "韓國"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "韓國"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1295,7 +1312,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "烏黑蘭文"
 
 #. name for nap
@@ -1341,8 +1358,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "韓國"
 
 #. name for niu
 msgid "Niuean"
@@ -1441,8 +1459,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "韓國"
 
 #. name for pag
 #, fuzzy
@@ -1479,8 +1498,9 @@ msgid "Persian"
 msgstr "列印"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "韓國"
 
 #. name for phn
 #, fuzzy
@@ -1538,8 +1558,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "韓國"
 
 #. name for roh, rm
 #, fuzzy
@@ -1580,8 +1601,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "烏黑蘭文"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1620,8 +1642,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "韓國"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1649,12 +1672,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "韓國"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "韓國"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1673,8 +1698,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "韓國"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1745,8 +1771,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "韓國"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1792,8 +1819,9 @@ msgid "Tahitian"
 msgstr "拉脫維亞文"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "韓國"
 
 #. name for tam, ta
 #, fuzzy
@@ -1909,8 +1937,9 @@ msgid "Turkish"
 msgstr "土耳其"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "韓國"
 
 #. name for tvl
 msgid "Tuvalu"
diff --git a/iso_639/zu.po b/iso_639/zu.po
index 76e5ad7..e383530 100644
--- a/iso_639/zu.po
+++ b/iso_639/zu.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iso_639 3.5\n"
+"Project-Id-Version: iso_639 3.6\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
 "debian.org>\n"
-"POT-Creation-Date: 2008-10-22 19:30+0200\n"
+"POT-Creation-Date: 2009-03-04 22:21+0100\n"
 "PO-Revision-Date: 2001-12-11 13:58SAST\n"
 "Last-Translator: Thobile Mhlongo <thobile at translate.org.za>\n"
 "Language-Team: Zulu <zulu at translate.org.za>\n"
@@ -49,7 +49,7 @@ msgid "Adyghe; Adygei"
 msgstr ""
 
 #. name for afa
-msgid "Afro-Asiatic (Other)"
+msgid "Afro-Asiatic languages"
 msgstr ""
 
 #. name for afh
@@ -135,8 +135,9 @@ msgid "Arapaho"
 msgstr ""
 
 #. name for art
-msgid "Artificial (Other)"
-msgstr ""
+#, fuzzy
+msgid "Artificial languages"
+msgstr "Isi-Koreyani"
 
 #. name for arw
 msgid "Arawak"
@@ -214,8 +215,9 @@ msgid "Basa"
 msgstr "Isi-Basque"
 
 #. name for bat
-msgid "Baltic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Baltic languages"
+msgstr "Isi-Koreyani"
 
 #. name for bej
 msgid "Beja; Bedawiyet"
@@ -235,8 +237,9 @@ msgid "Bengali"
 msgstr ""
 
 #. name for ber
-msgid "Berber (Other)"
-msgstr ""
+#, fuzzy
+msgid "Berber languages"
+msgstr "Isi-Koreyani"
 
 #. name for bho
 msgid "Bhojpuri"
@@ -265,8 +268,9 @@ msgid "Siksika"
 msgstr ""
 
 #. name for bnt
-msgid "Bantu (Other)"
-msgstr ""
+#, fuzzy
+msgid "Bantu languages"
+msgstr "Isi-Koreyani"
 
 #. name for bos, bs
 #, fuzzy
@@ -312,8 +316,9 @@ msgid "Caddo"
 msgstr ""
 
 #. name for cai
-msgid "Central American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Central American Indian languages"
+msgstr "Isi-Ukraniyani"
 
 #. name for car
 #, fuzzy
@@ -325,16 +330,18 @@ msgid "Catalan; Valencian"
 msgstr ""
 
 #. name for cau
-msgid "Caucasian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Caucasian languages"
+msgstr "Isi-Koreyani"
 
 #. name for ceb
 msgid "Cebuano"
 msgstr ""
 
 #. name for cel
-msgid "Celtic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Celtic languages"
+msgstr "Isi-Koreyani"
 
 #. name for cha, ch
 msgid "Chamorro"
@@ -416,15 +423,15 @@ msgid "Corsican"
 msgstr "Isi-Bosniyani"
 
 #. name for cpe
-msgid "Creoles and pidgins, English based (Other)"
+msgid "Creoles and pidgins, English based"
 msgstr ""
 
 #. name for cpf
-msgid "Creoles and pidgins, French-based (Other)"
+msgid "Creoles and pidgins, French-based"
 msgstr ""
 
 #. name for cpp
-msgid "Creoles and pidgins, Portuguese-based (Other)"
+msgid "Creoles and pidgins, Portuguese-based"
 msgstr ""
 
 #. name for cre, cr
@@ -437,7 +444,7 @@ msgid "Crimean Tatar; Crimean Turkish"
 msgstr ""
 
 #. name for crp
-msgid "Creoles and pidgins (Other)"
+msgid "Creoles and pidgins"
 msgstr ""
 
 #. name for csb
@@ -445,8 +452,9 @@ msgid "Kashubian"
 msgstr ""
 
 #. name for cus
-msgid "Cushitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Cushitic languages"
+msgstr "Isi-Koreyani"
 
 #. name for ces, cs
 msgid "Czech"
@@ -495,8 +503,9 @@ msgid "Dogri"
 msgstr "Isi-Mawori"
 
 #. name for dra
-msgid "Dravidian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Dravidian languages"
+msgstr "Isi-Koreyani"
 
 #. name for dsb
 #, fuzzy
@@ -590,8 +599,9 @@ msgid "Finnish"
 msgstr "Isi-Finishi"
 
 #. name for fiu
-msgid "Finno-Ugrian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Finno-Ugrian languages"
+msgstr "Isi-Koreyani"
 
 #. name for fon
 msgid "Fon"
@@ -646,8 +656,9 @@ msgid "Gbaya"
 msgstr ""
 
 #. name for gem
-msgid "Germanic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Germanic languages"
+msgstr "Isi-Koreyani"
 
 #. name for kat, ka
 #, fuzzy
@@ -844,16 +855,18 @@ msgid "Interlingua (International Auxiliary Language Association)"
 msgstr ""
 
 #. name for inc
-msgid "Indic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indic languages"
+msgstr "Isi-Koreyani"
 
 #. name for ind, id
 msgid "Indonesian"
 msgstr "Indoneshiya"
 
 #. name for ine
-msgid "Indo-European (Other)"
-msgstr ""
+#, fuzzy
+msgid "Indo-European languages"
+msgstr "Isi-Koreyani"
 
 #. name for inh
 #, fuzzy
@@ -865,8 +878,9 @@ msgid "Inupiaq"
 msgstr ""
 
 #. name for ira
-msgid "Iranian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Iranian languages"
+msgstr "Isi-Koreyani"
 
 #. name for iro
 msgid "Iroquoian languages"
@@ -955,8 +969,9 @@ msgid "Khasi"
 msgstr "Isi-Thayi"
 
 #. name for khi
-msgid "Khoisan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Khoisan languages"
+msgstr "Isi-Koreyani"
 
 #. name for khm, km
 msgid "Central Khmer"
@@ -1169,8 +1184,9 @@ msgid "Maori"
 msgstr "Isi-Mawori"
 
 #. name for map
-msgid "Austronesian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Austronesian languages"
+msgstr "Isi-Koreyani"
 
 #. name for mar, mr
 #, fuzzy
@@ -1216,8 +1232,9 @@ msgid "Uncoded languages"
 msgstr "Isi-Koreyani"
 
 #. name for mkh
-msgid "Mon-Khmer (Other)"
-msgstr ""
+#, fuzzy
+msgid "Mon-Khmer languages"
+msgstr "Isi-Koreyani"
 
 #. name for mlg, mg
 msgid "Malagasy"
@@ -1296,7 +1313,7 @@ msgstr ""
 
 #. name for nai
 #, fuzzy
-msgid "North American Indian"
+msgid "North American Indian languages"
 msgstr "Isi-Ukraniyani"
 
 #. name for nap
@@ -1341,8 +1358,9 @@ msgid "Nias"
 msgstr ""
 
 #. name for nic
-msgid "Niger-Kordofanian (Other)"
-msgstr ""
+#, fuzzy
+msgid "Niger-Kordofanian languages"
+msgstr "Isi-Koreyani"
 
 #. name for niu
 msgid "Niuean"
@@ -1441,8 +1459,9 @@ msgid "Otomian languages"
 msgstr ""
 
 #. name for paa
-msgid "Papuan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Papuan languages"
+msgstr "Isi-Koreyani"
 
 #. name for pag
 #, fuzzy
@@ -1479,8 +1498,9 @@ msgid "Persian"
 msgstr "Isi-Sebhiyani"
 
 #. name for phi
-msgid "Philippine (Other)"
-msgstr ""
+#, fuzzy
+msgid "Philippine languages"
+msgstr "Isi-Koreyani"
 
 #. name for phn
 #, fuzzy
@@ -1538,8 +1558,9 @@ msgid "Rarotongan; Cook Islands Maori"
 msgstr ""
 
 #. name for roa
-msgid "Romance (Other)"
-msgstr ""
+#, fuzzy
+msgid "Romance languages"
+msgstr "Isi-Koreyani"
 
 #. name for roh, rm
 #, fuzzy
@@ -1580,8 +1601,9 @@ msgid "Yakut"
 msgstr ""
 
 #. name for sai
-msgid "South American Indian (Other)"
-msgstr ""
+#, fuzzy
+msgid "South American Indian languages"
+msgstr "Isi-Ukraniyani"
 
 #. name for sal
 msgid "Salishan languages"
@@ -1617,8 +1639,9 @@ msgid "Selkup"
 msgstr ""
 
 #. name for sem
-msgid "Semitic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Semitic languages"
+msgstr "Isi-Koreyani"
 
 #. name for sga
 msgid "Irish, Old (to 900)"
@@ -1647,12 +1670,14 @@ msgid "Siouan languages"
 msgstr ""
 
 #. name for sit
-msgid "Sino-Tibetan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sino-Tibetan languages"
+msgstr "Isi-Koreyani"
 
 #. name for sla
-msgid "Slavic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Slavic languages"
+msgstr "Isi-Koreyani"
 
 #. name for slk, sk
 msgid "Slovak"
@@ -1671,8 +1696,9 @@ msgid "Northern Sami"
 msgstr ""
 
 #. name for smi
-msgid "Sami languages (Other)"
-msgstr ""
+#, fuzzy
+msgid "Sami languages"
+msgstr "Isi-Koreyani"
 
 #. name for smj
 msgid "Lule Sami"
@@ -1744,8 +1770,9 @@ msgid "Serer"
 msgstr ""
 
 #. name for ssa
-msgid "Nilo-Saharan (Other)"
-msgstr ""
+#, fuzzy
+msgid "Nilo-Saharan languages"
+msgstr "Isi-Koreyani"
 
 #. name for ssw, ss
 msgid "Swati"
@@ -1791,8 +1818,9 @@ msgid "Tahitian"
 msgstr "Isi-Lavithiyani"
 
 #. name for tai
-msgid "Tai (Other)"
-msgstr ""
+#, fuzzy
+msgid "Tai languages"
+msgstr "Isi-Koreyani"
 
 #. name for tam, ta
 msgid "Tamil"
@@ -1907,8 +1935,9 @@ msgid "Turkish"
 msgstr "Isi-Thekishi"
 
 #. name for tut
-msgid "Altaic (Other)"
-msgstr ""
+#, fuzzy
+msgid "Altaic languages"
+msgstr "Isi-Koreyani"
 
 #. name for tvl
 #, fuzzy

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



More information about the Pkg-isocodes-devel mailing list