X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/729e4ab9bc6618bc3d8a898e575df7f4019e29ca..ef6cf650f4a75c3f97de06b51fa104f2069b9ea2:/icuSources/data/locales/fr_CA.txt

diff --git a/icuSources/data/locales/fr_CA.txt b/icuSources/data/locales/fr_CA.txt
index 01c93695..cda679a9 100644
--- a/icuSources/data/locales/fr_CA.txt
+++ b/icuSources/data/locales/fr_CA.txt
@@ -1,129 +1,372 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2010 International Business Machines
-// * Corporation and others.  All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/common/main/fr_CA.xml
+// * Copyright (C) 2016 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_CA.xml
 // *
 // ***************************************************************************
 fr_CA{
     NumberElements{
         latn{
-            patterns{
-                currencyFormat{"#,##0.00 ¤;(#,##0.00 ¤)"}
+            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"}
+                        other{"0 G"}
+                    }
+                    10000000000{
+                        one{"00 G"}
+                        other{"00 G"}
+                    }
+                    100000000000{
+                        one{"000 G"}
+                        other{"000 G"}
+                    }
+                    1000000000000{
+                        one{"0 T"}
+                        other{"0 T"}
+                    }
+                    10000000000000{
+                        one{"00 T"}
+                        other{"00 T"}
+                    }
+                    100000000000000{
+                        one{"000 T"}
+                        other{"000 T"}
+                    }
+                }
             }
         }
     }
