From: Mathieu Lu <mathieu@symbiotic.coop>
Date: Wed, 8 Nov 2023 14:59:25 +0000 (-0500)
Subject: xml/templates/civicrm_state_province.tpl: regroup state/provinces by country
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d2ce7f708c84c00a77654ceb0a4731cf45f7423f;p=civicrm-core.git

xml/templates/civicrm_state_province.tpl: regroup state/provinces by country
---

diff --git a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
index dea5fbd02b..e814ca6ef1 100644
--- a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
+++ b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
@@ -1353,13 +1353,13 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
     $countyID = County::create()->setValues([
       'name' => 'Farnell',
       'abbreviation' => '',
-      'state_province_id' => 1640,
+      'state_province_id:name' => 'New South Wales',
     ])->execute()->first()['id'];
     // What if there are two counties with the same name?
     County::create()->setValues([
       'name' => 'Farnell',
       'abbreviation' => '',
-      'state_province_id' => 1641,
+      'state_province_id:name' => 'Queensland',
     ])->execute()->first()['id'];
 
     $childKey = $this->getRelationships()['Child of']['id'] . '_a_b';
@@ -1408,9 +1408,9 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
     $this->importCSV($csv, $mapper);
     $contacts = $this->getImportedContacts();
     foreach ($contacts as $contact) {
-      $this->assertEquals($countyID, $contact['address'][0]['county_id']);
-      $this->assertEquals(1013, $contact['address'][0]['country_id']);
-      $this->assertEquals(1640, $contact['address'][0]['state_province_id']);
+      $this->assertEquals($countyID, $contact['address_primary.county_id']);
+      $this->assertEquals('Australia', $contact['address_primary.country_id.name']);
+      $this->assertEquals('New South Wales', $contact['address_primary.state_province_id.name']);
     }
     $this->assertCount(2, $contacts);
     $dataSource = $this->getDataSource();
@@ -1644,10 +1644,10 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
     $this->assertCount(1, $contacts['Mum Jones']['im']);
     $this->assertCount(0, $contacts['sis@example.com']['im']);
     $this->assertCount(0, $contacts['Soccer Superstars']['im']);
-    $this->assertCount(1, $contacts['Susie Jones']['address']);
-    $this->assertCount(1, $contacts['Mum Jones']['address']);
-    $this->assertCount(1, $contacts['sis@example.com']['address']);
-    $this->assertCount(1, $contacts['Soccer Superstars']['address']);
+    $this->assertTrue($contacts['Susie Jones']['address_primary.id'] > 0);
+    $this->assertTrue($contacts['Mum Jones']['address_primary.id'] > 0);
+    $this->assertTrue($contacts['sis@example.com']['address_primary.id'] > 0);
+    $this->assertTrue($contacts['Soccer Superstars']['address_primary.id'] > 0);
     $this->assertCount(1, $contacts['Susie Jones']['openid']);
   }
 
@@ -2330,6 +2330,7 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
    */
   public function getImportedContacts(): array {
     return (array) Contact::get()
+      ->addSelect('*', 'address_primary.*', 'address_primary.country_id.name', 'address_primary.state_province_id.name')
       ->addWhere('display_name', 'IN', [
         'Susie Jones',
         'Mum Jones',
@@ -2337,7 +2338,6 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
         'Soccer Superstars',
       ])
       ->addChain('phone', Phone::get()->addWhere('contact_id', '=', '$id'))
-      ->addChain('address', Address::get()->addWhere('contact_id', '=', '$id'))
       ->addChain('website', Website::get()->addWhere('contact_id', '=', '$id'))
       ->addChain('im', IM::get()->addWhere('contact_id', '=', '$id'))
       ->addChain('email', Email::get()->addWhere('contact_id', '=', '$id'))
diff --git a/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php b/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php
index 46b2215435..8b63ffd47c 100644
--- a/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php
@@ -135,7 +135,7 @@ class CRM_Contribute_Form_AdditionalPaymentTest extends CiviUnitTestCase {
       'Total Fee: $100.00',
       'This Payment Amount: $70.00',
       'Billing Name and Address',
-      'Vancouver, AE 1321312',
+      'Vancouver, BC 1321312',
       'Visa',
       '***********1111',
       'Expires: May 2025',
@@ -249,7 +249,7 @@ class CRM_Contribute_Form_AdditionalPaymentTest extends CiviUnitTestCase {
       'Paid By: Credit Card',
       '***********1111',
       'Billing Name and Address',
-      'Vancouver, AE 1321312',
+      'Vancouver, BC 1321312',
       'Expires: May 2025',
 
     ]);
@@ -364,6 +364,11 @@ class CRM_Contribute_Form_AdditionalPaymentTest extends CiviUnitTestCase {
     ];
     if ($mode) {
       $_REQUEST['mode'] = $mode;
+      $stateProvinceBC = \Civi\Api4\StateProvince::get()
+        ->addWhere('abbreviation', '=', 'BC')
+        ->addWhere('country_id', '=', 1039)
+        ->execute()
+        ->single();
       $submitParams += [
         'payment_instrument_id' => array_search('Credit Card', $this->paymentInstruments, TRUE),
         'payment_processor_id' => $this->paymentProcessorID,
@@ -372,7 +377,7 @@ class CRM_Contribute_Form_AdditionalPaymentTest extends CiviUnitTestCase {
         'cvv2' => 234,
         'credit_card_type' => 'Visa',
         'billing_city-5' => 'Vancouver',
-        'billing_state_province_id-5' => 1059,
+        'billing_state_province_id-5' => $stateProvinceBC['id'],
         'billing_postal_code-5' => 1321312,
         'billing_country_id-5' => 1228,
       ];
diff --git a/tests/phpunit/api/v3/AddressTest.php b/tests/phpunit/api/v3/AddressTest.php
index 766dbe5cc1..010c1dc50b 100644
--- a/tests/phpunit/api/v3/AddressTest.php
+++ b/tests/phpunit/api/v3/AddressTest.php
@@ -490,11 +490,18 @@ class api_v3_AddressTest extends CiviUnitTestCase {
     // Now try it in Liberia
     $params = $this->_params;
     $params['sequential'] = 1;
-    // Liberia country id
-    $params['country_id'] = '1122';
+    $params['country_id'] = \Civi\Api4\Country::get()
+      ->addWhere('name', '=', 'Liberia')
+      ->execute()
+      ->single()['id'];
     $params['state_province_id'] = 'Maryland';
     $address2 = $this->callAPISuccess('address', 'create', $params);
-    $this->assertEquals('3497', $address2['values'][0]['state_province_id']);
+    $liberia_maryland_id = \Civi\Api4\StateProvince::get()
+      ->addWhere('country_id', '=', $params['country_id'])
+      ->addWhere('name', '=', 'Maryland')
+      ->execute()
+      ->single()['id'];
+    $this->assertEquals($liberia_maryland_id, $address2['values'][0]['state_province_id']);
   }
 
   public function getSymbolicCountryStateExamples() {
diff --git a/tests/phpunit/api/v4/Entity/ContactJoinTest.php b/tests/phpunit/api/v4/Entity/ContactJoinTest.php
index 4e9811e26c..7c1aa3d4bc 100644
--- a/tests/phpunit/api/v4/Entity/ContactJoinTest.php
+++ b/tests/phpunit/api/v4/Entity/ContactJoinTest.php
@@ -141,12 +141,13 @@ class ContactJoinTest extends Api4TestBase {
       'address_billing.country_id:abbr' => 'NG',
     ]);
     $addr = Address::get(FALSE)
+      ->addSelect('country_id:label', 'state_province_id:label')
       ->addWhere('contact_id', '=', $contact['id'])
-      ->execute();
-    $this->assertCount(1, $addr);
+      ->execute()
+      ->single();
     $this->assertEquals('Hello', $contact['address_billing.city']);
-    $this->assertEquals(3885, $contact['address_billing.state_province_id']);
-    $this->assertEquals(1157, $contact['address_billing.country_id']);
+    $this->assertEquals('Akwa Ibom', $addr['state_province_id:label']);
+    $this->assertEquals('Nigeria', $addr['country_id:label']);
     $emails = Email::get(FALSE)
       ->addWhere('contact_id', '=', $contact['id'])
       ->execute();
diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl
index 11a7458454..dd78965fb3 100644
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -16,6 +16,11 @@
 -- This may change in the future.
 ALTER TABLE civicrm_state_province AUTO_INCREMENT=1000;
 
+-- Note to developers: records are somewhat sorted by country ID
+-- Insert changes directly in the list (keeping the sort), not at the end
+-- All changes must also have a corresponding upgrade statement in
+-- CRM/Upgrade/Incremental/sql/5.xx.alpha1.mysql.tpl
+
 INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1228, "AL", "Alabama"),
 (1228, "AK", "Alaska"),
@@ -122,6 +127,10 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1101, "DL", "Delhi"),
 (1101, "LD", "Lakshadweep"),
 (1101, "PY", "Pondicherry"),
+(1101, "TG", "Telangana"),
+(1101, "DH", "Dādra and Nagar Haveli and Damān and Diu"),
+(1101, "LA", "Ladākh"),
+(1101, "CH", "Chandigarh"),
 -- Note we believe all lower-case is correct for Poland. See https://github.com/civicrm/civicrm-core/pull/17107
 (1172, "MZ", "mazowieckie"),
 (1172, "PM", "pomorskie"),
@@ -226,6 +235,13 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1011, "SU", "Syunik\'"),
 (1011, "TV", "Tavus"),
 (1011, "VD", "Vayoc Jor"),
