Skip to content

Commit c1d0926

Browse files
bhaiblebhaible
committed
Update from gettext.
1 parent 2359d33 commit c1d0926

File tree

2 files changed

+134
-73
lines changed

2 files changed

+134
-73
lines changed

‎libcharset/lib/ChangeLog‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
2004-01-21 Bruno Haible <bruno@clisp.org>
2+
3+
Upgrade from gettext-0.14.
4+
5+
2004-01-21 Bruno Haible <bruno@clisp.org>
6+
* config.charset: Add support for MacOS X (Darwin).
7+
8+
2003-12-02 Bruno Haible <bruno@clisp.org>
9+
* config.charset: Treat the new country name CS like the old country
10+
name YU.
11+
12+
2003-08-20 Bruno Haible <bruno@clisp.org>
13+
* config.charset (linux-gnulibc1*): Change hr_HR, ro_RO to ISO-8859-2.
14+
Reported by Alain Guibert <derogaton+bgli@oreka.com>.
15+
16+
2003-08-14 Bruno Haible <bruno@clisp.org>
17+
* config.charset: Add support for Linux libc5. Based on data from
18+
Alain Guibert <derogaton+bgli@oreka.com>.
19+
120
2003-06-27 Bruno Haible <bruno@clisp.org>
221

322
Avoid use of *_unlocked functions on Solaris 2.5.1.

‎libcharset/lib/config.charset‎

