-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.5 |
+-- | CiviCRM version 4.6 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2014 |
-- +--------------------------------------------------------------------+
(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"),
(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"),
(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"),
(4244, 1177, "BEL", "Belgorodskaya oblast\'"),
(4245, 1177, "BRY", "Bryanskaya oblast\'"),
(4246, 1177, "CHE", "Chelyabinskaya oblast\'"),
-(4247, 1177, "CHI", "Chitinskaya oblast\'"),
+(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", "Kamchatskaya oblast\'"),
+(4252, 1177, "KAM", "Kamchatka Krai\'"),
(4253, 1177, "KEM", "Kemerovskaya oblast\'"),
(4254, 1177, "KIR", "Kirovskaya oblast\'"),
(4255, 1177, "KOS", "Kostromskaya oblast\'"),
(4267, 1177, "ORE", "Orenburgskaya oblast\'"),
(4268, 1177, "ORL", "Orlovskaya oblast\'"),
(4269, 1177, "PNZ", "Penzenskaya oblast\'"),
-(4270, 1177, "PER", "Permskaya oblast\'"),
+(4270, 1177, "PEK", "Perm krai\'"),
(4271, 1177, "PSK", "Pskovskaya oblast\'"),
(4272, 1177, "ROS", "Rostovskaya oblast\'"),
(4273, 1177, "RYA", "Ryazanskaya oblast\'"),
(4290, 1177, "MOW", "Moskva"),
(4291, 1177, "SPE", "Sankt-Peterburg"),
(4292, 1177, "YEV", "Yevreyskaya avtonomnaya oblast\'"),
-(4293, 1177, "AGB", "Aginskiy Buryatskiy avtonomnyy"),
(4294, 1177, "CHU", "Chukotskiy avtonomnyy okrug"),
-(4295, 1177, "EVE", "Evenkiyskiy avtonomnyy okrug"),
(4296, 1177, "KHM", "Khanty-Mansiyskiy avtonomnyy okrug"),
-(4297, 1177, "KOP", "Komi-Permyatskiy avtonomnyy okrug"),
-(4298, 1177, "KOR", "Koryakskiy avtonomnyy okrug"),
(4299, 1177, "NEN", "Nenetskiy avtonomnyy okrug"),
-(4300, 1177, "TAY", "Taymyrskiy (Dolgano-Nenetskiy)"),
-(4301, 1177, "UOB", "Ust\'-Ordynskiy Buryatskiy"),
(4302, 1177, "YAN", "Yamalo-Nenetskiy avtonomnyy okrug"),
(4303, 1178, "C", "Butare"),
(4304, 1178, "I", "Byumba"),
(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