+(1005, "07", "Andorra la Vella"),
+(1005, "02", "Canillo"),
+(1005, "03", "Encamp"),
+(1005, "08", "Escaldes-Engordany"),
+(1005, "04", "La Massana"),
+(1005, "05", "Ordino"),
+(1005, "06", "Sant Julia de Loria"),
 (1006, "BGO", "Bengo"),
 (1006, "BGU", "Benguela"),
 (1006, "BIE", "Bie"),
@@ -244,6 +260,14 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1006, "NAM", "Namibe"),
 (1006, "UIG", "Uige"),
 (1006, "ZAI", "Zaire"),
+(1009, "03", "Saint George"),
+(1009, "04", "Saint John"),
+(1009, "05", "Saint Mary"),
+(1009, "06", "Saint Paul"),
+(1009, "07", "Saint Peter"),
+(1009, "08", "Saint Philip"),
+(1009, "10", "Barbuda"),
+(1009, "11", "Redonda"),
 (1010, "C", "Capital federal"),
 (1010, "B", "Buenos Aires"),
 (1010, "K", "Catamarca"),
@@ -267,6 +291,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1010, "G", "Santiago del Estero"),
 (1010, "V", "Tierra del Fuego"),
 (1010, "T", "Tucuman"),
+(1010, "F", "La Rioja"),
 (1014, "1", "Burgenland"),
 (1014, "2", "Kärnten"),
 (1014, "3", "Niederösterreich"),
@@ -424,6 +449,18 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1017, "60", "Sylhet zila"),
 (1017, "63", "Tangail zila"),
 (1017, "64", "Thakurgaon zila"),
+(1018, "01", "Christ Church"),
+(1018, "02", "Saint Andrew"),
+(1018, "03", "Saint George"),
+(1018, "04", "Saint James"),
+(1018, "05", "Saint John"),
+(1018, "06", "Saint Joseph"),
+(1018, "07", "Saint Lucy"),
+(1018, "08", "Saint Michael"),
+(1018, "09", "Saint Peter"),
+(1018, "10", "Saint Philip"),
+(1018, "11", "Saint Thomas"),
+(1020, "BRU", "Brussels"),
 (1020, "VAN", "Antwerpen"),
 (1020, "WBR", "Brabant Wallon"),
 (1020, "WHT", "Hainaut"),
@@ -434,6 +471,17 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1020, "VOV", "Oost-Vlaanderen"),
 (1020, "VBR", "Vlaams-Brabant"),
 (1020, "VWV", "West-Vlaanderen"),
+(1023, 'DEV', 'Devonshire'),
+(1023, 'HAM', 'Hamilton Parish'),
+(1023, 'HA', 'City of Hamilton'),
+(1023, 'PAG', 'Paget'),
+(1023, 'PEM', 'Pembroke'),
+(1023, 'SG', 'Town of St. George'),
+(1023, 'SGE', 'Saint George\'s'),
+(1023, 'SAN', 'Sandys'),
+(1023, 'SMI', 'Smiths'),
+(1023, 'SOU', 'Southampton'),
+(1023, 'WAR', 'Warwick'),
 (1034, "BAL", "Bale"),
 (1034, "BAM", "Bam"),
 (1034, "BAN", "Banwa"),
@@ -592,6 +640,13 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1212, "MG", "Mayaguana"),
 (1212, "NP", "New Providence"),
 (1212, "RI", "Ragged Island"),
+(1212, "AB", "Abaco Islands"),
+(1212, "AN", "Andros Island"),
+(1212, "BR", "Berry Islands"),
+(1212, "EL", "Eleuthera"),
+(1212, "GB", "Grand Bahama"),
+(1212, "RC", "Rum Cay"),
+(1212, "SS", "San Salvador Island"),
 (1024, "33", "Bumthang"),
 (1024, "12", "Chhukha"),
 (1024, "22", "Dagana"),
@@ -657,6 +712,26 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1042, "OP", "Ouham-Pende"),
 (1042, "SE", "Sangha-Mbaere"),
 (1042, "VR", "Vakaga"),
+(1050, "01", "Kongo central"),
+(1050, "02", "Kwango"),
+(1050, "03", "Kwilu"),
+(1050, "04", "Mai-Ndombe"),
+(1050, "05", "Kasai"),
+(1050, "06", "Lulua"),
+(1050, "07", "Lomami"),
+(1050, "08", "Sankuru"),
+(1050, "09", "Ituri"),
+(1050, "10", "Haut-Uele"),
+(1050, "11", "Tshopo"),
+(1050, "12", "Bas-Uele"),
+(1050, "13", "Nord-Ubangi"),
+(1050, "14", "Mongala"),
+(1050, "15", "Sud-Ubangi"),
+(1050, "16", "Tshuapa"),
+(1050, "17", "Haut-Lomami"),
+(1050, "18", "Lualaba"),
+(1050, "19", "Haut-Katanga"),
+(1050, "20", "Tanganyika"),
 (1051, "BZV", "Brazzaville"),
 (1051, "11", "Bouenza"),
 (1051, "8", "Cuvette"),
@@ -668,6 +743,15 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1051, "14", "Plateaux"),
 (1051, "12", "Pool"),
 (1051, "13", "Sangha"),
+(1080, "01", "Estuaire"),
+(1080, "02", "Haut-Ogooué"),
+(1080, "03", "Moyen-Ogooué"),
+(1080, "04", "Ngounié"),
+(1080, "05", "Nyanga"),
+(1080, "06", "Ogooué-Ivindo"),
+(1080, "07", "Ogooué-Lolo"),
+(1080, "08", "Ogooué-Maritime"),
+(1080, "09", "Woleu-Ntem"),
 (1205, "AG", "Aargau"),
 (1205, "AI", "Appenzell Innerrhoden"),
 (1205, "AR", "Appenzell Ausserrhoden"),
@@ -723,6 +807,8 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1044, "SM", "Santiago Metropolitan"),
 (1044, "TA", "Tarapaca"),
 (1044, "VS", "Valparaiso"),
+(1044, "LR", "Los Rios"),
+(1044, "AP", "Arica y Parinacota"),
 (1038, "AD", "Adamaoua"),
 (1038, "CE", "Centre"),
 (1038, "ES", "East"),
@@ -731,6 +817,8 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1038, "SW", "South"),
 (1038, "SW", "South-West"),
 (1038, "OU", "West"),
+(1038, "LT", "Littoral"),
+(1038, "NW", "Nord-Ouest"),
 (1045, "11", "Beijing"),
 (1045, "50", "Chongqing"),
 (1045, "31", "Shanghai"),
@@ -764,6 +852,11 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1045, "54", "Xizang"),
 (1045, "91", "Hong Kong"),
 (1045, "92", "Macau"),
+(1045, "YN", "Yinchuan"),
+(1045, "SZ", "Shizuishan"),
+(1045, "WZ", "Wuzhong"),
+(1045, "GY", "Guyuan"),
+(1045, "ZW", "Zhongwei"),
 (1048, "DC", "Distrito Capital de Bogotá"),
 (1048, "AMA", "Amazonea"),
 (1048, "ANT", "Antioquia"),
@@ -796,6 +889,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1048, "VAC", "Valle del Cauca"),
 (1048, "VAU", "Vaupés"),
 (1048, "VID", "Vichada"),
+(1048, "HUI", "Huila"),
 (1053, "A", "Alajuela"),
 (1053, "C", "Cartago"),
 (1053, "G", "Guanacaste"),
@@ -860,6 +954,18 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1058, "US", "Ústecký kraj"),
 (1058, "VY", "Vysočina"),
 (1058, "ZL", "Zlínský kraj"),
+(1081, "AB", "Abkhazia"),
+(1081, "AJ", "Adjara"),
+(1081, "TB", "Tbilisi"),
+(1081, "GU", "Guria"),
+(1081, "IM", "Imereti"),
+(1081, "KA", "Kakheti"),
+(1081, "KK", "Kvemo Kartli"),
+(1081, "MM", "Mtskheta-Mtianeti"),
+(1081, "RL", "Racha-Lechkhumi and Kvemo Svaneti"),
+(1081, "SZ", "Samegrelo-Zemo Svaneti"),
+(1081, "SJ", "Samtskhe-Javakheti"),
+(1081, "SK", "Shida Kartli"),
 (1082, "BW", "Baden-Württemberg"),
 (1082, "BY", "Bayern"),
 (1082, "HB", "Bremen"),
@@ -1093,6 +1199,8 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1198, "Z", "Zaragoza"),
 (1198, "CE", "Ceuta"),
 (1198, "ML", "Melilla"),
