diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-03 17:51:28 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-03 17:51:28 +0000 |
| commit | f71e9a28759c1f5d6e8dc0baced440e72507b433 (patch) | |
| tree | d1ef7f1f84de67d0446b60c04f10a47c84ac1ddc /libc/localedata/locales/fr_FR | |
| parent | 036dfd44bcc8ed8e97dcd9c763f61d3b59796941 (diff) | |
Merge changes between r24468 and r24941 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@24942 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/localedata/locales/fr_FR')
| -rw-r--r-- | libc/localedata/locales/fr_FR | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libc/localedata/locales/fr_FR b/libc/localedata/locales/fr_FR index f5b5b04d0..c88e06de5 100644 --- a/libc/localedata/locales/fr_FR +++ b/libc/localedata/locales/fr_FR @@ -44,7 +44,7 @@ category "fr_FR:2000";LC_PAPER category "fr_FR:2000";LC_NAME category "fr_FR:2000";LC_ADDRESS category "fr_FR:2000";LC_TELEPHONE - +category "fr_FR:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -160,7 +160,8 @@ int_select "<U0030><U0030>" END LC_TELEPHONE LC_MEASUREMENT -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME @@ -179,6 +180,8 @@ country_ab3 "<U0046><U0052><U0041>" country_num 250 % F country_car "<U0046>" +% Français +lang_name "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>" % fr lang_ab "<U0066><U0072>" % fra |