Merge remote-tracking branch 'upstream/master'

Conflicts:
	doc/html/classRedmatrix_1_1Import_1_1Import-members.html
	doc/html/classRedmatrix_1_1Import_1_1Import.js

1 files changed, 761 insertions, 0 deletions

diff --git a/library/intl/resources/country/es-CO.json b/library/intl/resources/country/es-CO.json
new file mode 100644
index 000000000..6a02f5aec
--- /dev/null
+++ b/library/intl/resources/country/es-CO.json
@@ -0,0 +1,761 @@
+{
+    "AF": {
+        "name": "Afganistán"
+    },
+    "AL": {
+        "name": "Albania"
+    },
+    "DE": {
+        "name": "Alemania"
+    },
+    "AD": {
+        "name": "Andorra"
+    },
+    "AO": {
+        "name": "Angola"
+    },
+    "AI": {
+        "name": "Anguila"
+    },
+    "AQ": {
+        "name": "Antártida"
+    },
+    "AG": {
+        "name": "Antigua y Barbuda"
+    },
+    "SA": {
+        "name": "Arabia Saudí"
+    },
+    "DZ": {
+        "name": "Argelia"
+    },
+    "AR": {
+        "name": "Argentina"
+    },
+    "AM": {
+        "name": "Armenia"
+    },
+    "AW": {
+        "name": "Aruba"
+    },
+    "AU": {
+        "name": "Australia"
+    },
+    "AT": {
+        "name": "Austria"
+    },
+    "AZ": {
+        "name": "Azerbaiyán"
+    },
+    "BS": {
+        "name": "Bahamas"
+    },
+    "BD": {
+        "name": "Bangladés"
+    },
+    "BB": {
+        "name": "Barbados"
+    },
+    "BH": {
+        "name": "Baréin"
+    },
+    "BE": {
+        "name": "Bélgica"
+    },
+    "BZ": {
+        "name": "Belice"
+    },
+    "BJ": {
+        "name": "Benín"
+    },
+    "BM": {
+        "name": "Bermudas"
+    },
+    "BY": {
+        "name": "Bielorrusia"
+    },
+    "BO": {
+        "name": "Bolivia"
+    },
+    "BA": {
+        "name": "Bosnia y Herzegovina"
+    },
+    "BW": {
+        "name": "Botsuana"
+    },
+    "BR": {
+        "name": "Brasil"
+    },
+    "BN": {
+        "name": "Brunéi"
+    },
+    "BG": {
+        "name": "Bulgaria"
+    },
+    "BF": {
+        "name": "Burkina Faso"
+    },
+    "BI": {
+        "name": "Burundi"
+    },
+    "BT": {
+        "name": "Bután"
+    },
+    "CV": {
+        "name": "Cabo Verde"
+    },
+    "KH": {
+        "name": "Camboya"
+    },
+    "CM": {
+        "name": "Camerún"
+    },
+    "CA": {
+        "name": "Canadá"
+    },
+    "BQ": {
+        "name": "Caribe neerlandés"
+    },
+    "QA": {
+        "name": "Catar"
+    },
+    "EA": {
+        "name": "Ceuta y Melilla"
+    },
+    "TD": {
+        "name": "Chad"
+    },
+    "CL": {
+        "name": "Chile"
+    },
+    "CN": {
+        "name": "China"
+    },
+    "CY": {
+        "name": "Chipre"
+    },
+    "VA": {
+        "name": "Ciudad del Vaticano"
+    },
+    "CO": {
+        "name": "Colombia"
+    },
+    "KM": {
+        "name": "Comoras"
+    },
+    "KP": {
+        "name": "Corea del Norte"
+    },
+    "KR": {
+        "name": "Corea del Sur"
+    },
+    "CI": {
+        "name": "Costa de Marfil"
+    },
+    "CR": {
+        "name": "Costa Rica"
+    },
+    "HR": {
+        "name": "Croacia"
+    },
+    "CU": {
+        "name": "Cuba"
+    },
+    "CW": {
+        "name": "Curazao"
+    },
+    "DG": {
+        "name": "Diego García"
+    },
+    "DK": {
+        "name": "Dinamarca"
+    },
+    "DM": {
+        "name": "Dominica"
+    },
+    "EC": {
+        "name": "Ecuador"
+    },
+    "EG": {
+        "name": "Egipto"
+    },
+    "SV": {
+        "name": "El Salvador"
+    },
+    "AE": {
+        "name": "Emiratos Árabes Unidos"
+    },
+    "ER": {
+        "name": "Eritrea"
+    },
+    "SK": {
+        "name": "Eslovaquia"
+    },
+    "SI": {
+        "name": "Eslovenia"
+    },
+    "ES": {
+        "name": "España"
+    },
+    "US": {
+        "name": "Estados Unidos"
+    },
+    "EE": {
+        "name": "Estonia"
+    },
+    "ET": {
+        "name": "Etiopía"
+    },
+    "PH": {
+        "name": "Filipinas"
+    },
+    "FI": {
+        "name": "Finlandia"
+    },
+    "FJ": {
+        "name": "Fiyi"
+    },
+    "FR": {
+        "name": "Francia"
+    },
+    "GA": {
+        "name": "Gabón"
+    },
+    "GM": {
+        "name": "Gambia"
+    },
+    "GE": {
+        "name": "Georgia"
+    },
+    "GH": {
+        "name": "Ghana"
+    },
+    "GI": {
+        "name": "Gibraltar"
+    },
+    "GD": {
+        "name": "Granada"
+    },
+    "GR": {
+        "name": "Grecia"
+    },
+    "GL": {
+        "name": "Groenlandia"
+    },
+    "GP": {
+        "name": "Guadalupe"
+    },
+    "GU": {
+        "name": "Guam"
+    },
+    "GT": {
+        "name": "Guatemala"
+    },
+    "GF": {
+        "name": "Guayana Francesa"
+    },
+    "GG": {
+        "name": "Guernesey"
+    },
+    "GN": {
+        "name": "Guinea"
+    },
+    "GQ": {
+        "name": "Guinea Ecuatorial"
+    },
+    "GW": {
+        "name": "Guinea-Bisáu"
+    },
+    "GY": {
+        "name": "Guyana"
+    },
+    "HT": {
+        "name": "Haití"
+    },
+    "HN": {
+        "name": "Honduras"
+    },
+    "HU": {
+        "name": "Hungría"
+    },
+    "IN": {
+        "name": "India"
+    },
+    "ID": {
+        "name": "Indonesia"
+    },
+    "IQ": {
+        "name": "Irak"
+    },
+    "IR": {
+        "name": "Irán"
+    },
+    "IE": {
+        "name": "Irlanda"
+    },
+    "AC": {
+        "name": "Isla Ascensión"
+    },
+    "CX": {
+        "name": "Isla Christmas"
+    },
+    "IM": {
+        "name": "Isla de Man"
+    },
+    "NF": {
+        "name": "Isla Norfolk"
+    },
+    "IS": {
+        "name": "Islandia"
+    },
+    "AX": {
+        "name": "Islas Åland"
+    },
+    "KY": {
+        "name": "Islas Caimán"
+    },
+    "IC": {
+        "name": "islas Canarias"
+    },
+    "CC": {
+        "name": "Islas Cocos"
+    },
+    "CK": {
+        "name": "Islas Cook"
+    },
+    "FO": {
+        "name": "Islas Feroe"
+    },
+    "GS": {
+        "name": "Islas Georgia del Sur y Sandwich del Sur"
+    },
+    "FK": {
+        "name": "Islas Malvinas"
+    },
+    "MP": {
+        "name": "Islas Marianas del Norte"
+    },
+    "MH": {
+        "name": "Islas Marshall"
+    },
+    "UM": {
+        "name": "Islas menores alejadas de EE. UU."
+    },
+    "PN": {
+        "name": "Islas Pitcairn"
+    },
+    "SB": {
+        "name": "Islas Salomón"
+    },
+    "TC": {
+        "name": "Islas Turcas y Caicos"
+    },
+    "VG": {
+        "name": "Islas Vírgenes Británicas"
+    },
+    "VI": {
+        "name": "Islas Vírgenes de EE. UU."
+    },
+    "IL": {
+        "name": "Israel"
+    },
+    "IT": {
+        "name": "Italia"
+    },
+    "JM": {
+        "name": "Jamaica"
+    },
+    "JP": {
+        "name": "Japón"
+    },
+    "JE": {
+        "name": "Jersey"
+    },
+    "JO": {
+        "name": "Jordania"
+    },
+    "KZ": {
+        "name": "Kazajistán"
+    },
+    "KE": {
+        "name": "Kenia"
+    },
+    "KG": {
+        "name": "Kirguistán"
+    },
+    "KI": {
+        "name": "Kiribati"
+    },
+    "XK": {
+        "name": "Kosovo"
+    },
+    "KW": {
+        "name": "Kuwait"
+    },
+    "LA": {
+        "name": "Laos"
+    },
+    "LS": {
+        "name": "Lesoto"
+    },
+    "LV": {
+        "name": "Letonia"
+    },
+    "LB": {
+        "name": "Líbano"
+    },
+    "LR": {
+        "name": "Liberia"
+    },
+    "LY": {
+        "name": "Libia"
+    },
+    "LI": {
+        "name": "Liechtenstein"
+    },
+    "LT": {
+        "name": "Lituania"
+    },
+    "LU": {
+        "name": "Luxemburgo"
+    },
+    "MK": {
+        "name": "Macedonia"
+    },
+    "MG": {
+        "name": "Madagascar"
+    },
+    "MY": {
+        "name": "Malasia"
+    },
+    "MW": {
+        "name": "Malaui"
+    },
+    "MV": {
+        "name": "Maldivas"
+    },
+    "ML": {
+        "name": "Mali"
+    },
+    "MT": {
+        "name": "Malta"
+    },
+    "MA": {
+        "name": "Marruecos"
+    },
+    "MQ": {
+        "name": "Martinica"
+    },
+    "MU": {
+        "name": "Mauricio"
+    },
+    "MR": {
+        "name": "Mauritania"
+    },
+    "YT": {
+        "name": "Mayotte"
+    },
+    "MX": {
+        "name": "México"
+    },
+    "FM": {
+        "name": "Micronesia"
+    },
+    "MD": {
+        "name": "Moldavia"
+    },
+    "MC": {
+        "name": "Mónaco"
+    },
+    "MN": {
+        "name": "Mongolia"
+    },
+    "ME": {
+        "name": "Montenegro"
+    },
+    "MS": {
+        "name": "Montserrat"
+    },
+    "MZ": {
+        "name": "Mozambique"
+    },
+    "MM": {
+        "name": "Myanmar (Birmania)"
+    },
+    "NA": {
+        "name": "Namibia"
+    },
+    "NR": {
+        "name": "Nauru"
+    },
+    "NP": {
+        "name": "Nepal"
+    },
+    "NI": {
+        "name": "Nicaragua"
+    },
+    "NE": {
+        "name": "Níger"
+    },
+    "NG": {
+        "name": "Nigeria"
+    },
+    "NU": {
+        "name": "Niue"
+    },
+    "NO": {
+        "name": "Noruega"
+    },
+    "NC": {
+        "name": "Nueva Caledonia"
+    },
+    "NZ": {
+        "name": "Nueva Zelanda"
+    },
+    "OM": {
+        "name": "Omán"
+    },
+    "NL": {
+        "name": "Países Bajos"
+    },
+    "PK": {
+        "name": "Pakistán"
+    },
+    "PW": {
+        "name": "Palau"
+    },
+    "PA": {
+        "name": "Panamá"
+    },
+    "PG": {
+        "name": "Papúa Nueva Guinea"
+    },
+    "PY": {
+        "name": "Paraguay"
+    },
+    "PE": {
+        "name": "Perú"
+    },
+    "PF": {
+        "name": "Polinesia Francesa"
+    },
+    "PL": {
+        "name": "Polonia"
+    },
+    "PT": {
+        "name": "Portugal"
+    },
+    "PR": {
+        "name": "Puerto Rico"
+    },
+    "HK": {
+        "name": "RAE de Hong Kong (China)"
+    },
+    "MO": {
+        "name": "RAE de Macao (China)"
+    },
+    "GB": {
+        "name": "Reino Unido"
+    },
+    "CF": {
+        "name": "República Centroafricana"
+    },
+    "CZ": {
+        "name": "República Checa"
+    },
+    "CG": {
+        "name": "República del Congo"
+    },
+    "CD": {
+        "name": "República Democrática del Congo"
+    },
+    "DO": {
+        "name": "República Dominicana"
+    },
+    "RE": {
+        "name": "Reunión"
+    },
+    "RW": {
+        "name": "Ruanda"
+    },
+    "RO": {
+        "name": "Rumanía"
+    },
+    "RU": {
+        "name": "Rusia"
+    },
+    "EH": {
+        "name": "Sáhara Occidental"
+    },
+    "WS": {
+        "name": "Samoa"
+    },
+    "AS": {
+        "name": "Samoa Americana"
+    },
+    "BL": {
+        "name": "San Bartolomé"
+    },
+    "KN": {
+        "name": "San Cristóbal y Nieves"
+    },
+    "SM": {
+        "name": "San Marino"
+    },
+    "MF": {
+        "name": "San Martín"
+    },
+    "PM": {
+        "name": "San Pedro y Miquelón"
+    },
+    "VC": {
+        "name": "San Vicente y las Granadinas"
+    },
+    "SH": {
+        "name": "Santa Elena"
+    },
+    "LC": {
+        "name": "Santa Lucía"
+    },
+    "ST": {
+        "name": "Santo Tomé y Príncipe"
+    },
+    "SN": {
+        "name": "Senegal"
+    },
+    "RS": {
+        "name": "Serbia"
+    },
+    "SC": {
+        "name": "Seychelles"
+    },
+    "SL": {
+        "name": "Sierra Leona"
+    },
+    "SG": {
+        "name": "Singapur"
+    },
+    "SX": {
+        "name": "Sint Maarten"
+    },
+    "SY": {
+        "name": "Siria"
+    },
+    "SO": {
+        "name": "Somalia"
+    },
+    "LK": {
+        "name": "Sri Lanka"
+    },
+    "SZ": {
+        "name": "Suazilandia"
+    },
+    "ZA": {
+        "name": "Sudáfrica"
+    },
+    "SD": {
+        "name": "Sudán"
+    },
+    "SS": {
+        "name": "Sudán del Sur"
+    },
+    "SE": {
+        "name": "Suecia"
+    },
+    "CH": {
+        "name": "Suiza"
+    },
+    "SR": {
+        "name": "Surinam"
+    },
+    "SJ": {
+        "name": "Svalbard y Jan Mayen"
+    },
+    "TH": {
+        "name": "Tailandia"
+    },
+    "TW": {
+        "name": "Taiwán"
+    },
+    "TZ": {
+        "name": "Tanzania"
+    },
+    "TJ": {
+        "name": "Tayikistán"
+    },
+    "IO": {
+        "name": "Territorio Británico del Océano Índico"
+    },
+    "TF": {
+        "name": "Territorios Australes Franceses"
+    },
+    "PS": {
+        "name": "Territorios Palestinos"
+    },
+    "TL": {
+        "name": "Timor Oriental"
+    },
+    "TG": {
+        "name": "Togo"
+    },
+    "TK": {
+        "name": "Tokelau"
+    },
+    "TO": {
+        "name": "Tonga"
+    },
+    "TT": {
+        "name": "Trinidad y Tobago"
+    },
+    "TA": {
+        "name": "Tristán da Cunha"
+    },
+    "TN": {
+        "name": "Túnez"
+    },
+    "TM": {
+        "name": "Turkmenistán"
+    },
+    "TR": {
+        "name": "Turquía"
+    },
+    "TV": {
+        "name": "Tuvalu"
+    },
+    "UA": {
+        "name": "Ucrania"
+    },
+    "UG": {
+        "name": "Uganda"
+    },
+    "UY": {
+        "name": "Uruguay"
+    },
+    "UZ": {
+        "name": "Uzbekistán"
+    },
+    "VU": {
+        "name": "Vanuatu"
+    },
+    "VE": {
+        "name": "Venezuela"
+    },
+    "VN": {
+        "name": "Vietnam"
+    },
+    "WF": {
+        "name": "Wallis y Futuna"
+    },
+    "YE": {
+        "name": "Yemen"
+    },
+    "DJ": {
+        "name": "Yibuti"
+    },
+    "ZM": {
+        "name": "Zambia"
+    },
+    "ZW": {
+        "name": "Zimbabue"
+    }
+}
\ No newline at end of file