Lines changed: 115 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /bin/sh
22
# Output a system dependent table of character encoding aliases.
33
#
4-
# Copyright (C) 2000-2003 Free Software Foundation, Inc.
4+
# Copyright (C) 2000-2004 Free Software Foundation, Inc.
55
#
66
# This program is free software; you can redistribute it and/or modify it
77
# under the terms of the GNU Library General Public License as published
@@ -30,77 +30,77 @@
3030
# MIME charset name is preferred.
3131
# The current list of GNU canonical charset names is as follows.
3232
#
33-
# name used by which systems a MIME name?
34-
# ASCII, ANSI_X3.4-1968 glibc solaris freebsd
35-
# ISO-8859-1 glibc aix hpux irix osf solaris freebsd yes
36-
# ISO-8859-2 glibc aix hpux irix osf solaris freebsd yes
37-
# ISO-8859-3 glibc solaris yes
38-
# ISO-8859-4 osf solaris freebsd yes
39-
# ISO-8859-5 glibc aix hpux irix osf solaris freebsd yes
40-
# ISO-8859-6 glibc aix hpux solaris yes
41-
# ISO-8859-7 glibc aix hpux irix osf solaris yes
42-
# ISO-8859-8 glibc aix hpux osf solaris yes
43-
# ISO-8859-9 glibc aix hpux irix osf solaris yes
44-
# ISO-8859-13 glibc
45-
# ISO-8859-14 glibc
46-
# ISO-8859-15 glibc aix osf solaris freebsd
47-
# KOI8-R glibc solaris freebsd yes
48-
# KOI8-U glibc freebsd yes
49-
# KOI8-T glibc
50-
# CP437 dos
51-
# CP775 dos
52-
# CP850 aix osf dos
53-
# CP852 dos
54-
# CP855 dos
55-
# CP856 aix
56-
# CP857 dos
57-
# CP861 dos
58-
# CP862 dos
59-
# CP864 dos
60-
# CP865 dos
61-
# CP866 freebsd dos
62-
# CP869 dos
63-
# CP874 woe32 dos
64-
# CP922 aix
65-
# CP932 aix woe32 dos
66-
# CP943 aix
67-
# CP949 osf woe32 dos
68-
# CP950 woe32 dos
69-
# CP1046 aix
70-
# CP1124 aix
71-
# CP1125 dos
72-
# CP1129 aix
73-
# CP1250 woe32
74-
# CP1251 glibc solaris woe32
75-
# CP1252 aix woe32
76-
# CP1253 woe32
77-
# CP1254 woe32
78-
# CP1255 glibc woe32
79-
# CP1256 woe32
80-
# CP1257 woe32
81-
# GB2312 glibc aix hpux irix solaris freebsd yes
82-
# EUC-JP glibc aix hpux irix osf solaris freebsd yes
83-
# EUC-KR glibc aix hpux irix osf solaris freebsd yes
84-
# EUC-TW glibc aix hpux irix osf solaris
85-
# BIG5 glibc aix hpux osf solaris freebsd yes
86-
# BIG5-HKSCS glibc solaris
87-
# GBK glibc aix osf solaris woe32 dos
88-
# GB18030 glibc solaris
89-
# SHIFT_JIS hpux osf solaris freebsd yes
90-
# JOHAB glibc solaris woe32
91-
# TIS-620 glibc aix hpux osf solaris
92-
# VISCII glibc yes
93-
# TCVN5712-1 glibc
94-
# GEORGIAN-PS glibc
95-
# HP-ROMAN8 hpux
96-
# HP-ARABIC8 hpux
97-
# HP-GREEK8 hpux
98-
# HP-HEBREW8 hpux
99-
# HP-TURKISH8 hpux
100-
# HP-KANA8 hpux
101-
# DEC-KANJI osf
102-
# DEC-HANYU osf
103-
# UTF-8 glibc aix hpux osf solaris yes
33+
# name MIME? used by which systems
34+
# ASCII, ANSI_X3.4-1968 glibc solaris freebsd darwin
35+
# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd darwin
36+
# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd darwin
37+
# ISO-8859-3 Y glibc solaris
38+
# ISO-8859-4 Y osf solaris freebsd darwin
39+
# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin
40+
# ISO-8859-6 Y glibc aix hpux solaris
41+
# ISO-8859-7 Y glibc aix hpux irix osf solaris
42+
# ISO-8859-8 Y glibc aix hpux osf solaris
43+
# ISO-8859-9 Y glibc aix hpux irix osf solaris
44+
# ISO-8859-13 glibc
45+
# ISO-8859-14 glibc
46+
# ISO-8859-15 glibc aix osf solaris freebsd
47+
# KOI8-R Y glibc solaris freebsd darwin
48+
# KOI8-U Y glibc freebsd darwin
49+
# KOI8-T glibc
50+
# CP437 dos
51+
# CP775 dos
52+
# CP850 aix osf dos
53+
# CP852 dos
54+
# CP855 dos
55+
# CP856 aix
56+
# CP857 dos
57+
# CP861 dos
58+
# CP862 dos
59+
# CP864 dos
60+
# CP865 dos
61+
# CP866 freebsd darwin dos
62+
# CP869 dos
63+
# CP874 woe32 dos
64+
# CP922 aix
65+
# CP932 aix woe32 dos
66+
# CP943 aix
67+
# CP949 osf woe32 dos
68+
# CP950 woe32 dos
69+
# CP1046 aix
70+
# CP1124 aix
71+
# CP1125 dos
72+
# CP1129 aix
73+
# CP1250 woe32
74+
# CP1251 glibc solaris darwin woe32
75+
# CP1252 aix woe32
76+
# CP1253 woe32
77+
# CP1254 woe32
78+
# CP1255 glibc woe32
79+
# CP1256 woe32
80+
# CP1257 woe32
81+
# GB2312 Y glibc aix hpux irix solaris freebsd darwin
82+
# EUC-JP Y glibc aix hpux irix osf solaris freebsd darwin
83+
# EUC-KR Y glibc aix hpux irix osf solaris freebsd darwin
84+
# EUC-TW glibc aix hpux irix osf solaris
85+
# BIG5 Y glibc aix hpux osf solaris freebsd darwin
86+
# BIG5-HKSCS glibc solaris
87+
# GBK glibc aix osf solaris woe32 dos
88+
# GB18030 glibc solaris
89+
# SHIFT_JIS Y hpux osf solaris freebsd darwin
90+
# JOHAB glibc solaris woe32
91+
# TIS-620 glibc aix hpux osf solaris
92+
# VISCII Y glibc
93+
# TCVN5712-1 glibc
94+
# GEORGIAN-PS glibc
95+
# HP-ROMAN8 hpux
96+
# HP-ARABIC8 hpux
97+
# HP-GREEK8 hpux
98+
# HP-HEBREW8 hpux
99+
# HP-TURKISH8 hpux
100+
# HP-KANA8 hpux
101+
# DEC-KANJI osf
102+
# DEC-HANYU osf
103+
# UTF-8 Y glibc aix hpux osf solaris
104104
#
105105
# Note: Names which are not marked as being a MIME name should not be used in
106106
# Internet protocols for information interchange (mail, news, etc.).
@@ -149,7 +149,7 @@ case "$os" in
149149
echo "$l.utf-8@euro UTF-8"
150150
done
151151
for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
152-
sl_SI sr sr_YU; do
152+
sl_SI sr sr_CS sr_YU; do
153153
echo "$l ISO-8859-2"
154154
echo "$l.iso-8859-2 ISO-8859-2"
155155
echo "$l.cp-852 CP852"
@@ -396,6 +396,47 @@ case "$os" in
396396
echo "BIG5 BIG5"
397397
echo "SJIS SHIFT_JIS"
398398
;;
399+
darwin*)
400+
# Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
401+
# localcharset.c falls back to using the full locale name
402+
# from the environment variables.
403+
echo "C ASCII"
404+
for l in en_AU en_CA en_GB en_US la_LN; do
405+
echo "$l.US-ASCII ASCII"
406+
done
407+
for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
408+
fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
409+
nl_NL no_NO pt_PT sv_SE; do
410+
echo "$l ISO-8859-1"
411+
echo "$l.ISO8859-1 ISO-8859-1"
412+
echo "$l.ISO8859-15 ISO-8859-15"
413+
done
414+
for l in la_LN; do
415+
echo "$l.ISO8859-1 ISO-8859-1"
416+
echo "$l.ISO8859-15 ISO-8859-15"
417+
done
418+
for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
419+
echo "$l.ISO8859-2 ISO-8859-2"
420+
done
421+
for l in la_LN lt_LT; do
422+
echo "$l.ISO8859-4 ISO-8859-4"
423+
done
424+
for l in ru_RU; do
425+
echo "$l.KOI8-R KOI8-R"
426+
echo "$l.ISO8859-5 ISO-8859-5"
427+
echo "$l.CP866 CP866"
428+
done
429+
for l in bg_BG; do
430+
echo "$l.CP1251 CP1251"
431+
done
432+
echo "uk_UA.KOI8-U KOI8-U"
433+
echo "zh_TW.BIG5 BIG5"
434+
echo "zh_TW.Big5 BIG5"
435+
echo "zh_CN.EUC GB2312"
436+
echo "ja_JP.EUC EUC-JP"
437+
echo "ja_JP.SJIS SHIFT_JIS"
438+
echo "ko_KR.EUC EUC-KR"
439+
;;
399440
beos*)
400441
# BeOS has a single locale, and it has UTF-8 encoding.
401442
echo "* UTF-8"
@@ -509,6 +550,7 @@ case "$os" in
509550
echo "sq CP852"
510551
echo "sq_AL CP852"
511552
echo "sr CP852" # CP852 or CP866 or CP855 ??
553+
echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
512554
echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
513555
# ISO-8859-3 languages
514556
echo "mt CP850"

0 commit comments

Comments
 (0)