Merge remote-tracking branch 'origin/master' into master-master-civimail-abtest-2014...

[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 c98e1789dd2898a73f8917b49f0995ef92c733e0..7d5d6a831fc8d841c7b3fe7a10c6d571efd901cb 100644 (file)
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -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"),
 (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"),
 (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\'"),
 (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\'"),
 (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\'"),
 (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\'"),
 (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\'"),
 (4271, 1177, "PSK", "Pskovskaya oblast\'"),
 (4272, 1177, "ROS", "Rostovskaya oblast\'"),
 (4273, 1177, "RYA", "Ryazanskaya oblast\'"),


@@ -2749,15 +2749,9 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4290, 1177, "MOW", "Moskva"),
 (4291, 1177, "SPE", "Sankt-Peterburg"),
 (4292, 1177, "YEV", "Yevreyskaya avtonomnaya 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"),
 (4294, 1177, "CHU", "Chukotskiy avtonomnyy okrug"),

-(4295, 1177, "EVE", "Evenkiyskiy avtonomnyy okrug"),

 (4296, 1177, "KHM", "Khanty-Mansiyskiy 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"),
 (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"),
 (4302, 1177, "YAN", "Yamalo-Nenetskiy avtonomnyy okrug"),
 (4303, 1178, "C", "Butare"),
 (4304, 1178, "I", "Byumba"),