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/ca_ES | |
| 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/ca_ES')
| -rw-r--r-- | libc/localedata/locales/ca_ES | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libc/localedata/locales/ca_ES b/libc/localedata/locales/ca_ES index 68ffd4776..c5dc9faa6 100644 --- a/libc/localedata/locales/ca_ES +++ b/libc/localedata/locales/ca_ES @@ -42,7 +42,7 @@ category "ca_ES:2000";LC_PAPER category "ca_ES:2000";LC_NAME category "ca_ES:2000";LC_ADDRESS category "ca_ES:2000";LC_TELEPHONE - +category "ca_ES:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -156,8 +156,8 @@ int_prefix "<U0033><U0034>" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +% metric +measurement 1 END LC_MEASUREMENT LC_NAME @@ -176,6 +176,8 @@ country_ab3 "<U0045><U0053><U0050>" country_num 724 % E country_car "<U0045>" +% català +lang_name "<U0063><U0061><U0074><U0061><U006C><U00E0>" % ca lang_ab "<U0063><U0061>" % cat |