diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-05-19 13:03:56 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-05-19 13:03:56 +0200 |
| commit | 181c13586f12a9a15ed446b1a9594a5a8831d8d1 (patch) | |
| tree | 52c4786d2d0448e9cbe9f4d25fadc7e7cee52924 /localedata | |
| parent | 9100611515956d730bac91fe23976978b0ab70a6 (diff) | |
| parent | 4828935d386854c19275dbe39e07dbd4bd539d1c (diff) | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 9 | ||||
| -rw-r--r-- | localedata/SUPPORTED | 2 | ||||
| -rw-r--r-- | localedata/locales/es_CR | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 514be38cfb..5ef9e5ae2b 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,12 @@ +2010-05-17 Andreas Schwab <schwab@redhat.com> + + * locales/es_CR (LC_ADDRESS): Fix character names in lang_ab. + +2010-05-04 Andreas Schwab <schwab@redhat.com> + + * SUPPORTED (SUPPORTED-LOCALES): Fix name of tt_RU.UTF-8@iqtelif + locale. + 2010-05-03 Ulrich Drepper <drepper@redhat.com> [BZ #11520] diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index 75e1a00a76..63b2a1c2c8 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -392,7 +392,7 @@ tr_TR.UTF-8/UTF-8 \ tr_TR/ISO-8859-9 \ ts_ZA/UTF-8 \ tt_RU.UTF-8/UTF-8 \ -tt_RU@iqtelif.UTF-8/UTF-8 \ +tt_RU.UTF-8@iqtelif/UTF-8 \ ug_CN/UTF-8 \ uk_UA.UTF-8/UTF-8 \ uk_UA/KOI8-U \ diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR index 35a4b84ded..6cff560624 100644 --- a/localedata/locales/es_CR +++ b/localedata/locales/es_CR @@ -157,7 +157,7 @@ country_post "<U0043><U0052>" country_car "<U0043><U0052>" country_isbn "9930,9977,9968" lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>" -lang_ab "<0065><0073>" +lang_ab "<U0065><U0073>" lang_term "<U0073><U0070><U0061>" country_ab2 "<U0043><U0052>" country_ab3 "<U0043><U0052><U0049>" |