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@euro | |
| 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@euro')
| -rw-r--r-- | libc/localedata/locales/fr_FR@euro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/localedata/locales/fr_FR@euro b/libc/localedata/locales/fr_FR@euro index 5f858fddd..c1ae9d824 100644 --- a/libc/localedata/locales/fr_FR@euro +++ b/libc/localedata/locales/fr_FR@euro @@ -34,7 +34,7 @@ category "fr_FR@euro:2000";LC_PAPER category "fr_FR@euro:2000";LC_NAME category "fr_FR@euro:2000";LC_ADDRESS category "fr_FR@euro:2000";LC_TELEPHONE - +category "fr_FR@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -71,7 +71,8 @@ copy "fr_FR" END LC_TELEPHONE LC_MEASUREMENT -copy "fr_FR" +% metric +measurement 1 END LC_MEASUREMENT LC_NAME |