[SIC/BIC] QLocale: update enums up to CLRD 1.9.1

This patch adds some missing codes (two-letter ones only),
removes an outdated ones, and updates some names.
The legacy language codes are handled in QLocalePrivate::codeToLanguage()
(fortunately, there are only 4 of such codes).

Change-Id: Iff50aecd1c762b6399cd151aebb955f341d366c6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 100 insertions, 34 deletions

diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index b3ff9fa443..8506b9140e 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -126,7 +126,8 @@
     \value AnyLanguage
     \value C The "C" locale is identical in behavior to English/UnitedStates.
     \value Abkhazian
-    \value Afan
+    \value Oromo
+    \value Afan Obsolete, please use Oromo
     \value Afar
     \value Afrikaans
     \value Albanian
@@ -134,24 +135,34 @@
     \value Arabic
     \value Armenian
     \value Assamese
+    \value Avaric
     \value Aymara
     \value Azerbaijani
     \value Bashkir
     \value Basque
     \value Bengali
-    \value Bhutani
+    \value Dzongkha
+    \value Bhutani Obsolete, please use Dzongkha
     \value Bihari
     \value Bislama
     \value Bosnian
+    \value Bodo
     \value Breton
     \value Bulgarian
     \value Burmese
-    \value Byelorussian
-    \value Cambodian
+    \value Belarusian
+    \value Byelorussian Obsolete, please use Belarusian
+    \value Khmer
+    \value Cambodian Obsolete, please use Khmer
     \value Catalan
+    \value Chamorro
+    \value Chechen
     \value Chinese
+    \value Church
+    \value Chuvash
     \value Cornish
     \value Corsican
+    \value Cree
     \value Croatian
     \value Czech
     \value Danish
@@ -161,7 +172,7 @@
     \value Esperanto
     \value Estonian
     \value Faroese
-    \value FijiLanguage
+    \value Fijian
     \value Finnish
     \value French
     \value Frisian
@@ -173,9 +184,12 @@
     \value Greenlandic
     \value Guarani
     \value Gujarati
+    \value Haitian
     \value Hausa
     \value Hebrew
+    \value Herero
     \value Hindi
+    \value HiriMotu
     \value Hungarian
     \value Icelandic
     \value Indonesian
@@ -188,18 +202,27 @@
     \value Japanese
     \value Javanese
     \value Kannada
+    \value Kanuri
     \value Kashmiri
     \value Kazakh
     \value Kinyarwanda
     \value Kirghiz
+    \value Komi
+    \value Kongo
     \value Korean
     \value Kurdish
-    \value Kurundi
-    \value Laothian
+    \value Rundi
+    \value Kurundi Obsolete, please use Rundi
+    \value Kwanyama
+    \value Lao
     \value Latin
     \value Latvian
+    \value Limburgish
     \value Lingala
     \value Lithuanian
+    \value LubaKatanga
+    \value Luxembourgish
+    \value Marshallese
     \value Macedonian
     \value Malagasy
     \value Malay
@@ -208,30 +231,36 @@
     \value Manx
     \value Maori
     \value Marathi
-    \value Moldavian
+    \value Moldavian Obsolete, please use Romanian
     \value Mongolian
     \value NauruLanguage
+    \value Navaho
+    \value Ndonga
     \value Nepali
-    \value Norwegian
-    \value NorwegianBokmal
-    \value Nynorsk Obsolete, please use NorwegianNynorsk
+    \value Norwegian same as NorwegianBokmal
+    \value NorwegianBokmal same as Norwegian
     \value NorwegianNynorsk
     \value Occitan
+    \value Ojibwa
     \value Oriya
+    \value Ossetic
+    \value Pali
     \value Pashto
     \value Persian
     \value Polish
     \value Portuguese
     \value Punjabi
     \value Quechua
-    \value RhaetoRomance
+    \value Romansh
+    \value RhaetoRomance Obsolete, please use Romansh
     \value Romanian
     \value Russian
     \value Samoan
     \value Sangho
     \value Sanskrit
+    \value Sardinian
     \value Serbian
-    \value SerboCroatian
+    \value SerboCroatian Obsolete, please use Serbian
     \value Sesotho
     \value Setswana
     \value Shona
@@ -245,7 +274,8 @@
     \value Sundanese
     \value Swahili
     \value Swedish
-    \value Tagalog
+    \value Tagalog Obsolete, please use Filipino
+    \value Tahitian
     \value Tajik
     \value Tamil
     \value Tatar
@@ -257,13 +287,14 @@
     \value Tsonga
     \value Turkish
     \value Turkmen
-    \value Twi
+    \value Twi Obsolete, please use Akan
     \value Uigur
     \value Ukrainian
     \value Urdu
     \value Uzbek
     \value Vietnamese
     \value Volapuk
+    \value Walloon
     \value Welsh
     \value Wolof
     \value Xhosa
@@ -386,7 +417,7 @@
     \value BouvetIsland
     \value Brazil
     \value BritishIndianOceanTerritory
