diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-05-09 09:01:52 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-05-09 09:01:52 -0400 |
| commit | 0f7843d00f0703837f380eb03143a4ed5d485ead (patch) | |
| tree | 4946d0f4f81206f79cb49496a2f4821dd4b92222 | |
| parent | 445d72ca267e2f4815847c3ad2bc108952049444 (diff) | |
| parent | 0e8131bb32cf026c87baeacb7abf2a9bdbbc4953 (diff) | |
| download | glibc-0f7843d00f0703837f380eb03143a4ed5d485ead.tar.gz glibc-0f7843d00f0703837f380eb03143a4ed5d485ead.tar.xz glibc-0f7843d00f0703837f380eb03143a4ed5d485ead.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: localedata/ChangeLog
| -rw-r--r-- | localedata/ChangeLog | 5 | ||||
| -rw-r--r-- | localedata/SUPPORTED | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index f5a3d96a51..c9dad8df25 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -5,6 +5,11 @@ Contributed by Soslan Khubulov <soslanx@gmail.com>. * SUPPORTED: Add entry for os_RU. +2010-12-02 Andreas Schwab <schwab@redhat.com> + + * SUPPORTED: Remove .UTF-8 suffix from az_AZ, as_IN, tt_RU locale + names. + 2010-05-17 Andreas Schwab <schwab@redhat.com> * locales/es_CR (LC_ADDRESS): Fix character names in lang_ab. diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index 81d5e11d1d..c9b591914d 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -46,8 +46,8 @@ ar_TN.UTF-8/UTF-8 \ ar_TN/ISO-8859-6 \ ar_YE.UTF-8/UTF-8 \ ar_YE/ISO-8859-6 \ -az_AZ.UTF-8/UTF-8 \ -as_IN.UTF-8/UTF-8 \ +az_AZ/UTF-8 \ +as_IN/UTF-8 \ ast_ES.UTF-8/UTF-8 \ ast_ES/ISO-8859-15 \ be_BY.UTF-8/UTF-8 \ @@ -386,8 +386,8 @@ tr_CY/ISO-8859-9 \ tr_TR.UTF-8/UTF-8 \ tr_TR/ISO-8859-9 \ ts_ZA/UTF-8 \ -tt_RU.UTF-8/UTF-8 \ -tt_RU.UTF-8@iqtelif/UTF-8 \ +tt_RU/UTF-8 \ +tt_RU@iqtelif/UTF-8 \ ug_CN/UTF-8 \ uk_UA.UTF-8/UTF-8 \ uk_UA/KOI8-U \ |