Merge remote-tracking branch 'origin/master'

[civicrm-core.git] / xml / templates / civicrm_state_province.tpl

diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl
index 5c9853cc250deb4d5ef09c4d5f1bee6b1088b6e1..c6c29075915a2fb9d0dee8b83ced8b63f0c604ea 100644 (file)
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -1,5 +1,5 @@
 -- +--------------------------------------------------------------------+
--- | CiviCRM version 4.5                                                |
+-- | CiviCRM version 4.6                                                |
 -- +--------------------------------------------------------------------+
 -- | Copyright CiviCRM LLC (c) 2004-2014                                |
 -- +--------------------------------------------------------------------+
@@ -1538,17 +1538,17 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (3053, 1099, "TB", "Tatabánya"),
 (3054, 1099, "ZE", "Zalaegerszeg"),
 (3055, 1102, "BA", "Bali"),
-(3056, 1102, "BB", "Bangka Belitung"),
+(3056, 1102, "BB", "Kepulauan Bangka Belitung"), -- changed from "Bangka Belitung"
 (3057, 1102, "BT", "Banten"),
 (3058, 1102, "BE", "Bengkulu"),
 (3059, 1102, "GO", "Gorontalo"),
-(3060, 1102, "IJ", "Irian Jaya"),
+(3060, 1102, "PB", "Papua Barat"), -- changed from "IJ" and "Irian Jaya"
 (3061, 1102, "JA", "Jambi"),
 (3062, 1102, "JB", "Jawa Barat"),
 (3063, 1102, "JT", "Jawa Tengah"),
 (3064, 1102, "JI", "Jawa Timur"),
 (3065, 1102, "KB", "Kalimantan Barat"),
-(3066, 1102, "KT", "Kalimantan Timur"),
+(3066, 1102, "KI", "Kalimantan Timur"), -- updated abbreviation
 (3067, 1102, "KS", "Kalimantan Selatan"),
 (3068, 1102, "KR", "Kepulauan Riau"),
 (3069, 1102, "LA", "Lampung"),
@@ -1565,9 +1565,9 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (3080, 1102, "SB", "Sumatra Barat"),
 (3081, 1102, "SS", "Sumatra Selatan"),
 (3082, 1102, "SU", "Sumatera Utara"),
-(3083, 1102, "JK", "Jakarta Raya"),
+(3083, 1102, "JK", "DKI Jakarta"), -- changed from "Jakarta Raya" 
 (3084, 1102, "AC", "Aceh"),
-(3085, 1102, "YO", "Yogyakarta"),
+(3085, 1102, "YO", "DI Yogyakarta"), -- changed from "Yogyakarta"
 (3086, 1105, "C", "Cork"),
 (3087, 1105, "CE", "Clare"),
 (3088, 1105, "CN", "Cavan"),
@@ -2008,10 +2008,10 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (3523, 1126, "G", "GreveNmacher"),
 (3550, 1119, "DGV", "Daugavpils"),
 (3551, 1119, "JEL", "Jelgava"),
-(3552, 1119, "JUR", "Jurmala"),
-(3553, 1119, "LPX", "Liepaja"),
-(3554, 1119, "REZ", "Rezekne"),
-(3555, 1119, "RIX", "Riga"),
+(3552, 1119, "JUR", "Jūrmala"),
+(3553, 1119, "LPX", "Liepāja"),
+(3554, 1119, "REZ", "Rēzekne"),
+(3555, 1119, "RIX", "Rīga"),
 (3556, 1119, "VEN", "Ventspils"),
 (3557, 1123, "AJ", "Ajdābiyā"),
 (3558, 1123, "BU", "Al Buţnān"),
@@ -2703,12 +2703,12 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4244, 1177, "BEL", "Belgorodskaya oblast\'"),
 (4245, 1177, "BRY", "Bryanskaya oblast\'"),
 (4246, 1177, "CHE", "Chelyabinskaya oblast\'"),
-(4247, 1177, "ZSK", "Zabaykal'skiy kray\'"),
+(4247, 1177, "ZSK", "Zabaykalsky Krai\'"),
 (4248, 1177, "IRK", "Irkutskaya oblast\'"),
 (4249, 1177, "IVA", "Ivanovskaya oblast\'"),
 (4250, 1177, "KGD", "Kaliningradskaya oblast\'"),
 (4251, 1177, "KLU", "Kaluzhskaya oblast\'"),
-(4252, 1177, "KAM", "Kamchatskiy kray\'"),
+(4252, 1177, "KAM", "Kamchatka Krai\'"),
 (4253, 1177, "KEM", "Kemerovskaya oblast\'"),
 (4254, 1177, "KIR", "Kirovskaya oblast\'"),
 (4255, 1177, "KOS", "Kostromskaya oblast\'"),
@@ -2726,7 +2726,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4267, 1177, "ORE", "Orenburgskaya oblast\'"),
 (4268, 1177, "ORL", "Orlovskaya oblast\'"),
 (4269, 1177, "PNZ", "Penzenskaya oblast\'"),
-(4270, 1177, "PEK", "Permskiy kray\'"),
+(4270, 1177, "PEK", "Perm krai\'"),
 (4271, 1177, "PSK", "Pskovskaya oblast\'"),
 (4272, 1177, "ROS", "Rostovskaya oblast\'"),
 (4273, 1177, "RYA", "Ryazanskaya oblast\'"),
@@ -3911,4 +3911,17 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (NULL, 1044, "AP", "Arica y Parinacota"),
 
 -- Add missing Peruvian State (Amazonas)
-(NULL, 1169, "AMA", "Amazonas");
+(NULL, 1169, "AMA", "Amazonas"),
+
+<<<<<<< HEAD
+-- Add missing Indonesian provinces (Kalimantan Tengah, Sulawesi Barat, Kalimantan Utara) and revised outdated names in code above
+(NULL, 1102, "KT", "Kalimantan Tengah"), -- added, updated abbreviation
+(NULL, 1102, "SR", "Sulawesi Barat"), -- added, updated abbreviation
+(NULL, 1102, "KU", "Kalimantan Utara"); -- added
+
+=======
+-- Add missing Indonesian provinces (Kalimantan Tengah, Sulawesi Barat) and revised outdated names in code above
+(NULL, 1102, "KT", "Kalimantan Tengah"), -- added, updated abbreviation
+(NULL, 1102, "SR", "Sulawesi Barat") -- added, updated abbreviation
+(NULL, 1102, "KU", "Kalimantan Utara"); -- added
+>>>>>>> origin/master