+(1198, "TO", "Toledo"),
+(1198, "CO", "Córdoba"),
 (1070, "AA", "Addis Ababa"),
 (1070, "DD", "Dire Dawa"),
 (1070, "AF", "Afar"),
@@ -1114,6 +1222,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1074, "N", "Northern"),
 (1074, "W", "Western"),
 (1074, "R", "Rotuma"),
+(1074, "C", "Central"),
 (1141, "TRK", "Chuuk"),
 (1141, "KSA", "Kosrae"),
 (1141, "PNI", "Pohnpei"),
@@ -1212,6 +1321,15 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1076, "88", "Vosges"),
 (1076, "89", "Yonne"),
 (1076, "78", "Yvelines"),
+(1076, "GP", "Guadeloupe"),
+(1076, "MQ", "Martinique"),
+(1076, "GF", "Guyane"),
+(1076, "RE", "La Réunion"),
+(1076, "YT", "Mayotte"),
+(1076, "WF", "Wallis-et-Futuna"),
+(1076, "NC", "Nouvelle-Calédonie"),
+(1076, "52", "Haute-Marne"),
+(1076, "39", "Jura"),
 (1226, "ABE", "Aberdeen City"),
 (1226, "ABD", "Aberdeenshire"),
 (1226, "ANS", "Angus"),
@@ -1295,12 +1413,57 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1226, "WSX", "West Sussex"),
 (1226, "WIL", "Wiltshire"),
 (1226, "WOR", "Worcestershire"),
+(1226, "ANN", "Antrim and Newtownabbey"),
+(1226, "AND", "Ards and North Down"),
+(1226, "ABC", "Armagh City, Banbridge and Craigavon"),
+(1226, "BFS", "Belfast"),
+(1226, "CCG", "Causeway Coast and Glens"),
+(1226, "DRS", "Derry City and Strabane"),
+(1226, "FMO", "Fermanagh and Omagh"),
+(1226, "LBC", "Lisburn and Castlereagh"),
+(1226, "MEA", "Mid and East Antrim"),
+(1226, "MUL", "Mid Ulster"),
+(1226, "NMD", "Newry, Mourne and Down"),
+(1226, "BGE", "Bridgend"),
+(1226, "CAY", "Caerphilly"),
+(1226, "CRF", "Cardiff"),
+(1226, "CMN", "Carmarthenshire"),
+(1226, "CGN", "Ceredigion"),
+(1226, "CWY", "Conwy"),
+(1226, "DEN", "Denbighshire"),
+(1226, "FLN", "Flintshire"),
+(1226, "AGY", "Isle of Anglesey"),
+(1226, "MTY", "Merthyr Tydfil"),
+(1226, "NTL", "Neath Port Talbot"),
+(1226, "NWP", "Newport"),
+(1226, "PEM", "Pembrokeshire"),
+(1226, "RCT", "Rhondda, Cynon, Taff"),
+(1226, "SWA", "Swansea"),
+(1226, "TOF", "Torfaen"),
+(1226, "WRX", "Wrexham"),
+(1226, "MON", "Monmouthshire"),
+(1226, "TWR", "Tyne and Wear"),
+(1226, "GTM", "Greater Manchester"),
+(1226, "TYR", "Co Tyrone"),
+(1226, "WYK", "West Yorkshire"),
+(1226, "SYK", "South Yorkshire"),
+(1226, "MSY", "Merseyside"),
+(1226, "BRK", "Berkshire"),
+(1226, "WMD", "West Midlands"),
+(1226, "WGM", "West Glamorgan"),
+(1226, "LON", "London"),
+(1226, "CWD", "Clwyd"),
+(1226, "SGM", "South Glamorgan"),
 (1083, "AH", "Ashanti"),
 (1083, "BA", "Brong-Ahafo"),
 (1083, "AA", "Greater Accra"),
 (1083, "UE", "Upper East"),
 (1083, "UW", "Upper West"),
 (1083, "TV", "Volta"),
+(1083, "CP", "Central"),
+(1083, "EP", "Eastern"),
+(1083, "NP", "Northern"),
+(1083, "WP", "Western"),
 (1213, "B", "Banjul"),
 (1213, "L", "Lower River"),
 (1213, "M", "MacCarthy Island"),
@@ -1399,6 +1562,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1085, "72", "Xanthi"),
 (1085, "21", "Zakynthos"),
 (1085, "69", "Agio Oros"),
+(1085, "61", "Pieria"),
 (1090, "AV", "Alta Verapaz"),
 (1090, "BV", "Baja Verapaz"),
 (1090, "CM", "Chimaltenango"),
@@ -1457,6 +1621,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1097, "SB", "Santa Barbara"),
 (1097, "VA", "Valle"),
 (1097, "YO", "Yoro"),
+(1097, "LP", "La Paz"),
 (1055, "07", "Bjelovarsko-bilogorska zupanija"),
 (1055, "12", "Brodsko-posavska zupanija"),
 (1055, "19", "Dubrovacko-neretvanska zupanija"),
@@ -1483,6 +1648,10 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1094, "OU", "Ouest"),
 (1094, "SD", "Sud"),
 (1094, "SE", "Sud-Est"),
+(1094, "AR", "Artibonite"),
+(1094, "CE", "Centre"),
+(1094, "NI", "Nippes"),
+(1094, "ND", "Nord"),
 (1099, "BU", "Budapest"),
 (1099, "BK", "Bács-Kiskun"),
 (1099, "BA", "Baranya"),
@@ -1555,6 +1724,9 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1102, "JK", "DKI Jakarta"),
 (1102, "AC", "Aceh"),
 (1102, "YO", "DI Yogyakarta"),
+(1102, "KT", "Kalimantan Tengah"),
+(1102, "SR", "Sulawesi Barat"),
+(1102, "KU", "Kalimantan Utara"),
 (1105, "C", "Cork"),
 (1105, "CE", "Clare"),
 (1105, "CN", "Cavan"),
@@ -1745,6 +1917,13 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1107, "VV", "Vibo Valentia"),
 (1107, "VI", "Vicenza"),
 (1107, "VT", "Viterbo"),
+(1107, "BT", "Barletta-Andria-Trani"),
+(1107, "FM", "Fermo"),
+(1107, "MB", "Monza e Brianza"),
+(1107, "CI", "Carbonia-Iglesias"),
+(1107, "OT", "Olbia-Tempio"),
+(1107, "VS", "Medio Campidano"),
+(1107, "OG", "Ogliastra"),
 (1109, "23", "Aichi"),
 (1109, "05", "Akita"),
 (1109, "02", "Aomori"),
@@ -1817,9 +1996,53 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1110, "JA", "Jarash"),
 (1110, "MN", "Ma\'an"),
 (1110, "MD", "Madaba"),
-
--- CRM-20062 Outdated provinces for Kenya removed .
-
+(1112, "01", "Baringo"),
+(1112, "02", "Bomet"),
+(1112, "03", "Bungoma"),
+(1112, "04", "Busia"),
+(1112, "05", "Elgeyo/Marakwet"),
+(1112, "06", "Embu"),
+(1112, "07", "Garissa"),
+(1112, "08", "Homa Bay"),
+(1112, "09", "Isiolo"),
+(1112, "10", "Kajiado"),
+(1112, "11", "Kakamega"),
+(1112, "12", "Kericho"),
+(1112, "13", "Kiambu"),
+(1112, "14", "Kilifi"),
+(1112, "15", "Kirinyaga"),
+(1112, "16", "Kisii"),
+(1112, "17", "Kisumu"),
+(1112, "18", "Kitui"),
+(1112, "19", "Kwale"),
+(1112, "20", "Laikipia"),
+(1112, "21", "Lamu"),
+(1112, "22", "Machakos"),
+(1112, "23", "Makueni"),
+(1112, "24", "Mandera"),
+(1112, "25", "Marsabit"),
+(1112, "26", "Meru"),
+(1112, "27", "Migori"),
+(1112, "28", "Mombasa"),
+(1112, "29", "Murang'a"),
+(1112, "30", "Nairobi City"),
+(1112, "31", "Nakuru"),
+(1112, "32", "Nandi"),
+(1112, "33", "Narok"),
+(1112, "34", "Nyamira"),
+(1112, "35", "Nyandarua"),
+(1112, "36", "Nyeri"),
+(1112, "37", "Samburu"),
+(1112, "38", "Siaya"),
+(1112, "39", "Taita/Taveta"),
+(1112, "40", "Tana River"),
+(1112, "41", "Tharaka-Nithi"),
+(1112, "42", "Trans Nzoia"),
+(1112, "43", "Turkana"),
+(1112, "44", "Uasin Gishu"),
+(1112, "45", "Vihiga"),
+(1112, "46", "Wajir"),
+(1112, "47", "West Pokot"),
 (1117, "GB", "Bishkek"),
 (1117, "B", "Batken"),
 (1117, "C", "Chu"),
@@ -1887,6 +2110,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1115, "49", "Jejudo"),
 (1115, "45", "Jeonrabugdo"),
 (1115, "46", "Jeonranamdo"),
