diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
| commit | a65dd355fb80a05215e15ae97649de52aec885e3 (patch) | |
| tree | 81701bb0c6b648630f2bf1729a85d7f5eb49e67b /localedata/locales/fr_CA | |
| parent | 296a5732f94abe4d5699dc981e4ccfb950b48cee (diff) | |
| parent | b4578bab30f72cddd2cf38abfb39f9c8dc892249 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'localedata/locales/fr_CA')
| -rw-r--r-- | localedata/locales/fr_CA | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA index 21eb6701ae..5e2c5a124f 100644 --- a/localedata/locales/fr_CA +++ b/localedata/locales/fr_CA @@ -43,7 +43,7 @@ category "fr_CA:2000";LC_PAPER category "fr_CA:2000";LC_NAME category "fr_CA:2000";LC_ADDRESS category "fr_CA:2000";LC_TELEPHONE - +category "fr_CA:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -129,7 +129,8 @@ copy "en_CA" END LC_TELEPHONE LC_MEASUREMENT -copy "en_CA" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME @@ -146,8 +147,14 @@ postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/ country_ab2 "<U0043><U0041>" country_ab3 "<U0043><U0041><U004E>" country_num 124 +% CDN +country_car "<U0043><U0044><U004E>" +% Français lang_name "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>" -lang_ab "<U0066><U0072>" -lang_term "<U0066><U0072><U0061>" +% fr +lang_ab "<U0066><U0072>" +% fra +lang_term "<U0066><U0072><U0061>" +% fre lang_lib "<U0066><U0072><U0065>" END LC_ADDRESS |