libX11: Changes to 'master'

[Egbert Eich]

 nls/compose.dir.pre         |   98 ++++++++++++----
 nls/ja.S90/XI18N_OBJS       |    7 -
 nls/ja.S90/XLC_LOCALE.pre   |  150 -------------------------
 nls/ja.U90/XI18N_OBJS       |    7 -
 nls/ja.U90/XLC_LOCALE.pre   |  151 --------------------------
 nls/ja_JP.UTF-8/Compose.pre |    1 
 nls/km_KH.UTF-8/Compose.pre |    8 +
 nls/km_KH.UTF-8/XI18N_OBJS  |    8 +
 nls/ko_KR.UTF-8/Compose.pre |    1 
 nls/locale.alias.pre        |  254 ++++++++++++++++++++++++--------------------
 nls/locale.dir.pre          |   43 +++++--
 nls/sr_CS.UTF-8/Compose.pre |  128 ++++++++++++++++++++++
 nls/sr_CS.UTF-8/XI18N_OBJS  |    8 +
 nls/th_TH.UTF-8/Compose.pre |    1 
 nls/zh_CN.UTF-8/Compose.pre |    1 
 nls/zh_HK.UTF-8/Compose.pre |    1 
 nls/zh_TW.UTF-8/Compose.pre |    1 
 17 files changed, 404 insertions(+), 464 deletions(-)

New commits:
commit 0a740a574aaf0c0eec78859b773a532cff3b74c3
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri May 20 13:04:11 2011 +0200

    i18n: Uppercased all occurances if 'iso8859' in the full locale name.
    
    Making all occurances of iso8859 upper case in the full local name
    makes the alias entries more consistent and match the entries on
    locale.dir.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 5e7d589697755a70fb22d85c6a1ae82b39843e53
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri May 20 17:55:49 2011 +0200

    i18n: Remove ja.S90 and ja.U90 locales.
    
    Both locales carry a copyright notice and a prorietary statement:
    
    Copyright 1995 by FUJITSU LIMITED
    This is source code modified by FUJITSU LIMITED under the Joint
    Development Agreement for the CDEnext PST.
    This is unpublished proprietary source code of FUJITSU LIMITED
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 99eae3dcb7bf6764e3b243d2a2934a4d1ecce90e
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri May 20 16:46:15 2011 +0200

    i18n: Bring locale.dir and compose.dir in sync.
    
    Some entries for locale/encoding combinations were missing from
    either file or just misspelled, some entries were wrong or just
    aliases.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit d1e6baa4e290b758e430077cb74e7c03ad850771
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri May 20 14:02:39 2011 +0200

    i18n: Treat 'a3_AZ' as an alias for 'az_AZ'.
    
    locale.alias contains a comment:
    XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
    Thus lets treat 'a3' as an alias for 'az'.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Magnus Kessler <Magnus.Kessler at gmx.net>

commit fa2aab0bea18efa26a56977d3166277582ab7b07
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri May 20 13:09:38 2011 +0200

    i18n: Fixed typos in full locale names.
    
    Fixing those typos those names actually match entries in
    locale.dir.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit b88dd95005dce4c40f9b4d5f938f945e7955fd04
Author: Egbert Eich <eich at freedesktop.org>
Date:   Sat May 21 07:29:38 2011 +0200

    i18n: Remove duplicates and aliases to oneself.
    
    Aliases to itself don't make much sense.
    This changes occurances of:
    xy_UV.UTF-8:			xy_UV.UTF-8
    to
    xy_UV:			xy_UV.UTF-8
    where applicable.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit f198c6aa98f88ff285d903175a3c4c0fd33a4575
Author: Jens Herden <jens.herden at email.de>
Date:   Fri May 20 17:29:03 2011 +0200

    i18n: Add support for Khmer locale and compose table.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit 40761898692e5063957bfa2518cca3d35b2e354a
Author: Kalman Kemenczy <kkemenczy at novell.com>
Date:   Fri May 20 17:03:24 2011 +0200

    i18n: Add support for Serbian specific compose table entries.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit 7c14aacc9f01d7a975f8d9d033b9b13cbd777a61
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri May 20 14:00:35 2011 +0200

    i18n: Adding and removing comments.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit 7754d68976106183751243c2c35a84134be17b34
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri May 20 13:45:31 2011 +0200

    i18n: Add missing locales which existed in locale.alias.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: James Cloos <cloos at jhcloos.com>

commit 952eccd0d25ba66023acfd31873eee2e71c38c42
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri May 20 10:57:57 2011 +0200

    i18n: Consolidate compose handling for locales with UTF-8 encoding.
    
    - add an entry to include the default en_US compose file
      for the ja_JP, ko_KR, th_TH, zh_CN, zh_HK and zh_TW locales.
    - add missing entries for zh_CN. and zh_HK and am_ET.
    - change entries for the UTF-8 encoding for ru_RU, ja_JP,
      ko_KR, th_TH and zh_TW to point to their native directory
      entries.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: James Cloos <cloos at jhcloos.com>