+(1115, "50", "Sejong"),
 (1116, "AH", "Al Ahmadi"),
 (1116, "FA", "Al Farwanlyah"),
 (1116, "JA", "Al Jahrah"),
@@ -1989,8 +2213,18 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1125, "TE", "Telšių Apskritis"),
 (1125, "UT", "Utenos Apskritis"),
 (1125, "VL", "Vilniaus Apskritis"),
+(1126, "LU", "Luxembourg"),
 (1126, "DI", "Diekirch"),
 (1126, "GR", "Grevenmacher"),
+(1126, 'CA', 'Capellen'),
+(1126, 'CL', 'Clervaux'),
+(1126, 'EC', 'Echternach'),
+(1126, 'ES', 'Esch-sur-Alzette'),
+(1126, 'ME', 'Mersch'),
+(1126, 'RD', 'Redange-sur-Attert'),
+(1126, 'RM', 'Remich'),
+(1126, 'VD', 'Vianden'),
+(1126, 'WI', 'Wiltz'),
 (1119, "DGV", "Daugavpils"),
 (1119, "JEL", "Jelgava"),
 (1119, "JUR", "JÅ«rmala"),
@@ -1998,38 +2232,150 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1119, "REZ", "Rēzekne"),
 (1119, "RIX", "RÄ«ga"),
 (1119, "VEN", "Ventspils"),
-(1123, "AJ", "Ajdābiyā"),
-(1123, "BU", "Al Buţnān"),
-(1123, "HZ", "Al Hizām al Akhdar"),
-(1123, "JA", "Al Jabal al Akhdar"),
-(1123, "JI", "Al Jifārah"),
-(1123, "JU", "Al Jufrah"),
-(1123, "KF", "Al Kufrah"),
-(1123, "MJ", "Al Marj"),
-(1123, "MB", "Al Marqab"),
-(1123, "QT", "Al Qaţrūn"),
-(1123, "QB", "Al Qubbah"),
-(1123, "WA", "Al Wāhah"),
-(1123, "NQ", "An Nuqaţ al Khams"),
-(1123, "SH", "Ash Shāţi\'"),
-(1123, "ZA", "Az Zāwiyah"),
-(1123, "BA", "Banghāzī"),
-(1123, "BW", "Banī Walīd"),
-(1123, "DR", "Darnah"),
-(1123, "GD", "Ghadāmis"),
-(1123, "GR", "Gharyān"),
-(1123, "GT", "Ghāt"),
-(1123, "JB", "Jaghbūb"),
-(1123, "MI", "Mişrātah"),
-(1123, "MZ", "Mizdah"),
-(1123, "MQ", "Murzuq"),
-(1123, "NL", "Nālūt"),
-(1123, "SB", "Sabhā"),
-(1123, "SS", "Şabrātah Şurmān"),
-(1123, "SR", "Surt"),
-(1123, "TN", "Tājūrā\' wa an Nawāhī al Arbāh"),
-(1123, "TB", "Ţarābulus"),
-(1123, "TM", "Tarhūnah-Masallātah"),
+(1119, "002", "Aizkraukles novads"),
+(1119, "038", "Jaunjelgavas novads"),
+(1119, "072", "Pļaviņu novads"),
+(1119, "046", "Kokneses novads"),
+(1119, "065", "Neretas novads"),
+(1119, "092", "Skrīveru novads"),
+(1119, "007", "Alūksnes novads"),
+(1119, "009", "Apes novads"),
+(1119, "015", "Balvu novads"),
+(1119, "108", "Viļakas novads"),
+(1119, "014", "Baltinavas novads"),
+(1119, "082", "Rugāju novads"),
+(1119, "016", "Bauskas novads"),
+(1119, "034", "Iecavas novads"),
+(1119, "083", "Rundāles novads"),
+(1119, "105", "Vecumnieku novads"),
+(1119, "022", "Cēsu novads"),
+(1119, "055", "LÄ«gatnes novads"),
+(1119, "008", "Amatas novads"),
+(1119, "039", "Jaunpiebalgas novads"),
+(1119, "075", "Priekuļu novads"),
+(1119, "070", "Pārgaujas novads"),
+(1119, "076", "Raunas novads"),
+(1119, "104", "Vecpiebalgas novads"),
+(1119, "025", "Daugavpils novads"),
+(1119, "036", "Ilūkstes novads"),
+(1119, "026", "Dobeles novads"),
+(1119, "010", "Auces novads"),
+(1119, "098", "Tērvetes novads"),
+(1119, "033", "Gulbenes novads"),
+(1119, "041", "Jelgavas novads"),
+(1119, "069", "Ozolnieku novads"),
+(1119, "042", "Jēkabpils novads"),
+(1119, "004", "Aknīstes novads"),
+(1119, "107", "Viesītes novads"),
+(1119, "049", "Krustpils novads"),
+(1119, "085", "Salas novads"),
+(1119, "047", "Krāslavas novads"),
+(1119, "024", "Dagdas novads"),
+(1119, "001", "Aglonas novads"),
+(1119, "050", "Kuldīgas novads"),
+(1119, "093", "Skrundas novads"),
+(1119, "006", "Alsungas novads"),
+(1119, "003", "Aizputes novads"),
+(1119, "028", "Durbes novads"),
+(1119, "032", "Grobiņas novads"),
+(1119, "071", "Pāvilostas novads"),
+(1119, "074", "Priekules novads"),
+(1119, "066", "NÄ«cas novads"),
+(1119, "081", "Rucavas novads"),
+(1119, "100", "Vaiņodes novads"),
+(1119, "054", "Limbažu novads"),
+(1119, "005", "Alojas novads"),
+(1119, "086", "Salacgrīvas novads"),
+(1119, "058", "Ludzas novads"),
+(1119, "044", "Kārsavas novads"),
+(1119, "110", "Zilupes novads"),
+(1119, "023", "Ciblas novads"),
+(1119, "059", "Madonas novads"),
+(1119, "021", "Cesvaines novads"),
+(1119, "057", "Lubānas novads"),
+(1119, "102", "Varakļānu novads"),
+(1119, "030", "Ērgļu novads"),
+(1119, "067", "Ogres novads"),
+(1119, "035", "Ikšķiles novads"),
+(1119, "051", "Ķeguma novads"),
+(1119, "053", "Lielvārdes novads"),
+(1119, "073", "Preiļu novads"),
+(1119, "056", "Līvānu novads"),
+(1119, "078", "Riebiņu novads"),
+(1119, "103", "Vārkavas novads"),
+(1119, "077", "Rēzeknes novads"),
+(1119, "109", "Viļānu novads"),
+(1119, "013", "Baldones novads"),
+(1119, "052", "Ķekavas novads"),
+(1119, "068", "Olaines novads"),
+(1119, "087", "Salaspils novads"),
+(1119, "089", "Saulkrastu novads"),
+(1119, "091", "Siguldas novads"),
+(1119, "037", "Inčukalna novads"),
+(1119, "011", "Ādažu novads"),
+(1119, "012", "Babītes novads"),
+(1119, "020", "Carnikavas novads"),
+(1119, "031", "Garkalnes novads"),
+(1119, "048", "Krimuldas novads"),
+(1119, "061", "Mālpils novads"),
+(1119, "062", "Mārupes novads"),
+(1119, "080", "Ropažu novads"),
+(1119, "090", "Sējas novads"),
+(1119, "095", "Stopiņu novads"),
+(1119, "088", "Saldus novads"),
+(1119, "018", "Brocēnu novads"),
+(1119, "097", "Talsu novads"),
+(1119, "027", "Dundagas novads"),
+(1119, "063", "Mērsraga novads"),
+(1119, "079", "Rojas novads"),
+(1119, "099", "Tukuma novads"),
+(1119, "043", "Kandavas novads"),
+(1119, "029", "Engures novads"),
+(1119, "040", "Jaunpils novads"),
+(1119, "101", "Valkas novads"),
+(1119, "094", "Smiltenes novads"),
+(1119, "096", "Strenču novads"),
+(1119, "045", "Kocēnu novads"),
+(1119, "060", "Mazsalacas novads"),
+(1119, "084", "RÅ«jienas novads"),
+(1119, "017", "Beverīnas novads"),
+(1119, "019", "Burtnieku novads"),
+(1119, "064", "Naukšēnu novads"),
+(1119, "106", "Ventspils novads"),
+(1119, "JKB", "Jēkabpils"),
+(1119, "VMR", "Valmiera"),
+(1123, "AJ", "Ajdābiyā"),
+(1123, "BU", "Al Buţnān"),
+(1123, "HZ", "Al Hizām al Akhdar"),
+(1123, "JA", "Al Jabal al Akhdar"),
+(1123, "JI", "Al Jifārah"),
+(1123, "JU", "Al Jufrah"),
+(1123, "KF", "Al Kufrah"),
+(1123, "MJ", "Al Marj"),
+(1123, "MB", "Al Marqab"),
+(1123, "QT", "Al Qaţrūn"),
+(1123, "QB", "Al Qubbah"),
+(1123, "WA", "Al Wāhah"),
+(1123, "NQ", "An Nuqaţ al Khams"),
+(1123, "SH", "Ash Shāţi\'"),
+(1123, "ZA", "Az Zāwiyah"),
+(1123, "BA", "Banghāzī"),
+(1123, "BW", "Banī Walīd"),
+(1123, "DR", "Darnah"),
+(1123, "GD", "Ghadāmis"),
+(1123, "GR", "Gharyān"),
+(1123, "GT", "Ghāt"),
+(1123, "JB", "Jaghbūb"),
+(1123, "MI", "Mişrātah"),
+(1123, "MZ", "Mizdah"),
+(1123, "MQ", "Murzuq"),
+(1123, "NL", "Nālūt"),
+(1123, "SB", "Sabhā"),
+(1123, "SS", "Şabrātah Şurmān"),
+(1123, "SR", "Surt"),
+(1123, "TN", "Tājūrā\' wa an Nawāhī al Arbāh"),
+(1123, "TB", "Ţarābulus"),
+(1123, "TM", "Tarhūnah-Masallātah"),
 (1123, "WD", "Wādī al hayāt"),
 (1123, "YJ", "Yafran-Jādū"),
 (1146, "AGD", "Agadir"),