-    \value BruneiDarussalam
+    \value Brunei
     \value Bulgaria
     \value BurkinaFaso
     \value Burundi
@@ -403,8 +434,10 @@
     \value CocosIslands
     \value Colombia
     \value Comoros
-    \value DemocraticRepublicOfCongo
-    \value PeoplesRepublicOfCongo
+    \value CongoKinshasa
+    \value CongoBrazzaville
+    \value DemocraticRepublicOfCongo Obsolete, please use CongoKinshasa
+    \value PeoplesRepublicOfCongo Obsolete, please use CongoBrazzaville
     \value CookIslands
     \value CostaRica
     \value IvoryCoast
@@ -426,10 +459,9 @@
     \value Ethiopia
     \value FalklandIslands
     \value FaroeIslands
-    \value FijiCountry
+    \value Fiji
     \value Finland
     \value France
-    \value MetropolitanFrance
     \value FrenchGuiana
     \value FrenchPolynesia
     \value FrenchSouthernTerritories
@@ -467,16 +499,18 @@
     \value Kazakhstan
     \value Kenya
     \value Kiribati
-    \value DemocraticRepublicOfKorea
-    \value RepublicOfKorea
+    \value NorthKorea
+    \value SouthKorea
+    \value DemocraticRepublicOfKorea Obsolete, please use NorthKorea
+    \value RepublicOfKorea Obsolete, please use SouthKorea
     \value Kuwait
     \value Kyrgyzstan
-    \value Lao
+    \value Laos
     \value Latvia
     \value Lebanon
     \value Lesotho
     \value Liberia
-    \value LibyanArabJamahiriya
+    \value Libya
     \value Liechtenstein
     \value Lithuania
     \value Luxembourg
@@ -519,7 +553,7 @@
     \value Oman
     \value Pakistan
     \value Palau
-    \value PalestinianTerritory
+    \value PalestinianTerritories
     \value Panama
     \value PapuaNewGuinea
     \value Paraguay
@@ -532,17 +566,17 @@
     \value Qatar
     \value Reunion
     \value Romania
-    \value RussianFederation
+    \value Russia same as RussianFederation
+    \value RussianFederation same as Russia
     \value Rwanda
     \value SaintKittsAndNevis
-    \value StLucia
-    \value StVincentAndTheGrenadines
+    \value SaintLucia
+    \value SaintVincentAndTheGrenadines
     \value Samoa
     \value SanMarino
     \value SaoTomeAndPrincipe
     \value SaudiArabia
     \value Senegal
-    \value SerbiaAndMontenegro
     \value Seychelles
     \value SierraLeone
     \value Singapore
@@ -554,15 +588,16 @@
     \value SouthGeorgiaAndTheSouthSandwichIslands
     \value Spain
     \value SriLanka
-    \value StHelena
-    \value StPierreAndMiquelon
+    \value SaintHelena
+    \value SaintPierreAndMiquelon
     \value Sudan
     \value Suriname
     \value SvalbardAndJanMayenIslands
     \value Swaziland
     \value Sweden
     \value Switzerland
-    \value SyrianArabRepublic
+    \value Syria
+    \value SyrianArabRepublic Obsolete, please use Syria
     \value Taiwan
     \value Tajikistan
     \value Tanzania
@@ -589,11 +624,10 @@
     \value Venezuela
     \value VietNam
     \value BritishVirginIslands
-    \value USVirginIslands
+    \value UnitedStatesVirginIslands
     \value WallisAndFutunaIslands
     \value WesternSahara
     \value Yemen
-    \value Yugoslavia
     \value Zambia
     \value Zimbabwe
     \value Montenegro
@@ -601,6 +635,13 @@
     \value SaintBarthelemy
     \value SaintMartin
     \value LatinAmericaAndTheCaribbean
+    \value AscensionIsland
+    \value AlandIslands
+    \value DiegoGarcia
+    \value CeutaAndMelilla
+    \value IsleOfMan
+    \value Jersey
+    \value TristanDaCunha
     \omitvalue LastCountry
 
     \sa country(), countryToString()
@@ -623,6 +664,31 @@
     \value LatinScript
     \value MongolianScript
     \value TifinaghScript
+    \value ArmenianScript
+    \value BengaliScript
+    \value CherokeeScript
+    \value DevanagariScript
+    \value EthiopicScript
+    \value GeorgianScript
+    \value GreekScript
+    \value GujaratiScript
+    \value HebrewScript
+    \value JapaneseScript
+    \value KhmerScript
+    \value KannadaScript
+    \value KoreanScript
+    \value LaoScript
+    \value MalayalamScript
+    \value MyanmarScript
+    \value OriyaScript
+    \value TamilScript
+    \value TeluguScript
+    \value ThaanaScript
+    \value ThaiScript
+    \value TibetanScript
+    \value SinhalaScript
+    \value SyriacScript
+    \value YiScript
     \omitvalue LastScript
 
     \sa script(), scriptToString(), languageToString()