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/es_US | |
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/es_US')
-rw-r--r-- | libc/localedata/locales/es_US | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libc/localedata/locales/es_US b/libc/localedata/locales/es_US index 5c1b74028..6b808d571 100644 --- a/libc/localedata/locales/es_US +++ b/libc/localedata/locales/es_US @@ -44,7 +44,7 @@ category "es_US:2000";LC_PAPER category "es_US:2000";LC_NAME category "es_US:2000";LC_ADDRESS category "es_US:2000";LC_TELEPHONE - +category "es_US:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -187,6 +187,7 @@ int_prefix "<U0031>" END LC_TELEPHONE LC_MEASUREMENT +% US customary units measurement 2 END LC_MEASUREMENT @@ -208,6 +209,8 @@ country_ab3 "<U0055><U0053><U0041>" country_num 840 country_car "<U0055><U0053><U0041>" country_isbn 0 +% EspaƱol +lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>" % es lang_ab "<U0065><U0073>" % spa |