@@ -2276,6 +2622,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1140, "VER", "Veracruz"),
 (1140, "YUC", "Yucatan"),
 (1140, "ZAC", "Zacatecas"),
+(1140, "DIF", "Distrito Federal"),
 (1131, "14", "Wilayah Persekutuan Kuala Lumpur"),
 (1131, "15", "Wilayah Persekutuan Labuan"),
 (1131, "16", "Wilayah Persekutuan Putrajaya"),
@@ -2359,6 +2706,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1157, "TA", "Taraba"),
 (1157, "YO", "Yobe"),
 (1157, "ZA", "Zamfara"),
+(1157, "PL", "Plateau"),
 (1155, "BO", "Boaco"),
 (1155, "CA", "Carazo"),
 (1155, "CI", "Chinandega"),
@@ -2430,6 +2778,23 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1162, "ZA", "Az Zahirah"),
 (1162, "MA", "Masqat"),
 (1162, "MU", "Musandam"),
+-- Palestinian governorates from http://en.wikipedia.org/wiki/Governorates_of_the_Palestinian_National_Authority (no ISO 3166-2 entries yet, hence temporary codes)
+(1165, "_A", "Jenin"),
+(1165, "_B", "Tubas"),
+(1165, "_C", "Tulkarm"),
+(1165, "_D", "Nablus"),
+(1165, "_E", "Qalqilya"),
+(1165, "_F", "Salfit"),
+(1165, "_G", "Ramallah and Al-Bireh"),
+(1165, "_H", "Jericho"),
+(1165, "_I", "Jerusalem"),
+(1165, "_J", "Bethlehem"),
+(1165, "_K", "Hebron"),
+(1165, "_L", "North Gaza"),
+(1165, "_M", "Gaza"),
+(1165, "_N", "Deir el-Balah"),
+(1165, "_O", "Khan Yunis"),
+(1165, "_P", "Rafah"),
 (1166, "1", "Bocas del Toro"),
 (1166, "2", "Cocle"),
 (1166, "4", "Chiriqui"),
@@ -2463,6 +2828,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1169, "TAC", "Tacna"),
 (1169, "TUM", "Tumbes"),
 (1169, "UCA", "Ucayali"),
+(1169, "AMA", "Amazonas"),
 (1167, "NCD", "National Capital District (Port Moresby)"),
 (1167, "CPK", "Chimbu"),
 (1167, "EHG", "Eastern Highlands"),
@@ -2559,6 +2925,8 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1170, "ZAN", "Zamboanga del Norte"),
 (1170, "ZAS", "Zamboanga del Sur"),
 (1170, "ZSI", "Zamboanga Sibiguey"),
+(1170, "DIN", "Dinagat Islands"),
+(1170, "MNL", "Metropolitan Manila"),
 (1163, "IS", "Islamabad Federal Capital Area"),
 (1163, "BA", "Baluchistan"),
 (1163, "NW", "Khyber Pakhtun Khawa"),
@@ -2566,6 +2934,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1163, "TA", "Federally Administered Tribal Areas"),
 (1163, "JK", "Azad Kashmir"),
 (1163, "NA", "Gilgit-Baltistan"),
+(1163, "PB", "Punjab"),
 (1173, "01", "Aveiro"),
 (1173, "02", "Beja"),
 (1173, "03", "Braga"),
@@ -2749,6 +3118,8 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1178, "L", "Kigali-Ville Kigali Ngari"),
 (1178, "M", "Mutara"),
 (1178, "H", "Ruhengeri"),
+(1181, "K", "Saint Kitts"),
+(1181, "N", "Nevis"),
 (1187, "11", "Al Bahah"),
 (1187, "08", "Al Hudud Ash Shamaliyah"),
 (1187, "12", "Al Jawf"),
@@ -2761,6 +3132,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1187, "02", "Makkah"),
 (1187, "10", "Najran"),
 (1187, "07", "Tabuk"),
+(1187, "04", "Ash Sharqiyah"),
 (1194, "CT", "Capital Territory (Honiara)"),
 (1194, "GU", "Guadalcanal"),
 (1194, "IS", "Isabel"),
@@ -2969,6 +3341,66 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1193, "147", "Žiri"),
 (1193, "192", "Žirovnica"),
 (1193, "193", "Žužemberk"),
+(1193, "86", "Ankaran"),
+(1193, "87", "Apače"),
+(1193, "88", "Cirkulane"),
+(1193, "89", "Gorje"),
+(1193, "90", "Kostanjevica na Krki"),
+(1193, "91", "Log-Dragomer"),
+(1193, "92", "Makole"),
+(1193, "93", "Mirna"),
+(1193, "94", "Mokronog-Trebelno"),
+(1193, "95", "Odranci"),
+(1193, "96", "Oplotnica"),
+(1193, "97", "Ormož"),
+(1193, "98", "Osilnica"),
+(1193, "99", "Pesnica"),
+(1193, "100", "Piran"),
+(1193, "101", "Pivka"),
+(1193, "102", "Podčetrtek"),
+(1193, "103", "Podlehnik"),
+(1193, "104", "Podvelka"),
+(1193, "105", "Poljčane"),
+(1193, "106", "Polzela"),
+(1193, "107", "Postojna"),
+(1193, "108", "Prebold"),
+(1193, "109", "Preddvor"),
+(1193, "110", "Prevalje"),
+(1193, "111", "Ptuj"),
+(1193, "112", "Puconci"),
+(1193, "113", "Rače-Fram"),
+(1193, "114", "Radeče"),
+(1193, "115", "Radenci"),
+(1193, "139", "Radlje ob Dravi"),
+(1193, "145", "Radovljica"),
+(1193, "171", "Ravne na Koroškem"),
+(1193, "172", "Razkrižje"),
+(1193, "173", "Rečica ob Savinji"),
+(1193, "174", "Renče-Vogrsko"),
+(1193, "175", "Ribnica"),
+(1193, "176", "Ribnica na Pohorju"),
+(1193, "177", "Rogaška Slatina"),
+(1193, "178", "Rogašovci"),
+(1193, "179", "Rogatec"),
+(1193, "180", "Ruše"),
+(1193, "195", "Selnica ob Dravi"),
+(1193, "196", "Semič"),
+(1193, "197", "Å entrupert"),
+(1193, "198", "Sevnica"),
+(1193, "199", "Sežana"),
+(1193, "200", "Slovenj Gradec"),
+(1193, "201", "Slovenska Bistrica"),
+(1193, "202", "Slovenske Konjice"),
+(1193, "203", "Šmarješke Toplice"),
+(1193, "204", "Sodražica"),
+(1193, "205", "Solčava"),
+(1193, "206", "Središče ob Dravi"),
+(1193, "207", "Starše"),
+(1193, "208", "Straža"),
+(1193, "209", "Sveta Trojica v Slovenskih goricah"),
+(1193, "210", "Sveti Jurij v Slovenskih goricah"),
+(1193, "211", "Sveti Tomaž"),
+(1193, "212", "Vodice"),
 (1192, "BC", "Banskobystrický kraj"),
 (1192, "BL", "Bratislavský kraj"),
 (1192, "KI", "Košický kraj"),
@@ -2978,6 +3410,9 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1192, "TA", "Trnavský kraj"),
 (1192, "ZI", "Žilinský kraj"),
 (1190, "W", "Western Area (Freetown)"),
+(1190, "E", "Eastern"),
+(1190, "N", "Northern"),
+(1190, "S", "Southern"),
 (1188, "DK", "Dakar"),
 (1188, "DB", "Diourbel"),
 (1188, "FK", "Fatick"),
@@ -3028,6 +3463,9 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1066, "SV", "San Vicente"),
 (1066, "SO", "Sonsonate"),
 (1066, "US", "Usulutan"),
+(1066, "LI", "La Libertad"),
+(1066, "PA", "La Paz"),
+(1066, "UN", "La Union"),
 (1206, "HA", "Al Hasakah"),
 (1206, "LA", "Al Ladhiqiyah"),
 (1206, "QU", "Al Qunaytirah"),
