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/mer.json b/library/intl/resources/country/mer.json
new file mode 100644
index 000000000..222406ed9
--- /dev/null
+++ b/library/intl/resources/country/mer.json
@@ -0,0 +1,761 @@
+{
+    "IE": {
+        "name": "Aelandi"
+    },
+    "ZA": {
+        "name": "Afrika ya Southi"
+    },
+    "AF": {
+        "name": "Afuganistani"
+    },
+    "CK": {
+        "name": "Aĩrandi cia Cook"
+    },
+    "FK": {
+        "name": "Aĩrandi cia Falklandi"
+    },
+    "KY": {
+        "name": "Aĩrandi cia Kayman"
+    },
+    "MP": {
+        "name": "Aĩrandi cia Mariana ya nothi"
+    },
+    "MH": {
+        "name": "Aĩrandi cia Marshal"
+    },
+    "NF": {
+        "name": "Aĩrandi cia Norfok"
+    },
+    "SB": {
+        "name": "Airandi Cia Solomon"
+    },
+    "TC": {
+        "name": "Aĩrandi cia Takĩ na Kaiko"
+    },
+    "VI": {
+        "name": "Aĩrandi cia Virgin cia Amerika"
+    },
+    "VG": {
+        "name": "Aĩrandi cia Virgin cia Ngeretha"
+    },
+    "IS": {
+        "name": "Aisilandi"
+    },
+    "AR": {
+        "name": "Ajentina"
+    },
+    "AX": {
+        "name": "Åland Islands"
+    },
+    "AL": {
+        "name": "Alubania"
+    },
+    "US": {
+        "name": "Amerika"
+    },
+    "AD": {
+        "name": "Andora"
+    },
+    "DZ": {
+        "name": "Angiria"
+    },
+    "AO": {
+        "name": "Angola"
+    },
+    "AI": {
+        "name": "Anguilla"
+    },
+    "AQ": {
+        "name": "Antarctica"
+    },
+    "AG": {
+        "name": "Antigua na Barbuda"
+    },
+    "AM": {
+        "name": "Armenia"
+    },
+    "AW": {
+        "name": "Aruba"
+    },
+    "AC": {
+        "name": "Ascension Island"
+    },
+    "AT": {
+        "name": "Austiria"
+    },
+    "AU": {
+        "name": "Austrĩlia"
+    },
+    "AZ": {
+        "name": "Azebaijani"
+    },
+    "BB": {
+        "name": "Babadosi"
+    },
+    "BS": {
+        "name": "Bahamasi"
+    },
+    "BH": {
+        "name": "Baharini"
+    },
+    "BM": {
+        "name": "Bamuda"
+    },
+    "BD": {
+        "name": "Bangiradeshi"
+    },
+    "BY": {
+        "name": "Belarusi"
+    },
+    "BZ": {
+        "name": "Belize"
+    },
+    "BJ": {
+        "name": "Benini"
+    },
+    "BE": {
+        "name": "Beronjiamu"
+    },
+    "BO": {
+        "name": "Bolivia"
+    },
+    "BA": {
+        "name": "Bosnia na Hezegovina"
+    },
+    "BW": {
+        "name": "Botswana"
+    },
+    "BR": {
+        "name": "Brazilu"
+    },
+    "BN": {
+        "name": "Brunei"
+    },
+    "BF": {
+        "name": "Bukinafaso"
+    },
+    "BG": {
+        "name": "Bulgaria"
+    },
+    "BI": {
+        "name": "Burundi"
+    },
+    "BT": {
+        "name": "Butani"
+    },
+    "CY": {
+        "name": "Caipurasi"
+    },
+    "IC": {
+        "name": "Canary Islands"
+    },
+    "BQ": {
+        "name": "Caribbean Netherlands"
+    },
+    "EA": {
+        "name": "Ceuta & Melilla"
+    },
+    "TD": {
+        "name": "Chadi"
+    },
+    "CL": {
+        "name": "Chile"
+    },
+    "CN": {
+        "name": "China"
+    },
+    "CX": {
+        "name": "Christmas Island"
+    },
+    "CC": {
+        "name": "Cocos (Keeling) Islands"
+    },
+    "CW": {
+        "name": "Curaçao"
+    },
+    "DK": {
+        "name": "Denimaki"
+    },
+    "DG": {
+        "name": "Diego Garcia"
+    },
+    "DM": {
+        "name": "Dominika"
+    },
+    "EC": {
+        "name": "Ekwado"
+    },
+    "SV": {
+        "name": "Elsavado"
+    },
+    "ER": {
+        "name": "Eritrea"
+    },
+    "EE": {
+        "name": "Estonia"
+    },
+    "AE": {
+        "name": "Falme cia Kiarabu"
+    },
+    "FO": {
+        "name": "Faroe Islands"
+    },
+    "FJ": {
+        "name": "Fiji"
+    },
+    "PH": {
+        "name": "Filipino"
+    },
+    "FI": {
+        "name": "Finilandi"
+    },
+    "FR": {
+        "name": "Fransi"
+    },
+    "TF": {
+        "name": "French Southern Territories"
+    },
+    "GA": {
+        "name": "Gaboni"
+    },
+    "GM": {
+        "name": "Gambia"
+    },
+    "GH": {
+        "name": "Ghana"
+    },
+    "GN": {
+        "name": "Gine"
+    },
+    "GQ": {
+        "name": "Gine ya Iquita"
+    },
+    "GW": {
+        "name": "Ginebisau"
+    },
+    "GD": {
+        "name": "Grenada"
+    },
+    "GG": {
+        "name": "Guernsey"
+    },
+    "GY": {
+        "name": "Guyana"
+    },
+    "GP": {
+        "name": "Gwadelupe"
+    },
+    "GU": {
+        "name": "Gwam"
+    },
+    "GT": {
+        "name": "Gwatemala"
+    },
+    "GF": {
+        "name": "Gwiyana ya Fransi"
+    },
+    "HT": {
+        "name": "Haiti"
+    },
+    "HU": {
+        "name": "Hangarĩ"
+    },
+    "NL": {
+        "name": "Holandi"
+    },
+    "HN": {
+        "name": "Hondurasi"
+    },
+    "HK": {
+        "name": "Hong Kong SAR China"
+    },
+    "IN": {
+        "name": "India"
+    },
+    "ID": {
+        "name": "Indonesia"
+    },
+    "IQ": {
+        "name": "Iraki"
+    },
+    "IR": {
+        "name": "Irani"
+    },
+    "IL": {
+        "name": "Isiraeli"
+    },
+    "IM": {
+        "name": "Isle of Man"
+    },
+    "IT": {
+        "name": "Italĩ"
+    },
+    "ET": {
+        "name": "Ithiopia"
+    },
+    "JM": {
+        "name": "Jamaika"
+    },
+    "JP": {
+        "name": "Japani"
+    },
+    "JE": {
+        "name": "Jersey"
+    },
+    "DJ": {
+        "name": "Jibuti"
+    },
+    "GE": {
+        "name": "Jojia"
+    },
+    "JO": {
+        "name": "Jorondani"
+    },
+    "NC": {
+        "name": "Kalendoia Ĩnjeru"
+    },
+    "KH": {
+        "name": "Kambodia"
+    },
+    "CM": {
+        "name": "Kameruni"
+    },
+    "CA": {
+        "name": "Kanada"
+    },
+    "QA": {
+        "name": "Kata"
+    },
+    "KZ": {
+        "name": "Kazakistani"
+    },
+    "KE": {
+        "name": "Kenya"
+    },
+    "CV": {
+        "name": "Kepuvede"
+    },
+    "KI": {
+        "name": "Kiribati"
+    },
+    "KG": {
+        "name": "Kirigizistani"
+    },
+    "CU": {
+        "name": "Kiuba"
+    },
+    "CI": {
+        "name": "Kodivaa"
+    },
+    "CO": {
+        "name": "Kolombia"
+    },
+    "KM": {
+        "name": "Komoro"
+    },
+    "CG": {
+        "name": "Kongo"
+    },
+    "KP": {
+        "name": "Korea Nothi"
+    },
+    "KR": {
+        "name": "Korea Saũthi"
+    },
+    "HR": {
+        "name": "Koroashia"
+    },
+    "XK": {
+        "name": "Kosovo"
+    },
+    "CR": {
+        "name": "Kostarika"
+    },
+    "KW": {
+        "name": "Kuwĩ ti"
+    },
+    "LA": {
+        "name": "Laosi"
+    },
+    "LV": {
+        "name": "Lativia"
+    },
+    "LB": {
+        "name": "Lebanoni"
+    },
+    "LS": {
+        "name": "Lesotho"
+    },
+    "LR": {
+        "name": "Liberia"
+    },
+    "LY": {
+        "name": "Lĩbia"
+    },
+    "LI": {
+        "name": "Lishenteni"
+    },
+    "LT": {
+        "name": "Lithuania"
+    },
+    "LU": {
+        "name": "Luxembogu"
+    },
+    "MO": {
+        "name": "Macau SAR China"
+    },
+    "MK": {
+        "name": "Macedonia"
+    },
+    "MG": {
+        "name": "Madagasika"
+    },
+    "MW": {
+        "name": "Malawi"
+    },
+    "ML": {
+        "name": "Mali"
+    },
+    "MY": {
+        "name": "Malĩsia"
+    },
+    "MT": {
+        "name": "Malta"
+    },
+    "MQ": {
+        "name": "Martiniki"
+    },
+    "MR": {
+        "name": "Mauritania"
+    },
+    "MU": {
+        "name": "Maurĩtiasi"
+    },
+    "YT": {
+        "name": "Mayotte"
+    },
+    "MX": {
+        "name": "Mexiko"
+    },
+    "FM": {
+        "name": "Mikronesia"
+    },
+    "EG": {
+        "name": "Misiri"
+    },
+    "MV": {
+        "name": "Modivu"
+    },
+    "MD": {
+        "name": "Moldova"
+    },
+    "MC": {
+        "name": "Monako"
+    },
+    "MN": {
+        "name": "Mongolia"
+    },
+    "ME": {
+        "name": "Montenegro"
+    },
+    "MS": {
+        "name": "Montserrati"
+    },
+    "MA": {
+        "name": "Moroko"
+    },
+    "MZ": {
+        "name": "Mozambiki"
+    },
+    "MM": {
+        "name": "Myanima"
+    },
+    "NA": {
+        "name": "Namibia"
+    },
+    "NR": {
+        "name": "Nauru"
+    },
+    "NP": {
+        "name": "Nepali"
+    },
+    "GB": {
+        "name": "Ngeretha"
+    },
+    "GI": {
+        "name": "Ngĩbrata"
+    },
+    "GR": {
+        "name": "Ngiriki"
+    },
+    "GL": {
+        "name": "Ngirinilandi"
+    },
+    "NE": {
+        "name": "Nija"
+    },
+    "NG": {
+        "name": "Nijeria"
+    },
+    "NI": {
+        "name": "Nikaragwa"
+    },
+    "NU": {
+        "name": "Niue"
+    },
+    "NZ": {
+        "name": "Niuzilandi"
+    },
+    "DE": {
+        "name": "Njamanĩ"
+    },
+    "NO": {
+        "name": "Norwi"
+    },
+    "IO": {
+        "name": "Nthĩ cia Ngeretha gatagatĩ ka ĩria ria Hindi"
+    },
+    "CF": {
+        "name": "Nthĩ ya Afrika gatĩgatĩ"
+    },
+    "CZ": {
+        "name": "Nthĩ ya Cheki"
+    },
+    "DO": {
+        "name": "Nthĩ ya Dominika"
+    },
+    "CD": {
+        "name": "Nthĩ ya Kidemokrasĩ ya Kongo"
+    },
+    "OM": {
+        "name": "Omani"
+    },
+    "PK": {
+        "name": "Pakistani"
+    },
+    "PW": {
+        "name": "Palau"
+    },
+    "PA": {
+        "name": "Panama"
+    },
+    "PG": {
+        "name": "Papua"
+    },
+    "PY": {
+        "name": "Paragwai"
+    },
+    "PE": {
+        "name": "Peru"
+    },
+    "PN": {
+        "name": "Pitkairni"
+    },
+    "PL": {
+        "name": "Polandi"
+    },
+    "PF": {
+        "name": "Polinesia ya Fransi"
+    },
+    "PT": {
+        "name": "Potogo"
+    },
+    "PR": {
+        "name": "Pwetoriko"
+    },
+    "RU": {
+        "name": "Rashia"
+    },
+    "RE": {
+        "name": "Riyunioni"
+    },
+    "RO": {
+        "name": "Romania"
+    },
+    "PS": {
+        "name": "Rũtere rwa Westi banki na Gaza cia Palestina"
+    },
+    "RW": {
+        "name": "Rwanda"
+    },
+    "SM": {
+        "name": "Samarino"
+    },
+    "WS": {
+        "name": "Samoa"
+    },
+    "AS": {
+        "name": "Samoa ya Amerika"
+    },
+    "SH": {
+        "name": "Santahelena"
+    },
+    "KN": {
+        "name": "Santakitzi na Nevis"
+    },
+    "LC": {
+        "name": "Santalusia"
+    },
+    "PM": {
+        "name": "Santapieri na Mikeloni"
+    },
+    "VC": {
+        "name": "Santavisenti na Grenadini"
+    },
+    "ST": {
+        "name": "Sao Tome na Principe"
+    },
+    "SA": {
+        "name": "Saudi"
+    },
+    "SN": {
+        "name": "Senego"
+    },
+    "RS": {
+        "name": "Serbia"
+    },
+    "SC": {
+        "name": "Shelisheli"
+    },
+    "SL": {
+        "name": "Siera Leoni"
+    },
+    "SG": {
+        "name": "Singapoo"
+    },
+    "SX": {
+        "name": "Sint Maarten"
+    },
+    "SY": {
+        "name": "Siria"
+    },
+    "LK": {
+        "name": "Sirilanka"
+    },
+    "SK": {
+        "name": "Slovakia"
+    },
+    "SI": {
+        "name": "Slovenia"
+    },
+    "SO": {
+        "name": "Somalia"
+    },
+    "GS": {
+        "name": "South Georgia & South Sandwich Islands"
+    },
+    "SS": {
+        "name": "South Sudan"
+    },
+    "ES": {
+        "name": "Spĩni"
+    },
+    "BL": {
+        "name": "St. Barthélemy"
+    },
+    "MF": {
+        "name": "St. Martin"
+    },
+    "SD": {
+        "name": "Sudani"
+    },
+    "SR": {
+        "name": "Surinamu"
+    },
+    "SJ": {
+        "name": "Svalbard & Jan Mayen"
+    },
+    "SZ": {
+        "name": "Swazilandi"
+    },
+    "SE": {
+        "name": "Swideni"
+    },
+    "CH": {
+        "name": "Swizilandi"
+    },
+    "TW": {
+        "name": "Taiwani"
+    },
+    "TJ": {
+        "name": "Tajikistani"
+    },
+    "TR": {
+        "name": "Takĩ"
+    },
+    "TZ": {
+        "name": "Tanzania"
+    },
+    "TH": {
+        "name": "Thaĩlandi"
+    },
+    "TL": {
+        "name": "Timori ya Isti"
+    },
+    "TG": {
+        "name": "Togo"
+    },
+    "TK": {
+        "name": "Tokelau"
+    },
+    "TO": {
+        "name": "Tonga"
+    },
+    "TT": {
+        "name": "Trinidad na Tobago"
+    },
+    "TA": {
+        "name": "Tristan da Cunha"
+    },
+    "TM": {
+        "name": "Tukumenistani"
+    },
+    "TN": {
+        "name": "Tunisia"
+    },
+    "TV": {
+        "name": "Tuvalu"
+    },
+    "UM": {
+        "name": "U.S. Outlying Islands"
+    },
+    "UG": {
+        "name": "Uganda"
+    },
+    "UA": {
+        "name": "Ukirĩni"
+    },
+    "UY": {
+        "name": "Urugwĩ"
+    },
+    "UZ": {
+        "name": "Uzibekistani"
+    },
+    "VU": {
+        "name": "Vanuatu"
+    },
+    "VA": {
+        "name": "Vatikani"
+    },
+    "VE": {
+        "name": "Venezuela"
+    },
+    "VN": {
+        "name": "Vietinamu"
+    },
+    "WF": {
+        "name": "Walis na Futuna"
+    },
+    "EH": {
+        "name": "Western Sahara"
+    },
+    "YE": {
+        "name": "Yemeni"
+    },
+    "ZM": {
+        "name": "Zambia"
+    },
+    "ZW": {
+        "name": "Zimbabwe"
+    }
+}
\ No newline at end of file