[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Mon Mar 14 08:22:01 EST 2005)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Mon Mar 14 08:22:01 EST 2005) |
|
Date: |
Mon, 14 Mar 2005 08:22:11 -0500 |
Index: ABOUT-NLS
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ABOUT-NLS,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** ABOUT-NLS 11 Apr 2004 17:56:45 -0000 1.5
--- ABOUT-NLS 14 Mar 2005 13:06:22 -0000 1.6
***************
*** 1,10 ****
! Notes on the Free Translation Project
! *************************************
Free software is going international! The Free Translation Project is
a way to get maintainers of free software, translators, and users all
! together, so that will gradually become able to speak many languages.
! A few packages already provide translations for their messages.
If you found this `ABOUT-NLS' file inside a distribution, you may
assume that the distributed package does use GNU `gettext' internally,
--- 1,11 ----
! 1 Notes on the Free Translation Project
! ***************************************
Free software is going international! The Free Translation Project is
a way to get maintainers of free software, translators, and users all
! together, so that free software will gradually become able to speak many
! languages. A few packages already provide translations for their
! messages.
If you found this `ABOUT-NLS' file inside a distribution, you may
assume that the distributed package does use GNU `gettext' internally,
***************
*** 15,29 ****
Installers will find here some useful hints. These notes also
explain how users should proceed for getting the programs to use the
available translations. They tell how people wanting to contribute and
! work at translations should contact the appropriate team.
When reporting bugs in the `intl/' directory or bugs which may be
related to internationalization, you should tell about the version of
`gettext' which is used. The information can be found in the
`intl/VERSION' file, in internationalized packages.
! Quick configuration advice
! ==========================
If you want to exploit the full power of internationalization, you
should configure it using
--- 16,30 ----
Installers will find here some useful hints. These notes also
explain how users should proceed for getting the programs to use the
available translations. They tell how people wanting to contribute and
! work on translations can contact the appropriate team.
When reporting bugs in the `intl/' directory or bugs which may be
related to internationalization, you should tell about the version of
`gettext' which is used. The information can be found in the
`intl/VERSION' file, in internationalized packages.
! 1.1 Quick configuration advice
! ==============================
If you want to exploit the full power of internationalization, you
should configure it using
***************
*** 45,52 ****
you have installed a recent copy of the GNU gettext package with the
included `libintl'.
! INSTALL Matters
! ===============
Some packages are "localizable" when properly installed; the programs
they contain can be made to speak your own native language. Most such
--- 46,53 ----
you have installed a recent copy of the GNU gettext package with the
included `libintl'.
! 1.2 INSTALL Matters
! ===================
Some packages are "localizable" when properly installed; the programs
they contain can be made to speak your own native language. Most such
***************
*** 55,81 ****
By default, this package will be installed to allow translation of
messages. It will automatically detect whether the system already
! provides the GNU `gettext' functions. If not, the GNU `gettext' own
! library will be used. This library is wholly contained within this
! package, usually in the `intl/' subdirectory, so prior installation of
! the GNU `gettext' package is _not_ required. Installers may use
! special options at configuration time for changing the default
! behaviour. The commands:
./configure --with-included-gettext
./configure --disable-nls
! will respectively bypass any pre-existing `gettext' to use the
internationalizing routines provided within this package, or else,
_totally_ disable translation of messages.
When you already have GNU `gettext' installed on your system and run
configure without an option for your new package, `configure' will
probably detect the previously built and installed `libintl.a' file and
! will decide to use this. This might be not what is desirable. You
! should use the more recent version of the GNU `gettext' library. I.e.
! if the file `intl/VERSION' shows that the library which comes with this
! package is more recent, you should use
./configure --with-included-gettext
--- 56,82 ----
By default, this package will be installed to allow translation of
messages. It will automatically detect whether the system already
! provides the GNU `gettext' functions. If not, the included GNU
! `gettext' library will be used. This library is wholly contained
! within this package, usually in the `intl/' subdirectory, so prior
! installation of the GNU `gettext' package is _not_ required.
! Installers may use special options at configuration time for changing
! the default behaviour. The commands:
./configure --with-included-gettext
./configure --disable-nls
! will, respectively, bypass any pre-existing `gettext' to use the
internationalizing routines provided within this package, or else,
_totally_ disable translation of messages.
When you already have GNU `gettext' installed on your system and run
configure without an option for your new package, `configure' will
probably detect the previously built and installed `libintl.a' file and
! will decide to use this. This might not be desirable. You should use
! the more recent version of the GNU `gettext' library. I.e. if the file
! `intl/VERSION' shows that the library which comes with this package is
! more recent, you should use
./configure --with-included-gettext
***************
*** 86,92 ****
emulation of `gettext' on top of `catgets' could not provide all the
extensions of the GNU `gettext' library.
! Internationalized packages have usually many `po/LL.po' files, where
LL gives an ISO 639 two-letter code identifying the language. Unless
translations have been forbidden at `configure' time by using the
`--disable-nls' switch, all available translations are installed
--- 87,93 ----
emulation of `gettext' on top of `catgets' could not provide all the
extensions of the GNU `gettext' library.
! Internationalized packages usually have many `po/LL.po' files, where
LL gives an ISO 639 two-letter code identifying the language. Unless
translations have been forbidden at `configure' time by using the
`--disable-nls' switch, all available translations are installed
***************
*** 95,102 ****
`LINGUAS' should then contain a space separated list of two-letter
codes, stating which languages are allowed.
! Using This Package
! ==================
As a user, if your language has been installed for this package, you
only have to set the `LANG' environment variable to the appropriate
--- 96,103 ----
`LINGUAS' should then contain a space separated list of two-letter
codes, stating which languages are allowed.
! 1.3 Using This Package
! ======================
As a user, if your language has been installed for this package, you
only have to set the `LANG' environment variable to the appropriate
***************
*** 144,151 ****
to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
(Portuguese as spoken in Portugal) in this context.
! Translating Teams
! =================
For the Free Translation Project to be a success, we need interested
people who like their own language and write it well, and who are also
--- 145,152 ----
to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
(Portuguese as spoken in Portugal) in this context.
! 1.4 Translating Teams
! =====================
For the Free Translation Project to be a success, we need interested
people who like their own language and write it well, and who are also
***************
*** 174,735 ****
the terminology in use. Proven linguistic skill are praised more than
programming skill, here.
! Available Packages
! ==================
Languages are not equally supported in all packages. The following
! matrix shows the current state of internationalization, as of January
! 2004. The matrix shows, in regard of each package, for which languages
PO files have been submitted to translation coordination, with a
translation percentage of at least 50%.
! Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es
! +----------------------------------------------------+
! a2ps | [] [] [] [] |
! aegis | () |
! ant-phone | () |
! anubis | |
! ap-utils | |
! aspell | [] |
! bash | [] [] [] [] |
! batchelor | |
! bfd | [] [] |
! binutils | [] [] |
! bison | [] [] [] |
! bluez-pin | [] [] [] |
! clisp | |
! clisp | [] [] [] |
! console-tools | [] [] |
! coreutils | [] [] [] [] |
! cpio | [] [] [] |
! darkstat | [] () [] |
! diffutils | [] [] [] [] [] [] [] |
! e2fsprogs | [] [] [] |
! enscript | [] [] [] [] |
! error | [] [] [] [] [] |
! fetchmail | [] () [] [] [] [] |
! fileutils | [] [] [] |
! findutils | [] [] [] [] [] [] [] |
! flex | [] [] [] [] |
! fslint | |
! gas | [] |
! gawk | [] [] [] [] |
! gbiff | [] |
! gcal | [] |
! gcc | [] [] |
! gettext | [] [] [] [] [] |
! gettext-examples | [] [] [] [] |
! gettext-runtime | [] [] [] [] [] |
! gettext-tools | [] [] [] |
! gimp-print | [] [] [] [] [] |
! gliv | |
! glunarclock | [] [] |
! gnubiff | [] |
! gnucash | [] () [] [] |
! gnucash-glossary | [] () [] |
! gnupg | [] () [] [] [] [] |
! gpe-aerial | [] |
! gpe-beam | [] [] |
! gpe-calendar | [] [] |
! gpe-clock | [] [] |
! gpe-conf | [] [] |
! gpe-contacts | [] [] |
! gpe-edit | [] |
! gpe-go | [] |
! gpe-login | [] [] |
! gpe-ownerinfo | [] [] |
! gpe-sketchbook | [] [] |
! gpe-su | [] [] |
! gpe-taskmanager | [] [] |
! gpe-timesheet | [] |
! gpe-today | [] [] |
! gpe-todo | [] [] |
! gphoto2 | [] [] [] [] |
! gprof | [] [] [] |
! gpsdrive | () () () |
! gramadoir | [] |
! grep | [] [] [] [] [] [] |
! gretl | [] |
! gtick | [] () |
! hello | [] [] [] [] [] [] |
! id-utils | [] [] |
! indent | [] [] [] [] |
! iso_3166 | [] [] [] [] [] [] [] [] [] [] |
! iso_3166_1 | [] [] [] [] [] [] |
! iso_3166_2 | |
! iso_3166_3 | [] |
! iso_4217 | [] [] [] [] |
! iso_639 | |
! jpilot | [] [] [] |
! jtag | |
! jwhois | [] |
! kbd | [] [] [] [] [] |
! latrine | () |
! ld | [] [] |
! libc | [] [] [] [] [] [] |
! libgpewidget | [] [] |
! libiconv | [] [] [] [] [] |
! lifelines | [] () |
! lilypond | [] |
! lingoteach | |
! lingoteach_lessons | () () |
! lynx | [] [] [] [] |
! m4 | [] [] [] [] |
! mailutils | [] [] |
! make | [] [] [] |
! man-db | [] () [] [] () |
! minicom | [] [] [] |
! mysecretdiary | [] [] [] |
! nano | [] () [] [] [] |
! nano_1_0 | [] () [] [] [] |
! opcodes | [] |
! parted | [] [] [] [] [] |
! ptx | [] [] [] [] [] |
! python | |
! radius | [] |
! recode | [] [] [] [] [] [] [] |
! rpm | [] [] |
! screem | |
! scrollkeeper | [] [] [] [] [] [] |
! sed | [] [] [] [] [] [] |
! sh-utils | [] [] [] |
! shared-mime-info | |
! sharutils | [] [] [] [] [] [] |
! silky | () |
! skencil | [] () [] |
! sketch | [] () [] |
! soundtracker | [] [] [] |
! sp | [] |
! tar | [] [] [] [] |
! texinfo | [] [] [] |
! textutils | [] [] [] [] |
! tin | () () |
! tp-robot | |
! tuxpaint | [] [] [] [] [] [] [] |
! unicode-han-tra... | |
! unicode-transla... | |
! util-linux | [] [] [] [] [] |
! vorbis-tools | [] [] [] [] |
! wastesedge | () |
! wdiff | [] [] [] [] |
! wget | [] [] [] [] [] [] |
! xchat | [] [] [] [] |
! xfree86_xkb_xml | [] [] |
! xpad | [] |
! +----------------------------------------------------+
! af am ar az be bg bs ca cs da de el en en_GB eo es
! 4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68
!
! et eu fa fi fr ga gl he hr hu id is it ja ko lg
+-------------------------------------------------+
! a2ps | [] [] [] () () |
! aegis | |
! ant-phone | [] |
! anubis | [] |
! ap-utils | [] |
! aspell | [] [] |
! bash | [] [] |
! batchelor | [] [] |
! bfd | [] |
! binutils | [] [] |
! bison | [] [] [] [] |
! bluez-pin | [] [] [] [] [] |
! clisp | |
! clisp | [] |
! console-tools | |
! coreutils | [] [] [] [] [] [] |
! cpio | [] [] [] [] |
! darkstat | () [] [] [] |
! diffutils | [] [] [] [] [] [] [] |
! e2fsprogs | |
! enscript | [] [] |
! error | [] [] [] [] |
! fetchmail | [] |
! fileutils | [] [] [] [] [] [] |
! findutils | [] [] [] [] [] [] [] [] [] [] [] |
! flex | [] [] [] |
! fslint | [] |
! gas | [] |
! gawk | [] [] [] |
! gbiff | [] |
! gcal | [] |
! gcc | [] |
! gettext | [] [] [] |
! gettext-examples | [] [] |
! gettext-runtime | [] [] [] [] [] |
! gettext-tools | [] [] [] |
! gimp-print | [] [] |
! gliv | () |
! glunarclock | [] [] [] [] |
! gnubiff | [] |
! gnucash | () [] |
! gnucash-glossary | [] |
! gnupg | [] [] [] [] [] [] [] |
! gpe-aerial | [] |
! gpe-beam | [] |
! gpe-calendar | [] [] [] |
! gpe-clock | [] |
! gpe-conf | [] |
! gpe-contacts | [] [] |
! gpe-edit | [] [] |
! gpe-go | [] |
! gpe-login | [] [] |
! gpe-ownerinfo | [] [] [] |
! gpe-sketchbook | [] |
! gpe-su | [] |
! gpe-taskmanager | [] |
! gpe-timesheet | [] [] [] |
! gpe-today | [] [] |
! gpe-todo | [] [] |
! gphoto2 | [] [] [] |
! gprof | [] [] |
! gpsdrive | () () () |
! gramadoir | [] [] |
! grep | [] [] [] [] [] [] [] [] [] [] [] |
! gretl | [] [] |
! gtick | [] [] [] |
! hello | [] [] [] [] [] [] [] [] [] [] [] [] [] |
! id-utils | [] [] [] [] |
! indent | [] [] [] [] [] [] [] [] [] |
! iso_3166 | [] [] [] [] [] [] [] |
! iso_3166_1 | [] [] [] [] [] |
iso_3166_2 | |
! iso_3166_3 | |
! iso_4217 | [] [] [] [] [] [] |
iso_639 | |
! jpilot | [] () |
! jtag | [] |
! jwhois | [] [] [] [] |
! kbd | [] |
! latrine | [] |
! ld | [] |
! libc | [] [] [] [] [] [] |
! libgpewidget | [] [] [] [] |
! libiconv | [] [] [] [] [] [] [] [] [] |
! lifelines | () |
! lilypond | [] |
! lingoteach | [] [] |
! lingoteach_lessons | |
! lynx | [] [] [] [] |
! m4 | [] [] [] [] |
! mailutils | |
! make | [] [] [] [] [] [] |
! man-db | () () |
! minicom | [] [] [] [] |
! mysecretdiary | [] [] |
! nano | [] [] [] [] |
! nano_1_0 | [] [] [] [] |
! opcodes | [] |
! parted | [] [] [] |
! ptx | [] [] [] [] [] [] [] |
python | |
! radius | [] |
! recode | [] [] [] [] [] [] |
! rpm | [] [] |
screem | |
! scrollkeeper | [] |
! sed | [] [] [] [] [] [] [] [] [] |
! sh-utils | [] [] [] [] [] [] [] |
! shared-mime-info | [] [] [] |
! sharutils | [] [] [] [] [] |
! silky | () [] () () |
! skencil | [] |
! sketch | [] |
! soundtracker | [] [] |
! sp | [] () |
! tar | [] [] [] [] [] [] [] [] [] |
! texinfo | [] [] [] [] |
! textutils | [] [] [] [] [] [] |
! tin | [] () |
! tp-robot | [] |
! tuxpaint | [] [] [] [] [] [] [] [] [] |
unicode-han-tra... | |
! unicode-transla... | [] [] |
! util-linux | [] [] [] [] () [] |
! vorbis-tools | [] |
! wastesedge | () |
! wdiff | [] [] [] [] [] [] |
! wget | [] [] [] [] [] [] [] |
! xchat | [] [] [] |
! xfree86_xkb_xml | [] [] |
! xpad | [] [] |
+-------------------------------------------------+
! et eu fa fi fr ga gl he hr hu id is it ja ko lg
! 22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0
!
! lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
!
+-----------------------------------------------------+
! a2ps | [] [] () () [] [] []
|
! aegis | () () ()
|
! ant-phone | [] []
|
! anubis | [] [] [] [] [] []
|
! ap-utils | [] () []
|
! aspell | []
|
! bash | [] [] []
|
! batchelor | []
|
! bfd | []
|
! binutils | []
|
! bison | [] [] [] [] []
|
! bluez-pin | [] [] []
|
! clisp |
|
! clisp | []
|
! console-tools | []
|
! coreutils | [] []
|
! cpio | [] [] [] [] []
|
! darkstat | [] [] [] []
|
! diffutils | [] [] [] [] [] []
|
! e2fsprogs | []
|
! enscript | [] [] [] []
|
! error | [] [] []
|
! fetchmail | [] [] () []
|
! fileutils | [] [] []
|
! findutils | [] [] [] [] []
|
! flex | [] [] [] []
|
! fslint | [] []
|
! gas |
|
! gawk | [] [] []
|
! gbiff | [] []
|
! gcal |
|
! gcc |
|
! gettext | [] [] []
|
! gettext-examples | [] [] []
|
! gettext-runtime | [] [] [] []
|
! gettext-tools | [] []
|
! gimp-print | []
|
! gliv | [] [] []
|
! glunarclock | [] [] [] []
|
! gnubiff | []
|
! gnucash | [] [] () []
|
! gnucash-glossary | [] []
|
! gnupg | []
|
! gpe-aerial | [] [] [] []
|
! gpe-beam | [] [] [] []
|
! gpe-calendar | [] [] [] []
|
! gpe-clock | [] [] [] []
|
! gpe-conf | [] [] [] []
|
! gpe-contacts | [] [] [] []
|
! gpe-edit | [] [] [] []
|
! gpe-go | [] [] []
|
! gpe-login | [] [] [] []
|
! gpe-ownerinfo | [] [] [] []
|
! gpe-sketchbook | [] [] [] []
|
! gpe-su | [] [] [] []
|
! gpe-taskmanager | [] [] [] []
|
! gpe-timesheet | [] [] [] []
|
! gpe-today | [] [] [] []
|
! gpe-todo | [] [] [] []
|
! gphoto2 | []
|
! gprof | [] []
|
! gpsdrive | () () []
|
! gramadoir | () []
|
! grep | [] [] [] [] []
|
! gretl |
|
! gtick | [] [] []
|
! hello | [] [] [] [] [] [] [] [] [] []
|
! id-utils | [] [] [] []
|
! indent | [] [] [] []
|
! iso_3166 | [] [] []
|
! iso_3166_1 | [] []
|
! iso_3166_2 |
|
! iso_3166_3 | []
|
! iso_4217 | [] [] [] [] [] [] [] []
|
! iso_639 | []
|
! jpilot | () ()
|
! jtag |
|
! jwhois | [] [] [] [] ()
|
! kbd | [] [] []
|
! latrine | []
|
! ld |
|
! libc | [] [] [] []
|
! libgpewidget | [] [] []
|
! libiconv | [] [] [] [] []
|
! lifelines |
|
! lilypond |
|
! lingoteach |
|
! lingoteach_lessons |
|
! lynx | [] [] []
|
! m4 | [] [] [] [] []
|
! mailutils | [] [] []
|
! make | [] [] [] []
|
! man-db | []
|
! minicom | [] [] [] []
|
! mysecretdiary | [] [] []
|
! nano | [] [] [] [] []
|
! nano_1_0 | [] [] [] [] [] []
|
! opcodes | [] []
|
! parted | [] [] [] []
|
! ptx | [] [] [] [] [] [] [] []
|
! python |
|
! radius | [] []
|
! recode | [] [] [] []
|
! rpm | [] [] []
|
! screem |
|
! scrollkeeper | [] [] [] [] []
|
! sed | [] [] []
|
! sh-utils | [] []
|
! shared-mime-info | [] []
|
! sharutils | [] []
|
! silky | ()
|
! skencil | [] []
|
! sketch | [] []
|
! soundtracker |
|
! sp |
|
! tar | [] [] [] [] [] []
|
! texinfo | [] [] [] []
|
! textutils | [] []
|
! tin |
|
! tp-robot | []
|
! tuxpaint | [] [] [] [] [] [] [] []
|
! unicode-han-tra... |
|
! unicode-transla... |
|
! util-linux | [] [] []
|
! vorbis-tools | [] [] []
|
! wastesedge |
|
! wdiff | [] [] [] [] []
|
! wget | [] [] []
|
! xchat | [] [] []
|
! xfree86_xkb_xml | [] []
|
! xpad | [] []
|
!
+-----------------------------------------------------+
! lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
! 1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63
!
! sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
!
+-----------------------------------------------------+
! a2ps | [] [] [] []
| 16
! aegis |
| 0
! ant-phone |
| 3
! anubis | [] []
| 9
! ap-utils | ()
| 3
! aspell |
| 4
! bash |
| 9
! batchelor |
| 3
! bfd | [] []
| 6
! binutils | [] [] []
| 8
! bison | [] []
| 14
! bluez-pin | [] [] []
| 14
! clisp |
| 0
! clisp |
| 5
! console-tools |
| 3
! coreutils | [] [] [] []
| 16
! cpio | [] []
| 14
! darkstat | [] [] [] () ()
| 12
! diffutils | [] [] []
| 23
! e2fsprogs | [] []
| 6
! enscript | [] []
| 12
! error | [] [] []
| 15
! fetchmail | [] []
| 11
! fileutils | [] [] [] [] []
| 17
! findutils | [] [] [] [] [] []
| 29
! flex | [] []
| 13
! fslint |
| 3
! gas | []
| 3
! gawk | [] []
| 12
! gbiff |
| 4
! gcal | [] []
| 4
! gcc | []
| 4
! gettext | [] [] [] [] []
| 16
! gettext-examples | [] [] [] [] []
| 14
! gettext-runtime | [] [] [] [] [] [] [] []
| 22
! gettext-tools | [] [] [] [] [] []
| 14
! gimp-print | [] []
| 10
! gliv |
| 3
! glunarclock | [] [] []
| 13
! gnubiff |
| 3
! gnucash | [] []
| 9
! gnucash-glossary | [] [] []
| 8
! gnupg | [] [] [] []
| 17
! gpe-aerial | []
| 7
! gpe-beam | []
| 8
! gpe-calendar | [] [] [] []
| 13
! gpe-clock | [] [] []
| 10
! gpe-conf | [] []
| 9
! gpe-contacts | [] [] []
| 11
! gpe-edit | [] [] [] [] []
| 12
! gpe-go |
| 5
! gpe-login | [] [] [] [] []
| 13
! gpe-ownerinfo | [] [] [] []
| 13
! gpe-sketchbook | [] []
| 9
! gpe-su | [] [] []
| 10
! gpe-taskmanager | [] [] []
| 10
! gpe-timesheet | [] [] [] []
| 12
! gpe-today | [] [] [] [] []
| 13
! gpe-todo | [] [] [] []
| 12
! gphoto2 | [] [] []
| 11
! gprof | [] []
| 9
! gpsdrive | [] []
| 3
! gramadoir | []
| 5
! grep | [] [] [] []
| 26
! gretl |
| 3
! gtick |
| 7
! hello | [] [] [] [] []
| 34
! id-utils | [] []
| 12
! indent | [] [] [] []
| 21
! iso_3166 | [] [] [] [] [] [] []
| 27
! iso_3166_1 | [] [] []
| 16
! iso_3166_2 |
| 0
! iso_3166_3 |
| 2
! iso_4217 | [] [] [] [] [] []
| 24
! iso_639 |
| 1
! jpilot | [] [] [] [] []
| 9
! jtag | []
| 2
! jwhois | () [] []
| 11
! kbd | [] []
| 11
! latrine |
| 2
! ld | [] []
| 5
! libc | [] [] [] []
| 20
! libgpewidget | [] [] [] []
| 13
! libiconv | [] [] [] [] [] [] [] []
| 27
! lifelines | []
| 2
! lilypond | []
| 3
! lingoteach |
| 2
! lingoteach_lessons | ()
| 0
! lynx | [] [] []
| 14
! m4 | [] []
| 15
! mailutils |
| 5
! make | [] [] []
| 16
! man-db | []
| 5
! minicom |
| 11
! mysecretdiary | [] []
| 10
! nano | [] [] [] []
| 17
! nano_1_0 | [] [] []
| 17
! opcodes | [] []
| 6
! parted | [] [] []
| 15
! ptx | [] []
| 22
! python |
| 0
! radius |
| 4
! recode | [] [] []
| 20
! rpm | [] []
| 9
! screem | [] []
| 2
! scrollkeeper | [] [] []
| 15
! sed | [] [] [] [] [] []
| 24
! sh-utils | [] []
| 14
! shared-mime-info | [] []
| 7
! sharutils | [] [] [] []
| 17
! silky | ()
| 3
! skencil | []
| 6
! sketch | []
| 6
! soundtracker | [] []
| 7
! sp | []
| 3
! tar | [] [] [] [] []
| 24
! texinfo | [] [] []
| 14
! textutils | [] [] [] []
| 16
! tin |
| 1
! tp-robot |
| 2
! tuxpaint | [] [] [] [] []
| 29
! unicode-han-tra... |
| 0
! unicode-transla... |
| 2
! util-linux | [] []
| 15
! vorbis-tools |
| 8
! wastesedge |
| 0
! wdiff | [] [] []
| 18
! wget | [] [] [] [] [] [] [] []
| 24
! xchat | [] [] [] [] []
| 15
! xfree86_xkb_xml | [] [] [] [] []
| 11
! xpad |
| 5
!
+-----------------------------------------------------+
! 63 teams sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
! 131 domains 47 19 28 83 0 0 59 13 1 1 11 0 22 22 0
1373
Some counters in the preceding matrix are higher than the number of
visible blocks let us expect. This is because a few extra PO files are
--- 175,963 ----
the terminology in use. Proven linguistic skill are praised more than
programming skill, here.
! 1.5 Available Packages
! ======================
Languages are not equally supported in all packages. The following
! matrix shows the current state of internationalization, as of February
! 2005. The matrix shows, in regard of each package, for which languages
PO files have been submitted to translation coordination, with a
translation percentage of at least 50%.
! Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB
+-------------------------------------------------+
! GNUnet | |
! a2ps | [] [] [] [] [] |
! aegis | () |
! ant-phone | () |
! anubis | [] |
! ap-utils | |
! aspell | [] [] [] [] |
! bash | [] [] |
! batchelor | [] |
! bfd | [] |
! bibshelf | [] |
! binutils | [] |
! bison | [] [] |
! bluez-pin | [] [] [] [] |
! clisp | [] [] |
! console-tools | [] [] |
! coreutils | [] [] [] [] |
! cpio | |
! cpplib | [] [] [] |
! darkstat | [] () [] |
! dialog | [] [] [] [] [] [] |
! diffutils | [] [] [] [] [] |
! doodle | [] |
! e2fsprogs | [] [] |
! enscript | [] [] [] [] |
! error | [] [] [] [] |
! fetchmail | [] () [] [] [] |
! fileutils | [] [] |
! findutils | [] [] [] |
! flex | [] [] [] |
! fslint | [] |
! gas | |
! gawk | [] [] [] |
! gbiff | [] |
! gcal | [] |
! gcc | [] |
! gettext-examples | [] [] [] [] |
! gettext-runtime | [] [] [] [] |
! gettext-tools | [] [] |
! gimp-print | [] [] [] [] |
! gip | |
! gliv | [] |
! glunarclock | [] |
! gmult | [] [] |
! gnubiff | () |
! gnucash | [] () () [] |
! gnucash-glossary | [] () |
! gnupg | [] () [] [] |
! gpe-aerial | [] [] |
! gpe-beam | [] [] |
! gpe-calendar | [] [] |
! gpe-clock | [] [] |
! gpe-conf | [] [] |
! gpe-contacts | |
! gpe-edit | [] |
! gpe-go | [] |
! gpe-login | [] [] |
! gpe-ownerinfo | [] [] |
! gpe-sketchbook | [] [] |
! gpe-su | [] [] |
! gpe-taskmanager | [] [] |
! gpe-timesheet | [] |
! gpe-today | [] [] |
! gpe-todo | [] [] |
! gphoto2 | [] [] [] [] |
! gprof | [] [] |
! gpsdrive | () () |
! gramadoir | [] [] |
! grep | [] [] [] [] [] [] |
! gretl | |
! gsasl | [] |
! gss | |
! gst-plugins | [] [] [] [] [] [] |
! gstreamer | [] [] [] [] [] |
! gtick | [] () |
! gtkspell | [] [] [] |
! hello | [] [] [] [] |
! id-utils | [] [] |
! impost | |
! indent | [] [] |
! iso_3166 | |
! iso_3166_1 | [] [] [] [] [] |
iso_3166_2 | |
! iso_3166_3 | [] |
! iso_4217 | |
iso_639 | |
! jpilot | [] |
! jtag | |
! jwhois | |
! kbd | [] [] [] [] |
! latrine | () |
! ld | [] |
! libc | [] [] [] [] [] |
! libextractor | |
! libgpewidget | [] [] [] |
! libgsasl | |
! libiconv | [] [] [] [] [] |
! libidn | |
! lifelines | [] () |
! lilypond | [] |
! lingoteach | |
! lynx | [] [] [] [] |
! m4 | [] [] [] [] |
! mailutils | [] |
! make | [] [] |
! man-db | [] () [] [] |
! minicom | [] [] |
! mysecretdiary | [] [] |
! nano | [] () [] |
! nano_1_0 | [] () [] [] |
! opcodes | [] |
! parted | [] [] [] [] |
! psmisc | |
! ptx | [] [] [] |
! pwdutils | |
python | |
! radius | [] |
! recode | [] [] [] [] [] |
! rpm | [] [] |
screem | |
! scrollkeeper | [] [] [] [] [] [] [] [] |
! sed | [] [] |
! sh-utils | [] [] |
! shared-mime-info | [] [] |
! sharutils | [] [] [] [] [] |
! silky | () |
! skencil | [] () |
! sketch | [] () |
! solfege | [] [] |
! soundtracker | [] [] |
! sp | [] |
! stardict | [] |
! tar | |
! texinfo | [] [] |
! textutils | [] [] [] |
! tin | () () |
! tp-robot | [] |
! tuxpaint | [] [] [] [] [] [] [] |
unicode-han-tra... | |
! unicode-transla... | |
! util-linux | [] [] [] [] |
! vorbis-tools | [] [] [] [] |
! wastesedge | () |
! wdiff | [] [] [] [] |
! wget | [] [] [] [] [] [] |
! xchat | [] [] [] [] |
! xfree86_xkb_xml | [] [] [] [] |
! xkeyboard-config | |
! xpad | |
+-------------------------------------------------+
! af am ar az be bg bs ca cs cy da de el en en_GB
! 11 0 0 3 7 4 0 42 44 3 55 92 21 1 15
!
! eo es et eu fa fi fr ga gl he hr hu id is it
! +-----------------------------------------------+
! GNUnet | |
! a2ps | [] [] [] () |
! aegis | |
! ant-phone | [] |
! anubis | [] |
! ap-utils | [] |
! aspell | [] [] |
! bash | [] [] [] [] |
! batchelor | [] [] |
! bfd | [] [] |
! bibshelf | [] [] [] |
! binutils | [] [] |
! bison | [] [] [] [] [] [] |
! bluez-pin | [] [] [] [] [] [] |
! clisp | [] [] |
! console-tools | |
! coreutils | [] [] [] [] [] |
! cpio | [] [] |
! cpplib | [] [] |
! darkstat | [] () [] [] [] |
! dialog | [] [] [] [] [] [] [] |
! diffutils | [] [] [] [] [] [] [] [] [] [] |
! doodle | [] [] |
! e2fsprogs | [] [] [] |
! enscript | [] [] |
! error | [] [] [] [] [] |
! fetchmail | [] |
! fileutils | [] [] [] [] [] [] |
! findutils | [] [] [] [] [] |
! flex | [] [] [] |
! fslint | [] |
! gas | [] [] |
! gawk | [] [] [] |
! gbiff | [] |
! gcal | [] [] |
! gcc | |
! gettext-examples | [] [] [] |
! gettext-runtime | [] [] [] [] [] |
! gettext-tools | [] [] |
! gimp-print | [] [] |
! gip | [] [] [] |
! gliv | () |
! glunarclock | [] [] [] |
! gmult | [] [] [] |
! gnubiff | [] [] () |
! gnucash | [] () [] |
! gnucash-glossary | [] [] |
! gnupg | [] [] [] [] [] [] [] [] |
! gpe-aerial | [] [] |
! gpe-beam | [] [] |
! gpe-calendar | [] [] [] [] |
! gpe-clock | [] [] |
! gpe-conf | [] |
! gpe-contacts | [] |
! gpe-edit | [] [] |
! gpe-go | [] [] |
! gpe-login | [] [] [] |
! gpe-ownerinfo | [] [] [] [] |
! gpe-sketchbook | [] [] |
! gpe-su | [] [] |
! gpe-taskmanager | [] [] |
! gpe-timesheet | [] [] [] [] |
! gpe-today | [] [] [] |
! gpe-todo | [] [] [] |
! gphoto2 | [] [] [] [] [] |
! gprof | [] [] [] |
! gpsdrive | () () [] () |
! gramadoir | [] [] |
! grep | [] [] [] [] [] [] [] [] [] [] [] [] |
! gretl | [] [] [] |
! gsasl | [] [] [] |
! gss | [] |
! gst-plugins | [] [] [] |
! gstreamer | [] |
! gtick | [] [] [] [] [] |
! gtkspell | [] [] [] [] [] [] |
! hello | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
! id-utils | [] [] [] [] |
! impost | [] [] |
! indent | [] [] [] [] [] [] [] [] [] [] [] |
! iso_3166 | [] [] |
! iso_3166_1 | [] [] [] [] [] [] |
! iso_3166_2 | [] |
! iso_3166_3 | [] |
! iso_4217 | [] [] |
! iso_639 | [] [] [] |
! jpilot | [] [] |
! jtag | [] |
! jwhois | [] [] [] [] [] |
! kbd | [] [] |
! latrine | [] [] [] |
! ld | [] [] |
! libc | [] [] [] [] [] |
! libextractor | |
! libgpewidget | [] [] [] [] [] |
! libgsasl | [] [] |
! libiconv | [] [] [] [] [] [] [] [] [] [] [] |
! libidn | [] [] |
! lifelines | () |
! lilypond | [] |
! lingoteach | [] [] [] |
! lynx | [] [] [] |
! m4 | [] [] [] [] |
! mailutils | [] [] |
! make | [] [] [] [] [] [] [] |
! man-db | () |
! minicom | [] [] [] [] |
! mysecretdiary | [] [] [] |
! nano | [] [] () [] [] |
! nano_1_0 | [] [] [] [] [] |
! opcodes | [] [] |
! parted | [] [] [] [] |
! psmisc | [] |
! ptx | [] [] [] [] [] [] [] [] [] |
! pwdutils | |
! python | |
! radius | [] [] |
! recode | [] [] [] [] [] [] [] [] |
! rpm | [] |
! screem | |
! scrollkeeper | [] [] |
! sed | [] [] [] [] [] |
! sh-utils | [] [] [] [] [] [] [] |
! shared-mime-info | [] [] [] [] [] [] |
! sharutils | [] [] [] [] [] [] [] |
! silky | () [] () () |
! skencil | [] [] |
! sketch | [] [] |
! solfege | [] [] [] |
! soundtracker | [] [] [] |
! sp | [] |
! stardict | [] |
! tar | [] [] [] [] [] |
! texinfo | [] [] [] |
! textutils | [] [] [] [] [] |
! tin | [] () |
! tp-robot | [] [] |
! tuxpaint | [] [] [] [] [] [] [] [] [] |
! unicode-han-tra... | |
! unicode-transla... | [] [] |
! util-linux | [] [] [] [] [] |
! vorbis-tools | [] [] |
! wastesedge | () |
! wdiff | [] [] [] [] [] [] [] [] |
! wget | [] [] [] [] [] [] [] [] [] [] |
! xchat | [] [] [] [] [] |
! xfree86_xkb_xml | [] [] |
! xkeyboard-config | |
! xpad | [] [] [] |
! +-----------------------------------------------+
! eo es et eu fa fi fr ga gl he hr hu id is it
! 14 87 22 15 2 25 119 44 18 8 6 41 28 1 41
!
! ja ko lg lt lv mk mn ms mt nb nl nn no nso or
! +-----------------------------------------------+
! GNUnet | |
! a2ps | () [] [] () |
! aegis | () |
! ant-phone | [] |
! anubis | [] [] [] |
! ap-utils | |
! aspell | [] [] |
! bash | [] |
! batchelor | [] |
! bfd | |
! bibshelf | |
! binutils | [] |
! bison | [] [] [] |
! bluez-pin | [] |
! clisp | [] |
! console-tools | |
! coreutils | [] [] |
! cpio | |
! cpplib | |
! darkstat | [] [] |
! dialog | [] |
! diffutils | [] [] [] |
! doodle | |
! e2fsprogs | |
! enscript | [] |
! error | [] |
! fetchmail | [] [] |
! fileutils | [] [] |
! findutils | |
! flex | [] [] |
! fslint | [] |
! gas | |
! gawk | [] [] |
! gbiff | [] |
! gcal | |
! gcc | |
! gettext-examples | [] [] |
! gettext-runtime | [] [] [] |
! gettext-tools | [] [] |
! gimp-print | [] [] |
! gip | [] |
! gliv | [] |
! glunarclock | [] [] |
! gmult | [] |
! gnubiff | |
! gnucash | () () [] |
! gnucash-glossary | [] |
! gnupg | [] [] |
! gpe-aerial | [] |
! gpe-beam | [] |
! gpe-calendar | [] |
! gpe-clock | [] |
! gpe-conf | [] |
! gpe-contacts | |
! gpe-edit | [] |
! gpe-go | [] |
! gpe-login | [] |
! gpe-ownerinfo | [] |
! gpe-sketchbook | [] |
! gpe-su | [] |
! gpe-taskmanager | [] |
! gpe-timesheet | [] |
! gpe-today | [] |
! gpe-todo | [] |
! gphoto2 | [] [] |
! gprof | |
! gpsdrive | () () () |
! gramadoir | () |
! grep | [] [] [] |
! gretl | |
! gsasl | [] |
! gss | |
! gst-plugins | [] [] |
! gstreamer | [] |
! gtick | [] |
! gtkspell | [] |
! hello | [] [] [] [] [] [] [] [] |
! id-utils | [] |
! impost | |
! indent | [] [] |
! iso_3166 | [] |
! iso_3166_1 | [] [] |
! iso_3166_2 | [] |
! iso_3166_3 | [] |
! iso_4217 | [] [] [] |
! iso_639 | [] [] [] |
! jpilot | () () () |
! jtag | |
! jwhois | [] |
! kbd | [] |
! latrine | [] |
! ld | |
! libc | [] [] [] [] [] |
! libextractor | |
! libgpewidget | [] |
! libgsasl | [] |
! libiconv | [] |
! libidn | |
! lifelines | [] |
! lilypond | [] |
! lingoteach | [] |
! lynx | [] [] |
! m4 | [] [] |
! mailutils | |
! make | [] [] [] |
! man-db | () |
! minicom | [] |
! mysecretdiary | [] |
! nano | [] [] |
! nano_1_0 | [] [] [] |
! opcodes | [] |
! parted | [] [] |
! psmisc | [] |
! ptx | [] [] [] |
! pwdutils | |
! python | |
! radius | |
! recode | [] |
! rpm | [] [] |
! screem | [] |
! scrollkeeper | [] [] [] |
! sed | [] [] |
! sh-utils | [] [] |
! shared-mime-info | [] [] [] [] |
! sharutils | [] [] |
! silky | [] |
! skencil | |
! sketch | |
! solfege | [] [] |
! soundtracker | |
! sp | () |
! stardict | [] [] |
! tar | [] [] |
! texinfo | [] [] [] |
! textutils | [] [] [] |
! tin | |
! tp-robot | [] |
! tuxpaint | [] [] [] [] [] [] |
! unicode-han-tra... | |
! unicode-transla... | |
! util-linux | [] [] |
! vorbis-tools | [] |
! wastesedge | [] |
! wdiff | [] [] |
! wget | [] [] |
! xchat | [] [] [] [] |
! xfree86_xkb_xml | [] |
! xkeyboard-config | [] |
! xpad | [] |
! +-----------------------------------------------+
! ja ko lg lt lv mk mn ms mt nb nl nn no nso or
! 35 11 1 1 2 2 3 11 0 14 96 7 5 0 1
!
! pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
! +----------------------------------------------+
! GNUnet | |
! a2ps | () [] [] [] [] [] [] |
! aegis | () () |
! ant-phone | [] |
! anubis | [] [] [] |
! ap-utils | () |
! aspell | [] [] |
! bash | [] [] [] |
! batchelor | [] |
! bfd | [] [] |
! bibshelf | |
! binutils | [] [] |
! bison | [] [] [] [] [] |
! bluez-pin | [] [] [] [] [] [] [] [] |
! clisp | [] |
! console-tools | [] |
! coreutils | [] [] [] [] |
! cpio | [] [] |
! cpplib | |
! darkstat | [] [] [] [] [] [] |
! dialog | [] [] [] [] [] [] |
! diffutils | [] [] [] [] [] [] |
! doodle | [] |
! e2fsprogs | [] [] |
! enscript | [] [] [] [] |
! error | [] [] [] |
! fetchmail | [] () [] [] [] |
! fileutils | [] [] [] [] [] |
! findutils | [] [] [] [] [] |
! flex | [] [] [] [] [] |
! fslint | [] [] [] |
! gas | |
! gawk | [] [] [] [] |
! gbiff | [] |
! gcal | [] |
! gcc | |
! gettext-examples | [] [] [] [] [] [] |
! gettext-runtime | [] [] [] [] [] [] [] |
! gettext-tools | [] [] [] [] [] [] [] |
! gimp-print | [] [] |
! gip | [] [] [] |
! gliv | [] [] [] |
! glunarclock | [] [] [] [] [] [] |
! gmult | [] [] [] [] |
! gnubiff | () [] |
! gnucash | () [] [] [] [] |
! gnucash-glossary | [] [] [] |
! gnupg | [] [] [] |
! gpe-aerial | [] [] [] [] [] [] |
! gpe-beam | [] [] [] [] [] [] |
! gpe-calendar | [] [] [] [] [] [] [] |
! gpe-clock | [] [] [] [] [] [] [] |
! gpe-conf | [] [] [] [] [] [] |
! gpe-contacts | [] [] [] |
! gpe-edit | [] [] [] [] [] [] [] |
! gpe-go | [] [] [] [] [] |
! gpe-login | [] [] [] [] [] [] [] |
! gpe-ownerinfo | [] [] [] [] [] [] [] |
! gpe-sketchbook | [] [] [] [] [] [] [] |
! gpe-su | [] [] [] [] [] [] [] |
! gpe-taskmanager | [] [] [] [] [] [] [] |
! gpe-timesheet | [] [] [] [] [] [] [] |
! gpe-today | [] [] [] [] [] [] [] |
! gpe-todo | [] [] [] [] [] [] [] |
! gphoto2 | [] [] [] [] |
! gprof | [] [] [] |
! gpsdrive | [] |
! gramadoir | [] |
! grep | [] [] [] [] [] [] [] |
! gretl | [] |
! gsasl | [] [] [] [] [] |
! gss | [] [] [] |
! gst-plugins | [] [] [] |
! gstreamer | [] [] [] [] |
! gtick | [] [] [] |
! gtkspell | [] [] [] [] [] |
! hello | [] [] [] [] [] [] [] |
! id-utils | [] [] [] [] |
! impost | |
! indent | [] [] [] [] [] [] |
! iso_3166 | [] [] [] [] [] |
! iso_3166_1 | [] [] [] [] |
! iso_3166_2 | |
! iso_3166_3 | [] [] [] |
! iso_4217 | [] [] |
! iso_639 | [] [] [] |
! jpilot | |
! jtag | [] |
! jwhois | [] [] [] () () |
! kbd | [] [] [] |
! latrine | [] [] |
! ld | [] |
! libc | [] [] [] [] [] |
! libextractor | |
! libgpewidget | [] [] [] [] [] [] |
! libgsasl | [] [] [] |
! libiconv | [] [] [] [] [] [] [] [] [] [] |
! libidn | [] () |
! lifelines | [] [] |
! lilypond | [] |
! lingoteach | [] |
! lynx | [] [] [] |
! m4 | [] [] [] [] [] |
! mailutils | [] [] [] |
! make | [] [] [] [] |
! man-db | [] [] |
! minicom | [] [] [] [] |
! mysecretdiary | [] [] [] |
! nano | [] [] [] |
! nano_1_0 | [] [] [] [] |
! opcodes | [] [] |
! parted | [] [] [] [] |
! psmisc | [] [] |
! ptx | [] [] [] [] [] [] |
! pwdutils | [] |
! python | |
! radius | [] [] |
! recode | [] [] [] [] [] [] |
! rpm | [] [] [] [] |
! screem | |
! scrollkeeper | [] [] [] [] [] [] [] |
! sed | [] [] [] [] [] [] [] |
! sh-utils | [] [] [] |
! shared-mime-info | [] [] [] [] [] |
! sharutils | [] [] [] |
! silky | () [] |
! skencil | [] [] [] |
! sketch | [] [] [] |
! solfege | [] |
! soundtracker | [] [] |
! sp | |
! stardict | [] [] |
! tar | [] [] [] [] |
! texinfo | [] [] [] [] |
! textutils | [] [] [] |
! tin | |
! tp-robot | [] |
! tuxpaint | [] [] [] [] [] [] [] [] |
! unicode-han-tra... | |
! unicode-transla... | |
! util-linux | [] [] [] |
! vorbis-tools | [] [] |
! wastesedge | |
! wdiff | [] [] [] [] [] [] |
! wget | [] [] [] [] [] [] [] [] |
! xchat | [] [] [] [] [] [] |
! xfree86_xkb_xml | [] [] [] [] [] |
! xkeyboard-config | |
! xpad | |
! +----------------------------------------------+
! pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
! 0 48 27 58 6 79 71 4 47 13 13 51 90 0
!
! tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
! +--------------------------------------------+
! GNUnet | | 0
! a2ps | [] [] | 18
! aegis | | 0
! ant-phone | [] | 4
! anubis | [] | 9
! ap-utils | () | 1
! aspell | [] [] | 12
! bash | | 10
! batchelor | [] [] | 7
! bfd | [] | 6
! bibshelf | [] | 5
! binutils | [] [] | 8
! bison | [] | 17
! bluez-pin | [] [] [] [] [] | 24
! clisp | | 7
! console-tools | | 3
! coreutils | [] | 16
! cpio | [] | 5
! cpplib | [] | 6
! darkstat | [] () () | 15
! dialog | [] [] | 22
! diffutils | [] [] [] | 27
! doodle | | 4
! e2fsprogs | [] | 8
! enscript | [] | 12
! error | [] [] | 15
! fetchmail | [] | 12
! fileutils | [] [] [] | 18
! findutils | [] | 14
! flex | [] | 14
! fslint | [] | 7
! gas | [] | 3
! gawk | [] | 13
! gbiff | | 4
! gcal | [] | 5
! gcc | | 1
! gettext-examples | [] [] [] [] | 19
! gettext-runtime | [] [] [] [] [] | 24
! gettext-tools | [] [] [] | 16
! gimp-print | [] | 11
! gip | [] | 8
! gliv | | 5
! glunarclock | [] [] | 14
! gmult | [] [] [] | 13
! gnubiff | | 3
! gnucash | () [] | 10
! gnucash-glossary | [] | 8
! gnupg | [] [] [] | 19
! gpe-aerial | [] | 12
! gpe-beam | [] [] | 13
! gpe-calendar | [] [] [] [] | 18
! gpe-clock | [] [] [] | 15
! gpe-conf | [] [] | 12
! gpe-contacts | [] [] | 6
! gpe-edit | [] [] [] | 14
! gpe-go | [] | 10
! gpe-login | [] [] [] [] | 17
! gpe-ownerinfo | [] [] [] | 17
! gpe-sketchbook | [] | 13
! gpe-su | [] [] | 14
! gpe-taskmanager | [] [] | 14
! gpe-timesheet | [] [] [] | 16
! gpe-today | [] [] [] [] | 17
! gpe-todo | [] [] [] | 16
! gphoto2 | [] [] | 17
! gprof | [] [] | 10
! gpsdrive | | 2
! gramadoir | [] | 6
! grep | [] [] [] [] | 32
! gretl | | 4
! gsasl | [] [] | 12
! gss | [] | 5
! gst-plugins | [] [] | 16
! gstreamer | [] [] [] | 14
! gtick | [] | 11
! gtkspell | [] [] [] | 18
! hello | [] [] [] [] | 37
! id-utils | [] [] | 13
! impost | [] | 3
! indent | [] [] [] | 24
! iso_3166 | [] | 9
! iso_3166_1 | [] [] | 19
! iso_3166_2 | | 2
! iso_3166_3 | [] [] | 8
! iso_4217 | [] | 8
! iso_639 | [] | 10
! jpilot | [] [] [] | 6
! jtag | | 2
! jwhois | [] [] [] | 12
! kbd | [] | 11
! latrine | [] [] | 8
! ld | [] | 5
! libc | [] [] | 22
! libextractor | | 0
! libgpewidget | [] [] | 17
! libgsasl | [] | 7
! libiconv | [] [] [] [] [] | 32
! libidn | [] | 4
! lifelines | | 4
! lilypond | [] | 5
! lingoteach | | 5
! lynx | [] [] | 14
! m4 | [] [] | 17
! mailutils | [] | 7
! make | [] [] | 18
! man-db | | 5
! minicom | | 11
! mysecretdiary | [] [] | 11
! nano | | 11
! nano_1_0 | [] [] | 17
! opcodes | [] | 7
! parted | [] [] [] | 17
! psmisc | [] | 5
! ptx | [] [] | 23
! pwdutils | | 1
! python | | 0
! radius | [] | 6
! recode | [] [] | 22
! rpm | [] [] | 11
! screem | | 1
! scrollkeeper | [] [] | 22
! sed | [] | 17
! sh-utils | [] | 15
! shared-mime-info | [] [] | 19
! sharutils | [] [] [] | 20
! silky | | 3
! skencil | | 6
! sketch | | 6
! solfege | | 8
! soundtracker | [] | 8
! sp | [] | 3
! stardict | [] [] [] [] | 10
! tar | [] [] | 13
! texinfo | [] [] | 14
! textutils | [] [] [] | 17
! tin | | 1
! tp-robot | [] [] | 7
! tuxpaint | [] [] [] [] | 34
! unicode-han-tra... | | 0
! unicode-transla... | | 2
! util-linux | [] [] | 16
! vorbis-tools | [] | 10
! wastesedge | | 1
! wdiff | [] | 21
! wget | [] [] [] [] | 30
! xchat | [] [] | 21
! xfree86_xkb_xml | [] [] [] | 15
! xkeyboard-config | | 1
! xpad | [] | 5
! +--------------------------------------------+
! 71 teams tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
! 149 domains 0 0 1 66 30 0 54 16 0 42 21 0 1695
Some counters in the preceding matrix are higher than the number of
visible blocks let us expect. This is because a few extra PO files are
***************
*** 742,754 ****
lag between the mere existence a PO file and its wide availability in a
distribution.
! If January 2004 seems to be old, you may fetch a more recent copy of
! this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
! matrix with full percentage details can be found at
`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
! Using `gettext' in new packages
! ===============================
If you are writing a freely available program and want to
internationalize it you are welcome to use GNU `gettext' in your
--- 970,982 ----
lag between the mere existence a PO file and its wide availability in a
distribution.
! If February 2005 seems to be old, you may fetch a more recent copy
! of this `ABOUT-NLS' file on most GNU archive sites. The most
! up-to-date matrix with full percentage details can be found at
`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
! 1.6 Using `gettext' in new packages
! ===================================
If you are writing a freely available program and want to
internationalize it you are welcome to use GNU `gettext' in your
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.476
retrieving revision 1.477
diff -c -r1.476 -r1.477
*** ChangeLog 12 Mar 2005 23:59:38 -0000 1.476
--- ChangeLog 14 Mar 2005 13:06:23 -0000 1.477
***************
*** 1,3 ****
--- 1,11 ----
+ 2005-03-13 Karl Berry <address@hidden>
+
+ * util/texi2dvi: invoke
+
+ 2005-03-12 gettextize <address@hidden>
+
+ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.14.2.
+
2005-03-12 Karl Berry <address@hidden>
* process_css_file: fclose the file when we're through with it,
Index: NEWS
===================================================================
RCS file: /cvsroot/texinfo/texinfo/NEWS,v
retrieving revision 1.107
retrieving revision 1.108
diff -c -r1.107 -r1.108
*** NEWS 8 Mar 2005 15:06:34 -0000 1.107
--- NEWS 14 Mar 2005 13:06:23 -0000 1.108
***************
*** 1,4 ****
! $Id: NEWS,v 1.107 2005/03/08 15:06:34 karl Exp $
This file records noteworthy changes, very tersely.
See the manual for detailed information.
--- 1,4 ----
! $Id: NEWS,v 1.108 2005/03/14 13:06:23 karl Exp $
This file records noteworthy changes, very tersely.
See the manual for detailed information.
***************
*** 30,36 ****
* info:
. look for info files in the current directory first, by default.
* Distribution:
! . automake 1.9.5.
4.8 (31 December 2004)
--- 30,36 ----
* info:
. look for info files in the current directory first, by default.
* Distribution:
! . automake 1.9.5, gettext 0.14.2.
4.8 (31 December 2004)
Index: configure.ac
===================================================================
RCS file: /cvsroot/texinfo/texinfo/configure.ac,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** configure.ac 31 Dec 2004 21:43:12 -0000 1.51
--- configure.ac 14 Mar 2005 13:06:23 -0000 1.52
***************
*** 1,5 ****
# Process this file with autoconf to produce a configure script.
! # $Id: configure.ac,v 1.51 2004/12/31 21:43:12 karl Exp $
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
--- 1,5 ----
# Process this file with autoconf to produce a configure script.
! # $Id: configure.ac,v 1.52 2005/03/14 13:06:23 karl Exp $
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
***************
*** 206,212 ****
# i18n support. To update to a new version of gettext, run:
# gettextize -f -c --intl
! AM_GNU_GETTEXT_VERSION(0.14.1)
AM_GNU_GETTEXT()
AC_CONFIG_FILES([
--- 206,212 ----
# i18n support. To update to a new version of gettext, run:
# gettextize -f -c --intl
! AM_GNU_GETTEXT_VERSION(0.14.2)
AM_GNU_GETTEXT()
AC_CONFIG_FILES([
Index: doc/info.1
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/info.1,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** doc/info.1 31 Dec 2004 21:43:12 -0000 1.34
--- doc/info.1 14 Mar 2005 13:06:23 -0000 1.35
***************
*** 1,5 ****
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH INFO "1" "December 2004" "info 4.8" "User Commands"
.SH NAME
info \- read Info documents
.SH SYNOPSIS
--- 1,5 ----
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH INFO "1" "March 2005" "info 4.8" "User Commands"
.SH NAME
info \- read Info documents
.SH SYNOPSIS
Index: doc/infokey.1
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/infokey.1,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** doc/infokey.1 31 Dec 2004 21:43:12 -0000 1.12
--- doc/infokey.1 14 Mar 2005 13:06:23 -0000 1.13
***************
*** 1,5 ****
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH INFOKEY "1" "December 2004" "infokey 4.8" "User Commands"
.SH NAME
infokey \- compile customizations for Info
.SH SYNOPSIS
--- 1,5 ----
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH INFOKEY "1" "March 2005" "infokey 4.8" "User Commands"
.SH NAME
infokey \- compile customizations for Info
.SH SYNOPSIS
Index: doc/install-info.1
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/install-info.1,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** doc/install-info.1 31 Dec 2004 21:43:12 -0000 1.34
--- doc/install-info.1 14 Mar 2005 13:06:23 -0000 1.35
***************
*** 1,5 ****
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH INSTALL-INFO "1" "December 2004" "install-info 4.8" "User Commands"
.SH NAME
install-info \- update info/dir entries
.SH SYNOPSIS
--- 1,5 ----
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH INSTALL-INFO "1" "March 2005" "install-info 4.8" "User Commands"
.SH NAME
install-info \- update info/dir entries
.SH SYNOPSIS
Index: doc/makeinfo.1
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/makeinfo.1,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** doc/makeinfo.1 14 Feb 2005 00:20:27 -0000 1.42
--- doc/makeinfo.1 14 Mar 2005 13:06:23 -0000 1.43
***************
*** 1,5 ****
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH MAKEINFO "1" "February 2005" "makeinfo 4.8" "User Commands"
.SH NAME
makeinfo \- translate Texinfo documents
.SH SYNOPSIS
--- 1,5 ----
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH MAKEINFO "1" "March 2005" "makeinfo 4.8" "User Commands"
.SH NAME
makeinfo \- translate Texinfo documents
.SH SYNOPSIS
Index: doc/texi2dvi.1
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.38
retrieving revision 1.39
diff -c -r1.38 -r1.39
*** doc/texi2dvi.1 14 Feb 2005 00:20:27 -0000 1.38
--- doc/texi2dvi.1 14 Mar 2005 13:06:23 -0000 1.39
***************
*** 1,5 ****
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH TEXI2DVI "1" "February 2005" "texi2dvi 1.42" "User Commands"
.SH NAME
texi2dvi \- print Texinfo documents
.SH SYNOPSIS
--- 1,5 ----
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH TEXI2DVI "1" "March 2005" "texi2dvi 1.48" "User Commands"
.SH NAME
texi2dvi \- print Texinfo documents
.SH SYNOPSIS
Index: doc/texindex.1
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texindex.1,v
retrieving revision 1.33
retrieving revision 1.34
diff -c -r1.33 -r1.34
*** doc/texindex.1 31 Dec 2004 21:43:12 -0000 1.33
--- doc/texindex.1 14 Mar 2005 13:06:23 -0000 1.34
***************
*** 1,5 ****
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH TEXINDEX "1" "December 2004" "texindex 4.8" "User Commands"
.SH NAME
texindex \- sort Texinfo index files
.SH SYNOPSIS
--- 1,5 ----
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
! .TH TEXINDEX "1" "March 2005" "texindex 4.8" "User Commands"
.SH NAME
texindex \- sort Texinfo index files
.SH SYNOPSIS
Index: doc/version.texi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** doc/version.texi 14 Feb 2005 00:20:27 -0000 1.28
--- doc/version.texi 14 Mar 2005 13:06:23 -0000 1.29
***************
*** 1,4 ****
! @set UPDATED 13 February 2005
! @set UPDATED-MONTH February 2005
@set EDITION 4.8
@set VERSION 4.8
--- 1,4 ----
! @set UPDATED 5 March 2005
! @set UPDATED-MONTH March 2005
@set EDITION 4.8
@set VERSION 4.8
Index: intl/ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** intl/ChangeLog 11 Apr 2004 17:56:46 -0000 1.7
--- intl/ChangeLog 14 Mar 2005 13:06:23 -0000 1.8
***************
*** 1,4 ****
! 2004-01-29 GNU <address@hidden>
! * Version 0.14.1 released.
--- 1,4 ----
! 2005-02-24 GNU <address@hidden>
! * Version 0.14.2 released.
Index: intl/Makefile.in
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** intl/Makefile.in 11 Apr 2004 17:56:46 -0000 1.5
--- intl/Makefile.in 14 Mar 2005 13:06:23 -0000 1.6
***************
*** 1,5 ****
# Makefile for directory with message catalog handling library of GNU gettext
! # Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU Library General Public License as published
--- 1,5 ----
# Makefile for directory with message catalog handling library of GNU gettext
! # Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU Library General Public License as published
***************
*** 98,103 ****
--- 98,104 ----
plural-exp.c \
localcharset.c \
relocatable.c \
+ langprefs.c \
localename.c \
log.c \
printf.c \
***************
*** 123,128 ****
--- 124,130 ----
plural-exp.$lo \
localcharset.$lo \
relocatable.$lo \
+ langprefs.$lo \
localename.$lo \
log.$lo \
printf.$lo \
***************
*** 152,158 ****
libintl.la libgnuintl.la: $(OBJECTS)
$(LIBTOOL) --mode=link \
$(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
! $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
-version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-rpath $(libdir) \
-no-undefined
--- 154,160 ----
libintl.la libgnuintl.la: $(OBJECTS)
$(LIBTOOL) --mode=link \
$(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
! $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \
-version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-rpath $(libdir) \
-no-undefined
***************
*** 163,169 ****
# Maintainers of other packages that include the intl directory must *not*
# change these values.
LTV_CURRENT=7
! LTV_REVISION=0
LTV_AGE=4
.SUFFIXES:
--- 165,171 ----
# Maintainers of other packages that include the intl directory must *not*
# change these values.
LTV_CURRENT=7
! LTV_REVISION=1
LTV_AGE=4
.SUFFIXES:
***************
*** 212,217 ****
--- 214,221 ----
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
relocatable.lo: $(srcdir)/relocatable.c
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
+ langprefs.lo: $(srcdir)/langprefs.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c
localename.lo: $(srcdir)/localename.c
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
log.lo: $(srcdir)/log.c
***************
*** 271,277 ****
: ; \
fi
if test "$(PACKAGE)" = "gettext-tools" \
! && test '@USE_INCLUDED_LIBINTL@' = no; then \
$(mkinstalldirs) $(DESTDIR)$(libdir); \
$(LIBTOOL) --mode=install \
$(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
--- 275,282 ----
: ; \
fi
if test "$(PACKAGE)" = "gettext-tools" \
! && test '@USE_INCLUDED_LIBINTL@' = no \
! && test @GLIBC2@ != no; then \
$(mkinstalldirs) $(DESTDIR)$(libdir); \
$(LIBTOOL) --mode=install \
$(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
***************
*** 346,352 ****
: ; \
fi
if test "$(PACKAGE)" = "gettext-tools" \
! && test '@USE_INCLUDED_LIBINTL@' = no; then \
$(mkinstalldirs) $(DESTDIR)$(libdir); \
else \
: ; \
--- 351,358 ----
: ; \
fi
if test "$(PACKAGE)" = "gettext-tools" \
! && test '@USE_INCLUDED_LIBINTL@' = no \
! && test @GLIBC2@ != no; then \
$(mkinstalldirs) $(DESTDIR)$(libdir); \
else \
: ; \
***************
*** 376,382 ****
: ; \
fi
if test "$(PACKAGE)" = "gettext-tools" \
! && test '@USE_INCLUDED_LIBINTL@' = no; then \
rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
else \
: ; \
--- 382,389 ----
: ; \
fi
if test "$(PACKAGE)" = "gettext-tools" \
! && test '@USE_INCLUDED_LIBINTL@' = no \
! && test @GLIBC2@ != no; then \
rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
else \
: ; \
Index: intl/VERSION
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/VERSION,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** intl/VERSION 11 Apr 2004 17:56:46 -0000 1.7
--- intl/VERSION 14 Mar 2005 13:06:23 -0000 1.8
***************
*** 1 ****
! GNU gettext library from gettext-0.14.1
--- 1 ----
! GNU gettext library from gettext-0.14.2
Index: intl/config.charset
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/config.charset,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** intl/config.charset 11 Apr 2004 17:56:46 -0000 1.5
--- intl/config.charset 14 Mar 2005 13:06:23 -0000 1.6
***************
*** 38,49 ****
# ISO-8859-4 Y osf solaris freebsd darwin
# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin
# ISO-8859-6 Y glibc aix hpux solaris
! # ISO-8859-7 Y glibc aix hpux irix osf solaris
# ISO-8859-8 Y glibc aix hpux osf solaris
! # ISO-8859-9 Y glibc aix hpux irix osf solaris
! # ISO-8859-13 glibc
# ISO-8859-14 glibc
! # ISO-8859-15 glibc aix osf solaris freebsd
# KOI8-R Y glibc solaris freebsd darwin
# KOI8-U Y glibc freebsd darwin
# KOI8-T glibc
--- 38,49 ----
# ISO-8859-4 Y osf solaris freebsd darwin
# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin
# ISO-8859-6 Y glibc aix hpux solaris
! # ISO-8859-7 Y glibc aix hpux irix osf solaris darwin
# ISO-8859-8 Y glibc aix hpux osf solaris
! # ISO-8859-9 Y glibc aix hpux irix osf solaris darwin
! # ISO-8859-13 glibc darwin
# ISO-8859-14 glibc
! # ISO-8859-15 glibc aix osf solaris freebsd darwin
# KOI8-R Y glibc solaris freebsd darwin
# KOI8-U Y glibc freebsd darwin
# KOI8-T glibc
***************
*** 100,106 ****
# HP-KANA8 hpux
# DEC-KANJI osf
# DEC-HANYU osf
! # UTF-8 Y glibc aix hpux osf solaris
#
# Note: Names which are not marked as being a MIME name should not be used in
# Internet protocols for information interchange (mail, news, etc.).
--- 100,106 ----
# HP-KANA8 hpux
# DEC-KANJI osf
# DEC-HANYU osf
! # UTF-8 Y glibc aix hpux osf solaris darwin
#
# Note: Names which are not marked as being a MIME name should not be used in
# Internet protocols for information interchange (mail, news, etc.).
***************
*** 396,402 ****
echo "BIG5 BIG5"
echo "SJIS SHIFT_JIS"
;;
! darwin*)
# Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
# localcharset.c falls back to using the full locale name
# from the environment variables.
--- 396,402 ----
echo "BIG5 BIG5"
echo "SJIS SHIFT_JIS"
;;
! darwin[56]*)
# Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
# localcharset.c falls back to using the full locale name
# from the environment variables.
***************
*** 437,442 ****
--- 437,472 ----
echo "ja_JP.SJIS SHIFT_JIS"
echo "ko_KR.EUC EUC-KR"
;;
+ darwin*)
+ # Darwin 7.5 has nl_langinfo(CODESET), but it is useless:
+ # - It returns the empty string when LANG is set to a locale of the
+ # form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
+ # LC_CTYPE file.
+ # - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
+ # the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
+ # - The documentation says:
+ # "... all code that calls BSD system routines should ensure
+ # that the const *char parameters of these routines are in UTF-8
+ # encoding. All BSD system functions expect their string
+ # parameters to be in UTF-8 encoding and nothing else."
+ # It also says
+ # "An additional caveat is that string parameters for files,
+ # paths, and other file-system entities must be in canonical
+ # UTF-8. In a canonical UTF-8 Unicode string, all decomposable
+ # characters are decomposed ..."
+ # but this is not true: You can pass non-decomposed UTF-8 strings
+ # to file system functions, and it is the OS which will convert
+ # them to decomposed UTF-8 before accessing the file system.
+ # - The Apple Terminal application displays UTF-8 by default.
+ # - However, other applications are free to use different encodings:
+ # - xterm uses ISO-8859-1 by default.
+ # - TextEdit uses MacRoman by default.
+ # We prefer UTF-8 over decomposed UTF-8-MAC because one should
+ # minimize the use of decomposed Unicode. Unfortunately, through the
+ # Darwin file system, decomposed UTF-8 strings are leaked into user
+ # space nevertheless.
+ echo "* UTF-8"
+ ;;
beos*)
# BeOS has a single locale, and it has UTF-8 encoding.
echo "* UTF-8"
Index: intl/dcigettext.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/dcigettext.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** intl/dcigettext.c 24 Dec 2003 15:12:48 -0000 1.4
--- intl/dcigettext.c 14 Mar 2005 13:06:23 -0000 1.5
***************
*** 1,5 ****
/* Implementation of the internal dcigettext function.
! Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
--- 1,5 ----
/* Implementation of the internal dcigettext function.
! Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
***************
*** 200,207 ****
it may be concatenated to a directory pathname.
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
*/
! #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined
__DJGPP__
! /* Win32, OS/2, DOS */
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
# define HAS_DEVICE(P) \
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
--- 200,207 ----
it may be concatenated to a directory pathname.
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
*/
! #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined
__EMX__ || defined __DJGPP__
! /* Win32, Cygwin, OS/2, DOS */
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
# define HAS_DEVICE(P) \
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
***************
*** 1122,1152 ****
}
#endif
! /* Guess value of current locale from value of the environment variables. */
static const char *
internal_function
guess_category_value (int category, const char *categoryname)
{
const char *language;
! const char *retval;
! /* The highest priority value is the `LANGUAGE' environment
! variable. But we don't use the value if the currently selected
! locale is the C locale. This is a GNU extension. */
! language = getenv ("LANGUAGE");
! if (language != NULL && language[0] == '\0')
! language = NULL;
! /* We have to proceed with the POSIX methods of looking to `LC_ALL',
`LC_xxx', and `LANG'. On some systems this can be done by the
`setlocale' function itself. */
#ifdef _LIBC
! retval = __current_locale_name (category);
#else
! retval = _nl_locale_name (category, categoryname);
#endif
! /* Ignore LANGUAGE if the locale is set to "C" because
1. "C" locale usually uses the ASCII encoding, and most international
messages use non-ASCII characters. These characters get displayed
as question marks (if using glibc's iconv()) or as invalid 8-bit
--- 1122,1171 ----
}
#endif
! /* Guess value of current locale from value of the environment variables
! or system-dependent defaults. */
static const char *
internal_function
guess_category_value (int category, const char *categoryname)
{
const char *language;
! const char *locale;
! #ifndef _LIBC
! const char *language_default;
! int locale_defaulted;
! #endif
! /* We use the settings in the following order:
! 1. The value of the environment variable 'LANGUAGE'. This is a GNU
! extension. Its value can be a colon-separated list of locale names.
! 2. The value of the environment variable 'LC_ALL', 'LC_xxx', or 'LANG'.
! More precisely, the first among these that is set to a non-empty
value.
! This is how POSIX specifies it. The value is a single locale name.
! 3. A system-dependent preference list of languages. Its value can be a
! colon-separated list of locale names.
! 4. A system-dependent default locale name.
! This way:
! - System-dependent settings can be overridden by environment variables.
! - If the system provides both a list of languages and a default locale,
! the former is used. */
! /* Fetch the locale name, through the POSIX method of looking to `LC_ALL',
`LC_xxx', and `LANG'. On some systems this can be done by the
`setlocale' function itself. */
#ifdef _LIBC
! locale = __current_locale_name (category);
#else
! locale = _nl_locale_name_posix (category, categoryname);
! locale_defaulted = 0;
! if (locale == NULL)
! {
! locale = _nl_locale_name_default ();
! locale_defaulted = 1;
! }
#endif
! /* Ignore LANGUAGE and its system-dependent analogon if the locale is set
! to "C" because
1. "C" locale usually uses the ASCII encoding, and most international
messages use non-ASCII characters. These characters get displayed
as question marks (if using glibc's iconv()) or as invalid 8-bit
***************
*** 1154,1161 ****
characters to ASCII). In any case, the output is ugly.
2. The precise output of some programs in the "C" locale is specified
by POSIX and should not depend on environment variables like
! "LANGUAGE". We allow such programs to use gettext(). */
! return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
}
/* @@ begin of epilog @@ */
--- 1173,1200 ----
characters to ASCII). In any case, the output is ugly.
2. The precise output of some programs in the "C" locale is specified
by POSIX and should not depend on environment variables like
! "LANGUAGE" or system-dependent information. We allow such programs
! to use gettext(). */
! if (strcmp (locale, "C") == 0)
! return locale;
!
! /* The highest priority value is the value of the 'LANGUAGE' environment
! variable. */
! language = getenv ("LANGUAGE");
! if (language != NULL && language[0] != '\0')
! return language;
! #ifndef _LIBC
! /* The next priority value is the locale name, if not defaulted. */
! if (locale_defaulted)
! {
! /* The next priority value is the default language preferences list. */
! language_default = _nl_language_preferences_default ();
! if (language_default != NULL)
! return language_default;
! }
! /* The least priority value is the locale name, if defaulted. */
! #endif
! return locale;
}
/* @@ begin of epilog @@ */
Index: intl/gettextP.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/gettextP.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** intl/gettextP.h 24 Dec 2003 15:12:48 -0000 1.4
--- intl/gettextP.h 14 Mar 2005 13:06:23 -0000 1.5
***************
*** 1,5 ****
/* Header describing internals of libintl library.
! Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
Written by Ulrich Drepper <address@hidden>, 1995.
This program is free software; you can redistribute it and/or modify it
--- 1,5 ----
/* Header describing internals of libintl library.
! Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
Written by Ulrich Drepper <address@hidden>, 1995.
This program is free software; you can redistribute it and/or modify it
***************
*** 151,156 ****
--- 151,159 ----
extern int _nl_msg_cat_cntr;
#ifndef _LIBC
+ const char *_nl_language_preferences_default (void);
+ const char *_nl_locale_name_posix (int category, const char *categoryname);
+ const char *_nl_locale_name_default (void);
const char *_nl_locale_name (int category, const char *categoryname);
#endif
Index: intl/l10nflist.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/l10nflist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** intl/l10nflist.c 24 Dec 2003 15:12:48 -0000 1.3
--- intl/l10nflist.c 14 Mar 2005 13:06:23 -0000 1.4
***************
*** 1,4 ****
! /* Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <address@hidden>, 1995.
This program is free software; you can redistribute it and/or modify it
--- 1,4 ----
! /* Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <address@hidden>, 1995.
This program is free software; you can redistribute it and/or modify it
***************
*** 67,74 ****
IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
it may be concatenated to a directory pathname.
*/
! #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined
__DJGPP__
! /* Win32, OS/2, DOS */
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
# define HAS_DEVICE(P) \
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
--- 67,74 ----
IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
it may be concatenated to a directory pathname.
*/
! #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined
__EMX__ || defined __DJGPP__
! /* Win32, Cygwin, OS/2, DOS */
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
# define HAS_DEVICE(P) \
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
Index: intl/libgnuintl.h.in
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/libgnuintl.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** intl/libgnuintl.h.in 24 Dec 2003 15:12:48 -0000 1.2
--- intl/libgnuintl.h.in 14 Mar 2005 13:06:23 -0000 1.3
***************
*** 1,5 ****
/* Message catalogs for internationalization.
! Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
--- 1,5 ----
/* Message catalogs for internationalization.
! Copyright (C) 1995-1997, 2000-2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
***************
*** 39,45 ****
/* Provide information about the supported file formats. Returns the
maximum minor revision number supported for a given major revision. */
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
! ((major) == 0 ? 1 : -1)
/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
precedence over _conio_gettext. */
--- 39,45 ----
/* Provide information about the supported file formats. Returns the
maximum minor revision number supported for a given major revision. */
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
! ((major) == 0 || (major) == 1 ? 1 : -1)
/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
precedence over _conio_gettext. */
Index: intl/localcharset.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/localcharset.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** intl/localcharset.c 24 Dec 2003 15:12:48 -0000 1.4
--- intl/localcharset.c 14 Mar 2005 13:06:23 -0000 1.5
***************
*** 1,6 ****
/* Determine a canonical name for the current locale's character encoding.
! Copyright (C) 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
--- 1,6 ----
/* Determine a canonical name for the current locale's character encoding.
! Copyright (C) 2000-2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
***************
*** 73,80 ****
# define relocate(pathname) (pathname)
#endif
! #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined
__DJGPP__
! /* Win32, OS/2, DOS */
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
#endif
--- 73,80 ----
# define relocate(pathname) (pathname)
#endif
! #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined
__EMX__ || defined __DJGPP__
! /* Win32, Cygwin, OS/2, DOS */
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
#endif
***************
*** 116,125 ****
{
#if !(defined VMS || defined WIN32)
FILE *fp;
! const char *dir = relocate (LIBDIR);
const char *base = "charset.alias";
char *file_name;
/* Concatenate dir and base into freshly allocated file_name. */
{
size_t dir_len = strlen (dir);
--- 116,131 ----
{
#if !(defined VMS || defined WIN32)
FILE *fp;
! const char *dir;
const char *base = "charset.alias";
char *file_name;
+ /* Make it possible to override the charset.alias location. This is
+ necessary for running the testsuite before "make install". */
+ dir = getenv ("CHARSETALIASDIR");
+ if (dir == NULL || dir[0] == '\0')
+ dir = relocate (LIBDIR);
+
/* Concatenate dir and base into freshly allocated file_name. */
{
size_t dir_len = strlen (dir);
***************
*** 141,155 ****
else
{
/* Parse the file's contents. */
- int c;
- char buf1[50+1];
- char buf2[50+1];
char *res_ptr = NULL;
size_t res_size = 0;
- size_t l1, l2;
for (;;)
{
c = getc (fp);
if (c == EOF)
break;
--- 147,163 ----
else
{
/* Parse the file's contents. */
char *res_ptr = NULL;
size_t res_size = 0;
for (;;)
{
+ int c;
+ char buf1[50+1];
+ char buf2[50+1];
+ size_t l1, l2;
+ char *old_res_ptr;
+
c = getc (fp);
if (c == EOF)
break;
***************
*** 170,175 ****
--- 178,184 ----
break;
l1 = strlen (buf1);
l2 = strlen (buf2);
+ old_res_ptr = res_ptr;
if (res_size == 0)
{
res_size = l1 + 1 + l2 + 1;
***************
*** 184,189 ****
--- 193,200 ----
{
/* Out of memory. */
res_size = 0;
+ if (old_res_ptr != NULL)
+ free (old_res_ptr);
break;
}
strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
Index: intl/localename.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/localename.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** intl/localename.c 11 Apr 2004 17:56:46 -0000 1.4
--- intl/localename.c 14 Mar 2005 13:06:23 -0000 1.5
***************
*** 1,5 ****
/* Determine the current selected locale.
! Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
--- 1,5 ----
/* Determine the current selected locale.
! Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
***************
*** 18,23 ****
--- 18,24 ----
/* Written by Ulrich Drepper <address@hidden>, 1995. */
/* Win32 code written by Tor Lillqvist <address@hidden>. */
+ /* MacOS X code written by Bruno Haible <address@hidden>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
***************
*** 26,31 ****
--- 27,42 ----
#include <stdlib.h>
#include <locale.h>
+ #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
+ # include <string.h>
+ # include <CFString.h>
+ # if HAVE_CFLOCALECOPYCURRENT
+ # include <CFLocale.h>
+ # elif HAVE_CFPREFERENCESCOPYAPPVALUE
+ # include <CFPreferences.h>
+ # endif
+ #endif
+
#if defined _WIN32 || defined __WIN32__
# undef WIN32 /* avoid warning on mingw32 */
# define WIN32
***************
*** 700,834 ****
The result must not be freed; it is statically allocated. */
const char *
! _nl_locale_name (int category, const char *categoryname)
{
- const char *retval;
-
- #ifndef WIN32
-
/* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
On some systems this can be done by the 'setlocale' function itself. */
! # if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined
HAVE_LOCALE_NULL
! retval = setlocale (category, NULL);
! # else
! /* Setting of LC_ALL overwrites all other. */
! retval = getenv ("LC_ALL");
! if (retval == NULL || retval[0] == '\0')
! {
! /* Next comes the name of the desired category. */
! retval = getenv (categoryname);
! if (retval == NULL || retval[0] == '\0')
! {
! /* Last possibility is the LANG environment variable. */
! retval = getenv ("LANG");
! if (retval == NULL || retval[0] == '\0')
! /* We use C as the default domain. POSIX says this is
! implementation defined. */
! retval = "C";
! }
! }
! # endif
!
! return retval;
!
! #else /* WIN32 */
!
! /* Return an XPG style locale name address@hidden
! Don't even bother determining the codeset; it's not useful in this
! context, because message catalogs are not specific to a single
! codeset. */
!
! LCID lcid;
! LANGID langid;
! int primary, sub;
! /* Let the user override the system settings through environment
! variables, as on POSIX systems. */
retval = getenv ("LC_ALL");
if (retval != NULL && retval[0] != '\0')
return retval;
retval = getenv (categoryname);
if (retval != NULL && retval[0] != '\0')
return retval;
retval = getenv ("LANG");
if (retval != NULL && retval[0] != '\0')
return retval;
! /* Use native Win32 API locale ID. */
! lcid = GetThreadLocale ();
! /* Strip off the sorting rules, keep only the language part. */
! langid = LANGIDFROMLCID (lcid);
! /* Split into language and territory part. */
! primary = PRIMARYLANGID (langid);
! sub = SUBLANGID (langid);
!
! /* Dispatch on language.
! See also http://www.unicode.org/unicode/onlinedat/languages.html .
! For details about languages, see http://www.ethnologue.com/ . */
! switch (primary)
! {
! case LANG_AFRIKAANS: return "af_ZA";
! case LANG_ALBANIAN: return "sq_AL";
! case LANG_AMHARIC: return "am_ET";
! case LANG_ARABIC:
! switch (sub)
! {
! case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
! case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
! case SUBLANG_ARABIC_EGYPT: return "ar_EG";
! case SUBLANG_ARABIC_LIBYA: return "ar_LY";
! case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
! case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
! case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
! case SUBLANG_ARABIC_OMAN: return "ar_OM";
! case SUBLANG_ARABIC_YEMEN: return "ar_YE";
! case SUBLANG_ARABIC_SYRIA: return "ar_SY";
! case SUBLANG_ARABIC_JORDAN: return "ar_JO";
! case SUBLANG_ARABIC_LEBANON: return "ar_LB";
! case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
! case SUBLANG_ARABIC_UAE: return "ar_AE";
! case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
! case SUBLANG_ARABIC_QATAR: return "ar_QA";
! }
! return "ar";
! case LANG_ARMENIAN: return "hy_AM";
! case LANG_ASSAMESE: return "as_IN";
! case LANG_AZERI:
! switch (sub)
! {
! /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */
! case SUBLANG_AZERI_LATIN: return "address@hidden";
! case SUBLANG_AZERI_CYRILLIC: return "address@hidden";
! }
! return "az";
! case LANG_BASQUE:
! return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */
! case LANG_BELARUSIAN: return "be_BY";
! case LANG_BENGALI:
! switch (sub)
! {
! case SUBLANG_BENGALI_INDIA: return "bn_IN";
! case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
! }
! return "bn";
! case LANG_BULGARIAN: return "bg_BG";
! case LANG_BURMESE: return "my_MM";
! case LANG_CAMBODIAN: return "km_KH";
! case LANG_CATALAN: return "ca_ES";
! case LANG_CHEROKEE: return "chr_US";
! case LANG_CHINESE:
! switch (sub)
! {
! case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
! case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
! case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
! case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
! case SUBLANG_CHINESE_MACAU: return "zh_MO";
! }
! return "zh";
! case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN
* What used to be called Serbo-Croatian
* should really now be two separate
* languages because of political reasons.
--- 711,887 ----
The result must not be freed; it is statically allocated. */
const char *
! _nl_locale_name_posix (int category, const char *categoryname)
{
/* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
On some systems this can be done by the 'setlocale' function itself. */
! #if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined
HAVE_LOCALE_NULL
! return setlocale (category, NULL);
! #else
! const char *retval;
! /* Setting of LC_ALL overrides all other. */
retval = getenv ("LC_ALL");
if (retval != NULL && retval[0] != '\0')
return retval;
+ /* Next comes the name of the desired category. */
retval = getenv (categoryname);
if (retval != NULL && retval[0] != '\0')
return retval;
+ /* Last possibility is the LANG environment variable. */
retval = getenv ("LANG");
if (retval != NULL && retval[0] != '\0')
return retval;
! return NULL;
! #endif
! }
! const char *
! _nl_locale_name_default (void)
! {
! /* POSIX:2001 says:
! "All implementations shall define a locale as the default locale, to be
! invoked when no environment variables are set, or set to the empty
! string. This default locale can be the POSIX locale or any other
! implementation-defined locale. Some implementations may provide
! facilities for local installation administrators to set the default
! locale, customizing it for each location. POSIX:2001 does not require
! such a facility. */
!
! #if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE ||
defined(WIN32))
!
! /* The system does not have a way of setting the locale, other than the
! POSIX specified environment variables. We use C as default locale. */
! return "C";
!
! #else
!
! /* Return an XPG style locale name address@hidden
! Don't even bother determining the codeset; it's not useful in this
! context, because message catalogs are not specific to a single
! codeset. */
! # if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
! /* MacOS X 10.2 or newer */
! {
! /* Cache the locale name, since CoreFoundation calls are expensive. */
! static const char *cached_localename;
!
! if (cached_localename == NULL)
! {
! char namebuf[256];
! # if HAVE_CFLOCALECOPYCURRENT /* MacOS X 10.3 or newer */
! CFLocaleRef locale = CFLocaleCopyCurrent ();
! CFStringRef name = CFLocaleGetIdentifier (locale);
!
! if (CFStringGetCString (name, namebuf, sizeof(namebuf),
! kCFStringEncodingASCII))
! cached_localename = strdup (namebuf);
! CFRelease (locale);
! # elif HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
! CFTypeRef value =
! CFPreferencesCopyAppValue (CFSTR ("AppleLocale"),
! kCFPreferencesCurrentApplication);
! if (value != NULL
! && CFGetTypeID (value) == CFStringGetTypeID ()
! && CFStringGetCString ((CFStringRef)value, namebuf, sizeof(namebuf),
! kCFStringEncodingASCII))
! cached_localename = strdup (namebuf);
! # endif
! if (cached_localename == NULL)
! cached_localename = "C";
! }
! return cached_localename;
! }
!
! # endif
!
! # if defined(WIN32) /* WIN32 */
! {
! LCID lcid;
! LANGID langid;
! int primary, sub;
!
! /* Use native Win32 API locale ID. */
! lcid = GetThreadLocale ();
!
! /* Strip off the sorting rules, keep only the language part. */
! langid = LANGIDFROMLCID (lcid);
!
! /* Split into language and territory part. */
! primary = PRIMARYLANGID (langid);
! sub = SUBLANGID (langid);
!
! /* Dispatch on language.
! See also http://www.unicode.org/unicode/onlinedat/languages.html .
! For details about languages, see http://www.ethnologue.com/ . */
! switch (primary)
! {
! case LANG_AFRIKAANS: return "af_ZA";
! case LANG_ALBANIAN: return "sq_AL";
! case LANG_AMHARIC: return "am_ET";
! case LANG_ARABIC:
! switch (sub)
! {
! case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
! case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
! case SUBLANG_ARABIC_EGYPT: return "ar_EG";
! case SUBLANG_ARABIC_LIBYA: return "ar_LY";
! case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
! case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
! case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
! case SUBLANG_ARABIC_OMAN: return "ar_OM";
! case SUBLANG_ARABIC_YEMEN: return "ar_YE";
! case SUBLANG_ARABIC_SYRIA: return "ar_SY";
! case SUBLANG_ARABIC_JORDAN: return "ar_JO";
! case SUBLANG_ARABIC_LEBANON: return "ar_LB";
! case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
! case SUBLANG_ARABIC_UAE: return "ar_AE";
! case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
! case SUBLANG_ARABIC_QATAR: return "ar_QA";
! }
! return "ar";
! case LANG_ARMENIAN: return "hy_AM";
! case LANG_ASSAMESE: return "as_IN";
! case LANG_AZERI:
! switch (sub)
! {
! /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */
! case SUBLANG_AZERI_LATIN: return "address@hidden";
! case SUBLANG_AZERI_CYRILLIC: return "address@hidden";
! }
! return "az";
! case LANG_BASQUE:
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "eu_ES";
! }
! return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */
! case LANG_BELARUSIAN: return "be_BY";
! case LANG_BENGALI:
! switch (sub)
! {
! case SUBLANG_BENGALI_INDIA: return "bn_IN";
! case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
! }
! return "bn";
! case LANG_BULGARIAN: return "bg_BG";
! case LANG_BURMESE: return "my_MM";
! case LANG_CAMBODIAN: return "km_KH";
! case LANG_CATALAN: return "ca_ES";
! case LANG_CHEROKEE: return "chr_US";
! case LANG_CHINESE:
! switch (sub)
! {
! case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
! case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
! case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
! case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
! case SUBLANG_CHINESE_MACAU: return "zh_MO";
! }
! return "zh";
! case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN
* What used to be called Serbo-Croatian
* should really now be two separate
* languages because of political reasons.
***************
*** 836,1142 ****
* or Croatian.)
* (I can feel those flames coming already.)
*/
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "hr_HR";
! case SUBLANG_SERBIAN_LATIN: return "sr_CS";
! case SUBLANG_SERBIAN_CYRILLIC: return "address@hidden";
! }
! return "hr";
! case LANG_CZECH: return "cs_CZ";
! case LANG_DANISH: return "da_DK";
! case LANG_DIVEHI: return "dv_MV";
! case LANG_DUTCH:
! switch (sub)
! {
! case SUBLANG_DUTCH: return "nl_NL";
! case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
! }
! return "nl";
! case LANG_EDO: return "bin_NG";
! case LANG_ENGLISH:
! switch (sub)
! {
! /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
! * English was the language spoken in England.
! * Oh well.
! */
! case SUBLANG_ENGLISH_US: return "en_US";
! case SUBLANG_ENGLISH_UK: return "en_GB";
! case SUBLANG_ENGLISH_AUS: return "en_AU";
! case SUBLANG_ENGLISH_CAN: return "en_CA";
! case SUBLANG_ENGLISH_NZ: return "en_NZ";
! case SUBLANG_ENGLISH_EIRE: return "en_IE";
! case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
! case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
! case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
! case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
! case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
! case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
! case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
! case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
! case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
! case SUBLANG_ENGLISH_INDIA: return "en_IN";
! case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
! case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
! }
! return "en";
! case LANG_ESTONIAN: return "et_EE";
! case LANG_FAEROESE: return "fo_FO";
! case LANG_FARSI: return "fa_IR";
! case LANG_FINNISH: return "fi_FI";
! case LANG_FRENCH:
! switch (sub)
! {
! case SUBLANG_FRENCH: return "fr_FR";
! case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
! case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
! case SUBLANG_FRENCH_SWISS: return "fr_CH";
! case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
! case SUBLANG_FRENCH_MONACO: return "fr_MC";
! case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
! case SUBLANG_FRENCH_REUNION: return "fr_RE";
! case SUBLANG_FRENCH_CONGO: return "fr_CG";
! case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
! case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
! case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
! case SUBLANG_FRENCH_MALI: return "fr_ML";
! case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
! case SUBLANG_FRENCH_HAITI: return "fr_HT";
! }
! return "fr";
! case LANG_FRISIAN: return "fy_NL";
! case LANG_FULFULDE:
! /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */
! return "ff_NG";
! case LANG_GAELIC:
! switch (sub)
! {
! case 0x01: /* SCOTTISH */ return "gd_GB";
! case 0x02: /* IRISH */ return "ga_IE";
! }
! return "C";
! case LANG_GALICIAN: return "gl_ES";
! case LANG_GEORGIAN: return "ka_GE";
! case LANG_GERMAN:
! switch (sub)
! {
! case SUBLANG_GERMAN: return "de_DE";
! case SUBLANG_GERMAN_SWISS: return "de_CH";
! case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
! case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
! case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
! }
! return "de";
! case LANG_GREEK: return "el_GR";
! case LANG_GUARANI: return "gn_PY";
! case LANG_GUJARATI: return "gu_IN";
! case LANG_HAUSA: return "ha_NG";
! case LANG_HAWAIIAN:
! /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
! or Hawaii Creole English ("cpe_US", 600000 speakers)? */
! return "cpe_US";
! case LANG_HEBREW: return "he_IL";
! case LANG_HINDI: return "hi_IN";
! case LANG_HUNGARIAN: return "hu_HU";
! case LANG_IBIBIO: return "nic_NG";
! case LANG_ICELANDIC: return "is_IS";
! case LANG_IGBO: return "ig_NG";
! case LANG_INDONESIAN: return "id_ID";
! case LANG_INUKTITUT: return "iu_CA";
! case LANG_ITALIAN:
! switch (sub)
! {
! case SUBLANG_ITALIAN: return "it_IT";
! case SUBLANG_ITALIAN_SWISS: return "it_CH";
! }
! return "it";
! case LANG_JAPANESE: return "ja_JP";
! case LANG_KANNADA: return "kn_IN";
! case LANG_KANURI: return "kr_NG";
! case LANG_KASHMIRI:
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "ks_PK";
! case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
! }
! return "ks";
! case LANG_KAZAK: return "kk_KZ";
! case LANG_KONKANI:
! /* FIXME: Adjust this when such locales appear on Unix. */
! return "kok_IN";
! case LANG_KOREAN: return "ko_KR";
! case LANG_KYRGYZ: return "ky_KG";
! case LANG_LAO: return "lo_LA";
! case LANG_LATIN: return "la_VA";
! case LANG_LATVIAN: return "lv_LV";
! case LANG_LITHUANIAN: return "lt_LT";
! case LANG_MACEDONIAN: return "mk_MK";
! case LANG_MALAY:
! switch (sub)
! {
! case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
! case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
! }
! return "ms";
! case LANG_MALAYALAM: return "ml_IN";
! case LANG_MALTESE: return "mt_MT";
! case LANG_MANIPURI:
! /* FIXME: Adjust this when such locales appear on Unix. */
! return "mni_IN";
! case LANG_MARATHI: return "mr_IN";
! case LANG_MONGOLIAN:
! return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */
! case LANG_NEPALI:
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "ne_NP";
! case SUBLANG_NEPALI_INDIA: return "ne_IN";
! }
! return "ne";
! case LANG_NORWEGIAN:
! switch (sub)
! {
! case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO";
! case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
! }
! return "no";
! case LANG_ORIYA: return "or_IN";
! case LANG_OROMO: return "om_ET";
! case LANG_PAPIAMENTU: return "pap_AN";
! case LANG_PASHTO:
! return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */
! case LANG_POLISH: return "pl_PL";
! case LANG_PORTUGUESE:
! switch (sub)
! {
! case SUBLANG_PORTUGUESE: return "pt_PT";
! /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
! Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
! case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
! }
! return "pt";
! case LANG_PUNJABI:
! switch (sub)
! {
! case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
! case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
! }
! return "pa";
! case LANG_RHAETO_ROMANCE: return "rm_CH";
! case LANG_ROMANIAN:
! switch (sub)
! {
! case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
! case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
! }
! return "ro";
! case LANG_RUSSIAN:
! return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */
! case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
! case LANG_SANSKRIT: return "sa_IN";
! case LANG_SINDHI:
! switch (sub)
! {
! case SUBLANG_SINDHI_INDIA: return "sd_IN";
! case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
! }
! return "sd";
! case LANG_SINHALESE: return "si_LK";
! case LANG_SLOVAK: return "sk_SK";
! case LANG_SLOVENIAN: return "sl_SI";
! case LANG_SOMALI: return "so_SO";
! case LANG_SORBIAN:
! /* FIXME: Adjust this when such locales appear on Unix. */
! return "wen_DE";
! case LANG_SPANISH:
! switch (sub)
! {
! case SUBLANG_SPANISH: return "es_ES";
! case SUBLANG_SPANISH_MEXICAN: return "es_MX";
! case SUBLANG_SPANISH_MODERN:
! return "address@hidden"; /* not seen on Unix */
! case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
! case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
! case SUBLANG_SPANISH_PANAMA: return "es_PA";
! case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
! case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
! case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
! case SUBLANG_SPANISH_PERU: return "es_PE";
! case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
! case SUBLANG_SPANISH_ECUADOR: return "es_EC";
! case SUBLANG_SPANISH_CHILE: return "es_CL";
! case SUBLANG_SPANISH_URUGUAY: return "es_UY";
! case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
! case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
! case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
! case SUBLANG_SPANISH_HONDURAS: return "es_HN";
! case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
! case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
! }
! return "es";
! case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
! case LANG_SWAHILI: return "sw_KE";
! case LANG_SWEDISH:
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "sv_SE";
! case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
! }
! return "sv";
! case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */
! case LANG_TAGALOG: return "tl_PH";
! case LANG_TAJIK: return "tg_TJ";
! case LANG_TAMAZIGHT:
! switch (sub)
! {
! /* FIXME: Adjust this when Tamazight locales appear on Unix. */
! case SUBLANG_TAMAZIGHT_ARABIC: return "address@hidden";
! case SUBLANG_TAMAZIGHT_LATIN: return "address@hidden";
! }
! return "ber_MA";
! case LANG_TAMIL:
! return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */
! case LANG_TATAR: return "tt_RU";
! case LANG_TELUGU: return "te_IN";
! case LANG_THAI: return "th_TH";
! case LANG_TIBETAN: return "bo_CN";
! case LANG_TIGRINYA:
! switch (sub)
! {
! case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
! case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
! }
! return "ti";
! case LANG_TSONGA: return "ts_ZA";
! case LANG_TSWANA: return "tn_BW";
! case LANG_TURKISH: return "tr_TR";
! case LANG_TURKMEN: return "tk_TM";
! case LANG_UKRAINIAN: return "uk_UA";
! case LANG_URDU:
! switch (sub)
! {
! case SUBLANG_URDU_PAKISTAN: return "ur_PK";
! case SUBLANG_URDU_INDIA: return "ur_IN";
! }
! return "ur";
! case LANG_UZBEK:
! switch (sub)
! {
! case SUBLANG_UZBEK_LATIN: return "uz_UZ";
! case SUBLANG_UZBEK_CYRILLIC: return "address@hidden";
! }
! return "uz";
! case LANG_VENDA: return "ve_ZA";
! case LANG_VIETNAMESE: return "vi_VN";
! case LANG_WELSH: return "cy_GB";
! case LANG_XHOSA: return "xh_ZA";
! case LANG_YI: return "sit_CN";
! case LANG_YIDDISH: return "yi_IL";
! case LANG_YORUBA: return "yo_NG";
! case LANG_ZULU: return "zu_ZA";
! default: return "C";
! }
!
#endif
}
--- 889,1220 ----
* or Croatian.)
* (I can feel those flames coming already.)
*/
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "hr_HR";
! case SUBLANG_SERBIAN_LATIN: return "sr_CS";
! case SUBLANG_SERBIAN_CYRILLIC: return "address@hidden";
! }
! return "hr";
! case LANG_CZECH: return "cs_CZ";
! case LANG_DANISH: return "da_DK";
! case LANG_DIVEHI: return "dv_MV";
! case LANG_DUTCH:
! switch (sub)
! {
! case SUBLANG_DUTCH: return "nl_NL";
! case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
! }
! return "nl";
! case LANG_EDO: return "bin_NG";
! case LANG_ENGLISH:
! switch (sub)
! {
! /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
! * English was the language spoken in England.
! * Oh well.
! */
! case SUBLANG_ENGLISH_US: return "en_US";
! case SUBLANG_ENGLISH_UK: return "en_GB";
! case SUBLANG_ENGLISH_AUS: return "en_AU";
! case SUBLANG_ENGLISH_CAN: return "en_CA";
! case SUBLANG_ENGLISH_NZ: return "en_NZ";
! case SUBLANG_ENGLISH_EIRE: return "en_IE";
! case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
! case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
! case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
! case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
! case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
! case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
! case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
! case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
! case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
! case SUBLANG_ENGLISH_INDIA: return "en_IN";
! case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
! case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
! }
! return "en";
! case LANG_ESTONIAN: return "et_EE";
! case LANG_FAEROESE: return "fo_FO";
! case LANG_FARSI: return "fa_IR";
! case LANG_FINNISH: return "fi_FI";
! case LANG_FRENCH:
! switch (sub)
! {
! case SUBLANG_FRENCH: return "fr_FR";
! case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
! case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
! case SUBLANG_FRENCH_SWISS: return "fr_CH";
! case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
! case SUBLANG_FRENCH_MONACO: return "fr_MC";
! case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
! case SUBLANG_FRENCH_REUNION: return "fr_RE";
! case SUBLANG_FRENCH_CONGO: return "fr_CG";
! case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
! case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
! case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
! case SUBLANG_FRENCH_MALI: return "fr_ML";
! case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
! case SUBLANG_FRENCH_HAITI: return "fr_HT";
! }
! return "fr";
! case LANG_FRISIAN: return "fy_NL";
! case LANG_FULFULDE:
! /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */
! return "ff_NG";
! case LANG_GAELIC:
! switch (sub)
! {
! case 0x01: /* SCOTTISH */ return "gd_GB";
! case 0x02: /* IRISH */ return "ga_IE";
! }
! return "C";
! case LANG_GALICIAN: return "gl_ES";
! case LANG_GEORGIAN: return "ka_GE";
! case LANG_GERMAN:
! switch (sub)
! {
! case SUBLANG_GERMAN: return "de_DE";
! case SUBLANG_GERMAN_SWISS: return "de_CH";
! case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
! case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
! case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
! }
! return "de";
! case LANG_GREEK: return "el_GR";
! case LANG_GUARANI: return "gn_PY";
! case LANG_GUJARATI: return "gu_IN";
! case LANG_HAUSA: return "ha_NG";
! case LANG_HAWAIIAN:
! /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
! or Hawaii Creole English ("cpe_US", 600000 speakers)? */
! return "cpe_US";
! case LANG_HEBREW: return "he_IL";
! case LANG_HINDI: return "hi_IN";
! case LANG_HUNGARIAN: return "hu_HU";
! case LANG_IBIBIO: return "nic_NG";
! case LANG_ICELANDIC: return "is_IS";
! case LANG_IGBO: return "ig_NG";
! case LANG_INDONESIAN: return "id_ID";
! case LANG_INUKTITUT: return "iu_CA";
! case LANG_ITALIAN:
! switch (sub)
! {
! case SUBLANG_ITALIAN: return "it_IT";
! case SUBLANG_ITALIAN_SWISS: return "it_CH";
! }
! return "it";
! case LANG_JAPANESE: return "ja_JP";
! case LANG_KANNADA: return "kn_IN";
! case LANG_KANURI: return "kr_NG";
! case LANG_KASHMIRI:
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "ks_PK";
! case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
! }
! return "ks";
! case LANG_KAZAK: return "kk_KZ";
! case LANG_KONKANI:
! /* FIXME: Adjust this when such locales appear on Unix. */
! return "kok_IN";
! case LANG_KOREAN: return "ko_KR";
! case LANG_KYRGYZ: return "ky_KG";
! case LANG_LAO: return "lo_LA";
! case LANG_LATIN: return "la_VA";
! case LANG_LATVIAN: return "lv_LV";
! case LANG_LITHUANIAN: return "lt_LT";
! case LANG_MACEDONIAN: return "mk_MK";
! case LANG_MALAY:
! switch (sub)
! {
! case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
! case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
! }
! return "ms";
! case LANG_MALAYALAM: return "ml_IN";
! case LANG_MALTESE: return "mt_MT";
! case LANG_MANIPURI:
! /* FIXME: Adjust this when such locales appear on Unix. */
! return "mni_IN";
! case LANG_MARATHI: return "mr_IN";
! case LANG_MONGOLIAN:
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "mn_MN";
! }
! return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */
! case LANG_NEPALI:
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "ne_NP";
! case SUBLANG_NEPALI_INDIA: return "ne_IN";
! }
! return "ne";
! case LANG_NORWEGIAN:
! switch (sub)
! {
! case SUBLANG_NORWEGIAN_BOKMAL: return "nb_NO";
! case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
! }
! return "no";
! case LANG_ORIYA: return "or_IN";
! case LANG_OROMO: return "om_ET";
! case LANG_PAPIAMENTU: return "pap_AN";
! case LANG_PASHTO:
! return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */
! case LANG_POLISH: return "pl_PL";
! case LANG_PORTUGUESE:
! switch (sub)
! {
! case SUBLANG_PORTUGUESE: return "pt_PT";
! /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
! Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
! case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
! }
! return "pt";
! case LANG_PUNJABI:
! switch (sub)
! {
! case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
! case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
! }
! return "pa";
! case LANG_RHAETO_ROMANCE: return "rm_CH";
! case LANG_ROMANIAN:
! switch (sub)
! {
! case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
! case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
! }
! return "ro";
! case LANG_RUSSIAN:
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "ru_RU";
! }
! return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */
! case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
! case LANG_SANSKRIT: return "sa_IN";
! case LANG_SINDHI:
! switch (sub)
! {
! case SUBLANG_SINDHI_INDIA: return "sd_IN";
! case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
! }
! return "sd";
! case LANG_SINHALESE: return "si_LK";
! case LANG_SLOVAK: return "sk_SK";
! case LANG_SLOVENIAN: return "sl_SI";
! case LANG_SOMALI: return "so_SO";
! case LANG_SORBIAN:
! /* FIXME: Adjust this when such locales appear on Unix. */
! return "wen_DE";
! case LANG_SPANISH:
! switch (sub)
! {
! case SUBLANG_SPANISH: return "es_ES";
! case SUBLANG_SPANISH_MEXICAN: return "es_MX";
! case SUBLANG_SPANISH_MODERN:
! return "address@hidden"; /* not seen on Unix */
! case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
! case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
! case SUBLANG_SPANISH_PANAMA: return "es_PA";
! case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
! case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
! case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
! case SUBLANG_SPANISH_PERU: return "es_PE";
! case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
! case SUBLANG_SPANISH_ECUADOR: return "es_EC";
! case SUBLANG_SPANISH_CHILE: return "es_CL";
! case SUBLANG_SPANISH_URUGUAY: return "es_UY";
! case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
! case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
! case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
! case SUBLANG_SPANISH_HONDURAS: return "es_HN";
! case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
! case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
! }
! return "es";
! case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
! case LANG_SWAHILI: return "sw_KE";
! case LANG_SWEDISH:
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "sv_SE";
! case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
! }
! return "sv";
! case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */
! case LANG_TAGALOG: return "tl_PH";
! case LANG_TAJIK: return "tg_TJ";
! case LANG_TAMAZIGHT:
! switch (sub)
! {
! /* FIXME: Adjust this when Tamazight locales appear on Unix. */
! case SUBLANG_TAMAZIGHT_ARABIC: return "address@hidden";
! case SUBLANG_TAMAZIGHT_LATIN: return "address@hidden";
! }
! return "ber_MA";
! case LANG_TAMIL:
! switch (sub)
! {
! case SUBLANG_DEFAULT: return "ta_IN";
! }
! return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */
! case LANG_TATAR: return "tt_RU";
! case LANG_TELUGU: return "te_IN";
! case LANG_THAI: return "th_TH";
! case LANG_TIBETAN: return "bo_CN";
! case LANG_TIGRINYA:
! switch (sub)
! {
! case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
! case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
! }
! return "ti";
! case LANG_TSONGA: return "ts_ZA";
! case LANG_TSWANA: return "tn_BW";
! case LANG_TURKISH: return "tr_TR";
! case LANG_TURKMEN: return "tk_TM";
! case LANG_UKRAINIAN: return "uk_UA";
! case LANG_URDU:
! switch (sub)
! {
! case SUBLANG_URDU_PAKISTAN: return "ur_PK";
! case SUBLANG_URDU_INDIA: return "ur_IN";
! }
! return "ur";
! case LANG_UZBEK:
! switch (sub)
! {
! case SUBLANG_UZBEK_LATIN: return "uz_UZ";
! case SUBLANG_UZBEK_CYRILLIC: return "address@hidden";
! }
! return "uz";
! case LANG_VENDA: return "ve_ZA";
! case LANG_VIETNAMESE: return "vi_VN";
! case LANG_WELSH: return "cy_GB";
! case LANG_XHOSA: return "xh_ZA";
! case LANG_YI: return "sit_CN";
! case LANG_YIDDISH: return "yi_IL";
! case LANG_YORUBA: return "yo_NG";
! case LANG_ZULU: return "zu_ZA";
! default: return "C";
! }
! }
! # endif
#endif
}
+
+ const char *
+ _nl_locale_name (int category, const char *categoryname)
+ {
+ const char *retval;
+
+ retval = _nl_locale_name_posix (category, categoryname);
+ if (retval != NULL)
+ return retval;
+
+ return _nl_locale_name_default ();
+ }
Index: intl/relocatable.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/relocatable.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** intl/relocatable.c 24 Dec 2003 15:12:48 -0000 1.2
--- intl/relocatable.c 14 Mar 2005 13:06:23 -0000 1.3
***************
*** 1,5 ****
/* Provide relocatable packages.
! Copyright (C) 2003 Free Software Foundation, Inc.
Written by Bruno Haible <address@hidden>, 2003.
This program is free software; you can redistribute it and/or modify it
--- 1,5 ----
/* Provide relocatable packages.
! Copyright (C) 2003-2004 Free Software Foundation, Inc.
Written by Bruno Haible <address@hidden>, 2003.
This program is free software; you can redistribute it and/or modify it
***************
*** 72,91 ****
ISSLASH(C) tests whether C is a directory separator character.
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
*/
! #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined
__DJGPP__
! /* Win32, OS/2, DOS */
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
# define HAS_DEVICE(P) \
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
&& (P)[1] == ':')
# define IS_PATH_WITH_DIR(P) \
(strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
! # define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
#else
/* Unix */
# define ISSLASH(C) ((C) == '/')
# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
! # define FILESYSTEM_PREFIX_LEN(P) 0
#endif
/* Original installation prefix. */
--- 72,91 ----
ISSLASH(C) tests whether C is a directory separator character.
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
*/
! #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined
__EMX__ || defined __DJGPP__
! /* Win32, Cygwin, OS/2, DOS */
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
# define HAS_DEVICE(P) \
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
&& (P)[1] == ':')
# define IS_PATH_WITH_DIR(P) \
(strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
! # define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
#else
/* Unix */
# define ISSLASH(C) ((C) == '/')
# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
! # define FILE_SYSTEM_PREFIX_LEN(P) 0
#endif
/* Original installation prefix. */
***************
*** 189,195 ****
/* Determine the current installation directory. */
{
! const char *p_base = curr_pathname + FILESYSTEM_PREFIX_LEN
(curr_pathname);
const char *p = curr_pathname + strlen (curr_pathname);
char *q;
--- 189,195 ----
/* Determine the current installation directory. */
{
! const char *p_base = curr_pathname + FILE_SYSTEM_PREFIX_LEN
(curr_pathname);
const char *p = curr_pathname + strlen (curr_pathname);
char *q;
***************
*** 216,222 ****
const char *rp = rel_installdir + strlen (rel_installdir);
const char *cp = curr_installdir + strlen (curr_installdir);
const char *cp_base =
! curr_installdir + FILESYSTEM_PREFIX_LEN (curr_installdir);
while (rp > rel_installdir && cp > cp_base)
{
--- 216,222 ----
const char *rp = rel_installdir + strlen (rel_installdir);
const char *cp = curr_installdir + strlen (curr_installdir);
const char *cp_base =
! curr_installdir + FILE_SYSTEM_PREFIX_LEN (curr_installdir);
while (rp > rel_installdir && cp > cp_base)
{
***************
*** 234,241 ****
same = true;
break;
}
! #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined
__DJGPP__
! /* Win32, OS/2, DOS - case insignificant filesystem */
if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
!= (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
break;
--- 234,241 ----
same = true;
break;
}
! #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined
__EMX__ || defined __DJGPP__
! /* Win32, Cygwin, OS/2, DOS - case insignificant filesystem */
if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
!= (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
break;
Index: intl/vasnprintf.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/vasnprintf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** intl/vasnprintf.c 11 Apr 2004 17:56:46 -0000 1.1
--- intl/vasnprintf.c 14 Mar 2005 13:06:23 -0000 1.2
***************
*** 1,5 ****
/* vsprintf with automatic memory allocation.
! Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
--- 1,5 ----
/* vsprintf with automatic memory allocation.
! Copyright (C) 1999, 2002-2005 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
***************
*** 41,47 ****
#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
#include <string.h> /* memcpy(), strlen() */
#include <errno.h> /* errno */
! #include <limits.h> /* CHAR_BIT */
#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
#if WIDE_CHAR_VERSION
# include "wprintf-parse.h"
--- 41,47 ----
#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
#include <string.h> /* memcpy(), strlen() */
#include <errno.h> /* errno */
! #include <limits.h> /* CHAR_BIT, INT_MAX */
#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
#if WIDE_CHAR_VERSION
# include "wprintf-parse.h"
***************
*** 52,57 ****
--- 52,62 ----
/* Checked size_t computations. */
#include "xsize.h"
+ /* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */
+ #ifndef EOVERFLOW
+ # define EOVERFLOW E2BIG
+ #endif
+
#ifdef HAVE_WCHAR_T
# ifdef HAVE_WCSLEN
# define local_wcslen wcslen
***************
*** 316,324 ****
const CHAR_T *digitp = dp->precision_start + 1;
precision = 0;
! do
precision = xsum (xtimes (precision, 10), *digitp++
- '0');
- while (digitp != dp->precision_end);
}
}
--- 321,328 ----
const CHAR_T *digitp = dp->precision_start + 1;
precision = 0;
! while (digitp != dp->precision_end)
precision = xsum (xtimes (precision, 10), *digitp++
- '0');
}
}
***************
*** 864,871 ****
--- 868,886 ----
free (buf_malloced);
CLEANUP ();
*lengthp = length;
+ if (length > INT_MAX)
+ goto length_overflow;
return result;
+ length_overflow:
+ /* We could produce such a big string, but its length doesn't fit into
+ an 'int'. POSIX says that snprintf() fails with errno = EOVERFLOW in
+ this case. */
+ if (result != resultbuf)
+ free (result);
+ errno = EOVERFLOW;
+ return NULL;
+
out_of_memory:
if (!(result == resultbuf || result == NULL))
free (result);
Index: intl/vasnprintf.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/intl/vasnprintf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** intl/vasnprintf.h 11 Apr 2004 17:56:46 -0000 1.1
--- intl/vasnprintf.h 14 Mar 2005 13:06:23 -0000 1.2
***************
*** 1,5 ****
/* vsprintf with automatic memory allocation.
! Copyright (C) 2002-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
--- 1,5 ----
/* vsprintf with automatic memory allocation.
! Copyright (C) 2002-2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
***************
*** 48,54 ****
If successful, return the address of the string (this may be = RESULTBUF
if no dynamic memory allocation was necessary) and set *LENGTHP to the
number of resulting bytes, excluding the trailing NUL. Upon error, set
! errno and return NULL. */
extern char * asnprintf (char *resultbuf, size_t *lengthp, const char
*format, ...)
__attribute__ ((__format__ (__printf__, 3, 4)));
extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char
*format, va_list args)
--- 48,71 ----
If successful, return the address of the string (this may be = RESULTBUF
if no dynamic memory allocation was necessary) and set *LENGTHP to the
number of resulting bytes, excluding the trailing NUL. Upon error, set
! errno and return NULL.
!
! When dynamic memory allocation occurs, the preallocated buffer is left
! alone (with possibly modified contents). This makes it possible to use
! a statically allocated or stack-allocated buffer, like this:
!
! char buf[100];
! size_t len = sizeof (buf);
! char *output = vasnprintf (buf, &len, format, args);
! if (output == NULL)
! ... error handling ...;
! else
! {
! ... use the output string ...;
! if (output != buf)
! free (output);
! }
! */
extern char * asnprintf (char *resultbuf, size_t *lengthp, const char
*format, ...)
__attribute__ ((__format__ (__printf__, 3, 4)));
extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char
*format, va_list args)
Index: m4/ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** m4/ChangeLog 11 Apr 2004 17:56:46 -0000 1.4
--- m4/ChangeLog 14 Mar 2005 13:06:23 -0000 1.5
***************
*** 1,3 ****
--- 1,23 ----
+ 2005-03-12 gettextize <address@hidden>
+
+ * gettext.m4: Upgrade to gettext-0.14.2.
+ * glibc2.m4: New file, from gettext-0.14.2.
+ * intdiv0.m4: Upgrade to gettext-0.14.2.
+ * intmax.m4: Upgrade to gettext-0.14.2.
+ * inttypes.m4: Upgrade to gettext-0.14.2.
+ * inttypes-pri.m4: Upgrade to gettext-0.14.2.
+ * isc-posix.m4: Upgrade to gettext-0.14.2.
+ * lcmessage.m4: Upgrade to gettext-0.14.2.
+ * lib-link.m4: Upgrade to gettext-0.14.2.
+ * lib-prefix.m4: Upgrade to gettext-0.14.2.
+ * nls.m4: Upgrade to gettext-0.14.2.
+ * po.m4: Upgrade to gettext-0.14.2.
+ * printf-posix.m4: Upgrade to gettext-0.14.2.
+ * progtest.m4: Upgrade to gettext-0.14.2.
+ * size_max.m4: Upgrade to gettext-0.14.2.
+ * xsize.m4: Upgrade to gettext-0.14.2.
+ * Makefile.am (EXTRA_DIST): Add the new files.
+
2004-02-05 gettextize <address@hidden>
* po.m4: Upgrade to gettext-0.14.1.
Index: m4/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** m4/Makefile.am 11 Apr 2004 17:56:46 -0000 1.7
--- m4/Makefile.am 14 Mar 2005 13:06:23 -0000 1.8
***************
*** 1,4 ****
! EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4
size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 nls.m4 po.m4 \
check-decl.m4 \
codeset.m4 \
gettext.m4 \
--- 1,4 ----
! EXTRA_DIST = glibc2.m4 intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4
signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 nls.m4 po.m4 \
check-decl.m4 \
codeset.m4 \
gettext.m4 \
Index: m4/gettext.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/gettext.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** m4/gettext.m4 19 Apr 2004 13:29:37 -0000 1.5
--- m4/gettext.m4 14 Mar 2005 13:06:23 -0000 1.6
***************
*** 1,10 ****
! # gettext.m4 serial 29
! dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
--- 1,8 ----
! # gettext.m4 serial 34 (gettext-0.14.2)
! dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
***************
*** 92,97 ****
--- 90,98 ----
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
])
+ dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+ gt_INTL_MACOSX
+
dnl Set USE_NLS.
AM_NLS
***************
*** 172,180 ****
#ifdef __cplusplus
"C"
#endif
! const char *_nl_expand_alias ();],
[bindtextdomain ("", "");
! return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
gt_cv_func_gnugettext_libintl=yes,
gt_cv_func_gnugettext_libintl=no)
dnl Now see whether libintl exists and depends on libiconv.
--- 173,181 ----
#ifdef __cplusplus
"C"
#endif
! const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
! return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
gt_cv_func_gnugettext_libintl=yes,
gt_cv_func_gnugettext_libintl=no)
dnl Now see whether libintl exists and depends on libiconv.
***************
*** 193,201 ****
#ifdef __cplusplus
"C"
#endif
! const char *_nl_expand_alias ();],
[bindtextdomain ("", "");
! return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
[LIBINTL="$LIBINTL $LIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
gt_cv_func_gnugettext_libintl=yes
--- 194,202 ----
#ifdef __cplusplus
"C"
#endif
! const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
! return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
[LIBINTL="$LIBINTL $LIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
gt_cv_func_gnugettext_libintl=yes
***************
*** 245,250 ****
--- 246,260 ----
fi
])
+ if test -n "$INTL_MACOSX_LIBS"; then
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Some extra flags are needed during linking.
+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+ fi
+ fi
+
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
AC_DEFINE(ENABLE_NLS, 1,
***************
*** 350,355 ****
--- 360,366 ----
AC_REQUIRE([AM_MKINSTALLDIRS])dnl
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([gt_GLIBC2])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl
AC_REQUIRE([AC_ISC_POSIX])dnl
AC_REQUIRE([AC_HEADER_STDC])dnl
***************
*** 374,379 ****
--- 385,391 ----
AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
AC_REQUIRE([gt_INTTYPES_PRI])dnl
AC_REQUIRE([gl_XSIZE])dnl
+ AC_REQUIRE([gt_INTL_MACOSX])dnl
AC_CHECK_TYPE([ptrdiff_t], ,
[AC_DEFINE([ptrdiff_t], [long],
***************
*** 427,433 ****
AM_ICONV
AM_LANGINFO_CODESET
if test $ac_cv_header_locale_h = yes; then
! AM_LC_MESSAGES
fi
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
--- 439,449 ----
AM_ICONV
AM_LANGINFO_CODESET
if test $ac_cv_header_locale_h = yes; then
! gt_LC_MESSAGES
! fi
!
! if test -n "$INTL_MACOSX_LIBS"; then
! CPPFLAGS="$CPPFLAGS
-I/System/Library/Frameworks/CoreFoundation.framework/Headers"
fi
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
***************
*** 463,468 ****
--- 479,528 ----
])
+ dnl Checks for special options needed on MacOS X.
+ dnl Defines INTL_MACOSX_LIBS.
+ AC_DEFUN([gt_INTL_MACOSX],
+ [
+ dnl Check for API introduced in MacOS X 10.2.
+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+ gt_cv_func_CFPreferencesCopyAppValue,
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS
-I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -framework CoreFoundation"
+ AC_TRY_LINK([#include <CFPreferences.h>],
+ [CFPreferencesCopyAppValue(NULL, NULL)],
+ [gt_cv_func_CFPreferencesCopyAppValue=yes],
+ [gt_cv_func_CFPreferencesCopyAppValue=no])
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+ [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue
in the CoreFoundation framework.])
+ fi
+ dnl Check for API introduced in MacOS X 10.3.
+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS
-I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -framework CoreFoundation"
+ AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
+ [gt_cv_func_CFLocaleCopyCurrent=yes],
+ [gt_cv_func_CFLocaleCopyCurrent=no])
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+ [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in
the CoreFoundation framework.])
+ fi
+ INTL_MACOSX_LIBS=
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test
$gt_cv_func_CFLocaleCopyCurrent = yes; then
+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+ fi
+ AC_SUBST([INTL_MACOSX_LIBS])
+ ])
+
+
dnl gt_CHECK_DECL(FUNC, INCLUDES)
dnl Check whether a function is declared.
AC_DEFUN([gt_CHECK_DECL],
Index: m4/intdiv0.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/intdiv0.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** m4/intdiv0.m4 21 Sep 2002 00:41:16 -0000 1.1
--- m4/intdiv0.m4 14 Mar 2005 13:06:23 -0000 1.2
***************
*** 1,10 ****
# intdiv0.m4 serial 1 (gettext-0.11.3)
dnl Copyright (C) 2002 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
--- 1,8 ----
# intdiv0.m4 serial 1 (gettext-0.11.3)
dnl Copyright (C) 2002 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
Index: m4/intmax.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/intmax.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** m4/intmax.m4 19 Apr 2004 13:29:37 -0000 1.4
--- m4/intmax.m4 14 Mar 2005 13:06:23 -0000 1.5
***************
*** 1,10 ****
! # intmax.m4 serial 2
! dnl Copyright (C) 2002-2004 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
dnl Test whether the system has the 'intmax_t' type, but don't attempt to
--- 1,8 ----
! # intmax.m4 serial 2 (gettext-0.14.2)
! dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
dnl Test whether the system has the 'intmax_t' type, but don't attempt to
Index: m4/inttypes-pri.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/inttypes-pri.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** m4/inttypes-pri.m4 21 Sep 2002 00:41:16 -0000 1.1
--- m4/inttypes-pri.m4 14 Mar 2005 13:06:23 -0000 1.2
***************
*** 1,10 ****
# inttypes-pri.m4 serial 1 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
--- 1,8 ----
# inttypes-pri.m4 serial 1 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
Index: m4/inttypes.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/inttypes.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** m4/inttypes.m4 2 Jun 2004 12:43:00 -0000 1.3
--- m4/inttypes.m4 14 Mar 2005 13:06:23 -0000 1.4
***************
*** 1,10 ****
# inttypes.m4 serial 1 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl From Paul Eggert.
--- 1,8 ----
# inttypes.m4 serial 1 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert.
Index: m4/isc-posix.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/isc-posix.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** m4/isc-posix.m4 21 Sep 2002 00:41:16 -0000 1.2
--- m4/isc-posix.m4 14 Mar 2005 13:06:23 -0000 1.3
***************
*** 1,10 ****
# isc-posix.m4 serial 2 (gettext-0.11.2)
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
--- 1,8 ----
# isc-posix.m4 serial 2 (gettext-0.11.2)
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
Index: m4/lcmessage.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/lcmessage.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** m4/lcmessage.m4 21 Sep 2002 00:41:16 -0000 1.2
--- m4/lcmessage.m4 14 Mar 2005 13:06:23 -0000 1.3
***************
*** 1,10 ****
! # lcmessage.m4 serial 3 (gettext-0.11.3)
! dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
--- 1,8 ----
! # lcmessage.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
***************
*** 20,31 ****
# Check whether LC_MESSAGES is available in <locale.h>.
! AC_DEFUN([AM_LC_MESSAGES],
[
! AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
! am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
! if test $am_cv_val_LC_MESSAGES = yes; then
AC_DEFINE(HAVE_LC_MESSAGES, 1,
[Define if your <locale.h> file defines LC_MESSAGES.])
fi
--- 18,29 ----
# Check whether LC_MESSAGES is available in <locale.h>.
! AC_DEFUN([gt_LC_MESSAGES],
[
! AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
! gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
! if test $gt_cv_val_LC_MESSAGES = yes; then
AC_DEFINE(HAVE_LC_MESSAGES, 1,
[Define if your <locale.h> file defines LC_MESSAGES.])
fi
Index: m4/lib-link.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/lib-link.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** m4/lib-link.m4 24 Jan 2005 13:51:49 -0000 1.4
--- m4/lib-link.m4 14 Mar 2005 13:06:23 -0000 1.5
***************
*** 1,5 ****
! # lib-link.m4 serial 4 (gettext-0.12)
! dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # lib-link.m4 serial 5 (gettext-0.14.2)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 348,354 ****
if test "X$additional_includedir" = "X/usr/local/include";
then
if test -n "$GCC"; then
case $host_os in
! linux*) haveit=yes;;
esac
fi
fi
--- 348,354 ----
if test "X$additional_includedir" = "X/usr/local/include";
then
if test -n "$GCC"; then
case $host_os in
! linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
***************
*** 397,403 ****
if test "X$additional_libdir" = "X/usr/local/lib"; then
if test -n "$GCC"; then
case $host_os in
! linux*) haveit=yes;;
esac
fi
fi
--- 397,403 ----
if test "X$additional_libdir" = "X/usr/local/lib"; then
if test -n "$GCC"; then
case $host_os in
! linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
Index: m4/lib-prefix.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/lib-prefix.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** m4/lib-prefix.m4 24 Jan 2005 13:51:49 -0000 1.4
--- m4/lib-prefix.m4 14 Mar 2005 13:06:23 -0000 1.5
***************
*** 1,5 ****
! # lib-prefix.m4 serial 3 (gettext-0.13)
! dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # lib-prefix.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 69,75 ****
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
! linux*) haveit=yes;;
esac
fi
fi
--- 69,75 ----
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
! linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
Index: m4/mkstemp.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/mkstemp.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** m4/mkstemp.m4 21 Apr 2004 12:57:46 -0000 1.7
--- m4/mkstemp.m4 14 Mar 2005 13:06:23 -0000 1.8
***************
*** 1,4 ****
! #serial 6
# On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a
# silly limit that it can create no more than 26 files from a given template.
--- 1,9 ----
! #serial 9
!
! # Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
! # This file is free software; the Free Software Foundation
! # gives unlimited permission to copy and/or distribute it,
! # with or without modifications, as long as this notice is preserved.
# On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a
# silly limit that it can create no more than 26 files from a given template.
***************
*** 15,40 ****
AC_CACHE_CHECK([for mkstemp limitations],
gl_cv_func_mkstemp_limitations,
[
AC_TRY_RUN([
! # include <stdlib.h>
! int main ()
! {
! int i;
! for (i = 0; i < 70; i++)
! {
! char template[] = "conftestXXXXXX";
! int fd = mkstemp (template);
! if (fd == -1)
! exit (1);
! close (fd);
! }
! exit (0);
! }
! ],
! gl_cv_func_mkstemp_limitations=no,
! gl_cv_func_mkstemp_limitations=yes,
! gl_cv_func_mkstemp_limitations=yes
! )
]
)
fi
--- 20,48 ----
AC_CACHE_CHECK([for mkstemp limitations],
gl_cv_func_mkstemp_limitations,
[
+ mkdir conftest.mkstemp
AC_TRY_RUN([
! # include <stdlib.h>
! # include <unistd.h>
! int main ()
! {
! int i;
! for (i = 0; i < 70; i++)
! {
! char template[] = "conftest.mkstemp/coXXXXXX";
! int fd = mkstemp (template);
! if (fd == -1)
! exit (1);
! close (fd);
! }
! exit (0);
! }
! ],
! gl_cv_func_mkstemp_limitations=no,
! gl_cv_func_mkstemp_limitations=yes,
! gl_cv_func_mkstemp_limitations=yes
! )
! rm -rf conftest.mkstemp
]
)
fi
Index: m4/nls.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/nls.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** m4/nls.m4 6 Nov 2003 14:36:17 -0000 1.1
--- m4/nls.m4 14 Mar 2005 13:06:23 -0000 1.2
***************
*** 1,10 ****
# nls.m4 serial 1 (gettext-0.12)
dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
--- 1,8 ----
# nls.m4 serial 1 (gettext-0.12)
dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
Index: m4/po.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/po.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** m4/po.m4 11 Apr 2004 17:56:46 -0000 1.3
--- m4/po.m4 14 Mar 2005 13:06:23 -0000 1.4
***************
*** 1,10 ****
! # po.m4 serial 3 (gettext-0.14)
! dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
--- 1,8 ----
! # po.m4 serial 5 (gettext-0.14.2)
! dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
***************
*** 19,24 ****
--- 17,24 ----
dnl Ulrich Drepper <address@hidden>, 1995-2000.
dnl Bruno Haible <address@hidden>, 2000-2003.
+ AC_PREREQ(2.50)
+
dnl Checks for all prerequisites of the po subdirectory.
AC_DEFUN([AM_PO_SUBDIRS],
[
***************
*** 34,40 ****
dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
dnl The second test excludes FreeBSD msgfmt.
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
! [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
(if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage
>/dev/null; then exit 1; else exit 0; fi)],
:)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
--- 34,40 ----
dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
dnl The second test excludes FreeBSD msgfmt.
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
! [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
(if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage
>/dev/null; then exit 1; else exit 0; fi)],
:)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
***************
*** 43,49 ****
dnl The first test excludes Solaris xgettext and early GNU xgettext
versions.
dnl The second test excludes FreeBSD xgettext.
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
! [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address=
/dev/null >/dev/null 2>&1 &&
(if $ac_dir/$ac_word --omit-header --copyright-holder=
--msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then
exit 1; else exit 0; fi)],
:)
dnl Remove leftover from FreeBSD xgettext call.
--- 43,49 ----
dnl The first test excludes Solaris xgettext and early GNU xgettext
versions.
dnl The second test excludes FreeBSD xgettext.
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
! [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address=
/dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
(if $ac_dir/$ac_word --omit-header --copyright-holder=
--msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then
exit 1; else exit 0; fi)],
:)
dnl Remove leftover from FreeBSD xgettext call.
***************
*** 51,57 ****
dnl Search for GNU msgmerge 0.11 or newer in the PATH.
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
! [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
dnl Test whether we really found GNU msgfmt.
--- 51,57 ----
dnl Search for GNU msgmerge 0.11 or newer in the PATH.
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
! [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[
2>&1], :)
dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
dnl Test whether we really found GNU msgfmt.
***************
*** 348,354 ****
QMFILES="$QMFILES $srcdirpre$lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
! frobbedlang=`echo $lang | sed -e 's/_/-/g'`
RESOURCESDLLFILES="$RESOURCESDLLFILES
$srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
done
# CATALOGS depends on both $ac_dir and the user's LINGUAS
--- 348,354 ----
QMFILES="$QMFILES $srcdirpre$lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
! frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
RESOURCESDLLFILES="$RESOURCESDLLFILES
$srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
done
# CATALOGS depends on both $ac_dir and the user's LINGUAS
***************
*** 389,395 ****
QTCATALOGS="$QTCATALOGS $lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
! frobbedlang=`echo $lang | sed -e 's/_/-/g'`
CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
done
fi
--- 389,395 ----
QTCATALOGS="$QTCATALOGS $lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
! frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
done
fi
***************
*** 409,415 ****
if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
# Add dependencies that cannot be formulated as a simple suffix rule.
for lang in $ALL_LINGUAS; do
! frobbedlang=`echo $lang | sed -e 's/_/-/g'`
cat >> "$ac_file.tmp" <<EOF
$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po
-r \$(DOMAIN)"; \
--- 409,415 ----
if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
# Add dependencies that cannot be formulated as a simple suffix rule.
for lang in $ALL_LINGUAS; do
! frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
cat >> "$ac_file.tmp" <<EOF
$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po
-r \$(DOMAIN)"; \
Index: m4/printf-posix.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/printf-posix.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** m4/printf-posix.m4 11 Apr 2004 17:56:46 -0000 1.1
--- m4/printf-posix.m4 14 Mar 2005 13:06:23 -0000 1.2
***************
*** 1,10 ****
# printf-posix.m4 serial 2 (gettext-0.13.1)
dnl Copyright (C) 2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
dnl Test whether the printf() function supports POSIX/XSI format strings with
--- 1,8 ----
# printf-posix.m4 serial 2 (gettext-0.13.1)
dnl Copyright (C) 2003 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
dnl Test whether the printf() function supports POSIX/XSI format strings with
Index: m4/progtest.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/progtest.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** m4/progtest.m4 29 May 2003 22:54:17 -0000 1.2
--- m4/progtest.m4 14 Mar 2005 13:06:23 -0000 1.3
***************
*** 1,10 ****
! # progtest.m4 serial 3 (gettext-0.12)
! dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
--- 1,8 ----
! # progtest.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
***************
*** 18,23 ****
--- 16,23 ----
dnl Authors:
dnl Ulrich Drepper <address@hidden>, 1996.
+ AC_PREREQ(2.50)
+
# Search path for a program which passes the given test.
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
***************
*** 67,72 ****
--- 67,73 ----
test -z "$ac_dir" && ac_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
if [$3]; then
ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
break 2
Index: m4/size_max.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/size_max.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** m4/size_max.m4 11 Apr 2004 17:56:46 -0000 1.1
--- m4/size_max.m4 14 Mar 2005 13:06:23 -0000 1.2
***************
*** 1,10 ****
# size_max.m4 serial 2
dnl Copyright (C) 2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
--- 1,8 ----
# size_max.m4 serial 2
dnl Copyright (C) 2003 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
Index: m4/xsize.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/xsize.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** m4/xsize.m4 11 Apr 2004 17:56:46 -0000 1.1
--- m4/xsize.m4 14 Mar 2005 13:06:23 -0000 1.2
***************
*** 1,14 ****
! # xsize.m4 serial 2
! dnl Copyright (C) 2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
AC_DEFUN([gl_XSIZE],
[
dnl Prerequisites of lib/xsize.h.
AC_REQUIRE([gl_SIZE_MAX])
AC_CHECK_HEADERS(stdint.h)
])
--- 1,13 ----
! # xsize.m4 serial 3
! dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_XSIZE],
[
dnl Prerequisites of lib/xsize.h.
AC_REQUIRE([gl_SIZE_MAX])
+ AC_REQUIRE([AC_C_INLINE])
AC_CHECK_HEADERS(stdint.h)
])
Index: po/ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/po/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** po/ChangeLog 11 Apr 2004 17:56:47 -0000 1.1
--- po/ChangeLog 14 Mar 2005 13:06:23 -0000 1.2
***************
*** 1,3 ****
--- 1,8 ----
+ 2005-03-12 gettextize <address@hidden>
+
+ * Makefile.in.in: Upgrade to gettext-0.14.2.
+ * ORIG: New file, from gettext-0.14.2.
+
2004-02-05 gettextize <address@hidden>
* Makefile.in.in: Upgrade to gettext-0.14.1.
Index: po/Makefile.in.in
===================================================================
RCS file: /cvsroot/texinfo/texinfo/po/Makefile.in.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** po/Makefile.in.in 11 Apr 2004 17:56:47 -0000 1.4
--- po/Makefile.in.in 14 Mar 2005 13:06:23 -0000 1.5
***************
*** 1,5 ****
# Makefile for PO directory in any package using GNU gettext.
! # Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <address@hidden>
#
# This file can be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU General Public
--- 1,5 ----
# Makefile for PO directory in any package using GNU gettext.
! # Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <address@hidden>
#
# This file can be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU General Public
***************
*** 8,17 ****
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
! # Origin: gettext-0.14
PACKAGE = @PACKAGE@
VERSION = @VERSION@
SHELL = /bin/sh
@SET_MAKE@
--- 8,18 ----
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
! # Origin: gettext-0.14.2
PACKAGE = @PACKAGE@
VERSION = @VERSION@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
SHELL = /bin/sh
@SET_MAKE@
***************
*** 100,110 ****
# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
! --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot; then \
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot >
$(DOMAIN).1po && \
--- 101,116 ----
# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' =
'@'PACKAGE_BUGREPORT'@'; then \
+ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+ else \
+ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+ fi; \
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
! --msgid-bugs-address="$$msgid_bugs_address"
test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot; then \
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot >
$(DOMAIN).1po && \
P ABOUT-NLS
P ChangeLog
P NEWS
P configure.ac
P doc/info.1
P doc/infokey.1
P doc/install-info.1
P doc/makeinfo.1
P doc/texi2dvi.1
P doc/texindex.1
P doc/version.texi
U intl/ChangeLog
P intl/Makefile.in
U intl/VERSION
P intl/config.charset
P intl/dcigettext.c
P intl/gettextP.h
P intl/l10nflist.c
P intl/libgnuintl.h.in
P intl/localcharset.c
P intl/localename.c
P intl/relocatable.c
P intl/vasnprintf.c
P intl/vasnprintf.h
P m4/ChangeLog
P m4/Makefile.am
P m4/gettext.m4
P m4/intdiv0.m4
P m4/intmax.m4
P m4/inttypes-pri.m4
P m4/inttypes.m4
P m4/isc-posix.m4
P m4/lcmessage.m4
P m4/lib-link.m4
P m4/lib-prefix.m4
P m4/mkstemp.m4
P m4/nls.m4
P m4/po.m4
P m4/printf-posix.m4
P m4/progtest.m4
P m4/size_max.m4
P m4/xsize.m4
P po/ChangeLog
P po/Makefile.in.in
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Mon Mar 14 08:22:01 EST 2005),
Karl Berry <=