X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/60876481060ad63e3a2e450d18351e01f850cce6..8b8c77dbf30f70a1e8ade679a62f08e130f959a2:/cc.inc.pl

diff --git a/cc.inc.pl b/cc.inc.pl
index 786655a..8be81c9 100644
--- a/cc.inc.pl
+++ b/cc.inc.pl
@@ -1,6 +1,6 @@
 # perl -MDBIx::Simple -MData::Dump=pp -e 'pp({DBIx::Simple->new("dbi:SQLite:dbname=locale.db")->query("SELECT country.code_alpha2, country.name, continent.name FROM country LEFT JOIN continent ON country.code_alpha2 = continent.country_code ORDER BY country.code_alpha2")->map_arrays(0)})'
 {
-ac => ["Ascension (dependency of Saint Helena)", 'c-oc Xr', 'sh'],
+ac => ["Ascension (dependency of Saint Helena)", 'c-oc Xr', undef, 'sh'],
 ad => ["Andorra", 'c-eu'],
 ae => ["United Arab Emirates", 'c-as'],
 af => ["Afghanistan", 'c-as'],
@@ -48,7 +48,7 @@ cl => ["Chile", 'c-sa'],
 cm => ["Cameroon", 'c-af'],
 cn => ["China", 'c-as'],
 co => ["Colombia", 'c-sa'],
-cp => ["Clipperton (French possession)", 'c-na Xr', 'fr'],
+cp => ["Clipperton (French possession)", 'c-na Xr', undef, 'fr'],
 cr => ["Costa Rica", 'c-na'],
 cu => ["Cuba", 'c-na'],
 cv => ["Cape Verde", 'c-af'],
@@ -58,11 +58,11 @@ cz => ["Czech Republic", 'c-eu'],
 de => ["Germany", 'c-eu'],
 dj => ["Djibouti", 'c-af'],
 dk => ["Denmark", 'c-eu'],
-dg => ["Diego Garcia (British Territory)", 'c-as Xr', 'io'],
+dg => ["Diego Garcia (British Territory)", 'c-as Xr', undef, 'io'],
 dm => ["Dominica", 'c-na'],
 do => ["Dominican Republic", 'c-na'],
 dz => ["Algeria", 'c-af'],
-ea => ["Ceuta and Melilla (Spanish cities outside EU territory)", 'c-af Xr', 'es'],
+ea => ["Ceuta and Melilla (Spanish cities outside EU territory)", 'c-af Xr', undef, 'es'],
 ec => ["Ecuador", 'c-sa'],
 ee => ["Estonia", 'c-eu'],
 eg => ["Egypt", 'c-af'],
@@ -77,7 +77,7 @@ fk => ["Falkland Islands (Malvinas)", 'c-sa'],
 fm => ["Micronesia, Federated States of", 'c-oc'],
 fo => ["Faroe Islands", 'c-oc'],
 fr => ["France", 'c-eu'],
-fx => ["Metropolitan France", 'c-eu Xr', 'fr'],
+fx => ["Metropolitan France", 'c-eu Xr', undef, 'fr'],
 ga => ["Gabon", 'c-af'],
 gb => ["United Kingdom", 'c-eu'],
 gd => ["Grenada", 'c-na'],
@@ -107,7 +107,7 @@ id => ["Indonesia", 'c-as'],
 ie => ["Ireland", 'c-eu'],
 il => ["Israel", 'c-as'],
 in => ["India", 'c-as'],
-io => ["British Indian Ocean Territory", 'c-oc'],
+io => ["British Indian Ocean Territory", 'c-oc', 'Chagos'],
 iq => ["Iraq", 'c-as'],
 ir => ["Iran, Islamic Republic of", 'c-as'],
 is => ["Iceland", 'c-eu'],
@@ -121,12 +121,12 @@ kh => ["Cambodia", 'c-as'],
 ki => ["Kiribati", 'c-oc'],
 km => ["Comoros", 'c-af'],
 kn => ["Saint Kitts and Nevis", 'c-na'],
-kp => ["Korea, Democratic People's Republic of", 'c-as'],
-kr => ["Korea, Republic of", 'c-as'],
+kp => ["Korea, Democratic People's Republic of", 'c-as', "North Korea"],
+kr => ["Korea, Republic of", 'c-as', "South Korea"],
 kw => ["Kuwait", 'c-as'],
 ky => ["Cayman Islands", 'c-oc'],
 kz => ["Kazakhstan", 'c-as'],
-la => ["Lao People's Democratic Republic", 'c-as'],
+la => ["Lao People's Democratic Republic", 'c-as', "Lao"],
 lb => ["Lebanon", 'c-as'],
 lc => ["Saint Lucia", 'c-na'],
 li => ["Liechtenstein", 'c-eu'],
@@ -136,11 +136,11 @@ ls => ["Lesotho", 'c-af'],
 lt => ["Lithuania", 'c-eu'],
 lu => ["Luxembourg", 'c-eu'],
 lv => ["Latvia", 'c-eu'],
-ly => ["Libyan Arab Jamahiriya", 'c-af'],
+ly => ["Libyan Arab Jamahiriya", 'c-af', "Libya"],
 ma => ["Morocco", 'c-af'],
 mc => ["Monaco", 'c-eu'],
 md => ["Moldova, Republic of", 'c-eu'],
-me => ["Republic of Montenegro", 'c-eu'],
+me => ["Montenegro, Republic of", 'c-eu'],
 mg => ["Madagascar", 'c-af'],
 mh => ["Marshall Islands", 'c-oc'],
 mk => ["Macedonia, the Former Yugoslav Republic of", 'c-eu'],
@@ -189,8 +189,8 @@ py => ["Paraguay", 'c-sa'],
 qa => ["Qatar", 'c-as'],
 re => ["Reunion", 'c-oc'],
 ro => ["Romania", 'c-eu'],
-rs => ["Republic of Serbia", 'c-eu'],
-ru => ["Russian Federation", 'c-eu'],
+rs => ["Serbia, Republic of", 'c-eu'],
+ru => ["Russian Federation", 'c-eu', "Russia"],
 rw => ["Rwanda", 'c-af'],
 sa => ["Saudi Arabia", 'c-as'],
 sb => ["Solomon Islands", 'c-oc'],
@@ -231,16 +231,16 @@ tw => ["Taiwan, Province of China", 'c-as'],
 tz => ["Tanzania, United Republic of", 'c-af'],
 ua => ["Ukraine", 'c-eu'],
 ug => ["Uganda", 'c-af'],
-uk => ["(United Kingdom)", 'c-eu Xr', 'gb'],
-um => ["United States Minor Outlying Islands", 'c-na'],
+uk => ["(United Kingdom)", 'c-eu Xr', undef, 'gb'],
+um => ["United States Minor Outlying Islands", 'c-na', 'U.S. isl.'],
 us => ["United States", 'c-na'],
 uy => ["Uruguay", 'c-sa'],
 uz => ["Uzbekistan", 'c-as'],
 va => ["Holy See (Vatican City State)", 'c-eu'],
 vc => ["Saint Vincent and the Grenadines", 'c-na'],
 ve => ["Venezuela", 'c-sa'],
-vg => ["Virgin Islands, British", 'c-na'],
-vi => ["Virgin Islands, U.S.", 'c-na'],
+vg => ["Virgin Islands, British", 'c-na', "British Virgin"],
+vi => ["Virgin Islands, U.S.", 'c-na', "U.S. Virgin"],
 vn => ["Vietnam", 'c-as'],
 vu => ["Vanuatu", 'c-oc'],
 wf => ["Wallis and Futuna", 'c-oc'],