Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-27-22-52-52

[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 fa6913ab685bab4cb14d317c9fe00e487101df8a..1a47cb72ff3c4fea240310f98088082ff39561ea 100644 (file)
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -1,5 +1,5 @@
 -- +--------------------------------------------------------------------+
--- | CiviCRM version 4.3                                                |
+-- | CiviCRM version 4.4                                                |
 -- +--------------------------------------------------------------------+
 -- | Copyright CiviCRM LLC (c) 2004-2013                                |
 -- +--------------------------------------------------------------------+
@@ -1412,8 +1412,8 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (2927, 1085, "72", "Xanthi"),
 (2928, 1085, "21", "Zakynthos"),
 (2929, 1085, "69", "Agio Oros"),
-(2930, 1090, "AV", "Alta Verapez"),
-(2931, 1090, "BV", "Baja Verapez"),
+(2930, 1090, "AV", "Alta Verapaz"),
+(2931, 1090, "BV", "Baja Verapaz"),
 (2932, 1090, "CM", "Chimaltenango"),
 (2933, 1090, "CQ", "Chiquimula"),
 (2934, 1090, "PR", "El Progreso"),
@@ -1426,11 +1426,11 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (2941, 1090, "PE", "Peten"),
 (2942, 1090, "QZ", "Quetzaltenango"),
 (2943, 1090, "QC", "Quiche"),
-(2944, 1090, "RE", "Reta.thuleu"),
+(2944, 1090, "RE", "Retalhuleu"),
 (2945, 1090, "SA", "Sacatepequez"),
 (2946, 1090, "SM", "San Marcos"),
 (2947, 1090, "SR", "Santa Rosa"),
-(2948, 1090, "SO", "Solol6"),
+(2948, 1090, "SO", "Sololá"),
 (2949, 1090, "SU", "Suchitepequez"),
 (2950, 1090, "TO", "Totonicapan"),
 (2951, 1090, "ZA", "Zacapa"),
@@ -2407,7 +2407,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (3948, 1161, "20", "Finnmark"),
 (3949, 1161, "04", "Hedmark"),
 (3950, 1161, "12", "Hordaland"),
-(3951, 1161, "15", "Møre ag Romsdal"),
+(3951, 1161, "15", "Møre og Romsdal"),
 (3952, 1161, "18", "Nordland"),
 (3953, 1161, "17", "Nord-Trøndelag"),
 (3954, 1161, "05", "Oppland"),
@@ -3696,7 +3696,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (9993, 1226, "BRK", "Berkshire"),
 (9994, 1226, "WMD", "West Midlands"),
 (9998, 1226, "WGM", "West Glamorgan"),
-(9999, 1226, "LON", "Greater London"),
+(9999, 1226, "LON", "London"),
 
 (10000, 1107, "CI", "Carbonia-Iglesias"),
 (10001, 1107, "OT", "Olbia-Tempio"),
@@ -3898,4 +3898,9 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (NULL, 1119, "064", "Naukšēnu novads"),
 (NULL, 1119, "106", "Ventspils novads"),
 (NULL, 1119, "JKB", "Jēkabpils"),
-(NULL, 1119, "VMR", "Valmiera");
\ No newline at end of file
+(NULL, 1119, "VMR", "Valmiera"),
+
+-- CRM-13314 Added States for Uruguay
+(NULL, 1229, "FL", "Florida"),
+(NULL, 1229, "RN", "Rio Negro"),
+(NULL, 1229, "SJ", "San Jose");