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

diff --git a/library/intl/resources/currency/fr.json b/library/intl/resources/currency/fr.json
new file mode 100644
index 000000000..848251d4c
--- /dev/null
+++ b/library/intl/resources/currency/fr.json
@@ -0,0 +1,634 @@
+{
+    "AFN": {
+        "name": "afghani afghan",
+        "symbol": "AFN"
+    },
+    "MGA": {
+        "name": "ariary malgache",
+        "symbol": "MGA"
+    },
+    "THB": {
+        "name": "baht thaïlandais",
+        "symbol": "฿"
+    },
+    "PAB": {
+        "name": "balboa panaméen",
+        "symbol": "PAB"
+    },
+    "ETB": {
+        "name": "birr éthiopien",
+        "symbol": "ETB"
+    },
+    "VEF": {
+        "name": "bolivar vénézuélien",
+        "symbol": "VEF"
+    },
+    "BOB": {
+        "name": "boliviano bolivien",
+        "symbol": "BOB"
+    },
+    "GHS": {
+        "name": "cédi ghanéen",
+        "symbol": "GHS"
+    },
+    "CRC": {
+        "name": "colón costaricain",
+        "symbol": "CRC"
+    },
+    "SVC": {
+        "name": "colón salvadorien",
+        "symbol": "SVC"
+    },
+    "NIO": {
+        "name": "córdoba oro nicaraguayen",
+        "symbol": "NIO"
+    },
+    "DKK": {
+        "name": "couronne danoise",
+        "symbol": "DKK"
+    },
+    "ISK": {
+        "name": "couronne islandaise",
+        "symbol": "ISK"
+    },
+    "NOK": {
+        "name": "couronne norvégienne",
+        "symbol": "NOK"
+    },
+    "SEK": {
+        "name": "couronne suédoise",
+        "symbol": "SEK"
+    },
+    "CZK": {
+        "name": "couronne tchèque",
+        "symbol": "CZK"
+    },
+    "GMD": {
+        "name": "dalasi gambien",
+        "symbol": "GMD"
+    },
+    "MKD": {
+        "name": "denar macédonien",
+        "symbol": "MKD"
+    },
+    "DZD": {
+        "name": "dinar algérien",
+        "symbol": "DZD"
+    },
+    "BHD": {
+        "name": "dinar bahreïni",
+        "symbol": "BHD"
+    },
+    "IQD": {
+        "name": "dinar irakien",
+        "symbol": "IQD"
+    },
+    "JOD": {
+        "name": "dinar jordanien",
+        "symbol": "JOD"
+    },
+    "KWD": {
+        "name": "dinar koweïtien",
+        "symbol": "KWD"
+    },
+    "LYD": {
+        "name": "dinar libyen",
+        "symbol": "LYD"
+    },
+    "RSD": {
+        "name": "dinar serbe",
+        "symbol": "RSD"
+    },
+    "TND": {
+        "name": "dinar tunisien",
+        "symbol": "TND"
+    },
+    "AED": {
+        "name": "dirham des Émirats arabes unis",
+        "symbol": "AED"
+    },
+    "MAD": {
+        "name": "dirham marocain",
+        "symbol": "MAD"
+    },
+    "STD": {
+        "name": "dobra santoméen",
+        "symbol": "STD"
+    },
+    "AUD": {
+        "name": "dollar australien",
+        "symbol": "$AU"
+    },
+    "BSD": {
+        "name": "dollar bahaméen",
+        "symbol": "$BS"
+    },
+    "BBD": {
+        "name": "dollar barbadien",
+        "symbol": "BBD"
+    },
+    "BZD": {
+        "name": "dollar bélizéen",
+        "symbol": "$BZ"
+    },
+    "BMD": {
+        "name": "dollar bermudien",
+        "symbol": "$BM"
+    },
+    "BND": {
+        "name": "dollar brunéien",
+        "symbol": "$BN"
+    },
+    "CAD": {
+        "name": "dollar canadien",
+        "symbol": "$CA"
+    },
+    "HKD": {
+        "name": "dollar de Hong Kong",
+        "symbol": "HKD"
+    },
+    "SGD": {
+        "name": "dollar de Singapour",
+        "symbol": "$SG"
+    },
+    "XCD": {
+        "name": "dollar des Caraïbes orientales",
+        "symbol": "XCD"
+    },
+    "USD": {
+        "name": "dollar des États-Unis",
+        "symbol": "$US"
+    },
+    "KYD": {
+        "name": "dollar des îles Caïmans",
+        "symbol": "KYD"
+    },
+    "SBD": {
+        "name": "dollar des îles Salomon",
+        "symbol": "$SB"
+    },
+    "GYD": {
+        "name": "dollar du Guyana",
+        "symbol": "GYD"
+    },
+    "FJD": {
+        "name": "dollar fidjien",
+        "symbol": "$FJ"
+    },
+    "JMD": {
+        "name": "dollar jamaïcain",
+        "symbol": "JMD"
+    },
+    "LRD": {
+        "name": "dollar libérien",
+        "symbol": "LRD"
+    },
+    "NAD": {
+        "name": "dollar namibien",
+        "symbol": "$NA"
+    },
+    "NZD": {
+        "name": "dollar néo-zélandais",
+        "symbol": "$NZ"
+    },
+    "SRD": {
+        "name": "dollar surinamais",
+        "symbol": "$SR"
+    },
+    "TTD": {
+        "name": "dollar trinidadien",
+        "symbol": "$TT"
+    },
+    "ZWL": {
+        "name": "dollar zimbabwéen (2009)",
+        "symbol": "ZWL"
+    },
+    "VND": {
+        "name": "dông vietnamien",
+        "symbol": "₫"
+    },
+    "AMD": {
+        "name": "dram arménien",
+        "symbol": "AMD"
+    },
+    "CVE": {
+        "name": "escudo capverdien",
+        "symbol": "CVE"
+    },
+    "EUR": {
+        "name": "euro",
+        "symbol": "€"
+    },
+    "ANG": {
+        "name": "florin antillais",
+        "symbol": "ANG"
+    },
+    "AWG": {
+        "name": "florin arubais",
+        "symbol": "AWG"
+    },
+    "HUF": {
+        "name": "forint hongrois",
+        "symbol": "HUF"
+    },
+    "BIF": {
+        "name": "franc burundais",
+        "symbol": "BIF"
+    },
+    "XOF": {
+        "name": "franc CFA (BCEAO)",
+        "symbol": "CFA"
+    },
+    "XAF": {
+        "name": "franc CFA (BEAC)",
+        "symbol": "FCFA"
+    },
+    "XPF": {
+        "name": "franc CFP",
+        "symbol": "FCFP"
+    },
+    "KMF": {
+        "name": "franc comorien",
+        "symbol": "KMF"
+    },
+    "CDF": {
+        "name": "franc congolais",
+        "symbol": "CDF"
+    },
+    "DJF": {
+        "name": "franc djiboutien",
+        "symbol": "DJF"
+    },
+    "GNF": {
+        "name": "franc guinéen",
+        "symbol": "GNF"
+    },
+    "RWF": {
+        "name": "franc rwandais",
+        "symbol": "RWF"
+    },
+    "CHF": {
+        "name": "franc suisse",
+        "symbol": "CHF"
+    },
+    "HTG": {
+        "name": "gourde haïtienne",
+        "symbol": "HTG"
+    },
+    "PYG": {
+        "name": "guaraní paraguayen",
+        "symbol": "PYG"
+    },
+    "UAH": {
+        "name": "hryvnia ukrainienne",
+        "symbol": "UAH"
+    },
+    "PGK": {
+        "name": "kina papouan-néo-guinéen",
+        "symbol": "PGK"
+    },
+    "LAK": {
+        "name": "kip loatien",
+        "symbol": "LAK"
+    },
+    "HRK": {
+        "name": "kuna croate",
+        "symbol": "HRK"
+    },
+    "MWK": {
+        "name": "kwacha malawite",
+        "symbol": "MWK"
+    },
+    "ZMW": {
+        "name": "kwacha zambien",
+        "symbol": "ZMW"
+    },
+    "AOA": {
+        "name": "kwanza angolais",
+        "symbol": "AOA"
+    },
+    "MMK": {
+        "name": "kyat myanmarais",
+        "symbol": "MMK"
+    },
+    "GEL": {
+        "name": "lari géorgien",
+        "symbol": "GEL"
+    },
+    "ALL": {
+        "name": "lek albanais",
+        "symbol": "ALL"
+    },
+    "HNL": {
+        "name": "lempira hondurien",
+        "symbol": "HNL"
+    },
+    "SLL": {
+        "name": "leone sierra-léonais",
+        "symbol": "SLL"
+    },
+    "MDL": {
+        "name": "leu moldave",
+        "symbol": "MDL"
+    },
+    "RON": {
+        "name": "leu roumain",
+        "symbol": "RON"
+    },
+    "BGN": {
+        "name": "lev bulgare",
+        "symbol": "BGN"
+    },
+    "SZL": {
+        "name": "lilangeni swazi",
+        "symbol": "SZL"
+    },
+    "LTL": {
+        "name": "litas lituanien",
+        "symbol": "LTL"
+    },
+    "GIP": {
+        "name": "livre de Gibraltar",
+        "symbol": "£GI"
+    },
+    "SHP": {
+        "name": "livre de Sainte-Hélène",
+        "symbol": "SHP"
+    },
+    "FKP": {
+        "name": "livre des Falkland",
+        "symbol": "£FK"
+    },
+    "EGP": {
+        "name": "livre égyptienne",
+        "symbol": "EGP"
+    },
+    "LBP": {
+        "name": "livre libanaise",
+        "symbol": "£LB"
+    },
+    "SDG": {
+        "name": "livre soudanaise",
+        "symbol": "SDG"
+    },
+    "GBP": {
+        "name": "livre sterling",
+        "symbol": "£GB"
+    },
+    "SSP": {
+        "name": "livre sud-soudanaise",
+        "symbol": "SSP"
+    },
+    "SYP": {
+        "name": "livre syrienne",
+        "symbol": "SYP"
+    },
+    "TRY": {
+        "name": "livre turque",
+        "symbol": "TRY"
+    },
+    "LSL": {
+        "name": "loti lesothan",
+        "symbol": "lLS"
+    },
+    "AZN": {
+        "name": "manat azéri",
+        "symbol": "AZN"
+    },
+    "BAM": {
+        "name": "mark convertible bosniaque",
+        "symbol": "BAM"
+    },
+    "MZN": {
+        "name": "metical mozambicain",
+        "symbol": "MZN"
+    },
+    "ERN": {
+        "name": "nafka érythréen",
+        "symbol": "ERN"
+    },
+    "NGN": {
+        "name": "naira nigérian",
+        "symbol": "NGN"
+    },
+    "BTN": {
+        "name": "ngultrum bouthanais",
+        "symbol": "BTN"
+    },
+    "TWD": {
+        "name": "nouveau dollar taïwanais",
+        "symbol": "TWD"
+    },
+    "TMT": {
+        "name": "nouveau manat turkmène",
+        "symbol": "TMT"
+    },
+    "ILS": {
+        "name": "nouveau shekel israélien",
+        "symbol": "₪"
+    },
+    "PEN": {
+        "name": "nouveau sol péruvien",
+        "symbol": "PEN"
+    },
+    "MRO": {
+        "name": "ouguiya mauritanien",
+        "symbol": "MRO"
+    },
+    "TOP": {
+        "name": "pa’anga tongan",
+        "symbol": "TOP"
+    },
+    "MOP": {
+        "name": "pataca macanaise",
+        "symbol": "MOP"
+    },
+    "ARS": {
+        "name": "peso argentin",
+        "symbol": "$AR"
+    },
+    "CLP": {
+        "name": "peso chilien",
+        "symbol": "$CL"
+    },
+    "COP": {
+        "name": "peso colombien",
+        "symbol": "$CO"
+    },
+    "CUP": {
+        "name": "peso cubain",
+        "symbol": "CUP"
+    },
+    "CUC": {
+        "name": "peso cubain convertible",
+        "symbol": "CUC"
+    },
+    "DOP": {
+        "name": "peso dominicain",
+        "symbol": "DOP"
+    },
+    "MXN": {
+        "name": "peso mexicain",
+        "symbol": "$MX"
+    },
+    "PHP": {
+        "name": "peso philippin",
+        "symbol": "PHP"
+    },
+    "UYU": {
+        "name": "peso uruguayen",
+        "symbol": "$UY"
+    },
+    "BWP": {
+        "name": "pula botswanais",
+        "symbol": "BWP"
+    },
+    "GTQ": {
+        "name": "quetzal guatémaltèque",
+        "symbol": "GTQ"
+    },
+    "ZAR": {
+        "name": "rand sud-africain",
+        "symbol": "ZAR"
+    },
+    "BRL": {
+        "name": "réal brésilien",
+        "symbol": "R$"
+    },
+    "IRR": {
+        "name": "rial iranien",
+        "symbol": "IRR"
+    },
+    "OMR": {
+        "name": "rial omanais",
+        "symbol": "OMR"
+    },
+    "QAR": {
+        "name": "rial qatari",
+        "symbol": "QAR"
+    },
+    "SAR": {
+        "name": "rial saoudien",
+        "symbol": "SAR"
+    },
+    "YER": {
+        "name": "rial yéménite",
+        "symbol": "YER"
+    },
+    "KHR": {
+        "name": "riel cambodgien",
+        "symbol": "KHR"
+    },
+    "MYR": {
+        "name": "ringgit malais",
+        "symbol": "MYR"
+    },
+    "BYR": {
+        "name": "rouble biélorusse",
+        "symbol": "BYR"
+    },
+    "RUB": {
+        "name": "rouble russe",
+        "symbol": "RUB"
+    },
+    "SCR": {
+        "name": "roupie des Seychelles",
+        "symbol": "SCR"
+    },
+    "INR": {
+        "name": "roupie indienne",
+        "symbol": "₹"
+    },
+    "IDR": {
+        "name": "roupie indonésienne",
+        "symbol": "IDR"
+    },
+    "MUR": {
+        "name": "roupie mauricienne",
+        "symbol": "MUR"
+    },
+    "NPR": {
+        "name": "roupie népalaise",
+        "symbol": "NPR"
+    },
+    "PKR": {
+        "name": "roupie pakistanaise",
+        "symbol": "PKR"
+    },
+    "LKR": {
+        "name": "roupie srilankaise",
+        "symbol": "LKR"
+    },
+    "MVR": {
+        "name": "rufiyaa maldivien",
+        "symbol": "MVR"
+    },
+    "KES": {
+        "name": "shilling kényan",
+        "symbol": "KES"
+    },
+    "UGX": {
+        "name": "shilling ougandais",
+        "symbol": "UGX"
+    },
+    "SOS": {
+        "name": "shilling somalien",
+        "symbol": "SOS"
+    },
+    "TZS": {
+        "name": "shilling tanzanien",
+        "symbol": "TZS"
+    },
+    "KGS": {
+        "name": "som kirghize",
+        "symbol": "KGS"
+    },
+    "TJS": {
+        "name": "somoni tadjik",
+        "symbol": "TJS"
+    },
+    "UZS": {
+        "name": "sum ouzbek",
+        "symbol": "UZS"
+    },
+    "BDT": {
+        "name": "taka bangladeshi",
+        "symbol": "BDT"
+    },
+    "WST": {
+        "name": "tala samoan",
+        "symbol": "WS$"
+    },
+    "KZT": {
+        "name": "tenge kazakh",
+        "symbol": "KZT"
+    },
+    "MNT": {
+        "name": "tugrik mongol",
+        "symbol": "MNT"
+    },
+    "VUV": {
+        "name": "vatu vanuatuan",
+        "symbol": "VUV"
+    },
+    "KPW": {
+        "name": "won nord-coréen",
+        "symbol": "KPW"
+    },
+    "KRW": {
+        "name": "won sud-coréen",
+        "symbol": "₩"
+    },
+    "JPY": {
+        "name": "yen japonais",
+        "symbol": "JPY"
+    },
+    "CNY": {
+        "name": "yuan renminbi chinois",
+        "symbol": "CNY"
+    },
+    "PLN": {
+        "name": "zloty polonais",
+        "symbol": "PLN"
+    }
+}
\ No newline at end of file