@@ -3143,6 +3581,8 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1209, "SU", "Sughd"),
 (1209, "KT", "Khatlon"),
 (1209, "GB", "Gorno-Badakhshan"),
+(1209, "DU", "Dushanbe"),
+(1209, "RA", "Nohiyahoi Tobei Jumhurí"),
 (1220, "A", "Ahal"),
 (1220, "B", "Balkan"),
 (1220, "D", "Dasoguz"),
@@ -3299,6 +3739,12 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1208, "TAO", "Taoyuan County"),
 (1208, "YUN", "Yunlin County"),
 (1208, "KEE", "Keelung City"),
+(1208, "TXG", "Taichung City"),
+(1208, "KHH", "Kaohsiung City"),
+(1208, "TPE", "Taipei City"),
+(1208, "CYI", "Chiayi City"),
+(1208, "HSZ", "Hsinchu City"),
+(1208, "TNN", "Tainan City"),
 (1210, "01", "Arusha"),
 (1210, "02", "Dar-es-Salaam"),
 (1210, "03", "Dodoma"),
@@ -3432,6 +3878,9 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1229, "SO", "Soriano"),
 (1229, "TA", "Tacuarembo"),
 (1229, "TT", "Treinta y Tres"),
+(1229, "FL", "Florida"),
+(1229, "RN", "Rio Negro"),
+(1229, "SJ", "San Jose"),
 (1230, "TK", "Toshkent (city)"),
 (1230, "QR", "Qoraqalpogiston Respublikasi"),
 (1230, "AN", "Andijon"),
@@ -3576,10 +4025,17 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1196, "NC", "Northern Cape"),
 (1196, "NP", "Limpopo"),
 (1196, "WC", "Western Cape"),
+(1196, "NW", "North West"),
 (1239, "08", "Copperbelt"),
 (1239, "04", "Luapula"),
 (1239, "09", "Lusaka"),
 (1239, "06", "North-Western"),
+(1239, 'C', 'Central'),
+(1239, 'E', 'Eastern'),
+(1239, 'M', 'Muchinga'),
+(1239, 'N', 'Northern'),
+(1239, 'S', 'Southern'),
+(1239, 'W', 'Western'),
 (1240, "BU", "Bulawayo"),
 (1240, "HA", "Harare"),
 (1240, "MA", "Manicaland"),
@@ -3632,559 +4088,5 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1108, "MR", "Manchester"),
 (1016, "13", "Al Manāmah (Al ‘Āşimah)"),
 (1016, "14", "Al Janūbīyah"),
--- (5198, 1016, "15", "Al Muḩarraq"), -- conflicts with id 1872, Al Muharraq
 (1016, "16", "Al Wusţá"),
