Index: source/data/locales/fr_CA.txt |
diff --git a/source/data/locales/fr_CA.txt b/source/data/locales/fr_CA.txt |
index 4fe669b4c26002204e437eb284cdbe9cba6bcb9c..dbd4ed9aafc0761e3763e054790fee52609a5aae 100644 |
--- a/source/data/locales/fr_CA.txt |
+++ b/source/data/locales/fr_CA.txt |
@@ -1,6 +1,6 @@ |
// *************************************************************************** |
// * |
-// * Copyright (C) 2014 International Business Machines |
+// * Copyright (C) 2015 International Business Machines |
// * Corporation and others. All Rights Reserved. |
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter |
// * Source File: <path>/common/main/fr_CA.xml |
@@ -9,7 +9,73 @@ |
fr_CA{ |
NumberElements{ |
latn{ |
+ patternsLong{ |
+ decimalFormat{ |
+ 1000000000{ |
+ one{"0 milliard"} |
+ other{"0 milliards"} |
+ } |
+ 10000000000{ |
+ one{"00 milliard"} |
+ other{"00 milliards"} |
+ } |
+ 100000000000{ |
+ one{"000 milliard"} |
+ other{"000 milliards"} |
+ } |
+ 1000000000000{ |
+ one{"0 billion"} |
+ other{"0 billions"} |
+ } |
+ 10000000000000{ |
+ one{"00 billion"} |
+ other{"00 billions"} |
+ } |
+ 100000000000000{ |
+ one{"000 billion"} |
+ other{"000 billions"} |
+ } |
+ } |
+ } |
patternsShort{ |
+ currencyFormat{ |
+ 1000000{ |
+ one{"0 mn ¤"} |
+ other{"0 mns ¤"} |
+ } |
+ 10000000{ |
+ one{"00 mn ¤"} |
+ other{"00 mns ¤"} |
+ } |
+ 100000000{ |
+ one{"000 mn ¤"} |
+ other{"000 mns ¤"} |
+ } |
+ 1000000000{ |
+ one{"0 md ¤"} |
+ other{"0 mds ¤"} |
+ } |
+ 10000000000{ |
+ one{"00 md ¤"} |
+ other{"00 mds ¤"} |
+ } |
+ 100000000000{ |
+ one{"000 md ¤"} |
+ other{"000 mds ¤"} |
+ } |
+ 1000000000000{ |
+ one{"0 bn ¤"} |
+ other{"0 bns ¤"} |
+ } |
+ 10000000000000{ |
+ one{"00 bn ¤"} |
+ other{"00 bns ¤"} |
+ } |
+ 100000000000000{ |
+ one{"000 bn ¤"} |
+ other{"000 bns ¤"} |
+ } |
+ } |
decimalFormat{ |
1000000000{ |
one{"0 G"} |
@@ -39,18 +105,18 @@ fr_CA{ |
} |
} |
} |
- Version{"2.1.8.19"} |
+ Version{"2.1.19.14"} |
calendar{ |
generic{ |
DateTimePatterns{ |
- "HH 'h' mm 'min' ss 's' zzzz", |
+ "HH:mm:ss zzzz", |
"HH:mm:ss z", |
"HH:mm:ss", |
"HH:mm", |
"EEEE d MMMM y G", |
"d MMMM y G", |
- "G y-MM-dd", |
- "GGGGG yy-MM-dd", |
+ "d MMM y G", |
+ "yy-MM-dd GGGGG", |
"{1} {0}", |
"{1} 'à' {0}", |
"{1} 'à' {0}", |
@@ -62,29 +128,12 @@ fr_CA{ |
MMd{"MM-d"} |
MMdd{"MM-dd"} |
Md{"M-d"} |
- yyyyM{"G y-MM"} |
- yyyyMEd{"E G y-MM-dd"} |
- yyyyMM{"G y-MM"} |
- yyyyMd{"G y-MM-dd"} |
+ yyyyM{"y-MM G"} |
+ yyyyMEd{"E y-MM-dd G"} |
+ yyyyMM{"y-MM G"} |
+ yyyyMd{"y-MM-dd G"} |
} |
intervalFormats{ |
- H{ |
- H{"HH–HH"} |
- } |
- Hm{ |
- H{"HH:mm–HH:mm"} |
- m{"HH:mm–HH:mm"} |
- } |
- Hmv{ |
- H{"HH:mm–HH:mm v"} |
- m{"HH:mm–HH:mm v"} |
- } |
- Hv{ |
- H{"HH–HH v"} |
- } |
- M{ |
- M{"M–M"} |
- } |
MEd{ |
M{"E MM-dd – E MM-dd"} |
d{"E MM-dd – E MM-dd"} |
@@ -96,51 +145,19 @@ fr_CA{ |
M{"MM-dd – MM-dd"} |
d{"MM-dd – MM-dd"} |
} |
- d{ |
- d{"d–d"} |
- } |
- h{ |
- h{"h–h a"} |
- } |
- hm{ |
- h{"h:mm–h:mm a"} |
- m{"h:mm–h:mm a"} |
- } |
- hmv{ |
- h{"h:mm–h:mm a v"} |
- m{"h:mm–h:mm a v"} |
- } |
- hv{ |
- h{"h–h a v"} |
- } |
- y{ |
- y{"G y–y"} |
- } |
yM{ |
- M{"G y-MM – y-MM"} |
- y{"G y-MM – y-MM"} |
+ M{"y-MM – y-MM G"} |
+ y{"y-MM – y-MM G"} |
} |
yMEd{ |
- M{"'du' E y-MM-dd 'au' E y-MM-dd G"} |
- d{"'du' E y-MM-dd 'au' E y-MM-dd G"} |
- y{"'du' E y-MM-dd 'au' E y-MM-dd G"} |
- } |
- yMMM{ |
- y{"'de' MMM y 'à' MMM y G"} |
- } |
- yMMMEd{ |
- M{"'du' E d MMM 'au' E d MMM y G"} |
- d{"'du' E d 'au' E d MMM y G"} |
- y{"'du' E d MMM y 'au' E d MMM y G"} |
- } |
- yMMMd{ |
- M{"'du' d MMM 'au' d MMM y G"} |
- y{"'du' d MMM y 'au' d MMM y G"} |
+ M{"E y-MM-dd – E y-MM-dd G"} |
+ d{"E y-MM-dd – E y-MM-dd G"} |
+ y{"E y-MM-dd – E y-MM-dd G"} |
} |
yMd{ |
- M{"G y-MM-dd – y-MM-dd"} |
- d{"G y-MM-dd – y-MM-dd"} |
- y{"G y-MM-dd – y-MM-dd"} |
+ M{"y-MM-dd – y-MM-dd G"} |
+ d{"y-MM-dd – y-MM-dd G"} |
+ y{"y-MM-dd – y-MM-dd G"} |
} |
} |
} |
@@ -150,13 +167,13 @@ fr_CA{ |
"p", |
} |
DateTimePatterns{ |
- "HH 'h' mm 'min' ss 's' zzzz", |
+ "HH:mm:ss zzzz", |
"HH:mm:ss z", |
"HH:mm:ss", |
"HH:mm", |
"EEEE d MMMM y", |
"d MMMM y", |
- "y-MM-dd", |
+ "d MMM y", |
"yy-MM-dd", |
"{1} {0}", |
"{1} 'à' {0}", |
@@ -174,57 +191,34 @@ fr_CA{ |
yMM{"y-MM"} |
yMd{"y-MM-dd"} |
} |
- dayNames{ |
- stand-alone{ |
+ dayPeriod{ |
+ format{ |
abbreviated{ |
- "dim.", |
- "lun.", |
- "mar.", |
- "mer.", |
- "jeu.", |
- "ven.", |
- "sam.", |
+ afternoon1{"après-midi"} |
+ night1{"du matin"} |
+ noon{"midi"} |
} |
- short{ |
- "dim.", |
- "lun.", |
- "mar.", |
- "mer.", |
- "jeu.", |
- "ven.", |
- "sam.", |
+ narrow{ |
+ afternoon1{"après-midi"} |
+ midnight{"minuit"} |
+ night1{"nuit"} |
+ noon{"midi"} |
} |
wide{ |
- "dimanche", |
- "lundi", |
- "mardi", |
- "mercredi", |
- "jeudi", |
- "vendredi", |
- "samedi", |
+ afternoon1{"de l’après-midi"} |
+ evening1{"du soir"} |
+ morning1{"du matin"} |
+ night1{"du matin"} |
+ noon{"midi"} |
} |
} |
} |
- eras{ |
- wide%variant{ |
- "avant l’ère commune", |
- "ère commune", |
- } |
- } |
intervalFormats{ |
H{ |
- H{"HH–HH"} |
- } |
- Hm{ |
- H{"HH:mm–HH:mm"} |
- m{"HH:mm–HH:mm"} |
- } |
- Hmv{ |
- H{"HH:mm–HH:mm v"} |
- m{"HH:mm–HH:mm v"} |
+ H{"H 'h' – H 'h'"} |
} |
Hv{ |
- H{"HH–HH v"} |
+ H{"H 'h' – H 'h' v"} |
} |
MEd{ |
M{"E MM-dd – E MM-dd"} |
@@ -235,44 +229,24 @@ fr_CA{ |
d{"MM-dd – MM-dd"} |
} |
d{ |
- d{"d–d"} |
+ d{"d – d"} |
} |
h{ |
- a{"h 'h' a – h 'h' a"} |
- h{"h–h a"} |
- } |
- hm{ |
- h{"h:mm–h:mm a"} |
- m{"h:mm–h:mm a"} |
- } |
- hmv{ |
- h{"h:mm–h:mm a v"} |
- m{"h:mm–h:mm a v"} |
+ a{"h 'h' a – h 'h' a"} |
+ h{"h 'h' – h 'h' a"} |
} |
hv{ |
a{"h 'h' a – h 'h' a v"} |
- h{"h–h a v"} |
+ h{"h 'h' – h 'h' a v"} |
} |
yM{ |
M{"y-MM – y-MM"} |
y{"y-MM – y-MM"} |
} |
yMEd{ |
- M{"'du' E y-MM-dd 'au' E y-MM-dd"} |
- d{"'du' E y-MM-dd 'au' E y-MM-dd"} |
- y{"'du' E y-MM-dd 'au' E y-MM-dd"} |
- } |
- yMMM{ |
- y{"'de' MMM y 'à' MMM y"} |
- } |
- yMMMEd{ |
- M{"'du' E d MMM 'au' E d MMM y"} |
- d{"'du' E d 'au' E d MMM y"} |
- y{"'du' E d MMM y 'au' E d MMM y"} |
- } |
- yMMMd{ |
- M{"'du' d MMM 'au' d MMM y"} |
- y{"'du' d MMM y 'au' d MMM y"} |
+ M{"E y-MM-dd – E y-MM-dd"} |
+ d{"E y-MM-dd – E y-MM-dd"} |
+ y{"E y-MM-dd – E y-MM-dd"} |
} |
yMd{ |
M{"y-MM-dd – y-MM-dd"} |
@@ -280,42 +254,10 @@ fr_CA{ |
y{"y-MM-dd – y-MM-dd"} |
} |
} |
- monthNames{ |
- stand-alone{ |
- abbreviated{ |
- "janv.", |
- "févr.", |
- "mars", |
- "avr.", |
- "mai", |
- "juin", |
- "juil.", |
- "août", |
- "sept.", |
- "oct.", |
- "nov.", |
- "déc.", |
- } |
- wide{ |
- "janvier", |
- "février", |
- "mars", |
- "avril", |
- "mai", |
- "juin", |
- "juillet", |
- "août", |
- "septembre", |
- "octobre", |
- "novembre", |
- "décembre", |
- } |
- } |
- } |
} |
islamic{ |
DateTimePatterns{ |
- "HH 'h' mm 'min' ss 's' zzzz", |
+ "HH:mm:ss zzzz", |
"HH:mm:ss z", |
"HH:mm:ss", |
"HH:mm", |
@@ -336,30 +278,27 @@ fr_CA{ |
yyyyMEd{"E y-MM-dd GGGGG"} |
yyyyMd{"y-MM-dd GGGGG"} |
} |
- } |
- } |
- delimiters{ |
- alternateQuotationEnd{"›"} |
- alternateQuotationStart{"‹"} |
- } |
- durationUnits{ |
- hm{"h:mm"} |
- hms{"h:mm:ss"} |
- ms{"m:ss"} |
- } |
- fields{ |
- day{ |
- relativeTime{ |
- future{ |
- one{"Dans {0} jour"} |
- other{"Dans {0} jours"} |
- } |
- past{ |
- one{"Il y a {0} jour"} |
- other{"Il y a {0} jours"} |
+ monthNames{ |
+ format{ |
+ wide{ |
+ "mouharram", |
+ "safar", |
+ "rabia al awal", |
+ "rabia ath-thani", |
+ "joumada al oula", |
+ "joumada ath-thania", |
+ "rajab", |
+ "chaabane", |
+ "ramadan", |
+ "chawwal", |
+ "dhou al qi`da", |
+ "dhou al-hijja", |
+ } |
} |
} |
} |
+ } |
+ fields{ |
day-short{ |
relativeTime{ |
future{ |
@@ -368,25 +307,15 @@ fr_CA{ |
} |
} |
} |
- dayperiod{ |
- dn{"système horaire"} |
- } |
- fri-narrow{ |
- relative{ |
- "-1"{"ven. dernier"} |
- "0"{"ce ven."} |
- "1"{"ven. prochain"} |
- } |
- } |
- hour{ |
+ hour-narrow{ |
relativeTime{ |
future{ |
- one{"Dans {0} heure"} |
- other{"Dans {0} heures"} |
+ one{"+{0} h"} |
+ other{"+{0} h"} |
} |
past{ |
- one{"Il y a {0} heure"} |
- other{"Il y a {0} heures"} |
+ one{"-{0} h"} |
+ other{"-{0} h"} |
} |
} |
} |
@@ -402,47 +331,6 @@ fr_CA{ |
} |
} |
} |
- mon-narrow{ |
- relative{ |
- "-1"{"lun. dernier"} |
- "0"{"ce lun."} |
- "1"{"lun. prochain"} |
- } |
- } |
- month{ |
- relativeTime{ |
- future{ |
- one{"Dans {0} mois"} |
- other{"Dans {0} mois"} |
- } |
- past{ |
- one{"Il y a {0} mois"} |
- other{"Il y a {0} mois"} |
- } |
- } |
- } |
- month-narrow{ |
- dn{"m."} |
- } |
- sat-narrow{ |
- relative{ |
- "-1"{"sam. dernier"} |
- "0"{"ce sam."} |
- "1"{"sam. prochain"} |
- } |
- } |
- second{ |
- relativeTime{ |
- future{ |
- one{"Dans {0} seconde"} |
- other{"Dans {0} secondes"} |
- } |
- past{ |
- one{"Il y a {0} seconde"} |
- other{"Il y a {0} secondes"} |
- } |
- } |
- } |
second-narrow{ |
relativeTime{ |
future{ |
@@ -451,46 +339,6 @@ fr_CA{ |
} |
} |
} |
- sun-narrow{ |
- relative{ |
- "-1"{"dim. dernier"} |
- "0"{"ce dim."} |
- "1"{"dim. prochain"} |
- } |
- } |
- thu-narrow{ |
- relative{ |
- "-1"{"jeu. dernier"} |
- "0"{"ce jeu."} |
- "1"{"jeu. prochain"} |
- } |
- } |
- tue-narrow{ |
- relative{ |
- "-1"{"mar. dernier"} |
- "0"{"ce mar."} |
- "1"{"mar. prochain"} |
- } |
- } |
- wed-narrow{ |
- relative{ |
- "-1"{"mer. dernier"} |
- "0"{"ce mer."} |
- "1"{"ce mer."} |
- } |
- } |
- week{ |
- relativeTime{ |
- future{ |
- one{"Dans {0} semaine"} |
- other{"Dans {0} semaines"} |
- } |
- past{ |
- one{"Il y a {0} semaine"} |
- other{"Il y a {0} semaines"} |
- } |
- } |
- } |
year{ |
relativeTime{ |
future{ |
@@ -503,11 +351,11 @@ fr_CA{ |
} |
} |
} |
+ year-short{ |
+ dn{"a"} |
+ } |
} |
transformNames{ |
- Numeric{"Chiffres"} |
- x-Fullwidth{"Pleine largeur"} |
- x-Halfwidth{"Demie largeur"} |
x-Publishing{"Édition"} |
} |
} |