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/oc_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/oc_FR')
| -rw-r--r-- | libc/localedata/locales/oc_FR | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libc/localedata/locales/oc_FR b/libc/localedata/locales/oc_FR index dfdc09507..10e3a0387 100644 --- a/libc/localedata/locales/oc_FR +++ b/libc/localedata/locales/oc_FR @@ -46,7 +46,8 @@ country_ab3 "FRA" country_num 250 country_isbn "2" country_car "F" -% FIXME lang_name "Occitan" in Occitan ? +% Occitan +lang_name "<U004F><U0063><U0063><U0069><U0074><U0061><U006E>" % oc lang_ab "<U006F><U0063>" % oci @@ -84,7 +85,8 @@ copy "fr_FR" END LC_PAPER LC_MEASUREMENT -copy "fr_FR" +% metric +measurement 1 END LC_MEASUREMENT LC_TELEPHONE |