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, 738 insertions, 0 deletions

diff --git a/library/intl/resources/language/es-CO.json b/library/intl/resources/language/es-CO.json
new file mode 100644
index 000000000..afeb6b6b4
--- /dev/null
+++ b/library/intl/resources/language/es-CO.json
@@ -0,0 +1,738 @@
+{
+    "af": {
+        "code": "af",
+        "name": "afrikáans"
+    },
+    "agq": {
+        "code": "agq",
+        "name": "aghem"
+    },
+    "ak": {
+        "code": "ak",
+        "name": "akan"
+    },
+    "sq": {
+        "code": "sq",
+        "name": "albanés"
+    },
+    "de": {
+        "code": "de",
+        "name": "alemán"
+    },
+    "gsw": {
+        "code": "gsw",
+        "name": "alemán (Suiza)"
+    },
+    "de-AT": {
+        "code": "de-AT",
+        "name": "alemán austríaco"
+    },
+    "de-CH": {
+        "code": "de-CH",
+        "name": "alto alemán de Suiza"
+    },
+    "am": {
+        "code": "am",
+        "name": "amárico"
+    },
+    "ar": {
+        "code": "ar",
+        "name": "árabe"
+    },
+    "ar-001": {
+        "code": "ar-001",
+        "name": "árabe estándar moderno"
+    },
+    "hy": {
+        "code": "hy",
+        "name": "armenio"
+    },
+    "ast": {
+        "code": "ast",
+        "name": "asturiano"
+    },
+    "asa": {
+        "code": "asa",
+        "name": "asu"
+    },
+    "az": {
+        "code": "az",
+        "name": "azerbaiyano"
+    },
+    "ksf": {
+        "code": "ksf",
+        "name": "bafia"
+    },
+    "bm": {
+        "code": "bm",
+        "name": "bambara"
+    },
+    "bas": {
+        "code": "bas",
+        "name": "basa"
+    },
+    "bez": {
+        "code": "bez",
+        "name": "bena"
+    },
+    "bn": {
+        "code": "bn",
+        "name": "bengalí"
+    },
+    "be": {
+        "code": "be",
+        "name": "bielorruso"
+    },
+    "my": {
+        "code": "my",
+        "name": "birmano"
+    },
+    "brx": {
+        "code": "brx",
+        "name": "bodo"
+    },
+    "nb": {
+        "code": "nb",
+        "name": "bokmal noruego"
+    },
+    "bs": {
+        "code": "bs",
+        "name": "bosnio"
+    },
+    "br": {
+        "code": "br",
+        "name": "bretón"
+    },
+    "bg": {
+        "code": "bg",
+        "name": "búlgaro"
+    },
+    "kab": {
+        "code": "kab",
+        "name": "cabila"
+    },
+    "ks": {
+        "code": "ks",
+        "name": "cachemiro"
+    },
+    "kn": {
+        "code": "kn",
+        "name": "canarés"
+    },
+    "ca": {
+        "code": "ca",
+        "name": "catalán"
+    },
+    "cs": {
+        "code": "cs",
+        "name": "checo"
+    },
+    "chr": {
+        "code": "chr",
+        "name": "cheroqui"
+    },
+    "cgg": {
+        "code": "cgg",
+        "name": "chiga"
+    },
+    "zh": {
+        "code": "zh",
+        "name": "chino"
+    },
+    "zh-Hans": {
+        "code": "zh-Hans",
+        "name": "chino simplificado"
+    },
+    "zh-Hant": {
+        "code": "zh-Hant",
+        "name": "chino tradicional"
+    },
+    "si": {
+        "code": "si",
+        "name": "cingalés"
+    },
+    "ko": {
+        "code": "ko",
+        "name": "coreano"
+    },
+    "kea": {
+        "code": "kea",
+        "name": "criollo caboverdiano"
+    },
+    "mfe": {
+        "code": "mfe",
+        "name": "criollo mauriciano"
+    },
+    "hr": {
+        "code": "hr",
+        "name": "croata"
+    },
+    "da": {
+        "code": "da",
+        "name": "danés"
+    },
+    "dz": {
+        "code": "dz",
+        "name": "dzongkha"
+    },
+    "ebu": {
+        "code": "ebu",
+        "name": "embu"
+    },
+    "sk": {
+        "code": "sk",
+        "name": "eslovaco"
+    },
+    "sl": {
+        "code": "sl",
+        "name": "esloveno"
+    },
+    "es": {
+        "code": "es",
+        "name": "español"
+    },
+    "es-ES": {
+        "code": "es-ES",
+        "name": "español de España"
+    },
+    "es-MX": {
+        "code": "es-MX",
+        "name": "español de México"
+    },
+    "eo": {
+        "code": "eo",
+        "name": "esperanto"
+    },
+    "et": {
+        "code": "et",
+        "name": "estonio"
+    },
+    "ee": {
+        "code": "ee",
+        "name": "ewé"
+    },
+    "ewo": {
+        "code": "ewo",
+        "name": "ewondo"
+    },
+    "fo": {
+        "code": "fo",
+        "name": "feroés"
+    },
+    "fil": {
+        "code": "fil",
+        "name": "filipino"
+    },
+    "fi": {
+        "code": "fi",
+        "name": "finés"
+    },
+    "nl-BE": {
+        "code": "nl-BE",
+        "name": "flamenco"
+    },
+    "fr": {
+        "code": "fr",
+        "name": "francés"
+    },
+    "fr-CA": {
+        "code": "fr-CA",
+        "name": "francés canadiense"
+    },
+    "fr-CH": {
+        "code": "fr-CH",
+        "name": "francés suizo"
+    },
+    "fy": {
+        "code": "fy",
+        "name": "frisón occidental"
+    },
+    "fur": {
+        "code": "fur",
+        "name": "friulano"
+    },
+    "ff": {
+        "code": "ff",
+        "name": "fula"
+    },
+    "gd": {
+        "code": "gd",
+        "name": "gaélico escocés"
+    },
+    "cy": {
+        "code": "cy",
+        "name": "galés"
+    },
+    "gl": {
+        "code": "gl",
+        "name": "gallego"
+    },
+    "lg": {
+        "code": "lg",
+        "name": "ganda"
+    },
+    "ka": {
+        "code": "ka",
+        "name": "georgiano"
+    },
+    "el": {
+        "code": "el",
+        "name": "griego"
+    },
+    "kl": {
+        "code": "kl",
+        "name": "groenlandés"
+    },
+    "gu": {
+        "code": "gu",
+        "name": "gujarati"
+    },
+    "guz": {
+        "code": "guz",
+        "name": "gusii"
+    },
+    "ha": {
+        "code": "ha",
+        "name": "hausa"
+    },
+    "he": {
+        "code": "he",
+        "name": "hebreo"
+    },
+    "hi": {
+        "code": "hi",
+        "name": "hindi"
+    },
+    "hu": {
+        "code": "hu",
+        "name": "húngaro"
+    },
+    "id": {
+        "code": "id",
+        "name": "indonesio"
+    },
+    "en": {
+        "code": "en",
+        "name": "inglés"
+    },
+    "en-AU": {
+        "code": "en-AU",
+        "name": "inglés australiano"
+    },
+    "en-GB": {
+        "code": "en-GB",
+        "name": "inglés británico"
+    },
+    "en-CA": {
+        "code": "en-CA",
+        "name": "inglés canadiense"
+    },
+    "en-US": {
+        "code": "en-US",
+        "name": "inglés estadounidense"
+    },
+    "ga": {
+        "code": "ga",
+        "name": "irlandés"
+    },
+    "is": {
+        "code": "is",
+        "name": "islandés"
+    },
+    "it": {
+        "code": "it",
+        "name": "italiano"
+    },
+    "ja": {
+        "code": "ja",
+        "name": "japonés"
+    },
+    "km": {
+        "code": "km",
+        "name": "jemer"
+    },
+    "dyo": {
+        "code": "dyo",
+        "name": "jola-fonyi"
+    },
+    "kln": {
+        "code": "kln",
+        "name": "kalenjin"
+    },
+    "kam": {
+        "code": "kam",
+        "name": "kamba"
+    },
+    "kk": {
+        "code": "kk",
+        "name": "kazajo"
+    },
+    "ki": {
+        "code": "ki",
+        "name": "kikuyu"
+    },
+    "ky": {
+        "code": "ky",
+        "name": "kirguís"
+    },
+    "rn": {
+        "code": "rn",
+        "name": "kiroundi"
+    },
+    "vun": {
+        "code": "vun",
+        "name": "kivunjo"
+    },
+    "ksh": {
+        "code": "ksh",
+        "name": "kölsch"
+    },
+    "khq": {
+        "code": "khq",
+        "name": "koyra chiini"
+    },
+    "ses": {
+        "code": "ses",
+        "name": "koyraboro senni"
+    },
+    "nmg": {
+        "code": "nmg",
+        "name": "kwasio"
+    },
+    "lag": {
+        "code": "lag",
+        "name": "langi"
+    },
+    "lo": {
+        "code": "lo",
+        "name": "laosiano"
+    },
+    "lv": {
+        "code": "lv",
+        "name": "letón"
+    },
+    "ln": {
+        "code": "ln",
+        "name": "lingala"
+    },
+    "lt": {
+        "code": "lt",
+        "name": "lituano"
+    },
+    "lu": {
+        "code": "lu",
+        "name": "luba-katanga"
+    },
+    "luo": {
+        "code": "luo",
+        "name": "Luo"
+    },
+    "lb": {
+        "code": "lb",
+        "name": "luxemburgués"
+    },
+    "luy": {
+        "code": "luy",
+        "name": "luyia"
+    },
+    "mk": {
+        "code": "mk",
+        "name": "macedonio"
+    },
+    "jmc": {
+        "code": "jmc",
+        "name": "machame"
+    },
+    "mgh": {
+        "code": "mgh",
+        "name": "makhuwa-meetto"
+    },
+    "kde": {
+        "code": "kde",
+        "name": "makonde"
+    },
+    "ml": {
+        "code": "ml",
+        "name": "malayalam"
+    },
+    "ms": {
+        "code": "ms",
+        "name": "malayo"
+    },
+    "mg": {
+        "code": "mg",
+        "name": "malgache"
+    },
+    "mt": {
+        "code": "mt",
+        "name": "maltés"
+    },
+    "mr": {
+        "code": "mr",
+        "name": "maratí"
+    },
+    "mas": {
+        "code": "mas",
+        "name": "masái"
+    },
+    "mer": {
+        "code": "mer",
+        "name": "meru"
+    },
+    "ro-MD": {
+        "code": "ro-MD",
+        "name": "moldavo"
+    },
+    "mn": {
+        "code": "mn",
+        "name": "mongol"
+    },
+    "mua": {
+        "code": "mua",
+        "name": "mundang"
+    },
+    "naq": {
+        "code": "naq",
+        "name": "nama"
+    },
+    "nd": {
+        "code": "nd",
+        "name": "ndebele septentrional"
+    },
+    "nl": {
+        "code": "nl",
+        "name": "neerlandés"
+    },
+    "ne": {
+        "code": "ne",
+        "name": "nepalí"
+    },
+    "jgo": {
+        "code": "jgo",
+        "name": "ngomba"
+    },
+    "nus": {
+        "code": "nus",
+        "name": "nuer"
+    },
+    "nyn": {
+        "code": "nyn",
+        "name": "nyankole"
+    },
+    "nn": {
+        "code": "nn",
+        "name": "nynorsk noruego"
+    },
+    "or": {
+        "code": "or",
+        "name": "oriya"
+    },
+    "ps": {
+        "code": "ps",
+        "name": "pastún"
+    },
+    "fa": {
+        "code": "fa",
+        "name": "persa"
+    },
+    "pl": {
+        "code": "pl",
+        "name": "polaco"
+    },
+    "pt": {
+        "code": "pt",
+        "name": "portugués"
+    },
+    "pt-BR": {
+        "code": "pt-BR",
+        "name": "portugués de Brasil"
+    },
+    "pt-PT": {
+        "code": "pt-PT",
+        "name": "portugués de Portugal"
+    },
+    "pa": {
+        "code": "pa",
+        "name": "punjabí"
+    },
+    "rm": {
+        "code": "rm",
+        "name": "retorrománico"
+    },
+    "rof": {
+        "code": "rof",
+        "name": "rombo"
+    },
+    "ro": {
+        "code": "ro",
+        "name": "rumano"
+    },
+    "ru": {
+        "code": "ru",
+        "name": "ruso"
+    },
+    "rwk": {
+        "code": "rwk",
+        "name": "rwa"
+    },
+    "saq": {
+        "code": "saq",
+        "name": "samburu"
+    },
+    "se": {
+        "code": "se",
+        "name": "sami septentrional"
+    },
+    "sg": {
+        "code": "sg",
+        "name": "sango"
+    },
+    "sbp": {
+        "code": "sbp",
+        "name": "sangu"
+    },
+    "seh": {
+        "code": "seh",
+        "name": "sena"
+    },
+    "sr": {
+        "code": "sr",
+        "name": "serbio"
+    },
+    "ksb": {
+        "code": "ksb",
+        "name": "shambala"
+    },
+    "sn": {
+        "code": "sn",
+        "name": "shona"
+    },
+    "xog": {
+        "code": "xog",
+        "name": "soga"
+    },
+    "so": {
+        "code": "so",
+        "name": "somalí"
+    },
+    "dsb": {
+        "code": "dsb",
+        "name": "sorbio inferior"
+    },
+    "hsb": {
+        "code": "hsb",
+        "name": "sorbio superior"
+    },
+    "sv": {
+        "code": "sv",
+        "name": "sueco"
+    },
+    "sw": {
+        "code": "sw",
+        "name": "swahili"
+    },
+    "swc": {
+        "code": "swc",
+        "name": "swahili del Congo"
+    },
+    "th": {
+        "code": "th",
+        "name": "tailandés"
+    },
+    "dav": {
+        "code": "dav",
+        "name": "taita"
+    },
+    "zgh": {
+        "code": "zgh",
+        "name": "tamazight"
+    },
+    "tzm": {
+        "code": "tzm",
+        "name": "tamazight del Marruecos Central"
+    },
+    "ta": {
+        "code": "ta",
+        "name": "tamil"
+    },
+    "twq": {
+        "code": "twq",
+        "name": "tasawaq"
+    },
+    "shi": {
+        "code": "shi",
+        "name": "tashelhit"
+    },
+    "te": {
+        "code": "te",
+        "name": "telugu"
+    },
+    "teo": {
+        "code": "teo",
+        "name": "teso"
+    },
+    "bo": {
+        "code": "bo",
+        "name": "tibetano"
+    },
+    "ti": {
+        "code": "ti",
+        "name": "tigriña"
+    },
+    "to": {
+        "code": "to",
+        "name": "tongano"
+    },
+    "tr": {
+        "code": "tr",
+        "name": "turco"
+    },
+    "uk": {
+        "code": "uk",
+        "name": "ucraniano"
+    },
+    "ug": {
+        "code": "ug",
+        "name": "uigur"
+    },
+    "ur": {
+        "code": "ur",
+        "name": "urdu"
+    },
+    "uz": {
+        "code": "uz",
+        "name": "uzbeko"
+    },
+    "vai": {
+        "code": "vai",
+        "name": "Vai"
+    },
+    "eu": {
+        "code": "eu",
+        "name": "vasco"
+    },
+    "vi": {
+        "code": "vi",
+        "name": "vietnamita"
+    },
+    "wae": {
+        "code": "wae",
+        "name": "walser"
+    },
+    "yav": {
+        "code": "yav",
+        "name": "yangben"
+    },
+    "yo": {
+        "code": "yo",
+        "name": "yoruba"
+    },
+    "dje": {
+        "code": "dje",
+        "name": "zarma"
+    },
+    "zu": {
+        "code": "zu",
+        "name": "zulú"
+    }
+}
\ No newline at end of file