-(1016, "17", "Ash Shamālīyah"),
-
--- Palestinian governorates from http://en.wikipedia.org/wiki/Governorates_of_the_Palestinian_National_Authority (no ISO 3166-2 entries yet, hence temporary codes)
-(1165, "_A", "Jenin"),
-(1165, "_B", "Tubas"),
-(1165, "_C", "Tulkarm"),
-(1165, "_D", "Nablus"),
-(1165, "_E", "Qalqilya"),
-(1165, "_F", "Salfit"),
-(1165, "_G", "Ramallah and Al-Bireh"),
-(1165, "_H", "Jericho"),
-(1165, "_I", "Jerusalem"),
-(1165, "_J", "Bethlehem"),
-(1165, "_K", "Hebron"),
-(1165, "_L", "North Gaza"),
-(1165, "_M", "Gaza"),
-(1165, "_N", "Deir el-Balah"),
-(1165, "_O", "Khan Yunis"),
-(1165, "_P", "Rafah"),
-
-(1020, "BRU", "Brussels"),
-
-(1140, "DIF", "Distrito Federal"),
-(1208, "TXG", "Taichung City"),
-(1208, "KHH", "Kaohsiung City"),
-(1208, "TPE", "Taipei City"),
-(1208, "CYI", "Chiayi City"),
-(1208, "HSZ", "Hsinchu City"),
-(1208, "TNN", "Tainan City"),
-(1196, "NW", "North West"),
-
-(1226, "TWR", "Tyne and Wear"),
-(1226, "GTM", "Greater Manchester"),
-(1226, "TYR", "Co Tyrone"),
-(1226, "WYK", "West Yorkshire"),
-(1226, "SYK", "South Yorkshire"),
-(1226, "MSY", "Merseyside"),
-(1226, "BRK", "Berkshire"),
-(1226, "WMD", "West Midlands"),
-(1226, "WGM", "West Glamorgan"),
-(1226, "LON", "London"),
-
-(1107, "CI", "Carbonia-Iglesias"),
-(1107, "OT", "Olbia-Tempio"),
-(1107, "VS", "Medio Campidano"),
-(1107, "OG", "Ogliastra"),
-
--- department of France (CRM-4769)
-(1076, "39", "Jura"),
-
--- new Italian provinces (CRM-5048)
-(1107, "BT", "Barletta-Andria-Trani"),
-(1107, "FM", "Fermo"),
-(1107, "MB", "Monza e Brianza"),
-
--- new UK provinces (CRM-5224)
-(1226, "CWD", "Clwyd"),
-(1226, "SGM", "South Glamorgan"),
-
--- Haiti (CRM-5628)
-(1094, "AR", "Artibonite"),
-(1094, "CE", "Centre"),
-(1094, "NI", "Nippes"),
-(1094, "ND", "Nord"),
-
--- CRM-6002 - Argentinian provinces suplemented
-(1010, "F", "La Rioja"),
-
--- CRM-6063 - Added states for Andorra
-(1005, "07", "Andorra la Vella"),
-(1005, "02", "Canillo"),
-(1005, "03", "Encamp"),
-(1005, "08", "Escaldes-Engordany"),
-(1005, "04", "La Massana"),
-(1005, "05", "Ordino"),
-(1005, "06", "Sant Julia de Loria"),
-
--- CRM-6198 - Added provinces of Bahamas
-(1212, "AB", "Abaco Islands"),
-(1212, "AN", "Andros Island"),
-(1212, "BR", "Berry Islands"),
-(1212, "EL", "Eleuthera"),
-(1212, "GB", "Grand Bahama"),
-(1212, "RC", "Rum Cay"),
-(1212, "SS", "San Salvador Island"),
-
--- Added provinces of The Democratic Republic of the Congo
-(1050, "01", "Kongo central"),
-(1050, "02", "Kwango"),
-(1050, "03", "Kwilu"),
-(1050, "04", "Mai-Ndombe"),
-(1050, "05", "Kasai"),
-(1050, "06", "Lulua"),
-(1050, "07", "Lomami"),
-(1050, "08", "Sankuru"),
-(1050, "09", "Ituri"),
-(1050, "10", "Haut-Uele"),
-(1050, "11", "Tshopo"),
-(1050, "12", "Bas-Uele"),
-(1050, "13", "Nord-Ubangi"),
-(1050, "14", "Mongala"),
-(1050, "15", "Sud-Ubangi"),
-(1050, "16", "Tshuapa"),
-(1050, "17", "Haut-Lomami"),
-(1050, "18", "Lualaba"),
-(1050, "19", "Haut-Katanga"),
-(1050, "20", "Tanganyika"),
-
--- CRM-8009 Added Missing Provinces for Spain
-(1198, "TO", "Toledo"),
-(1198, "CO", "Córdoba"),
-
--- CRM-8769 Added Missing Province for Philippines
-(1170, "MNL", "Metropolitan Manila"),
-
--- CRM-9686 Added Missing Province for Honduras
-(1097, "LP", "La Paz"),
-
--- CRM-10473 Added Missing Provinces of Ningxia Autonomous Region of China
-(1045, "YN", "Yinchuan"),
-(1045, "SZ", "Shizuishan"),
-(1045, "WZ", "Wuzhong"),
-(1045, "GY", "Guyuan"),
-(1045, "ZW", "Zhongwei"),
-
--- CRM-10863 Added Missing Province for Luxembourg
-(1126, "LU", "Luxembourg"),
-
--- CRM-11367 Latvian regions
-(1119, "002", "Aizkraukles novads"),
-(1119, "038", "Jaunjelgavas novads"),
-(1119, "072", "Pļaviņu novads"),
-(1119, "046", "Kokneses novads"),
-(1119, "065", "Neretas novads"),
-(1119, "092", "Skrīveru novads"),
-(1119, "007", "Alūksnes novads"),
-(1119, "009", "Apes novads"),
-(1119, "015", "Balvu novads"),
-(1119, "108", "Viļakas novads"),
-(1119, "014", "Baltinavas novads"),
-(1119, "082", "Rugāju novads"),
-(1119, "016", "Bauskas novads"),
-(1119, "034", "Iecavas novads"),
-(1119, "083", "Rundāles novads"),
-(1119, "105", "Vecumnieku novads"),
-(1119, "022", "Cēsu novads"),
-(1119, "055", "LÄ«gatnes novads"),
-(1119, "008", "Amatas novads"),
-(1119, "039", "Jaunpiebalgas novads"),
-(1119, "075", "Priekuļu novads"),
-(1119, "070", "Pārgaujas novads"),
-(1119, "076", "Raunas novads"),
-(1119, "104", "Vecpiebalgas novads"),
-(1119, "025", "Daugavpils novads"),
-(1119, "036", "Ilūkstes novads"),
-(1119, "026", "Dobeles novads"),
-(1119, "010", "Auces novads"),
-(1119, "098", "Tērvetes novads"),
-(1119, "033", "Gulbenes novads"),
-(1119, "041", "Jelgavas novads"),
-(1119, "069", "Ozolnieku novads"),
-(1119, "042", "Jēkabpils novads"),
-(1119, "004", "Aknīstes novads"),
-(1119, "107", "Viesītes novads"),
-(1119, "049", "Krustpils novads"),
-(1119, "085", "Salas novads"),
-(1119, "047", "Krāslavas novads"),
-(1119, "024", "Dagdas novads"),
-(1119, "001", "Aglonas novads"),
-(1119, "050", "Kuldīgas novads"),
-(1119, "093", "Skrundas novads"),
-(1119, "006", "Alsungas novads"),
-(1119, "003", "Aizputes novads"),
-(1119, "028", "Durbes novads"),
-(1119, "032", "Grobiņas novads"),
-(1119, "071", "Pāvilostas novads"),
-(1119, "074", "Priekules novads"),
-(1119, "066", "NÄ«cas novads"),
-(1119, "081", "Rucavas novads"),
-(1119, "100", "Vaiņodes novads"),
-(1119, "054", "Limbažu novads"),
-(1119, "005", "Alojas novads"),
-(1119, "086", "Salacgrīvas novads"),
-(1119, "058", "Ludzas novads"),
-(1119, "044", "Kārsavas novads"),
-(1119, "110", "Zilupes novads"),
-(1119, "023", "Ciblas novads"),
-(1119, "059", "Madonas novads"),
-(1119, "021", "Cesvaines novads"),
-(1119, "057", "Lubānas novads"),
-(1119, "102", "Varakļānu novads"),
-(1119, "030", "Ērgļu novads"),
-(1119, "067", "Ogres novads"),
-(1119, "035", "Ikšķiles novads"),
-(1119, "051", "Ķeguma novads"),
-(1119, "053", "Lielvārdes novads"),
-(1119, "073", "Preiļu novads"),
-(1119, "056", "Līvānu novads"),
-(1119, "078", "Riebiņu novads"),
-(1119, "103", "Vārkavas novads"),
-(1119, "077", "Rēzeknes novads"),
-(1119, "109", "Viļānu novads"),
-(1119, "013", "Baldones novads"),
-(1119, "052", "Ķekavas novads"),
-(1119, "068", "Olaines novads"),
-(1119, "087", "Salaspils novads"),
-(1119, "089", "Saulkrastu novads"),
-(1119, "091", "Siguldas novads"),
-(1119, "037", "Inčukalna novads"),
-(1119, "011", "Ādažu novads"),
-(1119, "012", "Babītes novads"),
-(1119, "020", "Carnikavas novads"),
-(1119, "031", "Garkalnes novads"),
-(1119, "048", "Krimuldas novads"),
-(1119, "061", "Mālpils novads"),
-(1119, "062", "Mārupes novads"),
-(1119, "080", "Ropažu novads"),
-(1119, "090", "Sējas novads"),
-(1119, "095", "Stopiņu novads"),
-(1119, "088", "Saldus novads"),
-(1119, "018", "Brocēnu novads"),
-(1119, "097", "Talsu novads"),
-(1119, "027", "Dundagas novads"),
-(1119, "063", "Mērsraga novads"),
-(1119, "079", "Rojas novads"),
-(1119, "099", "Tukuma novads"),
-(1119, "043", "Kandavas novads"),
-(1119, "029", "Engures novads"),
-(1119, "040", "Jaunpils novads"),
-(1119, "101", "Valkas novads"),
-(1119, "094", "Smiltenes novads"),
-(1119, "096", "Strenču novads"),
-(1119, "045", "Kocēnu novads"),
-(1119, "060", "Mazsalacas novads"),
-(1119, "084", "RÅ«jienas novads"),
-(1119, "017", "Beverīnas novads"),
-(1119, "019", "Burtnieku novads"),
-(1119, "064", "Naukšēnu novads"),
-(1119, "106", "Ventspils novads"),
-(1119, "JKB", "Jēkabpils"),
-(1119, "VMR", "Valmiera"),
-
--- CRM-13314 Added States for Uruguay
-(1229, "FL", "Florida"),
-(1229, "RN", "Rio Negro"),
-(1229, "SJ", "San Jose"),
-
--- Added Nigeria States(CRM-14183)
-(1157, "PL", "Plateau"),
-
-
--- CRM-14493 Added State for Greece
-(1085, "61", "Pieria"),
-
--- CRM-14843 Added States for Chile and Modify Santiago Metropolitan for consistency
-(1044, "LR", "Los Rios"),
-(1044, "AP", "Arica y Parinacota"),
-
--- Add missing Peruvian State (Amazonas)
-(1169, "AMA", "Amazonas"),
-
--- Add missing Indonesian provinces (Kalimantan Tengah, Sulawesi Barat, Kalimantan Utara) and revised outdated names in code above
-(1102, "KT", "Kalimantan Tengah"),
-(1102, "SR", "Sulawesi Barat"),
-(1102, "KU", "Kalimantan Utara"),
-
--- Add missing Slovenian municipalities
-(1193, "86", "Ankaran"),
-(1193, "87", "Apače"),
-(1193, "88", "Cirkulane"),
-(1193, "89", "Gorje"),
-(1193, "90", "Kostanjevica na Krki"),
-(1193, "91", "Log-Dragomer"),
-(1193, "92", "Makole"),
-(1193, "93", "Mirna"),
-(1193, "94", "Mokronog-Trebelno"),
-(1193, "95", "Odranci"),
-(1193, "96", "Oplotnica"),
-(1193, "97", "Ormož"),
-(1193, "98", "Osilnica"),
-(1193, "99", "Pesnica"),
-(1193, "100", "Piran"),
-(1193, "101", "Pivka"),
-(1193, "102", "Podčetrtek"),
-(1193, "103", "Podlehnik"),
-(1193, "104", "Podvelka"),
-(1193, "105", "Poljčane"),
-(1193, "106", "Polzela"),
-(1193, "107", "Postojna"),
-(1193, "108", "Prebold"),
-(1193, "109", "Preddvor"),
-(1193, "110", "Prevalje"),
-(1193, "111", "Ptuj"),
-(1193, "112", "Puconci"),
-(1193, "113", "Rače-Fram"),
-(1193, "114", "Radeče"),
-(1193, "115", "Radenci"),
-(1193, "139", "Radlje ob Dravi"),
-(1193, "145", "Radovljica"),
-(1193, "171", "Ravne na Koroškem"),
-(1193, "172", "Razkrižje"),
-(1193, "173", "Rečica ob Savinji"),
-(1193, "174", "Renče-Vogrsko"),
-(1193, "175", "Ribnica"),
-(1193, "176", "Ribnica na Pohorju"),
-(1193, "177", "Rogaška Slatina"),
-(1193, "178", "Rogašovci"),
-(1193, "179", "Rogatec"),
-(1193, "180", "Ruše"),
-(1193, "195", "Selnica ob Dravi"),
-(1193, "196", "Semič"),
-(1193, "197", "Å entrupert"),
-(1193, "198", "Sevnica"),
-(1193, "199", "Sežana"),
-(1193, "200", "Slovenj Gradec"),
-(1193, "201", "Slovenska Bistrica"),
-(1193, "202", "Slovenske Konjice"),
-(1193, "203", "Šmarješke Toplice"),
-(1193, "204", "Sodražica"),
-(1193, "205", "Solčava"),
-(1193, "206", "Središče ob Dravi"),
-(1193, "207", "Starše"),
-(1193, "208", "Straža"),
-(1193, "209", "Sveta Trojica v Slovenskih goricah"),
-(1193, "210", "Sveti Jurij v Slovenskih goricah"),
-(1193, "211", "Sveti Tomaž"),
-(1193, "212", "Vodice"),
-
--- CRM-16452 Missing administrative divisions for Georgia
-(1081, "AB", "Abkhazia"),
-(1081, "AJ", "Adjara"),
-(1081, "TB", "Tbilisi"),
-(1081, "GU", "Guria"),
-(1081, "IM", "Imereti"),
-(1081, "KA", "Kakheti"),
-(1081, "KK", "Kvemo Kartli"),
-(1081, "MM", "Mtskheta-Mtianeti"),
-(1081, "RL", "Racha-Lechkhumi and Kvemo Svaneti"),
-(1081, "SZ", "Samegrelo-Zemo Svaneti"),
-(1081, "SJ", "Samtskhe-Javakheti"),
-(1081, "SK", "Shida Kartli"),
-(1074, "C", "Central"),
-
--- CRM-17136 Add missing Pakistani Province (Punjab)
-(1163, "PB", "Punjab"),
-
--- CRM-17184
-(1066, "LI", "La Libertad"),
-(1066, "PA", "La Paz"),
-(1066, "UN", "La Union"),
-
--- CRM-17660 Add missing Cameroon Provinces
-(1038, "LT", "Littoral"),
-(1038, "NW", "Nord-Ouest"),
-
--- Add Indian province of Telangana
-(1101, "TG", "Telangana"),
-
--- CRM-17800
-(1187, "04", "Ash Sharqiyah"),
-
--- CRM-19134 Missing French overseas departments.
-(1076, "GP", "Guadeloupe"),
-(1076, "MQ", "Martinique"),
-(1076, "GF", "Guyane"),
-(1076, "RE", "La Réunion"),
-(1076, "YT", "Mayotte"),
-
--- CRM-20062 New counties of Kenya.
-(1112, "01", "Baringo"),
-(1112, "02", "Bomet"),
-(1112, "03", "Bungoma"),
-(1112, "04", "Busia"),
-(1112, "05", "Elgeyo/Marakwet"),
-(1112, "06", "Embu"),
-(1112, "07", "Garissa"),
-(1112, "08", "Homa Bay"),
-(1112, "09", "Isiolo"),
-(1112, "10", "Kajiado"),
-(1112, "11", "Kakamega"),
-(1112, "12", "Kericho"),
-(1112, "13", "Kiambu"),
-(1112, "14", "Kilifi"),
-(1112, "15", "Kirinyaga"),
-(1112, "16", "Kisii"),
-(1112, "17", "Kisumu"),
-(1112, "18", "Kitui"),
-(1112, "19", "Kwale"),
-(1112, "20", "Laikipia"),
-(1112, "21", "Lamu"),
-(1112, "22", "Machakos"),
-(1112, "23", "Makueni"),
-(1112, "24", "Mandera"),
-(1112, "25", "Marsabit"),
-(1112, "26", "Meru"),
-(1112, "27", "Migori"),
-(1112, "28", "Mombasa"),
-(1112, "29", "Murang'a"),
-(1112, "30", "Nairobi City"),
-(1112, "31", "Nakuru"),
-(1112, "32", "Nandi"),
-(1112, "33", "Narok"),
-(1112, "34", "Nyamira"),
-(1112, "35", "Nyandarua"),
-(1112, "36", "Nyeri"),
-(1112, "37", "Samburu"),
-(1112, "38", "Siaya"),
-(1112, "39", "Taita/Taveta"),
-(1112, "40", "Tana River"),
-(1112, "41", "Tharaka-Nithi"),
-(1112, "42", "Trans Nzoia"),
-(1112, "43", "Turkana"),
-(1112, "44", "Uasin Gishu"),
-(1112, "45", "Vihiga"),
-(1112, "46", "Wajir"),
-(1112, "47", "West Pokot"),
-
--- CRM-19993 Fixes for ISO compliance with countries and counties
--- Add states for: India, Ghana, Sierra Leone, Saint Kitts & Nevis
-(1101, "CH", "Chandigarh"),
-(1083, "CP", "Central"),
-(1083, "EP", "Eastern"),
-(1083, "NP", "Northern"),
-(1083, "WP", "Western"),
-(1181, "K", "Saint Kitts"),
-(1181, "N", "Nevis"),
-(1190, "E", "Eastern"),
-(1190, "N", "Northern"),
-(1190, "S", "Southern"),
-
--- CRM-21234 Missing subdivisions of Tajikistan.
-(1209, "DU", "Dushanbe"),
-(1209, "RA", "Nohiyahoi Tobei Jumhurí"),
-
--- CRM-21268 Missing French overseas departments.
-(1076, "WF", "Wallis-et-Futuna"),
-(1076, "NC", "Nouvelle-Calédonie"),
-
--- CRM-21532 Add French state/departments
-(1076, "52", "Haute-Marne"),
-
--- Add states for: Barbados and Antigua and Barbuda
-(1009, "03", "Saint George"),
-(1009, "04", "Saint John"),
-(1009, "05", "Saint Mary"),
-(1009, "06", "Saint Paul"),
-(1009, "07", "Saint Peter"),
-(1009, "08", "Saint Philip"),
-(1009, "10", "Barbuda"),
-(1009, "11", "Redonda"),
-(1018, "01", "Christ Church"),
-(1018, "02", "Saint Andrew"),
-(1018, "03", "Saint George"),
-(1018, "04", "Saint James"),
-(1018, "05", "Saint John"),
-(1018, "06", "Saint Joseph"),
-(1018, "07", "Saint Lucy"),
-(1018, "08", "Saint Michael"),
-(1018, "09", "Saint Peter"),
-(1018, "10", "Saint Philip"),
-(1018, "11", "Saint Thomas"),
-
--- CRM-21837 - Missing states for Gabon
-(1080, "01", "Estuaire"),
-(1080, "02", "Haut-Ogooué"),
-(1080, "03", "Moyen-Ogooué"),
-(1080, "04", "Ngounié"),
-(1080, "05", "Nyanga"),
-(1080, "06", "Ogooué-Ivindo"),
-(1080, "07", "Ogooué-Lolo"),
-(1080, "08", "Ogooué-Maritime"),
-(1080, "09", "Woleu-Ntem"),
-
--- dev/Core#131 Missing UK State
-(1226, "MON", "Monmouthshire"),
-
--- dev/core#2027 Missing subdivisions for Northern Ireland and Wales
-(1226, "ANN", "Antrim and Newtownabbey"),
-(1226, "AND", "Ards and North Down"),
-(1226, "ABC", "Armagh City, Banbridge and Craigavon"),
-(1226, "BFS", "Belfast"),
-(1226, "CCG", "Causeway Coast and Glens"),
-(1226, "DRS", "Derry City and Strabane"),
-(1226, "FMO", "Fermanagh and Omagh"),
-(1226, "LBC", "Lisburn and Castlereagh"),
-(1226, "MEA", "Mid and East Antrim"),
-(1226, "MUL", "Mid Ulster"),
-(1226, "NMD", "Newry, Mourne and Down"),
-
-(1226, "BGE", "Bridgend"),
-(1226, "CAY", "Caerphilly"),
-(1226, "CRF", "Cardiff"),
-(1226, "CMN", "Carmarthenshire"),
-(1226, "CGN", "Ceredigion"),
-(1226, "CWY", "Conwy"),
-(1226, "DEN", "Denbighshire"),
-(1226, "FLN", "Flintshire"),
-(1226, "AGY", "Isle of Anglesey"),
-(1226, "MTY", "Merthyr Tydfil"),
-(1226, "NTL", "Neath Port Talbot"),
-(1226, "NWP", "Newport"),
-(1226, "PEM", "Pembrokeshire"),
-(1226, "RCT", "Rhondda, Cynon, Taff"),
-(1226, "SWA", "Swansea"),
-(1226, "TOF", "Torfaen"),
-(1226, "WRX", "Wrexham"),
-
--- Add missing state for South Korea
-(1115, "50", "Sejong"),
-
--- Add missing province for Philippines
-(1170, "DIN", "Dinagat Islands"),
-
--- Add missing state for Colombia
-(1048, "HUI", "Huila"),
-
--- Add missing parishes for Bermuda
- (NULL, 1023, 'DEV', 'Devonshire'),
- (NULL, 1023, 'HAM', 'Hamilton Parish'),
- (NULL, 1023, 'HA', 'City of Hamilton'),
- (NULL, 1023, 'PAG', 'Paget'),
- (NULL, 1023, 'PEM', 'Pembroke'),
- (NULL, 1023, 'SG', 'Town of St. George'),
- (NULL, 1023, 'SGE', 'Saint George\'s'),
- (NULL, 1023, 'SAN', 'Sandys'),
- (NULL, 1023, 'SMI', 'Smiths'),
- (NULL, 1023, 'SOU', 'Southampton'),
- (NULL, 1023, 'WAR', 'Warwick'),
-
--- Add in missing Indian State provinces
-(1101, "DH", "Dādra and Nagar Haveli and Damān and Diu"),
-(1101, "LA", "Ladākh"),
-
--- Add missing provinces for Luxembourg
-(1126, 'CA', 'Capellen'),
-(1126, 'CL', 'Clervaux'),
-(1126, 'EC', 'Echternach'),
-(1126, 'ES', 'Esch-sur-Alzette'),
-(1126, 'ME', 'Mersch'),
-(1126, 'RD', 'Redange-sur-Attert'),
-(1126, 'RM', 'Remich'),
-(1126, 'VD', 'Vianden'),
-(1126, 'WI', 'Wiltz'),
-
--- Add missing provinces for Zambia
-(1239, 'C', 'Central'),
-(1239, 'E', 'Eastern'),
-(1239, 'M', 'Muchinga'),
-(1239, 'N', 'Northern'),
-(1239, 'S', 'Southern'),
-(1239, 'W', 'Western')
-
--- end of statement:
- ;
+(1016, "17", "Ash Shamālīyah");