-    PaperSize:intvector{
-        279,
-        216,
-    }
-    Version{"2.0.45.82"}
+    Version{"2.1.24.13"}
     calendar{
+        generic{
+            DateTimePatterns{
+                "HH:mm:ss zzzz",
+                "HH:mm:ss z",
+                "HH:mm:ss",
+                "HH:mm",
+                "EEEE d MMMM y G",
+                "d MMMM y G",
+                "d MMM y G",
+                "yy-MM-dd GGGGG",
+                "{1} {0}",
+                "{1} 'à' {0}",
+                "{1} 'à' {0}",
+                "{1} {0}",
+                "{1} {0}",
+            }
+            availableFormats{
+                MEd{"E M-d"}
+                MMd{"MM-d"}
+                MMdd{"MM-dd"}
+                Md{"M-d"}
+                yyyyM{"y-MM G"}
+                yyyyMEd{"E y-MM-dd G"}
+                yyyyMM{"y-MM G"}
+                yyyyMd{"y-MM-dd G"}
+            }
+            intervalFormats{
+                MEd{
+                    M{"E MM-dd – E MM-dd"}
+                    d{"E MM-dd – E MM-dd"}
+                }
+                MMMEd{
+                    d{"E d – E d MMM"}
+                }
+                Md{
+                    M{"MM-dd – MM-dd"}
+                    d{"MM-dd – MM-dd"}
+                }
+                yM{
+                    M{"y-MM – y-MM G"}
+                    y{"y-MM – y-MM G"}
+                }
+                yMEd{
+                    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{"y-MM-dd – y-MM-dd G"}
+                    d{"y-MM-dd – y-MM-dd G"}
+                    y{"y-MM-dd – y-MM-dd G"}
+                }
+            }
+        }
         gregorian{
-            DateTimeElements:intvector{
-                1,
-                4,
+            AmPmMarkersNarrow{
+                "a",
+                "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",
-                "yyyy-MM-dd",
+                "d MMM y",
                 "yy-MM-dd",
                 "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
+                "{1} 'à' {0}",
+                "{1} 'à' {0}",
                 "{1} {0}",
                 "{1} {0}",
             }
             availableFormats{
-                MEd{"EEE M-d"}
+                MEd{"E M-d"}
                 MMd{"MM-d"}
                 MMdd{"MM-dd"}
                 Md{"M-d"}
-                yM{"yyyy-MM"}
-                yMEd{"EEE yyyy-MM-dd"}
-                yyMM{"yy-MM"}
+                yM{"y-MM"}
+                yMEd{"E y-MM-dd"}
+                yMM{"y-MM"}
+                yMd{"y-MM-dd"}
+            }
+            dayPeriod{
+                format{
+                    abbreviated{
+                        afternoon1{"après-midi"}
+                        evening1{"soir"}
+                        midnight{"min."}
+                        morning1{"mat."}
+                        night1{"du matin"}
+                        noon{"midi"}
+                    }
+                    narrow{
+                        afternoon1{"après-midi"}
+                        evening1{"soir"}
+                        midnight{"minuit"}
+                        morning1{"mat."}
+                        night1{"nuit"}
+                        noon{"midi"}
+                    }
+                    wide{
+                        afternoon1{"de l’après-midi"}
+                        evening1{"du soir"}
+                        midnight{"minuit"}
+                        morning1{"du matin"}
+                        night1{"du matin"}
+                        noon{"midi"}
+                    }
+                }
             }
             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"}
                     d{"E MM-dd – E MM-dd"}
                 }
-                MMMM{
-                    M{"LLLL-LLLL"}
-                }
                 Md{
                     M{"MM-dd – MM-dd"}
                     d{"MM-dd – MM-dd"}
                 }
                 d{
-                    d{"d–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"}
+                    a{"h 'h' a – h 'h' a"}
+                    h{"h 'h' – h 'h' a"}
                 }
                 hv{
-                    h{"h–h a v"}
-                }
-                y{
-                    y{"y–y"}
+                    a{"h 'h' a – h 'h' a v"}
+                    h{"h 'h' – h 'h' a v"}
                 }
                 yM{
-                    M{"yy-MM – yy-MM"}
-                    y{"yy-MM – yy-MM"}
+                    M{"y-MM – y-MM"}
+                    y{"y-MM – y-MM"}
                 }
                 yMEd{
-                    M{"'du' E yy-MM-dd 'au' E yy-MM-dd"}
-                    d{"'du' E yy-MM-dd 'au' E yy-MM-dd"}
-                    y{"'du' E yy-MM-dd 'au' E yy-MM-dd"}
+                    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"}
                 }
-                yMMM{
-                    y{"'de' MMM y 'à' MMM y"}
+                yMd{
+                    M{"y-MM-dd – y-MM-dd"}
+                    d{"y-MM-dd – y-MM-dd"}
+                    y{"y-MM-dd – y-MM-dd"}
                 }
-                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"}
+            }
+        }
+        islamic{
+            DateTimePatterns{
+                "HH:mm:ss zzzz",
+                "HH:mm:ss z",
+                "HH:mm:ss",
+                "HH:mm",
+                "EEEE d MMMM y G",
+                "d MMMM y G",
+                "d MMM y G",
+                "y-MM-dd GGGGG",
+                "{1} {0}",
+                "{1} 'à' {0}",
+                "{1} 'à' {0}",
+                "{1} {0}",
+                "{1} {0}",
+            }
+            availableFormats{
+                MEd{"E d MMM"}
+                Md{"MM-dd"}
+                yyyyM{"y-MM GGGGG"}
+                yyyyMEd{"E y-MM-dd GGGGG"}
+                yyyyMd{"y-MM-dd GGGGG"}
+            }
+        }
+    }
+    fields{
+        day-short{
+            relativeTime{
+                future{
+                    one{"dans {0} j"}
+                    other{"dans {0} j"}
                 }
-                yMMMM{
-                    M{"MMMM – MMMM y"}
+            }
+        }
+        hour-narrow{
+            relativeTime{
+                future{
+                    one{"+{0} h"}
+                    other{"+{0} h"}
                 }
-                yMMMd{
-                    M{"'du' d MMM 'au' d MMM y"}
-                    y{"'du' d MMM y 'au' d MMM y"}
+                past{
+                    one{"-{0} h"}
+                    other{"-{0} h"}
                 }
-                yMd{
-                    M{"yy-MM-dd – yy-MM-dd"}
-                    d{"yy-MM-dd – yy-MM-dd"}
-                    y{"yy-MM-dd – yy-MM-dd"}
+            }
+        }
+        minute{
+            relativeTime{
+                future{
+                    one{"Dans {0} minute"}
+                    other{"Dans {0} minutes"}
+                }
+                past{
+                    one{"Il y a {0} minute"}
+                    other{"Il y a {0} minutes"}
+                }
+            }
+        }
+        second-narrow{
+            relativeTime{
+                future{
+                    one{"+ {0} s"}
+                    other{"+{0} s"}
+                }
+            }
+        }
+        year{
+            relativeTime{
+                future{
+                    one{"Dans {0} an"}
+                    other{"Dans {0} ans"}
                 }
+                past{
+                    one{"Il y a {0} an"}
+                    other{"Il y a {0} ans"}
+                }
+            }
+        }
+        year-short{
+            dn{"a"}
+        }
+    }
+    transformNames{
+        x-Publishing{"Édition"}
+    }
+    unitsShort{
+        energy{
+            calorie{
+                one{"{0} cal"}
+                other{"{0} cal"}
+            }
+            foodcalorie{
+                one{"{0} kcal"}
+                other{"{0} kcal"}
+            }
+            joule{
+                one{"{0} J"}
+                other{"{0} J"}
+            }
+            kilocalorie{
+                one{"{0} kcal"}
+                other{"{0} kcal"}
+            }
+            kilojoule{
+                one{"{0} kJ"}
+                other{"{0} kJ"}
             }
         }
     }