Fixed up support for using the internal intl library.
-E2fsprogs-specific notes
-************************
-
-1) NLS support is not enabled by default. In order to get NLS
- support, use the --enable-nls option when running configure.
-
-2) The intl and po directories aren't linked into the main makefile
- subdirectories.
-
-3) The documentation for gettext is abysmal. I hope everything is
-right, but I make no guarantees; the NLS integration is still in
-testing. (This is why it's disabled by default.)
-
-4) This ABOUT-NLS file was obtained from ftp.gnu.org in February,
-2000. Apparently this is the most recent version as of this writing,
-even though it was apparently last modified in August, 1998.
-
-
-
Notes on the Free Translation Project
*************************************
If you found this `ABOUT-NLS' file inside a distribution, you may
assume that the distributed package does use GNU `gettext' internally,
-itself available at your nearest GNU archive site. But you do *not*
+itself available at your nearest GNU archive site. But you do _not_
need to install GNU `gettext' prior to configuring, installing or using
this package with messages translated.
`gettext' which is used. The information can be found in the
`intl/VERSION' file, in internationalized packages.
-One piece of advise in advance
-==============================
+Quick configuration advice
+==========================
If you want to exploit the full power of internationalization, you
should configure it using
package, despite the existence of internationalizing capabilities in the
operating system where this package is being installed. So far, only
the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias or message inheritance) as the
-implementation here. It is also not possible to offer this additional
-functionality on top of a `catgets' implementation. Future versions of
-GNU `gettext' will very likely convey even more functionality. So it
-might be a good idea to change to GNU `gettext' as soon as possible.
-
- So you need not provide this option if you are using GNU libc 2 or
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation. Future versions of GNU `gettext' will
+very likely convey even more functionality. So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+ So you need _not_ provide this option if you are using GNU libc 2 or
you have installed a recent copy of the GNU gettext package with the
included `libintl'.
ways to internationalization, predating GNU `gettext'.
By default, this package will be installed to allow translation of
-messages. It will automatically detect whether the system provides
-usable `catgets' (if using this is selected by the installer) or
-`gettext' functions. If neither is available, the GNU `gettext' own
+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
+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 --with-catgets
./configure --disable-nls
-will respectively bypass any pre-existing `catgets' or `gettext' to use
-the internationalizing routines provided within this package, enable
-the use of the `catgets' functions (if found on the locale system), or
-else, *totally* disable translation of messages.
+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
to prevent auto-detection.
- By default the configuration process will not test for the `catgets'
-function and therefore they will not be used. The reasons are already
-given above: the emulation on top of `catgets' cannot provide all the
-extensions provided by the GNU `gettext' library. If you nevertheless
-want to use the `catgets' functions use
-
- ./configure --with-catgets
-
-to enable the test for `catgets' (this causes no harm if `catgets' is
-not available on your system). If you really select this option we
-would like to hear about the reasons because we cannot think of any
-good one ourself.
+ The configuration process will not test for the `catgets' function
+and therefore it will not be used. The reason is that even an
+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
As a user, if your language has been installed for this package, you
only have to set the `LANG' environment variable to the appropriate
-ISO 639 `LL' two-letter code prior to using the programs in the
-package. For example, let's suppose that you speak German. At the
-shell prompt, merely execute `setenv LANG de' (in `csh'),
-`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash'). This
-can be done from your `.login' or `.profile' file, once and for all.
-
- An operating system might already offer message localization for
-many of its programs, while other programs have been installed locally
-with the full capabilities of GNU `gettext'. Just using `gettext'
-extended syntax for `LANG' would break proper localization of already
-available operating system programs. In this case, users should set
-both `LANGUAGE' and `LANG' variables in their environment, as programs
-using GNU `gettext' give preference to `LANGUAGE'. For example, some
-Swedish users would rather read translations in German than English for
-when Swedish is not available. This is easily accomplished by setting
-`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
+`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code,
+and `CC' is an ISO 3166 two-letter country code. For example, let's
+suppose that you speak German and live in Germany. At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+ You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries. For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
+country code serves to distinguish the dialects.
+
+ The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc. On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
+locales supported by your system for your country by running the command
+`locale -a | grep '^LL''.
+
+ Not all programs have translations for all languages. By default, an
+English message is shown in place of a nonexistent translation. If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries. For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+ In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect. For example, `de' is equivalent
+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
able to synergize with other translators speaking the same language.
-Each translation team has its own mailing list, courtesy of Linux
-International. You may reach your translation team at the address
-`LL@li.org', replacing LL by the two-letter ISO 639 code for your
-language. Language codes are *not* the same as the country codes given
-in ISO 3166. The following translation teams exist, as of August 1998:
-
- Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
- Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
- `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
- Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
- `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
- Swedish `sv', and Turkish `tr'.
-
-For example, you may reach the Chinese translation team by writing to
-`zh@li.org'.
-
- If you'd like to volunteer to *work* at translating messages, you
+Each translation team has its own mailing list. The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
+area.
+
+ If you'd like to volunteer to _work_ at translating messages, you
should become a member of the translating team for your own language.
-The subscribing address is *not* the same as the list itself, it has
+The subscribing address is _not_ the same as the list itself, it has
`-request' appended. For example, speakers of Swedish can send a
message to `sv-request@li.org', having this message body:
subscribe
Keep in mind that team members are expected to participate
-*actively* in translations, or at solving translational difficulties,
+_actively_ in translations, or at solving translational difficulties,
rather than merely lurking around. If your team does not exist yet and
you want to start one, or if you are unsure about what to do or how to
get started, please write to `translation@iro.umontreal.ca' to reach the
Languages are not equally supported in all packages. The following
matrix shows the current state of internationalization, as of August
-1998. The matrix shows, in regard of each package, for which languages
-PO files have been submitted to translation coordination.
-
- Ready PO files cs da de el en es fi fr it
- .----------------------------.
- bash | [] [] |
- bison | [] [] |
- clisp | [] [] [] [] |
- cpio | [] [] [] |
- diffutils | [] [] [] |
- enscript | [] [] [] [] |
- fileutils | [] [] [] [] |
- findutils | [] [] [] [] |
- flex | [] [] |
- gcal | [] [] |
- gettext | [] [] [] [] [] |
- grep | [] [] [] [] |
- hello | [] [] [] [] [] |
- id-utils | [] [] |
- indent | [] [] |
- libc | [] [] [] |
- m4 | [] [] |
- make | [] [] [] |
- music | [] |
- ptx | [] [] [] |
- recode | [] [] [] [] |
- sed | |
- sh-utils | [] [] [] |
- sharutils | [] [] [] [] [] |
- tar | [] [] [] [] |
- texinfo | [] [] [] |
- textutils | [] [] [] [] |
- wdiff | [] [] [] [] |
- wget | [] [] [] [] |
- `----------------------------'
- cs da de el en es fi fr it
- 7 4 26 4 1 18 1 26 4
+2002. 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 be bg ca cs da de el en eo es et fi fr
+ +----------------------------------------+
+ a2ps | [] [] [] [] |
+ ap-utils | |
+ bash | [] [] [] [] |
+ bfd | [] [] |
+ binutils | [] [] |
+ bison | [] [] [] [] |
+ clisp | |
+ clisp | [] [] [] [] |
+ clisplow | |
+ cpio | [] [] [] [] |
+ darkstat | () |
+ diffutils | [] [] [] [] [] [] |
+ enscript | [] [] |
+ error | [] [] [] |
+ fetchmail | [] () [] [] [] () |
+ fileutils | [] [] [] [] [] |
+ findutils | [] [] [] [] [] [] |
+ flex | [] [] [] [] [] |
+ gas | [] [] |
+ gawk | [] [] [] |
+ gcal | [] [] |
+ gcc | [] [] |
+ gettext | [] [] [] [] [] |
+ gnupg | [] [] [] [] [] [] [] |
+ gprof | [] [] |
+ gpsdrive | () () () () () |
+ grep | [] [] [] [] [] [] [] [] |
+ gretl | [] |
+ gthumb | () () () |
+ hello | [] [] [] [] [] [] [] [] [] |
+ id-utils | [] [] [] |
+ indent | [] [] [] [] [] |
+ jpilot | () [] [] [] |
+ jwhois | [] [] |
+ kbd | [] [] [] |
+ ld | [] [] |
+ libc | [] [] [] [] [] [] [] [] |
+ libiconv | [] [] [] [] |
+ lifelines | () () |
+ lilypond | [] [] |
+ lingoteach | [] [] |
+ lingoteach_lessons| () () |
+ lynx | [] [] [] [] [] |
+ m4 | [] [] [] [] [] |
+ make | [] [] [] [] |
+ man-db | [] () () [] () () |
+ mysecretdiary | [] [] [] |
+ nano | [] () [] [] [] [] |
+ nano_1_0 | [] () [] [] [] [] |
+ opcodes | [] [] [] |
+ parted | [] [] [] [] [] |
+ ptx | [] [] [] [] [] [] [] |
+ python | |
+ recode | [] [] [] [] [] [] |
+ sed | [] [] [] [] [] [] [] [] [] [] |
+ sh-utils | [] [] [] [] |
+ sharutils | [] [] [] [] [] [] [] |
+ sketch | () [] () |
+ soundtracker | [] [] [] |
+ sp | [] |
+ tar | [] [] [] [] [] [] |
+ texinfo | [] [] [] [] [] |
+ textutils | [] [] [] [] [] |
+ util-linux | [] [] [] [] [] [] |
+ vorbis-tools | [] |
+ wastesedge | |
+ wdiff | [] [] [] [] [] [] |
+ wget | [] [] [] [] [] [] [] [] [] [] |
+ +----------------------------------------+
+ be bg ca cs da de el en eo es et fi fr
+ 0 2 19 10 30 44 9 1 12 44 17 6 53
+
+ gl he hr hu id it ja ko lv nb nl nn
+ +-------------------------------------+
+ a2ps | () () [] |
+ ap-utils | |
+ bash | [] |
+ bfd | [] |
+ binutils | [] |
+ bison | [] [] [] [] |
+ clisp | |
+ clisp | [] |
+ clisplow | |
+ cpio | [] [] [] [] |
+ darkstat | |
+ diffutils | [] [] [] [] [] |
+ enscript | [] [] |
+ error | [] |
+ fetchmail | [] |
+ fileutils | [] [] [] |
+ findutils | [] [] [] [] [] [] [] [] |
+ flex | [] |
+ gas | |
+ gawk | [] |
+ gcal | |
+ gcc | [] |
+ gettext | [] [] |
+ gnupg | [] [] [] [] |
+ gprof | [] |
+ gpsdrive | [] () () |
+ grep | [] [] [] [] [] [] [] |
+ gretl | |
+ gthumb | () () |
+ hello | [] [] [] [] [] [] [] [] [] [] [] [] |
+ id-utils | [] [] |
+ indent | [] [] [] [] |
+ jpilot | () () |
+ jwhois | [] [] |
+ kbd | |
+ ld | |
+ libc | [] [] [] [] |
+ libiconv | [] [] [] |
+ lifelines | |
+ lilypond | [] |
+ lingoteach | [] |
+ lingoteach_lessons| |
+ lynx | [] [] [] [] |
+ m4 | [] [] [] [] |
+ make | [] [] [] [] [] [] |
+ man-db | () () |
+ mysecretdiary | [] |
+ nano | [] [] [] [] |
+ nano_1_0 | [] [] [] [] [] |
+ opcodes | [] [] |
+ parted | [] [] [] |
+ ptx | [] [] [] [] [] |
+ python | |
+ recode | [] [] [] |
+ sed | [] [] [] [] [] [] [] [] |
+ sh-utils | [] [] [] |
+ sharutils | [] [] [] |
+ sketch | () |
+ soundtracker | [] [] |
+ sp | |
+ tar | [] [] [] [] [] [] |
+ texinfo | [] [] [] |
+ textutils | [] [] [] [] |
+ util-linux | () [] |
+ vorbis-tools | [] |
+ wastesedge | |
+ wdiff | [] [] [] |
+ wget | [] [] [] [] [] [] |
+ +-------------------------------------+
+ gl he hr hu id it ja ko lv nb nl nn
+ 23 9 12 19 16 13 26 9 1 7 19 3
- ja ko nl no pl pt ru sl sv
- .----------------------------.
- bash | [] | 3
- bison | [] | 3
- clisp | | 4
- cpio | [] [] [] | 6
- diffutils | [] [] | 5
- enscript | [] [] | 6
- fileutils | [] [] [] [] [] [] [] | 11
- findutils | [] [] [] [] [] | 9
- flex | [] [] | 4
- gcal | [] [] [] | 5
- gettext | [] [] [] [] [] [] [] | 13
- grep | [] [] [] [] [] [] [] | 11
- hello | [] [] [] [] [] [] [] | 12
- id-utils | [] | 3
- indent | [] [] [] | 5
- libc | [] [] [] [] [] | 8
- m4 | [] [] [] [] | 6
- make | [] [] [] | 6
- music | [] | 2
- ptx | [] [] [] [] [] | 8
- recode | [] [] [] [] [] | 9
- sed | | 0
- sh-utils | [] [] [] [] [] | 8
- sharutils | [] [] | 7
- tar | [] [] [] [] [] [] [] | 11
- texinfo | [] | 4
- textutils | [] [] [] [] [] | 9
- wdiff | [] [] [] [] | 8
- wget | [] | 5
- `----------------------------'
- 18 teams ja ko nl no pl pt ru sl sv
- 29 domains 1 12 21 11 19 7 5 7 17 191
+ no pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW
+ +----------------------------------------------+
+ a2ps | () () () [] [] [] [] [] | 10
+ ap-utils | () | 0
+ bash | [] | 6
+ bfd | [] [] | 5
+ binutils | [] [] | 5
+ bison | [] [] [] [] | 12
+ clisp | | 0
+ clisp | | 5
+ clisplow | | 0
+ cpio | [] [] [] [] | 12
+ darkstat | [] [] () () | 2
+ diffutils | [] [] [] [] [] [] | 17
+ enscript | [] [] [] [] | 8
+ error | [] [] [] | 7
+ fetchmail | () () [] | 6
+ fileutils | [] [] [] [] [] [] | 14
+ findutils | [] [] [] [] [] [] [] | 21
+ flex | [] [] [] | 9
+ gas | [] | 3
+ gawk | [] [] | 6
+ gcal | [] [] | 4
+ gcc | [] | 4
+ gettext | [] [] [] [] [] [] | 13
+ gnupg | [] [] [] | 14
+ gprof | [] [] | 5
+ gpsdrive | [] [] | 3
+ grep | [] [] [] [] [] | 20
+ gretl | | 1
+ gthumb | () () [] | 1
+ hello | [] [] [] [] [] [] [] | 28
+ id-utils | [] [] [] [] | 9
+ indent | [] [] [] [] [] | 14
+ jpilot | () () [] [] | 5
+ jwhois | [] () () [] [] | 7
+ kbd | [] [] | 5
+ ld | [] [] | 4
+ libc | [] [] [] [] [] [] | 18
+ libiconv | [] [] [] [] [] | 12
+ lifelines | [] | 1
+ lilypond | [] | 4
+ lingoteach | [] [] | 5
+ lingoteach_lessons| () | 0
+ lynx | [] [] [] [] | 13
+ m4 | [] [] [] [] | 13
+ make | [] [] [] [] [] | 15
+ man-db | | 3
+ mysecretdiary | [] [] [] | 7
+ nano | [] [] [] [] | 13
+ nano_1_0 | [] [] [] [] | 14
+ opcodes | [] [] [] | 8
+ parted | [] [] [] [] | 12
+ ptx | [] [] [] [] [] [] [] | 19
+ python | | 0
+ recode | [] [] [] [] [] [] | 15
+ sed | [] [] [] [] [] [] | 24
+ sh-utils | [] [] | 9
+ sharutils | [] [] [] [] | 14
+ sketch | [] () [] | 4
+ soundtracker | [] | 6
+ sp | | 1
+ tar | [] [] [] [] [] [] [] | 19
+ texinfo | [] [] | 10
+ textutils | [] [] [] [] [] | 14
+ util-linux | [] [] [] | 10
+ vorbis-tools | [] | 3
+ wastesedge | | 0
+ wdiff | [] [] [] [] [] | 14
+ wget | [] [] [] [] [] [] [] [] | 24
+ +----------------------------------------------+
+ 37 teams no pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW
+ 68 domains 4 15 2 28 28 12 10 49 43 4 1 9 609
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
lag between the mere existence a PO file and its wide availability in a
distribution.
- If August 1998 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites.
+ If August 2002 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
-package. Of course the GNU Public License applies to your sources from
-then if you include `gettext' directly in your distribution on but
-since you are writing free software anyway this is no restriction.
-
- Once the sources are change appropriately and the setup can handle to
-use of `gettext' the only thing missing are the translations. The Free
-Translation Project is also available for packages which are not
+package. Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library. This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
+
+ Once the sources are changed appropriately and the setup can handle
+to use of `gettext' the only thing missing are the translations. The
+Free Translation Project is also available for packages which are not
developed inside the GNU project. Therefore the information given above
applies also for every other Free Software Project. Contact
`translation@iro.umontreal.ca' to make the `.pot' files available to
+2003-05-03 Theodore Ts'o <tytso@mit.edu>
+
+ * ABOUT-NLS, MCONFIG.in, Makefile.in, aclocal.m4, configure,
+ configure.in: Update to using version 0.11.5 of the
+ gettext library. We now enable NLS by default.
+
2003-04-21 Theodore Ts'o <tytso@mit.edu>
* Release of E2fsprogs 1.33
sbindir = @sbindir@
libdir = @libdir@
datadir= @datadir@
+localedir = $(datadir)/locale
root_sysconfdir= @root_sysconfdir@
includedir = @includedir@
mandir = @mandir@
INSTALL_DATA = @INSTALL_DATA@
CC = @CC@
BUILD_CC = @BUILD_CC@
-DEFS = @DEFS@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
+ -I$(top_builddir)/intl -I$(top_srcdir)/intl \
-I$(top_builddir)/lib -I$(top_srcdir)/lib $(LINUX_INCLUDE)
LDFLAGS = @LDFLAGS@
ALL_LDFLAGS = $(LDFLAGS)
LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@
LIBBLKID = $(LIB)/libblkid@LIB_EXT@
+LIBINTL = @LIBINTL@
DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
@DEBUGFS_CMT@DEBUGFS_DIR= debugfs
@LINUX_CMT@EVMS_DIR= lib/evms
-LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid lib/blkid
+LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid lib/blkid intl
PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs $(EVMS_DIR)
SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 5
-
-AC_DEFUN(AM_WITH_NLS,
- [AC_MSG_CHECKING([whether NLS is requested])
- dnl Default is enabled NLS
- AC_ARG_ENABLE(nls,
- [ --enable-nls Turn on Native Language Support],
- USE_NLS=$enableval, USE_NLS=no)
- AC_MSG_RESULT($USE_NLS)
- AC_SUBST(USE_NLS)
+# codeset.m4 serial AM1 (gettext-0.10.40)
+dnl Copyright (C) 2000-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.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+ [AC_TRY_LINK([#include <langinfo.h>],
+ [char* cs = nl_langinfo(CODESET);],
+ am_cv_langinfo_codeset=yes,
+ am_cv_langinfo_codeset=no)
+ ])
+ if test $am_cv_langinfo_codeset = yes; then
+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+ fi
+])
+# gettext.m4 serial 17 (gettext-0.11.5)
+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
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl default (if it is not specified or empty) is 'no-libtool'.
+dnl INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl depending on --{enable,disable}-{shared,static} and on the presence of
+dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl implementations (in libc or libintl) without the ngettext() function
+dnl will be ignored. If NEEDSYMBOL is specified and is
+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries. If empty,
+dnl the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl and used.
+dnl Catalog format: GNU --> install in $(datadir)
+dnl Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl Catalog format: GNU --> install in $(datadir)
+dnl Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl Catalog format: none
+dnl Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+ dnl Argument checking.
+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+ define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
+ define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
+
+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
+ ifelse(gt_included_intl, yes, [
+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
+ ])
+
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
+ dnl Ideally we would do this search only after the
+ dnl if test "$USE_NLS" = "yes"; then
+ dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+ dnl the configure script would need to contain the same shell code
+ dnl again, outside any 'if'. There are two solutions:
+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+ dnl documented, we avoid it.
+ ifelse(gt_included_intl, yes, , [
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+ ])
+
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE(nls,
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT($USE_NLS)
+ AC_SUBST(USE_NLS)
+
+ ifelse(gt_included_intl, yes, [
+ BUILD_INCLUDED_LIBINTL=no
USE_INCLUDED_LIBINTL=no
+ ])
+ LIBINTL=
+ LTLIBINTL=
+ POSUB=
- dnl If we use NLS figure out what method
- if test "$USE_NLS" = "yes"; then
- AC_DEFINE(ENABLE_NLS)
+ dnl If we use NLS figure out what method
+ if test "$USE_NLS" = "yes"; then
+ gt_use_preinstalled_gnugettext=no
+ ifelse(gt_included_intl, yes, [
AC_MSG_CHECKING([whether included gettext is requested])
AC_ARG_WITH(included-gettext,
[ --with-included-gettext use the GNU gettext library included here],
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+ ])
dnl User does not insist on using GNU NLS library. Figure out what
- dnl to use. If gettext or catgets are available (in this order) we
- dnl use this. Else we have to fall back to GNU NLS library.
- dnl catgets is only used if permitted by option --with-catgets.
- nls_cv_header_intl=
- nls_cv_header_libgt=
- CATOBJEXT=NONE
-
- AC_CHECK_HEADER(libintl.h,
- [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
- [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
- gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
-
- if test "$gt_cv_func_gettext_libc" != "yes"; then
- AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for gettext in libintl],
- gt_cv_func_gettext_libintl,
- [AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
- gt_cv_func_gettext_libintl=no)],
- gt_cv_func_gettext_libintl=no)])
- fi
-
- if test "$gt_cv_func_gettext_libc" = "yes" \
- || test "$gt_cv_func_gettext_libintl" = "yes"; then
- AC_DEFINE(HAVE_GETTEXT)
- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
- if test "$MSGFMT" != "no"; then
- AC_CHECK_FUNCS(dcgettext)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr],
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [CATOBJEXT=.mo
- DATADIRNAME=lib])
- INSTOBJEXT=.mo
- fi
- fi
- ])
-
- if test "$CATOBJEXT" = "NONE"; then
- AC_MSG_CHECKING([whether catgets can be used])
- AC_ARG_WITH(catgets,
- [ --with-catgets use catgets functions if available],
- nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
- AC_MSG_RESULT($nls_cv_use_catgets)
-
- if test "$nls_cv_use_catgets" = "yes"; then
- dnl No gettext in C library. Try catgets next.
- AC_CHECK_LIB(i, main)
- AC_CHECK_FUNC(catgets,
- [AC_DEFINE(HAVE_CATGETS)
- INTLOBJS="\$(CATOBJS)"
- AC_PATH_PROG(GENCAT, gencat, no)dnl
- if test "$GENCAT" != "no"; then
- AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
- if test "$GMSGFMT" = "no"; then
- AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
- fi
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
- USE_INCLUDED_LIBINTL=yes
- CATOBJEXT=.cat
- INSTOBJEXT=.cat
- DATADIRNAME=lib
- INTLDEPS='$(top_builddir)/intl/libintl.a'
- INTLLIBS=$INTLDEPS
- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
- nls_cv_header_intl=intl/libintl.h
- nls_cv_header_libgt=intl/libgettext.h
- fi])
- fi
+ dnl to use. If GNU gettext is available we use this. Else we have
+ dnl to fall back to GNU NLS library.
+
+ dnl Add a version number to the cache macros.
+ define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
+ define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
+ define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
+
+ AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+ [AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
+ [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
+ gt_cv_func_gnugettext_libc=yes,
+ gt_cv_func_gnugettext_libc=no)])
+
+ if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
+ ifelse(gt_included_intl, yes, , [
+ AM_ICONV_LINK
+ ])
+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+ dnl even if libiconv doesn't exist.
+ AC_LIB_LINKFLAGS_BODY([intl])
+ AC_CACHE_CHECK([for GNU gettext in libintl],
+ gt_cv_func_gnugettext_libintl,
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCINTL"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBINTL"
+ dnl Now see whether libintl exists and does not depend on libiconv.
+ AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern
+#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.
+ if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+ LIBS="$LIBS $LIBICONV"
+ AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern
+#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
+ ])
+ fi
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"])
+ fi
+
+ dnl If an already present or preinstalled GNU gettext() is found,
+ dnl use it. But if this macro is used in GNU gettext, and GNU
+ dnl gettext is already preinstalled in libintl, we update this
+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
+ if test "$gt_cv_func_gnugettext_libc" = "yes" \
+ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+ && test "$PACKAGE" != gettext; }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ dnl Reset the values set by searching for libintl.
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
fi
- if test "$CATOBJEXT" = "NONE"; then
- dnl Neither gettext nor catgets in included in the C library.
- dnl Fall back on GNU gettext library.
- nls_cv_use_gnu_gettext=yes
+ ifelse(gt_included_intl, yes, [
+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+ dnl GNU gettext is not found in the C library.
+ dnl Fall back on included GNU gettext library.
+ nls_cv_use_gnu_gettext=yes
fi
fi
if test "$nls_cv_use_gnu_gettext" = "yes"; then
dnl Mark actions used to generate GNU NLS library.
INTLOBJS="\$(GETTOBJS)"
- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
- AC_SUBST(MSGFMT)
- USE_INCLUDED_LIBINTL=yes
- CATOBJEXT=.gmo
- INSTOBJEXT=.mo
- DATADIRNAME=share
- INTLDEPS='$(top_builddir)/intl/libintl.a'
- INTLLIBS=$INTLDEPS
- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
- nls_cv_header_intl=intl/libintl.h
- nls_cv_header_libgt=intl/libgettext.h
+ BUILD_INCLUDED_LIBINTL=yes
+ USE_INCLUDED_LIBINTL=yes
+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
fi
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is no GNU xgettext we define it as : so that the
- dnl Makefiles still can work.
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- AC_MSG_RESULT(
- [found xgettext program is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Mark actions to use GNU gettext tools.
+ CATOBJEXT=.gmo
fi
+ ])
- # We need to process the po/ directory.
- POSUB=po
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [Define to 1 if translation of program messages to the user's native language
+ is requested.])
else
- DATADIRNAME=share
- nls_cv_header_intl=intl/libintl.h
- nls_cv_header_libgt=intl/libgettext.h
+ USE_NLS=no
fi
- AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
- AC_OUTPUT_COMMANDS(
- [case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac])
+ fi
+ if test "$USE_NLS" = "yes"; then
- # If this is used in GNU gettext we have to set USE_NLS to `yes'
- # because some of the sources are only built for this goal.
- if test "$PACKAGE" = gettext; then
- USE_NLS=yes
- USE_INCLUDED_LIBINTL=yes
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+ AC_MSG_CHECKING([how to link with libintl])
+ AC_MSG_RESULT([$LIBINTL])
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+ fi
+
+ dnl For backward compatibility. Some packages may be using this.
+ AC_DEFINE(HAVE_GETTEXT, 1,
+ [Define if the GNU gettext() function is already present or preinstalled.])
+ AC_DEFINE(HAVE_DCGETTEXT, 1,
+ [Define if the GNU dcgettext() function is already present or preinstalled.])
fi
- dnl These rules are solely for the distribution goal. While doing this
- dnl we only have to keep exactly one list of the available catalogs
- dnl in configure.in.
- for lang in $ALL_LINGUAS; do
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
+ dnl We need to process the po/ directory.
+ POSUB=po
+ fi
+
+ ifelse(gt_included_intl, yes, [
+ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+ dnl to 'yes' because some of the testsuite requires it.
+ if test "$PACKAGE" = gettext; then
+ BUILD_INCLUDED_LIBINTL=yes
+ fi
dnl Make all variables we use known to autoconf.
+ AC_SUBST(BUILD_INCLUDED_LIBINTL)
AC_SUBST(USE_INCLUDED_LIBINTL)
- AC_SUBST(CATALOGS)
AC_SUBST(CATOBJEXT)
+ AC_SUBST(INTLOBJS)
+
+ dnl For backward compatibility. Some configure.ins may be using this.
+ nls_cv_header_intl=
+ nls_cv_header_libgt=
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ DATADIRNAME=share
AC_SUBST(DATADIRNAME)
- AC_SUBST(GMOFILES)
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INSTOBJEXT=.mo
AC_SUBST(INSTOBJEXT)
- AC_SUBST(INTLDEPS)
- AC_SUBST(INTLLIBS)
- AC_SUBST(INTLOBJS)
- AC_SUBST(POFILES)
- AC_SUBST(POSUB)
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ GENCAT=gencat
+ AC_SUBST(GENCAT)
+
+ dnl Enable libtool support if the surrounding package wishes it.
+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+ AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+ ])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLLIBS="$LIBINTL"
+ AC_SUBST(INTLLIBS)
+
+ dnl Make all documented variables known to autoconf.
+ AC_SUBST(LIBINTL)
+ AC_SUBST(LTLIBINTL)
+ AC_SUBST(POSUB)
+])
+
+
+dnl Checks for all prerequisites of the po subdirectory,
+dnl except for USE_NLS.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+
+ dnl Perform the following tests also if --disable-nls has been given,
+ dnl because they are needed for "make dist" to work.
+
+ dnl Search for GNU msgfmt in the PATH.
+ 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)
+
+ dnl Search for GNU xgettext 0.11 or newer in the PATH.
+ 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= /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+ dnl Remove leftover from FreeBSD xgettext call.
+ rm -f messages.po
+
+ 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.
+ if test "$GMSGFMT" != ":"; then
+ dnl If it is no GNU msgfmt we define it as : so that the
+ dnl Makefiles still can work.
+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ : ;
+ else
+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+ AC_MSG_RESULT(
+ [found $GMSGFMT program is not GNU msgfmt; ignore it])
+ GMSGFMT=":"
+ fi
+ fi
+
+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
+ dnl If it is no GNU xgettext we define it as : so that the
+ dnl Makefiles still can work.
+ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ : ;
+ else
+ AC_MSG_RESULT(
+ [found xgettext program is not GNU xgettext; ignore it])
+ XGETTEXT=":"
+ fi
+ dnl Remove leftover from FreeBSD xgettext call.
+ rm -f messages.po
+ fi
+
+ AC_OUTPUT_COMMANDS([
+ for ac_file in $CONFIG_FILES; do
+ # Support "outfile[:infile[:infile...]]"
+ case "$ac_file" in
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ esac
+ # PO directories have a Makefile.in generated from Makefile.in.in.
+ case "$ac_file" in */Makefile.in)
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+ rm -f "$ac_dir/POTFILES"
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
+ # on $ac_dir but don't depend on user-specified configuration
+ # parameters.
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ if test -n "$ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ # Hide the ALL_LINGUAS assigment from automake.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ fi
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ GMOFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ done
+ fi
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+ if test -f "$f"; then
+ case "$f" in
+ *.orig | *.bak | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
+ done
+ fi
+ ;;
+ esac
+ done],
+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
+ # from automake.
+ eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+ ])
+])
+
+
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
+[
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_PROG_RANLIB])dnl
+ AC_REQUIRE([AC_ISC_POSIX])dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+ AC_REQUIRE([AC_C_CONST])dnl
+ AC_REQUIRE([AC_C_INLINE])dnl
+ AC_REQUIRE([AC_TYPE_OFF_T])dnl
+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+ AC_REQUIRE([AC_FUNC_MMAP])dnl
+ AC_REQUIRE([jm_GLIBC21])dnl
+ AC_REQUIRE([gt_INTDIV0])dnl
+ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
+ AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+ AC_REQUIRE([gt_INTTYPES_PRI])dnl
+
+ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h])
+ AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
+
+ 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,
+ dnl because plural.y uses bison specific features. It requires at least
+ dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+ dnl compile.
+ dnl bison is only needed for the maintainer (who touches plural.y). But in
+ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+ dnl the rule in general Makefile. Now, some people carelessly touch the
+ dnl files or have a broken "make" program, hence the plural.c rule will
+ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+ dnl present or too old.
+ AC_CHECK_PROGS([INTLBISON], [bison])
+ if test -z "$INTLBISON"; then
+ ac_verc_fail=yes
+ else
+ dnl Found it, now check the version.
+ AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ esac
+ AC_MSG_RESULT([$ac_prog_version])
+ fi
+ if test $ac_verc_fail = yes; then
+ INTLBISON=:
+ fi
+])
+
+
+AC_DEFUN([AM_MKINSTALLDIRS],
+[
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+ dnl Try to locate is.
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+ AC_SUBST(MKINSTALLDIRS)
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
+dnl Copyright (C) 2000-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.
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([jm_GLIBC21],
+ [
+ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+ ac_cv_gnu_library_2_1,
+ [AC_EGREP_CPP([Lucky GNU user],
+ [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+ Lucky GNU user
+ #endif
+#endif
+ ],
+ ac_cv_gnu_library_2_1=yes,
+ ac_cv_gnu_library_2_1=no)
+ ]
+ )
+ AC_SUBST(GLIBC21)
+ GLIBC21="$ac_cv_gnu_library_2_1"
+ ]
+)
+# iconv.m4 serial AM4 (gettext-0.11.3)
+dnl Copyright (C) 2000-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.
+
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+ dnl accordingly.
+ AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+ dnl those with the standalone portable GNU libiconv installed).
+
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+ dnl accordingly.
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+ dnl because if the user has installed libiconv and not disabled its use
+ dnl via --without-libiconv-prefix, he wants to use it. The first
+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+ am_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+ am_cv_func_iconv=yes)
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes)
+ LIBS="$am_save_LIBS"
+ fi
])
+ if test "$am_cv_func_iconv" = yes; then
+ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ AC_MSG_CHECKING([how to link with libiconv])
+ AC_MSG_RESULT([$LIBICONV])
+ else
+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+ dnl either.
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+ AC_SUBST(LIBICONV)
+ AC_SUBST(LTLIBICONV)
+])
+
+AC_DEFUN([AM_ICONV],
+[
+ AM_ICONV_LINK
+ if test "$am_cv_func_iconv" = yes; then
+ AC_MSG_CHECKING([for iconv declaration])
+ AC_CACHE_VAL(am_cv_proto_iconv, [
+ AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+ AC_MSG_RESULT([$]{ac_t:-
+ }[$]am_cv_proto_iconv)
+ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+ [Define as const if the declaration of iconv() needs const.])
+ fi
+])
+# 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.
+
+AC_DEFUN([gt_INTDIV0],
+[
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
+ gt_cv_int_divbyzero_sigfpe,
+ [
+ AC_TRY_RUN([
+#include <stdlib.h>
+#include <signal.h>
+
+static void
+#ifdef __cplusplus
+sigfpe_handler (int sig)
+#else
+sigfpe_handler (sig) int sig;
+#endif
+{
+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
+ exit (sig != SIGFPE);
+}
+
+int x = 1;
+int y = 0;
+int z;
+int nan;
+
+int main ()
+{
+ signal (SIGFPE, sigfpe_handler);
+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+ signal (SIGTRAP, sigfpe_handler);
+#endif
+/* Linux/SPARC yields signal SIGILL. */
+#if defined (__sparc__) && defined (__linux__)
+ signal (SIGILL, sigfpe_handler);
+#endif
-AC_DEFUN(AM_GNU_GETTEXT,
- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_PROG_RANLIB])dnl
- AC_REQUIRE([AC_ISC_POSIX])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_REQUIRE([AC_C_CONST])dnl
- AC_REQUIRE([AC_C_INLINE])dnl
- AC_REQUIRE([AC_TYPE_OFF_T])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
- AC_REQUIRE([AC_FUNC_MMAP])dnl
-
- AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h sys/param.h])
- AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-strdup __argz_count __argz_stringify __argz_next])
-
- if test "${ac_cv_func_stpcpy+set}" != "set"; then
- AC_CHECK_FUNCS(stpcpy)
- fi
- if test "${ac_cv_func_stpcpy}" = "yes"; then
- AC_DEFINE(HAVE_STPCPY)
- fi
-
- AM_LC_MESSAGES
- AM_WITH_NLS
-
- if test "x$CATOBJEXT" != "x"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- AC_MSG_CHECKING(for catalogs to be installed)
- NEW_LINGUAS=
- for lang in ${LINGUAS=$ALL_LINGUAS}; do
- case "$ALL_LINGUAS" in
- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
- esac
- done
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
-
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-
- dnl The reference to <locale.h> in the installed <libintl.h> file
- dnl must be resolved because we cannot expect the users of this
- dnl to define HAVE_LOCALE_H.
- if test $ac_cv_header_locale_h = yes; then
- INCLUDE_LOCALE_H="#include <locale.h>"
- else
- INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>. Take care yourself. */"
- fi
- AC_SUBST(INCLUDE_LOCALE_H)
-
- dnl Determine which catalog format we have (if any is needed)
- dnl For now we know about two different formats:
- dnl Linux libc-5 and the normal X/Open format
- test -d intl || mkdir intl
- if test "$CATOBJEXT" = ".cat"; then
- AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-
- dnl Transform the SED scripts while copying because some dumb SEDs
- dnl cannot handle comments.
- sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
- fi
- dnl po2tbl.sed is always needed.
- sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
- $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
-
- dnl In the intl/Makefile.in we have a special dependency which makes
- dnl only sense for gettext. We comment this out for non-gettext
- dnl packages.
- if test "$PACKAGE" = "gettext"; then
- GT_NO="#NO#"
- GT_YES=
- else
- GT_NO=
- GT_YES="#YES#"
- fi
- AC_SUBST(GT_NO)
- AC_SUBST(GT_YES)
-
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
- dnl Try to locate is.
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
- AC_SUBST(MKINSTALLDIRS)
-
- dnl *** For now the libtool support in intl/Makefile is not for real.
- l=
- AC_SUBST(l)
-
- dnl Generate list of files to be processed by xgettext which will
- dnl be included in po/Makefile.
- test -d po || mkdir po
- if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
- posrcprefix="$srcdir/"
- else
- posrcprefix="../$srcdir/"
- fi
- else
- posrcprefix="../"
- fi
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
+ z = x / y;
+ nan = y / y;
+ exit (1);
+}
+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
+ [
+ # Guess based on the CPU.
+ case "$host_cpu" in
+ alpha* | i[34567]86 | m68k | s390*)
+ gt_cv_int_divbyzero_sigfpe="guessing yes";;
+ *)
+ gt_cv_int_divbyzero_sigfpe="guessing no";;
+ esac
+ ])
+ ])
+ case "$gt_cv_int_divbyzero_sigfpe" in
+ *yes) value=1;;
+ *) value=0;;
+ esac
+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
+ [Define if integer division by zero raises signal SIGFPE.])
+])
+# 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.
+
+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
+# <sys/types.h>.
+
+AC_DEFUN([gt_HEADER_INTTYPES_H],
+[
+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
+ [
+ AC_TRY_COMPILE(
+ [#include <sys/types.h>
+#include <inttypes.h>],
+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
])
+ if test $gt_cv_header_inttypes_h = yes; then
+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
+ fi
+])
+# inttypes_h.m4 serial 4 (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.
+
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
+[
+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
+ [AC_TRY_COMPILE(
+ [#include <sys/types.h>
+#include <inttypes.h>],
+ [uintmax_t i = (uintmax_t) -1;],
+ jm_ac_cv_header_inttypes_h=yes,
+ jm_ac_cv_header_inttypes_h=no)])
+ if test $jm_ac_cv_header_inttypes_h = yes; then
+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+ and declares uintmax_t. ])
+ fi
+])
+# 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.
+
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
+# macros to non-string values. This is the case on AIX 4.3.3.
+
+AC_DEFUN([gt_INTTYPES_PRI],
+[
+ AC_REQUIRE([gt_HEADER_INTTYPES_H])
+ if test $gt_cv_header_inttypes_h = yes; then
+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
+ gt_cv_inttypes_pri_broken,
+ [
+ AC_TRY_COMPILE([#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
+ ])
+ fi
+ if test "$gt_cv_inttypes_pri_broken" = yes; then
+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
+ [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+ fi
+])
+# 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.
+
+# This test replaces the one in autoconf.
+# Currently this macro should have the same name as the autoconf macro
+# because gettext's gettext.m4 (distributed in the automake package)
+# still uses it. Otherwise, the use in gettext.m4 makes autoheader
+# give these diagnostics:
+# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
+# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+
+undefine([AC_ISC_POSIX])
+
+AC_DEFUN([AC_ISC_POSIX],
+ [
+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
+ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
+ ]
+)
+# 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
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 1
-
-AC_DEFUN(AM_LC_MESSAGES,
- [if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+
+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)
+ 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
+])
+# lib-ld.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 1996-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 Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+ acl_cv_prog_gnu_ld=yes
+else
+ acl_cv_prog_gnu_ld=no
+fi])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH(gnu-ld,
+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by GCC])
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [[\\/]* | [A-Za-z]:[\\/]*)]
+ [re_direlt='/[^/][^/]*/\.\./']
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
+ AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(acl_cv_path_LD,
+[if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
fi
- fi])
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ AC_MSG_RESULT($LD)
+else
+ AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
+# lib-link.m4 serial 3 (gettext-0.11.3)
+dnl Copyright (C) 2001-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.
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+dnl From Bruno Haible.
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+ define([Name],[translit([$1],[./-], [___])])
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+ ])
+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+ dnl results of this search when this library appears as a dependency.
+ HAVE_LIB[]NAME=yes
+ undefine([Name])
+ undefine([NAME])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+ define([Name],[translit([$1],[./-], [___])])
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+ dnl because if the user has installed lib[]Name and not disabled its use
+ dnl via --without-lib[]Name-prefix, he wants to use it.
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIB[]NAME"
+ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+ LIBS="$ac_save_LIBS"
+ ])
+ if test "$ac_cv_lib[]Name" = yes; then
+ HAVE_LIB[]NAME=yes
+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+ AC_MSG_CHECKING([how to link with lib[]$1])
+ AC_MSG_RESULT([$LIB[]NAME])
+ else
+ HAVE_LIB[]NAME=no
+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+ dnl $INC[]NAME either.
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LIB[]NAME=
+ LTLIB[]NAME=
+ fi
+ AC_SUBST([HAVE_LIB]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ undefine([Name])
+ undefine([NAME])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
+dnl hardcode_direct, hardcode_minus_L,
+dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
+AC_DEFUN([AC_LIB_RPATH],
+[
+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+ ])
+ wl="$acl_cv_wl"
+ libext="$acl_cv_libext"
+ shlibext="$acl_cv_shlibext"
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ hardcode_direct="$acl_cv_hardcode_direct"
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+ dnl Determine whether the user wants rpath handling at all.
+ AC_ARG_ENABLE(rpath,
+ [ --disable-rpath do not hardcode runtime library paths],
+ :, enable_rpath=yes)
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_ARG_WITH([lib$1-prefix],
+[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
+ --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+])
+ dnl Search the library and its dependencies in $additional_libdir and
+ dnl $LDFLAGS. Using breadth-first-seach.
+ LIB[]NAME=
+ LTLIB[]NAME=
+ INC[]NAME=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='$1 $2'
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+ dnl or AC_LIB_HAVE_LINKFLAGS call.
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+ else
+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+ dnl that this library doesn't exist. So just drop it.
+ :
+ fi
+ else
+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ if test $use_additional = yes; then
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ found_dir="$additional_libdir"
+ found_so="$additional_libdir/lib$name.$shlibext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ else
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+ found_dir="$dir"
+ found_so="$dir/lib$name.$shlibext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ else
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ dnl Found the library.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ dnl The hardcoding into $LIBNAME is system dependent.
+ if test "$hardcode_direct" = yes; then
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+ dnl resulting binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ dnl Rely on "-L$found_dir".
+ dnl But don't add it if it's already contained in the LDFLAGS
+ dnl or the already constructed $LIBNAME
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+ dnl here, because this doesn't fit in flags passed to the
+ dnl compiler. So give up. No hardcoding. This affects only
+ dnl very old systems.
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ dnl Linking with a static library.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+ else
+ dnl We shouldn't come here, but anyway it's good to have a
+ dnl fallback.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+ fi
+ fi
+ dnl Assume the include files are nearby.
+ additional_includedir=
+ case "$found_dir" in
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ dnl Potentially add $additional_includedir to $INCNAME.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/include,
+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 3. if it's already present in $CPPFLAGS or the already
+ dnl constructed $INCNAME,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ 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
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INC[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ dnl Really add $additional_includedir to $INCNAME.
+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ dnl Look for dependencies.
+ if test -n "$found_la"; then
+ dnl Read the .la file. It defines the variables
+ dnl dlname, library_names, old_library, dependency_libs, current,
+ dnl age, revision, installed, dlopen, dlpreopen, libdir.
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ dnl We use only dependency_libs.
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/lib,
+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 3. if it's already present in $LDFLAGS or the already
+ dnl constructed $LIBNAME,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ 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
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LIBNAME.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LTLIBNAME.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ dnl Handle this in the next round.
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ dnl Handle this in the next round. Throw away the .la's
+ dnl directory; it is already contained in a preceding -L
+ dnl option.
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ dnl Most likely an immediate library name.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ dnl Didn't find the library; assume it is in the system directories
+ dnl known to the linker and runtime loader. (All the system
+ dnl directories known to the linker should also be known to the
+ dnl runtime loader, otherwise the system is severely misconfigured.)
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$hardcode_libdir_separator"; then
+ dnl Weird platform: only the last -rpath option counts, the user must
+ dnl pass all path elements in one option. We can arrange that for a
+ dnl single library, but not when more than one $LIBNAMEs are used.
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+ done
+ dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+ else
+ dnl The -rpath options are cumulative.
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ dnl When using libtool, the option that works for both libraries and
+ dnl executables is -R. The -R options are cumulative.
+ for found_dir in $ltrpathdirs; do
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+ for element in [$2]; do
+ haveit=
+ for x in $[$1]; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ [$1]="${[$1]}${[$1]:+ }$element"
+ fi
+ done
+])
+# lib-prefix.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-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.
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_ARG_WITH([lib-prefix],
+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+ --without-lib-prefix don't search for libraries in includedir and libdir],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+])
+ if test $use_additional = yes; then
+ dnl Potentially add $additional_includedir to $CPPFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/include,
+ dnl 2. if it's already present in $CPPFLAGS,
+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ for x in $CPPFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ 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
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ dnl Really add $additional_includedir to $CPPFLAGS.
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ dnl Potentially add $additional_libdir to $LDFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/lib,
+ dnl 2. if it's already present in $LDFLAGS,
+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ for x in $LDFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ 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
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LDFLAGS.
+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ fi
+])
-# serial 1
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+ dnl Unfortunately, prefix and exec_prefix get only finally determined
+ dnl at the end of configure.
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ $1
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+])
+# progtest.m4 serial 2 (gettext-0.10.40)
+dnl Copyright (C) 1996-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
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+# Search path for a program which passes the given test.
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
[# Extract the first word of "$2", so it can be a program name with args.
set dummy $2; ac_word=[$]2
AC_MSG_CHECKING([for $ac_word])
;;
esac])dnl
$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
AC_MSG_RESULT([$]$1)
else
AC_MSG_RESULT(no)
fi
AC_SUBST($1)dnl
])
+# stdint_h.m4 serial 2 (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.
+
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([jm_AC_HEADER_STDINT_H],
+[
+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
+ [AC_TRY_COMPILE(
+ [#include <sys/types.h>
+#include <stdint.h>],
+ [uintmax_t i = (uintmax_t) -1;],
+ jm_ac_cv_header_stdint_h=yes,
+ jm_ac_cv_header_stdint_h=no)])
+ if test $jm_ac_cv_header_stdint_h = yes; then
+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+ and declares uintmax_t. ])
+ fi
+])
+# uintmax_t.m4 serial 6 (gettext-0.11)
+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.
+
+AC_PREREQ(2.13)
+
+# Define uintmax_t to `unsigned long' or `unsigned long long'
+# if <inttypes.h> does not exist.
+
+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
+[
+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+ test $ac_cv_type_unsigned_long_long = yes \
+ && ac_type='unsigned long long' \
+ || ac_type='unsigned long'
+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
+ [Define to unsigned long or unsigned long long
+ if <inttypes.h> and <stdint.h> don't define.])
+ fi
+])
+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
+dnl Copyright (C) 1999-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.
+
+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
+[
+ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
+ [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
+ [unsigned long long ullmax = (unsigned long long) -1;
+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
+ ac_cv_type_unsigned_long_long=yes,
+ ac_cv_type_unsigned_long_long=no)])
+ if test $ac_cv_type_unsigned_long_long = yes; then
+ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
+ [Define if you have the unsigned long long type.])
+ fi
+])
--- /dev/null
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+# Copyright 1996-2002 Free Software Foundation, Inc.
+# Taken from GNU libtool, 2001
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+#
+# The first argument passed to this file is the canonical host specification,
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+shlibext=
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+wl=
+if test "$GCC" = yes; then
+ wl='-Wl,'
+else
+ case "$host_os" in
+ aix3* | aix4* | aix5*)
+ wl='-Wl,'
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ wl='-Wl,'
+ ;;
+ irix5* | irix6*)
+ wl='-Wl,'
+ ;;
+ linux*)
+ echo '__INTEL_COMPILER' > conftest.$ac_ext
+ if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null
+ then
+ :
+ else
+ # Intel icc
+ wl='-Qoption,ld,'
+ fi
+ ;;
+ osf3* | osf4* | osf5*)
+ wl='-Wl,'
+ ;;
+ solaris*)
+ wl='-Wl,'
+ ;;
+ sunos4*)
+ wl='-Qoption ld '
+ ;;
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ if test "x$host_vendor" = xsni; then
+ wl='-LD'
+ else
+ wl='-Wl,'
+ fi
+ ;;
+ esac
+fi
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+ case "$host_os" in
+ aix3* | aix4* | aix5*)
+ # On AIX, the GNU linker is very broken
+ ld_shlibs=no
+ ;;
+ amigaos*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+ # that the semantics of dynamic libraries on AmigaOS, at least up
+ # to version 4, is to share data among multiple programs linked
+ # with the same dynamic library. Since this doesn't match the
+ # behavior of shared libraries on other platforms, we can use
+ # them.
+ ld_shlibs=no
+ ;;
+ beos*)
+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ cygwin* | mingw* | pw32*)
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+ solaris* | sysv5*)
+ if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+ elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ sunos4*)
+ hardcode_direct=yes
+ ;;
+ *)
+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+ if test "$ld_shlibs" = yes; then
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ fi
+else
+ case "$host_os" in
+ aix3*)
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L=yes
+ if test "$GCC" = yes; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+ fi
+ ;;
+ aix4* | aix5*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ else
+ aix_use_runtimelinking=no
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+ esac
+ fi
+ hardcode_direct=yes
+ hardcode_libdir_separator=':'
+ if test "$GCC" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" && \
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ hardcode_direct=yes
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+ hardcode_minus_L=yes
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
+ fi
+ esac
+ fi
+ if test "$aix_use_runtimelinking" = yes; then
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ else
+ hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+ fi
+ fi
+ ;;
+ amigaos*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ # see comment about different semantics on the GNU ld section
+ ld_shlibs=no
+ ;;
+ cygwin* | mingw* | pw32*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec=' '
+ libext=lib
+ ;;
+ darwin* | rhapsody*)
+ hardcode_direct=yes
+ ;;
+ freebsd1*)
+ ld_shlibs=no
+ ;;
+ freebsd2.2*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ ;;
+ freebsd2*)
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ ;;
+ freebsd*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ hardcode_minus_L=yes # Not in the search PATH, but as the default
+ # location of the library.
+ ;;
+ irix5* | irix6*)
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+ netbsd*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ ;;
+ newsos6)
+ hardcode_direct=yes
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+ openbsd*)
+ hardcode_direct=yes
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
+ ;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ osf3*)
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+ osf4* | osf5*)
+ if test "$GCC" = yes; then
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ else
+ # Both cc and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+ fi
+ hardcode_libdir_separator=:
+ ;;
+ sco3.2v5*)
+ ;;
+ solaris*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ sunos4*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ ;;
+ sysv4)
+ if test "x$host_vendor" = xsno; then
+ hardcode_direct=yes # is this really true???
+ else
+ hardcode_direct=no # Motorola manual says yes, but my tests say they lie
+ fi
+ ;;
+ sysv4.3*)
+ ;;
+ sysv5*)
+ hardcode_libdir_flag_spec=
+ ;;
+ uts4*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+ dgux*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ ld_shlibs=yes
+ fi
+ ;;
+ sysv4.2uw2*)
+ hardcode_direct=yes
+ hardcode_minus_L=no
+ ;;
+ sysv5uw7* | unixware7*)
+ ;;
+ *)
+ ld_shlibs=no
+ ;;
+ esac
+fi
+
+# Check dynamic linker characteristics
+libname_spec='lib$name'
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+case "$host_os" in
+ aix3*)
+ shlibext=so
+ ;;
+ aix4* | aix5*)
+ shlibext=so
+ ;;
+ amigaos*)
+ shlibext=ixlibrary
+ ;;
+ beos*)
+ shlibext=so
+ ;;
+ bsdi4*)
+ shlibext=so
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+ ;;
+ cygwin* | mingw* | pw32*)
+ case $GCC,$host_os in
+ yes,cygwin*)
+ shlibext=dll.a
+ ;;
+ yes,mingw*)
+ shlibext=dll
+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
+ ;;
+ yes,pw32*)
+ shlibext=dll
+ ;;
+ *)
+ shlibext=dll
+ ;;
+ esac
+ ;;
+ darwin* | rhapsody*)
+ shlibext=dylib
+ ;;
+ freebsd1*)
+ ;;
+ freebsd*)
+ shlibext=so
+ ;;
+ gnu*)
+ shlibext=so
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ shlibext=sl
+ ;;
+ irix5* | irix6*)
+ shlibext=so
+ case "$host_os" in
+ irix5*)
+ libsuff= shlibsuff=
+ ;;
+ *)
+ case $LD in
+ *-32|*"-32 ") libsuff= shlibsuff= ;;
+ *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 ;;
+ *-64|*"-64 ") libsuff=64 shlibsuff=64 ;;
+ *) libsuff= shlibsuff= ;;
+ esac
+ ;;
+ esac
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ ;;
+ linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+ ;;
+ linux-gnu*)
+ shlibext=so
+ ;;
+ netbsd*)
+ shlibext=so
+ ;;
+ newsos6)
+ shlibext=so
+ ;;
+ openbsd*)
+ shlibext=so
+ ;;
+ os2*)
+ libname_spec='$name'
+ shlibext=dll
+ ;;
+ osf3* | osf4* | osf5*)
+ shlibext=so
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+ sco3.2v5*)
+ shlibext=so
+ ;;
+ solaris*)
+ shlibext=so
+ ;;
+ sunos4*)
+ shlibext=so
+ ;;
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ shlibext=so
+ case "$host_vendor" in
+ motorola)
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
+ uts4*)
+ shlibext=so
+ ;;
+ dgux*)
+ shlibext=so
+ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ shlibext=so
+ fi
+ ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec="$escaped_sys_lib_search_path_spec"
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec="$escaped_sys_lib_dlsearch_path_spec"
+
+EOF
ac_help="$ac_help
--enable-old-bitops Use old (non-standard but native) bitmask operations"
ac_help="$ac_help
- --enable-nls Turn on Native Language Support"
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]"
+ac_help="$ac_help
+ --disable-rpath do not hardcode runtime library paths"
+ac_help="$ac_help
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir"
+ac_help="$ac_help
+ --disable-nls do not use Native Language Support"
ac_help="$ac_help
--with-included-gettext use the GNU gettext library included here"
ac_help="$ac_help
- --with-catgets use catgets functions if available"
+ --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
+ --without-libintl-prefix don't search for libintl in includedir and libdir"
# Initialize some variables set by options.
# The variables have the same names as the options, with
ac_n= ac_c='\c' ac_t=
fi
+# Check whether --with-gnu-ld or --without-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+ withval="$with_gnu_ld"
+ test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
+echo "configure:598: checking for ld used by GCC" >&5
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
+echo "configure:628: checking for GNU ld" >&5
+else
+ echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+echo "configure:631: checking for non-GNU ld" >&5
+fi
+if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ echo "$ac_t""$LD" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
+echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
+echo "configure:666: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+ acl_cv_prog_gnu_ld=yes
+else
+ acl_cv_prog_gnu_ld=no
+fi
+fi
+
+echo "$ac_t""$acl_cv_prog_gnu_ld" 1>&6
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
MCONFIG=./MCONFIG
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:648: checking host system type" >&5
+echo "configure:752: checking host system type" >&5
host_alias=$host
case "$host_alias" in
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:682: checking for $ac_word" >&5
+echo "configure:786: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:712: checking for $ac_word" >&5
+echo "configure:816: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:763: checking for $ac_word" >&5
+echo "configure:867: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:795: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:899: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
cat > conftest.$ac_ext << EOF
-#line 806 "configure"
+#line 910 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:837: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:941: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:842: checking whether we are using GNU C" >&5
+echo "configure:946: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:870: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:974: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
CFLAGS=$withval
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:919: checking how to run the C preprocessor" >&5
+echo "configure:1023: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 934 "configure"
+#line 1038 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 951 "configure"
+#line 1055 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 968 "configure"
+#line 1072 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
ac_safe=`echo "linux/fs.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for linux/fs.h""... $ac_c" 1>&6
-echo "configure:1000: checking for linux/fs.h" >&5
+echo "configure:1104: checking for linux/fs.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1005 "configure"
+#line 1109 "configure"
#include "confdefs.h"
#include <linux/fs.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
-ALL_LINGUAS="it nyc tr de de-utf"
+
+ echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6
+echo "configure:1597: checking for inttypes.h" >&5
+if eval "test \"`echo '$''{'jm_ac_cv_header_inttypes_h'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1602 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <inttypes.h>
+int main() {
+uintmax_t i = (uintmax_t) -1;
+; return 0; }
+EOF
+if { (eval echo configure:1610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ jm_ac_cv_header_inttypes_h=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ jm_ac_cv_header_inttypes_h=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$jm_ac_cv_header_inttypes_h" 1>&6
+ if test $jm_ac_cv_header_inttypes_h = yes; then
+ cat >> confdefs.h <<EOF
+#define HAVE_INTTYPES_H_WITH_UINTMAX 1
+EOF
+
+ fi
+
+
+ echo $ac_n "checking for stdint.h""... $ac_c" 1>&6
+echo "configure:1632: checking for stdint.h" >&5
+if eval "test \"`echo '$''{'jm_ac_cv_header_stdint_h'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1637 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <stdint.h>
+int main() {
+uintmax_t i = (uintmax_t) -1;
+; return 0; }
+EOF
+if { (eval echo configure:1645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ jm_ac_cv_header_stdint_h=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ jm_ac_cv_header_stdint_h=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$jm_ac_cv_header_stdint_h" 1>&6
+ if test $jm_ac_cv_header_stdint_h = yes; then
+ cat >> confdefs.h <<EOF
+#define HAVE_STDINT_H_WITH_UINTMAX 1
+EOF
+
+ fi
+
+
+ echo $ac_n "checking for unsigned long long""... $ac_c" 1>&6
+echo "configure:1667: checking for unsigned long long" >&5
+if eval "test \"`echo '$''{'ac_cv_type_unsigned_long_long'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1672 "configure"
+#include "confdefs.h"
+unsigned long long ull = 1; int i = 63;
+int main() {
+unsigned long long ullmax = (unsigned long long) -1;
+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;
+; return 0; }
+EOF
+if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_type_unsigned_long_long=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_type_unsigned_long_long=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_type_unsigned_long_long" 1>&6
+ if test $ac_cv_type_unsigned_long_long = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_UNSIGNED_LONG_LONG 1
+EOF
+
+ fi
+
+
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+
+
+ echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
+echo "configure:1718: checking for shared library run path origin" >&5
+if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+
+fi
+
+echo "$ac_t""$acl_cv_rpath" 1>&6
+ wl="$acl_cv_wl"
+ libext="$acl_cv_libext"
+ shlibext="$acl_cv_shlibext"
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ hardcode_direct="$acl_cv_hardcode_direct"
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+ # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+ enableval="$enable_rpath"
+ :
+else
+ enable_rpath=yes
+fi
+
+
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1493: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1751: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
SET_MAKE="MAKE=${MAKE-make}"
fi
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:1789: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
+ for ac_dir in $PATH; do
+ # Account for people who put trailing slashes in PATH elements.
+ case "$ac_dir/" in
+ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ if test -f $ac_dir/$ac_prog; then
+ if test $ac_prog = install &&
+ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ else
+ ac_cv_path_install="$ac_dir/$ac_prog -c"
+ break 2
+ fi
+ fi
+ done
+ ;;
+ esac
+ done
+ IFS="$ac_save_IFS"
+
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL="$ac_cv_path_install"
+ else
+ # As a last resort, use the slow shell script. We don't cache a
+ # path for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the path is relative.
+ INSTALL="$ac_install_sh"
+ fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+
+
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1522: checking for $ac_word" >&5
+echo "configure:1854: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1550: checking for POSIXized ISC" >&5
-if test -d /etc/conf/kconfig.d &&
- grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
-then
- echo "$ac_t""yes" 1>&6
- ISC=yes # If later tests want to check for ISC.
- cat >> confdefs.h <<\EOF
-#define _POSIX_SOURCE 1
+
+ echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
+echo "configure:1883: checking for strerror in -lcposix" >&5
+ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lcposix $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1891 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char strerror();
+
+int main() {
+strerror()
+; return 0; }
EOF
+if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
- if test "$GCC" = yes; then
- CC="$CC -posix"
- else
- CC="$CC -Xp"
- fi
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="$LIBS -lcposix"
else
echo "$ac_t""no" 1>&6
- ISC=
fi
+
+
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1571: checking for ANSI C header files" >&5
+echo "configure:1925: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1576 "configure"
+#line 1930 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1601 "configure"
+#line 1955 "configure"
#include "confdefs.h"
#include <string.h>
EOF
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1619 "configure"
+#line 1973 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 1640 "configure"
+#line 1994 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1675: checking for working const" >&5
+echo "configure:2029: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1680 "configure"
+#line 2034 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1750: checking for inline" >&5
+echo "configure:2104: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 1757 "configure"
+#line 2111 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:1764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
esac
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1790: checking for off_t" >&5
+echo "configure:2144: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1795 "configure"
+#line 2149 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1823: checking for size_t" >&5
+echo "configure:2177: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1828 "configure"
+#line 2182 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1858: checking for working alloca.h" >&5
+echo "configure:2212: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1863 "configure"
+#line 2217 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:1870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1891: checking for alloca" >&5
+echo "configure:2245: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1896 "configure"
+#line 2250 "configure"
#include "confdefs.h"
#ifdef __GNUC__
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:1924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1956: checking whether alloca needs Cray hooks" >&5
+echo "configure:2310: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1961 "configure"
+#line 2315 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1986: checking for $ac_func" >&5
+echo "configure:2340: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1991 "configure"
+#line 2345 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:2014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2041: checking stack direction for C alloca" >&5
+echo "configure:2395: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 2049 "configure"
+#line 2403 "configure"
#include "confdefs.h"
find_stack_direction ()
{
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:2068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2093: checking for $ac_hdr" >&5
+echo "configure:2447: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2098 "configure"
+#line 2452 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2132: checking for $ac_func" >&5
+echo "configure:2486: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2137 "configure"
+#line 2491 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:2160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2185: checking for working mmap" >&5
+echo "configure:2539: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
-#line 2193 "configure"
+#line 2547 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
}
EOF
-if { (eval echo configure:2333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_mmap_fixed_mapped=yes
else
fi
-
- for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h sys/param.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2361: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+
+ echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
+echo "configure:2711: checking whether we are using the GNU C Library 2.1 or newer" >&5
+if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2366 "configure"
+#line 2716 "configure"
#include "confdefs.h"
-#include <$ac_hdr>
+
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+ Lucky GNU user
+ #endif
+#endif
+
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "Lucky GNU user" >/dev/null 2>&1; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ ac_cv_gnu_library_2_1=yes
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ ac_cv_gnu_library_2_1=no
fi
rm -f conftest*
+
+
+
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
- for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
-strdup __argz_count __argz_stringify __argz_next
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2401: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6
+
+ GLIBC21="$ac_cv_gnu_library_2_1"
+
+
+
+
+ echo $ac_n "checking whether integer division by zero raises SIGFPE""... $ac_c" 1>&6
+echo "configure:2749: checking whether integer division by zero raises SIGFPE" >&5
+if eval "test \"`echo '$''{'gt_cv_int_divbyzero_sigfpe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
+
+ if test "$cross_compiling" = yes; then
+
+ # Guess based on the CPU.
+ case "$host_cpu" in
+ alpha* | i3456786 | m68k | s390*)
+ gt_cv_int_divbyzero_sigfpe="guessing yes";;
+ *)
+ gt_cv_int_divbyzero_sigfpe="guessing no";;
+ esac
+
+else
cat > conftest.$ac_ext <<EOF
-#line 2406 "configure"
+#line 2766 "configure"
#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
-int main() {
+#include <stdlib.h>
+#include <signal.h>
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
+static void
+#ifdef __cplusplus
+sigfpe_handler (int sig)
#else
-$ac_func();
+sigfpe_handler (sig) int sig;
#endif
+{
+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
+ exit (sig != SIGFPE);
+}
+
+int x = 1;
+int y = 0;
+int z;
+int nan;
+
+int main ()
+{
+ signal (SIGFPE, sigfpe_handler);
+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+ signal (SIGTRAP, sigfpe_handler);
+#endif
+/* Linux/SPARC yields signal SIGILL. */
+#if defined (__sparc__) && defined (__linux__)
+ signal (SIGILL, sigfpe_handler);
+#endif
+
+ z = x / y;
+ nan = y / y;
+ exit (1);
+}
-; return 0; }
EOF
-if { (eval echo configure:2429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
+if { (eval echo configure:2806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ gt_cv_int_divbyzero_sigfpe=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
+ rm -fr conftest*
+ gt_cv_int_divbyzero_sigfpe=no
fi
-rm -f conftest*
+rm -fr conftest*
fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+
+fi
+
+echo "$ac_t""$gt_cv_int_divbyzero_sigfpe" 1>&6
+ case "$gt_cv_int_divbyzero_sigfpe" in
+ *yes) value=1;;
+ *) value=0;;
+ esac
cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
+#define INTDIV0_RAISES_SIGFPE $value
EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
- if test "${ac_cv_func_stpcpy+set}" != "set"; then
- for ac_func in stpcpy
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2458: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+
+
+
+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
+
+ test $ac_cv_type_unsigned_long_long = yes \
+ && ac_type='unsigned long long' \
+ || ac_type='unsigned long'
+ cat >> confdefs.h <<EOF
+#define uintmax_t $ac_type
+EOF
+
+ fi
+
+
+ echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6
+echo "configure:2847: checking for inttypes.h" >&5
+if eval "test \"`echo '$''{'gt_cv_header_inttypes_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2463 "configure"
+
+ cat > conftest.$ac_ext <<EOF
+#line 2853 "configure"
#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
-
+#include <sys/types.h>
+#include <inttypes.h>
int main() {
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
; return 0; }
EOF
-if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
+ gt_cv_header_inttypes_h=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
+ gt_cv_header_inttypes_h=no
fi
rm -f conftest*
+
fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
+echo "$ac_t""$gt_cv_header_inttypes_h" 1>&6
+ if test $gt_cv_header_inttypes_h = yes; then
+ cat >> confdefs.h <<EOF
+#define HAVE_INTTYPES_H 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
- fi
- if test "${ac_cv_func_stpcpy}" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define HAVE_STPCPY 1
-EOF
+ fi
- fi
- if test $ac_cv_header_locale_h = yes; then
- echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2520: checking for LC_MESSAGES" >&5
-if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
+
+ if test $gt_cv_header_inttypes_h = yes; then
+ echo $ac_n "checking whether the inttypes.h PRIxNN macros are broken""... $ac_c" 1>&6
+echo "configure:2886: checking whether the inttypes.h PRIxNN macros are broken" >&5
+if eval "test \"`echo '$''{'gt_cv_inttypes_pri_broken'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2525 "configure"
+
+ cat > conftest.$ac_ext <<EOF
+#line 2892 "configure"
#include "confdefs.h"
-#include <locale.h>
+#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+
int main() {
-return LC_MESSAGES
+
; return 0; }
EOF
-if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- am_cv_val_LC_MESSAGES=yes
+ gt_cv_inttypes_pri_broken=no
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- am_cv_val_LC_MESSAGES=no
+ gt_cv_inttypes_pri_broken=yes
fi
rm -f conftest*
+
fi
-echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6
- if test $am_cv_val_LC_MESSAGES = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_LC_MESSAGES 1
+echo "$ac_t""$gt_cv_inttypes_pri_broken" 1>&6
+ fi
+ if test "$gt_cv_inttypes_pri_broken" = yes; then
+ cat >> confdefs.h <<EOF
+#define PRI_MACROS_BROKEN 1
EOF
- fi
fi
- echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2553: checking whether NLS is requested" >&5
- # Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
- enableval="$enable_nls"
- USE_NLS=$enableval
-else
- USE_NLS=no
-fi
- echo "$ac_t""$USE_NLS" 1>&6
+
+
- USE_INCLUDED_LIBINTL=no
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
- if test "$USE_NLS" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define ENABLE_NLS 1
-EOF
+ # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then
+ withval="$with_libiconv_prefix"
+
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
- echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2573: checking whether included gettext is requested" >&5
- # Check whether --with-included-gettext or --without-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
- withval="$with_included_gettext"
- nls_cv_force_use_gnu_gettext=$withval
-else
- nls_cv_force_use_gnu_gettext=no
fi
- echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6
+ LIBICONV=
+ LTLIBICONV=
+ INCICONV=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='iconv '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ if test $use_additional = yes; then
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ found_dir="$additional_libdir"
+ found_so="$additional_libdir/lib$name.$shlibext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ else
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+ found_dir="$dir"
+ found_so="$dir/lib$name.$shlibext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ else
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ 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
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ 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
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+ done
+ fi
- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
- nls_cv_header_intl=
- nls_cv_header_libgt=
- CATOBJEXT=NONE
- ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2592: checking for libintl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+
+
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:3314: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2597 "configure"
-#include "confdefs.h"
-#include <libintl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ case "$MSGFMT" in
+ /*)
+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if $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); then
+ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+ ;;
+esac
fi
-rm -f conftest*
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+ echo "$ac_t""$MSGFMT" 1>&6
+else
+ echo "$ac_t""no" 1>&6
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:2619: checking for gettext in libc" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:3349: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2624 "configure"
-#include "confdefs.h"
-#include <libintl.h>
-int main() {
-return (int) gettext ("")
-; return 0; }
-EOF
-if { (eval echo configure:2631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- gt_cv_func_gettext_libc=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- gt_cv_func_gettext_libc=no
+ case "$GMSGFMT" in
+ /*)
+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+ ;;
+esac
fi
-rm -f conftest*
+GMSGFMT="$ac_cv_path_GMSGFMT"
+if test -n "$GMSGFMT"; then
+ echo "$ac_t""$GMSGFMT" 1>&6
+else
+ echo "$ac_t""no" 1>&6
fi
-echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
- if test "$gt_cv_func_gettext_libc" != "yes"; then
- echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:2647: checking for bindtextdomain in -lintl" >&5
-ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lintl $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2655 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char bindtextdomain();
-
-int main() {
-bindtextdomain()
-; return 0; }
-EOF
-if { (eval echo configure:2666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:2682: checking for gettext in libintl" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:2687: checking for gettext in -lintl" >&5
-ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ # Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:3386: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lintl $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2695 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char gettext();
-
-int main() {
-gettext()
-; return 0; }
-EOF
-if { (eval echo configure:2706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- gt_cv_func_gettext_libintl=yes
-else
- echo "$ac_t""no" 1>&6
-gt_cv_func_gettext_libintl=no
-fi
-
+ case "$XGETTEXT" in
+ /*)
+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+ ;;
+esac
fi
-
-echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+ echo "$ac_t""$XGETTEXT" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- fi
-
- if test "$gt_cv_func_gettext_libc" = "yes" \
- || test "$gt_cv_func_gettext_libintl" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define HAVE_GETTEXT 1
-EOF
+ rm -f messages.po
- # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
+ # Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2745: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+echo "configure:3423: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- case "$MSGFMT" in
+ case "$MSGMERGE" in
/*)
- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+ if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
+ ac_cv_path_MSGMERGE="$ac_dir/$ac_word"
break
fi
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
+ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
;;
esac
fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
- echo "$ac_t""$MSGFMT" 1>&6
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+ echo "$ac_t""$MSGMERGE" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- if test "$MSGFMT" != "no"; then
- for ac_func in dcgettext
+
+
+ if test "$GMSGFMT" != ":"; then
+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ : ;
+ else
+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+ echo "$ac_t""found $GMSGFMT program is not GNU msgfmt; ignore it" 1>&6
+ GMSGFMT=":"
+ fi
+ fi
+
+ if test "$XGETTEXT" != ":"; then
+ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ : ;
+ else
+ echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6
+ XGETTEXT=":"
+ fi
+ rm -f messages.po
+ fi
+
+
+
+
+
+ for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:3486: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 3491 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:3496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+ for ac_func in feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2779: checking for $ac_func" >&5
+echo "configure:3527: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2784 "configure"
+#line 3532 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
fi
done
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2834: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$GMSGFMT" in
- /*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
- ;;
- ?:/*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
- break
+
+
+
+
+
+
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
fi
done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
- ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
- echo "$ac_t""$GMSGFMT" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
- # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2870: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+
+ echo $ac_n "checking for iconv""... $ac_c" 1>&6
+echo "configure:3611: checking for iconv" >&5
+if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- case "$XGETTEXT" in
- /*)
- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
- ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
- echo "$ac_t""$XGETTEXT" 1>&6
+
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ cat > conftest.$ac_ext <<EOF
+#line 3619 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <iconv.h>
+int main() {
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+; return 0; }
+EOF
+if { (eval echo configure:3629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ am_cv_func_iconv=yes
else
- echo "$ac_t""no" 1>&6
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
fi
-
- cat > conftest.$ac_ext <<EOF
-#line 2902 "configure"
+rm -f conftest*
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ cat > conftest.$ac_ext <<EOF
+#line 3641 "configure"
#include "confdefs.h"
-
+#include <stdlib.h>
+#include <iconv.h>
int main() {
-extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
; return 0; }
EOF
-if { (eval echo configure:2910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- CATOBJEXT=.gmo
- DATADIRNAME=share
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
- DATADIRNAME=lib
fi
rm -f conftest*
- INSTOBJEXT=.mo
- fi
- fi
-
-else
- echo "$ac_t""no" 1>&6
+ LIBS="$am_save_LIBS"
+ fi
+
fi
+echo "$ac_t""$am_cv_func_iconv" 1>&6
+ if test "$am_cv_func_iconv" = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_ICONV 1
+EOF
- if test "$CATOBJEXT" = "NONE"; then
- echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:2933: checking whether catgets can be used" >&5
- # Check whether --with-catgets or --without-catgets was given.
-if test "${with_catgets+set}" = set; then
- withval="$with_catgets"
- nls_cv_use_catgets=$withval
-else
- nls_cv_use_catgets=no
-fi
-
- echo "$ac_t""$nls_cv_use_catgets" 1>&6
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ echo $ac_n "checking how to link with libiconv""... $ac_c" 1>&6
+echo "configure:3674: checking how to link with libiconv" >&5
+ echo "$ac_t""$LIBICONV" 1>&6
+ else
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+
+
- if test "$nls_cv_use_catgets" = "yes"; then
- echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:2946: checking for main in -li" >&5
-ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ if test "$am_cv_func_iconv" = yes; then
+ echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
+echo "configure:3686: checking for iconv declaration" >&5
+ if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-li $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2954 "configure"
+
+ cat > conftest.$ac_ext <<EOF
+#line 3692 "configure"
#include "confdefs.h"
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+
int main() {
-main()
+
; return 0; }
EOF
-if { (eval echo configure:2961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+ am_cv_proto_iconv_arg1=""
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ am_cv_proto_iconv_arg1="const"
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo i | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
- LIBS="-li $LIBS"
+ am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+ echo "$ac_t""${ac_t:-
+ }$am_cv_proto_iconv" 1>&6
+ cat >> confdefs.h <<EOF
+#define ICONV_CONST $am_cv_proto_iconv_arg1
+EOF
-else
- echo "$ac_t""no" 1>&6
-fi
+ fi
- echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:2989: checking for catgets" >&5
-if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
+
+ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
+echo "configure:3735: checking for nl_langinfo and CODESET" >&5
+if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2994 "configure"
+#line 3740 "configure"
#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char catgets(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char catgets();
-
+#include <langinfo.h>
int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_catgets) || defined (__stub___catgets)
-choke me
-#else
-catgets();
-#endif
-
+char* cs = nl_langinfo(CODESET);
; return 0; }
EOF
-if { (eval echo configure:3017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_func_catgets=yes"
+ am_cv_langinfo_codeset=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_func_catgets=no"
+ am_cv_langinfo_codeset=no
fi
rm -f conftest*
+
fi
-if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_CATGETS 1
+echo "$ac_t""$am_cv_langinfo_codeset" 1>&6
+ if test $am_cv_langinfo_codeset = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_LANGINFO_CODESET 1
EOF
- INTLOBJS="\$(CATOBJS)"
- # Extract the first word of "gencat", so it can be a program name with args.
-set dummy gencat; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3039: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$GENCAT" in
- /*)
- ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path.
- ;;
- ?:/*)
- ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_GENCAT="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no"
- ;;
-esac
-fi
-GENCAT="$ac_cv_path_GENCAT"
-if test -n "$GENCAT"; then
- echo "$ac_t""$GENCAT" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
- if test "$GENCAT" != "no"; then
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3075: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$GMSGFMT" in
- /*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
- ;;
- ?:/*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
- ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
- echo "$ac_t""$GMSGFMT" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
+ fi
- if test "$GMSGFMT" = "no"; then
- # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3112: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+ if test $ac_cv_header_locale_h = yes; then
+
+ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+echo "configure:3771: checking for LC_MESSAGES" >&5
+if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- case "$GMSGFMT" in
- /*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
- ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
- ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
- echo "$ac_t""$GMSGFMT" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
- fi
- # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3147: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ cat > conftest.$ac_ext <<EOF
+#line 3776 "configure"
+#include "confdefs.h"
+#include <locale.h>
+int main() {
+return LC_MESSAGES
+; return 0; }
+EOF
+if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ am_cv_val_LC_MESSAGES=yes
else
- case "$XGETTEXT" in
- /*)
- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
- ;;
-esac
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ am_cv_val_LC_MESSAGES=no
fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
- echo "$ac_t""$XGETTEXT" 1>&6
-else
- echo "$ac_t""no" 1>&6
+rm -f conftest*
fi
- USE_INCLUDED_LIBINTL=yes
- CATOBJEXT=.cat
- INSTOBJEXT=.cat
- DATADIRNAME=lib
- INTLDEPS='$(top_builddir)/intl/libintl.a'
- INTLLIBS=$INTLDEPS
- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
- nls_cv_header_intl=intl/libintl.h
- nls_cv_header_libgt=intl/libgettext.h
- fi
-else
- echo "$ac_t""no" 1>&6
-fi
+echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6
+ if test $am_cv_val_LC_MESSAGES = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_LC_MESSAGES 1
+EOF
- fi
- fi
+ fi
- if test "$CATOBJEXT" = "NONE"; then
- nls_cv_use_gnu_gettext=yes
- fi
- fi
+ fi
- if test "$nls_cv_use_gnu_gettext" = "yes"; then
- INTLOBJS="\$(GETTOBJS)"
- # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
+ for ac_prog in bison
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3205: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+echo "configure:3810: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- case "$MSGFMT" in
- /*)
- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
- ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
- echo "$ac_t""$MSGFMT" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3239: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ if test -n "$INTLBISON"; then
+ ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
else
- case "$GMSGFMT" in
- /*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
- ;;
- ?:/*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
- ;;
- *)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
- ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
- echo "$ac_t""$GMSGFMT" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
- # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3275: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$XGETTEXT" in
- /*)
- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
- break
- fi
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_INTLBISON="$ac_prog"
+ break
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
- ;;
-esac
fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
- echo "$ac_t""$XGETTEXT" 1>&6
+fi
+INTLBISON="$ac_cv_prog_INTLBISON"
+if test -n "$INTLBISON"; then
+ echo "$ac_t""$INTLBISON" 1>&6
else
echo "$ac_t""no" 1>&6
fi
-
- USE_INCLUDED_LIBINTL=yes
- CATOBJEXT=.gmo
- INSTOBJEXT=.mo
- DATADIRNAME=share
- INTLDEPS='$(top_builddir)/intl/libintl.a'
- INTLLIBS=$INTLDEPS
- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
- nls_cv_header_intl=intl/libintl.h
- nls_cv_header_libgt=intl/libgettext.h
- fi
+test -n "$INTLBISON" && break
+done
+
+ if test -z "$INTLBISON"; then
+ ac_verc_fail=yes
+ else
+ echo $ac_n "checking version of bison""... $ac_c" 1>&6
+echo "configure:3843: checking version of bison" >&5
+ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ esac
+ echo "$ac_t""$ac_prog_version" 1>&6
+ fi
+ if test $ac_verc_fail = yes; then
+ INTLBISON=:
+ fi
- if test "$XGETTEXT" != ":"; then
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6
- XGETTEXT=":"
- fi
- fi
- # We need to process the po/ directory.
- POSUB=po
- else
- DATADIRNAME=share
- nls_cv_header_intl=intl/libintl.h
- nls_cv_header_libgt=intl/libgettext.h
- fi
+
+
+
+
+
+
+
- # If this is used in GNU gettext we have to set USE_NLS to `yes'
- # because some of the sources are only built for this goal.
- if test "$PACKAGE" = gettext; then
- USE_NLS=yes
- USE_INCLUDED_LIBINTL=yes
- fi
+
- for lang in $ALL_LINGUAS; do
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
+ echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
+echo "configure:3872: checking whether NLS is requested" >&5
+ # Check whether --enable-nls or --disable-nls was given.
+if test "${enable_nls+set}" = set; then
+ enableval="$enable_nls"
+ USE_NLS=$enableval
+else
+ USE_NLS=yes
+fi
-
-
-
-
-
-
-
-
-
-
-
+ echo "$ac_t""$USE_NLS" 1>&6
- if test "x$CATOBJEXT" != "x"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3368: checking for catalogs to be installed" >&5
- NEW_LINGUAS=
- for lang in ${LINGUAS=$ALL_LINGUAS}; do
- case "$ALL_LINGUAS" in
- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
- esac
- done
- LINGUAS=$NEW_LINGUAS
- echo "$ac_t""$LINGUAS" 1>&6
- fi
-
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-
- if test $ac_cv_header_locale_h = yes; then
- INCLUDE_LOCALE_H="#include <locale.h>"
- else
- INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>. Take care yourself. */"
- fi
-
+
+ BUILD_INCLUDED_LIBINTL=no
+ USE_INCLUDED_LIBINTL=no
+
+ LIBINTL=
+ LTLIBINTL=
+ POSUB=
- test -d intl || mkdir intl
- if test "$CATOBJEXT" = ".cat"; then
- ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:3396: checking for linux/version.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ if test "$USE_NLS" = "yes"; then
+ gt_use_preinstalled_gnugettext=no
+
+ echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
+echo "configure:3896: checking whether included gettext is requested" >&5
+ # Check whether --with-included-gettext or --without-included-gettext was given.
+if test "${with_included_gettext+set}" = set; then
+ withval="$with_included_gettext"
+ nls_cv_force_use_gnu_gettext=$withval
+else
+ nls_cv_force_use_gnu_gettext=no
+fi
+
+ echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6
+
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+
+
+
+
+
+
+ echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
+echo "configure:3916: checking for GNU gettext in libc" >&5
+if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3401 "configure"
+#line 3921 "configure"
#include "confdefs.h"
-#include <linux/version.h>
+#include <libintl.h>
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+int main() {
+bindtextdomain ("", "");
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ gt_cv_func_gnugettext1_libc=yes
else
- echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ gt_cv_func_gnugettext1_libc=no
fi
rm -f conftest*
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- msgformat=linux
+
+echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
+
+ if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ # Check whether --with-libintl-prefix or --without-libintl-prefix was given.
+if test "${with_libintl_prefix+set}" = set; then
+ withval="$with_libintl_prefix"
+
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+
+fi
+
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='intl '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ if test $use_additional = yes; then
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ found_dir="$additional_libdir"
+ found_so="$additional_libdir/lib$name.$shlibext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ else
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+ found_dir="$dir"
+ found_so="$dir/lib$name.$shlibext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ else
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ 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
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ 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
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+ done
+ fi
+
+ echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
+echo "configure:4326: checking for GNU gettext in libintl" >&5
+if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
- echo "$ac_t""no" 1>&6
-msgformat=xopen
+ gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCINTL"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBINTL"
+ cat > conftest.$ac_ext <<EOF
+#line 4335 "configure"
+#include "confdefs.h"
+#include <libintl.h>
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias ();
+int main() {
+bindtextdomain ("", "");
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+; return 0; }
+EOF
+if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ gt_cv_func_gnugettext1_libintl=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ gt_cv_func_gnugettext1_libintl=no
+fi
+rm -f conftest*
+ if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
+ LIBS="$LIBS $LIBICONV"
+ cat > conftest.$ac_ext <<EOF
+#line 4362 "configure"
+#include "confdefs.h"
+#include <libintl.h>
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias ();
+int main() {
+bindtextdomain ("", "");
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+; return 0; }
+EOF
+if { (eval echo configure:4376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ gt_cv_func_gnugettext1_libintl=yes
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+ fi
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"
fi
+echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6
+ fi
- sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
- fi
- sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
- $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+ if test "$gt_cv_func_gnugettext1_libc" = "yes" \
+ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
+ && test "$PACKAGE" != gettext; }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ fi
- if test "$PACKAGE" = "gettext"; then
- GT_NO="#NO#"
- GT_YES=
- else
- GT_NO=
- GT_YES="#YES#"
- fi
-
-
+
+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+ nls_cv_use_gnu_gettext=yes
+ fi
+ fi
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
-
+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
+ INTLOBJS="\$(GETTOBJS)"
+ BUILD_INCLUDED_LIBINTL=yes
+ USE_INCLUDED_LIBINTL=yes
+ LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
+ LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+ fi
- l=
-
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ CATOBJEXT=.gmo
+ fi
+
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define ENABLE_NLS 1
+EOF
+
+ else
+ USE_NLS=no
+ fi
+ fi
+
+ if test "$USE_NLS" = "yes"; then
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+ echo $ac_n "checking how to link with libintl""... $ac_c" 1>&6
+echo "configure:4442: checking how to link with libintl" >&5
+ echo "$ac_t""$LIBINTL" 1>&6
+
+ for element in $INCINTL; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+ fi
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_GETTEXT 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_DCGETTEXT 1
+EOF
+
+ fi
+
+ POSUB=po
+ fi
+
+
+ if test "$PACKAGE" = gettext; then
+ BUILD_INCLUDED_LIBINTL=yes
+ fi
+
+
+
+
+
+
+ nls_cv_header_intl=
+ nls_cv_header_libgt=
+
+ DATADIRNAME=share
+
+
+ INSTOBJEXT=.mo
+
+
+ GENCAT=gencat
+
+
+ INTL_LIBTOOL_SUFFIX_PREFIX=
+
+
+
+ INTLLIBS="$LIBINTL"
+
- test -d po || mkdir po
- if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
- posrcprefix="$srcdir/"
- else
- posrcprefix="../$srcdir/"
- fi
- else
- posrcprefix="../"
- fi
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
+
+
+
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:3472: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4517: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
# Extract the first word of "ln", so it can be a program name with args.
set dummy ln; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3501: checking for $ac_word" >&5
+echo "configure:4546: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:3535: checking whether ln -s works" >&5
+echo "configure:4580: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "mv", so it can be a program name with args.
set dummy mv; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3558: checking for $ac_word" >&5
+echo "configure:4603: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "cp", so it can be a program name with args.
set dummy cp; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3594: checking for $ac_word" >&5
+echo "configure:4639: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "rm", so it can be a program name with args.
set dummy rm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3630: checking for $ac_word" >&5
+echo "configure:4675: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "chmod", so it can be a program name with args.
set dummy chmod; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3666: checking for $ac_word" >&5
+echo "configure:4711: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "awk", so it can be a program name with args.
set dummy awk; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3702: checking for $ac_word" >&5
+echo "configure:4747: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3738: checking for $ac_word" >&5
+echo "configure:4783: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3774: checking for $ac_word" >&5
+echo "configure:4819: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "ldconfig", so it can be a program name with args.
set dummy ldconfig; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3810: checking for $ac_word" >&5
+echo "configure:4855: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LDCONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:3844: checking build system type" >&5
+echo "configure:4889: checking build system type" >&5
build_alias=$build
case "$build_alias" in
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3870: checking for $ac_word" >&5
+echo "configure:4915: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3902: checking for $ac_word" >&5
+echo "configure:4947: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3937: checking for $ac_word" >&5
+echo "configure:4982: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3969: checking for $ac_word" >&5
+echo "configure:5014: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4004: checking for $ac_word" >&5
+echo "configure:5049: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4036: checking for $ac_word" >&5
+echo "configure:5081: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:4080: checking for a BSD compatible install" >&5
+echo "configure:5125: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4142: checking for $ac_word" >&5
+echo "configure:5187: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4176: checking for $ac_hdr" >&5
+echo "configure:5221: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4181 "configure"
+#line 5226 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
done
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:4213: checking for vprintf" >&5
+echo "configure:5258: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4218 "configure"
+#line 5263 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
; return 0; }
EOF
-if { (eval echo configure:4241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:4265: checking for _doprnt" >&5
+echo "configure:5310: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4270 "configure"
+#line 5315 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
; return 0; }
EOF
-if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
fi
echo $ac_n "checking whether d_reclen declared in dirent""... $ac_c" 1>&6
-echo "configure:4318: checking whether d_reclen declared in dirent" >&5
+echo "configure:5363: checking whether d_reclen declared in dirent" >&5
if eval "test \"`echo '$''{'e2fsprogs_cv_have_d_reclen_dirent'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4323 "configure"
+#line 5368 "configure"
#include "confdefs.h"
#include <dirent.h>
int main() {
struct dirent de; de.d_reclen = 0;
; return 0; }
EOF
-if { (eval echo configure:4330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
e2fsprogs_cv_have_d_reclen_dirent=yes
else
fi
echo $ac_n "checking whether ssize_t declared""... $ac_c" 1>&6
-echo "configure:4350: checking whether ssize_t declared" >&5
+echo "configure:5395: checking whether ssize_t declared" >&5
if eval "test \"`echo '$''{'e2fsprogs_cv_have_ssize_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4355 "configure"
+#line 5400 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
ssize_t a = 0;
; return 0; }
EOF
-if { (eval echo configure:4362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
e2fsprogs_cv_have_ssize_t=yes
else
fi
echo $ac_n "checking whether llseek declared in unistd.h""... $ac_c" 1>&6
-echo "configure:4382: checking whether llseek declared in unistd.h" >&5
+echo "configure:5427: checking whether llseek declared in unistd.h" >&5
if eval "test \"`echo '$''{'e2fsprogs_cv_have_llseek_prototype'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4387 "configure"
+#line 5432 "configure"
#include "confdefs.h"
#include <unistd.h>
int main() {
extern int llseek(int);
; return 0; }
EOF
-if { (eval echo configure:4394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
e2fsprogs_cv_have_llseek_prototype=no
else
fi
echo $ac_n "checking whether lseek64 declared in unistd.h""... $ac_c" 1>&6
-echo "configure:4414: checking whether lseek64 declared in unistd.h" >&5
+echo "configure:5459: checking whether lseek64 declared in unistd.h" >&5
if eval "test \"`echo '$''{'e2fsprogs_cv_have_lseek64_prototype'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4419 "configure"
+#line 5464 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE
#define _LARGEFILE64_SOURCE
extern int lseek64(int);
; return 0; }
EOF
-if { (eval echo configure:4428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
e2fsprogs_cv_have_lseek64_prototype=no
else
echo "configure: warning: Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4, long long=8" 1>&2
fi
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4456: checking size of short" >&5
+echo "configure:5501: checking size of short" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 4464 "configure"
+#line 5509 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
exit(0);
}
EOF
-if { (eval echo configure:4476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4496: checking size of int" >&5
+echo "configure:5541: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 4504 "configure"
+#line 5549 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
exit(0);
}
EOF
-if { (eval echo configure:4516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4536: checking size of long" >&5
+echo "configure:5581: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 4544 "configure"
+#line 5589 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
exit(0);
}
EOF
-if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4576: checking size of long long" >&5
+echo "configure:5621: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 4584 "configure"
+#line 5629 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
exit(0);
}
EOF
-if { (eval echo configure:4596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4624: checking whether byte ordering is bigendian" >&5
+echo "configure:5669: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 4631 "configure"
+#line 5676 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:4642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 4646 "configure"
+#line 5691 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:4657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 4677 "configure"
+#line 5722 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:4690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
fi
echo $ac_n "checking whether struct stat has a st_flags field""... $ac_c" 1>&6
-echo "configure:4714: checking whether struct stat has a st_flags field" >&5
+echo "configure:5759: checking whether struct stat has a st_flags field" >&5
if eval "test \"`echo '$''{'e2fsprogs_cv_struct_st_flags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4719 "configure"
+#line 5764 "configure"
#include "confdefs.h"
#include <sys/stat.h>
int main() {
struct stat stat; stat.st_flags = 0;
; return 0; }
EOF
-if { (eval echo configure:4726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
e2fsprogs_cv_struct_st_flags=yes
else
echo "$ac_t""$e2fsprogs_cv_struct_st_flags" 1>&6
if test "$e2fsprogs_cv_struct_st_flags" = yes; then
echo $ac_n "checking whether st_flags field is useful""... $ac_c" 1>&6
-echo "configure:4741: checking whether st_flags field is useful" >&5
+echo "configure:5786: checking whether st_flags field is useful" >&5
if eval "test \"`echo '$''{'e2fsprogs_cv_struct_st_flags_immut'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4746 "configure"
+#line 5791 "configure"
#include "confdefs.h"
#include <sys/stat.h>
int main() {
struct stat stat; stat.st_flags |= UF_IMMUTABLE;
; return 0; }
EOF
-if { (eval echo configure:4753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
e2fsprogs_cv_struct_st_flags_immut=yes
else
fi
fi
-for ac_func in chflags getrusage llseek lseek64 open64 getmntinfo strtoull strcasecmp srandom fchown mallinfo fdatasync strnlen sysconf pathconf
+for ac_func in chflags getrusage llseek lseek64 open64 getmntinfo strtoull strcasecmp srandom fchown mallinfo fdatasync strnlen strptime sysconf pathconf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4776: checking for $ac_func" >&5
+echo "configure:5821: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4781 "configure"
+#line 5826 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:4804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
SOCKET_LIB=''
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:4830: checking for socket in -lsocket" >&5
+echo "configure:5875: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4838 "configure"
+#line 5883 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
socket()
; return 0; }
EOF
-if { (eval echo configure:4849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
DLOPEN_LIB=''
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4872: checking for dlopen in -ldl" >&5
+echo "configure:5917: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4880 "configure"
+#line 5925 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dlopen()
; return 0; }
EOF
-if { (eval echo configure:4891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for optreset""... $ac_c" 1>&6
-echo "configure:4917: checking for optreset" >&5
+echo "configure:5962: checking for optreset" >&5
if eval "test \"`echo '$''{'ac_cv_have_optreset'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4922 "configure"
+#line 5967 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
echo $ac_n "checking whether linker accepts -static""... $ac_c" 1>&6
-echo "configure:5009: checking whether linker accepts -static" >&5
+echo "configure:6054: checking whether linker accepts -static" >&5
if eval "test \"`echo '$''{'ac_cv_e2fsprogs_use_static'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -static"
cat > conftest.$ac_ext <<EOF
-#line 5015 "configure"
+#line 6060 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
fflush(stdout);
; return 0; }
EOF
-if { (eval echo configure:5022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_e2fsprogs_use_static=yes
else
s%@PACKAGE@%$PACKAGE%g
s%@VERSION@%$VERSION%g
s%@SET_MAKE@%$SET_MAKE%g
-s%@RANLIB@%$RANLIB%g
-s%@ALLOCA@%$ALLOCA%g
-s%@USE_NLS@%$USE_NLS%g
+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
s%@MSGFMT@%$MSGFMT%g
s%@GMSGFMT@%$GMSGFMT%g
s%@XGETTEXT@%$XGETTEXT%g
-s%@GENCAT@%$GENCAT%g
+s%@MSGMERGE@%$MSGMERGE%g
+s%@RANLIB@%$RANLIB%g
+s%@ALLOCA@%$ALLOCA%g
+s%@GLIBC21@%$GLIBC21%g
+s%@LIBICONV@%$LIBICONV%g
+s%@LTLIBICONV@%$LTLIBICONV%g
+s%@INTLBISON@%$INTLBISON%g
+s%@USE_NLS@%$USE_NLS%g
+s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g
s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
-s%@CATALOGS@%$CATALOGS%g
s%@CATOBJEXT@%$CATOBJEXT%g
+s%@INTLOBJS@%$INTLOBJS%g
s%@DATADIRNAME@%$DATADIRNAME%g
-s%@GMOFILES@%$GMOFILES%g
s%@INSTOBJEXT@%$INSTOBJEXT%g
-s%@INTLDEPS@%$INTLDEPS%g
+s%@GENCAT@%$GENCAT%g
+s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g
s%@INTLLIBS@%$INTLLIBS%g
-s%@INTLOBJS@%$INTLOBJS%g
-s%@POFILES@%$POFILES%g
+s%@LIBINTL@%$LIBINTL%g
+s%@LTLIBINTL@%$LTLIBINTL%g
s%@POSUB@%$POSUB%g
-s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g
-s%@GT_NO@%$GT_NO%g
-s%@GT_YES@%$GT_YES%g
-s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
-s%@l@%$l%g
s%@BINARY_TYPE@%$BINARY_TYPE%g
s%@LN@%$LN%g
s%@LN_S@%$LN_S%g
s%@build_os@%$build_os%g
s%@AR@%$AR%g
s%@STRIP@%$STRIP%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@BUILD_CC@%$BUILD_CC%g
s%@SIZEOF_SHORT@%$SIZEOF_SHORT%g
s%@SIZEOF_INT@%$SIZEOF_INT%g
rm -f conftest.s*
EOF
-
-cat >> $CONFIG_STATUS <<EOF
-ac_sources="$nls_cv_header_libgt"
-ac_dests="$nls_cv_header_intl"
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-srcdir=$ac_given_srcdir
-while test -n "$ac_sources"; do
- set $ac_dests; ac_dest=$1; shift; ac_dests=$*
- set $ac_sources; ac_source=$1; shift; ac_sources=$*
-
- echo "linking $srcdir/$ac_source to $ac_dest"
-
- if test ! -r $srcdir/$ac_source; then
- { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
- fi
- rm -f $ac_dest
-
- # Make relative symlinks.
- # Remove last slash and all that follows it. Not all systems have dirname.
- ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
- if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
- # The dest file is in a subdirectory.
- test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
- ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
- # A "../" for each directory in $ac_dest_dir_suffix.
- ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
- else
- ac_dest_dir_suffix= ac_dots=
- fi
-
- case "$srcdir" in
- [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
- *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
- esac
-
- # Make a symlink if possible; otherwise try a hard link.
- if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
- ln $srcdir/$ac_source $ac_dest; then :
- else
- { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
- fi
-done
-EOF
cat >> $CONFIG_STATUS <<EOF
-
+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
+ # from automake.
+ eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+
EOF
cat >> $CONFIG_STATUS <<\EOF
-case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+
+ for ac_file in $CONFIG_FILES; do
+ # Support "outfile[:infile[:infile...]]"
+ case "$ac_file" in
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ esac
+ # PO directories have a Makefile.in generated from Makefile.in.in.
+ case "$ac_file" in */Makefile.in)
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+ rm -f "$ac_dir/POTFILES"
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
+ # on $ac_dir but don't depend on user-specified configuration
+ # parameters.
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ if test -n "$ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ # Hide the ALL_LINGUAS assigment from automake.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ fi
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ GMOFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ done
+ fi
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+ if test -f "$f"; then
+ case "$f" in
+ *.orig | *.bak | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
+ done
+ fi
+ ;;
esac
+ done
exit 0
EOF
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
-ALL_LINGUAS="it nyc tr de de-utf"
AM_GNU_GETTEXT
dnl
dnl End of configuration options
AC_DEFINE(HAVE_STAT_FLAGS)
fi
fi
-AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 getmntinfo strtoull strcasecmp srandom fchown mallinfo fdatasync strnlen sysconf pathconf)
+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 getmntinfo strtoull strcasecmp srandom fchown mallinfo fdatasync strnlen strptime sysconf pathconf)
dnl
dnl Check to see if -lsocket is required (solaris) to make something
dnl that uses socket() to compile; this is needed for the UUID library
+2003-05-03 Theodore Ts'o <tytso@mit.edu>
+
+ * Makefile.in: Add $(LIBINTL) to the link line so we can support
+ using the internal gettext library.
+
+ * e2fsck.h: Add #ifndef protection around LOCALEDIR definition.
+
2003-04-27 Theodore Ts'o <tytso@mit.edu>
* message.c (expand_at_expression): Fixed NLS support for message
MANPAGES= e2fsck.8
XTRA_CFLAGS= -DRESOURCE_TRACK
-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID)
+LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL)
DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
- $(STATIC_LIBUUID)
+ $(STATIC_LIBUUID) $(LIBINTL)
STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
$(DEPSTATIC_LIBUUID)
PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \
- $(PROFILED_BLKID) $(PROFILED_LIBUUID)
+ $(PROFILED_BLKID) $(PROFILED_LIBUUID) $(LIBINTL)
PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \
$(PROFILED_BLKID) $(DEPPROFILED_LIBUUID)
#else
#define N_(a) (a)
#endif
-/* FIXME */
+#ifndef NLS_CAT_NAME
#define NLS_CAT_NAME "e2fsprogs"
+#endif
+#ifndef LOCALEDIR
#define LOCALEDIR "/usr/share/locale"
-/* FIXME */
+#endif
#else
#define _(a) (a)
#define N_(a) a
+2003-05-03 Theodore Ts'o <tytso@mit.edu>
+
+ * Update to use gettext version 0.11.5 (released 2002-08-06)
+
2003-04-21 Theodore Ts'o <tytso@mit.edu>
* Release of E2fsprogs 1.33
* Release of E2fsprogs 1.19
-1998-04-29 Ulrich Drepper <drepper@cygnus.com>
-
- * intl/localealias.c (read_alias_file): Use unsigned char for
- local variables. Remove unused variable tp.
- * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char *
- for type of codeset. For losing Solaris systems.
- * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset.
- * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable
- len if not needed.
- Patches by Jim Meyering.
-
-1998-04-28 Ulrich Drepper <drepper@cygnus.com>
-
- * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if
- mmap is not supported.
-
- * hash-string.h: Don't include <values.h>.
-
-1998-04-27 Ulrich Drepper <drepper@cygnus.com>
-
- * textdomain.c: Use strdup is available.
-
- * localealias.c: Define HAVE_MEMPCPY so that we can use this
- function. Define and use semapahores to protect modfication of
- global objects when compiling for glibc. Add code to allow
- freeing alias table.
-
- * l10nflist.c: Don't assume stpcpy not being a macro.
-
- * gettextP.h: Define internal_function macri if not already done.
- Use glibc byte-swap macros instead of defining SWAP when compiled
- for glibc.
- (struct loaded_domain): Add elements to allow unloading.
-
- * Makefile.in (distclean): Don't remove libintl.h here.
-
- * bindtextdomain.c: Carry over changes from glibc. Use strdup if
- available.
-
- * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal
- functions. Add memory freeing code for glibc.
-
- * dgettext.c: Update copyright.
-
- * explodename.c: Include stdlib.h and string.h only if they exist.
- Use strings.h eventually.
-
- * finddomain.c: Mark internal functions. Use strdup if available.
- Add memory freeing code for glibc.
-
-1997-10-10 20:00 Ulrich Drepper <drepper@cygnus.com>
-
- * libgettext.h: Fix dummy textdomain and bindtextdomain macros.
- They should return reasonable values.
- Reported by Tom Tromey <tromey@cygnus.com>.
-
-1997-09-16 03:33 Ulrich Drepper <drepper@cygnus.com>
-
- * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined.
- * intlh.inst.in: Likewise.
- Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>.
-
- * libintl.glibc: Update from current glibc version.
-
-1997-09-06 02:10 Ulrich Drepper <drepper@cygnus.com>
-
- * intlh.inst.in: Reformat copyright.
-
-1997-08-19 15:22 Ulrich Drepper <drepper@cygnus.com>
-
- * dcgettext.c (DCGETTEXT): Remove wrong comment.
-
-1997-08-16 00:13 Ulrich Drepper <drepper@cygnus.com>
-
- * Makefile.in (install-data): Don't change directory to install.
-
-1997-08-01 14:30 Ulrich Drepper <drepper@cygnus.com>
-
- * cat-compat.c: Fix copyright.
-
- * localealias.c: Don't define strchr unless !HAVE_STRCHR.
-
- * loadmsgcat.c: Update copyright. Fix typos.
-
- * l10nflist.c: Don't define strchr unless !HAVE_STRCHR.
- (_nl_make_l10nflist): Handle sponsor and revision correctly.
-
- * gettext.c: Update copyright.
- * gettext.h: Likewise.
- * hash-string.h: Likewise.
-
- * finddomain.c: Remoave dead code. Define strchr only if
- !HAVE_STRCHR.
-
- * explodename.c: Include <sys/types.h>.
-
- * explodename.c: Reformat copyright text.
- (_nl_explode_name): Fix typo.
-
- * dcgettext.c: Define and use __set_errno.
- (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is
- not defined.
-
- * bindtextdom.c: Pretty printing.
-
-1997-05-01 02:25 Ulrich Drepper <drepper@cygnus.com>
-
- * dcgettext.c (guess_category_value): Don't depend on
- HAVE_LC_MESSAGES. We don't need the macro here.
- Patch by Bruno Haible <haible@ilog.fr>.
-
- * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL
- macro. Instead use HAVE_LOCALE_NULL and define it when using
- glibc, as in dcgettext.c.
- Patch by Bruno Haible <haible@ilog.fr>.
-
- * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois
- Pinard.
-
-Mon Mar 10 06:51:17 1997 Ulrich Drepper <drepper@cygnus.com>
-
- * Makefile.in: Implement handling of libtool.
-
- * gettextP.h: Change data structures for use of generic lowlevel
- i18n file handling.
-
-Wed Dec 4 20:21:18 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * textdomain.c: Put parentheses around arguments of memcpy macro
- definition.
- * localealias.c: Likewise.
- * l10nflist.c: Likewise.
- * finddomain.c: Likewise.
- * bindtextdom.c: Likewise.
- Reported by Thomas Esken.
-
-Mon Nov 25 22:57:51 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * textdomain.c: Move definition of `memcpy` macro to right
- position.
-
-Fri Nov 22 04:01:58 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using
- bcopy if not already defined. Reported by Thomas Esken.
- * bindtextdom.c: Likewise.
- * l10nflist.c: Likewise.
- * localealias.c: Likewise.
- * textdomain.c: Likewise.
-
-Tue Oct 29 11:10:27 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * Makefile.in (libdir): Change to use exec_prefix instead of
- prefix. Reported by Knut-HåvardAksnes <etokna@eto.ericsson.se>.
-
-Sat Aug 31 03:07:09 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * l10nflist.c (_nl_normalize_codeset): We convert to lower case,
- so don't prepend uppercase `ISO' for only numeric arg.
-
-Fri Jul 19 00:15:46 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after
- definition of _GNU_SOURCE. Patch by Roland McGrath.
-
- * Makefile.in (uninstall): Fix another bug with `for' loop and
- empty arguments. Patch by Jim Meyering. Correct name os
- uninstalled files: no intl- prefix anymore.
-
- * Makefile.in (install-data): Again work around shells which
- cannot handle mpty for list. Reported by Jim Meyering.
-
-Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * Makefile.in (install): Split goal. Now depend on install-exec
- and install-data.
- (install-exec, install-data): New goals. Created from former
- install goal.
- Reported by Karl Berry.
-
-Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * Makefile.in (MKINSTALLDIRS): New variable. Path to
- mkinstalldirs script.
- (install): use MKINSTALLDIRS variable or if the script is not present
- try to find it in the $top_scrdir).
-
-Wed Jun 19 02:56:56 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * l10nflist.c: Linux libc *partly* includes the argz_* functions.
- Grr. Work around by renaming the static version and use macros
- for renaming.
-
-Tue Jun 18 20:11:17 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * l10nflist.c: Correct presence test macros of __argz_* functions.
-
- * l10nflist.c: Include <argz.h> based on test of it instead when
- __argz_* functions are available.
- Reported by Andreas Schwab.
-
-Thu Jun 13 15:17:44 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * explodename.c, l10nflist.c: Define NULL for dumb systems.
-
-Tue Jun 11 17:05:13 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * intlh.inst.in, libgettext.h (dcgettext): Rename local variable
- result to __result to prevent name clash.
-
- * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to
- get prototype for stpcpy and strcasecmp.
-
- * intlh.inst.in, libgettext.h: Move declaration of
- `_nl_msg_cat_cntr' outside __extension__ block to prevent warning
- from gcc's -Wnested-extern option.
-
-Fri Jun 7 01:58:00 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * Makefile.in (install): Remove comment.
-
-Thu Jun 6 17:28:17 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * Makefile.in (install): Work around for another Buglix stupidity.
- Always use an `else' close for `if's. Reported by Nelson Beebe.
-
- * Makefile.in (intlh.inst): Correct typo in phony rule.
- Reported by Nelson Beebe.
-
-Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * dcgettext.c (read_alias_file): Rename variable alloca_list to
- block_list as the macro calls assume.
- Patch by Eric Backus.
-
- * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using
- malloc.
- (read_alias_file): Rename varriabe alloca_list to block_list as the
- macro calls assume.
- Patch by Eric Backus.
-
- * l10nflist.c: Correct conditional for <argz.h> inclusion.
- Reported by Roland McGrath.
-
- * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not
- all-@USE_NLS@.
-
- * Makefile.in (install): intlh.inst comes from local dir, not
- $(srcdir).
-
- * Makefile.in (intlh.inst): Special handling of this goal. If
- used in gettext, this is really a rul to construct this file. If
- used in any other package it is defined as a .PHONY rule with
- empty body.
-
- * finddomain.c: Extract locale file information handling into
- l10nfile.c. Rename local stpcpy__ function to stpcpy.
-
- * dcgettext.c (stpcpy): Add local definition.
-
- * l10nflist.c: Solve some portability problems. Patches partly by
- Thomas Esken. Add local definition of stpcpy.
-
-Tue Jun 4 02:47:49 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * intlh.inst.in: Don't depend including <locale.h> on
- HAVE_LOCALE_H. Instead configure must rewrite this fiile
- depending on the result of the configure run.
-
- * Makefile.in (install): libintl.inst is now called intlh.inst.
- Add rules for updating intlh.inst from intlh.inst.in.
-
- * libintl.inst: Renamed to intlh.inst.in.
-
- * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1
- because gcc has __buitlin_alloca.
- Reported by Roland McGrath.
-
-Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * Makefile.in (installcheck): New goal to fulfill needs of
- automake's distcheck.
-
- * Makefile.in (install): Reorder commands so that VERSION is
- found.
-
- * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in
- @datadir@/gettext.
- (COMSRCS): Add l10nfile.c.
- (OBJECTS): Add l10nfile.o.
- (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common).
- (DISTFILE.gettext): Remove $(DISTFILES.common).
- (all-gettext): Remove goal.
- (install): If $(PACKAGE) = gettext install, otherwose do nothing. No
- package but gettext itself should install libintl.h + headers.
- (dist): Extend goal to work for gettext, too.
- (dist-gettext): Remove goal.
-
- * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc.
-
-Sun Jun 2 17:33:06 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * loadmsgcat.c (_nl_load_domain): Parameter is now comes from
- find_l10nfile.
-
-Sat Jun 1 02:23:03 1996 Ulrich Drepper <drepper@cygnus.com>
-
- * l10nflist.c (__argz_next): Add definition.
-
- * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca
- code. Use new l10nfile handling.
-
- * localealias.c [!HAVE_ALLOCA]: Add code for handling missing
- alloca code.
-
- * l10nflist.c: Initial revision.
-
-Tue Apr 2 18:51:18 1996 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (all-gettext): New goal. Same as all-yes.
-
-Thu Mar 28 23:01:22 1996 Karl Eichwalder <ke@ke.central.de>
-
- * Makefile.in (gettextsrcdir): Define using @datadir@.
-
-Tue Mar 26 12:39:14 1996 Ulrich Drepper <drepper@myware>
-
- * finddomain.c: Include <ctype.h>. Reported by Roland McGrath.
-
-Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware>
-
- * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing
- with external declaration.
-
-Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (all-no): Rename from all_no.
-
-Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware>
-
- * gettextP.h [loaded_domain]: Array `successor' must now contain up
- to 63 elements (because of codeset name normalization).
-
- * finddomain.c: Implement codeset name normalization.
-
-Thu Feb 15 04:39:09 1996 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (all): Define to `all-@USE_NLS@'.
- (all-yes, all_no): New goals. `all-no' is noop, `all-yes'
- is former all.
-
-Mon Jan 15 21:46:01 1996 Howard Gayle <howard@hal.com>
-
- * localealias.c (alias_compare): Increment string pointers in loop
- of strcasecmp replacement.
-
-Fri Dec 29 21:16:34 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (install-src): Who commented this goal out ? :-)
-
-Fri Dec 29 15:08:16 1995 Ulrich Drepper <drepper@myware>
-
- * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls
- should not effect it because a missing catalog is no error.
- Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>.
-
-Tue Dec 19 22:09:13 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (Makefile): Explicitly use $(SHELL) for running
- shell scripts.
-
-Fri Dec 15 17:34:59 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-
- * Makefile.in (install-src): Only install library and header when
- we use the own implementation. Don't do it when using the
- system's gettext or catgets functions.
-
- * dcgettext.c (find_msg): Must not swap domain->hash_size here.
-
-Sat Dec 9 16:24:37 1995 Ulrich Drepper <drepper@myware>
-
- * localealias.c, libintl.inst, libgettext.h, hash-string.h,
- gettextP.h, finddomain.c, dcgettext.c, cat-compat.c:
- Use PARAMS instead of __P. Suggested by Roland McGrath.
-
-Tue Dec 5 11:39:14 1995 Larry Schwimmer <rosebud@cyclone.stanford.edu>
-
- * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if
- !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty.
-
-Mon Dec 4 15:42:07 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (install-src):
- Install libintl.inst instead of libintl.h.install.
-
-Sat Dec 2 22:51:38 1995 Marcus Daniels <marcus@sysc.pdx.edu>
-
- * cat-compat.c (textdomain):
- Reverse order in which files are tried you load. First
- try local file, when this failed absolute path.
-
-Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe <beebe@math.utah.edu>
-
- * cat-compat.c (bindtextdomain): Add missing { }.
-
-Sun Nov 26 18:21:41 1995 Ulrich Drepper <drepper@myware>
-
- * libintl.inst: Add missing __P definition. Reported by Nelson Beebe.
-
- * Makefile.in:
- Add dummy `all' and `dvi' goals. Reported by Tom Tromey.
-
-Sat Nov 25 16:12:01 1995 Franc,ois Pinard <pinard@iro.umontreal.ca>
-
- * hash-string.h: Capitalize arguments of macros.
-
-Sat Nov 25 12:01:36 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (DISTFILES): Prevent files names longer than 13
- characters. libintl.h.glibc->libintl.glibc,
- libintl.h.install->libintl.inst. Reported by Joshua R. Poulson.
-
-Sat Nov 25 11:31:12 1995 Eric Backus <ericb@lsid.hp.com>
-
- * dcgettext.c: Fix bug in preprocessor conditionals.
-
-Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe <beebe@math.utah.edu>
-
- * libgettext.h: Solaris cc does not understand
- #if !SYMBOL1 && !SYMBOL2. Sad but true.
-
-Thu Nov 23 16:22:14 1995 Ulrich Drepper <drepper@myware>
-
- * hash-string.h (hash_string):
- Fix for machine with >32 bit `unsigned long's.
-
- * dcgettext.c (DCGETTEXT):
- Fix horrible bug in loop for alternative translation.
-
-Thu Nov 23 01:45:29 1995 Ulrich Drepper <drepper@myware>
-
- * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed:
- Some further simplifications in message number generation.
-
-Mon Nov 20 21:08:43 1995 Ulrich Drepper <drepper@myware>
-
- * libintl.h.glibc: Use __const instead of const in prototypes.
-
- * Makefile.in (install-src):
- Install libintl.h.install instead of libintl.h. This
- is a stripped-down version. Suggested by Peter Miller.
-
- * libintl.h.install, libintl.h.glibc: Initial revision.
-
- * localealias.c (_nl_expand_alias, read_alias_file):
- Protect prototypes in type casts by __P.
-
-Tue Nov 14 16:43:58 1995 Ulrich Drepper <drepper@myware>
-
- * hash-string.h: Correct prototype for hash_string.
-
-Sun Nov 12 12:42:30 1995 Ulrich Drepper <drepper@myware>
-
- * hash-string.h (hash_string): Add prototype.
-
- * gettextP.h: Fix copyright.
- (SWAP): Add prototype.
-
-Wed Nov 8 22:56:33 1995 Ulrich Drepper <drepper@myware>
-
- * localealias.c (read_alias_file): Forgot sizeof.
- Avoid calling *printf function. This introduces a big overhead.
- Patch by Roland McGrath.
-
-Tue Nov 7 14:21:08 1995 Ulrich Drepper <drepper@myware>
-
- * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy.
-
- * finddomain.c (stpcpy):
- Define substitution function local. The macro was to flaky.
-
- * cat-compat.c: Fix typo.
-
- * xopen-msg.sed, linux-msg.sed:
- While bringing message number to right place only accept digits.
-
- * linux-msg.sed, xopen-msg.sed: Now that the counter does not have
- leading 0s we don't need to remove them. Reported by Marcus
- Daniels.
-
- * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in
- dependency. Reported by Marcus Daniels.
-
- * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement.
- Generally cleanup using #if instead of #ifndef.
-
- * Makefile.in: Correct typos in comment. By Franc,ois Pinard.
-
-Mon Nov 6 00:27:02 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (install-src): Don't install libintl.h and libintl.a
- if we use an available gettext implementation.
-
-Sun Nov 5 22:02:08 1995 Ulrich Drepper <drepper@myware>
-
- * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported
- by Franc,ois Pinard.
-
- * libgettext.h: Use #if instead of #ifdef/#ifndef.
-
- * finddomain.c:
- Comments describing what has to be done should start with FIXME.
-
-Sun Nov 5 19:38:01 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning.
- DISTFILES.common names the files common to both dist goals.
- DISTFILES.gettext are the files only distributed in GNU gettext.
-
-Sun Nov 5 17:32:54 1995 Ulrich Drepper <drepper@myware>
-
- * dcgettext.c (DCGETTEXT): Correct searching in derived locales.
- This was necessary since a change in _nl_find_msg several weeks
- ago. I really don't know this is still not fixed.
-
-Sun Nov 5 12:43:12 1995 Ulrich Drepper <drepper@myware>
-
- * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This
- might mark a special condition.
-
- * finddomain.c (make_entry_rec): Don't make illegal entry as decided.
-
- * Makefile.in (dist): Suppress error message when ln failed.
- Get files from $(srcdir) explicitly.
-
- * libgettext.h (gettext_const): Rename to gettext_noop.
-
-Fri Nov 3 07:36:50 1995 Ulrich Drepper <drepper@myware>
-
- * finddomain.c (make_entry_rec):
- Protect against wrong locale names by testing mask.
-
- * libgettext.h (gettext_const): Add macro definition.
- Capitalize macro arguments.
-
-Thu Nov 2 23:15:51 1995 Ulrich Drepper <drepper@myware>
-
- * finddomain.c (_nl_find_domain):
- Test for pointer != NULL before accessing value.
- Reported by Tom Tromey.
-
- * gettext.c (NULL):
- Define as (void*)0 instad of 0. Reported by Franc,ois Pinard.
-
-Mon Oct 30 21:28:52 1995 Ulrich Drepper <drepper@myware>
-
- * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering.
-
-Sat Oct 28 23:20:47 1995 Ulrich Drepper <drepper@myware>
-
- * libgettext.h: Disable dcgettext optimization for Solaris 2.3.
-
- * localealias.c (alias_compare):
- Peter Miller reported that tolower in some systems is
- even dumber than I thought. Protect call by `isupper'.
-
-Fri Oct 27 22:22:51 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (libdir, includedir): New variables.
- (install-src): Install libintl.a and libintl.h in correct dirs.
-
-Fri Oct 27 22:07:29 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c.
-
- * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques.
-
- * localealias.c:
- Fix typo and superflous test. Reported by Christian von Roques.
-
-Fri Oct 6 11:52:05 1995 Ulrich Drepper <drepper@myware>
-
- * finddomain.c (_nl_find_domain):
- Correct some remainder from the pre-CEN syntax. Now
- we don't have a constant number of successors anymore.
-
-Wed Sep 27 21:41:13 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (DISTFILES): Add libintl.h.glibc.
-
- * Makefile.in (dist-libc): Add goal for packing sources for glibc.
- (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc.
-
- * loadmsgcat.c: Forget to continue #if line.
-
- * localealias.c:
- [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name
- space clean.
-
- * dcgettext.c, finddomain.c: Better comment to last change.
-
- * loadmsgcat.c:
- [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to
- __fstat, __open, __close, __read, __mmap, and __munmap resp
- to keep ANSI C name space clean.
-
- * finddomain.c:
- [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean.
-
- * dcgettext.c:
- [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to
- keep ANSI C name space clean.
-
- * libgettext.h:
- Include sys/types.h for those old SysV systems out there.
- Reported by Francesco Potorti`.
-
- * loadmsgcat.c (use_mmap): Define if compiled for glibc.
-
- * bindtextdom.c: Include all those standard headers
- unconditionally if _LIBC is defined.
-
- * finddomain.c: Fix 2 times defiend -> defined.
-
- * textdomain.c: Include libintl.h instead of libgettext.h when
- compiling for glibc. Include all those standard headers
- unconditionally if _LIBC is defined.
-
- * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc.
-
- * gettext.c:
- Include libintl.h instead of libgettext.h when compiling for glibc.
- Get NULL from stddef.h if we compile for glibc.
-
- * finddomain.c: Include libintl.h instead of libgettext.h when
- compiling for glibc. Include all those standard headers
- unconditionally if _LIBC is defined.
-
- * dcgettext.c: Include all those standard headers unconditionally
- if _LIBC is defined.
-
- * dgettext.c: If compiled in glibc include libintl.h instead of
- libgettext.h.
- (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc.
-
- * dcgettext.c: If compiled in glibc include libintl.h instead of
- libgettext.h.
- (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc.
-
- * bindtextdom.c:
- If compiled in glibc include libintl.h instead of libgettext.h.
-
-Mon Sep 25 22:23:06 1995 Ulrich Drepper <drepper@myware>
-
- * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0.
- Reported by Marcus Daniels.
-
- * cat-compat.c (bindtextdomain):
- String used in putenv must not be recycled.
- Reported by Marcus Daniels.
-
- * libgettext.h (__USE_GNU_GETTEXT):
- Additional symbol to signal that we use GNU gettext
- library.
-
- * cat-compat.c (bindtextdomain):
- Fix bug with the strange stpcpy replacement.
- Reported by Nelson Beebe.
-
-Sat Sep 23 08:23:51 1995 Ulrich Drepper <drepper@myware>
-
- * cat-compat.c: Include <string.h> for stpcpy prototype.
-
- * localealias.c (read_alias_file):
- While expand strdup code temporary variable `cp' hided
- higher level variable with same name. Rename to `tp'.
-
- * textdomain.c (textdomain):
- Avoid warning by using temporary variable in strdup code.
-
- * finddomain.c (_nl_find_domain): Remove unused variable `application'.
-
-Thu Sep 21 15:51:44 1995 Ulrich Drepper <drepper@myware>
-
- * localealias.c (alias_compare):
- Use strcasecmp() only if available. Else use
- implementation in place.
-
- * intl-compat.c:
- Wrapper functions now call *__ functions instead of __*.
-
- * libgettext.h: Declare prototypes for *__ functions instead for __*.
-
- * cat-compat.c, loadmsgcat.c:
- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
- of the standard libc and so prevent libintl.a from being used
- standalone.
-
- * bindtextdom.c:
- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
- of the standard libc and so prevent libintl.a from being used
- standalone.
- Rename to bindtextdomain__ if not used in GNU C Library.
-
- * dgettext.c:
- Rename function to dgettext__ if not used in GNU C Library.
-
- * gettext.c:
- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
- of the standard libc and so prevent libintl.a from being used
- standalone.
- Functions now called gettext__ if not used in GNU C Library.
-
- * dcgettext.c, localealias.c, textdomain.c, finddomain.c:
- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
- of the standard libc and so prevent libintl.a from being used
- standalone.
-
-Sun Sep 17 23:14:49 1995 Ulrich Drepper <drepper@myware>
-
- * finddomain.c: Correct some bugs in handling of CEN standard
- locale definitions.
-
-Thu Sep 7 01:49:28 1995 Ulrich Drepper <drepper@myware>
-
- * finddomain.c: Implement CEN syntax.
-
- * gettextP.h (loaded_domain): Extend number of successors to 31.
-
-Sat Aug 19 19:25:29 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (aliaspath): Remove path to X11 locale dir.
-
- * Makefile.in: Make install-src depend on install. This helps
- gettext to install the sources and other packages can use the
- install goal.
-
-Sat Aug 19 15:19:33 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (uninstall): Remove stuff installed by install-src.
-
-Tue Aug 15 13:13:53 1995 Ulrich Drepper <drepper@myware>
-
- * VERSION.in: Initial revision.
-
- * Makefile.in (DISTFILES):
- Add VERSION file. This is not necessary for gettext, but
- for other packages using this library.
-
-Tue Aug 15 06:16:44 1995 Ulrich Drepper <drepper@myware>
-
- * gettextP.h (_nl_find_domain):
- New prototype after changing search strategy.
-
- * finddomain.c (_nl_find_domain):
- We now try only to find a specified catalog. Fall back to other
- catalogs listed in the locale list is now done in __dcgettext.
-
- * dcgettext.c (__dcgettext):
- Now we provide message fall back even to different languages.
- I.e. if a message is not available in one language all the other
- in the locale list a tried. Formerly fall back was only possible
- within one language. Implemented by moving one loop from
- _nl_find_domain to here.
-
-Mon Aug 14 23:45:50 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (gettextsrcdir):
- Directory where source of GNU gettext library are made
- available.
- (INSTALL, INSTALL_DATA): Programs used for installing sources.
- (gettext-src): New. Rule to install GNU gettext sources for use in
- gettextize shell script.
-
-Sun Aug 13 14:40:48 1995 Ulrich Drepper <drepper@myware>
-
- * loadmsgcat.c (_nl_load_domain):
- Use mmap for loading only when munmap function is
- also available.
-
- * Makefile.in (install): Depend on `all' goal.
-
-Wed Aug 9 11:04:33 1995 Ulrich Drepper <drepper@myware>
-
- * localealias.c (read_alias_file):
- Do not overwrite '\n' when terminating alias value string.
-
- * localealias.c (read_alias_file):
- Handle long lines. Ignore the rest not fitting in
- the buffer after the initial `fgets' call.
-
-Wed Aug 9 00:54:29 1995 Ulrich Drepper <drepper@myware>
-
- * gettextP.h (_nl_load_domain):
- Add prototype, replacing prototype for _nl_load_msg_cat.
-
- * finddomain.c (_nl_find_domain):
- Remove unneeded variable filename and filename_len.
- (expand_alias): Remove prototype because functions does not
- exist anymore.
-
- * localealias.c (read_alias_file):
- Change type of fname_len parameter to int.
- (xmalloc): Add prototype.
-
- * loadmsgcat.c: Better prototypes for xmalloc.
-
-Tue Aug 8 22:30:39 1995 Ulrich Drepper <drepper@myware>
-
- * finddomain.c (_nl_find_domain):
- Allow alias name to be constructed from the four components.
-
- * Makefile.in (aliaspath): New variable. Set to preliminary value.
- (SOURCES): Add localealias.c.
- (OBJECTS): Add localealias.o.
-
- * gettextP.h: Add prototype for _nl_expand_alias.
-
- * finddomain.c: Aliasing handled in intl/localealias.c.
-
- * localealias.c: Aliasing for locale names.
-
- * bindtextdom.c: Better prototypes for xmalloc and xstrdup.
-
-Mon Aug 7 23:47:42 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (DISTFILES): gettext.perl is now found in misc/.
-
- * cat-compat.c (bindtextdomain):
- Correct implementation. dirname parameter was not used.
- Reported by Marcus Daniels.
-
- * gettextP.h (loaded_domain):
- New fields `successor' and `decided' for oo, lazy
- message handling implementation.
-
- * dcgettext.c:
- Adopt for oo, lazy message handliing.
- Now we can inherit translations from less specific locales.
- (find_msg): New function.
-
- * loadmsgcat.c, finddomain.c:
- Complete rewrite. Implement oo, lazy message handling :-).
- We now have an additional environment variable `LANGUAGE' with
- a higher priority than LC_ALL for the LC_MESSAGE locale.
- Here we can set a colon separated list of specifications each
- of the form `language[_territory[.codeset]][@modifier]'.
-
-Sat Aug 5 09:55:42 1995 Ulrich Drepper <drepper@myware>
-
- * finddomain.c (unistd.h):
- Include to get _PC_PATH_MAX defined on system having it.
-
-Fri Aug 4 22:42:00 1995 Ulrich Drepper <drepper@myware>
-
- * finddomain.c (stpcpy): Include prototype.
-
- * Makefile.in (dist): Remove `copying instead' message.
-
-Wed Aug 2 18:52:03 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (ID, TAGS): Do not use $^.
-
-Tue Aug 1 20:07:11 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (TAGS, ID): Use $^ as command argument.
- (TAGS): Give etags -o option t write to current directory,
- not $(srcdir).
- (ID): Use $(srcdir) instead os $(top_srcdir)/src.
- (distclean): Remove ID.
-
-Sun Jul 30 11:51:46 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (gnulocaledir):
- New variable, always using share/ for data directory.
- (DEFS): Add GNULOCALEDIR, used in finddomain.c.
-
- * finddomain.c (_nl_default_dirname):
- Set to GNULOCALEDIR, because it always has to point
- to the directory where GNU gettext Library writes it to.
-
- * intl-compat.c (textdomain, bindtextdomain):
- Undefine macros before function definition.
-
-Sat Jul 22 01:10:02 1995 Ulrich Drepper <drepper@myware>
-
- * libgettext.h (_LIBINTL_H):
- Protect definition in case where this file is included as
- libgettext.h on Solaris machines. Add comment about this.
-
-Wed Jul 19 02:36:42 1995 Ulrich Drepper <drepper@myware>
-
- * intl-compat.c (textdomain): Correct typo.
-
-Wed Jul 19 01:51:35 1995 Ulrich Drepper <drepper@myware>
-
- * dcgettext.c (dcgettext): Function now called __dcgettext.
-
- * dgettext.c (dgettext): Now called __dgettext and calls
- __dcgettext.
-
- * gettext.c (gettext):
- Function now called __gettext and calls __dgettext.
-
- * textdomain.c (textdomain): Function now called __textdomain.
-
- * bindtextdom.c (bindtextdomain): Function now called
- __bindtextdomain.
-
- * intl-compat.c: Initial revision.
-
- * Makefile.in (SOURCES): Add intl-compat.c.
- (OBJECTS): We always compile the GNU gettext library functions.
- OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o,
- and intl-compat.o.
- (GETTOBJS): Contains now only intl-compat.o.
-
- * libgettext.h:
- Re-include protection matches dualistic character of libgettext.h.
- For all functions in GNU gettext library define __ counter part.
-
- * finddomain.c (strchr): Define as index if not found in C library.
- (_nl_find_domain): For relative paths paste / in between.
-
-Tue Jul 18 16:37:45 1995 Ulrich Drepper <drepper@myware>
-
- * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h.
-
- * xopen-msg.sed: Fix bug with `msgstr ""' lines.
- A little bit better comments.
-
-Tue Jul 18 01:18:27 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in:
- po-mode.el, makelinks, combine-sh are now found in ../misc.
-
- * po-mode.el, makelinks, combine-sh, elisp-comp:
- Moved to ../misc/.
-
- * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__.
-
-Sun Jul 16 22:33:02 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (INSTALL, INSTALL_DATA): New variables.
- (install-data, uninstall): Install/uninstall .elc file.
-
- * po-mode.el (Installation comment):
- Add .pox as possible extension of .po files.
-
-Sun Jul 16 13:23:27 1995 Ulrich Drepper <drepper@myware>
-
- * elisp-comp: Complete new version by Franc,ois: This does not
- fail when not compiling in the source directory.
-
-Sun Jul 16 00:12:17 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (../po/cat-id-tbl.o):
- Use $(MAKE) instead of make for recursive make.
-
- * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh.
- (install-exec): Add missing dummy goal.
- (install-data, uninstall): @ in multi-line shell command at
- beginning, not in front of echo. Reported by Eric Backus.
-
-Sat Jul 15 00:21:28 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (DISTFILES):
- Rename libgettext.perl to gettext.perl to fit in 14 chars
- file systems.
-
- * gettext.perl:
- Rename to gettext.perl to fit in 14 chars file systems.
-
-Thu Jul 13 23:17:20 1995 Ulrich Drepper <drepper@myware>
-
- * cat-compat.c: If !STDC_HEADERS try to include malloc.h.
-
-Thu Jul 13 20:55:02 1995 Ulrich Drepper <drepper@myware>
-
- * po2tbl.sed.in: Pretty printing.
-
- * linux-msg.sed, xopen-msg.sed:
- Correct bugs with handling substitute flags in branches.
-
- * hash-string.h (hash_string):
- Old K&R compilers don't under stand `unsigned char'.
-
- * gettext.h (nls_uint32):
- Some old K&R compilers (eg HP) don't understand `unsigned int'.
-
- * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes.
-
-Thu Jul 13 01:34:33 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (ELCFILES): New variable.
- (DISTFILES): Add elisp-comp.
- Add implicit rule for .el -> .elc compilation.
- (install-data): install $ELCFILES
- (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp.
-
- * elisp-comp: Initial revision
-
-Wed Jul 12 16:14:52 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in:
- cat-id-tbl.c is now found in po/. This enables us to use an identical
- intl/ directory in all packages.
-
- * dcgettext.c (dcgettext): hashing does not work for table size <= 2.
-
- * textdomain.c: fix typo (#if def -> #if defined)
-
-Tue Jul 11 18:44:43 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in (stamp-cat-id): use top_srcdir to address source files
- (DISTFILES,distclean): move tupdate.perl to src/
-
- * po-to-tbl.sed.in:
- add additional jump to clear change flag to recognize multiline strings
-
-Tue Jul 11 01:32:50 1995 Ulrich Drepper <drepper@myware>
-
- * textdomain.c: Protect inclusion of stdlib.h and string.h.
-
- * loadmsgcat.c: Protect inclusion of stdlib.h.
-
- * libgettext.h: Protect inclusion of locale.h.
- Allow use in C++ programs.
- Define NULL is not happened already.
-
- * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of
- po-to-tbl.sed.
- (distclean): remove po-to-tbl.sed and tupdate.perl.
-
- * tupdate.perl.in: Substitute Perl path even in exec line.
- Don't include entries without translation from old .po file.
-
-Tue Jul 4 00:41:51 1995 Ulrich Drepper <drepper@myware>
-
- * tupdate.perl.in: use "Updated: " in msgid "".
-
- * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR).
- Define getenv if !__STDC__.
-
- * bindtextdom.c: Protect stdlib.h and string.h inclusion.
- Define free if !__STDC__.
-
- * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
- Define free if !__STDC__.
-
- * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
-
-Mon Jul 3 23:56:30 1995 Ulrich Drepper <drepper@myware>
-
- * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR.
- Remove unneeded $(srcdir) from Makefile.in dependency.
-
- * makelinks: Add copyright and short description.
-
- * po-mode.el: Last version for 0.7.
-
- * tupdate.perl.in: Fix die message.
-
- * dcgettext.c: Protect include of string.h.
-
- * gettext.c: Protect include of stdlib.h and further tries to get NULL.
-
- * finddomain.c: Some corrections in includes.
-
- * Makefile.in (INCLUDES): Prune list correct path to Makefile.in.
-
- * po-to-tbl.sed: Adopt for new .po file format.
-
- * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format.
-
-Sun Jul 2 23:55:03 1995 Ulrich Drepper <drepper@myware>
-
- * tupdate.perl.in: Complete rewrite for new .po file format.
-
-Sun Jul 2 02:06:50 1995 Ulrich Drepper <drepper@myware>
-
- * First official release. This directory contains all the code
- needed to internationalize own packages. It provides functions
- which allow to use the X/Open catgets function with an interface
- like the Uniforum gettext function. For system which does not
- have neither of those a complete implementation is provided.
# Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# 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
+# by the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.
PACKAGE = @PACKAGE@
VERSION = @VERSION@
prefix = @prefix@
exec_prefix = @exec_prefix@
transform = @program_transform_name@
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
-datadir = $(prefix)/@DATADIRNAME@
+libdir = @libdir@
+includedir = @includedir@
+datadir = @datadir@
localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = @datadir@/gettext/intl
-aliaspath = $(localedir):.
+gettextsrcdir = $(datadir)/gettext/intl
+aliaspath = $(localedir)
subdir = intl
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-l = @l@
+l = @INTL_LIBTOOL_SUFFIX_PREFIX@
AR = ar
CC = @CC@
LIBTOOL = @LIBTOOL@
RANLIB = @RANLIB@
+YACC = @INTLBISON@ -y -d
+YFLAGS = --name-prefix=__gettext
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
--DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-HEADERS = $(COMHDRS) libgettext.h loadinfo.h
-COMHDRS = gettext.h gettextP.h hash-string.h
-SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
+HEADERS = $(COMHDRS) libgnuintl.h loadinfo.h
+COMHDRS = gmo.h gettextP.h hash-string.h plural-exp.h eval-plural.h os2compat.h
+SOURCES = $(COMSRCS) intl-compat.c
COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c
+explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
+plural-exp.c localcharset.c localename.c osdep.c os2compat.c
OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo
-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
+explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \
+plural.$lo plural-exp.$lo localcharset.$lo localename.$lo osdep.$lo
GETTOBJS = intl-compat.$lo
-DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
-xopen-msg.sed $(HEADERS) $(SOURCES)
+DISTFILES.common = Makefile.in \
+config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
+DISTFILES.generated = plural.c
DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc intlh.inst.in
+DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc
+DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
+COPYING.LIB-2 gettext.h libgettext.h plural-eval.c
+
+# Libtool's library version information for libintl.
+# Before making a gettext release, the gettext maintainer must change this
+# according to the libtool documentation, section "Library interface versions".
+# Maintainers of other packages that include the intl directory must *not*
+# change these values.
+LTV_CURRENT=4
+LTV_REVISION=0
+LTV_AGE=2
.SUFFIXES:
-.SUFFIXES: .c .o .lo
+.SUFFIXES: .c .y .o .lo .sin .sed
.c.o:
$(COMPILE) $<
.c.lo:
$(LIBTOOL) --mode=compile $(COMPILE) $<
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
+.y.c:
+ $(YACC) $(YFLAGS) --output $@ $<
+ rm -f $*.h
-all: all-@USE_INCLUDED_LIBINTL@
+.sin.sed:
+ sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
+ mv t-$@ $@
+
+INCLUDES = -I.. -I. -I$(top_srcdir)/intl
-all-yes: libintl.$la intlh.inst
-all-no:
+all: all-@USE_INCLUDED_LIBINTL@
+all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
+all-no: all-no-@BUILD_INCLUDED_LIBINTL@
+all-no-yes: libgnuintl.$la
+all-no-no:
-libintl.a: $(OBJECTS)
+libintl.a libgnuintl.a: $(OBJECTS)
rm -f $@
$(AR) cru $@ $(OBJECTS)
$(RANLIB) $@
-libintl.la: $(OBJECTS)
- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
- -version-info 1:0 -rpath $(libdir)
+libintl.la libgnuintl.la: $(OBJECTS)
+ $(LIBTOOL) --mode=link \
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
+ $(OBJECTS) @LTLIBICONV@ -lc \
+ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
+ -rpath $(libdir) \
+ -no-undefined
+
+libintl.h: libgnuintl.h
+ cp $(srcdir)/libgnuintl.h libintl.h
-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
- cd ../po && $(MAKE) cat-id-tbl.$lo
+charset.alias: config.charset
+ $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+ mv t-$@ $@
check: all
# only use the library should use install instead.
# We must not install the libintl.h/libintl.a files if we are on a
-# system which has the gettext() function in its C library or in a
-# separate library or use the catgets interface. A special case is
-# where configure found a previously installed GNU gettext library.
+# system which has the GNU gettext() function in its C library or in a
+# separate library.
# If you want to use the one which comes with this version of the
# package, you have to use `configure --with-included-gettext'.
install: install-exec install-data
install-exec: all
if test "$(PACKAGE)" = "gettext" \
&& test '@INTLOBJS@' = '$(GETTOBJS)'; then \
- if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(libdir) $(includedir); \
+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+ $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
+ $(LIBTOOL) --mode=install \
+ $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+ else \
+ : ; \
+ fi
+ if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+ test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+ dest=$(DESTDIR)$(libdir)/charset.alias; \
+ if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+ orig=$(DESTDIR)$(libdir)/charset.alias; \
+ sed -f ref-add.sed $$orig > $$temp; \
+ $(INSTALL_DATA) $$temp $$dest; \
+ rm -f $$temp; \
else \
- $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+ if test @GLIBC21@ = no; then \
+ orig=charset.alias; \
+ sed -f ref-add.sed $$orig > $$temp; \
+ $(INSTALL_DATA) $$temp $$dest; \
+ rm -f $$temp; \
+ fi; \
fi; \
- $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
+ $(mkinstalldirs) $(DESTDIR)$(localedir); \
+ test -f $(DESTDIR)$(localedir)/locale.alias \
+ && orig=$(DESTDIR)$(localedir)/locale.alias \
+ || orig=$(srcdir)/locale.alias; \
+ temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+ dest=$(DESTDIR)$(localedir)/locale.alias; \
+ sed -f ref-add.sed $$orig > $$temp; \
+ $(INSTALL_DATA) $$temp $$dest; \
+ rm -f $$temp; \
else \
: ; \
fi
install-data: all
if test "$(PACKAGE)" = "gettext"; then \
- if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
- else \
- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
- fi; \
- $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
- dists="$(DISTFILES.common)"; \
+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
+ $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
+ dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
+ for file in $$dists; do \
+ $(INSTALL_DATA) $(srcdir)/$$file \
+ $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
+ chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
+ dists="$(DISTFILES.generated)"; \
+ for file in $$dists; do \
+ if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ $(INSTALL_DATA) $$dir/$$file \
+ $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
+ dists="$(DISTFILES.obsolete)"; \
for file in $$dists; do \
- $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
done; \
else \
: ; \
fi
+install-strip: install
+
+installdirs:
+ if test "$(PACKAGE)" = "gettext" \
+ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+ else \
+ : ; \
+ fi
+ if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+ test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ $(mkinstalldirs) $(DESTDIR)$(localedir); \
+ else \
+ : ; \
+ fi
+ if test "$(PACKAGE)" = "gettext"; then \
+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ else \
+ : ; \
+ fi
+
# Define this as empty until I found a useful application.
installcheck:
uninstall:
- dists="$(DISTFILES.common)"; \
- for file in $$dists; do \
- rm -f $(gettextsrcdir)/$$file; \
- done
+ if test "$(PACKAGE)" = "gettext" \
+ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+ rm -f $(DESTDIR)$(includedir)/libintl.h; \
+ $(LIBTOOL) --mode=uninstall \
+ rm -f $(DESTDIR)$(libdir)/libintl.$la; \
+ else \
+ : ; \
+ fi
+ if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+ if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+ temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+ dest=$(DESTDIR)$(libdir)/charset.alias; \
+ sed -f ref-del.sed $$dest > $$temp; \
+ if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+ rm -f $$dest; \
+ else \
+ $(INSTALL_DATA) $$temp $$dest; \
+ fi; \
+ rm -f $$temp; \
+ fi; \
+ if test -f $(DESTDIR)$(localedir)/locale.alias; then \
+ temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+ dest=$(DESTDIR)$(localedir)/locale.alias; \
+ sed -f ref-del.sed $$dest > $$temp; \
+ if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+ rm -f $$dest; \
+ else \
+ $(INSTALL_DATA) $$temp $$dest; \
+ fi; \
+ rm -f $$temp; \
+ fi; \
+ else \
+ : ; \
+ fi
+ if test "$(PACKAGE)" = "gettext"; then \
+ for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
+ else \
+ : ; \
+ fi
info dvi:
-$(OBJECTS): ../config.h libgettext.h
-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
+$(OBJECTS): libgnuintl.h
+bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: gettextP.h gmo.h loadinfo.h
+dcigettext.$lo: hash-string.h
+explodename.$lo l10nflist.$lo: loadinfo.h
+dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: plural-exp.h
+dcigettext.$lo: eval-plural.h
tags: TAGS
mostlyclean:
- rm -f *.a *.o *.lo core core.*
+ rm -f *.a *.la *.o *.lo core core.*
+ rm -f libintl.h charset.alias ref-add.sed ref-del.sed
+ rm -f -r .libs _libs
clean: mostlyclean
distclean: clean
- rm -f Makefile ID TAGS po2msg.sed po2tbl.sed
+ rm -f Makefile ID TAGS
+ if test "$(PACKAGE)" = gettext; then \
+ rm -f ChangeLog.inst $(DISTFILES.normal); \
+ else \
+ : ; \
+ fi
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
# GNU gettext needs not contain the file `VERSION' but contains some
# other files which should not be distributed in other packages.
distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile $(DISTFILES)
+dist distdir: Makefile
if test "$(PACKAGE)" = gettext; then \
additional="$(DISTFILES.gettext)"; \
else \
additional="$(DISTFILES.normal)"; \
fi; \
- for file in $(DISTFILES.common) $$additional; do \
- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
- || cp -p $(srcdir)/$$file $(distdir); \
+ $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
+ for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
+ if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ cp -p $$dir/$$file $(distdir); \
done
-dist-libc:
- tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
-
Makefile: Makefile.in ../config.status
cd .. \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-# The dependency for intlh.inst is different in gettext and all other
-# packages. Because we cannot you GNU make features we have to solve
-# the problem while rewriting Makefile.in.
-@GT_YES@intlh.inst: intlh.inst.in ../config.status
-@GT_YES@ cd .. \
-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-@GT_YES@ $(SHELL) ./config.status
-@GT_NO@.PHONY: intlh.inst
-@GT_NO@intlh.inst:
-
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-GNU gettext library from gettext-0.10.35
+GNU gettext library from gettext-0.11.5
/* Implementation of the bindtextdomain(3) function
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-# include <malloc.h>
-# else
-void free ();
-# endif
-#endif
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
+#ifdef _LIBC
+# include <libintl.h>
#else
-# include <strings.h>
-# ifndef memcpy
-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
+# include "libgnuintl.h"
#endif
+#include "gettextP.h"
#ifdef _LIBC
-# include <libintl.h>
+/* We have to handle multi-threaded applications. */
+# include <bits/libc-lock.h>
#else
-# include "libgettext.h"
+/* Provide dummy implementation if this is outside glibc. */
+# define __libc_rwlock_define(CLASS, NAME)
+# define __libc_rwlock_wrlock(NAME)
+# define __libc_rwlock_unlock(NAME)
+#endif
+
+/* The internal variables in the standalone libintl.a must have different
+ names than the internal variables in GNU libc, otherwise programs
+ using libintl.a cannot be linked statically. */
+#if !defined _LIBC
+# define _nl_default_dirname libintl_nl_default_dirname
+# define _nl_domain_bindings libintl_nl_domain_bindings
+#endif
+
+/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
+#ifndef offsetof
+# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
#endif
-#include "gettext.h"
-#include "gettextP.h"
/* @@ end of prolog @@ */
/* List with bindings of specific domains. */
extern struct binding *_nl_domain_bindings;
+/* Lock variable to protect the global data in the gettext implementation. */
+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
+
/* Names for the libintl functions are a problem. They must not clash
with existing names and they should follow ANSI C. But this source
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define BINDTEXTDOMAIN __bindtextdomain
+# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
# ifndef strdup
# define strdup(str) __strdup (str)
# endif
#else
-# define BINDTEXTDOMAIN bindtextdomain__
+# define BINDTEXTDOMAIN libintl_bindtextdomain
+# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
#endif
-/* Specify that the DOMAINNAME message catalog will be found
- in DIRNAME rather than in the system locale data base. */
-char *
-BINDTEXTDOMAIN (domainname, dirname)
+/* Prototypes for local functions. */
+static void set_binding_values PARAMS ((const char *domainname,
+ const char **dirnamep,
+ const char **codesetp));
+
+/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
+ to be used for the DOMAINNAME message catalog.
+ If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
+ modified, only the current value is returned.
+ If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
+ modified nor returned. */
+static void
+set_binding_values (domainname, dirnamep, codesetp)
const char *domainname;
- const char *dirname;
+ const char **dirnamep;
+ const char **codesetp;
{
struct binding *binding;
+ int modified;
/* Some sanity checks. */
if (domainname == NULL || domainname[0] == '\0')
- return NULL;
+ {
+ if (dirnamep)
+ *dirnamep = NULL;
+ if (codesetp)
+ *codesetp = NULL;
+ return;
+ }
+
+ __libc_rwlock_wrlock (_nl_state_lock);
+
+ modified = 0;
for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
{
}
}
- if (dirname == NULL)
- /* The current binding has be to returned. */
- return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
-
if (binding != NULL)
{
- /* The domain is already bound. If the new value and the old
- one are equal we simply do nothing. Otherwise replace the
- old binding. */
- if (strcmp (dirname, binding->dirname) != 0)
+ if (dirnamep)
{
- char *new_dirname;
+ const char *dirname = *dirnamep;
- if (strcmp (dirname, _nl_default_dirname) == 0)
- new_dirname = (char *) _nl_default_dirname;
+ if (dirname == NULL)
+ /* The current binding has be to returned. */
+ *dirnamep = binding->dirname;
else
{
+ /* The domain is already bound. If the new value and the old
+ one are equal we simply do nothing. Otherwise replace the
+ old binding. */
+ char *result = binding->dirname;
+ if (strcmp (dirname, result) != 0)
+ {
+ if (strcmp (dirname, _nl_default_dirname) == 0)
+ result = (char *) _nl_default_dirname;
+ else
+ {
#if defined _LIBC || defined HAVE_STRDUP
- new_dirname = strdup (dirname);
- if (new_dirname == NULL)
- return NULL;
+ result = strdup (dirname);
#else
- size_t len = strlen (dirname) + 1;
- new_dirname = (char *) malloc (len);
- if (new_dirname == NULL)
- return NULL;
-
- memcpy (new_dirname, dirname, len);
+ size_t len = strlen (dirname) + 1;
+ result = (char *) malloc (len);
+ if (__builtin_expect (result != NULL, 1))
+ memcpy (result, dirname, len);
#endif
+ }
+
+ if (__builtin_expect (result != NULL, 1))
+ {
+ if (binding->dirname != _nl_default_dirname)
+ free (binding->dirname);
+
+ binding->dirname = result;
+ modified = 1;
+ }
+ }
+ *dirnamep = result;
}
+ }
- if (binding->dirname != _nl_default_dirname)
- free (binding->dirname);
+ if (codesetp)
+ {
+ const char *codeset = *codesetp;
- binding->dirname = new_dirname;
+ if (codeset == NULL)
+ /* The current binding has be to returned. */
+ *codesetp = binding->codeset;
+ else
+ {
+ /* The domain is already bound. If the new value and the old
+ one are equal we simply do nothing. Otherwise replace the
+ old binding. */
+ char *result = binding->codeset;
+ if (result == NULL || strcmp (codeset, result) != 0)
+ {
+#if defined _LIBC || defined HAVE_STRDUP
+ result = strdup (codeset);
+#else
+ size_t len = strlen (codeset) + 1;
+ result = (char *) malloc (len);
+ if (__builtin_expect (result != NULL, 1))
+ memcpy (result, codeset, len);
+#endif
+
+ if (__builtin_expect (result != NULL, 1))
+ {
+ if (binding->codeset != NULL)
+ free (binding->codeset);
+
+ binding->codeset = result;
+ binding->codeset_cntr++;
+ modified = 1;
+ }
+ }
+ *codesetp = result;
+ }
}
}
+ else if ((dirnamep == NULL || *dirnamep == NULL)
+ && (codesetp == NULL || *codesetp == NULL))
+ {
+ /* Simply return the default values. */
+ if (dirnamep)
+ *dirnamep = _nl_default_dirname;
+ if (codesetp)
+ *codesetp = NULL;
+ }
else
{
/* We have to create a new binding. */
-#if !defined _LIBC && !defined HAVE_STRDUP
- size_t len;
-#endif
+ size_t len = strlen (domainname) + 1;
struct binding *new_binding =
- (struct binding *) malloc (sizeof (*new_binding));
+ (struct binding *) malloc (offsetof (struct binding, domainname) + len);
+
+ if (__builtin_expect (new_binding == NULL, 0))
+ goto failed;
+
+ memcpy (new_binding->domainname, domainname, len);
- if (new_binding == NULL)
- return NULL;
+ if (dirnamep)
+ {
+ const char *dirname = *dirnamep;
+ if (dirname == NULL)
+ /* The default value. */
+ dirname = _nl_default_dirname;
+ else
+ {
+ if (strcmp (dirname, _nl_default_dirname) == 0)
+ dirname = _nl_default_dirname;
+ else
+ {
+ char *result;
#if defined _LIBC || defined HAVE_STRDUP
- new_binding->domainname = strdup (domainname);
- if (new_binding->domainname == NULL)
- return NULL;
+ result = strdup (dirname);
+ if (__builtin_expect (result == NULL, 0))
+ goto failed_dirname;
#else
- len = strlen (domainname) + 1;
- new_binding->domainname = (char *) malloc (len);
- if (new_binding->domainname == NULL)
- return NULL;
- memcpy (new_binding->domainname, domainname, len);
+ size_t len = strlen (dirname) + 1;
+ result = (char *) malloc (len);
+ if (__builtin_expect (result == NULL, 0))
+ goto failed_dirname;
+ memcpy (result, dirname, len);
#endif
-
- if (strcmp (dirname, _nl_default_dirname) == 0)
- new_binding->dirname = (char *) _nl_default_dirname;
+ dirname = result;
+ }
+ }
+ *dirnamep = dirname;
+ new_binding->dirname = (char *) dirname;
+ }
else
+ /* The default value. */
+ new_binding->dirname = (char *) _nl_default_dirname;
+
+ new_binding->codeset_cntr = 0;
+
+ if (codesetp)
{
+ const char *codeset = *codesetp;
+
+ if (codeset != NULL)
+ {
+ char *result;
+
#if defined _LIBC || defined HAVE_STRDUP
- new_binding->dirname = strdup (dirname);
- if (new_binding->dirname == NULL)
- return NULL;
+ result = strdup (codeset);
+ if (__builtin_expect (result == NULL, 0))
+ goto failed_codeset;
#else
- len = strlen (dirname) + 1;
- new_binding->dirname = (char *) malloc (len);
- if (new_binding->dirname == NULL)
- return NULL;
- memcpy (new_binding->dirname, dirname, len);
+ size_t len = strlen (codeset) + 1;
+ result = (char *) malloc (len);
+ if (__builtin_expect (result == NULL, 0))
+ goto failed_codeset;
+ memcpy (result, codeset, len);
#endif
+ codeset = result;
+ new_binding->codeset_cntr++;
+ }
+ *codesetp = codeset;
+ new_binding->codeset = (char *) codeset;
}
+ else
+ new_binding->codeset = NULL;
/* Now enqueue it. */
if (_nl_domain_bindings == NULL
binding->next = new_binding;
}
- binding = new_binding;
+ modified = 1;
+
+ /* Here we deal with memory allocation failures. */
+ if (0)
+ {
+ failed_codeset:
+ if (new_binding->dirname != _nl_default_dirname)
+ free (new_binding->dirname);
+ failed_dirname:
+ free (new_binding);
+ failed:
+ if (dirnamep)
+ *dirnamep = NULL;
+ if (codesetp)
+ *codesetp = NULL;
+ }
}
- return binding->dirname;
+ /* If we modified any binding, we flush the caches. */
+ if (modified)
+ ++_nl_msg_cat_cntr;
+
+ __libc_rwlock_unlock (_nl_state_lock);
+}
+
+/* Specify that the DOMAINNAME message catalog will be found
+ in DIRNAME rather than in the system locale data base. */
+char *
+BINDTEXTDOMAIN (domainname, dirname)
+ const char *domainname;
+ const char *dirname;
+{
+ set_binding_values (domainname, &dirname, NULL);
+ return (char *) dirname;
+}
+
+/* Specify the character encoding in which the messages from the
+ DOMAINNAME message catalog will be returned. */
+char *
+BIND_TEXTDOMAIN_CODESET (domainname, codeset)
+ const char *domainname;
+ const char *codeset;
+{
+ set_binding_values (domainname, NULL, &codeset);
+ return (char *) codeset;
}
#ifdef _LIBC
-/* Alias for function name in GNU C Library. */
+/* Aliases for function names in GNU C Library. */
weak_alias (__bindtextdomain, bindtextdomain);
+weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
#endif
+++ /dev/null
-/* Compatibility code for gettext-using-catgets interface.
- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-# include <malloc.h>
-# endif
-#endif
-
-#ifdef HAVE_NL_TYPES_H
-# include <nl_types.h>
-#endif
-
-#include "libgettext.h"
-
-/* @@ end of prolog @@ */
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
- ``Directs `setlocale()' to query `category' and return the current
- setting of `local'.''
- However it does not specify the exact format. And even worse: POSIX
- defines this not at all. So we can use this feature only on selected
- system (e.g. those using GNU C Library). */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* The catalog descriptor. */
-static nl_catd catalog = (nl_catd) -1;
-
-/* Name of the default catalog. */
-static const char default_catalog_name[] = "messages";
-
-/* Name of currently used catalog. */
-static const char *catalog_name = default_catalog_name;
-
-/* Get ID for given string. If not found return -1. */
-static int msg_to_cat_id PARAMS ((const char *msg));
-
-/* Substitution for systems lacking this function in their C library. */
-#if !_LIBC && !HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-#endif
-
-
-/* Set currently used domain/catalog. */
-char *
-textdomain (domainname)
- const char *domainname;
-{
- nl_catd new_catalog;
- char *new_name;
- size_t new_name_len;
- char *lang;
-
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \
- && defined HAVE_LOCALE_NULL
- lang = setlocale (LC_MESSAGES, NULL);
-#else
- lang = getenv ("LC_ALL");
- if (lang == NULL || lang[0] == '\0')
- {
- lang = getenv ("LC_MESSAGES");
- if (lang == NULL || lang[0] == '\0')
- lang = getenv ("LANG");
- }
-#endif
- if (lang == NULL || lang[0] == '\0')
- lang = "C";
-
- /* See whether name of currently used domain is asked. */
- if (domainname == NULL)
- return (char *) catalog_name;
-
- if (domainname[0] == '\0')
- domainname = default_catalog_name;
-
- /* Compute length of added path element. */
- new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang)
- + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1
- + sizeof (".cat");
-
- new_name = (char *) malloc (new_name_len);
- if (new_name == NULL)
- return NULL;
-
- strcpy (new_name, PACKAGE);
- new_catalog = catopen (new_name, 0);
-
- if (new_catalog == (nl_catd) -1)
- {
- /* NLSPATH search didn't work, try absolute path */
- sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang,
- PACKAGE);
- new_catalog = catopen (new_name, 0);
-
- if (new_catalog == (nl_catd) -1)
- {
- free (new_name);
- return (char *) catalog_name;
- }
- }
-
- /* Close old catalog. */
- if (catalog != (nl_catd) -1)
- catclose (catalog);
- if (catalog_name != default_catalog_name)
- free ((char *) catalog_name);
-
- catalog = new_catalog;
- catalog_name = new_name;
-
- return (char *) catalog_name;
-}
-
-char *
-bindtextdomain (domainname, dirname)
- const char *domainname;
- const char *dirname;
-{
-#if HAVE_SETENV || HAVE_PUTENV
- char *old_val, *new_val, *cp;
- size_t new_val_len;
-
- /* This does not make much sense here but to be compatible do it. */
- if (domainname == NULL)
- return NULL;
-
- /* Compute length of added path element. If we use setenv we don't need
- the first byts for NLSPATH=, but why complicate the code for this
- peanuts. */
- new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname)
- + sizeof ("/%L/LC_MESSAGES/%N.cat");
-
- old_val = getenv ("NLSPATH");
- if (old_val == NULL || old_val[0] == '\0')
- {
- old_val = NULL;
- new_val_len += 1 + sizeof (LOCALEDIR) - 1
- + sizeof ("/%L/LC_MESSAGES/%N.cat");
- }
- else
- new_val_len += strlen (old_val);
-
- new_val = (char *) malloc (new_val_len);
- if (new_val == NULL)
- return NULL;
-
-# if HAVE_SETENV
- cp = new_val;
-# else
- cp = stpcpy (new_val, "NLSPATH=");
-# endif
-
- cp = stpcpy (cp, dirname);
- cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:");
-
- if (old_val == NULL)
- {
-# if __STDC__
- stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat");
-# else
-
- cp = stpcpy (cp, LOCALEDIR);
- stpcpy (cp, "/%L/LC_MESSAGES/%N.cat");
-# endif
- }
- else
- stpcpy (cp, old_val);
-
-# if HAVE_SETENV
- setenv ("NLSPATH", new_val, 1);
- free (new_val);
-# else
- putenv (new_val);
- /* Do *not* free the environment entry we just entered. It is used
- from now on. */
-# endif
-
-#endif
-
- return (char *) domainname;
-}
-
-#undef gettext
-char *
-gettext (msg)
- const char *msg;
-{
- int msgid;
-
- if (msg == NULL || catalog == (nl_catd) -1)
- return (char *) msg;
-
- /* Get the message from the catalog. We always use set number 1.
- The message ID is computed by the function `msg_to_cat_id'
- which works on the table generated by `po-to-tbl'. */
- msgid = msg_to_cat_id (msg);
- if (msgid == -1)
- return (char *) msg;
-
- return catgets (catalog, 1, msgid, (char *) msg);
-}
-
-/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries
- for the one equal to msg. If it is found return the ID. In case when
- the string is not found return -1. */
-static int
-msg_to_cat_id (msg)
- const char *msg;
-{
- int cnt;
-
- for (cnt = 0; cnt < _msg_tbl_length; ++cnt)
- if (strcmp (msg, _msg_tbl[cnt]._msg) == 0)
- return _msg_tbl[cnt]._msg_number;
-
- return -1;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library. So we
- avoid the non-standard function stpcpy. In GNU C Library this
- function is available, though. Also allow the symbol HAVE_STPCPY
- to be defined. */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
- char *dest;
- const char *src;
-{
- while ((*dest++ = *src++) != '\0')
- /* Do nothing. */ ;
- return dest - 1;
-}
-#endif
--- /dev/null
+#! /bin/sh
+# Output a system dependent table of character encoding aliases.
+#
+# Copyright (C) 2000-2002 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
+# by the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.
+#
+# The table consists of lines of the form
+# ALIAS CANONICAL
+#
+# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
+# ALIAS is compared in a case sensitive way.
+#
+# CANONICAL is the GNU canonical name for this character encoding.
+# It must be an encoding supported by libiconv. Support by GNU libc is
+# also desirable. CANONICAL is case insensitive. Usually an upper case
+# MIME charset name is preferred.
+# The current list of GNU canonical charset names is as follows.
+#
+# name used by which systems a MIME name?
+# ASCII, ANSI_X3.4-1968 glibc solaris freebsd
+# ISO-8859-1 glibc aix hpux irix osf solaris freebsd yes
+# ISO-8859-2 glibc aix hpux irix osf solaris freebsd yes
+# ISO-8859-3 glibc solaris yes
+# ISO-8859-4 osf solaris freebsd yes
+# ISO-8859-5 glibc aix hpux irix osf solaris freebsd yes
+# ISO-8859-6 glibc aix hpux solaris yes
+# ISO-8859-7 glibc aix hpux irix osf solaris yes
+# ISO-8859-8 glibc aix hpux osf solaris yes
+# ISO-8859-9 glibc aix hpux irix osf solaris yes
+# ISO-8859-13 glibc
+# ISO-8859-14 glibc
+# ISO-8859-15 glibc aix osf solaris freebsd
+# KOI8-R glibc solaris freebsd yes
+# KOI8-U glibc freebsd yes
+# KOI8-T glibc
+# CP437 dos
+# CP775 dos
+# CP850 aix osf dos
+# CP852 dos
+# CP855 dos
+# CP856 aix
+# CP857 dos
+# CP861 dos
+# CP862 dos
+# CP864 dos
+# CP865 dos
+# CP866 freebsd dos
+# CP869 dos
+# CP874 woe32 dos
+# CP922 aix
+# CP932 aix woe32 dos
+# CP943 aix
+# CP949 osf woe32 dos
+# CP950 woe32 dos
+# CP1046 aix
+# CP1124 aix
+# CP1125 dos
+# CP1129 aix
+# CP1250 woe32
+# CP1251 glibc woe32
+# CP1252 aix woe32
+# CP1253 woe32
+# CP1254 woe32
+# CP1255 glibc woe32
+# CP1256 woe32
+# CP1257 woe32
+# GB2312 glibc aix hpux irix solaris freebsd yes
+# EUC-JP glibc aix hpux irix osf solaris freebsd yes
+# EUC-KR glibc aix hpux irix osf solaris freebsd yes
+# EUC-TW glibc aix hpux irix osf solaris
+# BIG5 glibc aix hpux osf solaris freebsd yes
+# BIG5-HKSCS glibc solaris
+# GBK glibc aix osf solaris woe32 dos
+# GB18030 glibc solaris
+# SHIFT_JIS hpux osf solaris freebsd yes
+# JOHAB glibc solaris woe32
+# TIS-620 glibc aix hpux osf solaris
+# VISCII glibc yes
+# TCVN5712-1 glibc
+# GEORGIAN-PS glibc
+# HP-ROMAN8 hpux
+# HP-ARABIC8 hpux
+# HP-GREEK8 hpux
+# HP-HEBREW8 hpux
+# HP-TURKISH8 hpux
+# HP-KANA8 hpux
+# DEC-KANJI osf
+# DEC-HANYU osf
+# UTF-8 glibc aix hpux osf solaris yes
+#
+# Note: Names which are not marked as being a MIME name should not be used in
+# Internet protocols for information interchange (mail, news, etc.).
+#
+# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
+# must understand both names and treat them as equivalent.
+#
+# The first argument passed to this file is the canonical host specification,
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+
+host="$1"
+os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
+echo "# This file contains a table of character encoding aliases,"
+echo "# suitable for operating system '${os}'."
+echo "# It was automatically generated from config.charset."
+# List of references, updated during installation:
+echo "# Packages using this file: "
+case "$os" in
+ linux* | *-gnu*)
+ # With glibc-2.1 or newer, we don't need any canonicalization,
+ # because glibc has iconv and both glibc and libiconv support all
+ # GNU canonical names directly. Therefore, the Makefile does not
+ # need to install the alias file at all.
+ # The following applies only to glibc-2.0.x and older libcs.
+ echo "ISO_646.IRV:1983 ASCII"
+ ;;
+ aix*)
+ echo "ISO8859-1 ISO-8859-1"
+ echo "ISO8859-2 ISO-8859-2"
+ echo "ISO8859-5 ISO-8859-5"
+ echo "ISO8859-6 ISO-8859-6"
+ echo "ISO8859-7 ISO-8859-7"
+ echo "ISO8859-8 ISO-8859-8"
+ echo "ISO8859-9 ISO-8859-9"
+ echo "ISO8859-15 ISO-8859-15"
+ echo "IBM-850 CP850"
+ echo "IBM-856 CP856"
+ echo "IBM-921 ISO-8859-13"
+ echo "IBM-922 CP922"
+ echo "IBM-932 CP932"
+ echo "IBM-943 CP943"
+ echo "IBM-1046 CP1046"
+ echo "IBM-1124 CP1124"
+ echo "IBM-1129 CP1129"
+ echo "IBM-1252 CP1252"
+ echo "IBM-eucCN GB2312"
+ echo "IBM-eucJP EUC-JP"
+ echo "IBM-eucKR EUC-KR"
+ echo "IBM-eucTW EUC-TW"
+ echo "big5 BIG5"
+ echo "GBK GBK"
+ echo "TIS-620 TIS-620"
+ echo "UTF-8 UTF-8"
+ ;;
+ hpux*)
+ echo "iso88591 ISO-8859-1"
+ echo "iso88592 ISO-8859-2"
+ echo "iso88595 ISO-8859-5"
+ echo "iso88596 ISO-8859-6"
+ echo "iso88597 ISO-8859-7"
+ echo "iso88598 ISO-8859-8"
+ echo "iso88599 ISO-8859-9"
+ echo "iso885915 ISO-8859-15"
+ echo "roman8 HP-ROMAN8"
+ echo "arabic8 HP-ARABIC8"
+ echo "greek8 HP-GREEK8"
+ echo "hebrew8 HP-HEBREW8"
+ echo "turkish8 HP-TURKISH8"
+ echo "kana8 HP-KANA8"
+ echo "tis620 TIS-620"
+ echo "big5 BIG5"
+ echo "eucJP EUC-JP"
+ echo "eucKR EUC-KR"
+ echo "eucTW EUC-TW"
+ echo "hp15CN GB2312"
+ #echo "ccdc ?" # what is this?
+ echo "SJIS SHIFT_JIS"
+ echo "utf8 UTF-8"
+ ;;
+ irix*)
+ echo "ISO8859-1 ISO-8859-1"
+ echo "ISO8859-2 ISO-8859-2"
+ echo "ISO8859-5 ISO-8859-5"
+ echo "ISO8859-7 ISO-8859-7"
+ echo "ISO8859-9 ISO-8859-9"
+ echo "eucCN GB2312"
+ echo "eucJP EUC-JP"
+ echo "eucKR EUC-KR"
+ echo "eucTW EUC-TW"
+ ;;
+ osf*)
+ echo "ISO8859-1 ISO-8859-1"
+ echo "ISO8859-2 ISO-8859-2"
+ echo "ISO8859-4 ISO-8859-4"
+ echo "ISO8859-5 ISO-8859-5"
+ echo "ISO8859-7 ISO-8859-7"
+ echo "ISO8859-8 ISO-8859-8"
+ echo "ISO8859-9 ISO-8859-9"
+ echo "ISO8859-15 ISO-8859-15"
+ echo "cp850 CP850"
+ echo "big5 BIG5"
+ echo "dechanyu DEC-HANYU"
+ echo "dechanzi GB2312"
+ echo "deckanji DEC-KANJI"
+ echo "deckorean EUC-KR"
+ echo "eucJP EUC-JP"
+ echo "eucKR EUC-KR"
+ echo "eucTW EUC-TW"
+ echo "GBK GBK"
+ echo "KSC5601 CP949"
+ echo "sdeckanji EUC-JP"
+ echo "SJIS SHIFT_JIS"
+ echo "TACTIS TIS-620"
+ echo "UTF-8 UTF-8"
+ ;;
+ solaris*)
+ echo "646 ASCII"
+ echo "ISO8859-1 ISO-8859-1"
+ echo "ISO8859-2 ISO-8859-2"
+ echo "ISO8859-3 ISO-8859-3"
+ echo "ISO8859-4 ISO-8859-4"
+ echo "ISO8859-5 ISO-8859-5"
+ echo "ISO8859-6 ISO-8859-6"
+ echo "ISO8859-7 ISO-8859-7"
+ echo "ISO8859-8 ISO-8859-8"
+ echo "ISO8859-9 ISO-8859-9"
+ echo "ISO8859-15 ISO-8859-15"
+ echo "koi8-r KOI8-R"
+ echo "BIG5 BIG5"
+ echo "Big5-HKSCS BIG5-HKSCS"
+ echo "gb2312 GB2312"
+ echo "GBK GBK"
+ echo "GB18030 GB18030"
+ echo "cns11643 EUC-TW"
+ echo "5601 EUC-KR"
+ echo "ko_KR.johap92 JOHAB"
+ echo "eucJP EUC-JP"
+ echo "PCK SHIFT_JIS"
+ echo "TIS620.2533 TIS-620"
+ #echo "sun_eu_greek ?" # what is this?
+ echo "UTF-8 UTF-8"
+ ;;
+ freebsd* | os2*)
+ # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
+ # localcharset.c falls back to using the full locale name
+ # from the environment variables.
+ # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
+ # reuse FreeBSD's locale data for OS/2.
+ echo "C ASCII"
+ echo "US-ASCII ASCII"
+ for l in la_LN lt_LN; do
+ echo "$l.ASCII ASCII"
+ done
+ for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+ fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+ lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
+ echo "$l.ISO_8859-1 ISO-8859-1"
+ echo "$l.DIS_8859-15 ISO-8859-15"
+ done
+ for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
+ echo "$l.ISO_8859-2 ISO-8859-2"
+ done
+ for l in la_LN lt_LT; do
+ echo "$l.ISO_8859-4 ISO-8859-4"
+ done
+ for l in ru_RU ru_SU; do
+ echo "$l.KOI8-R KOI8-R"
+ echo "$l.ISO_8859-5 ISO-8859-5"
+ echo "$l.CP866 CP866"
+ done
+ echo "uk_UA.KOI8-U KOI8-U"
+ echo "zh_TW.BIG5 BIG5"
+ echo "zh_TW.Big5 BIG5"
+ echo "zh_CN.EUC GB2312"
+ echo "ja_JP.EUC EUC-JP"
+ echo "ja_JP.SJIS SHIFT_JIS"
+ echo "ja_JP.Shift_JIS SHIFT_JIS"
+ echo "ko_KR.EUC EUC-KR"
+ ;;
+ netbsd*)
+ echo "646 ASCII"
+ echo "ISO8859-1 ISO-8859-1"
+ echo "ISO8859-2 ISO-8859-2"
+ echo "ISO8859-4 ISO-8859-4"
+ echo "ISO8859-5 ISO-8859-5"
+ echo "ISO8859-15 ISO-8859-15"
+ echo "eucCN GB2312"
+ echo "eucJP EUC-JP"
+ echo "eucKR EUC-KR"
+ echo "eucTW EUC-TW"
+ echo "BIG5 BIG5"
+ echo "SJIS SHIFT_JIS"
+ ;;
+ beos*)
+ # BeOS has a single locale, and it has UTF-8 encoding.
+ echo "* UTF-8"
+ ;;
+ msdosdjgpp*)
+ # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
+ # localcharset.c falls back to using the full locale name
+ # from the environment variables.
+ echo "#"
+ echo "# The encodings given here may not all be correct."
+ echo "# If you find that the encoding given for your language and"
+ echo "# country is not the one your DOS machine actually uses, just"
+ echo "# correct it in this file, and send a mail to"
+ echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
+ echo "# and Bruno Haible <bruno@clisp.org>."
+ echo "#"
+ echo "C ASCII"
+ # ISO-8859-1 languages
+ echo "ca CP850"
+ echo "ca_ES CP850"
+ echo "da CP865" # not CP850 ??
+ echo "da_DK CP865" # not CP850 ??
+ echo "de CP850"
+ echo "de_AT CP850"
+ echo "de_CH CP850"
+ echo "de_DE CP850"
+ echo "en CP850"
+ echo "en_AU CP850" # not CP437 ??
+ echo "en_CA CP850"
+ echo "en_GB CP850"
+ echo "en_NZ CP437"
+ echo "en_US CP437"
+ echo "en_ZA CP850" # not CP437 ??
+ echo "es CP850"
+ echo "es_AR CP850"
+ echo "es_BO CP850"
+ echo "es_CL CP850"
+ echo "es_CO CP850"
+ echo "es_CR CP850"
+ echo "es_CU CP850"
+ echo "es_DO CP850"
+ echo "es_EC CP850"
+ echo "es_ES CP850"
+ echo "es_GT CP850"
+ echo "es_HN CP850"
+ echo "es_MX CP850"
+ echo "es_NI CP850"
+ echo "es_PA CP850"
+ echo "es_PY CP850"
+ echo "es_PE CP850"
+ echo "es_SV CP850"
+ echo "es_UY CP850"
+ echo "es_VE CP850"
+ echo "et CP850"
+ echo "et_EE CP850"
+ echo "eu CP850"
+ echo "eu_ES CP850"
+ echo "fi CP850"
+ echo "fi_FI CP850"
+ echo "fr CP850"
+ echo "fr_BE CP850"
+ echo "fr_CA CP850"
+ echo "fr_CH CP850"
+ echo "fr_FR CP850"
+ echo "ga CP850"
+ echo "ga_IE CP850"
+ echo "gd CP850"
+ echo "gd_GB CP850"
+ echo "gl CP850"
+ echo "gl_ES CP850"
+ echo "id CP850" # not CP437 ??
+ echo "id_ID CP850" # not CP437 ??
+ echo "is CP861" # not CP850 ??
+ echo "is_IS CP861" # not CP850 ??
+ echo "it CP850"
+ echo "it_CH CP850"
+ echo "it_IT CP850"
+ echo "lt CP775"
+ echo "lt_LT CP775"
+ echo "lv CP775"
+ echo "lv_LV CP775"
+ echo "nb CP865" # not CP850 ??
+ echo "nb_NO CP865" # not CP850 ??
+ echo "nl CP850"
+ echo "nl_BE CP850"
+ echo "nl_NL CP850"
+ echo "nn CP865" # not CP850 ??
+ echo "nn_NO CP865" # not CP850 ??
+ echo "no CP865" # not CP850 ??
+ echo "no_NO CP865" # not CP850 ??
+ echo "pt CP850"
+ echo "pt_BR CP850"
+ echo "pt_PT CP850"
+ echo "sv CP850"
+ echo "sv_SE CP850"
+ # ISO-8859-2 languages
+ echo "cs CP852"
+ echo "cs_CZ CP852"
+ echo "hr CP852"
+ echo "hr_HR CP852"
+ echo "hu CP852"
+ echo "hu_HU CP852"
+ echo "pl CP852"
+ echo "pl_PL CP852"
+ echo "ro CP852"
+ echo "ro_RO CP852"
+ echo "sk CP852"
+ echo "sk_SK CP852"
+ echo "sl CP852"
+ echo "sl_SI CP852"
+ echo "sq CP852"
+ echo "sq_AL CP852"
+ echo "sr CP852" # CP852 or CP866 or CP855 ??
+ echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
+ # ISO-8859-3 languages
+ echo "mt CP850"
+ echo "mt_MT CP850"
+ # ISO-8859-5 languages
+ echo "be CP866"
+ echo "be_BE CP866"
+ echo "bg CP866" # not CP855 ??
+ echo "bg_BG CP866" # not CP855 ??
+ echo "mk CP866" # not CP855 ??
+ echo "mk_MK CP866" # not CP855 ??
+ echo "ru CP866"
+ echo "ru_RU CP866"
+ echo "uk CP1125"
+ echo "uk_UA CP1125"
+ # ISO-8859-6 languages
+ echo "ar CP864"
+ echo "ar_AE CP864"
+ echo "ar_DZ CP864"
+ echo "ar_EG CP864"
+ echo "ar_IQ CP864"
+ echo "ar_IR CP864"
+ echo "ar_JO CP864"
+ echo "ar_KW CP864"
+ echo "ar_MA CP864"
+ echo "ar_OM CP864"
+ echo "ar_QA CP864"
+ echo "ar_SA CP864"
+ echo "ar_SY CP864"
+ # ISO-8859-7 languages
+ echo "el CP869"
+ echo "el_GR CP869"
+ # ISO-8859-8 languages
+ echo "he CP862"
+ echo "he_IL CP862"
+ # ISO-8859-9 languages
+ echo "tr CP857"
+ echo "tr_TR CP857"
+ # Japanese
+ echo "ja CP932"
+ echo "ja_JP CP932"
+ # Chinese
+ echo "zh_CN GBK"
+ echo "zh_TW CP950" # not CP938 ??
+ # Korean
+ echo "kr CP949" # not CP934 ??
+ echo "kr_KR CP949" # not CP934 ??
+ # Thai
+ echo "th CP874"
+ echo "th_TH CP874"
+ # Other
+ echo "eo CP850"
+ echo "eo_EO CP850"
+ ;;
+esac
/* Implementation of the dcgettext(3) function.
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca
-char *alloca ();
-# endif
-# endif
-# endif
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-# include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-# define strchr index
-# endif
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettext.h"
#include "gettextP.h"
#ifdef _LIBC
# include <libintl.h>
#else
-# include "libgettext.h"
+# include "libgnuintl.h"
#endif
-#include "hash-string.h"
/* @@ end of prolog @@ */
-#ifdef _LIBC
-/* Rename the non ANSI C functions. This is required by the standard
- because some ANSI C functions will require linking with this object
- file and the name space must not be polluted. */
-# define getcwd __getcwd
-# ifndef stpcpy
-# define stpcpy __stpcpy
-# endif
-#else
-# if !defined HAVE_GETCWD
-char *getwd ();
-# define getcwd(buf, max) getwd (buf)
-# else
-char *getcwd ();
-# endif
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Amount to increase buffer size by in each try. */
-#define PATH_INCR 32
-
-/* The following is from pathmax.h. */
-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
- PATH_MAX but might cause redefinition warnings when sys/param.h is
- later included (as on MORE/BSD 4.3). */
-#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
-# include <limits.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-
-#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
-
-/* Don't include sys/param.h if it already has been. */
-#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
-# include <sys/param.h>
-#endif
-
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-# define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
- ``Directs `setlocale()' to query `category' and return the current
- setting of `local'.''
- However it does not specify the exact format. And even worse: POSIX
- defines this not at all. So we can use this feature only on selected
- system (e.g. those using GNU C Library). */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* Name of the default domain used for gettext(3) prior any call to
- textdomain(3). The default value for this is "messages". */
-const char _nl_default_default_domain[] = "messages";
-
-/* Value used as the default domain for gettext(3). */
-const char *_nl_current_default_domain = _nl_default_default_domain;
-
-/* Contains the default location of the message catalogs. */
-const char _nl_default_dirname[] = GNULOCALEDIR;
-
-/* List with bindings of specific domains created by bindtextdomain()
- calls. */
-struct binding *_nl_domain_bindings;
-
-/* Prototypes for local functions. */
-static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
- const char *msgid)) internal_function;
-static const char *category_to_name PARAMS ((int category)) internal_function;
-static const char *guess_category_value PARAMS ((int category,
- const char *categoryname))
- internal_function;
-
-
-/* For those loosing systems which don't have `alloca' we have to add
- some additional code emulating it. */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done. */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
- void *address;
- struct block_list *next;
-};
-# define ADD_BLOCK(list, addr) \
- do { \
- struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
- /* If we cannot get a free block we cannot add the new element to \
- the list. */ \
- if (newp != NULL) { \
- newp->address = (addr); \
- newp->next = (list); \
- (list) = newp; \
- } \
- } while (0)
-# define FREE_BLOCKS(list) \
- do { \
- while (list != NULL) { \
- struct block_list *old = list; \
- list = list->next; \
- free (old); \
- } \
- } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif /* have alloca */
-
-
/* Names for the libintl functions are a problem. They must not clash
with existing names and they should follow ANSI C. But this source
code is also used in GNU C Library where the names have a __
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define DCGETTEXT __dcgettext
+# define DCIGETTEXT __dcigettext
#else
-# define DCGETTEXT dcgettext__
+# define DCGETTEXT libintl_dcgettext
+# define DCIGETTEXT libintl_dcigettext
#endif
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
const char *msgid;
int category;
{
-#ifndef HAVE_ALLOCA
- struct block_list *block_list = NULL;
-#endif
- struct loaded_l10nfile *domain;
- struct binding *binding;
- const char *categoryname;
- const char *categoryvalue;
- char *dirname, *xdomainname;
- char *single_locale;
- char *retval;
- int saved_errno = errno;
-
- /* If no real MSGID is given return NULL. */
- if (msgid == NULL)
- return NULL;
-
- /* If DOMAINNAME is NULL, we are interested in the default domain. If
- CATEGORY is not LC_MESSAGES this might not make much sense but the
- defintion left this undefined. */
- if (domainname == NULL)
- domainname = _nl_current_default_domain;
-
- /* First find matching binding. */
- for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
- {
- int compare = strcmp (domainname, binding->domainname);
- if (compare == 0)
- /* We found it! */
- break;
- if (compare < 0)
- {
- /* It is not in the list. */
- binding = NULL;
- break;
- }
- }
-
- if (binding == NULL)
- dirname = (char *) _nl_default_dirname;
- else if (binding->dirname[0] == '/')
- dirname = binding->dirname;
- else
- {
- /* We have a relative path. Make it absolute now. */
- size_t dirname_len = strlen (binding->dirname) + 1;
- size_t path_max;
- char *ret;
-
- path_max = (unsigned) PATH_MAX;
- path_max += 2; /* The getcwd docs say to do this. */
-
- dirname = (char *) alloca (path_max + dirname_len);
- ADD_BLOCK (block_list, dirname);
-
- __set_errno (0);
- while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
- {
- path_max += PATH_INCR;
- dirname = (char *) alloca (path_max + dirname_len);
- ADD_BLOCK (block_list, dirname);
- __set_errno (0);
- }
-
- if (ret == NULL)
- {
- /* We cannot get the current working directory. Don't signal an
- error but simply return the default string. */
- FREE_BLOCKS (block_list);
- __set_errno (saved_errno);
- return (char *) msgid;
- }
-
- stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
- }
-
- /* Now determine the symbolic name of CATEGORY and its value. */
- categoryname = category_to_name (category);
- categoryvalue = guess_category_value (category, categoryname);
-
- xdomainname = (char *) alloca (strlen (categoryname)
- + strlen (domainname) + 5);
- ADD_BLOCK (block_list, xdomainname);
-
- stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
- domainname),
- ".mo");
-
- /* Creating working area. */
- single_locale = (char *) alloca (strlen (categoryvalue) + 1);
- ADD_BLOCK (block_list, single_locale);
-
-
- /* Search for the given string. This is a loop because we perhaps
- got an ordered list of languages to consider for th translation. */
- while (1)
- {
- /* Make CATEGORYVALUE point to the next element of the list. */
- while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
- ++categoryvalue;
- if (categoryvalue[0] == '\0')
- {
- /* The whole contents of CATEGORYVALUE has been searched but
- no valid entry has been found. We solve this situation
- by implicitly appending a "C" entry, i.e. no translation
- will take place. */
- single_locale[0] = 'C';
- single_locale[1] = '\0';
- }
- else
- {
- char *cp = single_locale;
- while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
- *cp++ = *categoryvalue++;
- *cp = '\0';
- }
-
- /* If the current locale value is C (or POSIX) we don't load a
- domain. Return the MSGID. */
- if (strcmp (single_locale, "C") == 0
- || strcmp (single_locale, "POSIX") == 0)
- {
- FREE_BLOCKS (block_list);
- __set_errno (saved_errno);
- return (char *) msgid;
- }
-
-
- /* Find structure describing the message catalog matching the
- DOMAINNAME and CATEGORY. */
- domain = _nl_find_domain (dirname, single_locale, xdomainname);
-
- if (domain != NULL)
- {
- retval = find_msg (domain, msgid);
-
- if (retval == NULL)
- {
- int cnt;
-
- for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
- {
- retval = find_msg (domain->successor[cnt], msgid);
-
- if (retval != NULL)
- break;
- }
- }
-
- if (retval != NULL)
- {
- FREE_BLOCKS (block_list);
- __set_errno (saved_errno);
- return retval;
- }
- }
- }
- /* NOTREACHED */
+ return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
}
#ifdef _LIBC
/* Alias for function name in GNU C Library. */
+INTDEF(__dcgettext)
weak_alias (__dcgettext, dcgettext);
#endif
-
-
-static char *
-internal_function
-find_msg (domain_file, msgid)
- struct loaded_l10nfile *domain_file;
- const char *msgid;
-{
- size_t top, act, bottom;
- struct loaded_domain *domain;
-
- if (domain_file->decided == 0)
- _nl_load_domain (domain_file);
-
- if (domain_file->data == NULL)
- return NULL;
-
- domain = (struct loaded_domain *) domain_file->data;
-
- /* Locate the MSGID and its translation. */
- if (domain->hash_size > 2 && domain->hash_tab != NULL)
- {
- /* Use the hashing table. */
- nls_uint32 len = strlen (msgid);
- nls_uint32 hash_val = hash_string (msgid);
- nls_uint32 idx = hash_val % domain->hash_size;
- nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
- nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
-
- if (nstr == 0)
- /* Hash table entry is empty. */
- return NULL;
-
- if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
- && strcmp (msgid,
- domain->data + W (domain->must_swap,
- domain->orig_tab[nstr - 1].offset)) == 0)
- return (char *) domain->data + W (domain->must_swap,
- domain->trans_tab[nstr - 1].offset);
-
- while (1)
- {
- if (idx >= domain->hash_size - incr)
- idx -= domain->hash_size - incr;
- else
- idx += incr;
-
- nstr = W (domain->must_swap, domain->hash_tab[idx]);
- if (nstr == 0)
- /* Hash table entry is empty. */
- return NULL;
-
- if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
- && strcmp (msgid,
- domain->data + W (domain->must_swap,
- domain->orig_tab[nstr - 1].offset))
- == 0)
- return (char *) domain->data
- + W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
- }
- /* NOTREACHED */
- }
-
- /* Now we try the default method: binary search in the sorted
- array of messages. */
- bottom = 0;
- top = domain->nstrings;
- while (bottom < top)
- {
- int cmp_val;
-
- act = (bottom + top) / 2;
- cmp_val = strcmp (msgid, domain->data
- + W (domain->must_swap,
- domain->orig_tab[act].offset));
- if (cmp_val < 0)
- top = act;
- else if (cmp_val > 0)
- bottom = act + 1;
- else
- break;
- }
-
- /* If an translation is found return this. */
- return bottom >= top ? NULL : (char *) domain->data
- + W (domain->must_swap,
- domain->trans_tab[act].offset);
-}
-
-
-/* Return string representation of locale CATEGORY. */
-static const char *
-internal_function
-category_to_name (category)
- int category;
-{
- const char *retval;
-
- switch (category)
- {
-#ifdef LC_COLLATE
- case LC_COLLATE:
- retval = "LC_COLLATE";
- break;
-#endif
-#ifdef LC_CTYPE
- case LC_CTYPE:
- retval = "LC_CTYPE";
- break;
-#endif
-#ifdef LC_MONETARY
- case LC_MONETARY:
- retval = "LC_MONETARY";
- break;
-#endif
-#ifdef LC_NUMERIC
- case LC_NUMERIC:
- retval = "LC_NUMERIC";
- break;
-#endif
-#ifdef LC_TIME
- case LC_TIME:
- retval = "LC_TIME";
- break;
-#endif
-#ifdef LC_MESSAGES
- case LC_MESSAGES:
- retval = "LC_MESSAGES";
- break;
-#endif
-#ifdef LC_RESPONSE
- case LC_RESPONSE:
- retval = "LC_RESPONSE";
- break;
-#endif
-#ifdef LC_ALL
- case LC_ALL:
- /* This might not make sense but is perhaps better than any other
- value. */
- retval = "LC_ALL";
- break;
-#endif
- default:
- /* If you have a better idea for a default value let me know. */
- retval = "LC_XXX";
- }
-
- return retval;
-}
-
-/* Guess value of current locale from value of the environment variables. */
-static const char *
-internal_function
-guess_category_value (category, categoryname)
- int category;
- const char *categoryname;
-{
- const char *retval;
-
- /* The highest priority value is the `LANGUAGE' environment
- variable. This is a GNU extension. */
- retval = getenv ("LANGUAGE");
- if (retval != NULL && retval[0] != '\0')
- return retval;
-
- /* `LANGUAGE' is not set. So 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. */
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
- return setlocale (category, NULL);
-#else
- /* Setting of LC_ALL overwrites 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;
-
- /* We use C as the default domain. POSIX says this is implementation
- defined. */
- return "C";
-#endif
-}
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library. So we
- avoid the non-standard function stpcpy. In GNU C Library this
- function is available, though. Also allow the symbol HAVE_STPCPY
- to be defined. */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
- char *dest;
- const char *src;
-{
- while ((*dest++ = *src++) != '\0')
- /* Do nothing. */ ;
- return dest - 1;
-}
-#endif
-
-
-#ifdef _LIBC
-/* If we want to free all resources we have to do some work at
- program's end. */
-static void __attribute__ ((unused))
-free_mem (void)
-{
- struct binding *runp;
-
- for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next)
- {
- free (runp->domainname);
- if (runp->dirname != _nl_default_dirname)
- /* Yes, this is a pointer comparison. */
- free (runp->dirname);
- }
-
- if (_nl_current_default_domain != _nl_default_default_domain)
- /* Yes, again a pointer comparison. */
- free ((char *) _nl_current_default_domain);
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
--- /dev/null
+/* Implementation of the internal dcigettext function.
+ Copyright (C) 1995-1999, 2000-2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+/* Tell glibc's <string.h> to provide a prototype for mempcpy().
+ This must come before <config.h> because <config.h> may include
+ <features.h>, and once <features.h> has been included, it's too late. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/types.h>
+
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# if defined HAVE_ALLOCA_H || defined _LIBC
+# include <alloca.h>
+# else
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca
+char *alloca ();
+# endif
+# endif
+# endif
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+#ifndef __set_errno
+# define __set_errno(val) errno = (val)
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined HAVE_UNISTD_H || defined _LIBC
+# include <unistd.h>
+#endif
+
+#include <locale.h>
+
+#ifdef _LIBC
+ /* Guess whether integer division by zero raises signal SIGFPE.
+ Set to 1 only if you know for sure. In case of doubt, set to 0. */
+# if defined __alpha__ || defined __arm__ || defined __i386__ \
+ || defined __m68k__ || defined __s390__
+# define INTDIV0_RAISES_SIGFPE 1
+# else
+# define INTDIV0_RAISES_SIGFPE 0
+# endif
+#endif
+#if !INTDIV0_RAISES_SIGFPE
+# include <signal.h>
+#endif
+
+#if defined HAVE_SYS_PARAM_H || defined _LIBC
+# include <sys/param.h>
+#endif
+
+#include "gettextP.h"
+#include "plural-exp.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+#include "hash-string.h"
+
+/* Thread safetyness. */
+#ifdef _LIBC
+# include <bits/libc-lock.h>
+#else
+/* Provide dummy implementation if this is outside glibc. */
+# define __libc_lock_define_initialized(CLASS, NAME)
+# define __libc_lock_lock(NAME)
+# define __libc_lock_unlock(NAME)
+# define __libc_rwlock_define_initialized(CLASS, NAME)
+# define __libc_rwlock_rdlock(NAME)
+# define __libc_rwlock_unlock(NAME)
+#endif
+
+/* Alignment of types. */
+#if defined __GNUC__ && __GNUC__ >= 2
+# define alignof(TYPE) __alignof__ (TYPE)
+#else
+# define alignof(TYPE) \
+ ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
+#endif
+
+/* The internal variables in the standalone libintl.a must have different
+ names than the internal variables in GNU libc, otherwise programs
+ using libintl.a cannot be linked statically. */
+#if !defined _LIBC
+# define _nl_default_default_domain libintl_nl_default_default_domain
+# define _nl_current_default_domain libintl_nl_current_default_domain
+# define _nl_default_dirname libintl_nl_default_dirname
+# define _nl_domain_bindings libintl_nl_domain_bindings
+#endif
+
+/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
+#ifndef offsetof
+# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
+#endif
+
+/* @@ end of prolog @@ */
+
+#ifdef _LIBC
+/* Rename the non ANSI C functions. This is required by the standard
+ because some ANSI C functions will require linking with this object
+ file and the name space must not be polluted. */
+# define getcwd __getcwd
+# ifndef stpcpy
+# define stpcpy __stpcpy
+# endif
+# define tfind __tfind
+#else
+# if !defined HAVE_GETCWD
+char *getwd ();
+# define getcwd(buf, max) getwd (buf)
+# else
+char *getcwd ();
+# endif
+# ifndef HAVE_STPCPY
+static char *stpcpy PARAMS ((char *dest, const char *src));
+# endif
+# ifndef HAVE_MEMPCPY
+static void *mempcpy PARAMS ((void *dest, const void *src, size_t n));
+# endif
+#endif
+
+/* Amount to increase buffer size by in each try. */
+#define PATH_INCR 32
+
+/* The following is from pathmax.h. */
+/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
+ PATH_MAX but might cause redefinition warnings when sys/param.h is
+ later included (as on MORE/BSD 4.3). */
+#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
+# include <limits.h>
+#endif
+
+#ifndef _POSIX_PATH_MAX
+# define _POSIX_PATH_MAX 255
+#endif
+
+#if !defined PATH_MAX && defined _PC_PATH_MAX
+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
+#endif
+
+/* Don't include sys/param.h if it already has been. */
+#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
+# include <sys/param.h>
+#endif
+
+#if !defined PATH_MAX && defined MAXPATHLEN
+# define PATH_MAX MAXPATHLEN
+#endif
+
+#ifndef PATH_MAX
+# define PATH_MAX _POSIX_PATH_MAX
+#endif
+
+/* Pathname support.
+ ISSLASH(C) tests whether C is a directory separator character.
+ IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
+ 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')) \
+ && (P)[1] == ':')
+# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
+# define IS_PATH_WITH_DIR(P) \
+ (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
+#else
+ /* Unix */
+# define ISSLASH(C) ((C) == '/')
+# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
+# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
+#endif
+
+/* This is the type used for the search tree where known translations
+ are stored. */
+struct known_translation_t
+{
+ /* Domain in which to search. */
+ char *domainname;
+
+ /* The category. */
+ int category;
+
+ /* State of the catalog counter at the point the string was found. */
+ int counter;
+
+ /* Catalog where the string was found. */
+ struct loaded_l10nfile *domain;
+
+ /* And finally the translation. */
+ const char *translation;
+ size_t translation_length;
+
+ /* Pointer to the string in question. */
+ char msgid[ZERO];
+};
+
+/* Root of the search tree with known translations. We can use this
+ only if the system provides the `tsearch' function family. */
+#if defined HAVE_TSEARCH || defined _LIBC
+# include <search.h>
+
+static void *root;
+
+# ifdef _LIBC
+# define tsearch __tsearch
+# endif
+
+/* Function to compare two entries in the table of known translations. */
+static int transcmp PARAMS ((const void *p1, const void *p2));
+static int
+transcmp (p1, p2)
+ const void *p1;
+ const void *p2;
+{
+ const struct known_translation_t *s1;
+ const struct known_translation_t *s2;
+ int result;
+
+ s1 = (const struct known_translation_t *) p1;
+ s2 = (const struct known_translation_t *) p2;
+
+ result = strcmp (s1->msgid, s2->msgid);
+ if (result == 0)
+ {
+ result = strcmp (s1->domainname, s2->domainname);
+ if (result == 0)
+ /* We compare the category last (though this is the cheapest
+ operation) since it is hopefully always the same (namely
+ LC_MESSAGES). */
+ result = s1->category - s2->category;
+ }
+
+ return result;
+}
+#endif
+
+/* Name of the default domain used for gettext(3) prior any call to
+ textdomain(3). The default value for this is "messages". */
+const char _nl_default_default_domain[] attribute_hidden = "messages";
+
+/* Value used as the default domain for gettext(3). */
+const char *_nl_current_default_domain attribute_hidden
+ = _nl_default_default_domain;
+
+/* Contains the default location of the message catalogs. */
+#if defined __EMX__
+extern const char _nl_default_dirname[];
+#else
+const char _nl_default_dirname[] = LOCALEDIR;
+#endif
+
+/* List with bindings of specific domains created by bindtextdomain()
+ calls. */
+struct binding *_nl_domain_bindings;
+
+/* Prototypes for local functions. */
+static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain,
+ unsigned long int n,
+ const char *translation,
+ size_t translation_len))
+ internal_function;
+static const char *category_to_name PARAMS ((int category)) internal_function;
+static const char *guess_category_value PARAMS ((int category,
+ const char *categoryname))
+ internal_function;
+
+
+/* For those loosing systems which don't have `alloca' we have to add
+ some additional code emulating it. */
+#ifdef HAVE_ALLOCA
+/* Nothing has to be done. */
+# define freea(p) /* nothing */
+# define ADD_BLOCK(list, address) /* nothing */
+# define FREE_BLOCKS(list) /* nothing */
+#else
+struct block_list
+{
+ void *address;
+ struct block_list *next;
+};
+# define ADD_BLOCK(list, addr) \
+ do { \
+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
+ /* If we cannot get a free block we cannot add the new element to \
+ the list. */ \
+ if (newp != NULL) { \
+ newp->address = (addr); \
+ newp->next = (list); \
+ (list) = newp; \
+ } \
+ } while (0)
+# define FREE_BLOCKS(list) \
+ do { \
+ while (list != NULL) { \
+ struct block_list *old = list; \
+ list = list->next; \
+ free (old->address); \
+ free (old); \
+ } \
+ } while (0)
+# undef alloca
+# define alloca(size) (malloc (size))
+# define freea(p) free (p)
+#endif /* have alloca */
+
+
+#ifdef _LIBC
+/* List of blocks allocated for translations. */
+typedef struct transmem_list
+{
+ struct transmem_list *next;
+ char data[ZERO];
+} transmem_block_t;
+static struct transmem_list *transmem_list;
+#else
+typedef unsigned char transmem_block_t;
+#endif
+
+
+/* Names for the libintl functions are a problem. They must not clash
+ with existing names and they should follow ANSI C. But this source
+ code is also used in GNU C Library where the names have a __
+ prefix. So we have to make a difference here. */
+#ifdef _LIBC
+# define DCIGETTEXT __dcigettext
+#else
+# define DCIGETTEXT libintl_dcigettext
+#endif
+
+/* Lock variable to protect the global data in the gettext implementation. */
+#ifdef _LIBC
+__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
+#endif
+
+/* Checking whether the binaries runs SUID must be done and glibc provides
+ easier methods therefore we make a difference here. */
+#ifdef _LIBC
+# define ENABLE_SECURE __libc_enable_secure
+# define DETERMINE_SECURE
+#else
+# ifndef HAVE_GETUID
+# define getuid() 0
+# endif
+# ifndef HAVE_GETGID
+# define getgid() 0
+# endif
+# ifndef HAVE_GETEUID
+# define geteuid() getuid()
+# endif
+# ifndef HAVE_GETEGID
+# define getegid() getgid()
+# endif
+static int enable_secure;
+# define ENABLE_SECURE (enable_secure == 1)
+# define DETERMINE_SECURE \
+ if (enable_secure == 0) \
+ { \
+ if (getuid () != geteuid () || getgid () != getegid ()) \
+ enable_secure = 1; \
+ else \
+ enable_secure = -1; \
+ }
+#endif
+
+/* Get the function to evaluate the plural expression. */
+#include "eval-plural.h"
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+ CATEGORY locale and, if PLURAL is nonzero, search over string
+ depending on the plural form determined by N. */
+char *
+DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
+ const char *domainname;
+ const char *msgid1;
+ const char *msgid2;
+ int plural;
+ unsigned long int n;
+ int category;
+{
+#ifndef HAVE_ALLOCA
+ struct block_list *block_list = NULL;
+#endif
+ struct loaded_l10nfile *domain;
+ struct binding *binding;
+ const char *categoryname;
+ const char *categoryvalue;
+ char *dirname, *xdomainname;
+ char *single_locale;
+ char *retval;
+ size_t retlen;
+ int saved_errno;
+#if defined HAVE_TSEARCH || defined _LIBC
+ struct known_translation_t *search;
+ struct known_translation_t **foundp = NULL;
+ size_t msgid_len;
+#endif
+ size_t domainname_len;
+
+ /* If no real MSGID is given return NULL. */
+ if (msgid1 == NULL)
+ return NULL;
+
+ __libc_rwlock_rdlock (_nl_state_lock);
+
+ /* If DOMAINNAME is NULL, we are interested in the default domain. If
+ CATEGORY is not LC_MESSAGES this might not make much sense but the
+ definition left this undefined. */
+ if (domainname == NULL)
+ domainname = _nl_current_default_domain;
+
+ /* OS/2 specific: backward compatibility with older libintl versions */
+#ifdef LC_MESSAGES_COMPAT
+ if (category == LC_MESSAGES_COMPAT)
+ category = LC_MESSAGES;
+#endif
+
+#if defined HAVE_TSEARCH || defined _LIBC
+ msgid_len = strlen (msgid1) + 1;
+
+ /* Try to find the translation among those which we found at
+ some time. */
+ search = (struct known_translation_t *)
+ alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
+ memcpy (search->msgid, msgid1, msgid_len);
+ search->domainname = (char *) domainname;
+ search->category = category;
+
+ foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
+ freea (search);
+ if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
+ {
+ /* Now deal with plural. */
+ if (plural)
+ retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
+ (*foundp)->translation_length);
+ else
+ retval = (char *) (*foundp)->translation;
+
+ __libc_rwlock_unlock (_nl_state_lock);
+ return retval;
+ }
+#endif
+
+ /* Preserve the `errno' value. */
+ saved_errno = errno;
+
+ /* See whether this is a SUID binary or not. */
+ DETERMINE_SECURE;
+
+ /* First find matching binding. */
+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
+ {
+ int compare = strcmp (domainname, binding->domainname);
+ if (compare == 0)
+ /* We found it! */
+ break;
+ if (compare < 0)
+ {
+ /* It is not in the list. */
+ binding = NULL;
+ break;
+ }
+ }
+
+ if (binding == NULL)
+ dirname = (char *) _nl_default_dirname;
+ else if (IS_ABSOLUTE_PATH (binding->dirname))
+ dirname = binding->dirname;
+ else
+ {
+ /* We have a relative path. Make it absolute now. */
+ size_t dirname_len = strlen (binding->dirname) + 1;
+ size_t path_max;
+ char *ret;
+
+ path_max = (unsigned int) PATH_MAX;
+ path_max += 2; /* The getcwd docs say to do this. */
+
+ for (;;)
+ {
+ dirname = (char *) alloca (path_max + dirname_len);
+ ADD_BLOCK (block_list, dirname);
+
+ __set_errno (0);
+ ret = getcwd (dirname, path_max);
+ if (ret != NULL || errno != ERANGE)
+ break;
+
+ path_max += path_max / 2;
+ path_max += PATH_INCR;
+ }
+
+ if (ret == NULL)
+ {
+ /* We cannot get the current working directory. Don't signal an
+ error but simply return the default string. */
+ FREE_BLOCKS (block_list);
+ __libc_rwlock_unlock (_nl_state_lock);
+ __set_errno (saved_errno);
+ return (plural == 0
+ ? (char *) msgid1
+ /* Use the Germanic plural rule. */
+ : n == 1 ? (char *) msgid1 : (char *) msgid2);
+ }
+
+ stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
+ }
+
+ /* Now determine the symbolic name of CATEGORY and its value. */
+ categoryname = category_to_name (category);
+ categoryvalue = guess_category_value (category, categoryname);
+
+ domainname_len = strlen (domainname);
+ xdomainname = (char *) alloca (strlen (categoryname)
+ + domainname_len + 5);
+ ADD_BLOCK (block_list, xdomainname);
+
+ stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
+ domainname, domainname_len),
+ ".mo");
+
+ /* Creating working area. */
+ single_locale = (char *) alloca (strlen (categoryvalue) + 1);
+ ADD_BLOCK (block_list, single_locale);
+
+
+ /* Search for the given string. This is a loop because we perhaps
+ got an ordered list of languages to consider for the translation. */
+ while (1)
+ {
+ /* Make CATEGORYVALUE point to the next element of the list. */
+ while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
+ ++categoryvalue;
+ if (categoryvalue[0] == '\0')
+ {
+ /* The whole contents of CATEGORYVALUE has been searched but
+ no valid entry has been found. We solve this situation
+ by implicitly appending a "C" entry, i.e. no translation
+ will take place. */
+ single_locale[0] = 'C';
+ single_locale[1] = '\0';
+ }
+ else
+ {
+ char *cp = single_locale;
+ while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
+ *cp++ = *categoryvalue++;
+ *cp = '\0';
+
+ /* When this is a SUID binary we must not allow accessing files
+ outside the dedicated directories. */
+ if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
+ /* Ingore this entry. */
+ continue;
+ }
+
+ /* If the current locale value is C (or POSIX) we don't load a
+ domain. Return the MSGID. */
+ if (strcmp (single_locale, "C") == 0
+ || strcmp (single_locale, "POSIX") == 0)
+ {
+ FREE_BLOCKS (block_list);
+ __libc_rwlock_unlock (_nl_state_lock);
+ __set_errno (saved_errno);
+ return (plural == 0
+ ? (char *) msgid1
+ /* Use the Germanic plural rule. */
+ : n == 1 ? (char *) msgid1 : (char *) msgid2);
+ }
+
+
+ /* Find structure describing the message catalog matching the
+ DOMAINNAME and CATEGORY. */
+ domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
+
+ if (domain != NULL)
+ {
+ retval = _nl_find_msg (domain, binding, msgid1, &retlen);
+
+ if (retval == NULL)
+ {
+ int cnt;
+
+ for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
+ {
+ retval = _nl_find_msg (domain->successor[cnt], binding,
+ msgid1, &retlen);
+
+ if (retval != NULL)
+ {
+ domain = domain->successor[cnt];
+ break;
+ }
+ }
+ }
+
+ if (retval != NULL)
+ {
+ /* Found the translation of MSGID1 in domain DOMAIN:
+ starting at RETVAL, RETLEN bytes. */
+ FREE_BLOCKS (block_list);
+ __set_errno (saved_errno);
+#if defined HAVE_TSEARCH || defined _LIBC
+ if (foundp == NULL)
+ {
+ /* Create a new entry and add it to the search tree. */
+ struct known_translation_t *newp;
+
+ newp = (struct known_translation_t *)
+ malloc (offsetof (struct known_translation_t, msgid)
+ + msgid_len + domainname_len + 1);
+ if (newp != NULL)
+ {
+ newp->domainname =
+ mempcpy (newp->msgid, msgid1, msgid_len);
+ memcpy (newp->domainname, domainname, domainname_len + 1);
+ newp->category = category;
+ newp->counter = _nl_msg_cat_cntr;
+ newp->domain = domain;
+ newp->translation = retval;
+ newp->translation_length = retlen;
+
+ /* Insert the entry in the search tree. */
+ foundp = (struct known_translation_t **)
+ tsearch (newp, &root, transcmp);
+ if (foundp == NULL
+ || __builtin_expect (*foundp != newp, 0))
+ /* The insert failed. */
+ free (newp);
+ }
+ }
+ else
+ {
+ /* We can update the existing entry. */
+ (*foundp)->counter = _nl_msg_cat_cntr;
+ (*foundp)->domain = domain;
+ (*foundp)->translation = retval;
+ (*foundp)->translation_length = retlen;
+ }
+#endif
+ /* Now deal with plural. */
+ if (plural)
+ retval = plural_lookup (domain, n, retval, retlen);
+
+ __libc_rwlock_unlock (_nl_state_lock);
+ return retval;
+ }
+ }
+ }
+ /* NOTREACHED */
+}
+
+
+char *
+internal_function
+_nl_find_msg (domain_file, domainbinding, msgid, lengthp)
+ struct loaded_l10nfile *domain_file;
+ struct binding *domainbinding;
+ const char *msgid;
+ size_t *lengthp;
+{
+ struct loaded_domain *domain;
+ nls_uint32 nstrings;
+ size_t act;
+ char *result;
+ size_t resultlen;
+
+ if (domain_file->decided == 0)
+ _nl_load_domain (domain_file, domainbinding);
+
+ if (domain_file->data == NULL)
+ return NULL;
+
+ domain = (struct loaded_domain *) domain_file->data;
+
+ nstrings = domain->nstrings;
+
+ /* Locate the MSGID and its translation. */
+ if (domain->hash_tab != NULL)
+ {
+ /* Use the hashing table. */
+ nls_uint32 len = strlen (msgid);
+ nls_uint32 hash_val = hash_string (msgid);
+ nls_uint32 idx = hash_val % domain->hash_size;
+ nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
+
+ while (1)
+ {
+ nls_uint32 nstr =
+ W (domain->must_swap_hash_tab, domain->hash_tab[idx]);
+
+ if (nstr == 0)
+ /* Hash table entry is empty. */
+ return NULL;
+
+ nstr--;
+
+ /* Compare msgid with the original string at index nstr.
+ We compare the lengths with >=, not ==, because plural entries
+ are represented by strings with an embedded NUL. */
+ if (nstr < nstrings
+ ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len
+ && (strcmp (msgid,
+ domain->data + W (domain->must_swap,
+ domain->orig_tab[nstr].offset))
+ == 0)
+ : domain->orig_sysdep_tab[nstr - nstrings].length > len
+ && (strcmp (msgid,
+ domain->orig_sysdep_tab[nstr - nstrings].pointer)
+ == 0))
+ {
+ act = nstr;
+ goto found;
+ }
+
+ if (idx >= domain->hash_size - incr)
+ idx -= domain->hash_size - incr;
+ else
+ idx += incr;
+ }
+ /* NOTREACHED */
+ }
+ else
+ {
+ /* Try the default method: binary search in the sorted array of
+ messages. */
+ size_t top, bottom;
+
+ bottom = 0;
+ top = nstrings;
+ while (bottom < top)
+ {
+ int cmp_val;
+
+ act = (bottom + top) / 2;
+ cmp_val = strcmp (msgid, (domain->data
+ + W (domain->must_swap,
+ domain->orig_tab[act].offset)));
+ if (cmp_val < 0)
+ top = act;
+ else if (cmp_val > 0)
+ bottom = act + 1;
+ else
+ goto found;
+ }
+ /* No translation was found. */
+ return NULL;
+ }
+
+ found:
+ /* The translation was found at index ACT. If we have to convert the
+ string to use a different character set, this is the time. */
+ if (act < nstrings)
+ {
+ result = (char *)
+ (domain->data + W (domain->must_swap, domain->trans_tab[act].offset));
+ resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
+ }
+ else
+ {
+ result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer;
+ resultlen = domain->trans_sysdep_tab[act - nstrings].length;
+ }
+
+#if defined _LIBC || HAVE_ICONV
+ if (domain->codeset_cntr
+ != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
+ {
+ /* The domain's codeset has changed through bind_textdomain_codeset()
+ since the message catalog was initialized or last accessed. We
+ have to reinitialize the converter. */
+ _nl_free_domain_conv (domain);
+ _nl_init_domain_conv (domain_file, domain, domainbinding);
+ }
+
+ if (
+# ifdef _LIBC
+ domain->conv != (__gconv_t) -1
+# else
+# if HAVE_ICONV
+ domain->conv != (iconv_t) -1
+# endif
+# endif
+ )
+ {
+ /* We are supposed to do a conversion. First allocate an
+ appropriate table with the same structure as the table
+ of translations in the file, where we can put the pointers
+ to the converted strings in.
+ There is a slight complication with plural entries. They
+ are represented by consecutive NUL terminated strings. We
+ handle this case by converting RESULTLEN bytes, including
+ NULs. */
+
+ if (domain->conv_tab == NULL
+ && ((domain->conv_tab =
+ (char **) calloc (nstrings + domain->n_sysdep_strings,
+ sizeof (char *)))
+ == NULL))
+ /* Mark that we didn't succeed allocating a table. */
+ domain->conv_tab = (char **) -1;
+
+ if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
+ /* Nothing we can do, no more memory. */
+ goto converted;
+
+ if (domain->conv_tab[act] == NULL)
+ {
+ /* We haven't used this string so far, so it is not
+ translated yet. Do this now. */
+ /* We use a bit more efficient memory handling.
+ We allocate always larger blocks which get used over
+ time. This is faster than many small allocations. */
+ __libc_lock_define_initialized (static, lock)
+# define INITIAL_BLOCK_SIZE 4080
+ static unsigned char *freemem;
+ static size_t freemem_size;
+
+ const unsigned char *inbuf;
+ unsigned char *outbuf;
+ int malloc_count;
+# ifndef _LIBC
+ transmem_block_t *transmem_list = NULL;
+# endif
+
+ __libc_lock_lock (lock);
+
+ inbuf = (const unsigned char *) result;
+ outbuf = freemem + sizeof (size_t);
+
+ malloc_count = 0;
+ while (1)
+ {
+ transmem_block_t *newmem;
+# ifdef _LIBC
+ size_t non_reversible;
+ int res;
+
+ if (freemem_size < sizeof (size_t))
+ goto resize_freemem;
+
+ res = __gconv (domain->conv,
+ &inbuf, inbuf + resultlen,
+ &outbuf,
+ outbuf + freemem_size - sizeof (size_t),
+ &non_reversible);
+
+ if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
+ break;
+
+ if (res != __GCONV_FULL_OUTPUT)
+ {
+ __libc_lock_unlock (lock);
+ goto converted;
+ }
+
+ inbuf = result;
+# else
+# if HAVE_ICONV
+ const char *inptr = (const char *) inbuf;
+ size_t inleft = resultlen;
+ char *outptr = (char *) outbuf;
+ size_t outleft;
+
+ if (freemem_size < sizeof (size_t))
+ goto resize_freemem;
+
+ outleft = freemem_size - sizeof (size_t);
+ if (iconv (domain->conv,
+ (ICONV_CONST char **) &inptr, &inleft,
+ &outptr, &outleft)
+ != (size_t) (-1))
+ {
+ outbuf = (unsigned char *) outptr;
+ break;
+ }
+ if (errno != E2BIG)
+ {
+ __libc_lock_unlock (lock);
+ goto converted;
+ }
+# endif
+# endif
+
+ resize_freemem:
+ /* We must allocate a new buffer or resize the old one. */
+ if (malloc_count > 0)
+ {
+ ++malloc_count;
+ freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
+ newmem = (transmem_block_t *) realloc (transmem_list,
+ freemem_size);
+# ifdef _LIBC
+ if (newmem != NULL)
+ transmem_list = transmem_list->next;
+ else
+ {
+ struct transmem_list *old = transmem_list;
+
+ transmem_list = transmem_list->next;
+ free (old);
+ }
+# endif
+ }
+ else
+ {
+ malloc_count = 1;
+ freemem_size = INITIAL_BLOCK_SIZE;
+ newmem = (transmem_block_t *) malloc (freemem_size);
+ }
+ if (__builtin_expect (newmem == NULL, 0))
+ {
+ freemem = NULL;
+ freemem_size = 0;
+ __libc_lock_unlock (lock);
+ goto converted;
+ }
+
+# ifdef _LIBC
+ /* Add the block to the list of blocks we have to free
+ at some point. */
+ newmem->next = transmem_list;
+ transmem_list = newmem;
+
+ freemem = newmem->data;
+ freemem_size -= offsetof (struct transmem_list, data);
+# else
+ transmem_list = newmem;
+ freemem = newmem;
+# endif
+
+ outbuf = freemem + sizeof (size_t);
+ }
+
+ /* We have now in our buffer a converted string. Put this
+ into the table of conversions. */
+ *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
+ domain->conv_tab[act] = (char *) freemem;
+ /* Shrink freemem, but keep it aligned. */
+ freemem_size -= outbuf - freemem;
+ freemem = outbuf;
+ freemem += freemem_size & (alignof (size_t) - 1);
+ freemem_size = freemem_size & ~ (alignof (size_t) - 1);
+
+ __libc_lock_unlock (lock);
+ }
+
+ /* Now domain->conv_tab[act] contains the translation of all
+ the plural variants. */
+ result = domain->conv_tab[act] + sizeof (size_t);
+ resultlen = *(size_t *) domain->conv_tab[act];
+ }
+
+ converted:
+ /* The result string is converted. */
+
+#endif /* _LIBC || HAVE_ICONV */
+
+ *lengthp = resultlen;
+ return result;
+}
+
+
+/* Look up a plural variant. */
+static char *
+internal_function
+plural_lookup (domain, n, translation, translation_len)
+ struct loaded_l10nfile *domain;
+ unsigned long int n;
+ const char *translation;
+ size_t translation_len;
+{
+ struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
+ unsigned long int index;
+ const char *p;
+
+ index = plural_eval (domaindata->plural, n);
+ if (index >= domaindata->nplurals)
+ /* This should never happen. It means the plural expression and the
+ given maximum value do not match. */
+ index = 0;
+
+ /* Skip INDEX strings at TRANSLATION. */
+ p = translation;
+ while (index-- > 0)
+ {
+#ifdef _LIBC
+ p = __rawmemchr (p, '\0');
+#else
+ p = strchr (p, '\0');
+#endif
+ /* And skip over the NUL byte. */
+ p++;
+
+ if (p >= translation + translation_len)
+ /* This should never happen. It means the plural expression
+ evaluated to a value larger than the number of variants
+ available for MSGID1. */
+ return (char *) translation;
+ }
+ return (char *) p;
+}
+
+
+/* Return string representation of locale CATEGORY. */
+static const char *
+internal_function
+category_to_name (category)
+ int category;
+{
+ const char *retval;
+
+ switch (category)
+ {
+#ifdef LC_COLLATE
+ case LC_COLLATE:
+ retval = "LC_COLLATE";
+ break;
+#endif
+#ifdef LC_CTYPE
+ case LC_CTYPE:
+ retval = "LC_CTYPE";
+ break;
+#endif
+#ifdef LC_MONETARY
+ case LC_MONETARY:
+ retval = "LC_MONETARY";
+ break;
+#endif
+#ifdef LC_NUMERIC
+ case LC_NUMERIC:
+ retval = "LC_NUMERIC";
+ break;
+#endif
+#ifdef LC_TIME
+ case LC_TIME:
+ retval = "LC_TIME";
+ break;
+#endif
+#ifdef LC_MESSAGES
+ case LC_MESSAGES:
+ retval = "LC_MESSAGES";
+ break;
+#endif
+#ifdef LC_RESPONSE
+ case LC_RESPONSE:
+ retval = "LC_RESPONSE";
+ break;
+#endif
+#ifdef LC_ALL
+ case LC_ALL:
+ /* This might not make sense but is perhaps better than any other
+ value. */
+ retval = "LC_ALL";
+ break;
+#endif
+ default:
+ /* If you have a better idea for a default value let me know. */
+ retval = "LC_XXX";
+ }
+
+ return retval;
+}
+
+/* Guess value of current locale from value of the environment variables. */
+static const char *
+internal_function
+guess_category_value (category, categoryname)
+ 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 = setlocale (category, NULL);
+#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
+ characters (because other iconv()s refuse to convert most non-ASCII
+ 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 @@ */
+
+/* We don't want libintl.a to depend on any other library. So we
+ avoid the non-standard function stpcpy. In GNU C Library this
+ function is available, though. Also allow the symbol HAVE_STPCPY
+ to be defined. */
+#if !_LIBC && !HAVE_STPCPY
+static char *
+stpcpy (dest, src)
+ char *dest;
+ const char *src;
+{
+ while ((*dest++ = *src++) != '\0')
+ /* Do nothing. */ ;
+ return dest - 1;
+}
+#endif
+
+#if !_LIBC && !HAVE_MEMPCPY
+static void *
+mempcpy (dest, src, n)
+ void *dest;
+ const void *src;
+ size_t n;
+{
+ return (void *) ((char *) memcpy (dest, src, n) + n);
+}
+#endif
+
+
+#ifdef _LIBC
+/* If we want to free all resources we have to do some work at
+ program's end. */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+ void *old;
+
+ while (_nl_domain_bindings != NULL)
+ {
+ struct binding *oldp = _nl_domain_bindings;
+ _nl_domain_bindings = _nl_domain_bindings->next;
+ if (oldp->dirname != _nl_default_dirname)
+ /* Yes, this is a pointer comparison. */
+ free (oldp->dirname);
+ free (oldp->codeset);
+ free (oldp);
+ }
+
+ if (_nl_current_default_domain != _nl_default_default_domain)
+ /* Yes, again a pointer comparison. */
+ free ((char *) _nl_current_default_domain);
+
+ /* Remove the search tree with the known translations. */
+ __tdestroy (root, free);
+ root = NULL;
+
+ while (transmem_list != NULL)
+ {
+ old = transmem_list;
+ transmem_list = transmem_list->next;
+ free (old);
+ }
+}
+
+text_set_element (__libc_subfreeres, free_mem);
+#endif
--- /dev/null
+/* Implementation of the dcngettext(3) function.
+ Copyright (C) 1995-1999, 2000, 2001, 2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem. They must not clash
+ with existing names and they should follow ANSI C. But this source
+ code is also used in GNU C Library where the names have a __
+ prefix. So we have to make a difference here. */
+#ifdef _LIBC
+# define DCNGETTEXT __dcngettext
+# define DCIGETTEXT __dcigettext
+#else
+# define DCNGETTEXT libintl_dcngettext
+# define DCIGETTEXT libintl_dcigettext
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+ locale. */
+char *
+DCNGETTEXT (domainname, msgid1, msgid2, n, category)
+ const char *domainname;
+ const char *msgid1;
+ const char *msgid2;
+ unsigned long int n;
+ int category;
+{
+ return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library. */
+INTDEF(__dcngettext)
+weak_alias (__dcngettext, dcngettext);
+#endif
-/* Implementation of the dgettext(3) function
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Implementation of the dgettext(3) function.
+ Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
+#include <locale.h>
+#include "gettextP.h"
#ifdef _LIBC
# include <libintl.h>
#else
-# include "libgettext.h"
+# include "libgnuintl.h"
#endif
/* @@ end of prolog @@ */
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define DGETTEXT __dgettext
-# define DCGETTEXT __dcgettext
+# define DCGETTEXT INTUSE(__dcgettext)
#else
-# define DGETTEXT dgettext__
-# define DCGETTEXT dcgettext__
+# define DGETTEXT libintl_dgettext
+# define DCGETTEXT libintl_dcgettext
#endif
/* Look up MSGID in the DOMAINNAME message catalog of the current
--- /dev/null
+/* Implementation of the dngettext(3) function.
+ Copyright (C) 1995-1997, 2000, 2001, 2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <locale.h>
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem. They must not clash
+ with existing names and they should follow ANSI C. But this source
+ code is also used in GNU C Library where the names have a __
+ prefix. So we have to make a difference here. */
+#ifdef _LIBC
+# define DNGETTEXT __dngettext
+# define DCNGETTEXT INTUSE(__dcngettext)
+#else
+# define DNGETTEXT libintl_dngettext
+# define DCNGETTEXT libintl_dcngettext
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog of the current
+ LC_MESSAGES locale and skip message according to the plural form. */
+char *
+DNGETTEXT (domainname, msgid1, msgid2, n)
+ const char *domainname;
+ const char *msgid1;
+ const char *msgid2;
+ unsigned long int n;
+{
+ return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library. */
+weak_alias (__dngettext, dngettext);
+#endif
--- /dev/null
+/* Plural expression evaluation.
+ Copyright (C) 2000-2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef STATIC
+#define STATIC static
+#endif
+
+/* Evaluate the plural expression and return an index value. */
+STATIC unsigned long int plural_eval PARAMS ((struct expression *pexp,
+ unsigned long int n))
+ internal_function;
+
+STATIC
+unsigned long int
+internal_function
+plural_eval (pexp, n)
+ struct expression *pexp;
+ unsigned long int n;
+{
+ switch (pexp->nargs)
+ {
+ case 0:
+ switch (pexp->operation)
+ {
+ case var:
+ return n;
+ case num:
+ return pexp->val.num;
+ default:
+ break;
+ }
+ /* NOTREACHED */
+ break;
+ case 1:
+ {
+ /* pexp->operation must be lnot. */
+ unsigned long int arg = plural_eval (pexp->val.args[0], n);
+ return ! arg;
+ }
+ case 2:
+ {
+ unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
+ if (pexp->operation == lor)
+ return leftarg || plural_eval (pexp->val.args[1], n);
+ else if (pexp->operation == land)
+ return leftarg && plural_eval (pexp->val.args[1], n);
+ else
+ {
+ unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
+
+ switch (pexp->operation)
+ {
+ case mult:
+ return leftarg * rightarg;
+ case divide:
+#if !INTDIV0_RAISES_SIGFPE
+ if (rightarg == 0)
+ raise (SIGFPE);
+#endif
+ return leftarg / rightarg;
+ case module:
+#if !INTDIV0_RAISES_SIGFPE
+ if (rightarg == 0)
+ raise (SIGFPE);
+#endif
+ return leftarg % rightarg;
+ case plus:
+ return leftarg + rightarg;
+ case minus:
+ return leftarg - rightarg;
+ case less_than:
+ return leftarg < rightarg;
+ case greater_than:
+ return leftarg > rightarg;
+ case less_or_equal:
+ return leftarg <= rightarg;
+ case greater_or_equal:
+ return leftarg >= rightarg;
+ case equal:
+ return leftarg == rightarg;
+ case not_equal:
+ return leftarg != rightarg;
+ default:
+ break;
+ }
+ }
+ /* NOTREACHED */
+ break;
+ }
+ case 3:
+ {
+ /* pexp->operation must be qmop. */
+ unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
+ return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
+ }
+ }
+ /* NOTREACHED */
+ return 0;
+}
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
#include "loadinfo.h"
/* @@ end of prolog @@ */
+char *
+_nl_find_language (name)
+ const char *name;
+{
+ while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
+ && name[0] != '+' && name[0] != ',')
+ ++name;
+
+ return (char *) name;
+}
+
+
int
_nl_explode_name (name, language, modifier, territory, codeset,
normalized_codeset, special, sponsor, revision)
mask = 0;
syntax = undecided;
*language = cp = name;
- while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@'
- && cp[0] != '+' && cp[0] != ',')
- ++cp;
+ cp = _nl_find_language (*language);
if (*language == cp)
/* This does not make sense: language has to be specified. Use
/* Handle list of needed message catalogs
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+ Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+ Written by Ulrich Drepper <drepper@gnu.org>, 1995.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include <ctype.h>
-#include <errno.h>
#include <stdio.h>
#include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-# include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-# define strchr index
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>
#if defined HAVE_UNISTD_H || defined _LIBC
# include <unistd.h>
#endif
-#include "gettext.h"
#include "gettextP.h"
#ifdef _LIBC
# include <libintl.h>
#else
-# include "libgettext.h"
+# include "libgnuintl.h"
#endif
/* @@ end of prolog @@ */
established bindings. */
struct loaded_l10nfile *
internal_function
-_nl_find_domain (dirname, locale, domainname)
+_nl_find_domain (dirname, locale, domainname, domainbinding)
const char *dirname;
char *locale;
const char *domainname;
+ struct binding *domainbinding;
{
struct loaded_l10nfile *retval;
const char *language;
int cnt;
if (retval->decided == 0)
- _nl_load_domain (retval);
+ _nl_load_domain (retval, domainbinding);
if (retval->data != NULL)
return retval;
for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
{
if (retval->successor[cnt]->decided == 0)
- _nl_load_domain (retval->successor[cnt]);
+ _nl_load_domain (retval->successor[cnt], domainbinding);
if (retval->successor[cnt]->data != NULL)
break;
return NULL;
if (retval->decided == 0)
- _nl_load_domain (retval);
+ _nl_load_domain (retval, domainbinding);
if (retval->data == NULL)
{
int cnt;
for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
{
if (retval->successor[cnt]->decided == 0)
- _nl_load_domain (retval->successor[cnt]);
+ _nl_load_domain (retval->successor[cnt], domainbinding);
if (retval->successor[cnt]->data != NULL)
break;
}
if (alias_value != NULL)
free (locale);
+ /* The space for normalized_codeset is dynamically allocated. Free it. */
+ if (mask & XPG_NORM_CODESET)
+ free ((void *) normalized_codeset);
+
return retval;
}
if (runp->data != NULL)
_nl_unload_domain ((struct loaded_domain *) runp->data);
runp = runp->next;
+ free ((char *) here->filename);
free (here);
}
}
/* Implementation of gettext(3) function.
- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
# define __need_NULL
# include <stddef.h>
#else
-# ifdef STDC_HEADERS
-# include <stdlib.h> /* Just for NULL. */
-# else
-# ifdef HAVE_STRING_H
-# include <string.h>
-# else
-# define NULL ((void *) 0)
-# endif
-# endif
+# include <stdlib.h> /* Just for NULL. */
#endif
+#include "gettextP.h"
#ifdef _LIBC
# include <libintl.h>
#else
-# include "libgettext.h"
+# include "libgnuintl.h"
#endif
/* @@ end of prolog @@ */
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define GETTEXT __gettext
-# define DGETTEXT __dgettext
+# define DCGETTEXT INTUSE(__dcgettext)
#else
-# define GETTEXT gettext__
-# define DGETTEXT dgettext__
+# define GETTEXT libintl_gettext
+# define DCGETTEXT libintl_dcgettext
#endif
/* Look up MSGID in the current default message catalog for the current
GETTEXT (msgid)
const char *msgid;
{
- return DGETTEXT (NULL, msgid);
+ return DCGETTEXT (NULL, msgid, LC_MESSAGES);
}
#ifdef _LIBC
+++ /dev/null
-/* Internal header for GNU gettext internationalization functions.
- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#ifndef _GETTEXT_H
-#define _GETTEXT_H 1
-
-#include <stdio.h>
-
-#if HAVE_LIMITS_H || _LIBC
-# include <limits.h>
-#endif
-
-/* @@ end of prolog @@ */
-
-/* The magic number of the GNU message catalog format. */
-#define _MAGIC 0x950412de
-#define _MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format. */
-#define MO_REVISION_NUMBER 0
-
-/* The following contortions are an attempt to use the C preprocessor
- to determine an unsigned integral type that is 32 bits wide. An
- alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
- doing that would require that the configure script compile and *run*
- the resulting executable. Locally running cross-compiled executables
- is usually not possible. */
-
-#if __STDC__
-# define UINT_MAX_32_BITS 4294967295U
-#else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
- This should be valid for all systems GNU cares about because
- that doesn't include 16-bit systems, and only modern systems
- (that certainly have <limits.h>) have 64+-bit integral types. */
-
-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
-
-#if UINT_MAX == UINT_MAX_32_BITS
-typedef unsigned nls_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-typedef unsigned short nls_uint32;
-# else
-# if ULONG_MAX == UINT_MAX_32_BITS
-typedef unsigned long nls_uint32;
-# else
- /* The following line is intended to throw an error. Using #error is
- not portable enough. */
- "Cannot determine unsigned 32-bit data type."
-# endif
-# endif
-#endif
-
-
-/* Header for binary .mo file format. */
-struct mo_file_header
-{
- /* The magic number. */
- nls_uint32 magic;
- /* The revision number of the file format. */
- nls_uint32 revision;
- /* The number of strings pairs. */
- nls_uint32 nstrings;
- /* Offset of table with start offsets of original strings. */
- nls_uint32 orig_tab_offset;
- /* Offset of table with start offsets of translation strings. */
- nls_uint32 trans_tab_offset;
- /* Size of hashing table. */
- nls_uint32 hash_tab_size;
- /* Offset of first hashing entry. */
- nls_uint32 hash_tab_offset;
-};
-
-struct string_desc
-{
- /* Length of addressed string. */
- nls_uint32 length;
- /* Offset of string in file. */
- nls_uint32 offset;
-};
-
-/* @@ begin of epilog @@ */
-
-#endif /* gettext.h */
-/* Header describing internals of gettext library
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+/* Header describing internals of libintl library.
+ Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
+ Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
#ifndef _GETTEXTP_H
#define _GETTEXTP_H
+#include <stddef.h> /* Get size_t. */
+
+#ifdef _LIBC
+# include "../iconv/gconv_int.h"
+#else
+# if HAVE_ICONV
+# include <iconv.h>
+# endif
+#endif
+
#include "loadinfo.h"
+#include "gmo.h" /* Get nls_uint32. */
+
/* @@ end of prolog @@ */
#ifndef PARAMS
-# if __STDC__
+# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
# define PARAMS(args) args
# else
# define PARAMS(args) ()
# define internal_function
#endif
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
+/* Tell the compiler when a conditional or integer expression is
+ almost always true or almost always false. */
+#ifndef HAVE_BUILTIN_EXPECT
+# define __builtin_expect(expr, val) (expr)
+#endif
+
#ifndef W
# define W(flag, data) ((flag) ? SWAP (data) : (data))
#endif
# include <byteswap.h>
# define SWAP(i) bswap_32 (i)
#else
-static nls_uint32 SWAP PARAMS ((nls_uint32 i));
-
static inline nls_uint32
SWAP (i)
nls_uint32 i;
#endif
+/* In-memory representation of system dependent string. */
+struct sysdep_string_desc
+{
+ /* Length of addressed string, including the trailing NUL. */
+ size_t length;
+ /* Pointer to addressed string. */
+ const char *pointer;
+};
+
+/* The representation of an opened message catalog. */
struct loaded_domain
{
+ /* Pointer to memory containing the .mo file. */
const char *data;
+ /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */
int use_mmap;
+ /* Size of mmap()ed memory. */
size_t mmap_size;
+ /* 1 if the .mo file uses a different endianness than this machine. */
int must_swap;
+ /* Pointer to additional malloc()ed memory. */
+ void *malloced;
+
+ /* Number of static strings pairs. */
nls_uint32 nstrings;
- struct string_desc *orig_tab;
- struct string_desc *trans_tab;
+ /* Pointer to descriptors of original strings in the file. */
+ const struct string_desc *orig_tab;
+ /* Pointer to descriptors of translated strings in the file. */
+ const struct string_desc *trans_tab;
+
+ /* Number of system dependent strings pairs. */
+ nls_uint32 n_sysdep_strings;
+ /* Pointer to descriptors of original sysdep strings. */
+ const struct sysdep_string_desc *orig_sysdep_tab;
+ /* Pointer to descriptors of translated sysdep strings. */
+ const struct sysdep_string_desc *trans_sysdep_tab;
+
+ /* Size of hash table. */
nls_uint32 hash_size;
- nls_uint32 *hash_tab;
+ /* Pointer to hash table. */
+ const nls_uint32 *hash_tab;
+ /* 1 if the hash table uses a different endianness than this machine. */
+ int must_swap_hash_tab;
+
+ int codeset_cntr;
+#ifdef _LIBC
+ __gconv_t conv;
+#else
+# if HAVE_ICONV
+ iconv_t conv;
+# endif
+#endif
+ char **conv_tab;
+
+ struct expression *plural;
+ unsigned long int nplurals;
};
+/* We want to allocate a string at the end of the struct. But ISO C
+ doesn't allow zero sized arrays. */
+#ifdef __GNUC__
+# define ZERO 0
+#else
+# define ZERO 1
+#endif
+
+/* A set of settings bound to a message domain. Used to store settings
+ from bindtextdomain() and bind_textdomain_codeset(). */
struct binding
{
struct binding *next;
- char *domainname;
char *dirname;
+ int codeset_cntr; /* Incremented each time codeset changes. */
+ char *codeset;
+ char domainname[ZERO];
};
+/* A counter which is incremented each time some previous translations
+ become invalid.
+ This variable is part of the external ABI of the GNU libintl. */
+extern int _nl_msg_cat_cntr;
+
+#ifndef _LIBC
+const char *_nl_locale_name PARAMS ((int category, const char *categoryname));
+#endif
+
struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
char *__locale,
- const char *__domainname))
+ const char *__domainname,
+ struct binding *__domainbinding))
internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain))
+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain,
+ struct binding *__domainbinding))
internal_function;
void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
internal_function;
+const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file,
+ struct loaded_domain *__domain,
+ struct binding *__domainbinding))
+ internal_function;
+void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain))
+ internal_function;
+
+char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
+ struct binding *domainbinding,
+ const char *msgid, size_t *lengthp))
+ internal_function;
+
+#ifdef _LIBC
+extern char *__gettext PARAMS ((const char *__msgid));
+extern char *__dgettext PARAMS ((const char *__domainname,
+ const char *__msgid));
+extern char *__dcgettext PARAMS ((const char *__domainname,
+ const char *__msgid, int __category));
+extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
+ unsigned long int __n));
+extern char *__dngettext PARAMS ((const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ unsigned long int n));
+extern char *__dcngettext PARAMS ((const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ unsigned long int __n, int __category));
+extern char *__dcigettext PARAMS ((const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ int __plural, unsigned long int __n,
+ int __category));
+extern char *__textdomain PARAMS ((const char *__domainname));
+extern char *__bindtextdomain PARAMS ((const char *__domainname,
+ const char *__dirname));
+extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
+ const char *__codeset));
+#else
+extern char *libintl_gettext PARAMS ((const char *__msgid));
+extern char *libintl_dgettext PARAMS ((const char *__domainname,
+ const char *__msgid));
+extern char *libintl_dcgettext PARAMS ((const char *__domainname,
+ const char *__msgid, int __category));
+extern char *libintl_ngettext PARAMS ((const char *__msgid1,
+ const char *__msgid2,
+ unsigned long int __n));
+extern char *libintl_dngettext PARAMS ((const char *__domainname,
+ const char *__msgid1,
+ const char *__msgid2,
+ unsigned long int __n));
+extern char *libintl_dcngettext PARAMS ((const char *__domainname,
+ const char *__msgid1,
+ const char *__msgid2,
+ unsigned long int __n,
+ int __category));
+extern char *libintl_dcigettext PARAMS ((const char *__domainname,
+ const char *__msgid1,
+ const char *__msgid2,
+ int __plural, unsigned long int __n,
+ int __category));
+extern char *libintl_textdomain PARAMS ((const char *__domainname));
+extern char *libintl_bindtextdomain PARAMS ((const char *__domainname,
+ const char *__dirname));
+extern char *libintl_bind_textdomain_codeset PARAMS ((const char *__domainname,
+ const char *__codeset));
+#endif
/* @@ begin of epilog @@ */
--- /dev/null
+/* Description of GNU message catalog format: general file layout.
+ Copyright (C) 1995, 1997, 2000-2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _GETTEXT_H
+#define _GETTEXT_H 1
+
+#include <limits.h>
+
+/* @@ end of prolog @@ */
+
+/* The magic number of the GNU message catalog format. */
+#define _MAGIC 0x950412de
+#define _MAGIC_SWAPPED 0xde120495
+
+/* Revision number of the currently used .mo (binary) file format. */
+#define MO_REVISION_NUMBER 0
+
+/* The following contortions are an attempt to use the C preprocessor
+ to determine an unsigned integral type that is 32 bits wide. An
+ alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
+ as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
+ when cross-compiling. */
+
+#if __STDC__
+# define UINT_MAX_32_BITS 4294967295U
+#else
+# define UINT_MAX_32_BITS 0xFFFFFFFF
+#endif
+
+/* If UINT_MAX isn't defined, assume it's a 32-bit type.
+ This should be valid for all systems GNU cares about because
+ that doesn't include 16-bit systems, and only modern systems
+ (that certainly have <limits.h>) have 64+-bit integral types. */
+
+#ifndef UINT_MAX
+# define UINT_MAX UINT_MAX_32_BITS
+#endif
+
+#if UINT_MAX == UINT_MAX_32_BITS
+typedef unsigned nls_uint32;
+#else
+# if USHRT_MAX == UINT_MAX_32_BITS
+typedef unsigned short nls_uint32;
+# else
+# if ULONG_MAX == UINT_MAX_32_BITS
+typedef unsigned long nls_uint32;
+# else
+ /* The following line is intended to throw an error. Using #error is
+ not portable enough. */
+ "Cannot determine unsigned 32-bit data type."
+# endif
+# endif
+#endif
+
+
+/* Header for binary .mo file format. */
+struct mo_file_header
+{
+ /* The magic number. */
+ nls_uint32 magic;
+ /* The revision number of the file format. */
+ nls_uint32 revision;
+
+ /* The following are only used in .mo files with major revision 0. */
+
+ /* The number of strings pairs. */
+ nls_uint32 nstrings;
+ /* Offset of table with start offsets of original strings. */
+ nls_uint32 orig_tab_offset;
+ /* Offset of table with start offsets of translated strings. */
+ nls_uint32 trans_tab_offset;
+ /* Size of hash table. */
+ nls_uint32 hash_tab_size;
+ /* Offset of first hash table entry. */
+ nls_uint32 hash_tab_offset;
+
+ /* The following are only used in .mo files with minor revision >= 1. */
+
+ /* The number of system dependent segments. */
+ nls_uint32 n_sysdep_segments;
+ /* Offset of table describing system dependent segments. */
+ nls_uint32 sysdep_segments_offset;
+ /* The number of system dependent strings pairs. */
+ nls_uint32 n_sysdep_strings;
+ /* Offset of table with start offsets of original sysdep strings. */
+ nls_uint32 orig_sysdep_tab_offset;
+ /* Offset of table with start offsets of translated sysdep strings. */
+ nls_uint32 trans_sysdep_tab_offset;
+};
+
+/* Descriptor for static string contained in the binary .mo file. */
+struct string_desc
+{
+ /* Length of addressed string, not including the trailing NUL. */
+ nls_uint32 length;
+ /* Offset of string in file. */
+ nls_uint32 offset;
+};
+
+/* The following are only used in .mo files with minor revision >= 1. */
+
+/* Descriptor for system dependent string segment. */
+struct sysdep_segment
+{
+ /* Length of addressed string, including the trailing NUL. */
+ nls_uint32 length;
+ /* Offset of string in file. */
+ nls_uint32 offset;
+};
+
+/* Descriptor for system dependent string. */
+struct sysdep_string
+{
+ /* Offset of static string segments in file. */
+ nls_uint32 offset;
+ /* Alternating sequence of static and system dependent segments.
+ The last segment is a static segment, including the trailing NUL. */
+ struct segment_pair
+ {
+ /* Size of static segment. */
+ nls_uint32 segsize;
+ /* Reference to system dependent string segment, or ~0 at the end. */
+ nls_uint32 sysdepref;
+ } segments[1];
+};
+
+/* Marker for the end of the segments[] array. This has the value 0xFFFFFFFF,
+ regardless whether 'int' is 16 bit, 32 bit, or 64 bit. */
+#define SEGMENTS_END ((nls_uint32) ~0)
+
+/* @@ begin of epilog @@ */
+
+#endif /* gettext.h */
-/* Implements a string hashing function.
- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/* Description of GNU message catalog format: string hashing function.
+ Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
/* @@ end of prolog @@ */
#ifndef PARAMS
-# if __STDC__
+# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
# define PARAMS(Args) Args
# else
# define PARAMS(Args) ()
/* Defines the so called `hashpjw' function by P.J. Weinberger
[see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
1986, 1987 Bell Telephone Laboratories, Inc.] */
-static unsigned long hash_string PARAMS ((const char *__str_param));
+static unsigned long int hash_string PARAMS ((const char *__str_param));
-static inline unsigned long
+static inline unsigned long int
hash_string (str_param)
const char *str_param;
{
while (*str != '\0')
{
hval <<= 4;
- hval += (unsigned long) *str++;
- g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4));
+ hval += (unsigned long int) *str++;
+ g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
if (g != 0)
{
hval ^= g >> (HASHWORDBITS - 8);
/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
Library.
- Copyright (C) 1995 Software Foundation, Inc.
+ Copyright (C) 1995, 2000-2002 Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include "libgettext.h"
+#define _INTL_REDIRECT_MACROS
+#include "libgnuintl.h"
+#include "gettextP.h"
/* @@ end of prolog @@ */
+/* This file redirects the gettext functions (without prefix) to those
+ defined in the included GNU libintl library (with "libintl_" prefix).
+ It is compiled into libintl in order to make the AM_GNU_GETTEXT test
+ of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which
+ has the redirections primarily in the <libintl.h> include file. */
+
#undef gettext
#undef dgettext
#undef dcgettext
+#undef ngettext
+#undef dngettext
+#undef dcngettext
#undef textdomain
#undef bindtextdomain
+#undef bind_textdomain_codeset
char *
-bindtextdomain (domainname, dirname)
+gettext (msgid)
+ const char *msgid;
+{
+ return libintl_gettext (msgid);
+}
+
+
+char *
+dgettext (domainname, msgid)
const char *domainname;
- const char *dirname;
+ const char *msgid;
{
- return bindtextdomain__ (domainname, dirname);
+ return libintl_dgettext (domainname, msgid);
}
const char *msgid;
int category;
{
- return dcgettext__ (domainname, msgid, category);
+ return libintl_dcgettext (domainname, msgid, category);
}
char *
-dgettext (domainname, msgid)
+ngettext (msgid1, msgid2, n)
+ const char *msgid1;
+ const char *msgid2;
+ unsigned long int n;
+{
+ return libintl_ngettext (msgid1, msgid2, n);
+}
+
+
+char *
+dngettext (domainname, msgid1, msgid2, n)
const char *domainname;
- const char *msgid;
+ const char *msgid1;
+ const char *msgid2;
+ unsigned long int n;
{
- return dgettext__ (domainname, msgid);
+ return libintl_dngettext (domainname, msgid1, msgid2, n);
}
char *
-gettext (msgid)
- const char *msgid;
+dcngettext (domainname, msgid1, msgid2, n, category)
+ const char *domainname;
+ const char *msgid1;
+ const char *msgid2;
+ unsigned long int n;
+ int category;
{
- return gettext__ (msgid);
+ return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
}
textdomain (domainname)
const char *domainname;
{
- return textdomain__ (domainname);
+ return libintl_textdomain (domainname);
+}
+
+
+char *
+bindtextdomain (domainname, dirname)
+ const char *domainname;
+ const char *dirname;
+{
+ return libintl_bindtextdomain (domainname, dirname);
+}
+
+
+char *
+bind_textdomain_codeset (domainname, codeset)
+ const char *domainname;
+ const char *codeset;
+{
+ return libintl_bind_textdomain_codeset (domainname, codeset);
}
-/* Handle list of needed message catalogs
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+/* Tell glibc's <string.h> to provide a prototype for stpcpy().
+ This must come before <config.h> because <config.h> may include
+ <features.h>, and once <features.h> has been included, it's too late. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-# define strchr index
-# endif
-#endif
+#include <string.h>
#if defined _LIBC || defined HAVE_ARGZ_H
# include <argz.h>
#endif
#include <ctype.h>
#include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
#include "loadinfo.h"
# endif
#endif
+/* Pathname support.
+ ISSLASH(C) tests whether C is a directory separator character.
+ 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')) \
+ && (P)[1] == ':')
+# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
+#else
+ /* Unix */
+# define ISSLASH(C) ((C) == '/')
+# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
+#endif
+
/* Define function which are usually not available. */
#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
}
# undef __argz_count
# define __argz_count(argz, len) argz_count__ (argz, len)
+#else
+# ifdef _LIBC
+# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
+# endif
#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
}
# undef __argz_stringify
# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
+#else
+# ifdef _LIBC
+# define __argz_stringify(argz, len, sep) \
+ INTUSE(__argz_stringify) (argz, len, sep)
+# endif
#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
int do_allocate;
{
char *abs_filename;
- struct loaded_l10nfile *last = NULL;
+ struct loaded_l10nfile **lastp;
struct loaded_l10nfile *retval;
char *cp;
+ size_t dirlist_count;
size_t entries;
int cnt;
+ /* If LANGUAGE contains an absolute directory specification, we ignore
+ DIRLIST. */
+ if (IS_ABSOLUTE_PATH (language))
+ dirlist_len = 0;
+
/* Allocate room for the full file name. */
abs_filename = (char *) malloc (dirlist_len
+ strlen (language)
+ (((mask & CEN_SPONSOR) != 0
|| (mask & CEN_REVISION) != 0)
? (1 + ((mask & CEN_SPONSOR) != 0
- ? strlen (sponsor) + 1 : 0)
+ ? strlen (sponsor) : 0)
+ ((mask & CEN_REVISION) != 0
? strlen (revision) + 1 : 0)) : 0)
+ 1 + strlen (filename) + 1);
if (abs_filename == NULL)
return NULL;
- retval = NULL;
- last = NULL;
-
/* Construct file name. */
- memcpy (abs_filename, dirlist, dirlist_len);
- __argz_stringify (abs_filename, dirlist_len, ':');
- cp = abs_filename + (dirlist_len - 1);
- *cp++ = '/';
+ cp = abs_filename;
+ if (dirlist_len > 0)
+ {
+ memcpy (cp, dirlist, dirlist_len);
+ __argz_stringify (cp, dirlist_len, PATH_SEPARATOR);
+ cp += dirlist_len;
+ cp[-1] = '/';
+ }
+
cp = stpcpy (cp, language);
if ((mask & TERRITORY) != 0)
/* Look in list of already loaded domains whether it is already
available. */
- last = NULL;
+ lastp = l10nfile_list;
for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
if (retval->filename != NULL)
{
break;
}
- last = retval;
+ lastp = &retval->next;
}
if (retval != NULL || do_allocate == 0)
return retval;
}
- retval = (struct loaded_l10nfile *)
- malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
- * (1 << pop (mask))
- * sizeof (struct loaded_l10nfile *)));
+ dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1);
+
+ /* Allocate a new loaded_l10nfile. */
+ retval =
+ (struct loaded_l10nfile *)
+ malloc (sizeof (*retval)
+ + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0))
+ * sizeof (struct loaded_l10nfile *)));
if (retval == NULL)
return NULL;
retval->filename = abs_filename;
- retval->decided = (__argz_count (dirlist, dirlist_len) != 1
+
+ /* We set retval->data to NULL here; it is filled in later.
+ Setting retval->decided to 1 here means that retval does not
+ correspond to a real file (dirlist_count > 1) or is not worth
+ looking up (if an unnormalized codeset was specified). */
+ retval->decided = (dirlist_count > 1
|| ((mask & XPG_CODESET) != 0
&& (mask & XPG_NORM_CODESET) != 0));
retval->data = NULL;
- if (last == NULL)
- {
- retval->next = *l10nfile_list;
- *l10nfile_list = retval;
- }
- else
- {
- retval->next = last->next;
- last->next = retval;
- }
+ retval->next = *lastp;
+ *lastp = retval;
entries = 0;
- /* If the DIRLIST is a real list the RETVAL entry corresponds not to
- a real file. So we have to use the DIRLIST separation mechanism
- of the inner loop. */
- cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
- for (; cnt >= 0; --cnt)
+ /* Recurse to fill the inheritance list of RETVAL.
+ If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL
+ entry does not correspond to a real file; retval->filename contains
+ colons. In this case we loop across all elements of DIRLIST and
+ across all bit patterns dominated by MASK.
+ If the DIRLIST is a single directory or entirely redundant (i.e.
+ DIRLIST_COUNT == 1), we loop across all bit patterns dominated by
+ MASK, excluding MASK itself.
+ In either case, we loop down from MASK to 0. This has the effect
+ that the extra bits in the locale name are dropped in this order:
+ first the modifier, then the territory, then the codeset, then the
+ normalized_codeset. */
+ for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt)
if ((cnt & ~mask) == 0
&& ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
&& ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
{
- /* Iterate over all elements of the DIRLIST. */
- char *dir = NULL;
-
- while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
- != NULL)
+ if (dirlist_count > 1)
+ {
+ /* Iterate over all elements of the DIRLIST. */
+ char *dir = NULL;
+
+ while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
+ != NULL)
+ retval->successor[entries++]
+ = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,
+ cnt, language, territory, codeset,
+ normalized_codeset, modifier, special,
+ sponsor, revision, filename, 1);
+ }
+ else
retval->successor[entries++]
- = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
- language, territory, codeset,
+ = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len,
+ cnt, language, territory, codeset,
normalized_codeset, modifier, special,
sponsor, revision, filename, 1);
}
\f
/* Normalize codeset name. There is no standard for the codeset
names. Normalization allows the user to use any of the common
- names. */
+ names. The return value is dynamically allocated and has to be
+ freed by the caller. */
const char *
_nl_normalize_codeset (codeset, name_len)
- const unsigned char *codeset;
+ const char *codeset;
size_t name_len;
{
int len = 0;
size_t cnt;
for (cnt = 0; cnt < name_len; ++cnt)
- if (isalnum (codeset[cnt]))
+ if (isalnum ((unsigned char) codeset[cnt]))
{
++len;
- if (isalpha (codeset[cnt]))
+ if (isalpha ((unsigned char) codeset[cnt]))
only_digit = 0;
}
wp = retval;
for (cnt = 0; cnt < name_len; ++cnt)
- if (isalpha (codeset[cnt]))
- *wp++ = tolower (codeset[cnt]);
- else if (isdigit (codeset[cnt]))
+ if (isalpha ((unsigned char) codeset[cnt]))
+ *wp++ = tolower ((unsigned char) codeset[cnt]);
+ else if (isdigit ((unsigned char) codeset[cnt]))
*wp++ = codeset[cnt];
*wp = '\0';
--- /dev/null
+/* Message catalogs for internationalization.
+ Copyright (C) 1995-1997, 2000-2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _LIBINTL_H
+#define _LIBINTL_H 1
+
+#include <locale.h>
+
+/* The LC_MESSAGES locale category is the category used by the functions
+ gettext() and dgettext(). It is specified in POSIX, but not in ANSI C.
+ On systems that don't define it, use an arbitrary value instead.
+ On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
+ then includes <libintl.h> (i.e. this file!) and then only defines
+ LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES
+ in this case. */
+#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
+# define LC_MESSAGES 1729
+#endif
+
+/* We define an additional symbol to signal that we use the GNU
+ implementation of gettext. */
+#define __USE_GNU_GETTEXT 1
+
+/* 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. */
+#ifdef __DJGPP__
+# undef gettext
+#endif
+
+/* Use _INTL_PARAMS, not PARAMS, in order to avoid clashes with identifiers
+ used by programs. Similarly, test __PROTOTYPES, not PROTOTYPES. */
+#ifndef _INTL_PARAMS
+# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
+# define _INTL_PARAMS(args) args
+# else
+# define _INTL_PARAMS(args) ()
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* We redirect the functions to those prefixed with "libintl_". This is
+ necessary, because some systems define gettext/textdomain/... in the C
+ library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
+ If we used the unprefixed names, there would be cases where the
+ definition in the C library would override the one in the libintl.so
+ shared library. Recall that on ELF systems, the symbols are looked
+ up in the following order:
+ 1. in the executable,
+ 2. in the shared libraries specified on the link command line, in order,
+ 3. in the dependencies of the shared libraries specified on the link
+ command line,
+ 4. in the dlopen()ed shared libraries, in the order in which they were
+ dlopen()ed.
+ The definition in the C library would override the one in libintl.so if
+ either
+ * -lc is given on the link command line and -lintl isn't, or
+ * -lc is given on the link command line before -lintl, or
+ * libintl.so is a dependency of a dlopen()ed shared library but not
+ linked to the executable at link time.
+ Since Solaris gettext() behaves differently than GNU gettext(), this
+ would be unacceptable.
+
+ The redirection happens by default through macros in C, so that &gettext
+ is independent of the compilation unit, but through inline functions in
+ C++, in order not to interfere with the name mangling of class fields or
+ class methods called 'gettext'. */
+
+/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
+ If he doesn't, we choose the method. A third possible method is
+ _INTL_REDIRECT_ASM, supported only by GCC. */
+#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
+# if __GNUC__ >= 2 && (defined __STDC__ || defined __cplusplus)
+# define _INTL_REDIRECT_ASM
+# else
+# ifdef __cplusplus
+# define _INTL_REDIRECT_INLINE
+# else
+# define _INTL_REDIRECT_MACROS
+# endif
+# endif
+#endif
+/* Auxiliary macros. */
+#ifdef _INTL_REDIRECT_ASM
+# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
+# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
+# define _INTL_STRINGIFY(prefix) #prefix
+#else
+# define _INTL_ASM(cname)
+#endif
+
+/* Look up MSGID in the current default message catalog for the current
+ LC_MESSAGES locale. If not found, returns MSGID itself (the default
+ text). */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_gettext (const char *__msgid);
+static inline char *gettext (const char *__msgid)
+{
+ return libintl_gettext (__msgid);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define gettext libintl_gettext
+#endif
+extern char *gettext _INTL_PARAMS ((const char *__msgid))
+ _INTL_ASM (libintl_gettext);
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+ LC_MESSAGES locale. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dgettext (const char *__domainname, const char *__msgid);
+static inline char *dgettext (const char *__domainname, const char *__msgid)
+{
+ return libintl_dgettext (__domainname, __msgid);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dgettext libintl_dgettext
+#endif
+extern char *dgettext _INTL_PARAMS ((const char *__domainname,
+ const char *__msgid))
+ _INTL_ASM (libintl_dgettext);
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+ locale. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
+ int __category);
+static inline char *dcgettext (const char *__domainname, const char *__msgid,
+ int __category)
+{
+ return libintl_dcgettext (__domainname, __msgid, __category);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dcgettext libintl_dcgettext
+#endif
+extern char *dcgettext _INTL_PARAMS ((const char *__domainname,
+ const char *__msgid,
+ int __category))
+ _INTL_ASM (libintl_dcgettext);
+#endif
+
+
+/* Similar to `gettext' but select the plural form corresponding to the
+ number N. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
+ unsigned long int __n);
+static inline char *ngettext (const char *__msgid1, const char *__msgid2,
+ unsigned long int __n)
+{
+ return libintl_ngettext (__msgid1, __msgid2, __n);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define ngettext libintl_ngettext
+#endif
+extern char *ngettext _INTL_PARAMS ((const char *__msgid1,
+ const char *__msgid2,
+ unsigned long int __n))
+ _INTL_ASM (libintl_ngettext);
+#endif
+
+/* Similar to `dgettext' but select the plural form corresponding to the
+ number N. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
+ const char *__msgid2, unsigned long int __n);
+static inline char *dngettext (const char *__domainname, const char *__msgid1,
+ const char *__msgid2, unsigned long int __n)
+{
+ return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dngettext libintl_dngettext
+#endif
+extern char *dngettext _INTL_PARAMS ((const char *__domainname,
+ const char *__msgid1,
+ const char *__msgid2,
+ unsigned long int __n))
+ _INTL_ASM (libintl_dngettext);
+#endif
+
+/* Similar to `dcgettext' but select the plural form corresponding to the
+ number N. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dcngettext (const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ unsigned long int __n, int __category);
+static inline char *dcngettext (const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ unsigned long int __n, int __category)
+{
+ return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dcngettext libintl_dcngettext
+#endif
+extern char *dcngettext _INTL_PARAMS ((const char *__domainname,
+ const char *__msgid1,
+ const char *__msgid2,
+ unsigned long int __n,
+ int __category))
+ _INTL_ASM (libintl_dcngettext);
+#endif
+
+
+/* Set the current default message catalog to DOMAINNAME.
+ If DOMAINNAME is null, return the current default.
+ If DOMAINNAME is "", reset to the default of "messages". */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_textdomain (const char *__domainname);
+static inline char *textdomain (const char *__domainname)
+{
+ return libintl_textdomain (__domainname);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define textdomain libintl_textdomain
+#endif
+extern char *textdomain _INTL_PARAMS ((const char *__domainname))
+ _INTL_ASM (libintl_textdomain);
+#endif
+
+/* Specify that the DOMAINNAME message catalog will be found
+ in DIRNAME rather than in the system locale data base. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_bindtextdomain (const char *__domainname,
+ const char *__dirname);
+static inline char *bindtextdomain (const char *__domainname,
+ const char *__dirname)
+{
+ return libintl_bindtextdomain (__domainname, __dirname);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define bindtextdomain libintl_bindtextdomain
+#endif
+extern char *bindtextdomain _INTL_PARAMS ((const char *__domainname,
+ const char *__dirname))
+ _INTL_ASM (libintl_bindtextdomain);
+#endif
+
+/* Specify the character encoding in which the messages from the
+ DOMAINNAME message catalog will be returned. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_bind_textdomain_codeset (const char *__domainname,
+ const char *__codeset);
+static inline char *bind_textdomain_codeset (const char *__domainname,
+ const char *__codeset)
+{
+ return libintl_bind_textdomain_codeset (__domainname, __codeset);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define bind_textdomain_codeset libintl_bind_textdomain_codeset
+#endif
+extern char *bind_textdomain_codeset _INTL_PARAMS ((const char *__domainname,
+ const char *__codeset))
+ _INTL_ASM (libintl_bind_textdomain_codeset);
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* libintl.h */
+++ /dev/null
-# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number. We use always set number 1.
-#
-1 {
- i\
-$set 1 # Automatically created by po2msg.sed
- h
- s/.*/0/
- x
-}
-#
-# Mitch's old catalog format does not allow comments.
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
- s/msgid[ ]*"//
-#
-# This does not work now with the new format.
-# /"$/! {
-# s/\\$//
-# s/$/ ... (more lines following)"/
-# }
- x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
- td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
- :d
- s/9\(_*\)$/_\1/
- td
-# Assure at least one digit is available.
- s/^\(_*\)$/0\1/
-# Increment the last digit.
- s/8\(_*\)$/9\1/
- s/7\(_*\)$/8\1/
- s/6\(_*\)$/7\1/
- s/5\(_*\)$/6\1/
- s/4\(_*\)$/5\1/
- s/3\(_*\)$/4\1/
- s/2\(_*\)$/3\1/
- s/1\(_*\)$/2\1/
- s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
- s/_/0/g
- x
- G
- s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID. Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here. (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
- s/msgstr[ ]*"\(.*\)"/# \1/
-# Clear substitution flag.
- tb
-# Append the next line.
- :b
- N
-# Look whether second part is continuation line.
- s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
- ta
- P
- D
-# Note that D includes a jump to the start!!
-# We found a continuation line. But before printing insert '\'.
- :a
- s/\(.*\)\(\n.*\)/\1\\\2/
- P
-# We cannot use D here.
- s/.*\n\(.*\)/\1/
- tb
-}
-d
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1999, 2000-2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _LOADINFO_H
+#define _LOADINFO_H 1
+
+/* Declarations of locale dependent catalog lookup functions.
+ Implemented in
+
+ localealias.c Possibly replace a locale name by another.
+ explodename.c Split a locale name into its various fields.
+ l10nflist.c Generate a list of filenames of possible message catalogs.
+ finddomain.c Find and open the relevant message catalogs.
+
+ The main function _nl_find_domain() in finddomain.c is declared
+ in gettextP.h.
+ */
#ifndef PARAMS
-# if __STDC__
+# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
# define PARAMS(args) args
# else
# define PARAMS(args) ()
# endif
#endif
+#ifndef internal_function
+# define internal_function
+#endif
+
+/* Tell the compiler when a conditional or integer expression is
+ almost always true or almost always false. */
+#ifndef HAVE_BUILTIN_EXPECT
+# define __builtin_expect(expr, val) (expr)
+#endif
+
+/* Separator in PATH like lists of pathnames. */
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+ /* Win32, OS/2, DOS */
+# define PATH_SEPARATOR ';'
+#else
+ /* Unix */
+# define PATH_SEPARATOR ':'
+#endif
+
/* Encoding of locale name parts. */
#define CEN_REVISION 1
#define CEN_SPONSOR 2
};
-extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset,
+/* Normalize codeset name. There is no standard for the codeset
+ names. Normalization allows the user to use any of the common
+ names. The return value is dynamically allocated and has to be
+ freed by the caller. */
+extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
size_t name_len));
+/* Lookup a locale dependent file.
+ *L10NFILE_LIST denotes a pool of lookup results of locale dependent
+ files of the same kind, sorted in decreasing order of ->filename.
+ DIRLIST and DIRLIST_LEN are an argz list of directories in which to
+ look, containing at least one directory (i.e. DIRLIST_LEN > 0).
+ MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER,
+ SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as
+ produced by _nl_explode_name(). FILENAME is the filename suffix.
+ The return value is the lookup result, either found in *L10NFILE_LIST,
+ or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
+ If the return value is non-NULL, it is added to *L10NFILE_LIST, and
+ its ->next field denotes the chaining inside *L10NFILE_LIST, and
+ furthermore its ->successor[] field contains a list of other lookup
+ results from which this lookup result inherits. */
extern struct loaded_l10nfile *
_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
const char *dirlist, size_t dirlist_len, int mask,
const char *sponsor, const char *revision,
const char *filename, int do_allocate));
-
+/* Lookup the real locale name for a locale alias NAME, or NULL if
+ NAME is not a locale alias (but possibly a real locale name).
+ The return value is statically allocated and must not be freed. */
extern const char *_nl_expand_alias PARAMS ((const char *name));
+/* Split a locale name NAME into its pieces: language, modifier,
+ territory, codeset, special, sponsor, revision.
+ NAME gets destructively modified: NUL bytes are inserted here and
+ there. *LANGUAGE gets assigned NAME. Each of *MODIFIER, *TERRITORY,
+ *CODESET, *SPECIAL, *SPONSOR, *REVISION gets assigned either a
+ pointer into the old NAME string, or NULL. *NORMALIZED_CODESET
+ gets assigned the expanded *CODESET, if it is different from *CODESET;
+ this one is dynamically allocated and has to be freed by the caller.
+ The return value is a bitmask, where each bit corresponds to one
+ filled-in value:
+ XPG_MODIFIER, CEN_AUDIENCE for *MODIFIER,
+ TERRITORY for *TERRITORY,
+ XPG_CODESET for *CODESET,
+ XPG_NORM_CODESET for *NORMALIZED_CODESET,
+ CEN_SPECIAL for *SPECIAL,
+ CEN_SPONSOR for *SPONSOR,
+ CEN_REVISION for *REVISION.
+ */
extern int _nl_explode_name PARAMS ((char *name, const char **language,
const char **modifier,
const char **territory,
const char **special,
const char **sponsor,
const char **revision));
+
+/* Split a locale name NAME into a leading language part and all the
+ rest. Return a pointer to the first character after the language,
+ i.e. to the first byte of the rest. */
+extern char *_nl_find_language PARAMS ((const char *name));
+
+#endif /* loadinfo.h */
/* Load needed message catalogs.
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+/* Tell glibc's <string.h> to provide a prototype for mempcpy().
+ This must come before <config.h> because <config.h> may include
+ <features.h>, and once <features.h> has been included, it's too late. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include <ctype.h>
+#include <errno.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# if defined HAVE_ALLOCA_H || defined _LIBC
+# include <alloca.h>
+# else
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca
+char *alloca ();
+# endif
+# endif
+# endif
#endif
+#include <stdlib.h>
+#include <string.h>
+
#if defined HAVE_UNISTD_H || defined _LIBC
# include <unistd.h>
#endif
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC
+#ifdef _LIBC
+# include <langinfo.h>
+# include <locale.h>
+#endif
+
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+ || (defined _LIBC && defined _POSIX_MAPPED_FILES)
# include <sys/mman.h>
+# undef HAVE_MMAP
+# define HAVE_MMAP 1
+#else
+# undef HAVE_MMAP
#endif
-#include "gettext.h"
+#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC
+# include <stdint.h>
+#endif
+#if defined HAVE_INTTYPES_H || defined _LIBC
+# include <inttypes.h>
+#endif
+
+#include "gmo.h"
#include "gettextP.h"
+#include "hash-string.h"
+#include "plural-exp.h"
+
+#ifdef _LIBC
+# include "../locale/localeinfo.h"
+#endif
+
+/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
+ Note that our fallback values need not be literal strings, because we don't
+ use them with preprocessor string concatenation. */
+#if !defined PRId8 || PRI_MACROS_BROKEN
+# undef PRId8
+# define PRId8 "d"
+#endif
+#if !defined PRIi8 || PRI_MACROS_BROKEN
+# undef PRIi8
+# define PRIi8 "i"
+#endif
+#if !defined PRIo8 || PRI_MACROS_BROKEN
+# undef PRIo8
+# define PRIo8 "o"
+#endif
+#if !defined PRIu8 || PRI_MACROS_BROKEN
+# undef PRIu8
+# define PRIu8 "u"
+#endif
+#if !defined PRIx8 || PRI_MACROS_BROKEN
+# undef PRIx8
+# define PRIx8 "x"
+#endif
+#if !defined PRIX8 || PRI_MACROS_BROKEN
+# undef PRIX8
+# define PRIX8 "X"
+#endif
+#if !defined PRId16 || PRI_MACROS_BROKEN
+# undef PRId16
+# define PRId16 "d"
+#endif
+#if !defined PRIi16 || PRI_MACROS_BROKEN
+# undef PRIi16
+# define PRIi16 "i"
+#endif
+#if !defined PRIo16 || PRI_MACROS_BROKEN
+# undef PRIo16
+# define PRIo16 "o"
+#endif
+#if !defined PRIu16 || PRI_MACROS_BROKEN
+# undef PRIu16
+# define PRIu16 "u"
+#endif
+#if !defined PRIx16 || PRI_MACROS_BROKEN
+# undef PRIx16
+# define PRIx16 "x"
+#endif
+#if !defined PRIX16 || PRI_MACROS_BROKEN
+# undef PRIX16
+# define PRIX16 "X"
+#endif
+#if !defined PRId32 || PRI_MACROS_BROKEN
+# undef PRId32
+# define PRId32 "d"
+#endif
+#if !defined PRIi32 || PRI_MACROS_BROKEN
+# undef PRIi32
+# define PRIi32 "i"
+#endif
+#if !defined PRIo32 || PRI_MACROS_BROKEN
+# undef PRIo32
+# define PRIo32 "o"
+#endif
+#if !defined PRIu32 || PRI_MACROS_BROKEN
+# undef PRIu32
+# define PRIu32 "u"
+#endif
+#if !defined PRIx32 || PRI_MACROS_BROKEN
+# undef PRIx32
+# define PRIx32 "x"
+#endif
+#if !defined PRIX32 || PRI_MACROS_BROKEN
+# undef PRIX32
+# define PRIX32 "X"
+#endif
+#if !defined PRId64 || PRI_MACROS_BROKEN
+# undef PRId64
+# define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
+#endif
+#if !defined PRIi64 || PRI_MACROS_BROKEN
+# undef PRIi64
+# define PRIi64 (sizeof (long) == 8 ? "li" : "lli")
+#endif
+#if !defined PRIo64 || PRI_MACROS_BROKEN
+# undef PRIo64
+# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo")
+#endif
+#if !defined PRIu64 || PRI_MACROS_BROKEN
+# undef PRIu64
+# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
+#endif
+#if !defined PRIx64 || PRI_MACROS_BROKEN
+# undef PRIx64
+# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx")
+#endif
+#if !defined PRIX64 || PRI_MACROS_BROKEN
+# undef PRIX64
+# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX")
+#endif
+#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN
+# undef PRIdLEAST8
+# define PRIdLEAST8 "d"
+#endif
+#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN
+# undef PRIiLEAST8
+# define PRIiLEAST8 "i"
+#endif
+#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN
+# undef PRIoLEAST8
+# define PRIoLEAST8 "o"
+#endif
+#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN
+# undef PRIuLEAST8
+# define PRIuLEAST8 "u"
+#endif
+#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN
+# undef PRIxLEAST8
+# define PRIxLEAST8 "x"
+#endif
+#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN
+# undef PRIXLEAST8
+# define PRIXLEAST8 "X"
+#endif
+#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN
+# undef PRIdLEAST16
+# define PRIdLEAST16 "d"
+#endif
+#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN
+# undef PRIiLEAST16
+# define PRIiLEAST16 "i"
+#endif
+#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN
+# undef PRIoLEAST16
+# define PRIoLEAST16 "o"
+#endif
+#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN
+# undef PRIuLEAST16
+# define PRIuLEAST16 "u"
+#endif
+#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN
+# undef PRIxLEAST16
+# define PRIxLEAST16 "x"
+#endif
+#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN
+# undef PRIXLEAST16
+# define PRIXLEAST16 "X"
+#endif
+#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN
+# undef PRIdLEAST32
+# define PRIdLEAST32 "d"
+#endif
+#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN
+# undef PRIiLEAST32
+# define PRIiLEAST32 "i"
+#endif
+#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN
+# undef PRIoLEAST32
+# define PRIoLEAST32 "o"
+#endif
+#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN
+# undef PRIuLEAST32
+# define PRIuLEAST32 "u"
+#endif
+#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN
+# undef PRIxLEAST32
+# define PRIxLEAST32 "x"
+#endif
+#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN
+# undef PRIXLEAST32
+# define PRIXLEAST32 "X"
+#endif
+#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN
+# undef PRIdLEAST64
+# define PRIdLEAST64 PRId64
+#endif
+#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN
+# undef PRIiLEAST64
+# define PRIiLEAST64 PRIi64
+#endif
+#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN
+# undef PRIoLEAST64
+# define PRIoLEAST64 PRIo64
+#endif
+#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN
+# undef PRIuLEAST64
+# define PRIuLEAST64 PRIu64
+#endif
+#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN
+# undef PRIxLEAST64
+# define PRIxLEAST64 PRIx64
+#endif
+#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN
+# undef PRIXLEAST64
+# define PRIXLEAST64 PRIX64
+#endif
+#if !defined PRIdFAST8 || PRI_MACROS_BROKEN
+# undef PRIdFAST8
+# define PRIdFAST8 "d"
+#endif
+#if !defined PRIiFAST8 || PRI_MACROS_BROKEN
+# undef PRIiFAST8
+# define PRIiFAST8 "i"
+#endif
+#if !defined PRIoFAST8 || PRI_MACROS_BROKEN
+# undef PRIoFAST8
+# define PRIoFAST8 "o"
+#endif
+#if !defined PRIuFAST8 || PRI_MACROS_BROKEN
+# undef PRIuFAST8
+# define PRIuFAST8 "u"
+#endif
+#if !defined PRIxFAST8 || PRI_MACROS_BROKEN
+# undef PRIxFAST8
+# define PRIxFAST8 "x"
+#endif
+#if !defined PRIXFAST8 || PRI_MACROS_BROKEN
+# undef PRIXFAST8
+# define PRIXFAST8 "X"
+#endif
+#if !defined PRIdFAST16 || PRI_MACROS_BROKEN
+# undef PRIdFAST16
+# define PRIdFAST16 "d"
+#endif
+#if !defined PRIiFAST16 || PRI_MACROS_BROKEN
+# undef PRIiFAST16
+# define PRIiFAST16 "i"
+#endif
+#if !defined PRIoFAST16 || PRI_MACROS_BROKEN
+# undef PRIoFAST16
+# define PRIoFAST16 "o"
+#endif
+#if !defined PRIuFAST16 || PRI_MACROS_BROKEN
+# undef PRIuFAST16
+# define PRIuFAST16 "u"
+#endif
+#if !defined PRIxFAST16 || PRI_MACROS_BROKEN
+# undef PRIxFAST16
+# define PRIxFAST16 "x"
+#endif
+#if !defined PRIXFAST16 || PRI_MACROS_BROKEN
+# undef PRIXFAST16
+# define PRIXFAST16 "X"
+#endif
+#if !defined PRIdFAST32 || PRI_MACROS_BROKEN
+# undef PRIdFAST32
+# define PRIdFAST32 "d"
+#endif
+#if !defined PRIiFAST32 || PRI_MACROS_BROKEN
+# undef PRIiFAST32
+# define PRIiFAST32 "i"
+#endif
+#if !defined PRIoFAST32 || PRI_MACROS_BROKEN
+# undef PRIoFAST32
+# define PRIoFAST32 "o"
+#endif
+#if !defined PRIuFAST32 || PRI_MACROS_BROKEN
+# undef PRIuFAST32
+# define PRIuFAST32 "u"
+#endif
+#if !defined PRIxFAST32 || PRI_MACROS_BROKEN
+# undef PRIxFAST32
+# define PRIxFAST32 "x"
+#endif
+#if !defined PRIXFAST32 || PRI_MACROS_BROKEN
+# undef PRIXFAST32
+# define PRIXFAST32 "X"
+#endif
+#if !defined PRIdFAST64 || PRI_MACROS_BROKEN
+# undef PRIdFAST64
+# define PRIdFAST64 PRId64
+#endif
+#if !defined PRIiFAST64 || PRI_MACROS_BROKEN
+# undef PRIiFAST64
+# define PRIiFAST64 PRIi64
+#endif
+#if !defined PRIoFAST64 || PRI_MACROS_BROKEN
+# undef PRIoFAST64
+# define PRIoFAST64 PRIo64
+#endif
+#if !defined PRIuFAST64 || PRI_MACROS_BROKEN
+# undef PRIuFAST64
+# define PRIuFAST64 PRIu64
+#endif
+#if !defined PRIxFAST64 || PRI_MACROS_BROKEN
+# undef PRIxFAST64
+# define PRIxFAST64 PRIx64
+#endif
+#if !defined PRIXFAST64 || PRI_MACROS_BROKEN
+# undef PRIXFAST64
+# define PRIXFAST64 PRIX64
+#endif
+#if !defined PRIdMAX || PRI_MACROS_BROKEN
+# undef PRIdMAX
+# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld")
+#endif
+#if !defined PRIiMAX || PRI_MACROS_BROKEN
+# undef PRIiMAX
+# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli")
+#endif
+#if !defined PRIoMAX || PRI_MACROS_BROKEN
+# undef PRIoMAX
+# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo")
+#endif
+#if !defined PRIuMAX || PRI_MACROS_BROKEN
+# undef PRIuMAX
+# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu")
+#endif
+#if !defined PRIxMAX || PRI_MACROS_BROKEN
+# undef PRIxMAX
+# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx")
+#endif
+#if !defined PRIXMAX || PRI_MACROS_BROKEN
+# undef PRIXMAX
+# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX")
+#endif
+#if !defined PRIdPTR || PRI_MACROS_BROKEN
+# undef PRIdPTR
+# define PRIdPTR \
+ (sizeof (void *) == sizeof (long) ? "ld" : \
+ sizeof (void *) == sizeof (int) ? "d" : \
+ "lld")
+#endif
+#if !defined PRIiPTR || PRI_MACROS_BROKEN
+# undef PRIiPTR
+# define PRIiPTR \
+ (sizeof (void *) == sizeof (long) ? "li" : \
+ sizeof (void *) == sizeof (int) ? "i" : \
+ "lli")
+#endif
+#if !defined PRIoPTR || PRI_MACROS_BROKEN
+# undef PRIoPTR
+# define PRIoPTR \
+ (sizeof (void *) == sizeof (long) ? "lo" : \
+ sizeof (void *) == sizeof (int) ? "o" : \
+ "llo")
+#endif
+#if !defined PRIuPTR || PRI_MACROS_BROKEN
+# undef PRIuPTR
+# define PRIuPTR \
+ (sizeof (void *) == sizeof (long) ? "lu" : \
+ sizeof (void *) == sizeof (int) ? "u" : \
+ "llu")
+#endif
+#if !defined PRIxPTR || PRI_MACROS_BROKEN
+# undef PRIxPTR
+# define PRIxPTR \
+ (sizeof (void *) == sizeof (long) ? "lx" : \
+ sizeof (void *) == sizeof (int) ? "x" : \
+ "llx")
+#endif
+#if !defined PRIXPTR || PRI_MACROS_BROKEN
+# undef PRIXPTR
+# define PRIXPTR \
+ (sizeof (void *) == sizeof (long) ? "lX" : \
+ sizeof (void *) == sizeof (int) ? "X" : \
+ "llX")
+#endif
/* @@ end of prolog @@ */
# define munmap __munmap
#endif
+/* For those losing systems which don't have `alloca' we have to add
+ some additional code emulating it. */
+#ifdef HAVE_ALLOCA
+# define freea(p) /* nothing */
+#else
+# define alloca(n) malloc (n)
+# define freea(p) free (p)
+#endif
+
+/* For systems that distinguish between text and binary I/O.
+ O_BINARY is usually declared in <fcntl.h>. */
+#if !defined O_BINARY && defined _O_BINARY
+ /* For MSC-compatible compilers. */
+# define O_BINARY _O_BINARY
+# define O_TEXT _O_TEXT
+#endif
+#ifdef __BEOS__
+ /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */
+# undef O_BINARY
+# undef O_TEXT
+#endif
+/* On reasonable systems, binary I/O is the default. */
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
+
+
+/* Prototypes for local functions. Needed to ensure compiler checking of
+ function argument counts despite of K&R C function definition syntax. */
+static const char *get_sysdep_segment_value PARAMS ((const char *name));
+
+
/* We need a sign, whether a new catalog was loaded, which can be associated
with all translations. This is important if the translations are
cached by one of GCC's features. */
-int _nl_msg_cat_cntr = 0;
+int _nl_msg_cat_cntr;
+
+
+/* Expand a system dependent string segment. Return NULL if unsupported. */
+static const char *
+get_sysdep_segment_value (name)
+ const char *name;
+{
+ /* Test for an ISO C 99 section 7.8.1 format string directive.
+ Syntax:
+ P R I { d | i | o | u | x | X }
+ { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */
+ /* We don't use a table of 14 times 6 'const char *' strings here, because
+ data relocations cost startup time. */
+ if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I')
+ {
+ if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u'
+ || name[3] == 'x' || name[3] == 'X')
+ {
+ if (name[4] == '8' && name[5] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRId8;
+ if (name[3] == 'i')
+ return PRIi8;
+ if (name[3] == 'o')
+ return PRIo8;
+ if (name[3] == 'u')
+ return PRIu8;
+ if (name[3] == 'x')
+ return PRIx8;
+ if (name[3] == 'X')
+ return PRIX8;
+ abort ();
+ }
+ if (name[4] == '1' && name[5] == '6' && name[6] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRId16;
+ if (name[3] == 'i')
+ return PRIi16;
+ if (name[3] == 'o')
+ return PRIo16;
+ if (name[3] == 'u')
+ return PRIu16;
+ if (name[3] == 'x')
+ return PRIx16;
+ if (name[3] == 'X')
+ return PRIX16;
+ abort ();
+ }
+ if (name[4] == '3' && name[5] == '2' && name[6] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRId32;
+ if (name[3] == 'i')
+ return PRIi32;
+ if (name[3] == 'o')
+ return PRIo32;
+ if (name[3] == 'u')
+ return PRIu32;
+ if (name[3] == 'x')
+ return PRIx32;
+ if (name[3] == 'X')
+ return PRIX32;
+ abort ();
+ }
+ if (name[4] == '6' && name[5] == '4' && name[6] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRId64;
+ if (name[3] == 'i')
+ return PRIi64;
+ if (name[3] == 'o')
+ return PRIo64;
+ if (name[3] == 'u')
+ return PRIu64;
+ if (name[3] == 'x')
+ return PRIx64;
+ if (name[3] == 'X')
+ return PRIX64;
+ abort ();
+ }
+ if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A'
+ && name[7] == 'S' && name[8] == 'T')
+ {
+ if (name[9] == '8' && name[10] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRIdLEAST8;
+ if (name[3] == 'i')
+ return PRIiLEAST8;
+ if (name[3] == 'o')
+ return PRIoLEAST8;
+ if (name[3] == 'u')
+ return PRIuLEAST8;
+ if (name[3] == 'x')
+ return PRIxLEAST8;
+ if (name[3] == 'X')
+ return PRIXLEAST8;
+ abort ();
+ }
+ if (name[9] == '1' && name[10] == '6' && name[11] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRIdLEAST16;
+ if (name[3] == 'i')
+ return PRIiLEAST16;
+ if (name[3] == 'o')
+ return PRIoLEAST16;
+ if (name[3] == 'u')
+ return PRIuLEAST16;
+ if (name[3] == 'x')
+ return PRIxLEAST16;
+ if (name[3] == 'X')
+ return PRIXLEAST16;
+ abort ();
+ }
+ if (name[9] == '3' && name[10] == '2' && name[11] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRIdLEAST32;
+ if (name[3] == 'i')
+ return PRIiLEAST32;
+ if (name[3] == 'o')
+ return PRIoLEAST32;
+ if (name[3] == 'u')
+ return PRIuLEAST32;
+ if (name[3] == 'x')
+ return PRIxLEAST32;
+ if (name[3] == 'X')
+ return PRIXLEAST32;
+ abort ();
+ }
+ if (name[9] == '6' && name[10] == '4' && name[11] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRIdLEAST64;
+ if (name[3] == 'i')
+ return PRIiLEAST64;
+ if (name[3] == 'o')
+ return PRIoLEAST64;
+ if (name[3] == 'u')
+ return PRIuLEAST64;
+ if (name[3] == 'x')
+ return PRIxLEAST64;
+ if (name[3] == 'X')
+ return PRIXLEAST64;
+ abort ();
+ }
+ }
+ if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S'
+ && name[7] == 'T')
+ {
+ if (name[8] == '8' && name[9] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRIdFAST8;
+ if (name[3] == 'i')
+ return PRIiFAST8;
+ if (name[3] == 'o')
+ return PRIoFAST8;
+ if (name[3] == 'u')
+ return PRIuFAST8;
+ if (name[3] == 'x')
+ return PRIxFAST8;
+ if (name[3] == 'X')
+ return PRIXFAST8;
+ abort ();
+ }
+ if (name[8] == '1' && name[9] == '6' && name[10] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRIdFAST16;
+ if (name[3] == 'i')
+ return PRIiFAST16;
+ if (name[3] == 'o')
+ return PRIoFAST16;
+ if (name[3] == 'u')
+ return PRIuFAST16;
+ if (name[3] == 'x')
+ return PRIxFAST16;
+ if (name[3] == 'X')
+ return PRIXFAST16;
+ abort ();
+ }
+ if (name[8] == '3' && name[9] == '2' && name[10] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRIdFAST32;
+ if (name[3] == 'i')
+ return PRIiFAST32;
+ if (name[3] == 'o')
+ return PRIoFAST32;
+ if (name[3] == 'u')
+ return PRIuFAST32;
+ if (name[3] == 'x')
+ return PRIxFAST32;
+ if (name[3] == 'X')
+ return PRIXFAST32;
+ abort ();
+ }
+ if (name[8] == '6' && name[9] == '4' && name[10] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRIdFAST64;
+ if (name[3] == 'i')
+ return PRIiFAST64;
+ if (name[3] == 'o')
+ return PRIoFAST64;
+ if (name[3] == 'u')
+ return PRIuFAST64;
+ if (name[3] == 'x')
+ return PRIxFAST64;
+ if (name[3] == 'X')
+ return PRIXFAST64;
+ abort ();
+ }
+ }
+ if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X'
+ && name[7] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRIdMAX;
+ if (name[3] == 'i')
+ return PRIiMAX;
+ if (name[3] == 'o')
+ return PRIoMAX;
+ if (name[3] == 'u')
+ return PRIuMAX;
+ if (name[3] == 'x')
+ return PRIxMAX;
+ if (name[3] == 'X')
+ return PRIXMAX;
+ abort ();
+ }
+ if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R'
+ && name[7] == '\0')
+ {
+ if (name[3] == 'd')
+ return PRIdPTR;
+ if (name[3] == 'i')
+ return PRIiPTR;
+ if (name[3] == 'o')
+ return PRIoPTR;
+ if (name[3] == 'u')
+ return PRIuPTR;
+ if (name[3] == 'x')
+ return PRIxPTR;
+ if (name[3] == 'X')
+ return PRIXPTR;
+ abort ();
+ }
+ }
+ }
+ /* Other system dependent strings are not valid. */
+ return NULL;
+}
+/* Initialize the codeset dependent parts of an opened message catalog.
+ Return the header entry. */
+const char *
+internal_function
+_nl_init_domain_conv (domain_file, domain, domainbinding)
+ struct loaded_l10nfile *domain_file;
+ struct loaded_domain *domain;
+ struct binding *domainbinding;
+{
+ /* Find out about the character set the file is encoded with.
+ This can be found (in textual form) in the entry "". If this
+ entry does not exist or if this does not contain the `charset='
+ information, we will assume the charset matches the one the
+ current locale and we don't have to perform any conversion. */
+ char *nullentry;
+ size_t nullentrylen;
+
+ /* Preinitialize fields, to avoid recursion during _nl_find_msg. */
+ domain->codeset_cntr =
+ (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
+#ifdef _LIBC
+ domain->conv = (__gconv_t) -1;
+#else
+# if HAVE_ICONV
+ domain->conv = (iconv_t) -1;
+# endif
+#endif
+ domain->conv_tab = NULL;
+
+ /* Get the header entry. */
+ nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
+
+ if (nullentry != NULL)
+ {
+#if defined _LIBC || HAVE_ICONV
+ const char *charsetstr;
+
+ charsetstr = strstr (nullentry, "charset=");
+ if (charsetstr != NULL)
+ {
+ size_t len;
+ char *charset;
+ const char *outcharset;
+
+ charsetstr += strlen ("charset=");
+ len = strcspn (charsetstr, " \t\n");
+
+ charset = (char *) alloca (len + 1);
+# if defined _LIBC || HAVE_MEMPCPY
+ *((char *) mempcpy (charset, charsetstr, len)) = '\0';
+# else
+ memcpy (charset, charsetstr, len);
+ charset[len] = '\0';
+# endif
+
+ /* The output charset should normally be determined by the
+ locale. But sometimes the locale is not used or not correctly
+ set up, so we provide a possibility for the user to override
+ this. Moreover, the value specified through
+ bind_textdomain_codeset overrides both. */
+ if (domainbinding != NULL && domainbinding->codeset != NULL)
+ outcharset = domainbinding->codeset;
+ else
+ {
+ outcharset = getenv ("OUTPUT_CHARSET");
+ if (outcharset == NULL || outcharset[0] == '\0')
+ {
+# ifdef _LIBC
+ outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
+# else
+# if HAVE_ICONV
+ extern const char *locale_charset PARAMS ((void));
+ outcharset = locale_charset ();
+# endif
+# endif
+ }
+ }
+
+# ifdef _LIBC
+ /* We always want to use transliteration. */
+ outcharset = norm_add_slashes (outcharset, "TRANSLIT");
+ charset = norm_add_slashes (charset, NULL);
+ if (__gconv_open (outcharset, charset, &domain->conv,
+ GCONV_AVOID_NOCONV)
+ != __GCONV_OK)
+ domain->conv = (__gconv_t) -1;
+# else
+# if HAVE_ICONV
+ /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
+ we want to use transliteration. */
+# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
+ || _LIBICONV_VERSION >= 0x0105
+ if (strchr (outcharset, '/') == NULL)
+ {
+ char *tmp;
+
+ len = strlen (outcharset);
+ tmp = (char *) alloca (len + 10 + 1);
+ memcpy (tmp, outcharset, len);
+ memcpy (tmp + len, "//TRANSLIT", 10 + 1);
+ outcharset = tmp;
+
+ domain->conv = iconv_open (outcharset, charset);
+
+ freea (outcharset);
+ }
+ else
+# endif
+ domain->conv = iconv_open (outcharset, charset);
+# endif
+# endif
+
+ freea (charset);
+ }
+#endif /* _LIBC || HAVE_ICONV */
+ }
+
+ return nullentry;
+}
+
+/* Frees the codeset dependent parts of an opened message catalog. */
+void
+internal_function
+_nl_free_domain_conv (domain)
+ struct loaded_domain *domain;
+{
+ if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
+ free (domain->conv_tab);
+
+#ifdef _LIBC
+ if (domain->conv != (__gconv_t) -1)
+ __gconv_close (domain->conv);
+#else
+# if HAVE_ICONV
+ if (domain->conv != (iconv_t) -1)
+ iconv_close (domain->conv);
+# endif
+#endif
+}
/* Load the message catalogs specified by FILENAME. If it is no valid
message catalog do nothing. */
void
internal_function
-_nl_load_domain (domain_file)
+_nl_load_domain (domain_file, domainbinding)
struct loaded_l10nfile *domain_file;
+ struct binding *domainbinding;
{
int fd;
size_t size;
+#ifdef _LIBC
+ struct stat64 st;
+#else
struct stat st;
+#endif
struct mo_file_header *data = (struct mo_file_header *) -1;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
- || defined _LIBC
int use_mmap = 0;
-#endif
struct loaded_domain *domain;
+ int revision;
+ const char *nullentry;
domain_file->decided = 1;
domain_file->data = NULL;
+ /* Note that it would be useless to store domainbinding in domain_file
+ because domainbinding might be == NULL now but != NULL later (after
+ a call to bind_textdomain_codeset). */
+
/* If the record does not represent a valid locale the FILENAME
might be NULL. This can happen when according to the given
specification the locale file name is different for XPG and CEN
return;
/* Try to open the addressed file. */
- fd = open (domain_file->filename, O_RDONLY);
+ fd = open (domain_file->filename, O_RDONLY | O_BINARY);
if (fd == -1)
return;
/* We must know about the size of the file. */
- if (fstat (fd, &st) != 0
- || (size = (size_t) st.st_size) != st.st_size
- || size < sizeof (struct mo_file_header))
+ if (
+#ifdef _LIBC
+ __builtin_expect (fstat64 (fd, &st) != 0, 0)
+#else
+ __builtin_expect (fstat (fd, &st) != 0, 0)
+#endif
+ || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
+ || __builtin_expect (size < sizeof (struct mo_file_header), 0))
{
/* Something went wrong. */
close (fd);
return;
}
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
- || defined _LIBC
+#ifdef HAVE_MMAP
/* Now we are ready to load the file. If mmap() is available we try
this first. If not available or it failed we try to load it. */
data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
MAP_PRIVATE, fd, 0);
- if (data != (struct mo_file_header *) -1)
+ if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
{
/* mmap() call was successful. */
close (fd);
do
{
long int nb = (long int) read (fd, read_ptr, to_read);
- if (nb == -1)
+ if (nb <= 0)
{
+#ifdef EINTR
+ if (nb == -1 && errno == EINTR)
+ continue;
+#endif
close (fd);
return;
}
-
read_ptr += nb;
to_read -= nb;
}
/* Using the magic number we can test whether it really is a message
catalog file. */
- if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
+ if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
+ 0))
{
/* The magic number is wrong: not a message catalog file. */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
- || defined _LIBC
+#ifdef HAVE_MMAP
if (use_mmap)
- munmap ((caddr_t) data, size);
+ munmap ((void *) data, size);
else
#endif
free (data);
return;
}
- domain_file->data
- = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
- if (domain_file->data == NULL)
+ domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
+ if (domain == NULL)
return;
+ domain_file->data = domain;
- domain = (struct loaded_domain *) domain_file->data;
domain->data = (char *) data;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
- || defined _LIBC
domain->use_mmap = use_mmap;
-#endif
domain->mmap_size = size;
domain->must_swap = data->magic != _MAGIC;
+ domain->malloced = NULL;
/* Fill in the information about the available tables. */
- switch (W (domain->must_swap, data->revision))
+ revision = W (domain->must_swap, data->revision);
+ /* We support only the major revision 0. */
+ switch (revision >> 16)
{
case 0:
domain->nstrings = W (domain->must_swap, data->nstrings);
- domain->orig_tab = (struct string_desc *)
+ domain->orig_tab = (const struct string_desc *)
((char *) data + W (domain->must_swap, data->orig_tab_offset));
- domain->trans_tab = (struct string_desc *)
+ domain->trans_tab = (const struct string_desc *)
((char *) data + W (domain->must_swap, data->trans_tab_offset));
domain->hash_size = W (domain->must_swap, data->hash_tab_size);
- domain->hash_tab = (nls_uint32 *)
- ((char *) data + W (domain->must_swap, data->hash_tab_offset));
+ domain->hash_tab =
+ (domain->hash_size > 2
+ ? (const nls_uint32 *)
+ ((char *) data + W (domain->must_swap, data->hash_tab_offset))
+ : NULL);
+ domain->must_swap_hash_tab = domain->must_swap;
+
+ /* Now dispatch on the minor revision. */
+ switch (revision & 0xffff)
+ {
+ case 0:
+ domain->n_sysdep_strings = 0;
+ domain->orig_sysdep_tab = NULL;
+ domain->trans_sysdep_tab = NULL;
+ break;
+ case 1:
+ default:
+ {
+ nls_uint32 n_sysdep_strings;
+
+ if (domain->hash_tab == NULL)
+ /* This is invalid. These minor revisions need a hash table. */
+ goto invalid;
+
+ n_sysdep_strings =
+ W (domain->must_swap, data->n_sysdep_strings);
+ if (n_sysdep_strings > 0)
+ {
+ nls_uint32 n_sysdep_segments;
+ const struct sysdep_segment *sysdep_segments;
+ const char **sysdep_segment_values;
+ const nls_uint32 *orig_sysdep_tab;
+ const nls_uint32 *trans_sysdep_tab;
+ size_t memneed;
+ char *mem;
+ struct sysdep_string_desc *inmem_orig_sysdep_tab;
+ struct sysdep_string_desc *inmem_trans_sysdep_tab;
+ nls_uint32 *inmem_hash_tab;
+ unsigned int i;
+
+ /* Get the values of the system dependent segments. */
+ n_sysdep_segments =
+ W (domain->must_swap, data->n_sysdep_segments);
+ sysdep_segments = (const struct sysdep_segment *)
+ ((char *) data
+ + W (domain->must_swap, data->sysdep_segments_offset));
+ sysdep_segment_values =
+ alloca (n_sysdep_segments * sizeof (const char *));
+ for (i = 0; i < n_sysdep_segments; i++)
+ {
+ const char *name =
+ (char *) data
+ + W (domain->must_swap, sysdep_segments[i].offset);
+ nls_uint32 namelen =
+ W (domain->must_swap, sysdep_segments[i].length);
+
+ if (!(namelen > 0 && name[namelen - 1] == '\0'))
+ {
+ freea (sysdep_segment_values);
+ goto invalid;
+ }
+
+ sysdep_segment_values[i] = get_sysdep_segment_value (name);
+ }
+
+ orig_sysdep_tab = (const nls_uint32 *)
+ ((char *) data
+ + W (domain->must_swap, data->orig_sysdep_tab_offset));
+ trans_sysdep_tab = (const nls_uint32 *)
+ ((char *) data
+ + W (domain->must_swap, data->trans_sysdep_tab_offset));
+
+ /* Compute the amount of additional memory needed for the
+ system dependent strings and the augmented hash table. */
+ memneed = 2 * n_sysdep_strings
+ * sizeof (struct sysdep_string_desc)
+ + domain->hash_size * sizeof (nls_uint32);
+ for (i = 0; i < 2 * n_sysdep_strings; i++)
+ {
+ const struct sysdep_string *sysdep_string =
+ (const struct sysdep_string *)
+ ((char *) data
+ + W (domain->must_swap,
+ i < n_sysdep_strings
+ ? orig_sysdep_tab[i]
+ : trans_sysdep_tab[i - n_sysdep_strings]));
+ size_t need = 0;
+ const struct segment_pair *p = sysdep_string->segments;
+
+ if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
+ for (p = sysdep_string->segments;; p++)
+ {
+ nls_uint32 sysdepref;
+
+ need += W (domain->must_swap, p->segsize);
+
+ sysdepref = W (domain->must_swap, p->sysdepref);
+ if (sysdepref == SEGMENTS_END)
+ break;
+
+ if (sysdepref >= n_sysdep_segments)
+ {
+ /* Invalid. */
+ freea (sysdep_segment_values);
+ goto invalid;
+ }
+
+ need += strlen (sysdep_segment_values[sysdepref]);
+ }
+
+ memneed += need;
+ }
+
+ /* Allocate additional memory. */
+ mem = (char *) malloc (memneed);
+ if (mem == NULL)
+ goto invalid;
+
+ domain->malloced = mem;
+ inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
+ mem += n_sysdep_strings * sizeof (struct sysdep_string_desc);
+ inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
+ mem += n_sysdep_strings * sizeof (struct sysdep_string_desc);
+ inmem_hash_tab = (nls_uint32 *) mem;
+ mem += domain->hash_size * sizeof (nls_uint32);
+
+ /* Compute the system dependent strings. */
+ for (i = 0; i < 2 * n_sysdep_strings; i++)
+ {
+ const struct sysdep_string *sysdep_string =
+ (const struct sysdep_string *)
+ ((char *) data
+ + W (domain->must_swap,
+ i < n_sysdep_strings
+ ? orig_sysdep_tab[i]
+ : trans_sysdep_tab[i - n_sysdep_strings]));
+ const char *static_segments =
+ (char *) data
+ + W (domain->must_swap, sysdep_string->offset);
+ const struct segment_pair *p = sysdep_string->segments;
+
+ /* Concatenate the segments, and fill
+ inmem_orig_sysdep_tab[i] (for i < n_sysdep_strings) and
+ inmem_trans_sysdep_tab[i-n_sysdep_strings] (for
+ i >= n_sysdep_strings). */
+
+ if (W (domain->must_swap, p->sysdepref) == SEGMENTS_END)
+ {
+ /* Only one static segment. */
+ inmem_orig_sysdep_tab[i].length =
+ W (domain->must_swap, p->segsize);
+ inmem_orig_sysdep_tab[i].pointer = static_segments;
+ }
+ else
+ {
+ inmem_orig_sysdep_tab[i].pointer = mem;
+
+ for (p = sysdep_string->segments;; p++)
+ {
+ nls_uint32 segsize =
+ W (domain->must_swap, p->segsize);
+ nls_uint32 sysdepref =
+ W (domain->must_swap, p->sysdepref);
+ size_t n;
+
+ if (segsize > 0)
+ {
+ memcpy (mem, static_segments, segsize);
+ mem += segsize;
+ static_segments += segsize;
+ }
+
+ if (sysdepref == SEGMENTS_END)
+ break;
+
+ n = strlen (sysdep_segment_values[sysdepref]);
+ memcpy (mem, sysdep_segment_values[sysdepref], n);
+ mem += n;
+ }
+
+ inmem_orig_sysdep_tab[i].length =
+ mem - inmem_orig_sysdep_tab[i].pointer;
+ }
+ }
+
+ /* Compute the augmented hash table. */
+ for (i = 0; i < domain->hash_size; i++)
+ inmem_hash_tab[i] =
+ W (domain->must_swap_hash_tab, domain->hash_tab[i]);
+ for (i = 0; i < n_sysdep_strings; i++)
+ {
+ const char *msgid = inmem_orig_sysdep_tab[i].pointer;
+ nls_uint32 hash_val = hash_string (msgid);
+ nls_uint32 idx = hash_val % domain->hash_size;
+ nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
+
+ for (;;)
+ {
+ if (inmem_hash_tab[idx] == 0)
+ {
+ /* Hash table entry is empty. Use it. */
+ inmem_hash_tab[idx] = 1 + domain->nstrings + i;
+ break;
+ }
+
+ if (idx >= domain->hash_size - incr)
+ idx -= domain->hash_size - incr;
+ else
+ idx += incr;
+ }
+ }
+
+ freea (sysdep_segment_values);
+
+ domain->n_sysdep_strings = n_sysdep_strings;
+ domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
+ domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
+
+ domain->hash_tab = inmem_hash_tab;
+ domain->must_swap_hash_tab = 0;
+ }
+ else
+ {
+ domain->n_sysdep_strings = 0;
+ domain->orig_sysdep_tab = NULL;
+ domain->trans_sysdep_tab = NULL;
+ }
+ }
+ break;
+ }
break;
default:
- /* This is an illegal revision. */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
- || defined _LIBC
+ /* This is an invalid revision. */
+ invalid:
+ /* This is an invalid .mo file. */
+ if (domain->malloced)
+ free (domain->malloced);
+#ifdef HAVE_MMAP
if (use_mmap)
- munmap ((caddr_t) data, size);
+ munmap ((void *) data, size);
else
#endif
free (data);
return;
}
- /* Show that one domain is changed. This might make some cached
- translations invalid. */
- ++_nl_msg_cat_cntr;
+ /* Now initialize the character set converter from the character set
+ the file is encoded with (found in the header entry) to the domain's
+ specified character set or the locale's character set. */
+ nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
+
+ /* Also look for a plural specification. */
+ EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
}
_nl_unload_domain (domain)
struct loaded_domain *domain;
{
+ if (domain->plural != &__gettext_germanic_plural)
+ __gettext_free_exp (domain->plural);
+
+ _nl_free_domain_conv (domain);
+
+ if (domain->malloced)
+ free (domain->malloced);
+
+# ifdef _POSIX_MAPPED_FILES
if (domain->use_mmap)
- munmap ((caddr_t) domain->data, domain->mmap_size);
+ munmap ((void *) domain->data, domain->mmap_size);
else
+# endif /* _POSIX_MAPPED_FILES */
free ((void *) domain->data);
free (domain);
--- /dev/null
+/* Determine a canonical name for the current locale's character encoding.
+
+ Copyright (C) 2000-2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+/* Written by Bruno Haible <bruno@clisp.org>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_STDDEF_H
+# include <stddef.h>
+#endif
+
+#include <stdio.h>
+#if HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if defined _WIN32 || defined __WIN32__
+# undef WIN32 /* avoid warning on mingw32 */
+# define WIN32
+#endif
+
+#if defined __EMX__
+/* Assume EMX program runs on OS/2, even if compiled under DOS. */
+# define OS2
+#endif
+
+#if !defined WIN32
+# if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+# else
+# if HAVE_SETLOCALE
+# include <locale.h>
+# endif
+# endif
+#elif defined WIN32
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+#if defined OS2
+# define INCL_DOS
+# include <os2.h>
+#endif
+
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+ /* Win32, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#endif
+
+#ifndef DIRECTORY_SEPARATOR
+# define DIRECTORY_SEPARATOR '/'
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#endif
+
+#ifdef HAVE_GETC_UNLOCKED
+# undef getc
+# define getc getc_unlocked
+#endif
+
+#ifdef __cplusplus
+/* When compiling with "gcc -x c++", produce a function with C linkage. */
+extern "C" const char * locale_charset (void);
+#endif
+
+/* The following static variable is declared 'volatile' to avoid a
+ possible multithread problem in the function get_charset_aliases. If we
+ are running in a threaded environment, and if two threads initialize
+ 'charset_aliases' simultaneously, both will produce the same value,
+ and everything will be ok if the two assignments to 'charset_aliases'
+ are atomic. But I don't know what will happen if the two assignments mix. */
+#if __STDC__ != 1
+# define volatile /* empty */
+#endif
+/* Pointer to the contents of the charset.alias file, if it has already been
+ read, else NULL. Its format is:
+ ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */
+static const char * volatile charset_aliases;
+
+/* Return a pointer to the contents of the charset.alias file. */
+static const char *
+get_charset_aliases ()
+{
+ const char *cp;
+
+ cp = charset_aliases;
+ if (cp == NULL)
+ {
+#if !defined WIN32
+ FILE *fp;
+ const char *dir = LIBDIR;
+ const char *base = "charset.alias";
+ char *file_name;
+
+ /* Concatenate dir and base into freshly allocated file_name. */
+ {
+ size_t dir_len = strlen (dir);
+ size_t base_len = strlen (base);
+ int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
+ file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
+ if (file_name != NULL)
+ {
+ memcpy (file_name, dir, dir_len);
+ if (add_slash)
+ file_name[dir_len] = DIRECTORY_SEPARATOR;
+ memcpy (file_name + dir_len + add_slash, base, base_len + 1);
+ }
+ }
+
+ if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
+ /* Out of memory or file not found, treat it as empty. */
+ cp = "";
+ 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;
+ if (c == '\n' || c == ' ' || c == '\t')
+ continue;
+ if (c == '#')
+ {
+ /* Skip comment, to end of line. */
+ do
+ c = getc (fp);
+ while (!(c == EOF || c == '\n'));
+ if (c == EOF)
+ break;
+ continue;
+ }
+ ungetc (c, fp);
+ if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
+ break;
+ l1 = strlen (buf1);
+ l2 = strlen (buf2);
+ if (res_size == 0)
+ {
+ res_size = l1 + 1 + l2 + 1;
+ res_ptr = (char *) malloc (res_size + 1);
+ }
+ else
+ {
+ res_size += l1 + 1 + l2 + 1;
+ res_ptr = (char *) realloc (res_ptr, res_size + 1);
+ }
+ if (res_ptr == NULL)
+ {
+ /* Out of memory. */
+ res_size = 0;
+ break;
+ }
+ strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
+ strcpy (res_ptr + res_size - (l2 + 1), buf2);
+ }
+ fclose (fp);
+ if (res_size == 0)
+ cp = "";
+ else
+ {
+ *(res_ptr + res_size) = '\0';
+ cp = res_ptr;
+ }
+ }
+
+ if (file_name != NULL)
+ free (file_name);
+
+#else
+
+ /* To avoid the troubles of installing a separate file in the same
+ directory as the DLL and of retrieving the DLL's directory at
+ runtime, simply inline the aliases here. */
+
+# if defined WIN32
+ cp = "CP936" "\0" "GBK" "\0"
+ "CP1361" "\0" "JOHAB" "\0"
+ "CP20127" "\0" "ASCII" "\0"
+ "CP20866" "\0" "KOI8-R" "\0"
+ "CP21866" "\0" "KOI8-RU" "\0"
+ "CP28591" "\0" "ISO-8859-1" "\0"
+ "CP28592" "\0" "ISO-8859-2" "\0"
+ "CP28593" "\0" "ISO-8859-3" "\0"
+ "CP28594" "\0" "ISO-8859-4" "\0"
+ "CP28595" "\0" "ISO-8859-5" "\0"
+ "CP28596" "\0" "ISO-8859-6" "\0"
+ "CP28597" "\0" "ISO-8859-7" "\0"
+ "CP28598" "\0" "ISO-8859-8" "\0"
+ "CP28599" "\0" "ISO-8859-9" "\0"
+ "CP28605" "\0" "ISO-8859-15" "\0";
+# endif
+#endif
+
+ charset_aliases = cp;
+ }
+
+ return cp;
+}
+
+/* Determine the current locale's character encoding, and canonicalize it
+ into one of the canonical names listed in config.charset.
+ The result must not be freed; it is statically allocated.
+ If the canonical name cannot be determined, the result is a non-canonical
+ name. */
+
+#ifdef STATIC
+STATIC
+#endif
+const char *
+locale_charset ()
+{
+ const char *codeset;
+ const char *aliases;
+
+#if !(defined WIN32 || defined OS2)
+
+# if HAVE_LANGINFO_CODESET
+
+ /* Most systems support nl_langinfo (CODESET) nowadays. */
+ codeset = nl_langinfo (CODESET);
+
+# else
+
+ /* On old systems which lack it, use setlocale or getenv. */
+ const char *locale = NULL;
+
+ /* But most old systems don't have a complete set of locales. Some
+ (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't
+ use setlocale here; it would return "C" when it doesn't support the
+ locale name the user has set. */
+# if HAVE_SETLOCALE && 0
+ locale = setlocale (LC_CTYPE, NULL);
+# endif
+ if (locale == NULL || locale[0] == '\0')
+ {
+ locale = getenv ("LC_ALL");
+ if (locale == NULL || locale[0] == '\0')
+ {
+ locale = getenv ("LC_CTYPE");
+ if (locale == NULL || locale[0] == '\0')
+ locale = getenv ("LANG");
+ }
+ }
+
+ /* On some old systems, one used to set locale = "iso8859_1". On others,
+ you set it to "language_COUNTRY.charset". In any case, we resolve it
+ through the charset.alias file. */
+ codeset = locale;
+
+# endif
+
+#elif defined WIN32
+
+ static char buf[2 + 10 + 1];
+
+ /* Woe32 has a function returning the locale's codepage as a number. */
+ sprintf (buf, "CP%u", GetACP ());
+ codeset = buf;
+
+#elif defined OS2
+
+ const char *locale;
+ static char buf[2 + 10 + 1];
+ ULONG cp[3];
+ ULONG cplen;
+
+ /* Allow user to override the codeset, as set in the operating system,
+ with standard language environment variables. */
+ locale = getenv ("LC_ALL");
+ if (locale == NULL || locale[0] == '\0')
+ {
+ locale = getenv ("LC_CTYPE");
+ if (locale == NULL || locale[0] == '\0')
+ locale = getenv ("LANG");
+ }
+ if (locale != NULL && locale[0] != '\0')
+ {
+ /* If the locale name contains an encoding after the dot, return it. */
+ const char *dot = strchr (locale, '.');
+
+ if (dot != NULL)
+ {
+ const char *modifier;
+
+ dot++;
+ /* Look for the possible @... trailer and remove it, if any. */
+ modifier = strchr (dot, '@');
+ if (modifier == NULL)
+ return dot;
+ if (modifier - dot < sizeof (buf))
+ {
+ memcpy (buf, dot, modifier - dot);
+ buf [modifier - dot] = '\0';
+ return buf;
+ }
+ }
+
+ /* Resolve through the charset.alias file. */
+ codeset = locale;
+ }
+ else
+ {
+ /* OS/2 has a function returning the locale's codepage as a number. */
+ if (DosQueryCp (sizeof (cp), cp, &cplen))
+ codeset = "";
+ else
+ {
+ sprintf (buf, "CP%u", cp[0]);
+ codeset = buf;
+ }
+ }
+
+#endif
+
+ if (codeset == NULL)
+ /* The canonical name cannot be determined. */
+ codeset = "";
+
+ /* Resolve alias. */
+ for (aliases = get_charset_aliases ();
+ *aliases != '\0';
+ aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+ if (strcmp (codeset, aliases) == 0
+ || (aliases[0] == '*' && aliases[1] == '\0'))
+ {
+ codeset = aliases + strlen (aliases) + 1;
+ break;
+ }
+
+ /* Don't return an empty string. GNU libc and GNU libiconv interpret
+ the empty string as denoting "the locale's character encoding",
+ thus GNU libiconv would call this function a second time. */
+ if (codeset[0] == '\0')
+ codeset = "ASCII";
+
+ return codeset;
+}
--- /dev/null
+# Locale name alias data base.
+# Copyright (C) 1996,1997,1998,1999,2000,2001 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
+# by the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.
+
+# The format of this file is the same as for the corresponding file of
+# the X Window System, which normally can be found in
+# /usr/lib/X11/locale/locale.alias
+# A single line contains two fields: an alias and a substitution value.
+# All entries are case independent.
+
+# Note: This file is far from being complete. If you have a value for
+# your own site which you think might be useful for others too, share
+# it with the rest of us. Send it using the `glibcbug' script to
+# bugs@gnu.org.
+
+# Packages using this file:
+
+bokmal no_NO.ISO-8859-1
+bokmål no_NO.ISO-8859-1
+catalan ca_ES.ISO-8859-1
+croatian hr_HR.ISO-8859-2
+czech cs_CZ.ISO-8859-2
+danish da_DK.ISO-8859-1
+dansk da_DK.ISO-8859-1
+deutsch de_DE.ISO-8859-1
+dutch nl_NL.ISO-8859-1
+eesti et_EE.ISO-8859-1
+estonian et_EE.ISO-8859-1
+finnish fi_FI.ISO-8859-1
+français fr_FR.ISO-8859-1
+french fr_FR.ISO-8859-1
+galego gl_ES.ISO-8859-1
+galician gl_ES.ISO-8859-1
+german de_DE.ISO-8859-1
+greek el_GR.ISO-8859-7
+hebrew he_IL.ISO-8859-8
+hrvatski hr_HR.ISO-8859-2
+hungarian hu_HU.ISO-8859-2
+icelandic is_IS.ISO-8859-1
+italian it_IT.ISO-8859-1
+japanese ja_JP.eucJP
+japanese.euc ja_JP.eucJP
+ja_JP ja_JP.eucJP
+ja_JP.ujis ja_JP.eucJP
+japanese.sjis ja_JP.SJIS
+korean ko_KR.eucKR
+korean.euc ko_KR.eucKR
+ko_KR ko_KR.eucKR
+lithuanian lt_LT.ISO-8859-13
+nb_NO no_NO.ISO-8859-1
+nb_NO.ISO-8859-1 no_NO.ISO-8859-1
+norwegian no_NO.ISO-8859-1
+nynorsk nn_NO.ISO-8859-1
+polish pl_PL.ISO-8859-2
+portuguese pt_PT.ISO-8859-1
+romanian ro_RO.ISO-8859-2
+russian ru_RU.ISO-8859-5
+slovak sk_SK.ISO-8859-2
+slovene sl_SI.ISO-8859-2
+slovenian sl_SI.ISO-8859-2
+spanish es_ES.ISO-8859-1
+swedish sv_SE.ISO-8859-1
+thai th_TH.TIS-620
+turkish tr_TR.ISO-8859-9
/* Handle aliases for locale names.
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+ Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+/* Tell glibc's <string.h> to provide a prototype for mempcpy().
+ This must come before <config.h> because <config.h> may include
+ <features.h>, and once <features.h> has been included, it's too late. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
#ifdef HAVE_CONFIG_H
# include <config.h>
#include <ctype.h>
#include <stdio.h>
+#if defined _LIBC || defined HAVE___FSETLOCKING
+# include <stdio_ext.h>
+#endif
#include <sys/types.h>
#ifdef __GNUC__
# endif
#endif
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-# include <malloc.h>
-# else
-void free ();
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-# define strchr index
-# endif
-#endif
-
-#include "gettext.h"
#include "gettextP.h"
/* @@ end of prolog @@ */
file and the name space must not be polluted. */
# define strcasecmp __strcasecmp
-# define mempcpy __mempcpy
+# ifndef mempcpy
+# define mempcpy __mempcpy
+# endif
# define HAVE_MEMPCPY 1
+# define HAVE___FSETLOCKING 1
/* We need locking here since we can be called from different places. */
# include <bits/libc-lock.h>
__libc_lock_define_initialized (static, lock);
#endif
+#ifndef internal_function
+# define internal_function
+#endif
-/* For those loosing systems which don't have `alloca' we have to add
+/* Some optimizations for glibc. */
+#ifdef _LIBC
+# define FEOF(fp) feof_unlocked (fp)
+# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp)
+#else
+# define FEOF(fp) feof (fp)
+# define FGETS(buf, n, fp) fgets (buf, n, fp)
+#endif
+
+/* For those losing systems which don't have `alloca' we have to add
some additional code emulating it. */
#ifdef HAVE_ALLOCA
-/* Nothing has to be done. */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
+# define freea(p) /* nothing */
#else
-struct block_list
-{
- void *address;
- struct block_list *next;
-};
-# define ADD_BLOCK(list, addr) \
- do { \
- struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
- /* If we cannot get a free block we cannot add the new element to \
- the list. */ \
- if (newp != NULL) { \
- newp->address = (addr); \
- newp->next = (list); \
- (list) = newp; \
- } \
- } while (0)
-# define FREE_BLOCKS(list) \
- do { \
- while (list != NULL) { \
- struct block_list *old = list; \
- list = list->next; \
- free (old); \
- } \
- } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif /* have alloca */
+# define alloca(n) malloc (n)
+# define freea(p) free (p)
+#endif
+
+#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
+# undef fgets
+# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
+#endif
+#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED
+# undef feof
+# define feof(s) feof_unlocked (s)
+#endif
struct alias_map
};
-static char *string_space = NULL;
-static size_t string_space_act = 0;
-static size_t string_space_max = 0;
+static char *string_space;
+static size_t string_space_act;
+static size_t string_space_max;
static struct alias_map *map;
-static size_t nmap = 0;
-static size_t maxmap = 0;
+static size_t nmap;
+static size_t maxmap;
/* Prototypes for local functions. */
static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
internal_function;
-static void extend_alias_table PARAMS ((void));
+static int extend_alias_table PARAMS ((void));
static int alias_compare PARAMS ((const struct alias_map *map1,
const struct alias_map *map2));
_nl_expand_alias (name)
const char *name;
{
- static const char *locale_alias_path = LOCALE_ALIAS_PATH;
+ static const char *locale_alias_path;
struct alias_map *retval;
const char *result = NULL;
size_t added;
__libc_lock_lock (lock);
#endif
+ if (locale_alias_path == NULL)
+ locale_alias_path = LOCALE_ALIAS_PATH;
+
do
{
struct alias_map item;
{
const char *start;
- while (locale_alias_path[0] == ':')
+ while (locale_alias_path[0] == PATH_SEPARATOR)
++locale_alias_path;
start = locale_alias_path;
- while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
+ while (locale_alias_path[0] != '\0'
+ && locale_alias_path[0] != PATH_SEPARATOR)
++locale_alias_path;
if (start < locale_alias_path)
const char *fname;
int fname_len;
{
-#ifndef HAVE_ALLOCA
- struct block_list *block_list = NULL;
-#endif
FILE *fp;
char *full_fname;
size_t added;
static const char aliasfile[] = "/locale.alias";
full_fname = (char *) alloca (fname_len + sizeof aliasfile);
- ADD_BLOCK (block_list, full_fname);
#ifdef HAVE_MEMPCPY
mempcpy (mempcpy (full_fname, fname, fname_len),
aliasfile, sizeof aliasfile);
#endif
fp = fopen (full_fname, "r");
+ freea (full_fname);
if (fp == NULL)
- {
- FREE_BLOCKS (block_list);
- return 0;
- }
+ return 0;
+
+#ifdef HAVE___FSETLOCKING
+ /* No threads present. */
+ __fsetlocking (fp, FSETLOCKING_BYCALLER);
+#endif
added = 0;
- while (!feof (fp))
+ while (!FEOF (fp))
{
/* It is a reasonable approach to use a fix buffer here because
a) we are only interested in the first two fields
b) these fields must be usable as file names and so must not
be that long
*/
- unsigned char buf[BUFSIZ];
- unsigned char *alias;
- unsigned char *value;
- unsigned char *cp;
+ char buf[BUFSIZ];
+ char *alias;
+ char *value;
+ char *cp;
- if (fgets (buf, sizeof buf, fp) == NULL)
+ if (FGETS (buf, sizeof buf, fp) == NULL)
/* EOF reached. */
break;
{
char altbuf[BUFSIZ];
do
- if (fgets (altbuf, sizeof altbuf, fp) == NULL)
+ if (FGETS (altbuf, sizeof altbuf, fp) == NULL)
/* Make sure the inner loop will be left. The outer loop
will exit at the `feof' test. */
break;
cp = buf;
/* Ignore leading white space. */
- while (isspace (cp[0]))
+ while (isspace ((unsigned char) cp[0]))
++cp;
/* A leading '#' signals a comment line. */
if (cp[0] != '\0' && cp[0] != '#')
{
alias = cp++;
- while (cp[0] != '\0' && !isspace (cp[0]))
+ while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
++cp;
/* Terminate alias name. */
if (cp[0] != '\0')
*cp++ = '\0';
/* Now look for the beginning of the value. */
- while (isspace (cp[0]))
+ while (isspace ((unsigned char) cp[0]))
++cp;
if (cp[0] != '\0')
size_t value_len;
value = cp++;
- while (cp[0] != '\0' && !isspace (cp[0]))
+ while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
++cp;
/* Terminate value. */
if (cp[0] == '\n')
*cp++ = '\0';
if (nmap >= maxmap)
- extend_alias_table ();
+ if (__builtin_expect (extend_alias_table (), 0))
+ return added;
alias_len = strlen (alias) + 1;
value_len = strlen (value) + 1;
? alias_len + value_len : 1024));
char *new_pool = (char *) realloc (string_space, new_size);
if (new_pool == NULL)
+ return added;
+
+ if (__builtin_expect (string_space != new_pool, 0))
{
- FREE_BLOCKS (block_list);
- return added;
+ size_t i;
+
+ for (i = 0; i < nmap; i++)
+ {
+ map[i].alias += new_pool - string_space;
+ map[i].value += new_pool - string_space;
+ }
}
+
string_space = new_pool;
string_space_max = new_size;
}
qsort (map, nmap, sizeof (struct alias_map),
(int (*) PARAMS ((const void *, const void *))) alias_compare);
- FREE_BLOCKS (block_list);
return added;
}
-static void
+static int
extend_alias_table ()
{
size_t new_size;
* sizeof (struct alias_map)));
if (new_map == NULL)
/* Simply don't extend: we don't have any more core. */
- return;
+ return -1;
map = new_map;
maxmap = new_size;
+ return 0;
}
--- /dev/null
+/* Determine the current selected locale.
+ Copyright (C) 1995-1999, 2000-2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+/* Written by Ulrich Drepper <drepper@gnu.org>, 1995. */
+/* Win32 code written by Tor Lillqvist <tml@iki.fi>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <locale.h>
+
+#if defined _WIN32 || defined __WIN32__
+# undef WIN32 /* avoid warning on mingw32 */
+# define WIN32
+#endif
+
+#ifdef WIN32
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+/* Mingw headers don't have latest language and sublanguage codes. */
+# ifndef LANG_AFRIKAANS
+# define LANG_AFRIKAANS 0x36
+# endif
+# ifndef LANG_ALBANIAN
+# define LANG_ALBANIAN 0x1c
+# endif
+# ifndef LANG_ARABIC
+# define LANG_ARABIC 0x01
+# endif
+# ifndef LANG_ARMENIAN
+# define LANG_ARMENIAN 0x2b
+# endif
+# ifndef LANG_ASSAMESE
+# define LANG_ASSAMESE 0x4d
+# endif
+# ifndef LANG_AZERI
+# define LANG_AZERI 0x2c
+# endif
+# ifndef LANG_BASQUE
+# define LANG_BASQUE 0x2d
+# endif
+# ifndef LANG_BELARUSIAN
+# define LANG_BELARUSIAN 0x23
+# endif
+# ifndef LANG_BENGALI
+# define LANG_BENGALI 0x45
+# endif
+# ifndef LANG_CATALAN
+# define LANG_CATALAN 0x03
+# endif
+# ifndef LANG_DIVEHI
+# define LANG_DIVEHI 0x65
+# endif
+# ifndef LANG_ESTONIAN
+# define LANG_ESTONIAN 0x25
+# endif
+# ifndef LANG_FAEROESE
+# define LANG_FAEROESE 0x38
+# endif
+# ifndef LANG_FARSI
+# define LANG_FARSI 0x29
+# endif
+# ifndef LANG_GALICIAN
+# define LANG_GALICIAN 0x56
+# endif
+# ifndef LANG_GEORGIAN
+# define LANG_GEORGIAN 0x37
+# endif
+# ifndef LANG_GUJARATI
+# define LANG_GUJARATI 0x47
+# endif
+# ifndef LANG_HEBREW
+# define LANG_HEBREW 0x0d
+# endif
+# ifndef LANG_HINDI
+# define LANG_HINDI 0x39
+# endif
+# ifndef LANG_INDONESIAN
+# define LANG_INDONESIAN 0x21
+# endif
+# ifndef LANG_KANNADA
+# define LANG_KANNADA 0x4b
+# endif
+# ifndef LANG_KASHMIRI
+# define LANG_KASHMIRI 0x60
+# endif
+# ifndef LANG_KAZAK
+# define LANG_KAZAK 0x3f
+# endif
+# ifndef LANG_KONKANI
+# define LANG_KONKANI 0x57
+# endif
+# ifndef LANG_KYRGYZ
+# define LANG_KYRGYZ 0x40
+# endif
+# ifndef LANG_LATVIAN
+# define LANG_LATVIAN 0x26
+# endif
+# ifndef LANG_LITHUANIAN
+# define LANG_LITHUANIAN 0x27
+# endif
+# ifndef LANG_MACEDONIAN
+# define LANG_MACEDONIAN 0x2f
+# endif
+# ifndef LANG_MALAY
+# define LANG_MALAY 0x3e
+# endif
+# ifndef LANG_MALAYALAM
+# define LANG_MALAYALAM 0x4c
+# endif
+# ifndef LANG_MANIPURI
+# define LANG_MANIPURI 0x58
+# endif
+# ifndef LANG_MARATHI
+# define LANG_MARATHI 0x4e
+# endif
+# ifndef LANG_MONGOLIAN
+# define LANG_MONGOLIAN 0x50
+# endif
+# ifndef LANG_NEPALI
+# define LANG_NEPALI 0x61
+# endif
+# ifndef LANG_ORIYA
+# define LANG_ORIYA 0x48
+# endif
+# ifndef LANG_PUNJABI
+# define LANG_PUNJABI 0x46
+# endif
+# ifndef LANG_SANSKRIT
+# define LANG_SANSKRIT 0x4f
+# endif
+# ifndef LANG_SERBIAN
+# define LANG_SERBIAN 0x1a
+# endif
+# ifndef LANG_SINDHI
+# define LANG_SINDHI 0x59
+# endif
+# ifndef LANG_SLOVAK
+# define LANG_SLOVAK 0x1b
+# endif
+# ifndef LANG_SORBIAN
+# define LANG_SORBIAN 0x2e
+# endif
+# ifndef LANG_SWAHILI
+# define LANG_SWAHILI 0x41
+# endif
+# ifndef LANG_SYRIAC
+# define LANG_SYRIAC 0x5a
+# endif
+# ifndef LANG_TAMIL
+# define LANG_TAMIL 0x49
+# endif
+# ifndef LANG_TATAR
+# define LANG_TATAR 0x44
+# endif
+# ifndef LANG_TELUGU
+# define LANG_TELUGU 0x4a
+# endif
+# ifndef LANG_THAI
+# define LANG_THAI 0x1e
+# endif
+# ifndef LANG_UKRAINIAN
+# define LANG_UKRAINIAN 0x22
+# endif
+# ifndef LANG_URDU
+# define LANG_URDU 0x20
+# endif
+# ifndef LANG_UZBEK
+# define LANG_UZBEK 0x43
+# endif
+# ifndef LANG_VIETNAMESE
+# define LANG_VIETNAMESE 0x2a
+# endif
+# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
+# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
+# endif
+# ifndef SUBLANG_ARABIC_IRAQ
+# define SUBLANG_ARABIC_IRAQ 0x02
+# endif
+# ifndef SUBLANG_ARABIC_EGYPT
+# define SUBLANG_ARABIC_EGYPT 0x03
+# endif
+# ifndef SUBLANG_ARABIC_LIBYA
+# define SUBLANG_ARABIC_LIBYA 0x04
+# endif
+# ifndef SUBLANG_ARABIC_ALGERIA
+# define SUBLANG_ARABIC_ALGERIA 0x05
+# endif
+# ifndef SUBLANG_ARABIC_MOROCCO
+# define SUBLANG_ARABIC_MOROCCO 0x06
+# endif
+# ifndef SUBLANG_ARABIC_TUNISIA
+# define SUBLANG_ARABIC_TUNISIA 0x07
+# endif
+# ifndef SUBLANG_ARABIC_OMAN
+# define SUBLANG_ARABIC_OMAN 0x08
+# endif
+# ifndef SUBLANG_ARABIC_YEMEN
+# define SUBLANG_ARABIC_YEMEN 0x09
+# endif
+# ifndef SUBLANG_ARABIC_SYRIA
+# define SUBLANG_ARABIC_SYRIA 0x0a
+# endif
+# ifndef SUBLANG_ARABIC_JORDAN
+# define SUBLANG_ARABIC_JORDAN 0x0b
+# endif
+# ifndef SUBLANG_ARABIC_LEBANON
+# define SUBLANG_ARABIC_LEBANON 0x0c
+# endif
+# ifndef SUBLANG_ARABIC_KUWAIT
+# define SUBLANG_ARABIC_KUWAIT 0x0d
+# endif
+# ifndef SUBLANG_ARABIC_UAE
+# define SUBLANG_ARABIC_UAE 0x0e
+# endif
+# ifndef SUBLANG_ARABIC_BAHRAIN
+# define SUBLANG_ARABIC_BAHRAIN 0x0f
+# endif
+# ifndef SUBLANG_ARABIC_QATAR
+# define SUBLANG_ARABIC_QATAR 0x10
+# endif
+# ifndef SUBLANG_AZERI_LATIN
+# define SUBLANG_AZERI_LATIN 0x01
+# endif
+# ifndef SUBLANG_AZERI_CYRILLIC
+# define SUBLANG_AZERI_CYRILLIC 0x02
+# endif
+# ifndef SUBLANG_CHINESE_MACAU
+# define SUBLANG_CHINESE_MACAU 0x05
+# endif
+# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
+# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
+# endif
+# ifndef SUBLANG_ENGLISH_JAMAICA
+# define SUBLANG_ENGLISH_JAMAICA 0x08
+# endif
+# ifndef SUBLANG_ENGLISH_CARIBBEAN
+# define SUBLANG_ENGLISH_CARIBBEAN 0x09
+# endif
+# ifndef SUBLANG_ENGLISH_BELIZE
+# define SUBLANG_ENGLISH_BELIZE 0x0a
+# endif
+# ifndef SUBLANG_ENGLISH_TRINIDAD
+# define SUBLANG_ENGLISH_TRINIDAD 0x0b
+# endif
+# ifndef SUBLANG_ENGLISH_ZIMBABWE
+# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
+# endif
+# ifndef SUBLANG_ENGLISH_PHILIPPINES
+# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
+# endif
+# ifndef SUBLANG_FRENCH_LUXEMBOURG
+# define SUBLANG_FRENCH_LUXEMBOURG 0x05
+# endif
+# ifndef SUBLANG_FRENCH_MONACO
+# define SUBLANG_FRENCH_MONACO 0x06
+# endif
+# ifndef SUBLANG_GERMAN_LUXEMBOURG
+# define SUBLANG_GERMAN_LUXEMBOURG 0x04
+# endif
+# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
+# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
+# endif
+# ifndef SUBLANG_KASHMIRI_INDIA
+# define SUBLANG_KASHMIRI_INDIA 0x02
+# endif
+# ifndef SUBLANG_MALAY_MALAYSIA
+# define SUBLANG_MALAY_MALAYSIA 0x01
+# endif
+# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
+# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
+# endif
+# ifndef SUBLANG_NEPALI_INDIA
+# define SUBLANG_NEPALI_INDIA 0x02
+# endif
+# ifndef SUBLANG_SERBIAN_LATIN
+# define SUBLANG_SERBIAN_LATIN 0x02
+# endif
+# ifndef SUBLANG_SERBIAN_CYRILLIC
+# define SUBLANG_SERBIAN_CYRILLIC 0x03
+# endif
+# ifndef SUBLANG_SPANISH_GUATEMALA
+# define SUBLANG_SPANISH_GUATEMALA 0x04
+# endif
+# ifndef SUBLANG_SPANISH_COSTA_RICA
+# define SUBLANG_SPANISH_COSTA_RICA 0x05
+# endif
+# ifndef SUBLANG_SPANISH_PANAMA
+# define SUBLANG_SPANISH_PANAMA 0x06
+# endif
+# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
+# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
+# endif
+# ifndef SUBLANG_SPANISH_VENEZUELA
+# define SUBLANG_SPANISH_VENEZUELA 0x08
+# endif
+# ifndef SUBLANG_SPANISH_COLOMBIA
+# define SUBLANG_SPANISH_COLOMBIA 0x09
+# endif
+# ifndef SUBLANG_SPANISH_PERU
+# define SUBLANG_SPANISH_PERU 0x0a
+# endif
+# ifndef SUBLANG_SPANISH_ARGENTINA
+# define SUBLANG_SPANISH_ARGENTINA 0x0b
+# endif
+# ifndef SUBLANG_SPANISH_ECUADOR
+# define SUBLANG_SPANISH_ECUADOR 0x0c
+# endif
+# ifndef SUBLANG_SPANISH_CHILE
+# define SUBLANG_SPANISH_CHILE 0x0d
+# endif
+# ifndef SUBLANG_SPANISH_URUGUAY
+# define SUBLANG_SPANISH_URUGUAY 0x0e
+# endif
+# ifndef SUBLANG_SPANISH_PARAGUAY
+# define SUBLANG_SPANISH_PARAGUAY 0x0f
+# endif
+# ifndef SUBLANG_SPANISH_BOLIVIA
+# define SUBLANG_SPANISH_BOLIVIA 0x10
+# endif
+# ifndef SUBLANG_SPANISH_EL_SALVADOR
+# define SUBLANG_SPANISH_EL_SALVADOR 0x11
+# endif
+# ifndef SUBLANG_SPANISH_HONDURAS
+# define SUBLANG_SPANISH_HONDURAS 0x12
+# endif
+# ifndef SUBLANG_SPANISH_NICARAGUA
+# define SUBLANG_SPANISH_NICARAGUA 0x13
+# endif
+# ifndef SUBLANG_SPANISH_PUERTO_RICO
+# define SUBLANG_SPANISH_PUERTO_RICO 0x14
+# endif
+# ifndef SUBLANG_SWEDISH_FINLAND
+# define SUBLANG_SWEDISH_FINLAND 0x02
+# endif
+# ifndef SUBLANG_URDU_PAKISTAN
+# define SUBLANG_URDU_PAKISTAN 0x01
+# endif
+# ifndef SUBLANG_URDU_INDIA
+# define SUBLANG_URDU_INDIA 0x02
+# endif
+# ifndef SUBLANG_UZBEK_LATIN
+# define SUBLANG_UZBEK_LATIN 0x01
+# endif
+# ifndef SUBLANG_UZBEK_CYRILLIC
+# define SUBLANG_UZBEK_CYRILLIC 0x02
+# endif
+#endif
+
+/* XPG3 defines the result of 'setlocale (category, NULL)' as:
+ "Directs 'setlocale()' to query 'category' and return the current
+ setting of 'local'."
+ However it does not specify the exact format. Neither do SUSV2 and
+ ISO C 99. So we can use this feature only on selected systems (e.g.
+ those using GNU C Library). */
+#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
+# define HAVE_LOCALE_NULL
+#endif
+
+/* Determine the current locale's name, and canonicalize it into XPG syntax
+ language[_territory[.codeset]][@modifier]
+ The codeset part in the result is not reliable; the locale_charset()
+ should be used for codeset information instead.
+ The result must not be freed; it is statically allocated. */
+
+const char *
+_nl_locale_name (category, categoryname)
+ 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 language[_territory][@modifier].
+ 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 0x5e: /* 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 "az_AZ@latin";
+ case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
+ }
+ return "az";
+ case LANG_BASQUE:
+ return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */
+ case LANG_BELARUSIAN: return "be_BY";
+ case LANG_BENGALI: return "bn_IN";
+ case LANG_BULGARIAN: return "bg_BG";
+ case 0x55: /* BURMESE */ return "my_MM";
+ case 0x53: /* CAMBODIAN */ return "km_KH";
+ case LANG_CATALAN: return "ca_ES";
+ case 0x5c: /* 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.
+ * (Says tml, who knows nothing about Serbian
+ * or Croatian.)
+ * (I can feel those flames coming already.)
+ */
+ switch (sub)
+ {
+ case SUBLANG_DEFAULT: return "hr_HR";
+ case SUBLANG_SERBIAN_LATIN: return "sr_YU";
+ case SUBLANG_SERBIAN_CYRILLIC: return "sr_YU@cyrillic";
+ }
+ return "hr";
+ case LANG_CZECH: return "cs_CZ";
+ case LANG_DANISH: return "da_DK";
+ case LANG_DIVEHI: return "div_MV";
+ case LANG_DUTCH:
+ switch (sub)
+ {
+ case SUBLANG_DUTCH: return "nl_NL";
+ case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
+ }
+ return "nl";
+ case 0x66: /* 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";
+ }
+ 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";
+ }
+ return "fr";
+ case 0x62: /* FRISIAN */ return "fy_NL";
+ case 0x67: /* FULFULDE */ return "ful_NG";
+ case 0x3c: /* 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 0x74: /* GUARANI */ return "gn_PY";
+ case LANG_GUJARATI: return "gu_IN";
+ case 0x68: /* HAUSA */ return "ha_NG";
+ case 0x75: /* 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 0x69: /* IBIBIO */ return "nic_NG";
+ case LANG_ICELANDIC: return "is_IS";
+ case 0x70: /* IGBO */ return "ibo_NG";
+ case LANG_INDONESIAN: return "id_ID";
+ case 0x5d: /* 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 0x71: /* KANURI */ return "kau_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 0x54: /* LAO */ return "lo_LA";
+ case 0x76: /* 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 0x3a: /* 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 0x72: /* OROMO */ return "om_ET";
+ case 0x79: /* PAPIAMENTU */ return "pap_AN";
+ case 0x63: /* 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: return "pa_IN";
+ case 0x17: /* RHAETO-ROMANCE */ return "rm_CH";
+ case LANG_ROMANIAN: return "ro_RO";
+ case LANG_RUSSIAN:
+ return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA". */
+ case 0x3b: /* SAMI */ return "se_NO";
+ case LANG_SANSKRIT: return "sa_IN";
+ case LANG_SINDHI: return "sd";
+ case 0x5b: /* SINHALESE */ return "si_LK";
+ case LANG_SLOVAK: return "sk_SK";
+ case LANG_SLOVENIAN: return "sl_SI";
+ case 0x77: /* 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 "es_ES@modern"; /* 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 0x30: /* SUTU */ return "bnt_TZ";
+ 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 0x64: /* TAGALOG */ return "tl_PH";
+ case 0x28: /* TAJIK */ return "tg_TJ";
+ case 0x5f: /* TAMAZIGHT */ 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 0x51: /* TIBETAN */ return "bo_CN";
+ case 0x73: /* TIGRINYA */ return "ti_ET";
+ case 0x31: /* TSONGA */ return "ts_ZA";
+ case LANG_TURKISH: return "tr_TR";
+ case 0x42: /* 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)
+ {
+ /* FIXME: Adjust this when Uzbek locales appear on Unix. */
+ case SUBLANG_UZBEK_LATIN: return "uz_UZ@latin";
+ case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
+ }
+ return "uz";
+ case 0x33: /* VENDA */ return "ven_ZA";
+ case LANG_VIETNAMESE: return "vi_VN";
+ case 0x52: /* WELSH */ return "cy_GB";
+ case 0x34: /* XHOSA */ return "xh_ZA";
+ case 0x78: /* YI */ return "sit_CN";
+ case 0x3d: /* YIDDISH */ return "yi_IL";
+ case 0x6a: /* YORUBA */ return "yo_NG";
+ case 0x35: /* ZULU */ return "zu_ZA";
+ default: return "C";
+ }
+
+#endif
+}
--- /dev/null
+/* Implementation of ngettext(3) function.
+ Copyright (C) 1995, 1997, 2000, 2001, 2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef _LIBC
+# define __need_NULL
+# include <stddef.h>
+#else
+# include <stdlib.h> /* Just for NULL. */
+#endif
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+#include <locale.h>
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem. They must not clash
+ with existing names and they should follow ANSI C. But this source
+ code is also used in GNU C Library where the names have a __
+ prefix. So we have to make a difference here. */
+#ifdef _LIBC
+# define NGETTEXT __ngettext
+# define DCNGETTEXT INTUSE(__dcngettext)
+#else
+# define NGETTEXT libintl_ngettext
+# define DCNGETTEXT libintl_dcngettext
+#endif
+
+/* Look up MSGID in the current default message catalog for the current
+ LC_MESSAGES locale. If not found, returns MSGID itself (the default
+ text). */
+char *
+NGETTEXT (msgid1, msgid2, n)
+ const char *msgid1;
+ const char *msgid2;
+ unsigned long int n;
+{
+ return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library. */
+weak_alias (__ngettext, ngettext);
+#endif
--- /dev/null
+/* OS/2 compatibility functions.
+ Copyright (C) 2001-2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#define OS2_AWARE
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/param.h>
+
+/* A version of getenv() that works from DLLs */
+extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
+
+char *
+_nl_getenv (const char *name)
+{
+ unsigned char *value;
+ if (DosScanEnv (name, &value))
+ return NULL;
+ else
+ return value;
+}
+
+/* A fixed size buffer. */
+char libintl_nl_default_dirname[MAXPATHLEN+1];
+
+char *_nlos2_libdir = NULL;
+char *_nlos2_localealiaspath = NULL;
+char *_nlos2_localedir = NULL;
+
+static __attribute__((constructor)) void
+nlos2_initialize ()
+{
+ char *root = getenv ("UNIXROOT");
+ char *gnulocaledir = getenv ("GNULOCALEDIR");
+
+ _nlos2_libdir = gnulocaledir;
+ if (!_nlos2_libdir)
+ {
+ if (root)
+ {
+ size_t sl = strlen (root);
+ _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
+ memcpy (_nlos2_libdir, root, sl);
+ memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
+ }
+ else
+ _nlos2_libdir = LIBDIR;
+ }
+
+ _nlos2_localealiaspath = gnulocaledir;
+ if (!_nlos2_localealiaspath)
+ {
+ if (root)
+ {
+ size_t sl = strlen (root);
+ _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
+ memcpy (_nlos2_localealiaspath, root, sl);
+ memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
+ }
+ else
+ _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
+ }
+
+ _nlos2_localedir = gnulocaledir;
+ if (!_nlos2_localedir)
+ {
+ if (root)
+ {
+ size_t sl = strlen (root);
+ _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
+ memcpy (_nlos2_localedir, root, sl);
+ memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
+ }
+ else
+ _nlos2_localedir = LOCALEDIR;
+ }
+
+ if (strlen (_nlos2_localedir) <= MAXPATHLEN)
+ strcpy (libintl_nl_default_dirname, _nlos2_localedir);
+}
--- /dev/null
+/* OS/2 compatibility defines.
+ This file is intended to be included from config.h
+ Copyright (C) 2001-2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+/* When included from os2compat.h we need all the original definitions */
+#ifndef OS2_AWARE
+
+#undef LIBDIR
+#define LIBDIR _nlos2_libdir
+extern char *_nlos2_libdir;
+
+#undef LOCALEDIR
+#define LOCALEDIR _nlos2_localedir
+extern char *_nlos2_localedir;
+
+#undef LOCALE_ALIAS_PATH
+#define LOCALE_ALIAS_PATH _nlos2_localealiaspath
+extern char *_nlos2_localealiaspath;
+
+#endif
+
+#undef HAVE_STRCASECMP
+#define HAVE_STRCASECMP 1
+#define strcasecmp stricmp
+#define strncasecmp strnicmp
+
+/* We have our own getenv() which works even if library is compiled as DLL */
+#define getenv _nl_getenv
+
+/* Older versions of gettext used -1 as the value of LC_MESSAGES */
+#define LC_MESSAGES_COMPAT (-1)
--- /dev/null
+/* OS dependent parts of libintl.
+ Copyright (C) 2001-2002 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#if defined __EMX__
+# include "os2compat.c"
+#else
+/* Avoid AIX compiler warning. */
+typedef int dummy;
+#endif
--- /dev/null
+/* Expression parsing for plural form selection.
+ Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "plural-exp.h"
+
+#if (defined __GNUC__ && !defined __APPLE_CC__) \
+ || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+
+/* These structs are the constant expression for the germanic plural
+ form determination. It represents the expression "n != 1". */
+static const struct expression plvar =
+{
+ .nargs = 0,
+ .operation = var,
+};
+static const struct expression plone =
+{
+ .nargs = 0,
+ .operation = num,
+ .val =
+ {
+ .num = 1
+ }
+};
+struct expression GERMANIC_PLURAL =
+{
+ .nargs = 2,
+ .operation = not_equal,
+ .val =
+ {
+ .args =
+ {
+ [0] = (struct expression *) &plvar,
+ [1] = (struct expression *) &plone
+ }
+ }
+};
+
+# define INIT_GERMANIC_PLURAL()
+
+#else
+
+/* For compilers without support for ISO C 99 struct/union initializers:
+ Initialization at run-time. */
+
+static struct expression plvar;
+static struct expression plone;
+struct expression GERMANIC_PLURAL;
+
+static void
+init_germanic_plural ()
+{
+ if (plone.val.num == 0)
+ {
+ plvar.nargs = 0;
+ plvar.operation = var;
+
+ plone.nargs = 0;
+ plone.operation = num;
+ plone.val.num = 1;
+
+ GERMANIC_PLURAL.nargs = 2;
+ GERMANIC_PLURAL.operation = not_equal;
+ GERMANIC_PLURAL.val.args[0] = &plvar;
+ GERMANIC_PLURAL.val.args[1] = &plone;
+ }
+}
+
+# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
+
+#endif
+
+void
+internal_function
+EXTRACT_PLURAL_EXPRESSION (nullentry, pluralp, npluralsp)
+ const char *nullentry;
+ struct expression **pluralp;
+ unsigned long int *npluralsp;
+{
+ if (nullentry != NULL)
+ {
+ const char *plural;
+ const char *nplurals;
+
+ plural = strstr (nullentry, "plural=");
+ nplurals = strstr (nullentry, "nplurals=");
+ if (plural == NULL || nplurals == NULL)
+ goto no_plural;
+ else
+ {
+ char *endp;
+ unsigned long int n;
+ struct parse_args args;
+
+ /* First get the number. */
+ nplurals += 9;
+ while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
+ ++nplurals;
+ if (!(*nplurals >= '0' && *nplurals <= '9'))
+ goto no_plural;
+#if defined HAVE_STRTOUL || defined _LIBC
+ n = strtoul (nplurals, &endp, 10);
+#else
+ for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
+ n = n * 10 + (*endp - '0');
+#endif
+ if (nplurals == endp)
+ goto no_plural;
+ *npluralsp = n;
+
+ /* Due to the restrictions bison imposes onto the interface of the
+ scanner function we have to put the input string and the result
+ passed up from the parser into the same structure which address
+ is passed down to the parser. */
+ plural += 7;
+ args.cp = plural;
+ if (PLURAL_PARSE (&args) != 0)
+ goto no_plural;
+ *pluralp = args.res;
+ }
+ }
+ else
+ {
+ /* By default we are using the Germanic form: singular form only
+ for `one', the plural form otherwise. Yes, this is also what
+ English is using since English is a Germanic language. */
+ no_plural:
+ INIT_GERMANIC_PLURAL ();
+ *pluralp = &GERMANIC_PLURAL;
+ *npluralsp = 2;
+ }
+}
--- /dev/null
+/* Expression parsing and evaluation for plural form selection.
+ Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+ Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _PLURAL_EXP_H
+#define _PLURAL_EXP_H
+
+#ifndef PARAMS
+# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
+# define PARAMS(args) args
+# else
+# define PARAMS(args) ()
+# endif
+#endif
+
+#ifndef internal_function
+# define internal_function
+#endif
+
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
+
+/* This is the representation of the expressions to determine the
+ plural form. */
+struct expression
+{
+ int nargs; /* Number of arguments. */
+ enum operator
+ {
+ /* Without arguments: */
+ var, /* The variable "n". */
+ num, /* Decimal number. */
+ /* Unary operators: */
+ lnot, /* Logical NOT. */
+ /* Binary operators: */
+ mult, /* Multiplication. */
+ divide, /* Division. */
+ module, /* Modulo operation. */
+ plus, /* Addition. */
+ minus, /* Subtraction. */
+ less_than, /* Comparison. */
+ greater_than, /* Comparison. */
+ less_or_equal, /* Comparison. */
+ greater_or_equal, /* Comparison. */
+ equal, /* Comparison for equality. */
+ not_equal, /* Comparison for inequality. */
+ land, /* Logical AND. */
+ lor, /* Logical OR. */
+ /* Ternary operators: */
+ qmop /* Question mark operator. */
+ } operation;
+ union
+ {
+ unsigned long int num; /* Number value for `num'. */
+ struct expression *args[3]; /* Up to three arguments. */
+ } val;
+};
+
+/* This is the data structure to pass information to the parser and get
+ the result in a thread-safe way. */
+struct parse_args
+{
+ const char *cp;
+ struct expression *res;
+};
+
+
+/* Names for the libintl functions are a problem. This source code is used
+ 1. in the GNU C Library library,
+ 2. in the GNU libintl library,
+ 3. in the GNU gettext tools.
+ The function names in each situation must be different, to allow for
+ binary incompatible changes in 'struct expression'. Furthermore,
+ 1. in the GNU C Library library, the names have a __ prefix,
+ 2.+3. in the GNU libintl library and in the GNU gettext tools, the names
+ must follow ANSI C and not start with __.
+ So we have to distinguish the three cases. */
+#ifdef _LIBC
+# define FREE_EXPRESSION __gettext_free_exp
+# define PLURAL_PARSE __gettextparse
+# define GERMANIC_PLURAL __gettext_germanic_plural
+# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
+#elif defined (IN_LIBINTL)
+# define FREE_EXPRESSION libintl_gettext_free_exp
+# define PLURAL_PARSE libintl_gettextparse
+# define GERMANIC_PLURAL libintl_gettext_germanic_plural
+# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural
+#else
+# define FREE_EXPRESSION free_plural_expression
+# define PLURAL_PARSE parse_plural_expression
+# define GERMANIC_PLURAL germanic_plural
+# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
+#endif
+
+extern void FREE_EXPRESSION PARAMS ((struct expression *exp))
+ internal_function;
+extern int PLURAL_PARSE PARAMS ((void *arg));
+extern struct expression GERMANIC_PLURAL attribute_hidden;
+extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry,
+ struct expression **pluralp,
+ unsigned long int *npluralsp))
+ internal_function;
+
+#if !defined (_LIBC) && !defined (IN_LIBINTL)
+extern unsigned long int plural_eval PARAMS ((struct expression *pexp,
+ unsigned long int n));
+#endif
+
+#endif /* _PLURAL_EXP_H */
--- /dev/null
+
+/* A Bison parser, made from plural.y
+ by GNU Bison version 1.28 */
+
+#define YYBISON 1 /* Identify Bison output. */
+
+#define yyparse __gettextparse
+#define yylex __gettextlex
+#define yyerror __gettexterror
+#define yylval __gettextlval
+#define yychar __gettextchar
+#define yydebug __gettextdebug
+#define yynerrs __gettextnerrs
+#define EQUOP2 257
+#define CMPOP2 258
+#define ADDOP2 259
+#define MULOP2 260
+#define NUMBER 261
+
+#line 1 "plural.y"
+
+/* Expression parsing for plural form selection.
+ Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+/* The bison generated parser uses alloca. AIX 3 forces us to put this
+ declaration at the beginning of the file. The declaration in bison's
+ skeleton file comes too late. This must come before <config.h>
+ because <config.h> may include arbitrary system headers. */
+#if defined _AIX && !defined __GNUC__
+ #pragma alloca
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include "plural-exp.h"
+
+/* The main function generated by the parser is called __gettextparse,
+ but we want it to be called PLURAL_PARSE. */
+#ifndef _LIBC
+# define __gettextparse PLURAL_PARSE
+#endif
+
+#define YYLEX_PARAM &((struct parse_args *) arg)->cp
+#define YYPARSE_PARAM arg
+
+#line 49 "plural.y"
+typedef union {
+ unsigned long int num;
+ enum operator op;
+ struct expression *exp;
+} YYSTYPE;
+#line 55 "plural.y"
+
+/* Prototypes for local functions. */
+static struct expression *new_exp PARAMS ((int nargs, enum operator op,
+ struct expression * const *args));
+static inline struct expression *new_exp_0 PARAMS ((enum operator op));
+static inline struct expression *new_exp_1 PARAMS ((enum operator op,
+ struct expression *right));
+static struct expression *new_exp_2 PARAMS ((enum operator op,
+ struct expression *left,
+ struct expression *right));
+static inline struct expression *new_exp_3 PARAMS ((enum operator op,
+ struct expression *bexp,
+ struct expression *tbranch,
+ struct expression *fbranch));
+static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
+static void yyerror PARAMS ((const char *str));
+
+/* Allocation of expressions. */
+
+static struct expression *
+new_exp (nargs, op, args)
+ int nargs;
+ enum operator op;
+ struct expression * const *args;
+{
+ int i;
+ struct expression *newp;
+
+ /* If any of the argument could not be malloc'ed, just return NULL. */
+ for (i = nargs - 1; i >= 0; i--)
+ if (args[i] == NULL)
+ goto fail;
+
+ /* Allocate a new expression. */
+ newp = (struct expression *) malloc (sizeof (*newp));
+ if (newp != NULL)
+ {
+ newp->nargs = nargs;
+ newp->operation = op;
+ for (i = nargs - 1; i >= 0; i--)
+ newp->val.args[i] = args[i];
+ return newp;
+ }
+
+ fail:
+ for (i = nargs - 1; i >= 0; i--)
+ FREE_EXPRESSION (args[i]);
+
+ return NULL;
+}
+
+static inline struct expression *
+new_exp_0 (op)
+ enum operator op;
+{
+ return new_exp (0, op, NULL);
+}
+
+static inline struct expression *
+new_exp_1 (op, right)
+ enum operator op;
+ struct expression *right;
+{
+ struct expression *args[1];
+
+ args[0] = right;
+ return new_exp (1, op, args);
+}
+
+static struct expression *
+new_exp_2 (op, left, right)
+ enum operator op;
+ struct expression *left;
+ struct expression *right;
+{
+ struct expression *args[2];
+
+ args[0] = left;
+ args[1] = right;
+ return new_exp (2, op, args);
+}
+
+static inline struct expression *
+new_exp_3 (op, bexp, tbranch, fbranch)
+ enum operator op;
+ struct expression *bexp;
+ struct expression *tbranch;
+ struct expression *fbranch;
+{
+ struct expression *args[3];
+
+ args[0] = bexp;
+ args[1] = tbranch;
+ args[2] = fbranch;
+ return new_exp (3, op, args);
+}
+
+#include <stdio.h>
+
+#ifndef __cplusplus
+#ifndef __STDC__
+#define const
+#endif
+#endif
+
+
+
+#define YYFINAL 27
+#define YYFLAG -32768
+#define YYNTBASE 16
+
+#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
+
+static const char yytranslate[] = { 0,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 10, 2, 2, 2, 2, 5, 2, 14,
+ 15, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 12, 2, 2,
+ 2, 2, 3, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 13,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 4, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 1, 6, 7, 8, 9,
+ 11
+};
+
+#if YYDEBUG != 0
+static const short yyprhs[] = { 0,
+ 0, 2, 8, 12, 16, 20, 24, 28, 32, 35,
+ 37, 39
+};
+
+static const short yyrhs[] = { 17,
+ 0, 17, 3, 17, 12, 17, 0, 17, 4, 17,
+ 0, 17, 5, 17, 0, 17, 6, 17, 0, 17,
+ 7, 17, 0, 17, 8, 17, 0, 17, 9, 17,
+ 0, 10, 17, 0, 13, 0, 11, 0, 14, 17,
+ 15, 0
+};
+
+#endif
+
+#if YYDEBUG != 0
+static const short yyrline[] = { 0,
+ 174, 182, 186, 190, 194, 198, 202, 206, 210, 214,
+ 218, 223
+};
+#endif
+
+
+#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+
+static const char * const yytname[] = { "$","error","$undefined.","'?'","'|'",
+"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'",
+"start","exp", NULL
+};
+#endif
+
+static const short yyr1[] = { 0,
+ 16, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+ 17, 17
+};
+
+static const short yyr2[] = { 0,
+ 1, 5, 3, 3, 3, 3, 3, 3, 2, 1,
+ 1, 3
+};
+
+static const short yydefact[] = { 0,
+ 0, 11, 10, 0, 1, 9, 0, 0, 0, 0,
+ 0, 0, 0, 0, 12, 0, 3, 4, 5, 6,
+ 7, 8, 0, 2, 0, 0, 0
+};
+
+static const short yydefgoto[] = { 25,
+ 5
+};
+
+static const short yypact[] = { -9,
+ -9,-32768,-32768, -9, 34,-32768, 11, -9, -9, -9,
+ -9, -9, -9, -9,-32768, 24, 39, 43, 16, 26,
+ -3,-32768, -9, 34, 21, 53,-32768
+};
+
+static const short yypgoto[] = {-32768,
+ -1
+};
+
+
+#define YYLAST 53
+
+
+static const short yytable[] = { 6,
+ 1, 2, 7, 3, 4, 14, 16, 17, 18, 19,
+ 20, 21, 22, 8, 9, 10, 11, 12, 13, 14,
+ 26, 24, 12, 13, 14, 15, 8, 9, 10, 11,
+ 12, 13, 14, 13, 14, 23, 8, 9, 10, 11,
+ 12, 13, 14, 10, 11, 12, 13, 14, 11, 12,
+ 13, 14, 27
+};
+
+static const short yycheck[] = { 1,
+ 10, 11, 4, 13, 14, 9, 8, 9, 10, 11,
+ 12, 13, 14, 3, 4, 5, 6, 7, 8, 9,
+ 0, 23, 7, 8, 9, 15, 3, 4, 5, 6,
+ 7, 8, 9, 8, 9, 12, 3, 4, 5, 6,
+ 7, 8, 9, 5, 6, 7, 8, 9, 6, 7,
+ 8, 9, 0
+};
+#define YYPURE 1
+
+/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
+#line 3 "/usr/local/share/bison.simple"
+/* This file comes from bison-1.28. */
+
+/* Skeleton output parser for bison,
+ Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* As a special exception, when this file is copied by Bison into a
+ Bison output file, you may use that output file without restriction.
+ This special exception was added by the Free Software Foundation
+ in version 1.24 of Bison. */
+
+/* This is the parser code that is written into each bison parser
+ when the %semantic_parser declaration is not specified in the grammar.
+ It was written by Richard Stallman by simplifying the hairy parser
+ used when %semantic_parser is specified. */
+
+#ifndef YYSTACK_USE_ALLOCA
+#ifdef alloca
+#define YYSTACK_USE_ALLOCA
+#else /* alloca not defined */
+#ifdef __GNUC__
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
+#else /* not GNU C. */
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#define YYSTACK_USE_ALLOCA
+#include <alloca.h>
+#else /* not sparc */
+/* We think this test detects Watcom and Microsoft C. */
+/* This used to test MSDOS, but that is a bad idea
+ since that symbol is in the user namespace. */
+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if 0 /* No need for malloc.h, which pollutes the namespace;
+ instead, just don't use alloca. */
+#include <malloc.h>
+#endif
+#else /* not MSDOS, or __TURBOC__ */
+#if defined(_AIX)
+/* I don't know what this was needed for, but it pollutes the namespace.
+ So I turned it off. rms, 2 May 1997. */
+/* #include <malloc.h> */
+ #pragma alloca
+#define YYSTACK_USE_ALLOCA
+#else /* not MSDOS, or __TURBOC__, or _AIX */
+#if 0
+#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
+ and on HPUX 10. Eventually we can turn this on. */
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
+#endif /* __hpux */
+#endif
+#endif /* not _AIX */
+#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not sparc */
+#endif /* not GNU C */
+#endif /* alloca not defined */
+#endif /* YYSTACK_USE_ALLOCA not defined */
+
+#ifdef YYSTACK_USE_ALLOCA
+#define YYSTACK_ALLOC alloca
+#else
+#define YYSTACK_ALLOC malloc
+#endif
+
+/* Note: there must be only one dollar sign in this file.
+ It is replaced by the list of actions, each action
+ as one case of the switch. */
+
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY -2
+#define YYEOF 0
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrlab1
+/* Like YYERROR except do call yyerror.
+ This remains here temporarily to ease the
+ transition to the new meaning of YYERROR, for GCC.
+ Once GCC version 2 has supplanted version 1, this can go. */
+#define YYFAIL goto yyerrlab
+#define YYRECOVERING() (!!yyerrstatus)
+#define YYBACKUP(token, value) \
+do \
+ if (yychar == YYEMPTY && yylen == 1) \
+ { yychar = (token), yylval = (value); \
+ yychar1 = YYTRANSLATE (yychar); \
+ YYPOPSTACK; \
+ goto yybackup; \
+ } \
+ else \
+ { yyerror ("syntax error: cannot back up"); YYERROR; } \
+while (0)
+
+#define YYTERROR 1
+#define YYERRCODE 256
+
+#ifndef YYPURE
+#define YYLEX yylex()
+#endif
+
+#ifdef YYPURE
+#ifdef YYLSP_NEEDED
+#ifdef YYLEX_PARAM
+#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM)
+#else
+#define YYLEX yylex(&yylval, &yylloc)
+#endif
+#else /* not YYLSP_NEEDED */
+#ifdef YYLEX_PARAM
+#define YYLEX yylex(&yylval, YYLEX_PARAM)
+#else
+#define YYLEX yylex(&yylval)
+#endif
+#endif /* not YYLSP_NEEDED */
+#endif
+
+/* If nonreentrant, generate the variables here */
+
+#ifndef YYPURE
+
+int yychar; /* the lookahead symbol */
+YYSTYPE yylval; /* the semantic value of the */
+ /* lookahead symbol */
+
+#ifdef YYLSP_NEEDED
+YYLTYPE yylloc; /* location data for the lookahead */
+ /* symbol */
+#endif
+
+int yynerrs; /* number of parse errors so far */
+#endif /* not YYPURE */
+
+#if YYDEBUG != 0
+int yydebug; /* nonzero means print parse trace */
+/* Since this is uninitialized, it does not stop multiple parsers
+ from coexisting. */
+#endif
+
+/* YYINITDEPTH indicates the initial size of the parser's stacks */
+
+#ifndef YYINITDEPTH
+#define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH is the maximum size the stacks can grow to
+ (effective only if the built-in stack extension method is used). */
+
+#if YYMAXDEPTH == 0
+#undef YYMAXDEPTH
+#endif
+
+#ifndef YYMAXDEPTH
+#define YYMAXDEPTH 10000
+#endif
+\f
+/* Define __yy_memcpy. Note that the size argument
+ should be passed with type unsigned int, because that is what the non-GCC
+ definitions require. With GCC, __builtin_memcpy takes an arg
+ of type size_t, but it can handle unsigned int. */
+
+#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
+#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
+#else /* not GNU C or C++ */
+#ifndef __cplusplus
+
+/* This is the most reliable way to avoid incompatibilities
+ in available built-in functions on various systems. */
+static void
+__yy_memcpy (to, from, count)
+ char *to;
+ char *from;
+ unsigned int count;
+{
+ register char *f = from;
+ register char *t = to;
+ register int i = count;
+
+ while (i-- > 0)
+ *t++ = *f++;
+}
+
+#else /* __cplusplus */
+
+/* This is the most reliable way to avoid incompatibilities
+ in available built-in functions on various systems. */
+static void
+__yy_memcpy (char *to, char *from, unsigned int count)
+{
+ register char *t = to;
+ register char *f = from;
+ register int i = count;
+
+ while (i-- > 0)
+ *t++ = *f++;
+}
+
+#endif
+#endif
+\f
+#line 217 "/usr/local/share/bison.simple"
+
+/* The user can define YYPARSE_PARAM as the name of an argument to be passed
+ into yyparse. The argument should have type void *.
+ It should actually point to an object.
+ Grammar actions can access the variable by casting it
+ to the proper pointer type. */
+
+#ifdef YYPARSE_PARAM
+#ifdef __cplusplus
+#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL
+#else /* not __cplusplus */
+#define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+#endif /* not __cplusplus */
+#else /* not YYPARSE_PARAM */
+#define YYPARSE_PARAM_ARG
+#define YYPARSE_PARAM_DECL
+#endif /* not YYPARSE_PARAM */
+
+/* Prevent warning if -Wstrict-prototypes. */
+#ifdef __GNUC__
+#ifdef YYPARSE_PARAM
+int yyparse (void *);
+#else
+int yyparse (void);
+#endif
+#endif
+
+int
+yyparse(YYPARSE_PARAM_ARG)
+ YYPARSE_PARAM_DECL
+{
+ register int yystate;
+ register int yyn;
+ register short *yyssp;
+ register YYSTYPE *yyvsp;
+ int yyerrstatus; /* number of tokens to shift before error messages enabled */
+ int yychar1 = 0; /* lookahead token as an internal (translated) token number */
+
+ short yyssa[YYINITDEPTH]; /* the state stack */
+ YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */
+
+ short *yyss = yyssa; /* refer to the stacks thru separate pointers */
+ YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */
+
+#ifdef YYLSP_NEEDED
+ YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */
+ YYLTYPE *yyls = yylsa;
+ YYLTYPE *yylsp;
+
+#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
+#else
+#define YYPOPSTACK (yyvsp--, yyssp--)
+#endif
+
+ int yystacksize = YYINITDEPTH;
+ int yyfree_stacks = 0;
+
+#ifdef YYPURE
+ int yychar;
+ YYSTYPE yylval;
+ int yynerrs;
+#ifdef YYLSP_NEEDED
+ YYLTYPE yylloc;
+#endif
+#endif
+
+ YYSTYPE yyval; /* the variable used to return */
+ /* semantic values from the action */
+ /* routines */
+
+ int yylen;
+
+#if YYDEBUG != 0
+ if (yydebug)
+ fprintf(stderr, "Starting parse\n");
+#endif
+
+ yystate = 0;
+ yyerrstatus = 0;
+ yynerrs = 0;
+ yychar = YYEMPTY; /* Cause a token to be read. */
+
+ /* Initialize stack pointers.
+ Waste one element of value and location stack
+ so that they stay on the same level as the state stack.
+ The wasted elements are never initialized. */
+
+ yyssp = yyss - 1;
+ yyvsp = yyvs;
+#ifdef YYLSP_NEEDED
+ yylsp = yyls;
+#endif
+
+/* Push a new state, which is found in yystate . */
+/* In all cases, when you get here, the value and location stacks
+ have just been pushed. so pushing a state here evens the stacks. */
+yynewstate:
+
+ *++yyssp = yystate;
+
+ if (yyssp >= yyss + yystacksize - 1)
+ {
+ /* Give user a chance to reallocate the stack */
+ /* Use copies of these so that the &'s don't force the real ones into memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ short *yyss1 = yyss;
+#ifdef YYLSP_NEEDED
+ YYLTYPE *yyls1 = yyls;
+#endif
+
+ /* Get the current used size of the three stacks, in elements. */
+ int size = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+ /* Each stack pointer address is followed by the size of
+ the data in use in that stack, in bytes. */
+#ifdef YYLSP_NEEDED
+ /* This used to be a conditional around just the two extra args,
+ but that might be undefined if yyoverflow is a macro. */
+ yyoverflow("parser stack overflow",
+ &yyss1, size * sizeof (*yyssp),
+ &yyvs1, size * sizeof (*yyvsp),
+ &yyls1, size * sizeof (*yylsp),
+ &yystacksize);
+#else
+ yyoverflow("parser stack overflow",
+ &yyss1, size * sizeof (*yyssp),
+ &yyvs1, size * sizeof (*yyvsp),
+ &yystacksize);
+#endif
+
+ yyss = yyss1; yyvs = yyvs1;
+#ifdef YYLSP_NEEDED
+ yyls = yyls1;
+#endif
+#else /* no yyoverflow */
+ /* Extend the stack our own way. */
+ if (yystacksize >= YYMAXDEPTH)
+ {
+ yyerror("parser stack overflow");
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
+ return 2;
+ }
+ yystacksize *= 2;
+ if (yystacksize > YYMAXDEPTH)
+ yystacksize = YYMAXDEPTH;
+#ifndef YYSTACK_USE_ALLOCA
+ yyfree_stacks = 1;
+#endif
+ yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+ __yy_memcpy ((char *)yyss, (char *)yyss1,
+ size * (unsigned int) sizeof (*yyssp));
+ yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+ __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+ size * (unsigned int) sizeof (*yyvsp));
+#ifdef YYLSP_NEEDED
+ yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+ __yy_memcpy ((char *)yyls, (char *)yyls1,
+ size * (unsigned int) sizeof (*yylsp));
+#endif
+#endif /* no yyoverflow */
+
+ yyssp = yyss + size - 1;
+ yyvsp = yyvs + size - 1;
+#ifdef YYLSP_NEEDED
+ yylsp = yyls + size - 1;
+#endif
+
+#if YYDEBUG != 0
+ if (yydebug)
+ fprintf(stderr, "Stack size increased to %d\n", yystacksize);
+#endif
+
+ if (yyssp >= yyss + yystacksize - 1)
+ YYABORT;
+ }
+
+#if YYDEBUG != 0
+ if (yydebug)
+ fprintf(stderr, "Entering state %d\n", yystate);
+#endif
+
+ goto yybackup;
+ yybackup:
+
+/* Do appropriate processing given the current state. */
+/* Read a lookahead token if we need one and don't already have one. */
+/* yyresume: */
+
+ /* First try to decide what to do without reference to lookahead token. */
+
+ yyn = yypact[yystate];
+ if (yyn == YYFLAG)
+ goto yydefault;
+
+ /* Not known => get a lookahead token if don't already have one. */
+
+ /* yychar is either YYEMPTY or YYEOF
+ or a valid token in external form. */
+
+ if (yychar == YYEMPTY)
+ {
+#if YYDEBUG != 0
+ if (yydebug)
+ fprintf(stderr, "Reading a token: ");
+#endif
+ yychar = YYLEX;
+ }
+
+ /* Convert token to internal form (in yychar1) for indexing tables with */
+
+ if (yychar <= 0) /* This means end of input. */
+ {
+ yychar1 = 0;
+ yychar = YYEOF; /* Don't call YYLEX any more */
+
+#if YYDEBUG != 0
+ if (yydebug)
+ fprintf(stderr, "Now at end of input.\n");
+#endif
+ }
+ else
+ {
+ yychar1 = YYTRANSLATE(yychar);
+
+#if YYDEBUG != 0
+ if (yydebug)
+ {
+ fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
+ /* Give the individual parser a way to print the precise meaning
+ of a token, for further debugging info. */
+#ifdef YYPRINT
+ YYPRINT (stderr, yychar, yylval);
+#endif
+ fprintf (stderr, ")\n");
+ }
+#endif
+ }
+
+ yyn += yychar1;
+ if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+ goto yydefault;
+
+ yyn = yytable[yyn];
+
+ /* yyn is what to do for this token type in this state.
+ Negative => reduce, -yyn is rule number.
+ Positive => shift, yyn is new state.
+ New state is final state => don't bother to shift,
+ just return success.
+ 0, or most negative number => error. */
+
+ if (yyn < 0)
+ {
+ if (yyn == YYFLAG)
+ goto yyerrlab;
+ yyn = -yyn;
+ goto yyreduce;
+ }
+ else if (yyn == 0)
+ goto yyerrlab;
+
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
+ /* Shift the lookahead token. */
+
+#if YYDEBUG != 0
+ if (yydebug)
+ fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
+#endif
+
+ /* Discard the token being shifted unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
+
+ *++yyvsp = yylval;
+#ifdef YYLSP_NEEDED
+ *++yylsp = yylloc;
+#endif
+
+ /* count tokens shifted since error; after three, turn off error status. */
+ if (yyerrstatus) yyerrstatus--;
+
+ yystate = yyn;
+ goto yynewstate;
+
+/* Do the default action for the current state. */
+yydefault:
+
+ yyn = yydefact[yystate];
+ if (yyn == 0)
+ goto yyerrlab;
+
+/* Do a reduction. yyn is the number of a rule to reduce with. */
+yyreduce:
+ yylen = yyr2[yyn];
+ if (yylen > 0)
+ yyval = yyvsp[1-yylen]; /* implement default value of the action */
+
+#if YYDEBUG != 0
+ if (yydebug)
+ {
+ int i;
+
+ fprintf (stderr, "Reducing via rule %d (line %d), ",
+ yyn, yyrline[yyn]);
+
+ /* Print the symbols being reduced, and their result. */
+ for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
+ fprintf (stderr, "%s ", yytname[yyrhs[i]]);
+ fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+ }
+#endif
+
+
+ switch (yyn) {
+
+case 1:
+#line 175 "plural.y"
+{
+ if (yyvsp[0].exp == NULL)
+ YYABORT;
+ ((struct parse_args *) arg)->res = yyvsp[0].exp;
+ ;
+ break;}
+case 2:
+#line 183 "plural.y"
+{
+ yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
+ ;
+ break;}
+case 3:
+#line 187 "plural.y"
+{
+ yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
+ ;
+ break;}
+case 4:
+#line 191 "plural.y"
+{
+ yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
+ ;
+ break;}
+case 5:
+#line 195 "plural.y"
+{
+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+ ;
+ break;}
+case 6:
+#line 199 "plural.y"
+{
+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+ ;
+ break;}
+case 7:
+#line 203 "plural.y"
+{
+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+ ;
+ break;}
+case 8:
+#line 207 "plural.y"
+{
+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+ ;
+ break;}
+case 9:
+#line 211 "plural.y"
+{
+ yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
+ ;
+ break;}
+case 10:
+#line 215 "plural.y"
+{
+ yyval.exp = new_exp_0 (var);
+ ;
+ break;}
+case 11:
+#line 219 "plural.y"
+{
+ if ((yyval.exp = new_exp_0 (num)) != NULL)
+ yyval.exp->val.num = yyvsp[0].num;
+ ;
+ break;}
+case 12:
+#line 224 "plural.y"
+{
+ yyval.exp = yyvsp[-1].exp;
+ ;
+ break;}
+}
+ /* the action file gets copied in in place of this dollarsign */
+#line 543 "/usr/local/share/bison.simple"
+\f
+ yyvsp -= yylen;
+ yyssp -= yylen;
+#ifdef YYLSP_NEEDED
+ yylsp -= yylen;
+#endif
+
+#if YYDEBUG != 0
+ if (yydebug)
+ {
+ short *ssp1 = yyss - 1;
+ fprintf (stderr, "state stack now");
+ while (ssp1 != yyssp)
+ fprintf (stderr, " %d", *++ssp1);
+ fprintf (stderr, "\n");
+ }
+#endif
+
+ *++yyvsp = yyval;
+
+#ifdef YYLSP_NEEDED
+ yylsp++;
+ if (yylen == 0)
+ {
+ yylsp->first_line = yylloc.first_line;
+ yylsp->first_column = yylloc.first_column;
+ yylsp->last_line = (yylsp-1)->last_line;
+ yylsp->last_column = (yylsp-1)->last_column;
+ yylsp->text = 0;
+ }
+ else
+ {
+ yylsp->last_line = (yylsp+yylen-1)->last_line;
+ yylsp->last_column = (yylsp+yylen-1)->last_column;
+ }
+#endif
+
+ /* Now "shift" the result of the reduction.
+ Determine what state that goes to,
+ based on the state we popped back to
+ and the rule number reduced by. */
+
+ yyn = yyr1[yyn];
+
+ yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
+ if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+ yystate = yytable[yystate];
+ else
+ yystate = yydefgoto[yyn - YYNTBASE];
+
+ goto yynewstate;
+
+yyerrlab: /* here on detecting error */
+
+ if (! yyerrstatus)
+ /* If not already recovering from an error, report this error. */
+ {
+ ++yynerrs;
+
+#ifdef YYERROR_VERBOSE
+ yyn = yypact[yystate];
+
+ if (yyn > YYFLAG && yyn < YYLAST)
+ {
+ int size = 0;
+ char *msg;
+ int x, count;
+
+ count = 0;
+ /* Start X at -yyn if nec to avoid negative indexes in yycheck. */
+ for (x = (yyn < 0 ? -yyn : 0);
+ x < (sizeof(yytname) / sizeof(char *)); x++)
+ if (yycheck[x + yyn] == x)
+ size += strlen(yytname[x]) + 15, count++;
+ msg = (char *) malloc(size + 15);
+ if (msg != 0)
+ {
+ strcpy(msg, "parse error");
+
+ if (count < 5)
+ {
+ count = 0;
+ for (x = (yyn < 0 ? -yyn : 0);
+ x < (sizeof(yytname) / sizeof(char *)); x++)
+ if (yycheck[x + yyn] == x)
+ {
+ strcat(msg, count == 0 ? ", expecting `" : " or `");
+ strcat(msg, yytname[x]);
+ strcat(msg, "'");
+ count++;
+ }
+ }
+ yyerror(msg);
+ free(msg);
+ }
+ else
+ yyerror ("parse error; also virtual memory exceeded");
+ }
+ else
+#endif /* YYERROR_VERBOSE */
+ yyerror("parse error");
+ }
+
+ goto yyerrlab1;
+yyerrlab1: /* here on error raised explicitly by an action */
+
+ if (yyerrstatus == 3)
+ {
+ /* if just tried and failed to reuse lookahead token after an error, discard it. */
+
+ /* return failure if at end of input */
+ if (yychar == YYEOF)
+ YYABORT;
+
+#if YYDEBUG != 0
+ if (yydebug)
+ fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
+#endif
+
+ yychar = YYEMPTY;
+ }
+
+ /* Else will try to reuse lookahead token
+ after shifting the error token. */
+
+ yyerrstatus = 3; /* Each real token shifted decrements this */
+
+ goto yyerrhandle;
+
+yyerrdefault: /* current state does not do anything special for the error token. */
+
+#if 0
+ /* This is wrong; only states that explicitly want error tokens
+ should shift them. */
+ yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/
+ if (yyn) goto yydefault;
+#endif
+
+yyerrpop: /* pop the current state because it cannot handle the error token */
+
+ if (yyssp == yyss) YYABORT;
+ yyvsp--;
+ yystate = *--yyssp;
+#ifdef YYLSP_NEEDED
+ yylsp--;
+#endif
+
+#if YYDEBUG != 0
+ if (yydebug)
+ {
+ short *ssp1 = yyss - 1;
+ fprintf (stderr, "Error: state stack now");
+ while (ssp1 != yyssp)
+ fprintf (stderr, " %d", *++ssp1);
+ fprintf (stderr, "\n");
+ }
+#endif
+
+yyerrhandle:
+
+ yyn = yypact[yystate];
+ if (yyn == YYFLAG)
+ goto yyerrdefault;
+
+ yyn += YYTERROR;
+ if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
+ goto yyerrdefault;
+
+ yyn = yytable[yyn];
+ if (yyn < 0)
+ {
+ if (yyn == YYFLAG)
+ goto yyerrpop;
+ yyn = -yyn;
+ goto yyreduce;
+ }
+ else if (yyn == 0)
+ goto yyerrpop;
+
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
+#if YYDEBUG != 0
+ if (yydebug)
+ fprintf(stderr, "Shifting error token, ");
+#endif
+
+ *++yyvsp = yylval;
+#ifdef YYLSP_NEEDED
+ *++yylsp = yylloc;
+#endif
+
+ yystate = yyn;
+ goto yynewstate;
+
+ yyacceptlab:
+ /* YYACCEPT comes here. */
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
+ return 0;
+
+ yyabortlab:
+ /* YYABORT comes here. */
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
+ return 1;
+}
+#line 229 "plural.y"
+
+
+void
+internal_function
+FREE_EXPRESSION (exp)
+ struct expression *exp;
+{
+ if (exp == NULL)
+ return;
+
+ /* Handle the recursive case. */
+ switch (exp->nargs)
+ {
+ case 3:
+ FREE_EXPRESSION (exp->val.args[2]);
+ /* FALLTHROUGH */
+ case 2:
+ FREE_EXPRESSION (exp->val.args[1]);
+ /* FALLTHROUGH */
+ case 1:
+ FREE_EXPRESSION (exp->val.args[0]);
+ /* FALLTHROUGH */
+ default:
+ break;
+ }
+
+ free (exp);
+}
+
+
+static int
+yylex (lval, pexp)
+ YYSTYPE *lval;
+ const char **pexp;
+{
+ const char *exp = *pexp;
+ int result;
+
+ while (1)
+ {
+ if (exp[0] == '\0')
+ {
+ *pexp = exp;
+ return YYEOF;
+ }
+
+ if (exp[0] != ' ' && exp[0] != '\t')
+ break;
+
+ ++exp;
+ }
+
+ result = *exp++;
+ switch (result)
+ {
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
+ {
+ unsigned long int n = result - '0';
+ while (exp[0] >= '0' && exp[0] <= '9')
+ {
+ n *= 10;
+ n += exp[0] - '0';
+ ++exp;
+ }
+ lval->num = n;
+ result = NUMBER;
+ }
+ break;
+
+ case '=':
+ if (exp[0] == '=')
+ {
+ ++exp;
+ lval->op = equal;
+ result = EQUOP2;
+ }
+ else
+ result = YYERRCODE;
+ break;
+
+ case '!':
+ if (exp[0] == '=')
+ {
+ ++exp;
+ lval->op = not_equal;
+ result = EQUOP2;
+ }
+ break;
+
+ case '&':
+ case '|':
+ if (exp[0] == result)
+ ++exp;
+ else
+ result = YYERRCODE;
+ break;
+
+ case '<':
+ if (exp[0] == '=')
+ {
+ ++exp;
+ lval->op = less_or_equal;
+ }
+ else
+ lval->op = less_than;
+ result = CMPOP2;
+ break;
+
+ case '>':
+ if (exp[0] == '=')
+ {
+ ++exp;
+ lval->op = greater_or_equal;
+ }
+ else
+ lval->op = greater_than;
+ result = CMPOP2;
+ break;
+
+ case '*':
+ lval->op = mult;
+ result = MULOP2;
+ break;
+
+ case '/':
+ lval->op = divide;
+ result = MULOP2;
+ break;
+
+ case '%':
+ lval->op = module;
+ result = MULOP2;
+ break;
+
+ case '+':
+ lval->op = plus;
+ result = ADDOP2;
+ break;
+
+ case '-':
+ lval->op = minus;
+ result = ADDOP2;
+ break;
+
+ case 'n':
+ case '?':
+ case ':':
+ case '(':
+ case ')':
+ /* Nothing, just return the character. */
+ break;
+
+ case ';':
+ case '\n':
+ case '\0':
+ /* Be safe and let the user call this function again. */
+ --exp;
+ result = YYEOF;
+ break;
+
+ default:
+ result = YYERRCODE;
+#if YYDEBUG != 0
+ --exp;
+#endif
+ break;
+ }
+
+ *pexp = exp;
+
+ return result;
+}
+
+
+static void
+yyerror (str)
+ const char *str;
+{
+ /* Do nothing. We don't print error messages here. */
+}
--- /dev/null
+%{
+/* Expression parsing for plural form selection.
+ Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+/* The bison generated parser uses alloca. AIX 3 forces us to put this
+ declaration at the beginning of the file. The declaration in bison's
+ skeleton file comes too late. This must come before <config.h>
+ because <config.h> may include arbitrary system headers. */
+#if defined _AIX && !defined __GNUC__
+ #pragma alloca
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include "plural-exp.h"
+
+/* The main function generated by the parser is called __gettextparse,
+ but we want it to be called PLURAL_PARSE. */
+#ifndef _LIBC
+# define __gettextparse PLURAL_PARSE
+#endif
+
+#define YYLEX_PARAM &((struct parse_args *) arg)->cp
+#define YYPARSE_PARAM arg
+%}
+%pure_parser
+%expect 7
+
+%union {
+ unsigned long int num;
+ enum operator op;
+ struct expression *exp;
+}
+
+%{
+/* Prototypes for local functions. */
+static struct expression *new_exp PARAMS ((int nargs, enum operator op,
+ struct expression * const *args));
+static inline struct expression *new_exp_0 PARAMS ((enum operator op));
+static inline struct expression *new_exp_1 PARAMS ((enum operator op,
+ struct expression *right));
+static struct expression *new_exp_2 PARAMS ((enum operator op,
+ struct expression *left,
+ struct expression *right));
+static inline struct expression *new_exp_3 PARAMS ((enum operator op,
+ struct expression *bexp,
+ struct expression *tbranch,
+ struct expression *fbranch));
+static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
+static void yyerror PARAMS ((const char *str));
+
+/* Allocation of expressions. */
+
+static struct expression *
+new_exp (nargs, op, args)
+ int nargs;
+ enum operator op;
+ struct expression * const *args;
+{
+ int i;
+ struct expression *newp;
+
+ /* If any of the argument could not be malloc'ed, just return NULL. */
+ for (i = nargs - 1; i >= 0; i--)
+ if (args[i] == NULL)
+ goto fail;
+
+ /* Allocate a new expression. */
+ newp = (struct expression *) malloc (sizeof (*newp));
+ if (newp != NULL)
+ {
+ newp->nargs = nargs;
+ newp->operation = op;
+ for (i = nargs - 1; i >= 0; i--)
+ newp->val.args[i] = args[i];
+ return newp;
+ }
+
+ fail:
+ for (i = nargs - 1; i >= 0; i--)
+ FREE_EXPRESSION (args[i]);
+
+ return NULL;
+}
+
+static inline struct expression *
+new_exp_0 (op)
+ enum operator op;
+{
+ return new_exp (0, op, NULL);
+}
+
+static inline struct expression *
+new_exp_1 (op, right)
+ enum operator op;
+ struct expression *right;
+{
+ struct expression *args[1];
+
+ args[0] = right;
+ return new_exp (1, op, args);
+}
+
+static struct expression *
+new_exp_2 (op, left, right)
+ enum operator op;
+ struct expression *left;
+ struct expression *right;
+{
+ struct expression *args[2];
+
+ args[0] = left;
+ args[1] = right;
+ return new_exp (2, op, args);
+}
+
+static inline struct expression *
+new_exp_3 (op, bexp, tbranch, fbranch)
+ enum operator op;
+ struct expression *bexp;
+ struct expression *tbranch;
+ struct expression *fbranch;
+{
+ struct expression *args[3];
+
+ args[0] = bexp;
+ args[1] = tbranch;
+ args[2] = fbranch;
+ return new_exp (3, op, args);
+}
+
+%}
+
+/* This declares that all operators have the same associativity and the
+ precedence order as in C. See [Harbison, Steele: C, A Reference Manual].
+ There is no unary minus and no bitwise operators.
+ Operators with the same syntactic behaviour have been merged into a single
+ token, to save space in the array generated by bison. */
+%right '?' /* ? */
+%left '|' /* || */
+%left '&' /* && */
+%left EQUOP2 /* == != */
+%left CMPOP2 /* < > <= >= */
+%left ADDOP2 /* + - */
+%left MULOP2 /* * / % */
+%right '!' /* ! */
+
+%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
+%token <num> NUMBER
+%type <exp> exp
+
+%%
+
+start: exp
+ {
+ if ($1 == NULL)
+ YYABORT;
+ ((struct parse_args *) arg)->res = $1;
+ }
+ ;
+
+exp: exp '?' exp ':' exp
+ {
+ $$ = new_exp_3 (qmop, $1, $3, $5);
+ }
+ | exp '|' exp
+ {
+ $$ = new_exp_2 (lor, $1, $3);
+ }
+ | exp '&' exp
+ {
+ $$ = new_exp_2 (land, $1, $3);
+ }
+ | exp EQUOP2 exp
+ {
+ $$ = new_exp_2 ($2, $1, $3);
+ }
+ | exp CMPOP2 exp
+ {
+ $$ = new_exp_2 ($2, $1, $3);
+ }
+ | exp ADDOP2 exp
+ {
+ $$ = new_exp_2 ($2, $1, $3);
+ }
+ | exp MULOP2 exp
+ {
+ $$ = new_exp_2 ($2, $1, $3);
+ }
+ | '!' exp
+ {
+ $$ = new_exp_1 (lnot, $2);
+ }
+ | 'n'
+ {
+ $$ = new_exp_0 (var);
+ }
+ | NUMBER
+ {
+ if (($$ = new_exp_0 (num)) != NULL)
+ $$->val.num = $1;
+ }
+ | '(' exp ')'
+ {
+ $$ = $2;
+ }
+ ;
+
+%%
+
+void
+internal_function
+FREE_EXPRESSION (exp)
+ struct expression *exp;
+{
+ if (exp == NULL)
+ return;
+
+ /* Handle the recursive case. */
+ switch (exp->nargs)
+ {
+ case 3:
+ FREE_EXPRESSION (exp->val.args[2]);
+ /* FALLTHROUGH */
+ case 2:
+ FREE_EXPRESSION (exp->val.args[1]);
+ /* FALLTHROUGH */
+ case 1:
+ FREE_EXPRESSION (exp->val.args[0]);
+ /* FALLTHROUGH */
+ default:
+ break;
+ }
+
+ free (exp);
+}
+
+
+static int
+yylex (lval, pexp)
+ YYSTYPE *lval;
+ const char **pexp;
+{
+ const char *exp = *pexp;
+ int result;
+
+ while (1)
+ {
+ if (exp[0] == '\0')
+ {
+ *pexp = exp;
+ return YYEOF;
+ }
+
+ if (exp[0] != ' ' && exp[0] != '\t')
+ break;
+
+ ++exp;
+ }
+
+ result = *exp++;
+ switch (result)
+ {
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
+ {
+ unsigned long int n = result - '0';
+ while (exp[0] >= '0' && exp[0] <= '9')
+ {
+ n *= 10;
+ n += exp[0] - '0';
+ ++exp;
+ }
+ lval->num = n;
+ result = NUMBER;
+ }
+ break;
+
+ case '=':
+ if (exp[0] == '=')
+ {
+ ++exp;
+ lval->op = equal;
+ result = EQUOP2;
+ }
+ else
+ result = YYERRCODE;
+ break;
+
+ case '!':
+ if (exp[0] == '=')
+ {
+ ++exp;
+ lval->op = not_equal;
+ result = EQUOP2;
+ }
+ break;
+
+ case '&':
+ case '|':
+ if (exp[0] == result)
+ ++exp;
+ else
+ result = YYERRCODE;
+ break;
+
+ case '<':
+ if (exp[0] == '=')
+ {
+ ++exp;
+ lval->op = less_or_equal;
+ }
+ else
+ lval->op = less_than;
+ result = CMPOP2;
+ break;
+
+ case '>':
+ if (exp[0] == '=')
+ {
+ ++exp;
+ lval->op = greater_or_equal;
+ }
+ else
+ lval->op = greater_than;
+ result = CMPOP2;
+ break;
+
+ case '*':
+ lval->op = mult;
+ result = MULOP2;
+ break;
+
+ case '/':
+ lval->op = divide;
+ result = MULOP2;
+ break;
+
+ case '%':
+ lval->op = module;
+ result = MULOP2;
+ break;
+
+ case '+':
+ lval->op = plus;
+ result = ADDOP2;
+ break;
+
+ case '-':
+ lval->op = minus;
+ result = ADDOP2;
+ break;
+
+ case 'n':
+ case '?':
+ case ':':
+ case '(':
+ case ')':
+ /* Nothing, just return the character. */
+ break;
+
+ case ';':
+ case '\n':
+ case '\0':
+ /* Be safe and let the user call this function again. */
+ --exp;
+ result = YYEOF;
+ break;
+
+ default:
+ result = YYERRCODE;
+#if YYDEBUG != 0
+ --exp;
+#endif
+ break;
+ }
+
+ *pexp = exp;
+
+ return result;
+}
+
+
+static void
+yyerror (str)
+ const char *str;
+{
+ /* Do nothing. We don't print error messages here. */
+}
+++ /dev/null
-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-1 {
- i\
-/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot. */\
-\
-#if HAVE_CONFIG_H\
-# include <config.h>\
-#endif\
-\
-#include "libgettext.h"\
-\
-const struct _msg_ent _msg_tbl[] = {
- h
- s/.*/0/
- x
-}
-#
-# Write msgid entries in C array form.
-#
-/^msgid/ {
- s/msgid[ ]*\(".*"\)/ {\1/
- tb
-# Append the next line
- :b
- N
-# Look whether second part is continuation line.
- s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
-# Yes, then branch.
- ta
-# Because we assume that the input file correctly formed the line
-# just read cannot be again be a msgid line. So it's safe to ignore
-# it.
- s/\(.*\)\n.*/\1/
- bc
-# We found a continuation line. But before printing insert '\'.
- :a
- s/\(.*\)\(\n.*\)/\1\\\2/
- P
-# We cannot use D here.
- s/.*\n\(.*\)/\1/
-# Some buggy seds do not clear the `successful substitution since last ``t'''
-# flag on `N', so we do a `t' here to clear it.
- tb
-# Not reached
- :c
- x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
- td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
- :d
- s/9\(_*\)$/_\1/
- td
-# Assure at least one digit is available.
- s/^\(_*\)$/0\1/
-# Increment the last digit.
- s/8\(_*\)$/9\1/
- s/7\(_*\)$/8\1/
- s/6\(_*\)$/7\1/
- s/5\(_*\)$/6\1/
- s/4\(_*\)$/5\1/
- s/3\(_*\)$/4\1/
- s/2\(_*\)$/3\1/
- s/1\(_*\)$/2\1/
- s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
- s/_/0/g
- x
- G
- s/\(.*\)\n\([0-9]*\)/\1, \2},/
- s/\(.*\)"$/\1/
- p
-}
-#
-# Last line.
-#
-$ {
- i\
-};\
-
- g
- s/0*\(.*\)/int _msg_tbl_length = \1;/p
-}
-d
--- /dev/null
+# Add this package to a list of references stored in a text file.
+#
+# Copyright (C) 2000 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
+# by the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+ s/# Packages using this file://
+ ta
+ :a
+ s/ @PACKAGE@ / @PACKAGE@ /
+ tb
+ s/ $/ @PACKAGE@ /
+ :b
+ s/^/# Packages using this file:/
+}
--- /dev/null
+# Remove this package from a list of references stored in a text file.
+#
+# Copyright (C) 2000 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
+# by the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+ s/# Packages using this file://
+ s/ @PACKAGE@ / /
+ s/^/# Packages using this file:/
+}
/* Implementation of the textdomain(3) function.
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+ Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ 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
+ by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
-#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
+#ifdef _LIBC
+# include <libintl.h>
#else
-# include <strings.h>
-# ifndef memcpy
-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
+# include "libgnuintl.h"
#endif
+#include "gettextP.h"
#ifdef _LIBC
-# include <libintl.h>
+/* We have to handle multi-threaded applications. */
+# include <bits/libc-lock.h>
#else
-# include "libgettext.h"
+/* Provide dummy implementation if this is outside glibc. */
+# define __libc_rwlock_define(CLASS, NAME)
+# define __libc_rwlock_wrlock(NAME)
+# define __libc_rwlock_unlock(NAME)
+#endif
+
+/* The internal variables in the standalone libintl.a must have different
+ names than the internal variables in GNU libc, otherwise programs
+ using libintl.a cannot be linked statically. */
+#if !defined _LIBC
+# define _nl_default_default_domain libintl_nl_default_default_domain
+# define _nl_current_default_domain libintl_nl_current_default_domain
#endif
/* @@ end of prolog @@ */
/* Name of the default text domain. */
-extern const char _nl_default_default_domain[];
+extern const char _nl_default_default_domain[] attribute_hidden;
/* Default text domain in which entries for gettext(3) are to be found. */
-extern const char *_nl_current_default_domain;
+extern const char *_nl_current_default_domain attribute_hidden;
/* Names for the libintl functions are a problem. They must not clash
# define strdup(str) __strdup (str)
# endif
#else
-# define TEXTDOMAIN textdomain__
+# define TEXTDOMAIN libintl_textdomain
#endif
+/* Lock variable to protect the global data in the gettext implementation. */
+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
+
/* Set the current default message catalog to DOMAINNAME.
If DOMAINNAME is null, return the current default.
If DOMAINNAME is "", reset to the default of "messages". */
TEXTDOMAIN (domainname)
const char *domainname;
{
- char *old;
+ char *new_domain;
+ char *old_domain;
/* A NULL pointer requests the current setting. */
if (domainname == NULL)
return (char *) _nl_current_default_domain;
- old = (char *) _nl_current_default_domain;
+ __libc_rwlock_wrlock (_nl_state_lock);
+
+ old_domain = (char *) _nl_current_default_domain;
/* If domain name is the null string set to default domain "messages". */
if (domainname[0] == '\0'
|| strcmp (domainname, _nl_default_default_domain) == 0)
- _nl_current_default_domain = _nl_default_default_domain;
+ {
+ _nl_current_default_domain = _nl_default_default_domain;
+ new_domain = (char *) _nl_current_default_domain;
+ }
+ else if (strcmp (domainname, old_domain) == 0)
+ /* This can happen and people will use it to signal that some
+ environment variable changed. */
+ new_domain = old_domain;
else
{
/* If the following malloc fails `_nl_current_default_domain'
will be NULL. This value will be returned and so signals we
are out of core. */
#if defined _LIBC || defined HAVE_STRDUP
- _nl_current_default_domain = strdup (domainname);
+ new_domain = strdup (domainname);
#else
size_t len = strlen (domainname) + 1;
- char *cp = (char *) malloc (len);
- if (cp != NULL)
- memcpy (cp, domainname, len);
- _nl_current_default_domain = cp;
+ new_domain = (char *) malloc (len);
+ if (new_domain != NULL)
+ memcpy (new_domain, domainname, len);
#endif
+
+ if (new_domain != NULL)
+ _nl_current_default_domain = new_domain;
+ }
+
+ /* We use this possibility to signal a change of the loaded catalogs
+ since this is most likely the case and there is no other easy we
+ to do it. Do it only when the call was successful. */
+ if (new_domain != NULL)
+ {
+ ++_nl_msg_cat_cntr;
+
+ if (old_domain != new_domain && old_domain != _nl_default_default_domain)
+ free (old_domain);
}
- if (old != _nl_default_default_domain)
- free (old);
+ __libc_rwlock_unlock (_nl_state_lock);
- return (char *) _nl_current_default_domain;
+ return new_domain;
}
#ifdef _LIBC
+++ /dev/null
-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number. We use always set number 1.
-#
-1 {
- i\
-$set 1 # Automatically created by po2msg.sed
- h
- s/.*/0/
- x
-}
-#
-# We copy all comments into the .msg file. Perhaps they can help.
-#
-/^#/ s/^#[ ]*/$ /p
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-# Does not work now
-# /"$/! {
-# s/\\$//
-# s/$/ ... (more lines following)"/
-# }
- s/^msgid[ ]*"\(.*\)"$/$ Original Message: \1/
- p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID. Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here. (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
- s/msgstr[ ]*"\(.*\)"/\1/
- x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
- td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
- :d
- s/9\(_*\)$/_\1/
- td
-# Assure at least one digit is available.
- s/^\(_*\)$/0\1/
-# Increment the last digit.
- s/8\(_*\)$/9\1/
- s/7\(_*\)$/8\1/
- s/6\(_*\)$/7\1/
- s/5\(_*\)$/6\1/
- s/4\(_*\)$/5\1/
- s/3\(_*\)$/4\1/
- s/2\(_*\)$/3\1/
- s/1\(_*\)$/2\1/
- s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
- s/_/0/g
- x
-# Bring the line in the format `<number> <message>'
- G
- s/^[^\n]*$/& /
- s/\(.*\)\n\([0-9]*\)/\2 \1/
-# Clear flag from last substitution.
- tb
-# Append the next line.
- :b
- N
-# Look whether second part is a continuation line.
- s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
- ta
- P
- D
-# Note that `D' includes a jump to the start!!
-# We found a continuation line. But before printing insert '\'.
- :a
- s/\(.*\)\(\n.*\)/\1\\\2/
- P
-# We cannot use the sed command `D' here
- s/.*\n\(.*\)/\1/
- tb
-}
-d
+2003-05-03 Theodore Ts'o <tytso@mit.edu>
+
+ * Makefile.in: Add $(LIBINTL) to the link line so we can support
+ using the internal gettext library.
+
+ * nls-enable.h: Add #ifndef protection around LOCALEDIR definition.
+
2003-04-21 Theodore Ts'o <tytso@mit.edu>
* Release of E2fsprogs 1.33
tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID)
$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
- $(LIBS_BLKID) $(LIBS_E2P)
+ $(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL)
blkid: $(BLKID_OBJS) $(DEPLIBS_BLKID)
- $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID)
+ $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL)
e2image: $(E2IMAGE_OBJS) $(DEPLIBS)
- $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS)
+ $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
base_device: base_device.c
$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
cmp $(srcdir)/base_device.tst base_device.out
mklost+found: $(MKLPF_OBJS)
- $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS)
+ $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBS_BLKID)
$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \
- $(LIBE2P) $(LIBUUID)
+ $(LIBE2P) $(LIBUUID) $(LIBINTL)
mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID)
$(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
- $(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBUUID)
+ $(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBUUID) $(LIBINTL)
resize2fs: resize2fs.o $(DEPLIBS)
- $(CC) $(ALL_LDFLAGS) -o resize2fs resize2fs.o $(LIBS)
+ $(CC) $(ALL_LDFLAGS) -o resize2fs resize2fs.o $(LIBS) $(LIBINTL)
chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P)
- $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P)
+ $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P)
- $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P)
+ $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID)
- $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID)
+ $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID)
$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
- $(LIBS_E2P) $(LIBUUID)
+ $(LIBS_E2P) $(LIBUUID) $(LIBINTL)
fsck: $(FSCK_OBJS) $(DEBLIBS_BLKID)
- $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID)
+ $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID) $(LIBINTL)
badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
- $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS)
+ $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
logsave: logsave.o
$(CC) $(ALL_LDFLAGS) -o logsave logsave.o
#else
#define N_(a) (a)
#endif
-/* FIXME */
+#ifndef NLS_CAT_NAME
#define NLS_CAT_NAME "e2fsprogs"
+#endif
+#ifndef LOCALEDIR
#define LOCALEDIR "/usr/share/locale"
-/* FIXME */
+#endif
#else
#define _(a) (a)
#define N_(a) a
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
-# Last modified: 1994-03-25
# Public domain
+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
+
errstatus=0
-for file in ${1+"$@"} ; do
+for file
+do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
- for d in ${1+"$@"} ; do
+ for d
+ do
pathcomp="$pathcomp$d"
case "$pathcomp" in
-* ) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp" 1>&2
- mkdir "$pathcomp" || errstatus=$?
+ echo "mkdir $pathcomp"
+
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ fi
fi
pathcomp="$pathcomp/"
+2003-05-03 gettextize <bug-gnu-gettext@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.11.5.
+ * Rules-quot: New file, from gettext-0.11.5.
+ * boldquot.sed: New file, from gettext-0.11.5.
+ * en@boldquot.header: New file, from gettext-0.11.5.
+ * en@quot.header: New file, from gettext-0.11.5.
+ * insert-header.sin: New file, from gettext-0.11.5.
+ * quot.sed: New file, from gettext-0.11.5.
+ * remove-potcdate.sin: New file, from gettext-0.11.5.
+
2003-04-21 Theodore Ts'o <tytso@mit.edu>
* Release of E2fsprogs 1.33
--- /dev/null
+it nyc tr de de-utf
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
#
-# This file file be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# 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
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
PACKAGE = @PACKAGE@
VERSION = @VERSION@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = @datadir@
localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
-subdir = po
+gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
+GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-MSGMERGE = PATH=../src:$$PATH msgmerge
+XGETTEXT = @XGETTEXT@
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES = cat-id-tbl.c
POFILES = @POFILES@
GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
-stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in Makevars remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
POTFILES = \
CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-.c.o:
- $(COMPILE) $<
+# Makevars gets inserted here. (Don't remove this line!)
-.po.pox:
- $(MAKE) $(PACKAGE).pot
- $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
.po.mo:
- $(MSGFMT) -o $@ $<
+ @echo "$(MSGFMT) -c -o $@ $<"; \
+ $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
.po.gmo:
- file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
+ @lang=`echo $* | sed -e 's,.*/,,'`; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+ $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $(srcdir)/$${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-.po.cat:
- sed -f ../intl/po2msg.sed < $< > $*.msg \
- && rm -f $@ && $(GENCAT) $@ $*.msg
+.sin.sed:
+ sed -e '/^#/d' $< > t-$@
+ mv t-$@ $@
all: all-@USE_NLS@
-all-yes: cat-id-tbl.c $(CATALOGS)
+all-yes: $(CATALOGS)
all-no:
-$(srcdir)/$(PACKAGE).pot: $(POTFILES)
- $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
- --add-comments --keyword=_ --keyword=N_ \
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+$(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 \
- && test ! -f $(PACKAGE).po \
- || ( rm -f $(srcdir)/$(PACKAGE).pot \
- && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
-
-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-$(srcdir)/stamp-cat-id: $(PACKAGE).pot
- rm -f cat-id-tbl.tmp
- sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
- | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
- if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
- rm cat-id-tbl.tmp; \
- else \
- echo cat-id-tbl.c changed; \
- rm -f $(srcdir)/cat-id-tbl.c; \
- mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
- fi
- cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
+ --copyright-holder='$(COPYRIGHT_HOLDER)'
+ test ! -f $(DOMAIN).po || { \
+ if test -f $(srcdir)/$(DOMAIN).pot; then \
+ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+ else \
+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+ fi; \
+ else \
+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+ fi; \
+ }
+
+$(srcdir)/$(DOMAIN).pot:
+ $(MAKE) $(DOMAIN).pot-update
+
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
install: install-exec install-data
install-exec:
install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+ if test "$(PACKAGE)" = "gettext"; then \
+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ for file in $(DISTFILES.common); do \
+ $(INSTALL_DATA) $(srcdir)/$$file \
+ $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ : ; \
fi
+install-data-no: all
+install-data-yes: all
+ $(mkinstalldirs) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
- case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
- esac; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $$dir; \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
- fi; \
- if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- fi; \
- if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- else \
- if test -r $(srcdir)/$$cat.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- else \
- true; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
+ $(mkinstalldirs) $(DESTDIR)$$dir; \
+ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ if test -n "$$lc"; then \
+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+ for file in *; do \
+ if test -f $$file; then \
+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+ fi; \
+ done); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ else \
+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+ :; \
+ else \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ fi; \
+ fi; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
fi; \
- fi; \
+ done; \
done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
if test "$(PACKAGE)" = "gettext"; then \
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
- fi; \
- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
else \
: ; \
fi
+installdirs-data-no:
+installdirs-data-yes:
+ $(mkinstalldirs) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
+ $(mkinstalldirs) $(DESTDIR)$$dir; \
+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ if test -n "$$lc"; then \
+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+ for file in *; do \
+ if test -f $$file; then \
+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+ fi; \
+ done); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ else \
+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+ :; \
+ else \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ fi; \
+ fi; \
+ fi; \
+ done; \
+ done
# Define this as empty until I found a useful application.
installcheck:
-uninstall:
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+ if test "$(PACKAGE)" = "gettext"; then \
+ for file in $(DISTFILES.common); do \
+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
+ else \
+ : ; \
+ fi
+uninstall-data-no:
+uninstall-data-yes:
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ done; \
done
- rm -f $(gettextsrcdir)/po-Makefile.in.in
-
-check:: all
-cat-id-tbl.o: ../intl/libgettext.h
+check: all
dvi info tags TAGS ID:
mostlyclean:
- rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
+ rm -f remove-potcdate.sed *.gmo
+ rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
rm -fr *.o
clean: mostlyclean
distclean: clean
- rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+ rm -f Makefile Makefile.in POTFILES *.mo
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
rm -f $(GMOFILES)
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+ $(MAKE) update-po
+ @$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: $(DISTFILES)
dists="$(DISTFILES)"; \
+ if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \
+ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
for file in $$dists; do \
- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
- || cp -p $(srcdir)/$$file $(distdir); \
+ if test -f $$file; then \
+ cp -p $$file $(distdir); \
+ else \
+ cp -p $(srcdir)/$$file $(distdir); \
+ fi; \
done
update-po: Makefile
- $(MAKE) $(PACKAGE).pot
- PATH=`pwd`/../src:$$PATH; \
+ $(MAKE) $(DOMAIN).pot-update
+ $(MAKE) $(UPDATEPOFILES)
+ $(MAKE) update-gmo
+
+# General rule for updating PO files.
+
+.nop.po-update:
+ @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+ if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
+ tmpdir=`pwd`; \
+ echo "$$lang:"; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
cd $(srcdir); \
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- mv $$lang.po $$lang.old.po; \
- echo "$$lang:"; \
- if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
- rm -f $$lang.old.po; \
+ if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
else \
- echo "msgmerge for $$cat failed!"; \
- rm -f $$lang.po; \
- mv $$lang.old.po $$lang.po; \
+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+ :; \
+ else \
+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+ exit 1; \
+ fi; \
fi; \
- done
+ else \
+ echo "msgmerge for $$lang.po failed!" 1>&2; \
+ rm -f $$tmpdir/$$lang.new.po; \
+ fi
-POTFILES: POTFILES.in
- ( if test 'x$(srcdir)' != 'x.'; then \
- posrcprefix='$(top_srcdir)/'; \
- else \
- posrcprefix="../"; \
- fi; \
- rm -f $@-t $@ \
- && (sed -e '/^#/d' -e '/^[ ]*$$/d' \
- -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
- | sed -e '$$s/\\$$//') > $@-t \
- && chmod a-w $@-t \
- && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
- cd .. \
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+ @:
+
+Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
$(SHELL) ./config.status
+force:
+
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- /dev/null
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Theodore Ts''o
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
e2fsck/badblocks.c
+e2fsck/dict.c
+e2fsck/dirinfo.c
+e2fsck/dx_dirinfo.c
e2fsck/ehandler.c
e2fsck/emptydir.c
e2fsck/extend.c
e2fsck/pass5.c
e2fsck/problem.c
e2fsck/recovery.c
+e2fsck/region.c
e2fsck/scantest.c
e2fsck/super.c
e2fsck/swapfs.c
e2fsck/unix.c
e2fsck/util.c
misc/badblocks.c
+misc/base_device.c
+misc/blkid.c
misc/chattr.c
misc/dumpe2fs.c
-misc/e2label.c
misc/e2image.c
+misc/e2label.c
misc/findsuper.c
misc/fsck.c
-misc/get_device_by_label.c
+misc/logsave.c
misc/lsattr.c
misc/mke2fs.c
misc/mklost+found.c
misc/partinfo.c
misc/tune2fs.c
-misc/uuidgen.c
misc/util.c
+misc/uuidgen.c
+resize/extent.c
resize/main.c
resize/resize2fs.c
-resize/extent.c
+resize/sim_progress.c
--- /dev/null
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
+en@quot.po-update: en@quot.po-update-en
+en@boldquot.po-update: en@boldquot.po-update-en
+
+.insert-header.po-update-en:
+ @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+ if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+ tmpdir=`pwd`; \
+ echo "$$lang:"; \
+ ll=`echo $$lang | sed -e 's/@.*//'`; \
+ LC_ALL=C; export LC_ALL; \
+ cd $(srcdir); \
+ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+ :; \
+ else \
+ echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+ exit 1; \
+ fi; \
+ fi; \
+ else \
+ echo "creation of $$lang.po failed!" 1>&2; \
+ rm -f $$tmpdir/$$lang.new.po; \
+ fi
+
+en@quot.insert-header: insert-header.sin
+ sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+ sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+ rm -f *.insert-header
--- /dev/null
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
+s/“/“\e[1m/g
+s/”/\e[0m”/g
+s/‘/‘\e[1m/g
+s/’/\e[0m’/g
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs-1.28\n"
-"POT-Creation-Date: 2002-11-09 11:58-0500\n"
+"POT-Creation-Date: 2003-05-03 14:59-0400\n"
"PO-Revision-Date: 2002-09-28 13:45MET\n"
"Last-Translator: Olaf Klemke <olke@users.sourceforge.net>\n"
"Language-Team: deutsch <gnome-de@gnome.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:187
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:191
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Bad block %u out of range; ignored.\n"
msgid "while reading the bad blocks inode"
msgstr "während des Lesen des Bad-Block-Inode"
-#: e2fsck/badblocks.c:71 e2fsck/iscan.c:110 e2fsck/scantest.c:107
-#: e2fsck/unix.c:853 e2fsck/unix.c:885 misc/badblocks.c:771
-#: misc/badblocks.c:782 misc/badblocks.c:796 misc/badblocks.c:808
-#: misc/dumpe2fs.c:337 misc/e2image.c:475 misc/e2image.c:491 misc/mke2fs.c:203
-#: misc/tune2fs.c:718 resize/main.c:198
+#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
+#: e2fsck/unix.c:869 e2fsck/unix.c:901 misc/badblocks.c:772
+#: misc/badblocks.c:783 misc/badblocks.c:797 misc/badblocks.c:809
+#: misc/dumpe2fs.c:337 misc/e2image.c:477 misc/e2image.c:493 misc/mke2fs.c:207
+#: misc/tune2fs.c:728 resize/main.c:198
#, c-format
msgid "while trying to open %s"
msgstr "while trying to open %s"
msgid "while trying popen '%s'"
msgstr "while trying popen '%s'"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:210
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:214
msgid "while reading in list of bad blocks from file"
msgstr "während des Lesen der Bad-Blockliste aus der Datei"
msgid "empty dir map"
msgstr "leerer Verzeichniseintrag"
-#. Inode number 11 is usually lost+found
#: e2fsck/emptydir.c:97
#, c-format
msgid "Empty directory block %d (#%d) in inode %d\n"
msgid "Couldn't allocate block buffer (size=%d)\n"
msgstr "Konnte keinen Blockpuffer (Grösse=%d) reservieren.\n"
-#: e2fsck/flushb.c:44
+#: e2fsck/flushb.c:34
#, c-format
msgid "Usage: %s disk\n"
msgstr "Verwendung: %s Laufwerk\n"
-#: e2fsck/flushb.c:73
+#: e2fsck/flushb.c:63
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr "BLKFLSBUF ioctl nicht unterstützt! Can't flush buffers.\n"
-#: e2fsck/iscan.c:44
+#: e2fsck/iscan.c:46
#, c-format
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Verwendung: %s [-F] [-I inode_buffer_blocks] Gerät\n"
-#: e2fsck/iscan.c:81 e2fsck/unix.c:673 resize/main.c:175
+#: e2fsck/iscan.c:83 e2fsck/unix.c:689 resize/main.c:175
#, c-format
msgid "while opening %s for flushing"
msgstr "während des Öffnens von %s zum Rückschreiben."
-#: e2fsck/iscan.c:86 e2fsck/unix.c:679 resize/main.c:182
+#: e2fsck/iscan.c:88 e2fsck/unix.c:695 resize/main.c:182
#, c-format
msgid "while trying to flush %s"
msgstr "während des Rückschreibeversuches auf %s."
-#: e2fsck/iscan.c:119 e2fsck/scantest.c:114 misc/e2image.c:377
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:377
msgid "while opening inode scan"
msgstr "während der Inodenabtastung"
-#: e2fsck/iscan.c:127 misc/e2image.c:395
+#: e2fsck/iscan.c:129 misc/e2image.c:395
msgid "while getting next inode"
msgstr "während des Ladens des nächsten Inode"
-#: e2fsck/iscan.c:136
+#: e2fsck/iscan.c:138
#, c-format
msgid "%d inodes scanned.\n"
msgstr "%d Inoden abgetastet.\n"
-#: e2fsck/journal.c:418
+#: e2fsck/journal.c:420
msgid "reading journal superblock\n"
msgstr "Lese Journal Superblock\n"
-#: e2fsck/journal.c:475
+#: e2fsck/journal.c:477
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: Habe keinen gültigen Journal Superblock gefunden\n"
-#: e2fsck/journal.c:484
+#: e2fsck/journal.c:486
#, c-format
msgid "%s: journal too short\n"
msgstr "%s:Das Journal ist zu kurz.\n"
-#: e2fsck/journal.c:756
+#: e2fsck/journal.c:758
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: stelle das Journal wieder her\n"
-#: e2fsck/journal.c:758
+#: e2fsck/journal.c:760
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: Das Jounal ist nur lesbar - Keine Wiederherstellung\n"
-#: e2fsck/journal.c:779
+#: e2fsck/journal.c:781
#, c-format
msgid "while trying to re-open %s"
msgstr "while trying to re-open %s"
msgid "<The NULL inode>"
msgstr "<Des NULL Inode>"
-#. 0
#: e2fsck/message.c:143
msgid "<The bad blocks inode>"
msgstr "<Des Bad Blocks Inode>"
-#. 1
-#. 2
#: e2fsck/message.c:145
msgid "<The ACL index inode>"
msgstr "<Des ACL Index Inode>"
-#. 3
#: e2fsck/message.c:146
msgid "<The ACL data inode>"
msgstr "<Des ACL Data Inode>"
-#. 4
#: e2fsck/message.c:147
msgid "<The boot loader inode>"
msgstr "<Des Boot Loader Inode>"
-#. 5
#: e2fsck/message.c:148
msgid "<The undelete directory inode>"
msgstr "<Des ungelöschten Verzeichnis Inode>"
-#. 6
#: e2fsck/message.c:149
msgid "<The group descriptor inode>"
msgstr "<Des Gruppenbezeicher-Inode>"
-#. 7
#: e2fsck/message.c:150
msgid "<The journal inode>"
msgstr "<Des Journal Inode>"
-#. 8
#: e2fsck/message.c:151
msgid "<Reserved inode 9>"
msgstr "<Der reservierte Inode 9>"
-#. 9
#: e2fsck/message.c:152
msgid "<Reserved inode 10>"
msgstr "<Der reservierte Inode 10>"
msgid "returned from clone_file_block"
msgstr "zurückgegeben von clone_file_block"
-#.
-#. * Allocate bitmaps structures
-#.
-#: e2fsck/pass1.c:311
+#: e2fsck/pass1.c:296
msgid "in-use inode map"
msgstr "benutztes Inoden Verzeichnis"
-#: e2fsck/pass1.c:320
+#: e2fsck/pass1.c:305
msgid "directory inode map"
msgstr "Inoden-Verzeichnis für Verzeichnisse"
-#: e2fsck/pass1.c:328
+#: e2fsck/pass1.c:313
msgid "regular file inode map"
msgstr "Inoden-Verzeichnis für reguläre Dateien"
-#: e2fsck/pass1.c:335
+#: e2fsck/pass1.c:320
msgid "in-use block map"
msgstr "benutztes Block-Verzeichnis"
-#: e2fsck/pass1.c:382
+#: e2fsck/pass1.c:367
msgid "doing inode scan"
msgstr "Inodenabtastung"
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:736
msgid "Pass 1"
msgstr "Durchgang 1"
-#: e2fsck/pass1.c:809
+#: e2fsck/pass1.c:794
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "lese den indirekten Block von Inode %u"
-#: e2fsck/pass1.c:851
+#: e2fsck/pass1.c:836
msgid "bad inode map"
msgstr "fehlerhaftes Inoden Verzeichnis"
-#: e2fsck/pass1.c:873
+#: e2fsck/pass1.c:858
msgid "inode in bad block map"
msgstr "Inode im Bad Blocks Verzeichnis"
-#: e2fsck/pass1.c:893
+#: e2fsck/pass1.c:878
msgid "imagic inode map"
msgstr "imagic inode map"
-#: e2fsck/pass1.c:920
+#: e2fsck/pass1.c:905
msgid "multiply claimed block map"
msgstr "multiply claimed block map"
-#: e2fsck/pass1.c:1019
+#: e2fsck/pass1.c:1004
msgid "ext attr block map"
msgstr "ext attr block map"
-#: e2fsck/pass1.c:1775
+#: e2fsck/pass1.c:1760
msgid "block bitmap"
msgstr "block bitmap"
-#: e2fsck/pass1.c:1779
+#: e2fsck/pass1.c:1764
msgid "inode bitmap"
msgstr "inode bitmap"
-#: e2fsck/pass1.c:1783
+#: e2fsck/pass1.c:1768
msgid "inode table"
msgstr "Inoden-Tabelle"
-#: e2fsck/pass2.c:290
+#: e2fsck/pass2.c:291
#, fuzzy
msgid "Pass 2"
msgstr "Durchgang 1"
-#.
-#. * Allocate some bitmaps to do loop detection.
-#.
-#: e2fsck/pass3.c:80
+#: e2fsck/pass3.c:79
msgid "inode done bitmap"
msgstr "inode done bitmap"
-#: e2fsck/pass3.c:91
+#: e2fsck/pass3.c:90
msgid "Peak memory"
msgstr "Peak memory"
-#: e2fsck/pass3.c:144
+#: e2fsck/pass3.c:143
msgid "Pass 3"
msgstr "Durchgang 3"
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:333
msgid "inode loop detection bitmap"
msgstr "inode loop detection bitmap"
msgid "(no prompt)"
msgstr "(nicht interaktiv)"
-#. 0
#: e2fsck/problem.c:50
msgid "Fix"
msgstr "Repariere"
-#. 1
#: e2fsck/problem.c:51
msgid "Clear"
msgstr "Bereinige"
-#. 2
#: e2fsck/problem.c:52
msgid "Relocate"
msgstr "Zurücksetzen"
-#. 3
#: e2fsck/problem.c:53
msgid "Allocate"
msgstr "Freigeben"
-#. 4
#: e2fsck/problem.c:54
msgid "Expand"
msgstr "Erweitere"
-#. 5
#: e2fsck/problem.c:55
msgid "Connect to /lost+found"
msgstr "Verbinde nach /lost+found"
-#. 6
#: e2fsck/problem.c:56
msgid "Create"
msgstr "Erstelle"
-#. 7
#: e2fsck/problem.c:57
msgid "Salvage"
msgstr "Rette"
-#. 8
#: e2fsck/problem.c:58
msgid "Truncate"
msgstr "Beenden"
-#. 9
#: e2fsck/problem.c:59
msgid "Clear inode"
msgstr "Bereinige Inode"
-#. 10
#: e2fsck/problem.c:60
msgid "Abort"
msgstr "Abbrechen"
-#. 11
#: e2fsck/problem.c:61
msgid "Split"
msgstr "Abspalten"
-#. 12
#: e2fsck/problem.c:62
msgid "Continue"
msgstr "Fortsetzen"
-#. 13
#: e2fsck/problem.c:63
msgid "Clone duplicate/bad blocks"
msgstr "Clone doppelte/bad blocks"
-#. 14
#: e2fsck/problem.c:64
msgid "Delete file"
msgstr "Lösche Datei"
-#. 15
#: e2fsck/problem.c:65
msgid "Suppress messages"
msgstr "Ausgaben unterdrücken"
-#. 16
#: e2fsck/problem.c:66
msgid "Unlink"
msgstr "Unlink"
-#. 17
#: e2fsck/problem.c:67
msgid "Clear HTree index"
msgstr "Clear HTree index"
msgid "(NONE)"
msgstr "(NICHTS)"
-#. 0
#: e2fsck/problem.c:77
msgid "FIXED"
msgstr "REPARIERT"
-#. 1
#: e2fsck/problem.c:78
msgid "CLEARED"
msgstr "BEREINIGT"
-#. 2
#: e2fsck/problem.c:79
msgid "RELOCATED"
msgstr "ZURÜCKGESETZT"
-#. 3
#: e2fsck/problem.c:80
msgid "ALLOCATED"
msgstr "FREIGEGEBEN"
-#. 4
#: e2fsck/problem.c:81
msgid "EXPANDED"
msgstr "ERWEITERT"
-#. 5
#: e2fsck/problem.c:82
msgid "RECONNECTED"
msgstr "WIEDER VERBUNDEN"
-#. 6
#: e2fsck/problem.c:83
msgid "CREATED"
msgstr "ANGELEGT"
-#. 7
#: e2fsck/problem.c:84
msgid "SALVAGED"
msgstr "GERETTET"
-#. 8
#: e2fsck/problem.c:85
msgid "TRUNCATED"
msgstr "BEENDET"
-#. 9
#: e2fsck/problem.c:86
msgid "INODE CLEARED"
msgstr "INODE BEREINIGT"
-#. 10
#: e2fsck/problem.c:87
msgid "ABORTED"
msgstr "ABGEBROCHEN"
-#. 11
#: e2fsck/problem.c:88
msgid "SPLIT"
msgstr "ABGESPALTEN"
-#. 12
#: e2fsck/problem.c:89
msgid "CONTINUING"
msgstr "SETZE FORT"
-#. 13
#: e2fsck/problem.c:90
msgid "DUPLICATE/BAD BLOCKS CLONED"
msgstr "DOPPELTE /BAD BLOCKS GECLONT"
-#. 14
#: e2fsck/problem.c:91
msgid "FILE DELETED"
msgstr "DATEI GELÖSCHT"
-#. 15
#: e2fsck/problem.c:92
msgid "SUPPRESSED"
msgstr "UNTERDRÜCKT"
-#. 16
#: e2fsck/problem.c:93
msgid "UNLINKED"
msgstr "UNLINKED"
-#. 17
#: e2fsck/problem.c:94
msgid "HTREE INDEX CLEARED"
msgstr "HTREE INDEX BEREINIGT"
-#. Pre-Pass 1 errors
-#. Block bitmap not in group
#: e2fsck/problem.c:103
msgid "@b @B for @g %g is not in @g. (@b %b)\n"
msgstr "@b @B für @g %g ist nicht in @g. (@b %b)\n"
-#. Inode bitmap not in group
#: e2fsck/problem.c:107
msgid "@i @B for @g %g is not in @g. (@b %b)\n"
msgstr "@i @B für @g %g ist nicht in @g. (@b %b)\n"
msgid "Pass 1: Checking @is, @bs, and sizes\n"
msgstr "Durchgang 1: Prüfe @is, @bs, und Grössen\n"
-#. Root directory is not an inode
#: e2fsck/problem.c:320
msgid "@r is not a @d. "
msgstr "@r ist kein @d. "
msgid "@E is duplicate '..' @e.\n"
msgstr "@E ist ein Duplikat '..' @e.\n"
-#: e2fsck/problem.c:938 e2fsck/problem.c:1204
+#: e2fsck/problem.c:938 e2fsck/problem.c:1219
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr "Interner Fehler: kann dir_info für %i nicht finden.\n"
msgid "@p @h %d: node (%B) has bad depth\n"
msgstr "@p @h %d: node (%B) has bad max hash\n"
-#: e2fsck/problem.c:1094
+#: e2fsck/problem.c:1092
+#, fuzzy
+msgid "Duplicate @E found. "
+msgstr "Doppelte/bad @b(s) in @i %i:"
+
+#: e2fsck/problem.c:1097
+#, c-format
+msgid ""
+"@E has a non-unique filename.\n"
+"Rename to %s"
+msgstr ""
+
+#: e2fsck/problem.c:1102
+msgid ""
+"Duplicate @e '%Dn' found.\n"
+"\tMarking %p (%i) to be rebuilt.\n"
+"\n"
+msgstr ""
+
+#: e2fsck/problem.c:1109
msgid "Pass 3: Checking @d connectivity\n"
msgstr "Durchgang 3: Prüfe @d Verknüpfungen\n"
-#: e2fsck/problem.c:1099
+#: e2fsck/problem.c:1114
msgid "@r not allocated. "
msgstr "@r nicht reserviert. "
-#: e2fsck/problem.c:1104
+#: e2fsck/problem.c:1119
msgid "No room in @l @d. "
msgstr "Kein Platz auf @l @d. "
-#: e2fsck/problem.c:1109
+#: e2fsck/problem.c:1124
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr "Nicht verbunden @d @i %i (%p)\n"
-#: e2fsck/problem.c:1114
+#: e2fsck/problem.c:1129
msgid "/@l not found. "
msgstr "/@l nicht gefunden. "
-#: e2fsck/problem.c:1119
+#: e2fsck/problem.c:1134
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr "'..' in %Q (%i) ist %P (%j), @s %q (%d).\n"
-#: e2fsck/problem.c:1124
+#: e2fsck/problem.c:1139
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr "Falscher oder fehlender /@l. Wiederverbinden nicht möglich.\n"
-#: e2fsck/problem.c:1129
+#: e2fsck/problem.c:1144
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr "Erweitern nicht möglich /@l: %m\n"
-#: e2fsck/problem.c:1134
+#: e2fsck/problem.c:1149
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr "Wiederverbinden nicht möglich %i: %m\n"
-#: e2fsck/problem.c:1139
+#: e2fsck/problem.c:1154
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr "Fehler während der Suche nach /@l: %m\n"
-#: e2fsck/problem.c:1144
+#: e2fsck/problem.c:1159
#, c-format
msgid "ext2fs_new_@b: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_@b: %m während des Versuches /@l @d zu erzeugen.\n"
-#: e2fsck/problem.c:1149
+#: e2fsck/problem.c:1164
#, c-format
msgid "ext2fs_new_@i: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_@i: %m während des Versuches /@l @d zu erzeugen.\n"
-#: e2fsck/problem.c:1154
+#: e2fsck/problem.c:1169
#, c-format
msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n"
msgstr "ext2fs_new_dir_@b: %m während des Versuches /@l @d zu erzeugen.\n"
-#: e2fsck/problem.c:1159
+#: e2fsck/problem.c:1174
#, c-format
msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
msgstr "ext2fs_write_dir_@b: %m während des Schreibens von @d @b für /@l\n"
-#: e2fsck/problem.c:1164
+#: e2fsck/problem.c:1179
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr "Fehler während der Einstellung von @i count auf @i %i\n"
-#: e2fsck/problem.c:1169
+#: e2fsck/problem.c:1184
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
"Konnte Parent von @i %i: %m nicht reparieren\n"
"\n"
-#: e2fsck/problem.c:1174
+#: e2fsck/problem.c:1189
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d entry\n"
"Kann das Elternobj. von @i %i nicht repar.: \n"
"Kann das Elterneintrag von @d nicht finden.\n"
-#: e2fsck/problem.c:1179
+#: e2fsck/problem.c:1194
msgid "@A @i @B (%N): %m\n"
msgstr "@A @i @B (%N): %m\n"
-#: e2fsck/problem.c:1184
+#: e2fsck/problem.c:1199
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr "Fehler beim Erzerugen von root @d (%s): %m\n"
-#: e2fsck/problem.c:1189
+#: e2fsck/problem.c:1204
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr "Fehler beim Erzerugen von /@l @d (%s): %m\n"
-#: e2fsck/problem.c:1194
+#: e2fsck/problem.c:1209
msgid "@r is not a @d; aborting.\n"
msgstr "@r ist kein @d; Abbruch.\n"
-#: e2fsck/problem.c:1199
+#: e2fsck/problem.c:1214
msgid "Cannot proceed without a @r.\n"
msgstr "Kann ohne @r nicht weitermachen.\n"
-#: e2fsck/problem.c:1209
+#: e2fsck/problem.c:1224
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr "/@l ist kein @d (ino=%i)\n"
-#: e2fsck/problem.c:1216
+#: e2fsck/problem.c:1231
msgid "Pass 3A: Optimizing directories\n"
msgstr "Durchgang 3A: Optimiere Verzeichnisse\n"
-#: e2fsck/problem.c:1221
+#: e2fsck/problem.c:1236
#, c-format
msgid "Failed to create dirs_to_hash iterator: %m"
msgstr "Failed to create dirs_to_hash iterator: %m"
-#: e2fsck/problem.c:1226
+#: e2fsck/problem.c:1241
msgid "Failed to optimize directory %q (%d): %m"
msgstr "Failed to optimize directory %q (%d): %m"
-#: e2fsck/problem.c:1231
+#: e2fsck/problem.c:1246
msgid "Optimizing directories: "
msgstr "Optimiere Verzeichnisse: "
-#: e2fsck/problem.c:1248
+#: e2fsck/problem.c:1263
msgid "Pass 4: Checking reference counts\n"
msgstr "Durchgang 4: Überprüfe die Prüfsummen\n"
-#: e2fsck/problem.c:1263
+#: e2fsck/problem.c:1278
msgid "@i %i ref count is %Il, @s %N. "
msgstr "@i %i Prüfsumme ist %Il, @s %N. "
-#: e2fsck/problem.c:1267
+#: e2fsck/problem.c:1282
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
"@i_link_info[%i] ist %N, @i.i_links_count ist %Il. Sie sollten gleich "
"sein!\n"
-#: e2fsck/problem.c:1277
+#: e2fsck/problem.c:1292
msgid "Pass 5: Checking @g summary information\n"
msgstr "Durchgang 5: Überprüfe @g Zusammenfassung\n"
-#: e2fsck/problem.c:1282
+#: e2fsck/problem.c:1297
msgid "Padding at end of @i @B is not set. "
msgstr "Auffüllbyte am Ende von @i @B ist nicht gesetzt. "
-#: e2fsck/problem.c:1287
+#: e2fsck/problem.c:1302
msgid "Padding at end of @b @B is not set. "
msgstr "Auffüllbyte am Ende von @b @B ist nicht gesetzt. "
-#: e2fsck/problem.c:1292
+#: e2fsck/problem.c:1307
msgid "@b @B differences: "
msgstr "@b @B differieren: "
-#: e2fsck/problem.c:1312
+#: e2fsck/problem.c:1327
msgid "@i @B differences: "
msgstr "@i @B differieren: "
-#: e2fsck/problem.c:1332
+#: e2fsck/problem.c:1347
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr "Freie @is Anzahl ist falsch für @g #%g (%i, counted=%j).\n"
-#: e2fsck/problem.c:1337
+#: e2fsck/problem.c:1352
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr "Verzeichnisanzahl ist falsch für @g #%g (%i, counted=%j).\n"
-#: e2fsck/problem.c:1342
+#: e2fsck/problem.c:1357
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr "Freie @is Anzahl ist falsch (%i, counted=%j).\n"
-#: e2fsck/problem.c:1347
+#: e2fsck/problem.c:1362
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr "Freie @bs Anzahl ist falsch @g #%g (%b, counted=%c).\n"
-#: e2fsck/problem.c:1352
+#: e2fsck/problem.c:1367
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Freie @bs Anzahl ist falsch (%b, counted=%c).\n"
-#: e2fsck/problem.c:1357
+#: e2fsck/problem.c:1372
msgid ""
"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
"endpoints (%i, %j)\n"
"PROGRAMMIERFEHLER: @f (#%N) @B Endpunkt (%b, %c) passt nicht zum brechneten "
"@B Endpunkt (%i, %j)\n"
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1378
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr "Interner Fehler: fudging end of bitmap (%N)\n"
-#: e2fsck/problem.c:1497
+#: e2fsck/problem.c:1512
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr "Unbenutzter Fehlercode (0x%x)!\n"
-#: e2fsck/problem.c:1569
+#: e2fsck/problem.c:1584
msgid "IGNORED"
msgstr "IGNORIERT"
-#: e2fsck/scantest.c:79
+#: e2fsck/scantest.c:81
#, c-format
msgid "Memory used: %d, elapsed time: %6.3f/%6.3f/%6.3f\n"
msgstr "benutzter Speicher: %d, vergangende Zeit: %6.3f/%6.3f/%6.3f\n"
-#: e2fsck/scantest.c:98
+#: e2fsck/scantest.c:100
#, c-format
msgid "size of inode=%d\n"
msgstr "Grösse der Inode=%d\n"
-#: e2fsck/scantest.c:119
+#: e2fsck/scantest.c:121
msgid "while starting inode scan"
msgstr "während des Beginns der Inodenprüfung"
-#: e2fsck/scantest.c:130
+#: e2fsck/scantest.c:132
msgid "while doing inode scan"
msgstr "während der Inodenprüfung"
msgid "Byte swap"
msgstr "Byte Swap"
-#: e2fsck/unix.c:63
+#: e2fsck/unix.c:67
#, fuzzy, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
"\t\t[-l|-L bad_blocks_file] [-C fd] [-j ext-journal]\n"
"\t\t[-E extended-options] Gerät\n"
-#: e2fsck/unix.c:69
+#: e2fsck/unix.c:73
+#, fuzzy
msgid ""
"\n"
"Emergency help:\n"
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
" -c suche nach defekten Blöcken\n"
" -f erzwinge die Überprüfung auch wenn alles i.O. erscheint\n"
-#: e2fsck/unix.c:75
+#: e2fsck/unix.c:79
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
" -l bad_blocks_file zur Liste der defekten Blöcke hinzufügen\n"
".-L bad_blocks_file Liste der defekten Blöcke definieren\n"
-#: e2fsck/unix.c:109
+#: e2fsck/unix.c:113
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr "%s: %d/%d Dateien (%0d.%d%% nicht verbunden ), %d/%d Blöcke\n"
-#: e2fsck/unix.c:124
+#: e2fsck/unix.c:128
#, c-format
msgid ""
"\n"
"\n"
"%8d Inoden benutzt (%d%%)\n"
-#: e2fsck/unix.c:126
+#: e2fsck/unix.c:130
#, c-format
msgid "%8d non-contiguous inodes (%0d.%d%%)\n"
msgstr "%8dnicht verbundene Inoden (%0d.%d%%)\n"
-#: e2fsck/unix.c:128
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr " # von Inoden mit ind/dind/tind Blöcken: %d/%d/%d\n"
-#: e2fsck/unix.c:130
+#: e2fsck/unix.c:134
#, c-format
msgid ""
"%8d blocks used (%d%%)\n"
"%8d Blöcke benutzt (%d%%)\n"
"%8d defekte Blöcke\n"
-#: e2fsck/unix.c:134
+#: e2fsck/unix.c:138
#, c-format
msgid "%8d large files\n"
msgstr "%8d grosse Dateien\n"
-#: e2fsck/unix.c:135
+#: e2fsck/unix.c:139
#, c-format
msgid ""
"\n"
"--------\n"
"%8d Dateien\n"
-#: e2fsck/unix.c:168
+#: e2fsck/unix.c:172
#, c-format
msgid "%8d large file%s\n"
msgstr "%8d grosse Dateien %s\n"
-#: e2fsck/unix.c:211 misc/badblocks.c:612 misc/tune2fs.c:734 misc/util.c:133
+#: e2fsck/unix.c:215 misc/badblocks.c:613 misc/tune2fs.c:744 misc/util.c:133
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr "während der Prüfung ob %s eingehängt ist."
-#: e2fsck/unix.c:226
+#: e2fsck/unix.c:230
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "Warnung! %s ist eingehängt.\n"
-#: e2fsck/unix.c:230
+#: e2fsck/unix.c:234
#, c-format
msgid "%s is mounted. "
msgstr "%s ist eingehängt. "
-#: e2fsck/unix.c:232
+#: e2fsck/unix.c:236
msgid ""
"Cannot continue, aborting.\n"
"\n"
"Komme nicht weiter, breche ab.\n"
"\n"
-#: e2fsck/unix.c:233
+#: e2fsck/unix.c:237
msgid ""
"\n"
"\n"
"kann das Dateisystem STARK BESCHÄDIGEN.\n"
"\n"
-#: e2fsck/unix.c:236
+#: e2fsck/unix.c:240
msgid "Do you really want to continue"
msgstr "Möchte sie wirklich fortfahren"
-#: e2fsck/unix.c:238
+#: e2fsck/unix.c:242
msgid "check aborted.\n"
msgstr "Test abgebrochen.\n"
-#: e2fsck/unix.c:260
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr " enthält ein fehlerhaftes Dateisystem"
-#: e2fsck/unix.c:262
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr " wurde nicht ordnungsgemäss ausgehängt"
-#: e2fsck/unix.c:266
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " wurde %u mal ohne Überprüfung eingehängt"
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:275
#, c-format
msgid " has gone %u days without being checked"
msgstr " wurde %u Tage ohne Überprüfung genutzt"
-#: e2fsck/unix.c:277
+#: e2fsck/unix.c:281
msgid ", check forced.\n"
msgstr ", Prüfung erzwungen.\n"
-#: e2fsck/unix.c:280
+#: e2fsck/unix.c:284
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks\n"
msgstr "%s: i.O., %d/%d Dateien, %d/%d Blöcke\n"
-#: e2fsck/unix.c:411
+#: e2fsck/unix.c:431
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "Fehler: Kann /dev/null (%s) nicht öffnen\n"
-#: e2fsck/unix.c:463
-msgid "Couldn't allocate memory to parse extended options!\n"
-msgstr "Couldn't allocate memory to parse extended options!\n"
-
-#: e2fsck/unix.c:489
+#: e2fsck/unix.c:502
msgid "Invalid EA version.\n"
msgstr "Invalid EA version.\n"
-#: e2fsck/unix.c:498
+#: e2fsck/unix.c:511
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
"\tea_ver=<ea_version (1 or 2)\n"
"\n"
-#: e2fsck/unix.c:547
+#: e2fsck/unix.c:561
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "Fehler bei Überprüfung des Datei-Descriptors %d: %s\n"
-#: e2fsck/unix.c:551
+#: e2fsck/unix.c:565
msgid "Invalid completion information file descriptor"
msgstr "Unvollständiger completion information file descriptor"
-#: e2fsck/unix.c:581
+#: e2fsck/unix.c:580
+msgid "Only one the options -p/-a, -n or -y may be specified."
+msgstr ""
+
+#: e2fsck/unix.c:601
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "Die -t Option wird von dieser e2fsck-Version nicht unterstützt.\n"
-#: e2fsck/unix.c:650
+#: e2fsck/unix.c:666
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr ""
"Das Byte-Swapping wurde in dieser Version von e2fsck nicht mit-übersetzt.\n"
-#: e2fsck/unix.c:688
+#: e2fsck/unix.c:704
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr "Inkompatible Optionen sind beim Byte-Swapping nicht erlaubt.\n"
-#: e2fsck/unix.c:695
+#: e2fsck/unix.c:711
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Die -c und -l/-L Optionen dürfen nicht gleichzeitig werden.\n"
-#: e2fsck/unix.c:773
+#: e2fsck/unix.c:789
msgid "Error: ext2fs library version out of date!\n"
msgstr "Fehler: ext2fs-Bibliotheks-Version ist zu alt!\n"
-#: e2fsck/unix.c:781
+#: e2fsck/unix.c:797
msgid "while trying to initialize program"
msgstr "während der Programminitalisierung"
-#: e2fsck/unix.c:795
+#: e2fsck/unix.c:811
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tBenutze %s, %s\n"
-#: e2fsck/unix.c:807
+#: e2fsck/unix.c:823
msgid "need terminal for interactive repairs"
msgstr "Benötige einen Terminal für interaktive Reparaturen"
-#: e2fsck/unix.c:843
+#: e2fsck/unix.c:859
#, c-format
msgid "%s trying backup blocks...\n"
msgstr "%s versuche backup blocks...\n"
-#: e2fsck/unix.c:844
+#: e2fsck/unix.c:860
msgid "Couldn't find ext2 superblock,"
msgstr "Konnte den ext2 Superblock nicht finden,"
-#: e2fsck/unix.c:845
+#: e2fsck/unix.c:861
msgid "Group descriptors look bad..."
msgstr "Gruppen Descriptoren scheinen defekt..."
-#: e2fsck/unix.c:856
+#: e2fsck/unix.c:872
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
"von e2fsck (oder der Dateisystem-Superblock ist kaputt).\n"
"\n"
-#: e2fsck/unix.c:862
+#: e2fsck/unix.c:878
msgid "Could this be a zero-length partition?\n"
msgstr "Könnte es eine Partion mit Länge gleich Null sein ?\n"
-#: e2fsck/unix.c:864
+#: e2fsck/unix.c:880
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Sie benötigen %s- oder root-Rechte für das Dateisystem.\n"
-#: e2fsck/unix.c:869
+#: e2fsck/unix.c:885
msgid "Possibly non-existent or swap device?\n"
msgstr "Möglicherweise nicht-existent oder swap-Partition?\n"
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:888
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
"Laufwerk ist schreibgeschützt, nutzen sie die -n Option\n"
"um es im Nur-Lesen-Modus zu testen.\n"
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:904
msgid "Get a newer version of e2fsck!"
msgstr "Holen sie sich eine neuere Version von e2fsck!"
-#: e2fsck/unix.c:914
+#: e2fsck/unix.c:925
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "während der Prüfung des ext3-journals für %s"
-#: e2fsck/unix.c:925
+#: e2fsck/unix.c:936
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
"Warnung: Überspringe, da das Dateisystem im Nur-Lesen-Modus ist, die Jounal-"
"Wiederherstellung.\n"
-#: e2fsck/unix.c:933
+#: e2fsck/unix.c:949
+#, fuzzy, c-format
+msgid "unable to set superblock flags on %s\n"
+msgstr ""
+"\n"
+"Sparse superblock flag set. %s"
+
+#: e2fsck/unix.c:955
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "während der Wiederherstellung des ext3-Journals von %s"
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:984
msgid "Warning: compression support is experimental.\n"
msgstr "Warnung: Die Kompressionsunterstützung ist experimental.\n"
-#: e2fsck/unix.c:966
+#: e2fsck/unix.c:989
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
"Die Unterstützung für HTREE wurde in E2fsck nicht aktiviert,\n"
"\taber das Dateisystem %s besitzt HTREE Verzeichnisse.\n"
-#: e2fsck/unix.c:1009
+#: e2fsck/unix.c:1032
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr "%s: die Byte-Reifolge des Dateisystems wurde schon normalisiert.\n"
-#: e2fsck/unix.c:1029
+#: e2fsck/unix.c:1052
msgid "while reading bad blocks inode"
msgstr "während des Lesen des Bad-Block-Inodes"
-#: e2fsck/unix.c:1031
+#: e2fsck/unix.c:1054
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "die Wartezeit war zu kurz, wir versuchen es trotzdem ..\n"
-#: e2fsck/unix.c:1038
+#: e2fsck/unix.c:1061
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Beginne e2fsck neu ...\n"
-#: e2fsck/unix.c:1042
+#: e2fsck/unix.c:1065
msgid "while resetting context"
msgstr "während des Rücksetzen des Kontext"
-#: e2fsck/unix.c:1049
+#: e2fsck/unix.c:1072
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck abgebrochhen.\n"
-#: e2fsck/unix.c:1054
+#: e2fsck/unix.c:1077
msgid "aborted"
msgstr "abgebrochen"
-#: e2fsck/unix.c:1062
+#: e2fsck/unix.c:1085
#, c-format
msgid ""
"\n"
"\n"
"%s: ***** DATEISYSTEM WURDE VERÄNDERT *****\n"
-#: e2fsck/unix.c:1065
+#: e2fsck/unix.c:1088
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** STARTE LINUX NEU *****\n"
-#: e2fsck/unix.c:1071
+#: e2fsck/unix.c:1094
#, c-format
msgid ""
"\n"
"%s: ********** WARNUNG: Noch Fehler im Dateisystem **********\n"
"\n"
-#: e2fsck/util.c:99 misc/util.c:68
+#: e2fsck/util.c:130 misc/util.c:68
msgid "yY"
msgstr "yJ"
-#: e2fsck/util.c:100
+#: e2fsck/util.c:131
msgid "nN"
msgstr "nN"
-#: e2fsck/util.c:114
+#: e2fsck/util.c:145
msgid "<y>"
msgstr "<j>"
-#: e2fsck/util.c:116
+#: e2fsck/util.c:147
msgid "<n>"
msgstr "<n>"
-#: e2fsck/util.c:118
+#: e2fsck/util.c:149
msgid " (y/n)"
msgstr " (j/n)"
-#: e2fsck/util.c:133
+#: e2fsck/util.c:164
msgid "cancelled!\n"
msgstr "Abgebrochen!\n"
-#: e2fsck/util.c:148
+#: e2fsck/util.c:179
msgid "yes\n"
msgstr "ja\n"
-#: e2fsck/util.c:150
+#: e2fsck/util.c:181
msgid "no\n"
msgstr "nein\n"
-#: e2fsck/util.c:160
+#: e2fsck/util.c:191
#, c-format
msgid ""
"%s? no\n"
"%s? nein\n"
"\n"
-#: e2fsck/util.c:164
+#: e2fsck/util.c:195
#, c-format
msgid ""
"%s? yes\n"
"%s? ja\n"
"\n"
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "yes"
msgstr "ja"
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "no"
msgstr "nein"
-#: e2fsck/util.c:181
+#: e2fsck/util.c:212
#, c-format
msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
msgstr "e2fsck_read_bitmaps: illegal bitmap block(s) für %s"
-#: e2fsck/util.c:186
+#: e2fsck/util.c:217
msgid "reading inode and block bitmaps"
msgstr "lese Inode und Block bitmaps"
-#: e2fsck/util.c:191
+#: e2fsck/util.c:222
#, c-format
msgid "while retrying to read bitmaps for %s"
msgstr "während des wiederholten Versuches Bitmaps für %s einzulesen"
-#: e2fsck/util.c:203
+#: e2fsck/util.c:234
msgid "writing block bitmaps"
msgstr "Schreibe Block-Bitmaps"
-#: e2fsck/util.c:208
+#: e2fsck/util.c:239
#, c-format
msgid "while retrying to write block bitmaps for %s"
msgstr "während des wiederholten Versuches Block-Bitmaps für %s zu schreiben."
-#: e2fsck/util.c:215
+#: e2fsck/util.c:246
msgid "writing inode bitmaps"
msgstr "Schreibe Inoden-Bitmaps"
-#: e2fsck/util.c:220
+#: e2fsck/util.c:251
#, c-format
msgid "while retrying to write inode bitmaps for %s"
msgstr "während des wiederholten Versuches Inoden-Bitmaps für %s zu schreiben."
-#: e2fsck/util.c:233
+#: e2fsck/util.c:264
#, c-format
msgid ""
"\n"
"%s: UNERWARTETE INKONSISTENS; fsck PER HAND AUSFÜHREN\n"
"\t(z.B. ohne -a or -p Optionen)\n"
-#: e2fsck/util.c:298
+#: e2fsck/util.c:329
#, c-format
msgid "Memory used: %dk/%dk (%dk/%dk), "
msgstr "benutzter Speicher: %dk/%dk (%dk/%dk), "
-#: e2fsck/util.c:302
+#: e2fsck/util.c:333
#, c-format
msgid "Memory used: %d, "
msgstr "benutzter Speicher: %d, "
-#: e2fsck/util.c:308
+#: e2fsck/util.c:339
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr "Zeit: %5.2f/%5.2f/%5.2f\n"
-#: e2fsck/util.c:313
+#: e2fsck/util.c:344
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr "abgelaufende Zeit: %6.3f\n"
-#: e2fsck/util.c:327
+#: e2fsck/util.c:358
#, c-format
msgid "while reading inode %ld in %s"
msgstr "während des Lesens von Inode %ld in %s"
-#: e2fsck/util.c:340
+#: e2fsck/util.c:371
#, c-format
msgid "while writing inode %ld in %s"
msgstr "während des Schreibens von Inode %ld in %s"
"svwnf]\n"
" [-c blocks_at_once] [-p Durchgänge ] Gerät [letzter_Block [Beginn_count]]\n"
-#: misc/badblocks.c:171 misc/badblocks.c:198
+#: misc/badblocks.c:172 misc/badblocks.c:199
msgid "during seek"
msgstr "during seek"
-#: misc/badblocks.c:178
+#: misc/badblocks.c:179
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr "Merkwürdiger Wert (%ld) in do_read\n"
-#: misc/badblocks.c:219
+#: misc/badblocks.c:220
msgid "during ext2fs_sync_device"
msgstr "während ext2fs_sync_device"
-#: misc/badblocks.c:235 misc/badblocks.c:411
+#: misc/badblocks.c:236 misc/badblocks.c:412
msgid "while beginning bad block list iteration"
msgstr "während des Beginns der Bad-Block-Listen Wiederholung"
-#: misc/badblocks.c:245 misc/badblocks.c:314 misc/badblocks.c:421
+#: misc/badblocks.c:246 misc/badblocks.c:315 misc/badblocks.c:422
msgid "while allocating buffers"
msgstr "während des Resevierens der Puffer"
-#: misc/badblocks.c:250
+#: misc/badblocks.c:251
msgid "Checking for bad blocks in read-only mode\n"
msgstr "Suche nach defekten Blöcken im Nur-Lesen-Modus\n"
-#: misc/badblocks.c:251 misc/badblocks.c:323 misc/badblocks.c:440
+#: misc/badblocks.c:252 misc/badblocks.c:324 misc/badblocks.c:441
#, c-format
msgid "From block %lu to %lu\n"
msgstr "von Block %lu bis %lu\n"
-#: misc/badblocks.c:259
+#: misc/badblocks.c:260
msgid "Checking for bad blocks (read-only test): "
msgstr "Suche nach defekten Blöcken (Nur-Lesen-Modus):"
-#: misc/badblocks.c:322
+#: misc/badblocks.c:323
msgid "Checking for bad blocks in read-write mode\n"
msgstr "Suche nach defekten Blöcken (Lesen+Schreiben-Modus)\n"
-#: misc/badblocks.c:329
+#: misc/badblocks.c:330
#, c-format
msgid "Writing pattern 0x%08x: "
msgstr "Schreibe Muster 0x%08x: "
-#: misc/badblocks.c:343 misc/badblocks.c:368
+#: misc/badblocks.c:344 misc/badblocks.c:369
#, c-format
msgid "during seek on block %d"
msgstr "during seek on block %d"
-#: misc/badblocks.c:355
+#: misc/badblocks.c:356
msgid "Reading and comparing: "
msgstr "Lesen und Vergleichen:"
-#: misc/badblocks.c:428
+#: misc/badblocks.c:429
msgid "Initializing random test data\n"
msgstr "Initialisiere Zufalls-Test-Daten\n"
-#: misc/badblocks.c:439
+#: misc/badblocks.c:440
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr ""
"Suche nach defekten Blöcken im zerstörungsfreien Lesen+Schreiben-Modus\n"
-#: misc/badblocks.c:443
+#: misc/badblocks.c:444
msgid "Checking for bad blocks (non-destructive read-write test): "
msgstr "Suche nach defekten Blöcken (zerstörungsfreier Lesen+Schreiben-Modus):"
-#: misc/badblocks.c:452
+#: misc/badblocks.c:453
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
"\n"
"Interrupt bekommen, räume auf\n"
-#: misc/badblocks.c:509
+#: misc/badblocks.c:510
#, c-format
msgid "during test data write, block %lu"
msgstr "während des Schreibens der Test-Daten; Block %lu"
-#: misc/badblocks.c:619 misc/util.c:140
+#: misc/badblocks.c:620 misc/util.c:140
#, c-format
msgid "%s is mounted; "
msgstr "%s ist eingehängt; "
-#: misc/badblocks.c:621
+#: misc/badblocks.c:622
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr ""
"Badblocks wird trotzdem erzwungen . Ich hoffe /etc/mtab stimmt nicht.\n"
-#: misc/badblocks.c:625
+#: misc/badblocks.c:626
msgid "it's not safe to run badblocks!\n"
msgstr "es ist zu unsicher, Badblocks zu starten!\n"
-#: misc/badblocks.c:668 misc/mke2fs.c:881
+#: misc/badblocks.c:669 misc/mke2fs.c:885
#, c-format
msgid "bad block size - %s"
msgstr "bad block Grösse - %s"
-#: misc/badblocks.c:731
+#: misc/badblocks.c:732
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
"Ich kann die Grösse des Gerätes nicht feststellen.\n"
"Sie müssen sie manuell angeben.\n"
-#: misc/badblocks.c:737
+#: misc/badblocks.c:738
msgid "while trying to determine device size"
msgstr "während des Versuches die Gerätegrösse festzustellen"
-#: misc/badblocks.c:743 misc/mke2fs.c:1054
+#: misc/badblocks.c:744 misc/mke2fs.c:1059
#, c-format
msgid "bad blocks count - %s"
msgstr "bad blocks Anzahl - %s"
-#: misc/badblocks.c:752
+#: misc/badblocks.c:753
#, c-format
msgid "bad starting block - %s"
msgstr "bad starting block - %s"
-#: misc/badblocks.c:758
+#: misc/badblocks.c:759
#, c-format
msgid "bad blocks range: %lu-%lu"
msgstr "bad blocks Bereich: %lu-%lu"
-#: misc/badblocks.c:819
+#: misc/badblocks.c:820
msgid "creating in-memory bad blocks list"
msgstr "erstelle Bad-Block-Liste im Speicher"
-#: misc/badblocks.c:834
+#: misc/badblocks.c:835
msgid "adding to in-memory bad block list"
msgstr "füge zur Bad-Block-Liste im Speicher hinzu"
-#: misc/badblocks.c:858
+#: misc/badblocks.c:859
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr "Durchgang beendet, %u defekte Blöcke gefunden.\n"
"Journal Start: %d\n"
"Journal Nutzeranzahl: %d\n"
-#. Print version number and exit
-#: misc/dumpe2fs.c:312 misc/mke2fs.c:1040
+#: misc/dumpe2fs.c:312 misc/mke2fs.c:1045
#, c-format
msgid "\tUsing %s\n"
msgstr "\tBenutze %s\n"
-#: misc/dumpe2fs.c:339 misc/e2image.c:477 misc/tune2fs.c:721 resize/main.c:200
+#: misc/dumpe2fs.c:339 misc/e2image.c:479 misc/tune2fs.c:731 resize/main.c:200
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Kann keinen gültigen Dateisystem-Superblock finden.\n"
"%s: %s: error reading bitmaps: %s\n"
msgstr "Lesefehler @i %i: %m\n"
+#: misc/e2image.c:50
+#, c-format
+msgid "Usage: %s [-r] device file\n"
+msgstr "Verwendung: %s [-r] Gerätedatei\n"
+
+#: misc/e2image.c:61
+msgid "Couldn't allocate header buffer\n"
+msgstr "Couldn't allocate header buffer\n"
+
+#: misc/e2image.c:80
+#, c-format
+msgid "short write (only %d bytes) forwriting image header"
+msgstr "short write (only %d bytes) forwriting image header"
+
+#: misc/e2image.c:99
+msgid "while writing superblock"
+msgstr "while writing superblock"
+
+#: misc/e2image.c:107
+msgid "while writing inode table"
+msgstr "while writing inode table"
+
+#: misc/e2image.c:114
+msgid "while writing block bitmap"
+msgstr "while writing block bitmap"
+
+#: misc/e2image.c:121
+msgid "while writing inode bitmap"
+msgstr "while writing inode bitmap"
+
#: misc/e2label.c:57
#, c-format
msgid "e2label: cannot open %s\n"
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: Kein ext2 Dateisystem\n"
-#: misc/e2label.c:96 misc/tune2fs.c:828
+#: misc/e2label.c:96 misc/tune2fs.c:838
msgid "Warning: label too long, truncating.\n"
msgstr "Warnung: Name zu lang, kürze ihn.\n"
msgid "e2label: error writing superblock\n"
msgstr "e2label: Schreibfehler Superblock\n"
-#: misc/e2label.c:116 misc/tune2fs.c:427
+#: misc/e2label.c:116 misc/tune2fs.c:426
msgid "Usage: e2label device [newlabel]\n"
msgstr "Verwendung: e2label Gerät [neuer_Name]\n"
-#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
-msgstr "Verwendung: %s [-r] Gerätedatei\n"
-
-#: misc/e2image.c:61
-msgid "Couldn't allocate header buffer\n"
-msgstr "Couldn't allocate header buffer\n"
-
-#: misc/e2image.c:80
-#, c-format
-msgid "short write (only %d bytes) forwriting image header"
-msgstr "short write (only %d bytes) forwriting image header"
-
-#: misc/e2image.c:99
-msgid "while writing superblock"
-msgstr "while writing superblock"
-
-#: misc/e2image.c:107
-msgid "while writing inode table"
-msgstr "while writing inode table"
-
-#: misc/e2image.c:114
-msgid "while writing block bitmap"
-msgstr "while writing block bitmap"
-
-#: misc/e2image.c:121
-msgid "while writing inode bitmap"
-msgstr "while writing inode bitmap"
-
-#: misc/findsuper.c:135
+#: misc/findsuper.c:126
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr "Verwendung: findsuper Gerät [skipbytes [startkb]]\n"
-#: misc/findsuper.c:141
+#: misc/findsuper.c:132
#, c-format
msgid "skiprate should be a number, not %s\n"
msgstr "skiprate sollte eine Zahl sein, nicht %s\n"
-#: misc/findsuper.c:146
+#: misc/findsuper.c:137
msgid "skipbytes must be a multiple of the sector size\n"
msgstr "skipbytes müssen ein vielfaches der Sektorgrösse sein\n"
-#: misc/findsuper.c:152
+#: misc/findsuper.c:143
#, c-format
msgid "startkb should be a number, not %s\n"
msgstr "startkb sollte eine Zahl sein, nicht %s\n"
-#: misc/findsuper.c:156
+#: misc/findsuper.c:147
#, c-format
msgid "startkb should be positive, not %Ld\n"
msgstr "startkb sollte positiv sein, nicht %Ld\n"
-#. Now, go looking for the superblock !
-#: misc/findsuper.c:166
+#: misc/findsuper.c:157
#, c-format
msgid "starting at %Ld, with %d byte increments\n"
msgstr "starting at %Ld, with %d byte increments\n"
-#: misc/findsuper.c:167
+#: misc/findsuper.c:158
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr " thisoff block fs_blk_sz blksz grp last_mount\n"
-#: misc/findsuper.c:213
+#: misc/findsuper.c:204
#, c-format
msgid ""
"\n"
"\n"
"%14Ld: beendet mit errno %d\n"
-#: misc/fsck.c:258
-#, c-format
-msgid "Could not determine filesystem type for %s\n"
-msgstr "Konnte den Dateisystemtype für %s nicht feststellen.\n"
-
-#: misc/fsck.c:278
+#: misc/fsck.c:331
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr "WARNUNG: Konnte nicht öffnen %s: %s\n"
-#: misc/fsck.c:288
+#: misc/fsck.c:341
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr "WARNUNG: falsches Format in Zeile %d von %s\n"
-#: misc/fsck.c:308
+#: misc/fsck.c:356
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
"\tsollten ihre /etc/fstab so schnell wie möglich korrigieren.\n"
"\n"
-#: misc/fsck.c:422
+#: misc/fsck.c:455
#, c-format
msgid "fsck: %s: not found\n"
msgstr "fsck: %s: nicht gefunden\n"
-#: misc/fsck.c:535
+#: misc/fsck.c:568
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr "%s: wait: No more child process?!?\n"
-#: misc/fsck.c:557
+#: misc/fsck.c:590
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr "Warnung... %s für Gerät %s starb mit Signal %d.\n"
-#: misc/fsck.c:563
+#: misc/fsck.c:596
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr "%s %s: Status ist %x, sollte nie vorkommen.\n"
-#: misc/fsck.c:599
+#: misc/fsck.c:632
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "Beendet mit %s (exit status %d)\n"
-#: misc/fsck.c:659
+#: misc/fsck.c:687
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr "%s: Fehler %d bei Ausführung von fsck.%s für %s\n"
-#: misc/fsck.c:680
+#: misc/fsck.c:708
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
"Entweder alle oder kein Dateisystem wird mit -t angegeben;\n"
"wenn nötig, mit vorangestelltem 'no' oder '!'.\n"
-#: misc/fsck.c:699
+#: misc/fsck.c:727
msgid "Couldn't allocate memory for filesystem types\n"
msgstr "Kann keinen Speicher für Dateisystemtypen reservieren.\n"
-#: misc/fsck.c:839
+#: misc/fsck.c:867
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr "fsck: kann %s nicht Überprüfen: fsck.%s nicht gefunden\n"
-#: misc/fsck.c:895
+#: misc/fsck.c:923
msgid "Checking all file systems.\n"
msgstr "Überprüfe alle Dateisysteme.\n"
-#: misc/fsck.c:983
+#: misc/fsck.c:1009
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--warten-- (Durchgang %d)\n"
-#: misc/fsck.c:1003
+#: misc/fsck.c:1029
msgid "Usage: fsck [-ACNPRTV] [-t fstype] [fs-options] [filesys ...]\n"
msgstr ""
"Verwendung: fsck [-ACNPRTV] [-t Datesystemtyp] [fs-Optionen] "
"[Dateisystem...]\n"
-#: misc/fsck.c:1047
+#: misc/fsck.c:1071
#, c-format
msgid "%s: too many devices\n"
msgstr "%s: zu viele Geräte\n"
-#: misc/fsck.c:1057 misc/fsck.c:1126
+#: misc/fsck.c:1104 misc/fsck.c:1173
#, c-format
msgid "%s: too many arguments\n"
msgstr "%s: zu viele Argumente\n"
-#: misc/get_device_by_label.c:443
-#, c-format
-msgid "WARNING: %s: bad UUID\n"
-msgstr "WARNUNG: %s: falscher UUID\n"
-
#: misc/lsattr.c:67
#, c-format
msgid "Usage: %s [-RVadlv] [files...]\n"
"\t[-L volume-label] [-M last-mounted-directory] [-O feature[,...]]\n"
"\t[-r fs-revision] [-R raid_opts] [-qvSV] Gerät [Blockanzahl]\n"
-#: misc/mke2fs.c:228
+#: misc/mke2fs.c:232
#, c-format
msgid "Running command: %s\n"
msgstr "Führe aus: %s\n"
-#: misc/mke2fs.c:232
+#: misc/mke2fs.c:236
#, c-format
msgid "while trying run '%s'"
msgstr "während des Ausführungsversuchs von '%s'"
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:243
msgid "while processing list of bad blocks from program"
msgstr "while processing list of bad blocks from program"
-#: misc/mke2fs.c:265
+#: misc/mke2fs.c:269
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr "Block %d im primären Superblock/Gruppen Descriptorbereich defekt.\n"
-#: misc/mke2fs.c:267
+#: misc/mke2fs.c:271
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr ""
"Die Blöcke %d bis einschliesslich %d müssen i.O. sein um ein Dateisystem zu "
"erstellen.\n"
-#: misc/mke2fs.c:270
+#: misc/mke2fs.c:274
msgid "Aborting....\n"
msgstr "Breche ab...\n"
-#: misc/mke2fs.c:290
+#: misc/mke2fs.c:294
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
"\tdefekte Blöcke.\n"
"\n"
-#: misc/mke2fs.c:308
+#: misc/mke2fs.c:312
msgid "while marking bad blocks as used"
msgstr "während der Kennzeichnung defekter Blöcke als belegt"
-#: misc/mke2fs.c:361
+#: misc/mke2fs.c:365
msgid "done \n"
msgstr "erledigt \n"
-#: misc/mke2fs.c:396
+#: misc/mke2fs.c:400
msgid "while allocating zeroizing buffer"
msgstr "while allocating zeroizing buffer"
-#: misc/mke2fs.c:436
+#: misc/mke2fs.c:440
msgid "Writing inode tables: "
msgstr "Schreibe Inoden-Tabellen: "
-#: misc/mke2fs.c:447
+#: misc/mke2fs.c:451
#, c-format
msgid ""
"\n"
"\n"
"Konnte %d Blöcke nicht in Inoden-Tabelle schreiben beginnend bei %d: %s\n"
-#: misc/mke2fs.c:470
+#: misc/mke2fs.c:474
msgid "while creating root dir"
msgstr "while creating root dir"
-#: misc/mke2fs.c:477
+#: misc/mke2fs.c:481
msgid "while reading root inode"
msgstr "while reading root inode"
-#: misc/mke2fs.c:486
+#: misc/mke2fs.c:490
msgid "while setting root inode ownership"
msgstr "while setting root inode ownership"
-#: misc/mke2fs.c:504
+#: misc/mke2fs.c:508
msgid "while creating /lost+found"
msgstr "while creating /lost+found"
-#: misc/mke2fs.c:511
+#: misc/mke2fs.c:515
msgid "while looking up /lost+found"
msgstr "while looking up /lost+found"
-#: misc/mke2fs.c:521
+#: misc/mke2fs.c:525
msgid "while expanding /lost+found"
msgstr "while expanding /lost+found"
-#: misc/mke2fs.c:537
+#: misc/mke2fs.c:541
msgid "while setting bad block inode"
msgstr "while setting bad block inode"
-#: misc/mke2fs.c:569
+#: misc/mke2fs.c:573
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "Out of memory erasing sectors %d-%d\n"
-#: misc/mke2fs.c:579
+#: misc/mke2fs.c:583
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "Warnung: konnte Block %s nicht lesen\n"
-#: misc/mke2fs.c:595
+#: misc/mke2fs.c:599
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "Warnung: konnte Sektor %d: %s nicht löschen\n"
-#: misc/mke2fs.c:611
+#: misc/mke2fs.c:615
msgid "while initializing journal superblock"
msgstr "while initializing journal superblock"
-#: misc/mke2fs.c:617
+#: misc/mke2fs.c:621
msgid "Zeroing journal device: "
msgstr "Zeroing journal device: "
-#: misc/mke2fs.c:624
+#: misc/mke2fs.c:628
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr "while zeroing journal device (block %u, count %d)"
-#: misc/mke2fs.c:635
+#: misc/mke2fs.c:639
msgid "while writing journal superblock"
msgstr "while writing journal superblock"
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:653
#, c-format
msgid ""
"warning: %d blocks unused.\n"
"Warnung: %d Blöcke unbenutzt.\n"
"\n"
-#: misc/mke2fs.c:654
+#: misc/mke2fs.c:658
#, c-format
msgid "Filesystem label=%s\n"
msgstr "Dateisystem Label=%s\n"
-#: misc/mke2fs.c:655
+#: misc/mke2fs.c:659
msgid "OS type: "
msgstr "OS type: "
-#: misc/mke2fs.c:660
+#: misc/mke2fs.c:664
msgid "(unknown os)"
msgstr "(unbekanntes OS)"
-#: misc/mke2fs.c:663
+#: misc/mke2fs.c:667
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Blockgrösse=%u (log=%u)\n"
-#: misc/mke2fs.c:665
+#: misc/mke2fs.c:669
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Fragmentgrösse=%u (log=%u)\n"
-#: misc/mke2fs.c:667
+#: misc/mke2fs.c:671
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u Inoden, %u Blöcke\n"
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:673
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u Blöcke (%2.2f%%) reserviert für den Superuser\n"
-#: misc/mke2fs.c:672
+#: misc/mke2fs.c:676
#, c-format
msgid "First data block=%u\n"
msgstr "erster Datenblock=%u\n"
-#: misc/mke2fs.c:674
+#: misc/mke2fs.c:678
#, c-format
msgid "%u block groups\n"
msgstr "%u block groups\n"
-#: misc/mke2fs.c:676
+#: misc/mke2fs.c:680
#, c-format
msgid "%u block group\n"
msgstr "%u block group\n"
-#: misc/mke2fs.c:677
+#: misc/mke2fs.c:681
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "%u Blöcke pro Gruppe, %u Fragmente pro Gruppe\n"
-#: misc/mke2fs.c:679
+#: misc/mke2fs.c:683
#, c-format
msgid "%u inodes per group\n"
msgstr "%u Inoden pro Gruppe\n"
-#: misc/mke2fs.c:686
+#: misc/mke2fs.c:690
msgid "Superblock backups stored on blocks: "
msgstr "Superblock Sicherungskopien gespeichert in den Blöcken: "
-#: misc/mke2fs.c:736
+#: misc/mke2fs.c:740
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr "Couldn't allocate memory to parse raid options!\n"
-#: misc/mke2fs.c:761
+#: misc/mke2fs.c:765
msgid "Invalid stride parameter.\n"
msgstr "Invalid stride parameter.\n"
-#: misc/mke2fs.c:769
+#: misc/mke2fs.c:773
msgid ""
"\n"
"Bad raid options specified.\n"
"\tstride=<stride length in blocks>\n"
"\n"
-#: misc/mke2fs.c:885
+#: misc/mke2fs.c:889
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Warnung: Blockgrösse %d ist auf den meisten Systemen unbrauchbar.\n"
-#: misc/mke2fs.c:901
+#: misc/mke2fs.c:906
#, c-format
msgid "bad fragment size - %s"
msgstr "falsche Fragmentgrösse size - %s"
-#: misc/mke2fs.c:907
+#: misc/mke2fs.c:912
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Warnung: Fragmente werden nicht unterstützt. Ignoriere -F Option\n"
-#: misc/mke2fs.c:914
+#: misc/mke2fs.c:919
msgid "Illegal number for blocks per group"
msgstr "unzulässige Angabe für Blöcke pro Gruppe"
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:924
msgid "blocks per group must be multiple of 8"
msgstr "Anzahl der Blöcke pro Gruppe muss ein Vielfaches von 8 sein"
-#: misc/mke2fs.c:929
+#: misc/mke2fs.c:934
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr "bad inode ratio %s (min %d/max %d"
-#: misc/mke2fs.c:948
+#: misc/mke2fs.c:953
msgid "in malloc for bad_blocks_filename"
msgstr "in malloc for bad_blocks_filename"
-#: misc/mke2fs.c:957
+#: misc/mke2fs.c:962
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr "bad reserved blocks percent - %s"
-#: misc/mke2fs.c:989
+#: misc/mke2fs.c:994
#, c-format
msgid "bad inode size - %s"
msgstr "bad inode size - %s"
-#: misc/mke2fs.c:1025 misc/tune2fs.c:287
+#: misc/mke2fs.c:1030 misc/tune2fs.c:286
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Unvollständige Dateisystem-Option gesetzt: %s\n"
-#: misc/mke2fs.c:1078 misc/mke2fs.c:1379
+#: misc/mke2fs.c:1087 misc/mke2fs.c:1396
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "while trying to open journal device %s\n"
-#: misc/mke2fs.c:1091
+#: misc/mke2fs.c:1093
+#, c-format
+msgid "Journal dev blocksize (%d) smaller thanminimum blocksize %d\n"
+msgstr ""
+
+#: misc/mke2fs.c:1107
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "%d-byte Blöcke zu gross für's System (max %d)"
-#: misc/mke2fs.c:1095
+#: misc/mke2fs.c:1111
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr "Warnung:%d-byte Blöcke zu gross für's System (max %d), erzwinge sie\n"
-#: misc/mke2fs.c:1115
+#: misc/mke2fs.c:1131
msgid "filesystem"
msgstr "Dateisystem"
-#: misc/mke2fs.c:1128 resize/main.c:222
+#: misc/mke2fs.c:1144 resize/main.c:222
msgid "while trying to determine filesystem size"
msgstr "while trying to determine filesystem size"
-#: misc/mke2fs.c:1134
+#: misc/mke2fs.c:1150
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
"Konnte die Gerätegrösse nicht feststellen, geben\n"
"sie die Grösse des Dateisystems an\n"
-#: misc/mke2fs.c:1141
+#: misc/mke2fs.c:1157
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
"gezwungen\n"
"\tsein, neu zu booten, um die Partitionstabelle neu einzulesen.\n"
-#: misc/mke2fs.c:1156
-msgid "Filesystem larger than apparent filesystem size."
+#: misc/mke2fs.c:1172
+#, fuzzy
+msgid "Filesystem larger than apparent device size."
msgstr "Das Dateisystem ist grösser als es den Anschein hat."
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1197
msgid "blocks per group count out of range"
msgstr "blocks per group count out of range"
-#: misc/mke2fs.c:1190
+#: misc/mke2fs.c:1207
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr "bad inode size %d (min %d/max %d)"
-#: misc/mke2fs.c:1196
+#: misc/mke2fs.c:1213
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr "Warning: %d-Byte Inoden meist zu gross für's System\n"
-#: misc/mke2fs.c:1238
+#: misc/mke2fs.c:1255
msgid "while setting up superblock"
msgstr "while setting up superblock"
-#: misc/mke2fs.c:1272
+#: misc/mke2fs.c:1289
#, c-format
msgid "unknown os - %s"
msgstr "unbekanntes OS - %s"
-#: misc/mke2fs.c:1326
+#: misc/mke2fs.c:1343
msgid "while trying to allocate filesystem tables"
msgstr "while trying to allocate filesystem tables"
-#: misc/mke2fs.c:1357
+#: misc/mke2fs.c:1374
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "while zeroing block %u at end of filesystem"
-#: misc/mke2fs.c:1372 misc/tune2fs.c:370
+#: misc/mke2fs.c:1389 misc/tune2fs.c:369
msgid "journal"
msgstr "Journal"
-#: misc/mke2fs.c:1384
+#: misc/mke2fs.c:1401
#, c-format
msgid "Adding journal to device %s: "
msgstr "Adding journal to device %s: "
-#: misc/mke2fs.c:1391
+#: misc/mke2fs.c:1408
#, c-format
msgid ""
"\n"
"\n"
"\twhile trying to add journal to device %s"
-#: misc/mke2fs.c:1396 misc/mke2fs.c:1420 misc/tune2fs.c:392 misc/tune2fs.c:406
+#: misc/mke2fs.c:1413 misc/mke2fs.c:1437 misc/tune2fs.c:391 misc/tune2fs.c:405
msgid "done\n"
msgstr "erledigt\n"
-#: misc/mke2fs.c:1408
+#: misc/mke2fs.c:1425
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Creating journal (%d blocks): "
-#: misc/mke2fs.c:1416
+#: misc/mke2fs.c:1433
msgid ""
"\n"
"\twhile trying to create journal"
"\n"
"\twhile trying to create journal"
-#: misc/mke2fs.c:1425
+#: misc/mke2fs.c:1442
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Writing superblocks and filesystem accounting information: "
-#: misc/mke2fs.c:1430
+#: misc/mke2fs.c:1447
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
"\n"
"Warnung: Habe Schwierigkeiten die Superblöcke auf das Gerät zu schreiben."
-#: misc/mke2fs.c:1433
+#: misc/mke2fs.c:1450
msgid ""
"done\n"
"\n"
msgid "Journal NOT removed\n"
msgstr "Journal NOT removed\n"
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:189
msgid "Journal removed\n"
msgstr "Journal removed\n"
-#: misc/tune2fs.c:221
+#: misc/tune2fs.c:220
msgid "while reading journal inode"
msgstr "while reading journal inode"
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:227
msgid "while reading bitmaps"
msgstr "while reading bitmaps"
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:234
msgid "while clearing journal inode"
msgstr "while clearing journal inode"
-#: misc/tune2fs.c:246
+#: misc/tune2fs.c:245
msgid "while writing journal inode"
msgstr "while writing journal inode"
-#: misc/tune2fs.c:261
+#: misc/tune2fs.c:260
#, fuzzy, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Unvollständige Dateisystem-Option gesetzt: %s\n"
-#: misc/tune2fs.c:303
+#: misc/tune2fs.c:302
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
"Die has_jounal flag kann nur gelöscht werden, wenn das Dateisystem\n"
"nicht eingehängt oder im Nur-Lesen-Modus ist.\n"
-#: misc/tune2fs.c:312
+#: misc/tune2fs.c:311
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
"Die needs_recovery Flag ist gesetzt. Bitte starten sie e2fsck vor\n"
"der Löschung der has_journal Flag.\n"
-#: misc/tune2fs.c:365
+#: misc/tune2fs.c:364
msgid "The filesystem already has a journal.\n"
msgstr "Das Dateisystem hat schon ein Journal.\n"
-#: misc/tune2fs.c:376
+#: misc/tune2fs.c:375
#, c-format
msgid ""
"\n"
"\n"
"\twhile trying to open journal on %s\n"
-#: misc/tune2fs.c:380
+#: misc/tune2fs.c:379
#, c-format
msgid "Creating journal on device %s: "
msgstr "Creating journal on device %s: "
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:387
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "while adding filesystem to journal on %s"
-#: misc/tune2fs.c:394
+#: misc/tune2fs.c:393
msgid "Creating journal inode: "
msgstr "Creating journal inode: "
-#: misc/tune2fs.c:403
+#: misc/tune2fs.c:402
msgid ""
"\n"
"\twhile trying to create journal file"
"\n"
"\twhile trying to create journal file"
-#: misc/tune2fs.c:450
+#: misc/tune2fs.c:460
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Couldn't parse date/time specifier: %s"
-#: misc/tune2fs.c:472 misc/tune2fs.c:485
+#: misc/tune2fs.c:482 misc/tune2fs.c:495
#, c-format
msgid "bad mounts count - %s"
msgstr "bad mounts count - %s"
-#: misc/tune2fs.c:501
+#: misc/tune2fs.c:511
#, c-format
msgid "bad error behavior - %s"
msgstr "bad error behavior - %s"
-#: misc/tune2fs.c:524
+#: misc/tune2fs.c:534
#, c-format
msgid "bad gid/group name - %s"
msgstr "bad gid/group name - %s"
-#: misc/tune2fs.c:557
+#: misc/tune2fs.c:567
#, c-format
msgid "bad interval - %s"
msgstr "bad interval - %s"
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:595
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "bad reserved block ratio - %s"
-#: misc/tune2fs.c:600
+#: misc/tune2fs.c:610
#, fuzzy
msgid "-o may only be specified once"
msgstr "-O darf nur eimal angegeben werden"
-#: misc/tune2fs.c:610
+#: misc/tune2fs.c:620
msgid "-O may only be specified once"
msgstr "-O darf nur eimal angegeben werden"
-#: misc/tune2fs.c:620
+#: misc/tune2fs.c:630
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "bad reserved blocks count - %s"
-#: misc/tune2fs.c:649
+#: misc/tune2fs.c:659
#, c-format
msgid "bad uid/user name - %s"
msgstr "bad uid/user name - %s"
-#: misc/tune2fs.c:744
+#: misc/tune2fs.c:754
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Setting maximal mount count to %d\n"
-#: misc/tune2fs.c:750
+#: misc/tune2fs.c:760
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Setting current mount count to %d\n"
-#: misc/tune2fs.c:755
+#: misc/tune2fs.c:765
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Setting error behavior to %d\n"
-#: misc/tune2fs.c:760
+#: misc/tune2fs.c:770
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Setting reserved blocks gid to %lu\n"
-#: misc/tune2fs.c:765
+#: misc/tune2fs.c:775
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr "Setting interval between check %lu seconds\n"
-#: misc/tune2fs.c:771
+#: misc/tune2fs.c:781
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr "Setting reserved blocks percentage to %lu (%u blocks)\n"
-#: misc/tune2fs.c:777
+#: misc/tune2fs.c:787
#, c-format
msgid "reserved blocks count is too big (%ul)"
msgstr "reserved blocks count is too big (%ul)"
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:793
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Setting reserved blocks count to %lu\n"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:799
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
"\n"
"The filesystem already has sparse superblocks.\n"
-#: misc/tune2fs.c:796
+#: misc/tune2fs.c:806
#, c-format
msgid ""
"\n"
"\n"
"Sparse superblock flag set. %s"
-#: misc/tune2fs.c:803
+#: misc/tune2fs.c:813
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
"\n"
"The filesystem already has sparse superblocks disabled.\n"
-#: misc/tune2fs.c:811
+#: misc/tune2fs.c:821
#, c-format
msgid ""
"\n"
"\n"
"Sparse superblock flag cleared. %s"
-#: misc/tune2fs.c:818
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Setting time filesystem last checked to %s\n"
-#: misc/tune2fs.c:824
+#: misc/tune2fs.c:834
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Setting reserved blocks uid to %lu\n"
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:867
msgid "Invalid UUID format\n"
msgstr "Invalid UUID format\n"
-#: misc/uuidgen.c:30
-#, c-format
-msgid "Usage: %s [-r] [-t]\n"
-msgstr "Verwendung: %s [-r] [-t]\n"
-
#: misc/util.c:72
msgid "Proceed anyway? (y,n) "
msgstr "Trotzdem fortsetzen? (y,n) "
"Das Dateisystem wird automatisch alle %d mounts bzw. %g Tagen überprüft,\n"
" jenachdem was zuerst eintritt. Veränderbar mit tune2fs -c oder -t .\n"
+#: misc/uuidgen.c:30
+#, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Verwendung: %s [-r] [-t]\n"
+
+#: resize/extent.c:197
+msgid "# Extent dump:\n"
+msgstr "# Extent dump:\n"
+
+#: resize/extent.c:198
+#, c-format
+msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
+msgstr "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
+
+#: resize/extent.c:201
+#, c-format
+msgid "#\t\t %u -> %u (%d)\n"
+msgstr "#\t\t %u -> %u (%d)\n"
+
#: resize/main.c:32
#, c-format
msgid ""
msgid "blocks to be moved"
msgstr "blocks to be moved"
-#: resize/resize2fs.c:808
+#: resize/resize2fs.c:811
msgid "Going into desperation mode for block allocations\n"
msgstr "Going into desperation mode for block allocations\n"
-#: resize/resize2fs.c:901
+#: resize/resize2fs.c:904
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr "Moving %d blocks %u->%u\n"
-#: resize/resize2fs.c:971
+#: resize/resize2fs.c:974
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr "ino=%u, blockcnt=%lld, %u->%u\n"
-#: resize/resize2fs.c:1139
+#: resize/resize2fs.c:1142
#, c-format
msgid "Inode moved %u->%u\n"
msgstr "Inode moved %u->%u\n"
-#: resize/resize2fs.c:1204
+#: resize/resize2fs.c:1207
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
-#: resize/resize2fs.c:1330
+#: resize/resize2fs.c:1333
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr "Itable move group %d block %u->%u (diff %d)\n"
-#: resize/resize2fs.c:1356
+#: resize/resize2fs.c:1359
#, c-format
msgid "%d blocks of zeros...\n"
msgstr "%d blocks of zeros...\n"
-#: resize/resize2fs.c:1391
+#: resize/resize2fs.c:1394
msgid "Inode table move finished.\n"
msgstr "Inode table move finished.\n"
-#: resize/extent.c:197
-msgid "# Extent dump:\n"
-msgstr "# Extent dump:\n"
+#~ msgid "Couldn't allocate memory to parse extended options!\n"
+#~ msgstr "Couldn't allocate memory to parse extended options!\n"
-#: resize/extent.c:198
-#, c-format
-msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
-msgstr "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
+#~ msgid "Could not determine filesystem type for %s\n"
+#~ msgstr "Konnte den Dateisystemtype für %s nicht feststellen.\n"
-#: resize/extent.c:201
-#, c-format
-msgid "#\t\t %u -> %u (%d)\n"
-msgstr "#\t\t %u -> %u (%d)\n"
+#~ msgid "WARNING: %s: bad UUID\n"
+#~ msgstr "WARNUNG: %s: falscher UUID\n"
#~ msgid "while trying to read the bitmaps"
#~ msgstr "while trying to read the bitmaps"
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs-1.28\n"
-"POT-Creation-Date: 2002-11-09 11:58-0500\n"
+"POT-Creation-Date: 2003-05-03 14:59-0400\n"
"PO-Revision-Date: 2002-09-28 13:29MET\n"
"Last-Translator: Olaf Klemke <olke@users.sourceforge.net>\n"
"Language-Team: deutsch <gnome-de@gnome.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:187
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:191
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Bad block %u out of range; ignored.\n"
msgid "while reading the bad blocks inode"
msgstr "während des Lesen des Bad-Block-Inode"
-#: e2fsck/badblocks.c:71 e2fsck/iscan.c:110 e2fsck/scantest.c:107
-#: e2fsck/unix.c:853 e2fsck/unix.c:885 misc/badblocks.c:771
-#: misc/badblocks.c:782 misc/badblocks.c:796 misc/badblocks.c:808
-#: misc/dumpe2fs.c:337 misc/e2image.c:475 misc/e2image.c:491 misc/mke2fs.c:203
-#: misc/tune2fs.c:718 resize/main.c:198
+#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
+#: e2fsck/unix.c:869 e2fsck/unix.c:901 misc/badblocks.c:772
+#: misc/badblocks.c:783 misc/badblocks.c:797 misc/badblocks.c:809
+#: misc/dumpe2fs.c:337 misc/e2image.c:477 misc/e2image.c:493 misc/mke2fs.c:207
+#: misc/tune2fs.c:728 resize/main.c:198
#, c-format
msgid "while trying to open %s"
msgstr "while trying to open %s"
msgid "while trying popen '%s'"
msgstr "while trying popen '%s'"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:210
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:214
msgid "while reading in list of bad blocks from file"
msgstr "während des Lesen der Bad-Blockliste aus der Datei"
msgid "empty dir map"
msgstr "leerer Verzeichniseintrag"
-#. Inode number 11 is usually lost+found
#: e2fsck/emptydir.c:97
#, c-format
msgid "Empty directory block %d (#%d) in inode %d\n"
msgid "Couldn't allocate block buffer (size=%d)\n"
msgstr "Konnte keinen Blockpuffer (Grösse=%d) reservieren.\n"
-#: e2fsck/flushb.c:44
+#: e2fsck/flushb.c:34
#, c-format
msgid "Usage: %s disk\n"
msgstr "Verwendung: %s Laufwerk\n"
-#: e2fsck/flushb.c:73
+#: e2fsck/flushb.c:63
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr "BLKFLSBUF ioctl nicht unterstützt! Can't flush buffers.\n"
-#: e2fsck/iscan.c:44
+#: e2fsck/iscan.c:46
#, c-format
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Verwendung: %s [-F] [-I inode_buffer_blocks] Gerät\n"
-#: e2fsck/iscan.c:81 e2fsck/unix.c:673 resize/main.c:175
+#: e2fsck/iscan.c:83 e2fsck/unix.c:689 resize/main.c:175
#, c-format
msgid "while opening %s for flushing"
msgstr "während des Öffnens von %s zum Rückschreiben."
-#: e2fsck/iscan.c:86 e2fsck/unix.c:679 resize/main.c:182
+#: e2fsck/iscan.c:88 e2fsck/unix.c:695 resize/main.c:182
#, c-format
msgid "while trying to flush %s"
msgstr "während des Rückschreibeversuches auf %s."
-#: e2fsck/iscan.c:119 e2fsck/scantest.c:114 misc/e2image.c:377
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:377
msgid "while opening inode scan"
msgstr "während der Inodenabtastung"
-#: e2fsck/iscan.c:127 misc/e2image.c:395
+#: e2fsck/iscan.c:129 misc/e2image.c:395
msgid "while getting next inode"
msgstr "während des Ladens des nächsten Inode"
-#: e2fsck/iscan.c:136
+#: e2fsck/iscan.c:138
#, c-format
msgid "%d inodes scanned.\n"
msgstr "%d Inoden abgetastet.\n"
-#: e2fsck/journal.c:418
+#: e2fsck/journal.c:420
msgid "reading journal superblock\n"
msgstr "Lese Journal Superblock\n"
-#: e2fsck/journal.c:475
+#: e2fsck/journal.c:477
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: Habe keinen gültigen Journal Superblock gefunden\n"
-#: e2fsck/journal.c:484
+#: e2fsck/journal.c:486
#, c-format
msgid "%s: journal too short\n"
msgstr "%s:Das Journal ist zu kurz.\n"
-#: e2fsck/journal.c:756
+#: e2fsck/journal.c:758
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: stelle das Journal wieder her\n"
-#: e2fsck/journal.c:758
+#: e2fsck/journal.c:760
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: Das Jounal ist nur lesbar - Keine Wiederherstellung\n"
-#: e2fsck/journal.c:779
+#: e2fsck/journal.c:781
#, c-format
msgid "while trying to re-open %s"
msgstr "while trying to re-open %s"
msgid "<The NULL inode>"
msgstr "<Des NULL Inode>"
-#. 0
#: e2fsck/message.c:143
msgid "<The bad blocks inode>"
msgstr "<Des Bad Blocks Inode>"
-#. 1
-#. 2
#: e2fsck/message.c:145
msgid "<The ACL index inode>"
msgstr "<Des ACL Index Inode>"
-#. 3
#: e2fsck/message.c:146
msgid "<The ACL data inode>"
msgstr "<Des ACL Data Inode>"
-#. 4
#: e2fsck/message.c:147
msgid "<The boot loader inode>"
msgstr "<Des Boot Loader Inode>"
-#. 5
#: e2fsck/message.c:148
msgid "<The undelete directory inode>"
msgstr "<Des ungelöschten Verzeichnis Inode>"
-#. 6
#: e2fsck/message.c:149
msgid "<The group descriptor inode>"
msgstr "<Des Gruppenbezeicher-Inode>"
-#. 7
#: e2fsck/message.c:150
msgid "<The journal inode>"
msgstr "<Des Journal Inode>"
-#. 8
#: e2fsck/message.c:151
msgid "<Reserved inode 9>"
msgstr "<Der reservierte Inode 9>"
-#. 9
#: e2fsck/message.c:152
msgid "<Reserved inode 10>"
msgstr "<Der reservierte Inode 10>"
msgid "returned from clone_file_block"
msgstr "zurückgegeben von clone_file_block"
-#.
-#. * Allocate bitmaps structures
-#.
-#: e2fsck/pass1.c:311
+#: e2fsck/pass1.c:296
msgid "in-use inode map"
msgstr "benutztes Inoden Verzeichnis"
-#: e2fsck/pass1.c:320
+#: e2fsck/pass1.c:305
msgid "directory inode map"
msgstr "Inoden-Verzeichnis für Verzeichnisse"
-#: e2fsck/pass1.c:328
+#: e2fsck/pass1.c:313
msgid "regular file inode map"
msgstr "Inoden-Verzeichnis für reguläre Dateien"
-#: e2fsck/pass1.c:335
+#: e2fsck/pass1.c:320
msgid "in-use block map"
msgstr "benutztes Block-Verzeichnis"
-#: e2fsck/pass1.c:382
+#: e2fsck/pass1.c:367
msgid "doing inode scan"
msgstr "Inodenabtastung"
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:736
msgid "Pass 1"
msgstr "Durchgang 1"
-#: e2fsck/pass1.c:809
+#: e2fsck/pass1.c:794
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "lese den indirekten Block von Inode %u"
-#: e2fsck/pass1.c:851
+#: e2fsck/pass1.c:836
msgid "bad inode map"
msgstr "fehlerhaftes Inoden Verzeichnis"
-#: e2fsck/pass1.c:873
+#: e2fsck/pass1.c:858
msgid "inode in bad block map"
msgstr "Inode im Bad Blocks Verzeichnis"
-#: e2fsck/pass1.c:893
+#: e2fsck/pass1.c:878
msgid "imagic inode map"
msgstr "imagic inode map"
-#: e2fsck/pass1.c:920
+#: e2fsck/pass1.c:905
msgid "multiply claimed block map"
msgstr "multiply claimed block map"
-#: e2fsck/pass1.c:1019
+#: e2fsck/pass1.c:1004
msgid "ext attr block map"
msgstr "ext attr block map"
-#: e2fsck/pass1.c:1775
+#: e2fsck/pass1.c:1760
msgid "block bitmap"
msgstr "block bitmap"
-#: e2fsck/pass1.c:1779
+#: e2fsck/pass1.c:1764
msgid "inode bitmap"
msgstr "inode bitmap"
-#: e2fsck/pass1.c:1783
+#: e2fsck/pass1.c:1768
msgid "inode table"
msgstr "Inoden-Tabelle"
-#: e2fsck/pass2.c:290
+#: e2fsck/pass2.c:291
#, fuzzy
msgid "Pass 2"
msgstr "Durchgang 1"
-#.
-#. * Allocate some bitmaps to do loop detection.
-#.
-#: e2fsck/pass3.c:80
+#: e2fsck/pass3.c:79
msgid "inode done bitmap"
msgstr "inode done bitmap"
-#: e2fsck/pass3.c:91
+#: e2fsck/pass3.c:90
msgid "Peak memory"
msgstr "Peak memory"
-#: e2fsck/pass3.c:144
+#: e2fsck/pass3.c:143
msgid "Pass 3"
msgstr "Durchgang 3"
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:333
msgid "inode loop detection bitmap"
msgstr "inode loop detection bitmap"
msgid "(no prompt)"
msgstr "(nicht interaktiv)"
-#. 0
#: e2fsck/problem.c:50
msgid "Fix"
msgstr "Repariere"
-#. 1
#: e2fsck/problem.c:51
msgid "Clear"
msgstr "Bereinige"
-#. 2
#: e2fsck/problem.c:52
msgid "Relocate"
msgstr "Zurücksetzen"
-#. 3
#: e2fsck/problem.c:53
msgid "Allocate"
msgstr "Freigeben"
-#. 4
#: e2fsck/problem.c:54
msgid "Expand"
msgstr "Erweitere"
-#. 5
#: e2fsck/problem.c:55
msgid "Connect to /lost+found"
msgstr "Verbinde nach /lost+found"
-#. 6
#: e2fsck/problem.c:56
msgid "Create"
msgstr "Erstelle"
-#. 7
#: e2fsck/problem.c:57
msgid "Salvage"
msgstr "Rette"
-#. 8
#: e2fsck/problem.c:58
msgid "Truncate"
msgstr "Beenden"
-#. 9
#: e2fsck/problem.c:59
msgid "Clear inode"
msgstr "Bereinige Inode"
-#. 10
#: e2fsck/problem.c:60
msgid "Abort"
msgstr "Abbrechen"
-#. 11
#: e2fsck/problem.c:61
msgid "Split"
msgstr "Abspalten"
-#. 12
#: e2fsck/problem.c:62
msgid "Continue"
msgstr "Fortsetzen"
-#. 13
#: e2fsck/problem.c:63
msgid "Clone duplicate/bad blocks"
msgstr "Clone doppelte/bad blocks"
-#. 14
#: e2fsck/problem.c:64
msgid "Delete file"
msgstr "Lösche Datei"
-#. 15
#: e2fsck/problem.c:65
msgid "Suppress messages"
msgstr "Ausgaben unterdrücken"
-#. 16
#: e2fsck/problem.c:66
msgid "Unlink"
msgstr "Unlink"
-#. 17
#: e2fsck/problem.c:67
msgid "Clear HTree index"
msgstr "Clear HTree index"
msgid "(NONE)"
msgstr "(NICHTS)"
-#. 0
#: e2fsck/problem.c:77
msgid "FIXED"
msgstr "REPARIERT"
-#. 1
#: e2fsck/problem.c:78
msgid "CLEARED"
msgstr "BEREINIGT"
-#. 2
#: e2fsck/problem.c:79
msgid "RELOCATED"
msgstr "ZURÜCKGESETZT"
-#. 3
#: e2fsck/problem.c:80
msgid "ALLOCATED"
msgstr "FREIGEGEBEN"
-#. 4
#: e2fsck/problem.c:81
msgid "EXPANDED"
msgstr "ERWEITERT"
-#. 5
#: e2fsck/problem.c:82
msgid "RECONNECTED"
msgstr "WIEDER VERBUNDEN"
-#. 6
#: e2fsck/problem.c:83
msgid "CREATED"
msgstr "ANGELEGT"
-#. 7
#: e2fsck/problem.c:84
msgid "SALVAGED"
msgstr "GERETTET"
-#. 8
#: e2fsck/problem.c:85
msgid "TRUNCATED"
msgstr "BEENDET"
-#. 9
#: e2fsck/problem.c:86
msgid "INODE CLEARED"
msgstr "INODE BEREINIGT"
-#. 10
#: e2fsck/problem.c:87
msgid "ABORTED"
msgstr "ABGEBROCHEN"
-#. 11
#: e2fsck/problem.c:88
msgid "SPLIT"
msgstr "ABGESPALTEN"
-#. 12
#: e2fsck/problem.c:89
msgid "CONTINUING"
msgstr "SETZE FORT"
-#. 13
#: e2fsck/problem.c:90
msgid "DUPLICATE/BAD BLOCKS CLONED"
msgstr "DOPPELTE /BAD BLOCKS GECLONT"
-#. 14
#: e2fsck/problem.c:91
msgid "FILE DELETED"
msgstr "DATEI GELÖSCHT"
-#. 15
#: e2fsck/problem.c:92
msgid "SUPPRESSED"
msgstr "UNTERDRÜCKT"
-#. 16
#: e2fsck/problem.c:93
msgid "UNLINKED"
msgstr "UNLINKED"
-#. 17
#: e2fsck/problem.c:94
msgid "HTREE INDEX CLEARED"
msgstr "HTREE INDEX BEREINIGT"
-#. Pre-Pass 1 errors
-#. Block bitmap not in group
#: e2fsck/problem.c:103
msgid "@b @B for @g %g is not in @g. (@b %b)\n"
msgstr "@b @B für @g %g ist nicht in @g. (@b %b)\n"
-#. Inode bitmap not in group
#: e2fsck/problem.c:107
msgid "@i @B for @g %g is not in @g. (@b %b)\n"
msgstr "@i @B für @g %g ist nicht in @g. (@b %b)\n"
msgid "Pass 1: Checking @is, @bs, and sizes\n"
msgstr "Durchgang 1: Prüfe @is, @bs, und Grössen\n"
-#. Root directory is not an inode
#: e2fsck/problem.c:320
msgid "@r is not a @d. "
msgstr "@r ist kein @d. "
msgid "@E is duplicate '..' @e.\n"
msgstr "@E ist ein Duplikat '..' @e.\n"
-#: e2fsck/problem.c:938 e2fsck/problem.c:1204
+#: e2fsck/problem.c:938 e2fsck/problem.c:1219
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr "Interner Fehler: kann dir_info für %i nicht finden.\n"
msgid "@p @h %d: node (%B) has bad depth\n"
msgstr "@p @h %d: node (%B) has bad max hash\n"
-#: e2fsck/problem.c:1094
+#: e2fsck/problem.c:1092
+#, fuzzy
+msgid "Duplicate @E found. "
+msgstr "Doppelte/bad @b(s) in @i %i:"
+
+#: e2fsck/problem.c:1097
+#, c-format
+msgid ""
+"@E has a non-unique filename.\n"
+"Rename to %s"
+msgstr ""
+
+#: e2fsck/problem.c:1102
+msgid ""
+"Duplicate @e '%Dn' found.\n"
+"\tMarking %p (%i) to be rebuilt.\n"
+"\n"
+msgstr ""
+
+#: e2fsck/problem.c:1109
msgid "Pass 3: Checking @d connectivity\n"
msgstr "Durchgang 3: Prüfe @d Verknüpfungen\n"
-#: e2fsck/problem.c:1099
+#: e2fsck/problem.c:1114
msgid "@r not allocated. "
msgstr "@r nicht reserviert. "
-#: e2fsck/problem.c:1104
+#: e2fsck/problem.c:1119
msgid "No room in @l @d. "
msgstr "Kein Platz auf @l @d. "
-#: e2fsck/problem.c:1109
+#: e2fsck/problem.c:1124
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr "Nicht verbunden @d @i %i (%p)\n"
-#: e2fsck/problem.c:1114
+#: e2fsck/problem.c:1129
msgid "/@l not found. "
msgstr "/@l nicht gefunden. "
-#: e2fsck/problem.c:1119
+#: e2fsck/problem.c:1134
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr "'..' in %Q (%i) ist %P (%j), @s %q (%d).\n"
-#: e2fsck/problem.c:1124
+#: e2fsck/problem.c:1139
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr "Falscher oder fehlender /@l. Wiederverbinden nicht möglich.\n"
-#: e2fsck/problem.c:1129
+#: e2fsck/problem.c:1144
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr "Erweitern nicht möglich /@l: %m\n"
-#: e2fsck/problem.c:1134
+#: e2fsck/problem.c:1149
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr "Wiederverbinden nicht möglich %i: %m\n"
-#: e2fsck/problem.c:1139
+#: e2fsck/problem.c:1154
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr "Fehler während der Suche nach /@l: %m\n"
-#: e2fsck/problem.c:1144
+#: e2fsck/problem.c:1159
#, c-format
msgid "ext2fs_new_@b: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_@b: %m während des Versuches /@l @d zu erzeugen.\n"
-#: e2fsck/problem.c:1149
+#: e2fsck/problem.c:1164
#, c-format
msgid "ext2fs_new_@i: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_@i: %m während des Versuches /@l @d zu erzeugen.\n"
-#: e2fsck/problem.c:1154
+#: e2fsck/problem.c:1169
#, c-format
msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n"
msgstr "ext2fs_new_dir_@b: %m während des Versuches /@l @d zu erzeugen.\n"
-#: e2fsck/problem.c:1159
+#: e2fsck/problem.c:1174
#, c-format
msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
msgstr "ext2fs_write_dir_@b: %m während des Schreibens von @d @b für /@l\n"
-#: e2fsck/problem.c:1164
+#: e2fsck/problem.c:1179
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr "Fehler während der Einstellung von @i count auf @i %i\n"
-#: e2fsck/problem.c:1169
+#: e2fsck/problem.c:1184
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
"Konnte Parent von @i %i: %m nicht reparieren\n"
"\n"
-#: e2fsck/problem.c:1174
+#: e2fsck/problem.c:1189
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d entry\n"
"Kann das Elternobj. von @i %i nicht repar.: \n"
"Kann das Elterneintrag von @d nicht finden.\n"
-#: e2fsck/problem.c:1179
+#: e2fsck/problem.c:1194
msgid "@A @i @B (%N): %m\n"
msgstr "@A @i @B (%N): %m\n"
-#: e2fsck/problem.c:1184
+#: e2fsck/problem.c:1199
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr "Fehler beim Erzerugen von root @d (%s): %m\n"
-#: e2fsck/problem.c:1189
+#: e2fsck/problem.c:1204
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr "Fehler beim Erzerugen von /@l @d (%s): %m\n"
-#: e2fsck/problem.c:1194
+#: e2fsck/problem.c:1209
msgid "@r is not a @d; aborting.\n"
msgstr "@r ist kein @d; Abbruch.\n"
-#: e2fsck/problem.c:1199
+#: e2fsck/problem.c:1214
msgid "Cannot proceed without a @r.\n"
msgstr "Kann ohne @r nicht weitermachen.\n"
-#: e2fsck/problem.c:1209
+#: e2fsck/problem.c:1224
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr "/@l ist kein @d (ino=%i)\n"
-#: e2fsck/problem.c:1216
+#: e2fsck/problem.c:1231
msgid "Pass 3A: Optimizing directories\n"
msgstr "Durchgang 3A: Optimiere Verzeichnisse\n"
-#: e2fsck/problem.c:1221
+#: e2fsck/problem.c:1236
#, c-format
msgid "Failed to create dirs_to_hash iterator: %m"
msgstr "Failed to create dirs_to_hash iterator: %m"
-#: e2fsck/problem.c:1226
+#: e2fsck/problem.c:1241
msgid "Failed to optimize directory %q (%d): %m"
msgstr "Failed to optimize directory %q (%d): %m"
-#: e2fsck/problem.c:1231
+#: e2fsck/problem.c:1246
msgid "Optimizing directories: "
msgstr "Optimiere Verzeichnisse: "
-#: e2fsck/problem.c:1248
+#: e2fsck/problem.c:1263
msgid "Pass 4: Checking reference counts\n"
msgstr "Durchgang 4: Überprüfe die Prüfsummen\n"
-#: e2fsck/problem.c:1263
+#: e2fsck/problem.c:1278
msgid "@i %i ref count is %Il, @s %N. "
msgstr "@i %i Prüfsumme ist %Il, @s %N. "
-#: e2fsck/problem.c:1267
+#: e2fsck/problem.c:1282
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
"@i_link_info[%i] ist %N, @i.i_links_count ist %Il. Sie sollten gleich "
"sein!\n"
-#: e2fsck/problem.c:1277
+#: e2fsck/problem.c:1292
msgid "Pass 5: Checking @g summary information\n"
msgstr "Durchgang 5: Überprüfe @g Zusammenfassung\n"
-#: e2fsck/problem.c:1282
+#: e2fsck/problem.c:1297
msgid "Padding at end of @i @B is not set. "
msgstr "Auffüllbyte am Ende von @i @B ist nicht gesetzt. "
-#: e2fsck/problem.c:1287
+#: e2fsck/problem.c:1302
msgid "Padding at end of @b @B is not set. "
msgstr "Auffüllbyte am Ende von @b @B ist nicht gesetzt. "
-#: e2fsck/problem.c:1292
+#: e2fsck/problem.c:1307
msgid "@b @B differences: "
msgstr "@b @B differieren: "
-#: e2fsck/problem.c:1312
+#: e2fsck/problem.c:1327
msgid "@i @B differences: "
msgstr "@i @B differieren: "
-#: e2fsck/problem.c:1332
+#: e2fsck/problem.c:1347
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr "Freie @is Anzahl ist falsch für @g #%g (%i, counted=%j).\n"
-#: e2fsck/problem.c:1337
+#: e2fsck/problem.c:1352
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr "Verzeichnisanzahl ist falsch für @g #%g (%i, counted=%j).\n"
-#: e2fsck/problem.c:1342
+#: e2fsck/problem.c:1357
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr "Freie @is Anzahl ist falsch (%i, counted=%j).\n"
-#: e2fsck/problem.c:1347
+#: e2fsck/problem.c:1362
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr "Freie @bs Anzahl ist falsch @g #%g (%b, counted=%c).\n"
-#: e2fsck/problem.c:1352
+#: e2fsck/problem.c:1367
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Freie @bs Anzahl ist falsch (%b, counted=%c).\n"
-#: e2fsck/problem.c:1357
+#: e2fsck/problem.c:1372
msgid ""
"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
"endpoints (%i, %j)\n"
"PROGRAMMIERFEHLER: @f (#%N) @B Endpunkt (%b, %c) passt nicht zum brechneten "
"@B Endpunkt (%i, %j)\n"
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1378
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr "Interner Fehler: fudging end of bitmap (%N)\n"
-#: e2fsck/problem.c:1497
+#: e2fsck/problem.c:1512
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr "Unbenutzter Fehlercode (0x%x)!\n"
-#: e2fsck/problem.c:1569
+#: e2fsck/problem.c:1584
msgid "IGNORED"
msgstr "IGNORIERT"
-#: e2fsck/scantest.c:79
+#: e2fsck/scantest.c:81
#, c-format
msgid "Memory used: %d, elapsed time: %6.3f/%6.3f/%6.3f\n"
msgstr "benutzter Speicher: %d, vergangende Zeit: %6.3f/%6.3f/%6.3f\n"
-#: e2fsck/scantest.c:98
+#: e2fsck/scantest.c:100
#, c-format
msgid "size of inode=%d\n"
msgstr "Grösse der Inode=%d\n"
-#: e2fsck/scantest.c:119
+#: e2fsck/scantest.c:121
msgid "while starting inode scan"
msgstr "während des Beginns der Inodenprüfung"
-#: e2fsck/scantest.c:130
+#: e2fsck/scantest.c:132
msgid "while doing inode scan"
msgstr "während der Inodenprüfung"
msgid "Byte swap"
msgstr "Byte Swap"
-#: e2fsck/unix.c:63
+#: e2fsck/unix.c:67
#, fuzzy, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
"\t\t[-l|-L bad_blocks_file] [-C fd] [-j ext-journal]\n"
"\t\t[-E extended-options] Gerät\n"
-#: e2fsck/unix.c:69
+#: e2fsck/unix.c:73
+#, fuzzy
msgid ""
"\n"
"Emergency help:\n"
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
" -c suche nach defekten Blöcken\n"
" -f erzwinge die Überprüfung auch wenn alles i.O. erscheint\n"
-#: e2fsck/unix.c:75
+#: e2fsck/unix.c:79
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
" -l bad_blocks_file zur Liste der defekten Blöcke hinzufügen\n"
".-L bad_blocks_file Liste der defekten Blöcke definieren\n"
-#: e2fsck/unix.c:109
+#: e2fsck/unix.c:113
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr "%s: %d/%d Dateien (%0d.%d%% nicht verbunden ), %d/%d Blöcke\n"
-#: e2fsck/unix.c:124
+#: e2fsck/unix.c:128
#, c-format
msgid ""
"\n"
"\n"
"%8d Inoden benutzt (%d%%)\n"
-#: e2fsck/unix.c:126
+#: e2fsck/unix.c:130
#, c-format
msgid "%8d non-contiguous inodes (%0d.%d%%)\n"
msgstr "%8dnicht verbundene Inoden (%0d.%d%%)\n"
-#: e2fsck/unix.c:128
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr " # von Inoden mit ind/dind/tind Blöcken: %d/%d/%d\n"
-#: e2fsck/unix.c:130
+#: e2fsck/unix.c:134
#, c-format
msgid ""
"%8d blocks used (%d%%)\n"
"%8d Blöcke benutzt (%d%%)\n"
"%8d defekte Blöcke\n"
-#: e2fsck/unix.c:134
+#: e2fsck/unix.c:138
#, c-format
msgid "%8d large files\n"
msgstr "%8d grosse Dateien\n"
-#: e2fsck/unix.c:135
+#: e2fsck/unix.c:139
#, c-format
msgid ""
"\n"
"--------\n"
"%8d Dateien\n"
-#: e2fsck/unix.c:168
+#: e2fsck/unix.c:172
#, c-format
msgid "%8d large file%s\n"
msgstr "%8d grosse Dateien %s\n"
-#: e2fsck/unix.c:211 misc/badblocks.c:612 misc/tune2fs.c:734 misc/util.c:133
+#: e2fsck/unix.c:215 misc/badblocks.c:613 misc/tune2fs.c:744 misc/util.c:133
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr "während der Prüfung ob %s eingehängt ist."
-#: e2fsck/unix.c:226
+#: e2fsck/unix.c:230
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "Warnung! %s ist eingehängt.\n"
-#: e2fsck/unix.c:230
+#: e2fsck/unix.c:234
#, c-format
msgid "%s is mounted. "
msgstr "%s ist eingehängt. "
-#: e2fsck/unix.c:232
+#: e2fsck/unix.c:236
msgid ""
"Cannot continue, aborting.\n"
"\n"
"Komme nicht weiter, breche ab.\n"
"\n"
-#: e2fsck/unix.c:233
+#: e2fsck/unix.c:237
msgid ""
"\n"
"\n"
"kann das Dateisystem STARK BESCHÄDIGEN.\n"
"\n"
-#: e2fsck/unix.c:236
+#: e2fsck/unix.c:240
msgid "Do you really want to continue"
msgstr "Möchte sie wirklich fortfahren"
-#: e2fsck/unix.c:238
+#: e2fsck/unix.c:242
msgid "check aborted.\n"
msgstr "Test abgebrochen.\n"
-#: e2fsck/unix.c:260
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr " enthält ein fehlerhaftes Dateisystem"
-#: e2fsck/unix.c:262
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr " wurde nicht ordnungsgemäss ausgehängt"
-#: e2fsck/unix.c:266
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " wurde %u mal ohne Überprüfung eingehängt"
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:275
#, c-format
msgid " has gone %u days without being checked"
msgstr " wurde %u Tage ohne Überprüfung genutzt"
-#: e2fsck/unix.c:277
+#: e2fsck/unix.c:281
msgid ", check forced.\n"
msgstr ", Prüfung erzwungen.\n"
-#: e2fsck/unix.c:280
+#: e2fsck/unix.c:284
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks\n"
msgstr "%s: i.O., %d/%d Dateien, %d/%d Blöcke\n"
-#: e2fsck/unix.c:411
+#: e2fsck/unix.c:431
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "Fehler: Kann /dev/null (%s) nicht öffnen\n"
-#: e2fsck/unix.c:463
-msgid "Couldn't allocate memory to parse extended options!\n"
-msgstr "Couldn't allocate memory to parse extended options!\n"
-
-#: e2fsck/unix.c:489
+#: e2fsck/unix.c:502
msgid "Invalid EA version.\n"
msgstr "Invalid EA version.\n"
-#: e2fsck/unix.c:498
+#: e2fsck/unix.c:511
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
"\tea_ver=<ea_version (1 or 2)\n"
"\n"
-#: e2fsck/unix.c:547
+#: e2fsck/unix.c:561
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "Fehler bei Überprüfung des Datei-Descriptors %d: %s\n"
-#: e2fsck/unix.c:551
+#: e2fsck/unix.c:565
msgid "Invalid completion information file descriptor"
msgstr "Unvollständiger completion information file descriptor"
-#: e2fsck/unix.c:581
+#: e2fsck/unix.c:580
+msgid "Only one the options -p/-a, -n or -y may be specified."
+msgstr ""
+
+#: e2fsck/unix.c:601
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "Die -t Option wird von dieser e2fsck-Version nicht unterstützt.\n"
-#: e2fsck/unix.c:650
+#: e2fsck/unix.c:666
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr ""
"Das Byte-Swapping wurde in dieser Version von e2fsck nicht mit-übersetzt.\n"
-#: e2fsck/unix.c:688
+#: e2fsck/unix.c:704
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr "Inkompatible Optionen sind beim Byte-Swapping nicht erlaubt.\n"
-#: e2fsck/unix.c:695
+#: e2fsck/unix.c:711
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Die -c und -l/-L Optionen dürfen nicht gleichzeitig werden.\n"
-#: e2fsck/unix.c:773
+#: e2fsck/unix.c:789
msgid "Error: ext2fs library version out of date!\n"
msgstr "Fehler: ext2fs-Bibliotheks-Version ist zu alt!\n"
-#: e2fsck/unix.c:781
+#: e2fsck/unix.c:797
msgid "while trying to initialize program"
msgstr "während der Programminitalisierung"
-#: e2fsck/unix.c:795
+#: e2fsck/unix.c:811
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tBenutze %s, %s\n"
-#: e2fsck/unix.c:807
+#: e2fsck/unix.c:823
msgid "need terminal for interactive repairs"
msgstr "Benötige einen Terminal für interaktive Reparaturen"
-#: e2fsck/unix.c:843
+#: e2fsck/unix.c:859
#, c-format
msgid "%s trying backup blocks...\n"
msgstr "%s versuche backup blocks...\n"
-#: e2fsck/unix.c:844
+#: e2fsck/unix.c:860
msgid "Couldn't find ext2 superblock,"
msgstr "Konnte den ext2 Superblock nicht finden,"
-#: e2fsck/unix.c:845
+#: e2fsck/unix.c:861
msgid "Group descriptors look bad..."
msgstr "Gruppen Descriptoren scheinen defekt..."
-#: e2fsck/unix.c:856
+#: e2fsck/unix.c:872
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
"von e2fsck (oder der Dateisystem-Superblock ist kaputt).\n"
"\n"
-#: e2fsck/unix.c:862
+#: e2fsck/unix.c:878
msgid "Could this be a zero-length partition?\n"
msgstr "Könnte es eine Partion mit Länge gleich Null sein ?\n"
-#: e2fsck/unix.c:864
+#: e2fsck/unix.c:880
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Sie benötigen %s- oder root-Rechte für das Dateisystem.\n"
-#: e2fsck/unix.c:869
+#: e2fsck/unix.c:885
msgid "Possibly non-existent or swap device?\n"
msgstr "Möglicherweise nicht-existent oder swap-Partition?\n"
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:888
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
"Laufwerk ist schreibgeschützt, nutzen sie die -n Option\n"
"um es im Nur-Lesen-Modus zu testen.\n"
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:904
msgid "Get a newer version of e2fsck!"
msgstr "Holen sie sich eine neuere Version von e2fsck!"
-#: e2fsck/unix.c:914
+#: e2fsck/unix.c:925
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "während der Prüfung des ext3-journals für %s"
-#: e2fsck/unix.c:925
+#: e2fsck/unix.c:936
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
"Warnung: Überspringe, da das Dateisystem im Nur-Lesen-Modus ist, die Jounal-"
"Wiederherstellung.\n"
-#: e2fsck/unix.c:933
+#: e2fsck/unix.c:949
+#, fuzzy, c-format
+msgid "unable to set superblock flags on %s\n"
+msgstr ""
+"\n"
+"Sparse superblock flag set. %s"
+
+#: e2fsck/unix.c:955
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "während der Wiederherstellung des ext3-Journals von %s"
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:984
msgid "Warning: compression support is experimental.\n"
msgstr "Warnung: Die Kompressionsunterstützung ist experimental.\n"
-#: e2fsck/unix.c:966
+#: e2fsck/unix.c:989
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
"Die Unterstützung für HTREE wurde in E2fsck nicht aktiviert,\n"
"\taber das Dateisystem %s besitzt HTREE Verzeichnisse.\n"
-#: e2fsck/unix.c:1009
+#: e2fsck/unix.c:1032
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr "%s: die Byte-Reifolge des Dateisystems wurde schon normalisiert.\n"
-#: e2fsck/unix.c:1029
+#: e2fsck/unix.c:1052
msgid "while reading bad blocks inode"
msgstr "während des Lesen des Bad-Block-Inodes"
-#: e2fsck/unix.c:1031
+#: e2fsck/unix.c:1054
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "die Wartezeit war zu kurz, wir versuchen es trotzdem ..\n"
-#: e2fsck/unix.c:1038
+#: e2fsck/unix.c:1061
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Beginne e2fsck neu ...\n"
-#: e2fsck/unix.c:1042
+#: e2fsck/unix.c:1065
msgid "while resetting context"
msgstr "während des Rücksetzen des Kontext"
-#: e2fsck/unix.c:1049
+#: e2fsck/unix.c:1072
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck abgebrochhen.\n"
-#: e2fsck/unix.c:1054
+#: e2fsck/unix.c:1077
msgid "aborted"
msgstr "abgebrochen"
-#: e2fsck/unix.c:1062
+#: e2fsck/unix.c:1085
#, c-format
msgid ""
"\n"
"\n"
"%s: ***** DATEISYSTEM WURDE VERÄNDERT *****\n"
-#: e2fsck/unix.c:1065
+#: e2fsck/unix.c:1088
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** STARTE LINUX NEU *****\n"
-#: e2fsck/unix.c:1071
+#: e2fsck/unix.c:1094
#, c-format
msgid ""
"\n"
"%s: ********** WARNUNG: Noch Fehler im Dateisystem **********\n"
"\n"
-#: e2fsck/util.c:99 misc/util.c:68
+#: e2fsck/util.c:130 misc/util.c:68
msgid "yY"
msgstr "yJ"
-#: e2fsck/util.c:100
+#: e2fsck/util.c:131
msgid "nN"
msgstr "nN"
-#: e2fsck/util.c:114
+#: e2fsck/util.c:145
msgid "<y>"
msgstr "<j>"
-#: e2fsck/util.c:116
+#: e2fsck/util.c:147
msgid "<n>"
msgstr "<n>"
-#: e2fsck/util.c:118
+#: e2fsck/util.c:149
msgid " (y/n)"
msgstr " (j/n)"
-#: e2fsck/util.c:133
+#: e2fsck/util.c:164
msgid "cancelled!\n"
msgstr "Abgebrochen!\n"
-#: e2fsck/util.c:148
+#: e2fsck/util.c:179
msgid "yes\n"
msgstr "ja\n"
-#: e2fsck/util.c:150
+#: e2fsck/util.c:181
msgid "no\n"
msgstr "nein\n"
-#: e2fsck/util.c:160
+#: e2fsck/util.c:191
#, c-format
msgid ""
"%s? no\n"
"%s? nein\n"
"\n"
-#: e2fsck/util.c:164
+#: e2fsck/util.c:195
#, c-format
msgid ""
"%s? yes\n"
"%s? ja\n"
"\n"
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "yes"
msgstr "ja"
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "no"
msgstr "nein"
-#: e2fsck/util.c:181
+#: e2fsck/util.c:212
#, c-format
msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
msgstr "e2fsck_read_bitmaps: illegal bitmap block(s) für %s"
-#: e2fsck/util.c:186
+#: e2fsck/util.c:217
msgid "reading inode and block bitmaps"
msgstr "lese Inode und Block bitmaps"
-#: e2fsck/util.c:191
+#: e2fsck/util.c:222
#, c-format
msgid "while retrying to read bitmaps for %s"
msgstr "während des wiederholten Versuches Bitmaps für %s einzulesen"
-#: e2fsck/util.c:203
+#: e2fsck/util.c:234
msgid "writing block bitmaps"
msgstr "Schreibe Block-Bitmaps"
-#: e2fsck/util.c:208
+#: e2fsck/util.c:239
#, c-format
msgid "while retrying to write block bitmaps for %s"
msgstr "während des wiederholten Versuches Block-Bitmaps für %s zu schreiben."
-#: e2fsck/util.c:215
+#: e2fsck/util.c:246
msgid "writing inode bitmaps"
msgstr "Schreibe Inoden-Bitmaps"
-#: e2fsck/util.c:220
+#: e2fsck/util.c:251
#, c-format
msgid "while retrying to write inode bitmaps for %s"
msgstr "während des wiederholten Versuches Inoden-Bitmaps für %s zu schreiben."
-#: e2fsck/util.c:233
+#: e2fsck/util.c:264
#, c-format
msgid ""
"\n"
"%s: UNERWARTETE INKONSISTENS; fsck PER HAND AUSFÜHREN\n"
"\t(z.B. ohne -a or -p Optionen)\n"
-#: e2fsck/util.c:298
+#: e2fsck/util.c:329
#, c-format
msgid "Memory used: %dk/%dk (%dk/%dk), "
msgstr "benutzter Speicher: %dk/%dk (%dk/%dk), "
-#: e2fsck/util.c:302
+#: e2fsck/util.c:333
#, c-format
msgid "Memory used: %d, "
msgstr "benutzter Speicher: %d, "
-#: e2fsck/util.c:308
+#: e2fsck/util.c:339
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr "Zeit: %5.2f/%5.2f/%5.2f\n"
-#: e2fsck/util.c:313
+#: e2fsck/util.c:344
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr "abgelaufende Zeit: %6.3f\n"
-#: e2fsck/util.c:327
+#: e2fsck/util.c:358
#, c-format
msgid "while reading inode %ld in %s"
msgstr "während des Lesens von Inode %ld in %s"
-#: e2fsck/util.c:340
+#: e2fsck/util.c:371
#, c-format
msgid "while writing inode %ld in %s"
msgstr "während des Schreibens von Inode %ld in %s"
"svwnf]\n"
" [-c blocks_at_once] [-p Durchgänge ] Gerät [letzter_Block [Beginn_count]]\n"
-#: misc/badblocks.c:171 misc/badblocks.c:198
+#: misc/badblocks.c:172 misc/badblocks.c:199
msgid "during seek"
msgstr "during seek"
-#: misc/badblocks.c:178
+#: misc/badblocks.c:179
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr "Merkwürdiger Wert (%ld) in do_read\n"
-#: misc/badblocks.c:219
+#: misc/badblocks.c:220
msgid "during ext2fs_sync_device"
msgstr "während ext2fs_sync_device"
-#: misc/badblocks.c:235 misc/badblocks.c:411
+#: misc/badblocks.c:236 misc/badblocks.c:412
msgid "while beginning bad block list iteration"
msgstr "während des Beginns der Bad-Block-Listen Wiederholung"
-#: misc/badblocks.c:245 misc/badblocks.c:314 misc/badblocks.c:421
+#: misc/badblocks.c:246 misc/badblocks.c:315 misc/badblocks.c:422
msgid "while allocating buffers"
msgstr "während des Resevierens der Puffer"
-#: misc/badblocks.c:250
+#: misc/badblocks.c:251
msgid "Checking for bad blocks in read-only mode\n"
msgstr "Suche nach defekten Blöcken im Nur-Lesen-Modus\n"
-#: misc/badblocks.c:251 misc/badblocks.c:323 misc/badblocks.c:440
+#: misc/badblocks.c:252 misc/badblocks.c:324 misc/badblocks.c:441
#, c-format
msgid "From block %lu to %lu\n"
msgstr "von Block %lu bis %lu\n"
-#: misc/badblocks.c:259
+#: misc/badblocks.c:260
msgid "Checking for bad blocks (read-only test): "
msgstr "Suche nach defekten Blöcken (Nur-Lesen-Modus):"
-#: misc/badblocks.c:322
+#: misc/badblocks.c:323
msgid "Checking for bad blocks in read-write mode\n"
msgstr "Suche nach defekten Blöcken (Lesen+Schreiben-Modus)\n"
-#: misc/badblocks.c:329
+#: misc/badblocks.c:330
#, c-format
msgid "Writing pattern 0x%08x: "
msgstr "Schreibe Muster 0x%08x: "
-#: misc/badblocks.c:343 misc/badblocks.c:368
+#: misc/badblocks.c:344 misc/badblocks.c:369
#, c-format
msgid "during seek on block %d"
msgstr "during seek on block %d"
-#: misc/badblocks.c:355
+#: misc/badblocks.c:356
msgid "Reading and comparing: "
msgstr "Lesen und Vergleichen:"
-#: misc/badblocks.c:428
+#: misc/badblocks.c:429
msgid "Initializing random test data\n"
msgstr "Initialisiere Zufalls-Test-Daten\n"
-#: misc/badblocks.c:439
+#: misc/badblocks.c:440
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr ""
"Suche nach defekten Blöcken im zerstörungsfreien Lesen+Schreiben-Modus\n"
-#: misc/badblocks.c:443
+#: misc/badblocks.c:444
msgid "Checking for bad blocks (non-destructive read-write test): "
msgstr "Suche nach defekten Blöcken (zerstörungsfreier Lesen+Schreiben-Modus):"
-#: misc/badblocks.c:452
+#: misc/badblocks.c:453
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
"\n"
"Interrupt bekommen, räume auf\n"
-#: misc/badblocks.c:509
+#: misc/badblocks.c:510
#, c-format
msgid "during test data write, block %lu"
msgstr "während des Schreibens der Test-Daten; Block %lu"
-#: misc/badblocks.c:619 misc/util.c:140
+#: misc/badblocks.c:620 misc/util.c:140
#, c-format
msgid "%s is mounted; "
msgstr "%s ist eingehängt; "
-#: misc/badblocks.c:621
+#: misc/badblocks.c:622
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr ""
"Badblocks wird trotzdem erzwungen . Ich hoffe /etc/mtab stimmt nicht.\n"
-#: misc/badblocks.c:625
+#: misc/badblocks.c:626
msgid "it's not safe to run badblocks!\n"
msgstr "es ist zu unsicher, Badblocks zu starten!\n"
-#: misc/badblocks.c:668 misc/mke2fs.c:881
+#: misc/badblocks.c:669 misc/mke2fs.c:885
#, c-format
msgid "bad block size - %s"
msgstr "bad block Grösse - %s"
-#: misc/badblocks.c:731
+#: misc/badblocks.c:732
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
"Ich kann die Grösse des Gerätes nicht feststellen.\n"
"Sie müssen sie manuell angeben.\n"
-#: misc/badblocks.c:737
+#: misc/badblocks.c:738
msgid "while trying to determine device size"
msgstr "während des Versuches die Gerätegrösse festzustellen"
-#: misc/badblocks.c:743 misc/mke2fs.c:1054
+#: misc/badblocks.c:744 misc/mke2fs.c:1059
#, c-format
msgid "bad blocks count - %s"
msgstr "bad blocks Anzahl - %s"
-#: misc/badblocks.c:752
+#: misc/badblocks.c:753
#, c-format
msgid "bad starting block - %s"
msgstr "bad starting block - %s"
-#: misc/badblocks.c:758
+#: misc/badblocks.c:759
#, c-format
msgid "bad blocks range: %lu-%lu"
msgstr "bad blocks Bereich: %lu-%lu"
-#: misc/badblocks.c:819
+#: misc/badblocks.c:820
msgid "creating in-memory bad blocks list"
msgstr "erstelle Bad-Block-Liste im Speicher"
-#: misc/badblocks.c:834
+#: misc/badblocks.c:835
msgid "adding to in-memory bad block list"
msgstr "füge zur Bad-Block-Liste im Speicher hinzu"
-#: misc/badblocks.c:858
+#: misc/badblocks.c:859
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr "Durchgang beendet, %u defekte Blöcke gefunden.\n"
"Journal Start: %d\n"
"Journal Nutzeranzahl: %d\n"
-#. Print version number and exit
-#: misc/dumpe2fs.c:312 misc/mke2fs.c:1040
+#: misc/dumpe2fs.c:312 misc/mke2fs.c:1045
#, c-format
msgid "\tUsing %s\n"
msgstr "\tBenutze %s\n"
-#: misc/dumpe2fs.c:339 misc/e2image.c:477 misc/tune2fs.c:721 resize/main.c:200
+#: misc/dumpe2fs.c:339 misc/e2image.c:479 misc/tune2fs.c:731 resize/main.c:200
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Kann keinen gültigen Dateisystem-Superblock finden.\n"
"%s: %s: error reading bitmaps: %s\n"
msgstr "Lesefehler @i %i: %m\n"
+#: misc/e2image.c:50
+#, c-format
+msgid "Usage: %s [-r] device file\n"
+msgstr "Verwendung: %s [-r] Gerätedatei\n"
+
+#: misc/e2image.c:61
+msgid "Couldn't allocate header buffer\n"
+msgstr "Couldn't allocate header buffer\n"
+
+#: misc/e2image.c:80
+#, c-format
+msgid "short write (only %d bytes) forwriting image header"
+msgstr "short write (only %d bytes) forwriting image header"
+
+#: misc/e2image.c:99
+msgid "while writing superblock"
+msgstr "while writing superblock"
+
+#: misc/e2image.c:107
+msgid "while writing inode table"
+msgstr "while writing inode table"
+
+#: misc/e2image.c:114
+msgid "while writing block bitmap"
+msgstr "while writing block bitmap"
+
+#: misc/e2image.c:121
+msgid "while writing inode bitmap"
+msgstr "while writing inode bitmap"
+
#: misc/e2label.c:57
#, c-format
msgid "e2label: cannot open %s\n"
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: Kein ext2 Dateisystem\n"
-#: misc/e2label.c:96 misc/tune2fs.c:828
+#: misc/e2label.c:96 misc/tune2fs.c:838
msgid "Warning: label too long, truncating.\n"
msgstr "Warnung: Name zu lang, kürze ihn.\n"
msgid "e2label: error writing superblock\n"
msgstr "e2label: Schreibfehler Superblock\n"
-#: misc/e2label.c:116 misc/tune2fs.c:427
+#: misc/e2label.c:116 misc/tune2fs.c:426
msgid "Usage: e2label device [newlabel]\n"
msgstr "Verwendung: e2label Gerät [neuer_Name]\n"
-#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
-msgstr "Verwendung: %s [-r] Gerätedatei\n"
-
-#: misc/e2image.c:61
-msgid "Couldn't allocate header buffer\n"
-msgstr "Couldn't allocate header buffer\n"
-
-#: misc/e2image.c:80
-#, c-format
-msgid "short write (only %d bytes) forwriting image header"
-msgstr "short write (only %d bytes) forwriting image header"
-
-#: misc/e2image.c:99
-msgid "while writing superblock"
-msgstr "while writing superblock"
-
-#: misc/e2image.c:107
-msgid "while writing inode table"
-msgstr "while writing inode table"
-
-#: misc/e2image.c:114
-msgid "while writing block bitmap"
-msgstr "while writing block bitmap"
-
-#: misc/e2image.c:121
-msgid "while writing inode bitmap"
-msgstr "while writing inode bitmap"
-
-#: misc/findsuper.c:135
+#: misc/findsuper.c:126
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr "Verwendung: findsuper Gerät [skipbytes [startkb]]\n"
-#: misc/findsuper.c:141
+#: misc/findsuper.c:132
#, c-format
msgid "skiprate should be a number, not %s\n"
msgstr "skiprate sollte eine Zahl sein, nicht %s\n"
-#: misc/findsuper.c:146
+#: misc/findsuper.c:137
msgid "skipbytes must be a multiple of the sector size\n"
msgstr "skipbytes müssen ein vielfaches der Sektorgrösse sein\n"
-#: misc/findsuper.c:152
+#: misc/findsuper.c:143
#, c-format
msgid "startkb should be a number, not %s\n"
msgstr "startkb sollte eine Zahl sein, nicht %s\n"
-#: misc/findsuper.c:156
+#: misc/findsuper.c:147
#, c-format
msgid "startkb should be positive, not %Ld\n"
msgstr "startkb sollte positiv sein, nicht %Ld\n"
-#. Now, go looking for the superblock !
-#: misc/findsuper.c:166
+#: misc/findsuper.c:157
#, c-format
msgid "starting at %Ld, with %d byte increments\n"
msgstr "starting at %Ld, with %d byte increments\n"
-#: misc/findsuper.c:167
+#: misc/findsuper.c:158
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr " thisoff block fs_blk_sz blksz grp last_mount\n"
-#: misc/findsuper.c:213
+#: misc/findsuper.c:204
#, c-format
msgid ""
"\n"
"\n"
"%14Ld: beendet mit errno %d\n"
-#: misc/fsck.c:258
-#, c-format
-msgid "Could not determine filesystem type for %s\n"
-msgstr "Konnte den Dateisystemtype für %s nicht feststellen.\n"
-
-#: misc/fsck.c:278
+#: misc/fsck.c:331
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr "WARNUNG: Konnte nicht öffnen %s: %s\n"
-#: misc/fsck.c:288
+#: misc/fsck.c:341
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr "WARNUNG: falsches Format in Zeile %d von %s\n"
-#: misc/fsck.c:308
+#: misc/fsck.c:356
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
"\tsollten ihre /etc/fstab so schnell wie möglich korrigieren.\n"
"\n"
-#: misc/fsck.c:422
+#: misc/fsck.c:455
#, c-format
msgid "fsck: %s: not found\n"
msgstr "fsck: %s: nicht gefunden\n"
-#: misc/fsck.c:535
+#: misc/fsck.c:568
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr "%s: wait: No more child process?!?\n"
-#: misc/fsck.c:557
+#: misc/fsck.c:590
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr "Warnung... %s für Gerät %s starb mit Signal %d.\n"
-#: misc/fsck.c:563
+#: misc/fsck.c:596
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr "%s %s: Status ist %x, sollte nie vorkommen.\n"
-#: misc/fsck.c:599
+#: misc/fsck.c:632
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "Beendet mit %s (exit status %d)\n"
-#: misc/fsck.c:659
+#: misc/fsck.c:687
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr "%s: Fehler %d bei Ausführung von fsck.%s für %s\n"
-#: misc/fsck.c:680
+#: misc/fsck.c:708
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
"Entweder alle oder kein Dateisystem wird mit -t angegeben;\n"
"wenn nötig, mit vorangestelltem 'no' oder '!'.\n"
-#: misc/fsck.c:699
+#: misc/fsck.c:727
msgid "Couldn't allocate memory for filesystem types\n"
msgstr "Kann keinen Speicher für Dateisystemtypen reservieren.\n"
-#: misc/fsck.c:839
+#: misc/fsck.c:867
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr "fsck: kann %s nicht Überprüfen: fsck.%s nicht gefunden\n"
-#: misc/fsck.c:895
+#: misc/fsck.c:923
msgid "Checking all file systems.\n"
msgstr "Überprüfe alle Dateisysteme.\n"
-#: misc/fsck.c:983
+#: misc/fsck.c:1009
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--warten-- (Durchgang %d)\n"
-#: misc/fsck.c:1003
+#: misc/fsck.c:1029
msgid "Usage: fsck [-ACNPRTV] [-t fstype] [fs-options] [filesys ...]\n"
msgstr ""
"Verwendung: fsck [-ACNPRTV] [-t Datesystemtyp] [fs-Optionen] "
"[Dateisystem...]\n"
-#: misc/fsck.c:1047
+#: misc/fsck.c:1071
#, c-format
msgid "%s: too many devices\n"
msgstr "%s: zu viele Geräte\n"
-#: misc/fsck.c:1057 misc/fsck.c:1126
+#: misc/fsck.c:1104 misc/fsck.c:1173
#, c-format
msgid "%s: too many arguments\n"
msgstr "%s: zu viele Argumente\n"
-#: misc/get_device_by_label.c:443
-#, c-format
-msgid "WARNING: %s: bad UUID\n"
-msgstr "WARNUNG: %s: falscher UUID\n"
-
#: misc/lsattr.c:67
#, c-format
msgid "Usage: %s [-RVadlv] [files...]\n"
"\t[-L volume-label] [-M last-mounted-directory] [-O feature[,...]]\n"
"\t[-r fs-revision] [-R raid_opts] [-qvSV] Gerät [Blockanzahl]\n"
-#: misc/mke2fs.c:228
+#: misc/mke2fs.c:232
#, c-format
msgid "Running command: %s\n"
msgstr "Führe aus: %s\n"
-#: misc/mke2fs.c:232
+#: misc/mke2fs.c:236
#, c-format
msgid "while trying run '%s'"
msgstr "während des Ausführungsversuchs von '%s'"
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:243
msgid "while processing list of bad blocks from program"
msgstr "while processing list of bad blocks from program"
-#: misc/mke2fs.c:265
+#: misc/mke2fs.c:269
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr "Block %d im primären Superblock/Gruppen Descriptorbereich defekt.\n"
-#: misc/mke2fs.c:267
+#: misc/mke2fs.c:271
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr ""
"Die Blöcke %d bis einschliesslich %d müssen i.O. sein um ein Dateisystem zu "
"erstellen.\n"
-#: misc/mke2fs.c:270
+#: misc/mke2fs.c:274
msgid "Aborting....\n"
msgstr "Breche ab...\n"
-#: misc/mke2fs.c:290
+#: misc/mke2fs.c:294
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
"\tdefekte Blöcke.\n"
"\n"
-#: misc/mke2fs.c:308
+#: misc/mke2fs.c:312
msgid "while marking bad blocks as used"
msgstr "während der Kennzeichnung defekter Blöcke als belegt"
-#: misc/mke2fs.c:361
+#: misc/mke2fs.c:365
msgid "done \n"
msgstr "erledigt \n"
-#: misc/mke2fs.c:396
+#: misc/mke2fs.c:400
msgid "while allocating zeroizing buffer"
msgstr "while allocating zeroizing buffer"
-#: misc/mke2fs.c:436
+#: misc/mke2fs.c:440
msgid "Writing inode tables: "
msgstr "Schreibe Inoden-Tabellen: "
-#: misc/mke2fs.c:447
+#: misc/mke2fs.c:451
#, c-format
msgid ""
"\n"
"\n"
"Konnte %d Blöcke nicht in Inoden-Tabelle schreiben beginnend bei %d: %s\n"
-#: misc/mke2fs.c:470
+#: misc/mke2fs.c:474
msgid "while creating root dir"
msgstr "while creating root dir"
-#: misc/mke2fs.c:477
+#: misc/mke2fs.c:481
msgid "while reading root inode"
msgstr "while reading root inode"
-#: misc/mke2fs.c:486
+#: misc/mke2fs.c:490
msgid "while setting root inode ownership"
msgstr "while setting root inode ownership"
-#: misc/mke2fs.c:504
+#: misc/mke2fs.c:508
msgid "while creating /lost+found"
msgstr "while creating /lost+found"
-#: misc/mke2fs.c:511
+#: misc/mke2fs.c:515
msgid "while looking up /lost+found"
msgstr "while looking up /lost+found"
-#: misc/mke2fs.c:521
+#: misc/mke2fs.c:525
msgid "while expanding /lost+found"
msgstr "while expanding /lost+found"
-#: misc/mke2fs.c:537
+#: misc/mke2fs.c:541
msgid "while setting bad block inode"
msgstr "while setting bad block inode"
-#: misc/mke2fs.c:569
+#: misc/mke2fs.c:573
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "Out of memory erasing sectors %d-%d\n"
-#: misc/mke2fs.c:579
+#: misc/mke2fs.c:583
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "Warnung: konnte Block %s nicht lesen\n"
-#: misc/mke2fs.c:595
+#: misc/mke2fs.c:599
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "Warnung: konnte Sektor %d: %s nicht löschen\n"
-#: misc/mke2fs.c:611
+#: misc/mke2fs.c:615
msgid "while initializing journal superblock"
msgstr "while initializing journal superblock"
-#: misc/mke2fs.c:617
+#: misc/mke2fs.c:621
msgid "Zeroing journal device: "
msgstr "Zeroing journal device: "
-#: misc/mke2fs.c:624
+#: misc/mke2fs.c:628
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr "while zeroing journal device (block %u, count %d)"
-#: misc/mke2fs.c:635
+#: misc/mke2fs.c:639
msgid "while writing journal superblock"
msgstr "while writing journal superblock"
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:653
#, c-format
msgid ""
"warning: %d blocks unused.\n"
"Warnung: %d Blöcke unbenutzt.\n"
"\n"
-#: misc/mke2fs.c:654
+#: misc/mke2fs.c:658
#, c-format
msgid "Filesystem label=%s\n"
msgstr "Dateisystem Label=%s\n"
-#: misc/mke2fs.c:655
+#: misc/mke2fs.c:659
msgid "OS type: "
msgstr "OS type: "
-#: misc/mke2fs.c:660
+#: misc/mke2fs.c:664
msgid "(unknown os)"
msgstr "(unbekanntes OS)"
-#: misc/mke2fs.c:663
+#: misc/mke2fs.c:667
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Blockgrösse=%u (log=%u)\n"
-#: misc/mke2fs.c:665
+#: misc/mke2fs.c:669
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Fragmentgrösse=%u (log=%u)\n"
-#: misc/mke2fs.c:667
+#: misc/mke2fs.c:671
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u Inoden, %u Blöcke\n"
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:673
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u Blöcke (%2.2f%%) reserviert für den Superuser\n"
-#: misc/mke2fs.c:672
+#: misc/mke2fs.c:676
#, c-format
msgid "First data block=%u\n"
msgstr "erster Datenblock=%u\n"
-#: misc/mke2fs.c:674
+#: misc/mke2fs.c:678
#, c-format
msgid "%u block groups\n"
msgstr "%u block groups\n"
-#: misc/mke2fs.c:676
+#: misc/mke2fs.c:680
#, c-format
msgid "%u block group\n"
msgstr "%u block group\n"
-#: misc/mke2fs.c:677
+#: misc/mke2fs.c:681
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "%u Blöcke pro Gruppe, %u Fragmente pro Gruppe\n"
-#: misc/mke2fs.c:679
+#: misc/mke2fs.c:683
#, c-format
msgid "%u inodes per group\n"
msgstr "%u Inoden pro Gruppe\n"
-#: misc/mke2fs.c:686
+#: misc/mke2fs.c:690
msgid "Superblock backups stored on blocks: "
msgstr "Superblock Sicherungskopien gespeichert in den Blöcken: "
-#: misc/mke2fs.c:736
+#: misc/mke2fs.c:740
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr "Couldn't allocate memory to parse raid options!\n"
-#: misc/mke2fs.c:761
+#: misc/mke2fs.c:765
msgid "Invalid stride parameter.\n"
msgstr "Invalid stride parameter.\n"
-#: misc/mke2fs.c:769
+#: misc/mke2fs.c:773
msgid ""
"\n"
"Bad raid options specified.\n"
"\tstride=<stride length in blocks>\n"
"\n"
-#: misc/mke2fs.c:885
+#: misc/mke2fs.c:889
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Warnung: Blockgrösse %d ist auf den meisten Systemen unbrauchbar.\n"
-#: misc/mke2fs.c:901
+#: misc/mke2fs.c:906
#, c-format
msgid "bad fragment size - %s"
msgstr "falsche Fragmentgrösse size - %s"
-#: misc/mke2fs.c:907
+#: misc/mke2fs.c:912
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Warnung: Fragmente werden nicht unterstützt. Ignoriere -F Option\n"
-#: misc/mke2fs.c:914
+#: misc/mke2fs.c:919
msgid "Illegal number for blocks per group"
msgstr "unzulässige Angabe für Blöcke pro Gruppe"
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:924
msgid "blocks per group must be multiple of 8"
msgstr "Anzahl der Blöcke pro Gruppe muss ein Vielfaches von 8 sein"
-#: misc/mke2fs.c:929
+#: misc/mke2fs.c:934
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr "bad inode ratio %s (min %d/max %d"
-#: misc/mke2fs.c:948
+#: misc/mke2fs.c:953
msgid "in malloc for bad_blocks_filename"
msgstr "in malloc for bad_blocks_filename"
-#: misc/mke2fs.c:957
+#: misc/mke2fs.c:962
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr "bad reserved blocks percent - %s"
-#: misc/mke2fs.c:989
+#: misc/mke2fs.c:994
#, c-format
msgid "bad inode size - %s"
msgstr "bad inode size - %s"
-#: misc/mke2fs.c:1025 misc/tune2fs.c:287
+#: misc/mke2fs.c:1030 misc/tune2fs.c:286
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Unvollständige Dateisystem-Option gesetzt: %s\n"
-#: misc/mke2fs.c:1078 misc/mke2fs.c:1379
+#: misc/mke2fs.c:1087 misc/mke2fs.c:1396
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "while trying to open journal device %s\n"
-#: misc/mke2fs.c:1091
+#: misc/mke2fs.c:1093
+#, c-format
+msgid "Journal dev blocksize (%d) smaller thanminimum blocksize %d\n"
+msgstr ""
+
+#: misc/mke2fs.c:1107
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "%d-byte Blöcke zu gross für's System (max %d)"
-#: misc/mke2fs.c:1095
+#: misc/mke2fs.c:1111
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr "Warnung:%d-byte Blöcke zu gross für's System (max %d), erzwinge sie\n"
-#: misc/mke2fs.c:1115
+#: misc/mke2fs.c:1131
msgid "filesystem"
msgstr "Dateisystem"
-#: misc/mke2fs.c:1128 resize/main.c:222
+#: misc/mke2fs.c:1144 resize/main.c:222
msgid "while trying to determine filesystem size"
msgstr "while trying to determine filesystem size"
-#: misc/mke2fs.c:1134
+#: misc/mke2fs.c:1150
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
"Konnte die Gerätegrösse nicht feststellen, geben\n"
"sie die Grösse des Dateisystems an\n"
-#: misc/mke2fs.c:1141
+#: misc/mke2fs.c:1157
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
"gezwungen\n"
"\tsein, neu zu booten, um die Partitionstabelle neu einzulesen.\n"
-#: misc/mke2fs.c:1156
-msgid "Filesystem larger than apparent filesystem size."
+#: misc/mke2fs.c:1172
+#, fuzzy
+msgid "Filesystem larger than apparent device size."
msgstr "Das Dateisystem ist grösser als es den Anschein hat."
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1197
msgid "blocks per group count out of range"
msgstr "blocks per group count out of range"
-#: misc/mke2fs.c:1190
+#: misc/mke2fs.c:1207
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr "bad inode size %d (min %d/max %d)"
-#: misc/mke2fs.c:1196
+#: misc/mke2fs.c:1213
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr "Warning: %d-Byte Inoden meist zu gross für's System\n"
-#: misc/mke2fs.c:1238
+#: misc/mke2fs.c:1255
msgid "while setting up superblock"
msgstr "while setting up superblock"
-#: misc/mke2fs.c:1272
+#: misc/mke2fs.c:1289
#, c-format
msgid "unknown os - %s"
msgstr "unbekanntes OS - %s"
-#: misc/mke2fs.c:1326
+#: misc/mke2fs.c:1343
msgid "while trying to allocate filesystem tables"
msgstr "while trying to allocate filesystem tables"
-#: misc/mke2fs.c:1357
+#: misc/mke2fs.c:1374
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "while zeroing block %u at end of filesystem"
-#: misc/mke2fs.c:1372 misc/tune2fs.c:370
+#: misc/mke2fs.c:1389 misc/tune2fs.c:369
msgid "journal"
msgstr "Journal"
-#: misc/mke2fs.c:1384
+#: misc/mke2fs.c:1401
#, c-format
msgid "Adding journal to device %s: "
msgstr "Adding journal to device %s: "
-#: misc/mke2fs.c:1391
+#: misc/mke2fs.c:1408
#, c-format
msgid ""
"\n"
"\n"
"\twhile trying to add journal to device %s"
-#: misc/mke2fs.c:1396 misc/mke2fs.c:1420 misc/tune2fs.c:392 misc/tune2fs.c:406
+#: misc/mke2fs.c:1413 misc/mke2fs.c:1437 misc/tune2fs.c:391 misc/tune2fs.c:405
msgid "done\n"
msgstr "erledigt\n"
-#: misc/mke2fs.c:1408
+#: misc/mke2fs.c:1425
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Creating journal (%d blocks): "
-#: misc/mke2fs.c:1416
+#: misc/mke2fs.c:1433
msgid ""
"\n"
"\twhile trying to create journal"
"\n"
"\twhile trying to create journal"
-#: misc/mke2fs.c:1425
+#: misc/mke2fs.c:1442
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Writing superblocks and filesystem accounting information: "
-#: misc/mke2fs.c:1430
+#: misc/mke2fs.c:1447
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
"\n"
"Warnung: Habe Schwierigkeiten die Superblöcke auf das Gerät zu schreiben."
-#: misc/mke2fs.c:1433
+#: misc/mke2fs.c:1450
msgid ""
"done\n"
"\n"
msgid "Journal NOT removed\n"
msgstr "Journal NOT removed\n"
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:189
msgid "Journal removed\n"
msgstr "Journal removed\n"
-#: misc/tune2fs.c:221
+#: misc/tune2fs.c:220
msgid "while reading journal inode"
msgstr "while reading journal inode"
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:227
msgid "while reading bitmaps"
msgstr "while reading bitmaps"
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:234
msgid "while clearing journal inode"
msgstr "while clearing journal inode"
-#: misc/tune2fs.c:246
+#: misc/tune2fs.c:245
msgid "while writing journal inode"
msgstr "while writing journal inode"
-#: misc/tune2fs.c:261
+#: misc/tune2fs.c:260
#, fuzzy, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Unvollständige Dateisystem-Option gesetzt: %s\n"
-#: misc/tune2fs.c:303
+#: misc/tune2fs.c:302
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
"Die has_jounal flag kann nur gelöscht werden, wenn das Dateisystem\n"
"nicht eingehängt oder im Nur-Lesen-Modus ist.\n"
-#: misc/tune2fs.c:312
+#: misc/tune2fs.c:311
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
"Die needs_recovery Flag ist gesetzt. Bitte starten sie e2fsck vor\n"
"der Löschung der has_journal Flag.\n"
-#: misc/tune2fs.c:365
+#: misc/tune2fs.c:364
msgid "The filesystem already has a journal.\n"
msgstr "Das Dateisystem hat schon ein Journal.\n"
-#: misc/tune2fs.c:376
+#: misc/tune2fs.c:375
#, c-format
msgid ""
"\n"
"\n"
"\twhile trying to open journal on %s\n"
-#: misc/tune2fs.c:380
+#: misc/tune2fs.c:379
#, c-format
msgid "Creating journal on device %s: "
msgstr "Creating journal on device %s: "
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:387
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "while adding filesystem to journal on %s"
-#: misc/tune2fs.c:394
+#: misc/tune2fs.c:393
msgid "Creating journal inode: "
msgstr "Creating journal inode: "
-#: misc/tune2fs.c:403
+#: misc/tune2fs.c:402
msgid ""
"\n"
"\twhile trying to create journal file"
"\n"
"\twhile trying to create journal file"
-#: misc/tune2fs.c:450
+#: misc/tune2fs.c:460
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Couldn't parse date/time specifier: %s"
-#: misc/tune2fs.c:472 misc/tune2fs.c:485
+#: misc/tune2fs.c:482 misc/tune2fs.c:495
#, c-format
msgid "bad mounts count - %s"
msgstr "bad mounts count - %s"
-#: misc/tune2fs.c:501
+#: misc/tune2fs.c:511
#, c-format
msgid "bad error behavior - %s"
msgstr "bad error behavior - %s"
-#: misc/tune2fs.c:524
+#: misc/tune2fs.c:534
#, c-format
msgid "bad gid/group name - %s"
msgstr "bad gid/group name - %s"
-#: misc/tune2fs.c:557
+#: misc/tune2fs.c:567
#, c-format
msgid "bad interval - %s"
msgstr "bad interval - %s"
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:595
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "bad reserved block ratio - %s"
-#: misc/tune2fs.c:600
+#: misc/tune2fs.c:610
#, fuzzy
msgid "-o may only be specified once"
msgstr "-O darf nur eimal angegeben werden"
-#: misc/tune2fs.c:610
+#: misc/tune2fs.c:620
msgid "-O may only be specified once"
msgstr "-O darf nur eimal angegeben werden"
-#: misc/tune2fs.c:620
+#: misc/tune2fs.c:630
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "bad reserved blocks count - %s"
-#: misc/tune2fs.c:649
+#: misc/tune2fs.c:659
#, c-format
msgid "bad uid/user name - %s"
msgstr "bad uid/user name - %s"
-#: misc/tune2fs.c:744
+#: misc/tune2fs.c:754
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Setting maximal mount count to %d\n"
-#: misc/tune2fs.c:750
+#: misc/tune2fs.c:760
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Setting current mount count to %d\n"
-#: misc/tune2fs.c:755
+#: misc/tune2fs.c:765
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Setting error behavior to %d\n"
-#: misc/tune2fs.c:760
+#: misc/tune2fs.c:770
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Setting reserved blocks gid to %lu\n"
-#: misc/tune2fs.c:765
+#: misc/tune2fs.c:775
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr "Setting interval between check %lu seconds\n"
-#: misc/tune2fs.c:771
+#: misc/tune2fs.c:781
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr "Setting reserved blocks percentage to %lu (%u blocks)\n"
-#: misc/tune2fs.c:777
+#: misc/tune2fs.c:787
#, c-format
msgid "reserved blocks count is too big (%ul)"
msgstr "reserved blocks count is too big (%ul)"
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:793
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Setting reserved blocks count to %lu\n"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:799
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
"\n"
"The filesystem already has sparse superblocks.\n"
-#: misc/tune2fs.c:796
+#: misc/tune2fs.c:806
#, c-format
msgid ""
"\n"
"\n"
"Sparse superblock flag set. %s"
-#: misc/tune2fs.c:803
+#: misc/tune2fs.c:813
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
"\n"
"The filesystem already has sparse superblocks disabled.\n"
-#: misc/tune2fs.c:811
+#: misc/tune2fs.c:821
#, c-format
msgid ""
"\n"
"\n"
"Sparse superblock flag cleared. %s"
-#: misc/tune2fs.c:818
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Setting time filesystem last checked to %s\n"
-#: misc/tune2fs.c:824
+#: misc/tune2fs.c:834
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Setting reserved blocks uid to %lu\n"
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:867
msgid "Invalid UUID format\n"
msgstr "Invalid UUID format\n"
-#: misc/uuidgen.c:30
-#, c-format
-msgid "Usage: %s [-r] [-t]\n"
-msgstr "Verwendung: %s [-r] [-t]\n"
-
#: misc/util.c:72
msgid "Proceed anyway? (y,n) "
msgstr "Trotzdem fortsetzen? (y,n) "
"Das Dateisystem wird automatisch alle %d mounts bzw. %g Tagen überprüft,\n"
" jenachdem was zuerst eintritt. Veränderbar mit tune2fs -c oder -t .\n"
+#: misc/uuidgen.c:30
+#, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Verwendung: %s [-r] [-t]\n"
+
+#: resize/extent.c:197
+msgid "# Extent dump:\n"
+msgstr "# Extent dump:\n"
+
+#: resize/extent.c:198
+#, c-format
+msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
+msgstr "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
+
+#: resize/extent.c:201
+#, c-format
+msgid "#\t\t %u -> %u (%d)\n"
+msgstr "#\t\t %u -> %u (%d)\n"
+
#: resize/main.c:32
#, c-format
msgid ""
msgid "blocks to be moved"
msgstr "blocks to be moved"
-#: resize/resize2fs.c:808
+#: resize/resize2fs.c:811
msgid "Going into desperation mode for block allocations\n"
msgstr "Going into desperation mode for block allocations\n"
-#: resize/resize2fs.c:901
+#: resize/resize2fs.c:904
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr "Moving %d blocks %u->%u\n"
-#: resize/resize2fs.c:971
+#: resize/resize2fs.c:974
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr "ino=%u, blockcnt=%lld, %u->%u\n"
-#: resize/resize2fs.c:1139
+#: resize/resize2fs.c:1142
#, c-format
msgid "Inode moved %u->%u\n"
msgstr "Inode moved %u->%u\n"
-#: resize/resize2fs.c:1204
+#: resize/resize2fs.c:1207
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
-#: resize/resize2fs.c:1330
+#: resize/resize2fs.c:1333
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr "Itable move group %d block %u->%u (diff %d)\n"
-#: resize/resize2fs.c:1356
+#: resize/resize2fs.c:1359
#, c-format
msgid "%d blocks of zeros...\n"
msgstr "%d blocks of zeros...\n"
-#: resize/resize2fs.c:1391
+#: resize/resize2fs.c:1394
msgid "Inode table move finished.\n"
msgstr "Inode table move finished.\n"
-#: resize/extent.c:197
-msgid "# Extent dump:\n"
-msgstr "# Extent dump:\n"
+#~ msgid "Couldn't allocate memory to parse extended options!\n"
+#~ msgstr "Couldn't allocate memory to parse extended options!\n"
-#: resize/extent.c:198
-#, c-format
-msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
-msgstr "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
+#~ msgid "Could not determine filesystem type for %s\n"
+#~ msgstr "Konnte den Dateisystemtype für %s nicht feststellen.\n"
-#: resize/extent.c:201
-#, c-format
-msgid "#\t\t %u -> %u (%d)\n"
-msgstr "#\t\t %u -> %u (%d)\n"
+#~ msgid "WARNING: %s: bad UUID\n"
+#~ msgstr "WARNUNG: %s: falscher UUID\n"
#~ msgid "while trying to read the bitmaps"
#~ msgstr "while trying to read the bitmaps"
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR Theodore Tso
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-11-09 11:58-0500\n"
+"POT-Creation-Date: 2003-05-03 14:59-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:187
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:191
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr ""
msgid "while reading the bad blocks inode"
msgstr ""
-#: e2fsck/badblocks.c:71 e2fsck/iscan.c:110 e2fsck/scantest.c:107
-#: e2fsck/unix.c:853 e2fsck/unix.c:885 misc/badblocks.c:771
-#: misc/badblocks.c:782 misc/badblocks.c:796 misc/badblocks.c:808
-#: misc/dumpe2fs.c:337 misc/e2image.c:475 misc/e2image.c:491 misc/mke2fs.c:203
-#: misc/tune2fs.c:718 resize/main.c:198
+#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
+#: e2fsck/unix.c:869 e2fsck/unix.c:901 misc/badblocks.c:772
+#: misc/badblocks.c:783 misc/badblocks.c:797 misc/badblocks.c:809
+#: misc/dumpe2fs.c:337 misc/e2image.c:477 misc/e2image.c:493 misc/mke2fs.c:207
+#: misc/tune2fs.c:728 resize/main.c:198
#, c-format
msgid "while trying to open %s"
msgstr ""
msgid "while trying popen '%s'"
msgstr ""
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:210
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:214
msgid "while reading in list of bad blocks from file"
msgstr ""
msgid "empty dir map"
msgstr ""
-#. Inode number 11 is usually lost+found
#: e2fsck/emptydir.c:97
#, c-format
msgid "Empty directory block %d (#%d) in inode %d\n"
msgid "Couldn't allocate block buffer (size=%d)\n"
msgstr ""
-#: e2fsck/flushb.c:44
+#: e2fsck/flushb.c:34
#, c-format
msgid "Usage: %s disk\n"
msgstr ""
-#: e2fsck/flushb.c:73
+#: e2fsck/flushb.c:63
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr ""
-#: e2fsck/iscan.c:44
+#: e2fsck/iscan.c:46
#, c-format
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr ""
-#: e2fsck/iscan.c:81 e2fsck/unix.c:673 resize/main.c:175
+#: e2fsck/iscan.c:83 e2fsck/unix.c:689 resize/main.c:175
#, c-format
msgid "while opening %s for flushing"
msgstr ""
-#: e2fsck/iscan.c:86 e2fsck/unix.c:679 resize/main.c:182
+#: e2fsck/iscan.c:88 e2fsck/unix.c:695 resize/main.c:182
#, c-format
msgid "while trying to flush %s"
msgstr ""
-#: e2fsck/iscan.c:119 e2fsck/scantest.c:114 misc/e2image.c:377
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:377
msgid "while opening inode scan"
msgstr ""
-#: e2fsck/iscan.c:127 misc/e2image.c:395
+#: e2fsck/iscan.c:129 misc/e2image.c:395
msgid "while getting next inode"
msgstr ""
-#: e2fsck/iscan.c:136
+#: e2fsck/iscan.c:138
#, c-format
msgid "%d inodes scanned.\n"
msgstr ""
-#: e2fsck/journal.c:418
+#: e2fsck/journal.c:420
msgid "reading journal superblock\n"
msgstr ""
-#: e2fsck/journal.c:475
+#: e2fsck/journal.c:477
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr ""
-#: e2fsck/journal.c:484
+#: e2fsck/journal.c:486
#, c-format
msgid "%s: journal too short\n"
msgstr ""
-#: e2fsck/journal.c:756
+#: e2fsck/journal.c:758
#, c-format
msgid "%s: recovering journal\n"
msgstr ""
-#: e2fsck/journal.c:758
+#: e2fsck/journal.c:760
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr ""
-#: e2fsck/journal.c:779
+#: e2fsck/journal.c:781
#, c-format
msgid "while trying to re-open %s"
msgstr ""
msgid "<The NULL inode>"
msgstr ""
-#. 0
#: e2fsck/message.c:143
msgid "<The bad blocks inode>"
msgstr ""
-#. 1
-#. 2
#: e2fsck/message.c:145
msgid "<The ACL index inode>"
msgstr ""
-#. 3
#: e2fsck/message.c:146
msgid "<The ACL data inode>"
msgstr ""
-#. 4
#: e2fsck/message.c:147
msgid "<The boot loader inode>"
msgstr ""
-#. 5
#: e2fsck/message.c:148
msgid "<The undelete directory inode>"
msgstr ""
-#. 6
#: e2fsck/message.c:149
msgid "<The group descriptor inode>"
msgstr ""
-#. 7
#: e2fsck/message.c:150
msgid "<The journal inode>"
msgstr ""
-#. 8
#: e2fsck/message.c:151
msgid "<Reserved inode 9>"
msgstr ""
-#. 9
#: e2fsck/message.c:152
msgid "<Reserved inode 10>"
msgstr ""
msgid "returned from clone_file_block"
msgstr ""
-#.
-#. * Allocate bitmaps structures
-#.
-#: e2fsck/pass1.c:311
+#: e2fsck/pass1.c:296
msgid "in-use inode map"
msgstr ""
-#: e2fsck/pass1.c:320
+#: e2fsck/pass1.c:305
msgid "directory inode map"
msgstr ""
-#: e2fsck/pass1.c:328
+#: e2fsck/pass1.c:313
msgid "regular file inode map"
msgstr ""
-#: e2fsck/pass1.c:335
+#: e2fsck/pass1.c:320
msgid "in-use block map"
msgstr ""
-#: e2fsck/pass1.c:382
+#: e2fsck/pass1.c:367
msgid "doing inode scan"
msgstr ""
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:736
msgid "Pass 1"
msgstr ""
-#: e2fsck/pass1.c:809
+#: e2fsck/pass1.c:794
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr ""
-#: e2fsck/pass1.c:851
+#: e2fsck/pass1.c:836
msgid "bad inode map"
msgstr ""
-#: e2fsck/pass1.c:873
+#: e2fsck/pass1.c:858
msgid "inode in bad block map"
msgstr ""
-#: e2fsck/pass1.c:893
+#: e2fsck/pass1.c:878
msgid "imagic inode map"
msgstr ""
-#: e2fsck/pass1.c:920
+#: e2fsck/pass1.c:905
msgid "multiply claimed block map"
msgstr ""
-#: e2fsck/pass1.c:1019
+#: e2fsck/pass1.c:1004
msgid "ext attr block map"
msgstr ""
-#: e2fsck/pass1.c:1775
+#: e2fsck/pass1.c:1760
msgid "block bitmap"
msgstr ""
-#: e2fsck/pass1.c:1779
+#: e2fsck/pass1.c:1764
msgid "inode bitmap"
msgstr ""
-#: e2fsck/pass1.c:1783
+#: e2fsck/pass1.c:1768
msgid "inode table"
msgstr ""
-#: e2fsck/pass2.c:290
+#: e2fsck/pass2.c:291
msgid "Pass 2"
msgstr ""
-#.
-#. * Allocate some bitmaps to do loop detection.
-#.
-#: e2fsck/pass3.c:80
+#: e2fsck/pass3.c:79
msgid "inode done bitmap"
msgstr ""
-#: e2fsck/pass3.c:91
+#: e2fsck/pass3.c:90
msgid "Peak memory"
msgstr ""
-#: e2fsck/pass3.c:144
+#: e2fsck/pass3.c:143
msgid "Pass 3"
msgstr ""
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:333
msgid "inode loop detection bitmap"
msgstr ""
msgid "(no prompt)"
msgstr ""
-#. 0
#: e2fsck/problem.c:50
msgid "Fix"
msgstr ""
-#. 1
#: e2fsck/problem.c:51
msgid "Clear"
msgstr ""
-#. 2
#: e2fsck/problem.c:52
msgid "Relocate"
msgstr ""
-#. 3
#: e2fsck/problem.c:53
msgid "Allocate"
msgstr ""
-#. 4
#: e2fsck/problem.c:54
msgid "Expand"
msgstr ""
-#. 5
#: e2fsck/problem.c:55
msgid "Connect to /lost+found"
msgstr ""
-#. 6
#: e2fsck/problem.c:56
msgid "Create"
msgstr ""
-#. 7
#: e2fsck/problem.c:57
msgid "Salvage"
msgstr ""
-#. 8
#: e2fsck/problem.c:58
msgid "Truncate"
msgstr ""
-#. 9
#: e2fsck/problem.c:59
msgid "Clear inode"
msgstr ""
-#. 10
#: e2fsck/problem.c:60
msgid "Abort"
msgstr ""
-#. 11
#: e2fsck/problem.c:61
msgid "Split"
msgstr ""
-#. 12
#: e2fsck/problem.c:62
msgid "Continue"
msgstr ""
-#. 13
#: e2fsck/problem.c:63
msgid "Clone duplicate/bad blocks"
msgstr ""
-#. 14
#: e2fsck/problem.c:64
msgid "Delete file"
msgstr ""
-#. 15
#: e2fsck/problem.c:65
msgid "Suppress messages"
msgstr ""
-#. 16
#: e2fsck/problem.c:66
msgid "Unlink"
msgstr ""
-#. 17
#: e2fsck/problem.c:67
msgid "Clear HTree index"
msgstr ""
msgid "(NONE)"
msgstr ""
-#. 0
#: e2fsck/problem.c:77
msgid "FIXED"
msgstr ""
-#. 1
#: e2fsck/problem.c:78
msgid "CLEARED"
msgstr ""
-#. 2
#: e2fsck/problem.c:79
msgid "RELOCATED"
msgstr ""
-#. 3
#: e2fsck/problem.c:80
msgid "ALLOCATED"
msgstr ""
-#. 4
#: e2fsck/problem.c:81
msgid "EXPANDED"
msgstr ""
-#. 5
#: e2fsck/problem.c:82
msgid "RECONNECTED"
msgstr ""
-#. 6
#: e2fsck/problem.c:83
msgid "CREATED"
msgstr ""
-#. 7
#: e2fsck/problem.c:84
msgid "SALVAGED"
msgstr ""
-#. 8
#: e2fsck/problem.c:85
msgid "TRUNCATED"
msgstr ""
-#. 9
#: e2fsck/problem.c:86
msgid "INODE CLEARED"
msgstr ""
-#. 10
#: e2fsck/problem.c:87
msgid "ABORTED"
msgstr ""
-#. 11
#: e2fsck/problem.c:88
msgid "SPLIT"
msgstr ""
-#. 12
#: e2fsck/problem.c:89
msgid "CONTINUING"
msgstr ""
-#. 13
#: e2fsck/problem.c:90
msgid "DUPLICATE/BAD BLOCKS CLONED"
msgstr ""
-#. 14
#: e2fsck/problem.c:91
msgid "FILE DELETED"
msgstr ""
-#. 15
#: e2fsck/problem.c:92
msgid "SUPPRESSED"
msgstr ""
-#. 16
#: e2fsck/problem.c:93
msgid "UNLINKED"
msgstr ""
-#. 17
#: e2fsck/problem.c:94
msgid "HTREE INDEX CLEARED"
msgstr ""
-#. Pre-Pass 1 errors
-#. Block bitmap not in group
#: e2fsck/problem.c:103
msgid "@b @B for @g %g is not in @g. (@b %b)\n"
msgstr ""
-#. Inode bitmap not in group
#: e2fsck/problem.c:107
msgid "@i @B for @g %g is not in @g. (@b %b)\n"
msgstr ""
msgid "Pass 1: Checking @is, @bs, and sizes\n"
msgstr ""
-#. Root directory is not an inode
#: e2fsck/problem.c:320
msgid "@r is not a @d. "
msgstr ""
msgid "@E is duplicate '..' @e.\n"
msgstr ""
-#: e2fsck/problem.c:938 e2fsck/problem.c:1204
+#: e2fsck/problem.c:938 e2fsck/problem.c:1219
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr ""
msgid "@p @h %d: node (%B) has bad depth\n"
msgstr ""
-#: e2fsck/problem.c:1094
+#: e2fsck/problem.c:1092
+msgid "Duplicate @E found. "
+msgstr ""
+
+#: e2fsck/problem.c:1097
+#, c-format
+msgid ""
+"@E has a non-unique filename.\n"
+"Rename to %s"
+msgstr ""
+
+#: e2fsck/problem.c:1102
+msgid ""
+"Duplicate @e '%Dn' found.\n"
+"\tMarking %p (%i) to be rebuilt.\n"
+"\n"
+msgstr ""
+
+#: e2fsck/problem.c:1109
msgid "Pass 3: Checking @d connectivity\n"
msgstr ""
-#: e2fsck/problem.c:1099
+#: e2fsck/problem.c:1114
msgid "@r not allocated. "
msgstr ""
-#: e2fsck/problem.c:1104
+#: e2fsck/problem.c:1119
msgid "No room in @l @d. "
msgstr ""
-#: e2fsck/problem.c:1109
+#: e2fsck/problem.c:1124
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr ""
-#: e2fsck/problem.c:1114
+#: e2fsck/problem.c:1129
msgid "/@l not found. "
msgstr ""
-#: e2fsck/problem.c:1119
+#: e2fsck/problem.c:1134
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr ""
-#: e2fsck/problem.c:1124
+#: e2fsck/problem.c:1139
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr ""
-#: e2fsck/problem.c:1129
+#: e2fsck/problem.c:1144
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr ""
-#: e2fsck/problem.c:1134
+#: e2fsck/problem.c:1149
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr ""
-#: e2fsck/problem.c:1139
+#: e2fsck/problem.c:1154
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr ""
-#: e2fsck/problem.c:1144
+#: e2fsck/problem.c:1159
#, c-format
msgid "ext2fs_new_@b: %m while trying to create /@l @d\n"
msgstr ""
-#: e2fsck/problem.c:1149
+#: e2fsck/problem.c:1164
#, c-format
msgid "ext2fs_new_@i: %m while trying to create /@l @d\n"
msgstr ""
-#: e2fsck/problem.c:1154
+#: e2fsck/problem.c:1169
#, c-format
msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n"
msgstr ""
-#: e2fsck/problem.c:1159
+#: e2fsck/problem.c:1174
#, c-format
msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
msgstr ""
-#: e2fsck/problem.c:1164
+#: e2fsck/problem.c:1179
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr ""
-#: e2fsck/problem.c:1169
+#: e2fsck/problem.c:1184
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
"\n"
msgstr ""
-#: e2fsck/problem.c:1174
+#: e2fsck/problem.c:1189
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d entry\n"
"\n"
msgstr ""
-#: e2fsck/problem.c:1179
+#: e2fsck/problem.c:1194
msgid "@A @i @B (%N): %m\n"
msgstr ""
-#: e2fsck/problem.c:1184
+#: e2fsck/problem.c:1199
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1189
+#: e2fsck/problem.c:1204
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1194
+#: e2fsck/problem.c:1209
msgid "@r is not a @d; aborting.\n"
msgstr ""
-#: e2fsck/problem.c:1199
+#: e2fsck/problem.c:1214
msgid "Cannot proceed without a @r.\n"
msgstr ""
-#: e2fsck/problem.c:1209
+#: e2fsck/problem.c:1224
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr ""
-#: e2fsck/problem.c:1216
+#: e2fsck/problem.c:1231
msgid "Pass 3A: Optimizing directories\n"
msgstr ""
-#: e2fsck/problem.c:1221
+#: e2fsck/problem.c:1236
#, c-format
msgid "Failed to create dirs_to_hash iterator: %m"
msgstr ""
-#: e2fsck/problem.c:1226
+#: e2fsck/problem.c:1241
msgid "Failed to optimize directory %q (%d): %m"
msgstr ""
-#: e2fsck/problem.c:1231
+#: e2fsck/problem.c:1246
msgid "Optimizing directories: "
msgstr ""
-#: e2fsck/problem.c:1248
+#: e2fsck/problem.c:1263
msgid "Pass 4: Checking reference counts\n"
msgstr ""
-#: e2fsck/problem.c:1263
+#: e2fsck/problem.c:1278
msgid "@i %i ref count is %Il, @s %N. "
msgstr ""
-#: e2fsck/problem.c:1267
+#: e2fsck/problem.c:1282
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
"@i_link_info[%i] is %N, @i.i_links_count is %Il. They should be the same!\n"
msgstr ""
-#: e2fsck/problem.c:1277
+#: e2fsck/problem.c:1292
msgid "Pass 5: Checking @g summary information\n"
msgstr ""
-#: e2fsck/problem.c:1282
+#: e2fsck/problem.c:1297
msgid "Padding at end of @i @B is not set. "
msgstr ""
-#: e2fsck/problem.c:1287
+#: e2fsck/problem.c:1302
msgid "Padding at end of @b @B is not set. "
msgstr ""
-#: e2fsck/problem.c:1292
+#: e2fsck/problem.c:1307
msgid "@b @B differences: "
msgstr ""
-#: e2fsck/problem.c:1312
+#: e2fsck/problem.c:1327
msgid "@i @B differences: "
msgstr ""
-#: e2fsck/problem.c:1332
+#: e2fsck/problem.c:1347
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1337
+#: e2fsck/problem.c:1352
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1342
+#: e2fsck/problem.c:1357
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1347
+#: e2fsck/problem.c:1362
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr ""
-#: e2fsck/problem.c:1352
+#: e2fsck/problem.c:1367
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr ""
-#: e2fsck/problem.c:1357
+#: e2fsck/problem.c:1372
msgid ""
"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
"endpoints (%i, %j)\n"
msgstr ""
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1378
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr ""
-#: e2fsck/problem.c:1497
+#: e2fsck/problem.c:1512
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr ""
-#: e2fsck/problem.c:1569
+#: e2fsck/problem.c:1584
msgid "IGNORED"
msgstr ""
-#: e2fsck/scantest.c:79
+#: e2fsck/scantest.c:81
#, c-format
msgid "Memory used: %d, elapsed time: %6.3f/%6.3f/%6.3f\n"
msgstr ""
-#: e2fsck/scantest.c:98
+#: e2fsck/scantest.c:100
#, c-format
msgid "size of inode=%d\n"
msgstr ""
-#: e2fsck/scantest.c:119
+#: e2fsck/scantest.c:121
msgid "while starting inode scan"
msgstr ""
-#: e2fsck/scantest.c:130
+#: e2fsck/scantest.c:132
msgid "while doing inode scan"
msgstr ""
msgid "Byte swap"
msgstr ""
-#: e2fsck/unix.c:63
+#: e2fsck/unix.c:67
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
"\t\t[-E extended-options] device\n"
msgstr ""
-#: e2fsck/unix.c:69
+#: e2fsck/unix.c:73
msgid ""
"\n"
"Emergency help:\n"
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
-#: e2fsck/unix.c:75
+#: e2fsck/unix.c:79
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
" -L bad_blocks_file Set badblocks list\n"
msgstr ""
-#: e2fsck/unix.c:109
+#: e2fsck/unix.c:113
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr ""
-#: e2fsck/unix.c:124
+#: e2fsck/unix.c:128
#, c-format
msgid ""
"\n"
"%8d inodes used (%d%%)\n"
msgstr ""
-#: e2fsck/unix.c:126
+#: e2fsck/unix.c:130
#, c-format
msgid "%8d non-contiguous inodes (%0d.%d%%)\n"
msgstr ""
-#: e2fsck/unix.c:128
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr ""
-#: e2fsck/unix.c:130
+#: e2fsck/unix.c:134
#, c-format
msgid ""
"%8d blocks used (%d%%)\n"
"%8d bad blocks\n"
msgstr ""
-#: e2fsck/unix.c:134
+#: e2fsck/unix.c:138
#, c-format
msgid "%8d large files\n"
msgstr ""
-#: e2fsck/unix.c:135
+#: e2fsck/unix.c:139
#, c-format
msgid ""
"\n"
"%8d files\n"
msgstr ""
-#: e2fsck/unix.c:168
+#: e2fsck/unix.c:172
#, c-format
msgid "%8d large file%s\n"
msgstr ""
-#: e2fsck/unix.c:211 misc/badblocks.c:612 misc/tune2fs.c:734 misc/util.c:133
+#: e2fsck/unix.c:215 misc/badblocks.c:613 misc/tune2fs.c:744 misc/util.c:133
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr ""
-#: e2fsck/unix.c:226
+#: e2fsck/unix.c:230
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr ""
-#: e2fsck/unix.c:230
+#: e2fsck/unix.c:234
#, c-format
msgid "%s is mounted. "
msgstr ""
-#: e2fsck/unix.c:232
+#: e2fsck/unix.c:236
msgid ""
"Cannot continue, aborting.\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:233
+#: e2fsck/unix.c:237
msgid ""
"\n"
"\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:236
+#: e2fsck/unix.c:240
msgid "Do you really want to continue"
msgstr ""
-#: e2fsck/unix.c:238
+#: e2fsck/unix.c:242
msgid "check aborted.\n"
msgstr ""
-#: e2fsck/unix.c:260
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr ""
-#: e2fsck/unix.c:262
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr ""
-#: e2fsck/unix.c:266
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr ""
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:275
#, c-format
msgid " has gone %u days without being checked"
msgstr ""
-#: e2fsck/unix.c:277
+#: e2fsck/unix.c:281
msgid ", check forced.\n"
msgstr ""
-#: e2fsck/unix.c:280
+#: e2fsck/unix.c:284
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks\n"
msgstr ""
-#: e2fsck/unix.c:411
+#: e2fsck/unix.c:431
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr ""
-#: e2fsck/unix.c:463
-msgid "Couldn't allocate memory to parse extended options!\n"
-msgstr ""
-
-#: e2fsck/unix.c:489
+#: e2fsck/unix.c:502
msgid "Invalid EA version.\n"
msgstr ""
-#: e2fsck/unix.c:498
+#: e2fsck/unix.c:511
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:547
+#: e2fsck/unix.c:561
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr ""
-#: e2fsck/unix.c:551
+#: e2fsck/unix.c:565
msgid "Invalid completion information file descriptor"
msgstr ""
-#: e2fsck/unix.c:581
+#: e2fsck/unix.c:580
+msgid "Only one the options -p/-a, -n or -y may be specified."
+msgstr ""
+
+#: e2fsck/unix.c:601
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr ""
-#: e2fsck/unix.c:650
+#: e2fsck/unix.c:666
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr ""
-#: e2fsck/unix.c:688
+#: e2fsck/unix.c:704
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr ""
-#: e2fsck/unix.c:695
+#: e2fsck/unix.c:711
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr ""
-#: e2fsck/unix.c:773
+#: e2fsck/unix.c:789
msgid "Error: ext2fs library version out of date!\n"
msgstr ""
-#: e2fsck/unix.c:781
+#: e2fsck/unix.c:797
msgid "while trying to initialize program"
msgstr ""
-#: e2fsck/unix.c:795
+#: e2fsck/unix.c:811
#, c-format
msgid "\tUsing %s, %s\n"
msgstr ""
-#: e2fsck/unix.c:807
+#: e2fsck/unix.c:823
msgid "need terminal for interactive repairs"
msgstr ""
-#: e2fsck/unix.c:843
+#: e2fsck/unix.c:859
#, c-format
msgid "%s trying backup blocks...\n"
msgstr ""
-#: e2fsck/unix.c:844
+#: e2fsck/unix.c:860
msgid "Couldn't find ext2 superblock,"
msgstr ""
-#: e2fsck/unix.c:845
+#: e2fsck/unix.c:861
msgid "Group descriptors look bad..."
msgstr ""
-#: e2fsck/unix.c:856
+#: e2fsck/unix.c:872
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:862
+#: e2fsck/unix.c:878
msgid "Could this be a zero-length partition?\n"
msgstr ""
-#: e2fsck/unix.c:864
+#: e2fsck/unix.c:880
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr ""
-#: e2fsck/unix.c:869
+#: e2fsck/unix.c:885
msgid "Possibly non-existent or swap device?\n"
msgstr ""
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:888
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
msgstr ""
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:904
msgid "Get a newer version of e2fsck!"
msgstr ""
-#: e2fsck/unix.c:914
+#: e2fsck/unix.c:925
#, c-format
msgid "while checking ext3 journal for %s"
msgstr ""
-#: e2fsck/unix.c:925
+#: e2fsck/unix.c:936
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
msgstr ""
-#: e2fsck/unix.c:933
+#: e2fsck/unix.c:949
+#, c-format
+msgid "unable to set superblock flags on %s\n"
+msgstr ""
+
+#: e2fsck/unix.c:955
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr ""
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:984
msgid "Warning: compression support is experimental.\n"
msgstr ""
-#: e2fsck/unix.c:966
+#: e2fsck/unix.c:989
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
"\tbut filesystem %s has HTREE directories.\n"
msgstr ""
-#: e2fsck/unix.c:1009
+#: e2fsck/unix.c:1032
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr ""
-#: e2fsck/unix.c:1029
+#: e2fsck/unix.c:1052
msgid "while reading bad blocks inode"
msgstr ""
-#: e2fsck/unix.c:1031
+#: e2fsck/unix.c:1054
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr ""
-#: e2fsck/unix.c:1038
+#: e2fsck/unix.c:1061
msgid "Restarting e2fsck from the beginning...\n"
msgstr ""
-#: e2fsck/unix.c:1042
+#: e2fsck/unix.c:1065
msgid "while resetting context"
msgstr ""
-#: e2fsck/unix.c:1049
+#: e2fsck/unix.c:1072
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr ""
-#: e2fsck/unix.c:1054
+#: e2fsck/unix.c:1077
msgid "aborted"
msgstr ""
-#: e2fsck/unix.c:1062
+#: e2fsck/unix.c:1085
#, c-format
msgid ""
"\n"
"%s: ***** FILE SYSTEM WAS MODIFIED *****\n"
msgstr ""
-#: e2fsck/unix.c:1065
+#: e2fsck/unix.c:1088
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr ""
-#: e2fsck/unix.c:1071
+#: e2fsck/unix.c:1094
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: e2fsck/util.c:99 misc/util.c:68
+#: e2fsck/util.c:130 misc/util.c:68
msgid "yY"
msgstr ""
-#: e2fsck/util.c:100
+#: e2fsck/util.c:131
msgid "nN"
msgstr ""
-#: e2fsck/util.c:114
+#: e2fsck/util.c:145
msgid "<y>"
msgstr ""
-#: e2fsck/util.c:116
+#: e2fsck/util.c:147
msgid "<n>"
msgstr ""
-#: e2fsck/util.c:118
+#: e2fsck/util.c:149
msgid " (y/n)"
msgstr ""
-#: e2fsck/util.c:133
+#: e2fsck/util.c:164
msgid "cancelled!\n"
msgstr ""
-#: e2fsck/util.c:148
+#: e2fsck/util.c:179
msgid "yes\n"
msgstr ""
-#: e2fsck/util.c:150
+#: e2fsck/util.c:181
msgid "no\n"
msgstr ""
-#: e2fsck/util.c:160
+#: e2fsck/util.c:191
#, c-format
msgid ""
"%s? no\n"
"\n"
msgstr ""
-#: e2fsck/util.c:164
+#: e2fsck/util.c:195
#, c-format
msgid ""
"%s? yes\n"
"\n"
msgstr ""
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "yes"
msgstr ""
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "no"
msgstr ""
-#: e2fsck/util.c:181
+#: e2fsck/util.c:212
#, c-format
msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
msgstr ""
-#: e2fsck/util.c:186
+#: e2fsck/util.c:217
msgid "reading inode and block bitmaps"
msgstr ""
-#: e2fsck/util.c:191
+#: e2fsck/util.c:222
#, c-format
msgid "while retrying to read bitmaps for %s"
msgstr ""
-#: e2fsck/util.c:203
+#: e2fsck/util.c:234
msgid "writing block bitmaps"
msgstr ""
-#: e2fsck/util.c:208
+#: e2fsck/util.c:239
#, c-format
msgid "while retrying to write block bitmaps for %s"
msgstr ""
-#: e2fsck/util.c:215
+#: e2fsck/util.c:246
msgid "writing inode bitmaps"
msgstr ""
-#: e2fsck/util.c:220
+#: e2fsck/util.c:251
#, c-format
msgid "while retrying to write inode bitmaps for %s"
msgstr ""
-#: e2fsck/util.c:233
+#: e2fsck/util.c:264
#, c-format
msgid ""
"\n"
"\t(i.e., without -a or -p options)\n"
msgstr ""
-#: e2fsck/util.c:298
+#: e2fsck/util.c:329
#, c-format
msgid "Memory used: %dk/%dk (%dk/%dk), "
msgstr ""
-#: e2fsck/util.c:302
+#: e2fsck/util.c:333
#, c-format
msgid "Memory used: %d, "
msgstr ""
-#: e2fsck/util.c:308
+#: e2fsck/util.c:339
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr ""
-#: e2fsck/util.c:313
+#: e2fsck/util.c:344
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr ""
-#: e2fsck/util.c:327
+#: e2fsck/util.c:358
#, c-format
msgid "while reading inode %ld in %s"
msgstr ""
-#: e2fsck/util.c:340
+#: e2fsck/util.c:371
#, c-format
msgid "while writing inode %ld in %s"
msgstr ""
" [-c blocks_at_once] [-p num_passes] device [last_block [start_count]]\n"
msgstr ""
-#: misc/badblocks.c:171 misc/badblocks.c:198
+#: misc/badblocks.c:172 misc/badblocks.c:199
msgid "during seek"
msgstr ""
-#: misc/badblocks.c:178
+#: misc/badblocks.c:179
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr ""
-#: misc/badblocks.c:219
+#: misc/badblocks.c:220
msgid "during ext2fs_sync_device"
msgstr ""
-#: misc/badblocks.c:235 misc/badblocks.c:411
+#: misc/badblocks.c:236 misc/badblocks.c:412
msgid "while beginning bad block list iteration"
msgstr ""
-#: misc/badblocks.c:245 misc/badblocks.c:314 misc/badblocks.c:421
+#: misc/badblocks.c:246 misc/badblocks.c:315 misc/badblocks.c:422
msgid "while allocating buffers"
msgstr ""
-#: misc/badblocks.c:250
+#: misc/badblocks.c:251
msgid "Checking for bad blocks in read-only mode\n"
msgstr ""
-#: misc/badblocks.c:251 misc/badblocks.c:323 misc/badblocks.c:440
+#: misc/badblocks.c:252 misc/badblocks.c:324 misc/badblocks.c:441
#, c-format
msgid "From block %lu to %lu\n"
msgstr ""
-#: misc/badblocks.c:259
+#: misc/badblocks.c:260
msgid "Checking for bad blocks (read-only test): "
msgstr ""
-#: misc/badblocks.c:322
+#: misc/badblocks.c:323
msgid "Checking for bad blocks in read-write mode\n"
msgstr ""
-#: misc/badblocks.c:329
+#: misc/badblocks.c:330
#, c-format
msgid "Writing pattern 0x%08x: "
msgstr ""
-#: misc/badblocks.c:343 misc/badblocks.c:368
+#: misc/badblocks.c:344 misc/badblocks.c:369
#, c-format
msgid "during seek on block %d"
msgstr ""
-#: misc/badblocks.c:355
+#: misc/badblocks.c:356
msgid "Reading and comparing: "
msgstr ""
-#: misc/badblocks.c:428
+#: misc/badblocks.c:429
msgid "Initializing random test data\n"
msgstr ""
-#: misc/badblocks.c:439
+#: misc/badblocks.c:440
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr ""
-#: misc/badblocks.c:443
+#: misc/badblocks.c:444
msgid "Checking for bad blocks (non-destructive read-write test): "
msgstr ""
-#: misc/badblocks.c:452
+#: misc/badblocks.c:453
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
msgstr ""
-#: misc/badblocks.c:509
+#: misc/badblocks.c:510
#, c-format
msgid "during test data write, block %lu"
msgstr ""
-#: misc/badblocks.c:619 misc/util.c:140
+#: misc/badblocks.c:620 misc/util.c:140
#, c-format
msgid "%s is mounted; "
msgstr ""
-#: misc/badblocks.c:621
+#: misc/badblocks.c:622
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr ""
-#: misc/badblocks.c:625
+#: misc/badblocks.c:626
msgid "it's not safe to run badblocks!\n"
msgstr ""
-#: misc/badblocks.c:668 misc/mke2fs.c:881
+#: misc/badblocks.c:669 misc/mke2fs.c:885
#, c-format
msgid "bad block size - %s"
msgstr ""
-#: misc/badblocks.c:731
+#: misc/badblocks.c:732
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
msgstr ""
-#: misc/badblocks.c:737
+#: misc/badblocks.c:738
msgid "while trying to determine device size"
msgstr ""
-#: misc/badblocks.c:743 misc/mke2fs.c:1054
+#: misc/badblocks.c:744 misc/mke2fs.c:1059
#, c-format
msgid "bad blocks count - %s"
msgstr ""
-#: misc/badblocks.c:752
+#: misc/badblocks.c:753
#, c-format
msgid "bad starting block - %s"
msgstr ""
-#: misc/badblocks.c:758
+#: misc/badblocks.c:759
#, c-format
msgid "bad blocks range: %lu-%lu"
msgstr ""
-#: misc/badblocks.c:819
+#: misc/badblocks.c:820
msgid "creating in-memory bad blocks list"
msgstr ""
-#: misc/badblocks.c:834
+#: misc/badblocks.c:835
msgid "adding to in-memory bad block list"
msgstr ""
-#: misc/badblocks.c:858
+#: misc/badblocks.c:859
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr ""
"Journal number of users: %d\n"
msgstr ""
-#. Print version number and exit
-#: misc/dumpe2fs.c:312 misc/mke2fs.c:1040
+#: misc/dumpe2fs.c:312 misc/mke2fs.c:1045
#, c-format
msgid "\tUsing %s\n"
msgstr ""
-#: misc/dumpe2fs.c:339 misc/e2image.c:477 misc/tune2fs.c:721 resize/main.c:200
+#: misc/dumpe2fs.c:339 misc/e2image.c:479 misc/tune2fs.c:731 resize/main.c:200
msgid "Couldn't find valid filesystem superblock.\n"
msgstr ""
"%s: %s: error reading bitmaps: %s\n"
msgstr ""
-#: misc/e2label.c:57
+#: misc/e2image.c:50
#, c-format
-msgid "e2label: cannot open %s\n"
+msgid "Usage: %s [-r] device file\n"
msgstr ""
-#: misc/e2label.c:62
-msgid "e2label: cannot seek to superblock\n"
+#: misc/e2image.c:61
+msgid "Couldn't allocate header buffer\n"
msgstr ""
-#: misc/e2label.c:67
-msgid "e2label: error reading superblock\n"
+#: misc/e2image.c:80
+#, c-format
+msgid "short write (only %d bytes) forwriting image header"
msgstr ""
-#: misc/e2label.c:71
-msgid "e2label: not an ext2 filesystem\n"
+#: misc/e2image.c:99
+msgid "while writing superblock"
msgstr ""
-#: misc/e2label.c:96 misc/tune2fs.c:828
-msgid "Warning: label too long, truncating.\n"
+#: misc/e2image.c:107
+msgid "while writing inode table"
msgstr ""
-#: misc/e2label.c:99
-msgid "e2label: cannot seek to superblock again\n"
+#: misc/e2image.c:114
+msgid "while writing block bitmap"
msgstr ""
-#: misc/e2label.c:104
-msgid "e2label: error writing superblock\n"
+#: misc/e2image.c:121
+msgid "while writing inode bitmap"
msgstr ""
-#: misc/e2label.c:116 misc/tune2fs.c:427
-msgid "Usage: e2label device [newlabel]\n"
+#: misc/e2label.c:57
+#, c-format
+msgid "e2label: cannot open %s\n"
msgstr ""
-#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
+#: misc/e2label.c:62
+msgid "e2label: cannot seek to superblock\n"
msgstr ""
-#: misc/e2image.c:61
-msgid "Couldn't allocate header buffer\n"
+#: misc/e2label.c:67
+msgid "e2label: error reading superblock\n"
msgstr ""
-#: misc/e2image.c:80
-#, c-format
-msgid "short write (only %d bytes) forwriting image header"
+#: misc/e2label.c:71
+msgid "e2label: not an ext2 filesystem\n"
msgstr ""
-#: misc/e2image.c:99
-msgid "while writing superblock"
+#: misc/e2label.c:96 misc/tune2fs.c:838
+msgid "Warning: label too long, truncating.\n"
msgstr ""
-#: misc/e2image.c:107
-msgid "while writing inode table"
+#: misc/e2label.c:99
+msgid "e2label: cannot seek to superblock again\n"
msgstr ""
-#: misc/e2image.c:114
-msgid "while writing block bitmap"
+#: misc/e2label.c:104
+msgid "e2label: error writing superblock\n"
msgstr ""
-#: misc/e2image.c:121
-msgid "while writing inode bitmap"
+#: misc/e2label.c:116 misc/tune2fs.c:426
+msgid "Usage: e2label device [newlabel]\n"
msgstr ""
-#: misc/findsuper.c:135
+#: misc/findsuper.c:126
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr ""
-#: misc/findsuper.c:141
+#: misc/findsuper.c:132
#, c-format
msgid "skiprate should be a number, not %s\n"
msgstr ""
-#: misc/findsuper.c:146
+#: misc/findsuper.c:137
msgid "skipbytes must be a multiple of the sector size\n"
msgstr ""
-#: misc/findsuper.c:152
+#: misc/findsuper.c:143
#, c-format
msgid "startkb should be a number, not %s\n"
msgstr ""
-#: misc/findsuper.c:156
+#: misc/findsuper.c:147
#, c-format
msgid "startkb should be positive, not %Ld\n"
msgstr ""
-#. Now, go looking for the superblock !
-#: misc/findsuper.c:166
+#: misc/findsuper.c:157
#, c-format
msgid "starting at %Ld, with %d byte increments\n"
msgstr ""
-#: misc/findsuper.c:167
+#: misc/findsuper.c:158
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr ""
-#: misc/findsuper.c:213
+#: misc/findsuper.c:204
#, c-format
msgid ""
"\n"
"%14Ld: finished with errno %d\n"
msgstr ""
-#: misc/fsck.c:258
-#, c-format
-msgid "Could not determine filesystem type for %s\n"
-msgstr ""
-
-#: misc/fsck.c:278
+#: misc/fsck.c:331
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr ""
-#: misc/fsck.c:288
+#: misc/fsck.c:341
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr ""
-#: misc/fsck.c:308
+#: misc/fsck.c:356
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
"\n"
msgstr ""
-#: misc/fsck.c:422
+#: misc/fsck.c:455
#, c-format
msgid "fsck: %s: not found\n"
msgstr ""
-#: misc/fsck.c:535
+#: misc/fsck.c:568
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr ""
-#: misc/fsck.c:557
+#: misc/fsck.c:590
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr ""
-#: misc/fsck.c:563
+#: misc/fsck.c:596
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr ""
-#: misc/fsck.c:599
+#: misc/fsck.c:632
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr ""
-#: misc/fsck.c:659
+#: misc/fsck.c:687
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr ""
-#: misc/fsck.c:680
+#: misc/fsck.c:708
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
msgstr ""
-#: misc/fsck.c:699
+#: misc/fsck.c:727
msgid "Couldn't allocate memory for filesystem types\n"
msgstr ""
-#: misc/fsck.c:839
+#: misc/fsck.c:867
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr ""
-#: misc/fsck.c:895
+#: misc/fsck.c:923
msgid "Checking all file systems.\n"
msgstr ""
-#: misc/fsck.c:983
+#: misc/fsck.c:1009
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr ""
-#: misc/fsck.c:1003
+#: misc/fsck.c:1029
msgid "Usage: fsck [-ACNPRTV] [-t fstype] [fs-options] [filesys ...]\n"
msgstr ""
-#: misc/fsck.c:1047
+#: misc/fsck.c:1071
#, c-format
msgid "%s: too many devices\n"
msgstr ""
-#: misc/fsck.c:1057 misc/fsck.c:1126
+#: misc/fsck.c:1104 misc/fsck.c:1173
#, c-format
msgid "%s: too many arguments\n"
msgstr ""
-#: misc/get_device_by_label.c:443
-#, c-format
-msgid "WARNING: %s: bad UUID\n"
-msgstr ""
-
#: misc/lsattr.c:67
#, c-format
msgid "Usage: %s [-RVadlv] [files...]\n"
"\t[-r fs-revision] [-R raid_opts] [-qvSV] device [blocks-count]\n"
msgstr ""
-#: misc/mke2fs.c:228
+#: misc/mke2fs.c:232
#, c-format
msgid "Running command: %s\n"
msgstr ""
-#: misc/mke2fs.c:232
+#: misc/mke2fs.c:236
#, c-format
msgid "while trying run '%s'"
msgstr ""
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:243
msgid "while processing list of bad blocks from program"
msgstr ""
-#: misc/mke2fs.c:265
+#: misc/mke2fs.c:269
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr ""
-#: misc/mke2fs.c:267
+#: misc/mke2fs.c:271
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr ""
-#: misc/mke2fs.c:270
+#: misc/mke2fs.c:274
msgid "Aborting....\n"
msgstr ""
-#: misc/mke2fs.c:290
+#: misc/mke2fs.c:294
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:308
+#: misc/mke2fs.c:312
msgid "while marking bad blocks as used"
msgstr ""
-#: misc/mke2fs.c:361
+#: misc/mke2fs.c:365
msgid "done \n"
msgstr ""
-#: misc/mke2fs.c:396
+#: misc/mke2fs.c:400
msgid "while allocating zeroizing buffer"
msgstr ""
-#: misc/mke2fs.c:436
+#: misc/mke2fs.c:440
msgid "Writing inode tables: "
msgstr ""
-#: misc/mke2fs.c:447
+#: misc/mke2fs.c:451
#, c-format
msgid ""
"\n"
"Could not write %d blocks in inode table starting at %d: %s\n"
msgstr ""
-#: misc/mke2fs.c:470
+#: misc/mke2fs.c:474
msgid "while creating root dir"
msgstr ""
-#: misc/mke2fs.c:477
+#: misc/mke2fs.c:481
msgid "while reading root inode"
msgstr ""
-#: misc/mke2fs.c:486
+#: misc/mke2fs.c:490
msgid "while setting root inode ownership"
msgstr ""
-#: misc/mke2fs.c:504
+#: misc/mke2fs.c:508
msgid "while creating /lost+found"
msgstr ""
-#: misc/mke2fs.c:511
+#: misc/mke2fs.c:515
msgid "while looking up /lost+found"
msgstr ""
-#: misc/mke2fs.c:521
+#: misc/mke2fs.c:525
msgid "while expanding /lost+found"
msgstr ""
-#: misc/mke2fs.c:537
+#: misc/mke2fs.c:541
msgid "while setting bad block inode"
msgstr ""
-#: misc/mke2fs.c:569
+#: misc/mke2fs.c:573
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr ""
-#: misc/mke2fs.c:579
+#: misc/mke2fs.c:583
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr ""
-#: misc/mke2fs.c:595
+#: misc/mke2fs.c:599
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr ""
-#: misc/mke2fs.c:611
+#: misc/mke2fs.c:615
msgid "while initializing journal superblock"
msgstr ""
-#: misc/mke2fs.c:617
+#: misc/mke2fs.c:621
msgid "Zeroing journal device: "
msgstr ""
-#: misc/mke2fs.c:624
+#: misc/mke2fs.c:628
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr ""
-#: misc/mke2fs.c:635
+#: misc/mke2fs.c:639
msgid "while writing journal superblock"
msgstr ""
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:653
#, c-format
msgid ""
"warning: %d blocks unused.\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:654
+#: misc/mke2fs.c:658
#, c-format
msgid "Filesystem label=%s\n"
msgstr ""
-#: misc/mke2fs.c:655
+#: misc/mke2fs.c:659
msgid "OS type: "
msgstr ""
-#: misc/mke2fs.c:660
+#: misc/mke2fs.c:664
msgid "(unknown os)"
msgstr ""
-#: misc/mke2fs.c:663
+#: misc/mke2fs.c:667
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr ""
-#: misc/mke2fs.c:665
+#: misc/mke2fs.c:669
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr ""
-#: misc/mke2fs.c:667
+#: misc/mke2fs.c:671
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr ""
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:673
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr ""
-#: misc/mke2fs.c:672
+#: misc/mke2fs.c:676
#, c-format
msgid "First data block=%u\n"
msgstr ""
-#: misc/mke2fs.c:674
+#: misc/mke2fs.c:678
#, c-format
msgid "%u block groups\n"
msgstr ""
-#: misc/mke2fs.c:676
+#: misc/mke2fs.c:680
#, c-format
msgid "%u block group\n"
msgstr ""
-#: misc/mke2fs.c:677
+#: misc/mke2fs.c:681
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr ""
-#: misc/mke2fs.c:679
+#: misc/mke2fs.c:683
#, c-format
msgid "%u inodes per group\n"
msgstr ""
-#: misc/mke2fs.c:686
+#: misc/mke2fs.c:690
msgid "Superblock backups stored on blocks: "
msgstr ""
-#: misc/mke2fs.c:736
+#: misc/mke2fs.c:740
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr ""
-#: misc/mke2fs.c:761
+#: misc/mke2fs.c:765
msgid "Invalid stride parameter.\n"
msgstr ""
-#: misc/mke2fs.c:769
+#: misc/mke2fs.c:773
msgid ""
"\n"
"Bad raid options specified.\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:885
+#: misc/mke2fs.c:889
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr ""
-#: misc/mke2fs.c:901
+#: misc/mke2fs.c:906
#, c-format
msgid "bad fragment size - %s"
msgstr ""
-#: misc/mke2fs.c:907
+#: misc/mke2fs.c:912
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr ""
-#: misc/mke2fs.c:914
+#: misc/mke2fs.c:919
msgid "Illegal number for blocks per group"
msgstr ""
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:924
msgid "blocks per group must be multiple of 8"
msgstr ""
-#: misc/mke2fs.c:929
+#: misc/mke2fs.c:934
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr ""
-#: misc/mke2fs.c:948
+#: misc/mke2fs.c:953
msgid "in malloc for bad_blocks_filename"
msgstr ""
-#: misc/mke2fs.c:957
+#: misc/mke2fs.c:962
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr ""
-#: misc/mke2fs.c:989
+#: misc/mke2fs.c:994
#, c-format
msgid "bad inode size - %s"
msgstr ""
-#: misc/mke2fs.c:1025 misc/tune2fs.c:287
+#: misc/mke2fs.c:1030 misc/tune2fs.c:286
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr ""
-#: misc/mke2fs.c:1078 misc/mke2fs.c:1379
+#: misc/mke2fs.c:1087 misc/mke2fs.c:1396
#, c-format
msgid "while trying to open journal device %s\n"
msgstr ""
-#: misc/mke2fs.c:1091
+#: misc/mke2fs.c:1093
+#, c-format
+msgid "Journal dev blocksize (%d) smaller thanminimum blocksize %d\n"
+msgstr ""
+
+#: misc/mke2fs.c:1107
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr ""
-#: misc/mke2fs.c:1095
+#: misc/mke2fs.c:1111
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr ""
-#: misc/mke2fs.c:1115
+#: misc/mke2fs.c:1131
msgid "filesystem"
msgstr ""
-#: misc/mke2fs.c:1128 resize/main.c:222
+#: misc/mke2fs.c:1144 resize/main.c:222
msgid "while trying to determine filesystem size"
msgstr ""
-#: misc/mke2fs.c:1134
+#: misc/mke2fs.c:1150
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
msgstr ""
-#: misc/mke2fs.c:1141
+#: misc/mke2fs.c:1157
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
"\tto re-read your partition table.\n"
msgstr ""
-#: misc/mke2fs.c:1156
-msgid "Filesystem larger than apparent filesystem size."
+#: misc/mke2fs.c:1172
+msgid "Filesystem larger than apparent device size."
msgstr ""
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1197
msgid "blocks per group count out of range"
msgstr ""
-#: misc/mke2fs.c:1190
+#: misc/mke2fs.c:1207
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr ""
-#: misc/mke2fs.c:1196
+#: misc/mke2fs.c:1213
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr ""
-#: misc/mke2fs.c:1238
+#: misc/mke2fs.c:1255
msgid "while setting up superblock"
msgstr ""
-#: misc/mke2fs.c:1272
+#: misc/mke2fs.c:1289
#, c-format
msgid "unknown os - %s"
msgstr ""
-#: misc/mke2fs.c:1326
+#: misc/mke2fs.c:1343
msgid "while trying to allocate filesystem tables"
msgstr ""
-#: misc/mke2fs.c:1357
+#: misc/mke2fs.c:1374
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr ""
-#: misc/mke2fs.c:1372 misc/tune2fs.c:370
+#: misc/mke2fs.c:1389 misc/tune2fs.c:369
msgid "journal"
msgstr ""
-#: misc/mke2fs.c:1384
+#: misc/mke2fs.c:1401
#, c-format
msgid "Adding journal to device %s: "
msgstr ""
-#: misc/mke2fs.c:1391
+#: misc/mke2fs.c:1408
#, c-format
msgid ""
"\n"
"\twhile trying to add journal to device %s"
msgstr ""
-#: misc/mke2fs.c:1396 misc/mke2fs.c:1420 misc/tune2fs.c:392 misc/tune2fs.c:406
+#: misc/mke2fs.c:1413 misc/mke2fs.c:1437 misc/tune2fs.c:391 misc/tune2fs.c:405
msgid "done\n"
msgstr ""
-#: misc/mke2fs.c:1408
+#: misc/mke2fs.c:1425
#, c-format
msgid "Creating journal (%d blocks): "
msgstr ""
-#: misc/mke2fs.c:1416
+#: misc/mke2fs.c:1433
msgid ""
"\n"
"\twhile trying to create journal"
msgstr ""
-#: misc/mke2fs.c:1425
+#: misc/mke2fs.c:1442
msgid "Writing superblocks and filesystem accounting information: "
msgstr ""
-#: misc/mke2fs.c:1430
+#: misc/mke2fs.c:1447
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
msgstr ""
-#: misc/mke2fs.c:1433
+#: misc/mke2fs.c:1450
msgid ""
"done\n"
"\n"
msgid "Journal NOT removed\n"
msgstr ""
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:189
msgid "Journal removed\n"
msgstr ""
-#: misc/tune2fs.c:221
+#: misc/tune2fs.c:220
msgid "while reading journal inode"
msgstr ""
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:227
msgid "while reading bitmaps"
msgstr ""
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:234
msgid "while clearing journal inode"
msgstr ""
-#: misc/tune2fs.c:246
+#: misc/tune2fs.c:245
msgid "while writing journal inode"
msgstr ""
-#: misc/tune2fs.c:261
+#: misc/tune2fs.c:260
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr ""
-#: misc/tune2fs.c:303
+#: misc/tune2fs.c:302
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
msgstr ""
-#: misc/tune2fs.c:312
+#: misc/tune2fs.c:311
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
msgstr ""
-#: misc/tune2fs.c:365
+#: misc/tune2fs.c:364
msgid "The filesystem already has a journal.\n"
msgstr ""
-#: misc/tune2fs.c:376
+#: misc/tune2fs.c:375
#, c-format
msgid ""
"\n"
"\twhile trying to open journal on %s\n"
msgstr ""
-#: misc/tune2fs.c:380
+#: misc/tune2fs.c:379
#, c-format
msgid "Creating journal on device %s: "
msgstr ""
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:387
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr ""
-#: misc/tune2fs.c:394
+#: misc/tune2fs.c:393
msgid "Creating journal inode: "
msgstr ""
-#: misc/tune2fs.c:403
+#: misc/tune2fs.c:402
msgid ""
"\n"
"\twhile trying to create journal file"
msgstr ""
-#: misc/tune2fs.c:450
+#: misc/tune2fs.c:460
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr ""
-#: misc/tune2fs.c:472 misc/tune2fs.c:485
+#: misc/tune2fs.c:482 misc/tune2fs.c:495
#, c-format
msgid "bad mounts count - %s"
msgstr ""
-#: misc/tune2fs.c:501
+#: misc/tune2fs.c:511
#, c-format
msgid "bad error behavior - %s"
msgstr ""
-#: misc/tune2fs.c:524
+#: misc/tune2fs.c:534
#, c-format
msgid "bad gid/group name - %s"
msgstr ""
-#: misc/tune2fs.c:557
+#: misc/tune2fs.c:567
#, c-format
msgid "bad interval - %s"
msgstr ""
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:595
#, c-format
msgid "bad reserved block ratio - %s"
msgstr ""
-#: misc/tune2fs.c:600
+#: misc/tune2fs.c:610
msgid "-o may only be specified once"
msgstr ""
-#: misc/tune2fs.c:610
+#: misc/tune2fs.c:620
msgid "-O may only be specified once"
msgstr ""
-#: misc/tune2fs.c:620
+#: misc/tune2fs.c:630
#, c-format
msgid "bad reserved blocks count - %s"
msgstr ""
-#: misc/tune2fs.c:649
+#: misc/tune2fs.c:659
#, c-format
msgid "bad uid/user name - %s"
msgstr ""
-#: misc/tune2fs.c:744
+#: misc/tune2fs.c:754
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:750
+#: misc/tune2fs.c:760
#, c-format
msgid "Setting current mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:755
+#: misc/tune2fs.c:765
#, c-format
msgid "Setting error behavior to %d\n"
msgstr ""
-#: misc/tune2fs.c:760
+#: misc/tune2fs.c:770
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:765
+#: misc/tune2fs.c:775
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr ""
-#: misc/tune2fs.c:771
+#: misc/tune2fs.c:781
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr ""
-#: misc/tune2fs.c:777
+#: misc/tune2fs.c:787
#, c-format
msgid "reserved blocks count is too big (%ul)"
msgstr ""
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:793
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr ""
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:799
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
msgstr ""
-#: misc/tune2fs.c:796
+#: misc/tune2fs.c:806
#, c-format
msgid ""
"\n"
"Sparse superblock flag set. %s"
msgstr ""
-#: misc/tune2fs.c:803
+#: misc/tune2fs.c:813
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
msgstr ""
-#: misc/tune2fs.c:811
+#: misc/tune2fs.c:821
#, c-format
msgid ""
"\n"
"Sparse superblock flag cleared. %s"
msgstr ""
-#: misc/tune2fs.c:818
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr ""
-#: misc/tune2fs.c:824
+#: misc/tune2fs.c:834
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:867
msgid "Invalid UUID format\n"
msgstr ""
-#: misc/uuidgen.c:30
-#, c-format
-msgid "Usage: %s [-r] [-t]\n"
-msgstr ""
-
#: misc/util.c:72
msgid "Proceed anyway? (y,n) "
msgstr ""
"%g days, whichever comes first. Use tune2fs -c or -i to override.\n"
msgstr ""
+#: misc/uuidgen.c:30
+#, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr ""
+
+#: resize/extent.c:197
+msgid "# Extent dump:\n"
+msgstr ""
+
+#: resize/extent.c:198
+#, c-format
+msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
+msgstr ""
+
+#: resize/extent.c:201
+#, c-format
+msgid "#\t\t %u -> %u (%d)\n"
+msgstr ""
+
#: resize/main.c:32
#, c-format
msgid ""
msgid "blocks to be moved"
msgstr ""
-#: resize/resize2fs.c:808
+#: resize/resize2fs.c:811
msgid "Going into desperation mode for block allocations\n"
msgstr ""
-#: resize/resize2fs.c:901
+#: resize/resize2fs.c:904
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:971
+#: resize/resize2fs.c:974
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:1139
+#: resize/resize2fs.c:1142
#, c-format
msgid "Inode moved %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:1204
+#: resize/resize2fs.c:1207
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr ""
-#: resize/resize2fs.c:1330
+#: resize/resize2fs.c:1333
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr ""
-#: resize/resize2fs.c:1356
+#: resize/resize2fs.c:1359
#, c-format
msgid "%d blocks of zeros...\n"
msgstr ""
-#: resize/resize2fs.c:1391
+#: resize/resize2fs.c:1394
msgid "Inode table move finished.\n"
msgstr ""
-
-#: resize/extent.c:197
-msgid "# Extent dump:\n"
-msgstr ""
-
-#: resize/extent.c:198
-#, c-format
-msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
-msgstr ""
-
-#: resize/extent.c:201
-#, c-format
-msgid "#\t\t %u -> %u (%d)\n"
-msgstr ""
--- /dev/null
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
--- /dev/null
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
--- /dev/null
+# Sed script that inserts the file called HEADER before the header entry.
+#
+# At each occurrence of a line starting with "msgid ", we execute the following
+# commands. At the first occurrence, insert the file. At the following
+# occurrences, do nothing. The distinction between the first and the following
+# occurrences is achieved by looking at the hold space.
+/^msgid /{
+x
+# Test if the hold space is empty.
+s/m/m/
+ta
+# Yes it was empty. First occurrence. Read the file.
+r HEADER
+# Output the file's contents by reading the next line. But don't lose the
+# current line while doing this.
+g
+N
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs 1.18\n"
-"POT-Creation-Date: 2002-11-09 11:58-0500\n"
+"POT-Creation-Date: 2003-05-03 14:59-0400\n"
"PO-Revision-Date: 2000-01-15 14:21+01:00\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <it@li.org>\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:187
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:191
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr ""
msgid "while reading the bad blocks inode"
msgstr ""
-#: e2fsck/badblocks.c:71 e2fsck/iscan.c:110 e2fsck/scantest.c:107
-#: e2fsck/unix.c:853 e2fsck/unix.c:885 misc/badblocks.c:771
-#: misc/badblocks.c:782 misc/badblocks.c:796 misc/badblocks.c:808
-#: misc/dumpe2fs.c:337 misc/e2image.c:475 misc/e2image.c:491 misc/mke2fs.c:203
-#: misc/tune2fs.c:718 resize/main.c:198
+#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
+#: e2fsck/unix.c:869 e2fsck/unix.c:901 misc/badblocks.c:772
+#: misc/badblocks.c:783 misc/badblocks.c:797 misc/badblocks.c:809
+#: misc/dumpe2fs.c:337 misc/e2image.c:477 misc/e2image.c:493 misc/mke2fs.c:207
+#: misc/tune2fs.c:728 resize/main.c:198
#, c-format
msgid "while trying to open %s"
msgstr ""
msgid "while trying popen '%s'"
msgstr ""
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:210
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:214
msgid "while reading in list of bad blocks from file"
msgstr ""
msgid "empty dir map"
msgstr ""
-#. Inode number 11 is usually lost+found
#: e2fsck/emptydir.c:97
#, c-format
msgid "Empty directory block %d (#%d) in inode %d\n"
msgid "Couldn't allocate block buffer (size=%d)\n"
msgstr ""
-#: e2fsck/flushb.c:44
+#: e2fsck/flushb.c:34
#, c-format
msgid "Usage: %s disk\n"
msgstr ""
-#: e2fsck/flushb.c:73
+#: e2fsck/flushb.c:63
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr ""
-#: e2fsck/iscan.c:44
+#: e2fsck/iscan.c:46
#, c-format
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr ""
-#: e2fsck/iscan.c:81 e2fsck/unix.c:673 resize/main.c:175
+#: e2fsck/iscan.c:83 e2fsck/unix.c:689 resize/main.c:175
#, c-format
msgid "while opening %s for flushing"
msgstr ""
-#: e2fsck/iscan.c:86 e2fsck/unix.c:679 resize/main.c:182
+#: e2fsck/iscan.c:88 e2fsck/unix.c:695 resize/main.c:182
#, c-format
msgid "while trying to flush %s"
msgstr ""
-#: e2fsck/iscan.c:119 e2fsck/scantest.c:114 misc/e2image.c:377
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:377
msgid "while opening inode scan"
msgstr ""
-#: e2fsck/iscan.c:127 misc/e2image.c:395
+#: e2fsck/iscan.c:129 misc/e2image.c:395
msgid "while getting next inode"
msgstr ""
-#: e2fsck/iscan.c:136
+#: e2fsck/iscan.c:138
#, c-format
msgid "%d inodes scanned.\n"
msgstr ""
-#: e2fsck/journal.c:418
+#: e2fsck/journal.c:420
msgid "reading journal superblock\n"
msgstr ""
-#: e2fsck/journal.c:475
+#: e2fsck/journal.c:477
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr ""
-#: e2fsck/journal.c:484
+#: e2fsck/journal.c:486
#, c-format
msgid "%s: journal too short\n"
msgstr ""
-#: e2fsck/journal.c:756
+#: e2fsck/journal.c:758
#, c-format
msgid "%s: recovering journal\n"
msgstr ""
-#: e2fsck/journal.c:758
+#: e2fsck/journal.c:760
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr ""
-#: e2fsck/journal.c:779
+#: e2fsck/journal.c:781
#, c-format
msgid "while trying to re-open %s"
msgstr ""
msgid "<The NULL inode>"
msgstr ""
-#. 0
#: e2fsck/message.c:143
msgid "<The bad blocks inode>"
msgstr ""
-#. 1
-#. 2
#: e2fsck/message.c:145
msgid "<The ACL index inode>"
msgstr ""
-#. 3
#: e2fsck/message.c:146
msgid "<The ACL data inode>"
msgstr ""
-#. 4
#: e2fsck/message.c:147
msgid "<The boot loader inode>"
msgstr ""
-#. 5
#: e2fsck/message.c:148
msgid "<The undelete directory inode>"
msgstr ""
-#. 6
#: e2fsck/message.c:149
msgid "<The group descriptor inode>"
msgstr ""
-#. 7
#: e2fsck/message.c:150
msgid "<The journal inode>"
msgstr ""
-#. 8
#: e2fsck/message.c:151
msgid "<Reserved inode 9>"
msgstr ""
-#. 9
#: e2fsck/message.c:152
msgid "<Reserved inode 10>"
msgstr ""
msgid "returned from clone_file_block"
msgstr ""
-#.
-#. * Allocate bitmaps structures
-#.
-#: e2fsck/pass1.c:311
+#: e2fsck/pass1.c:296
msgid "in-use inode map"
msgstr ""
-#: e2fsck/pass1.c:320
+#: e2fsck/pass1.c:305
msgid "directory inode map"
msgstr ""
-#: e2fsck/pass1.c:328
+#: e2fsck/pass1.c:313
msgid "regular file inode map"
msgstr ""
-#: e2fsck/pass1.c:335
+#: e2fsck/pass1.c:320
msgid "in-use block map"
msgstr ""
-#: e2fsck/pass1.c:382
+#: e2fsck/pass1.c:367
msgid "doing inode scan"
msgstr ""
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:736
msgid "Pass 1"
msgstr ""
-#: e2fsck/pass1.c:809
+#: e2fsck/pass1.c:794
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr ""
-#: e2fsck/pass1.c:851
+#: e2fsck/pass1.c:836
msgid "bad inode map"
msgstr ""
-#: e2fsck/pass1.c:873
+#: e2fsck/pass1.c:858
msgid "inode in bad block map"
msgstr ""
-#: e2fsck/pass1.c:893
+#: e2fsck/pass1.c:878
msgid "imagic inode map"
msgstr ""
-#: e2fsck/pass1.c:920
+#: e2fsck/pass1.c:905
msgid "multiply claimed block map"
msgstr ""
-#: e2fsck/pass1.c:1019
+#: e2fsck/pass1.c:1004
msgid "ext attr block map"
msgstr ""
-#: e2fsck/pass1.c:1775
+#: e2fsck/pass1.c:1760
msgid "block bitmap"
msgstr ""
-#: e2fsck/pass1.c:1779
+#: e2fsck/pass1.c:1764
msgid "inode bitmap"
msgstr ""
-#: e2fsck/pass1.c:1783
+#: e2fsck/pass1.c:1768
msgid "inode table"
msgstr ""
-#: e2fsck/pass2.c:290
+#: e2fsck/pass2.c:291
msgid "Pass 2"
msgstr ""
-#.
-#. * Allocate some bitmaps to do loop detection.
-#.
-#: e2fsck/pass3.c:80
+#: e2fsck/pass3.c:79
msgid "inode done bitmap"
msgstr ""
-#: e2fsck/pass3.c:91
+#: e2fsck/pass3.c:90
msgid "Peak memory"
msgstr ""
-#: e2fsck/pass3.c:144
+#: e2fsck/pass3.c:143
msgid "Pass 3"
msgstr ""
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:333
msgid "inode loop detection bitmap"
msgstr ""
msgid "(no prompt)"
msgstr ""
-#. 0
#: e2fsck/problem.c:50
msgid "Fix"
msgstr ""
-#. 1
#: e2fsck/problem.c:51
msgid "Clear"
msgstr ""
-#. 2
#: e2fsck/problem.c:52
msgid "Relocate"
msgstr ""
-#. 3
#: e2fsck/problem.c:53
msgid "Allocate"
msgstr ""
-#. 4
#: e2fsck/problem.c:54
msgid "Expand"
msgstr ""
-#. 5
#: e2fsck/problem.c:55
msgid "Connect to /lost+found"
msgstr ""
-#. 6
#: e2fsck/problem.c:56
msgid "Create"
msgstr ""
-#. 7
#: e2fsck/problem.c:57
msgid "Salvage"
msgstr ""
-#. 8
#: e2fsck/problem.c:58
msgid "Truncate"
msgstr ""
-#. 9
#: e2fsck/problem.c:59
msgid "Clear inode"
msgstr ""
-#. 10
#: e2fsck/problem.c:60
msgid "Abort"
msgstr ""
-#. 11
#: e2fsck/problem.c:61
msgid "Split"
msgstr ""
-#. 12
#: e2fsck/problem.c:62
msgid "Continue"
msgstr ""
-#. 13
#: e2fsck/problem.c:63
msgid "Clone duplicate/bad blocks"
msgstr ""
-#. 14
#: e2fsck/problem.c:64
msgid "Delete file"
msgstr ""
-#. 15
#: e2fsck/problem.c:65
msgid "Suppress messages"
msgstr ""
-#. 16
#: e2fsck/problem.c:66
msgid "Unlink"
msgstr ""
-#. 17
#: e2fsck/problem.c:67
msgid "Clear HTree index"
msgstr ""
msgid "(NONE)"
msgstr ""
-#. 0
#: e2fsck/problem.c:77
msgid "FIXED"
msgstr ""
-#. 1
#: e2fsck/problem.c:78
msgid "CLEARED"
msgstr ""
-#. 2
#: e2fsck/problem.c:79
msgid "RELOCATED"
msgstr ""
-#. 3
#: e2fsck/problem.c:80
msgid "ALLOCATED"
msgstr ""
-#. 4
#: e2fsck/problem.c:81
msgid "EXPANDED"
msgstr ""
-#. 5
#: e2fsck/problem.c:82
msgid "RECONNECTED"
msgstr ""
-#. 6
#: e2fsck/problem.c:83
msgid "CREATED"
msgstr ""
-#. 7
#: e2fsck/problem.c:84
msgid "SALVAGED"
msgstr ""
-#. 8
#: e2fsck/problem.c:85
msgid "TRUNCATED"
msgstr ""
-#. 9
#: e2fsck/problem.c:86
msgid "INODE CLEARED"
msgstr ""
-#. 10
#: e2fsck/problem.c:87
msgid "ABORTED"
msgstr ""
-#. 11
#: e2fsck/problem.c:88
msgid "SPLIT"
msgstr ""
-#. 12
#: e2fsck/problem.c:89
msgid "CONTINUING"
msgstr ""
-#. 13
#: e2fsck/problem.c:90
msgid "DUPLICATE/BAD BLOCKS CLONED"
msgstr ""
-#. 14
#: e2fsck/problem.c:91
msgid "FILE DELETED"
msgstr ""
-#. 15
#: e2fsck/problem.c:92
msgid "SUPPRESSED"
msgstr ""
-#. 16
#: e2fsck/problem.c:93
msgid "UNLINKED"
msgstr ""
-#. 17
#: e2fsck/problem.c:94
msgid "HTREE INDEX CLEARED"
msgstr ""
-#. Pre-Pass 1 errors
-#. Block bitmap not in group
#: e2fsck/problem.c:103
msgid "@b @B for @g %g is not in @g. (@b %b)\n"
msgstr ""
-#. Inode bitmap not in group
#: e2fsck/problem.c:107
msgid "@i @B for @g %g is not in @g. (@b %b)\n"
msgstr ""
msgid "Pass 1: Checking @is, @bs, and sizes\n"
msgstr ""
-#. Root directory is not an inode
#: e2fsck/problem.c:320
msgid "@r is not a @d. "
msgstr ""
msgid "@E is duplicate '..' @e.\n"
msgstr ""
-#: e2fsck/problem.c:938 e2fsck/problem.c:1204
+#: e2fsck/problem.c:938 e2fsck/problem.c:1219
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr ""
msgid "@p @h %d: node (%B) has bad depth\n"
msgstr ""
-#: e2fsck/problem.c:1094
+#: e2fsck/problem.c:1092
+msgid "Duplicate @E found. "
+msgstr ""
+
+#: e2fsck/problem.c:1097
+#, c-format
+msgid ""
+"@E has a non-unique filename.\n"
+"Rename to %s"
+msgstr ""
+
+#: e2fsck/problem.c:1102
+msgid ""
+"Duplicate @e '%Dn' found.\n"
+"\tMarking %p (%i) to be rebuilt.\n"
+"\n"
+msgstr ""
+
+#: e2fsck/problem.c:1109
msgid "Pass 3: Checking @d connectivity\n"
msgstr ""
-#: e2fsck/problem.c:1099
+#: e2fsck/problem.c:1114
msgid "@r not allocated. "
msgstr ""
-#: e2fsck/problem.c:1104
+#: e2fsck/problem.c:1119
msgid "No room in @l @d. "
msgstr ""
-#: e2fsck/problem.c:1109
+#: e2fsck/problem.c:1124
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr ""
-#: e2fsck/problem.c:1114
+#: e2fsck/problem.c:1129
msgid "/@l not found. "
msgstr ""
-#: e2fsck/problem.c:1119
+#: e2fsck/problem.c:1134
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr ""
-#: e2fsck/problem.c:1124
+#: e2fsck/problem.c:1139
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr ""
-#: e2fsck/problem.c:1129
+#: e2fsck/problem.c:1144
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr ""
-#: e2fsck/problem.c:1134
+#: e2fsck/problem.c:1149
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr ""
-#: e2fsck/problem.c:1139
+#: e2fsck/problem.c:1154
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr ""
-#: e2fsck/problem.c:1144
+#: e2fsck/problem.c:1159
#, c-format
msgid "ext2fs_new_@b: %m while trying to create /@l @d\n"
msgstr ""
-#: e2fsck/problem.c:1149
+#: e2fsck/problem.c:1164
#, c-format
msgid "ext2fs_new_@i: %m while trying to create /@l @d\n"
msgstr ""
-#: e2fsck/problem.c:1154
+#: e2fsck/problem.c:1169
#, c-format
msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n"
msgstr ""
-#: e2fsck/problem.c:1159
+#: e2fsck/problem.c:1174
#, c-format
msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
msgstr ""
-#: e2fsck/problem.c:1164
+#: e2fsck/problem.c:1179
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr ""
-#: e2fsck/problem.c:1169
+#: e2fsck/problem.c:1184
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
"\n"
msgstr ""
-#: e2fsck/problem.c:1174
+#: e2fsck/problem.c:1189
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d entry\n"
"\n"
msgstr ""
-#: e2fsck/problem.c:1179
+#: e2fsck/problem.c:1194
msgid "@A @i @B (%N): %m\n"
msgstr ""
-#: e2fsck/problem.c:1184
+#: e2fsck/problem.c:1199
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1189
+#: e2fsck/problem.c:1204
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1194
+#: e2fsck/problem.c:1209
msgid "@r is not a @d; aborting.\n"
msgstr ""
-#: e2fsck/problem.c:1199
+#: e2fsck/problem.c:1214
msgid "Cannot proceed without a @r.\n"
msgstr ""
-#: e2fsck/problem.c:1209
+#: e2fsck/problem.c:1224
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr ""
-#: e2fsck/problem.c:1216
+#: e2fsck/problem.c:1231
msgid "Pass 3A: Optimizing directories\n"
msgstr ""
-#: e2fsck/problem.c:1221
+#: e2fsck/problem.c:1236
#, c-format
msgid "Failed to create dirs_to_hash iterator: %m"
msgstr ""
-#: e2fsck/problem.c:1226
+#: e2fsck/problem.c:1241
msgid "Failed to optimize directory %q (%d): %m"
msgstr ""
-#: e2fsck/problem.c:1231
+#: e2fsck/problem.c:1246
msgid "Optimizing directories: "
msgstr ""
-#: e2fsck/problem.c:1248
+#: e2fsck/problem.c:1263
msgid "Pass 4: Checking reference counts\n"
msgstr ""
-#: e2fsck/problem.c:1263
+#: e2fsck/problem.c:1278
msgid "@i %i ref count is %Il, @s %N. "
msgstr ""
-#: e2fsck/problem.c:1267
+#: e2fsck/problem.c:1282
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
"@i_link_info[%i] is %N, @i.i_links_count is %Il. They should be the same!\n"
msgstr ""
-#: e2fsck/problem.c:1277
+#: e2fsck/problem.c:1292
msgid "Pass 5: Checking @g summary information\n"
msgstr ""
-#: e2fsck/problem.c:1282
+#: e2fsck/problem.c:1297
msgid "Padding at end of @i @B is not set. "
msgstr ""
-#: e2fsck/problem.c:1287
+#: e2fsck/problem.c:1302
msgid "Padding at end of @b @B is not set. "
msgstr ""
-#: e2fsck/problem.c:1292
+#: e2fsck/problem.c:1307
msgid "@b @B differences: "
msgstr ""
-#: e2fsck/problem.c:1312
+#: e2fsck/problem.c:1327
msgid "@i @B differences: "
msgstr ""
-#: e2fsck/problem.c:1332
+#: e2fsck/problem.c:1347
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1337
+#: e2fsck/problem.c:1352
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1342
+#: e2fsck/problem.c:1357
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1347
+#: e2fsck/problem.c:1362
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr ""
-#: e2fsck/problem.c:1352
+#: e2fsck/problem.c:1367
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr ""
-#: e2fsck/problem.c:1357
+#: e2fsck/problem.c:1372
msgid ""
"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
"endpoints (%i, %j)\n"
msgstr ""
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1378
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr ""
-#: e2fsck/problem.c:1497
+#: e2fsck/problem.c:1512
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr ""
-#: e2fsck/problem.c:1569
+#: e2fsck/problem.c:1584
msgid "IGNORED"
msgstr ""
-#: e2fsck/scantest.c:79
+#: e2fsck/scantest.c:81
#, c-format
msgid "Memory used: %d, elapsed time: %6.3f/%6.3f/%6.3f\n"
msgstr ""
-#: e2fsck/scantest.c:98
+#: e2fsck/scantest.c:100
#, c-format
msgid "size of inode=%d\n"
msgstr ""
-#: e2fsck/scantest.c:119
+#: e2fsck/scantest.c:121
msgid "while starting inode scan"
msgstr ""
-#: e2fsck/scantest.c:130
+#: e2fsck/scantest.c:132
msgid "while doing inode scan"
msgstr ""
msgid "Byte swap"
msgstr ""
-#: e2fsck/unix.c:63
+#: e2fsck/unix.c:67
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
"\t\t[-E extended-options] device\n"
msgstr ""
-#: e2fsck/unix.c:69
+#: e2fsck/unix.c:73
msgid ""
"\n"
"Emergency help:\n"
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
-#: e2fsck/unix.c:75
+#: e2fsck/unix.c:79
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
" -L bad_blocks_file Set badblocks list\n"
msgstr ""
-#: e2fsck/unix.c:109
+#: e2fsck/unix.c:113
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr ""
-#: e2fsck/unix.c:124
+#: e2fsck/unix.c:128
#, c-format
msgid ""
"\n"
"%8d inodes used (%d%%)\n"
msgstr ""
-#: e2fsck/unix.c:126
+#: e2fsck/unix.c:130
#, c-format
msgid "%8d non-contiguous inodes (%0d.%d%%)\n"
msgstr ""
-#: e2fsck/unix.c:128
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr ""
-#: e2fsck/unix.c:130
+#: e2fsck/unix.c:134
#, c-format
msgid ""
"%8d blocks used (%d%%)\n"
"%8d bad blocks\n"
msgstr ""
-#: e2fsck/unix.c:134
+#: e2fsck/unix.c:138
#, c-format
msgid "%8d large files\n"
msgstr ""
-#: e2fsck/unix.c:135
+#: e2fsck/unix.c:139
#, c-format
msgid ""
"\n"
"%8d files\n"
msgstr ""
-#: e2fsck/unix.c:168
+#: e2fsck/unix.c:172
#, c-format
msgid "%8d large file%s\n"
msgstr ""
-#: e2fsck/unix.c:211 misc/badblocks.c:612 misc/tune2fs.c:734 misc/util.c:133
+#: e2fsck/unix.c:215 misc/badblocks.c:613 misc/tune2fs.c:744 misc/util.c:133
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr ""
-#: e2fsck/unix.c:226
+#: e2fsck/unix.c:230
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr ""
-#: e2fsck/unix.c:230
+#: e2fsck/unix.c:234
#, c-format
msgid "%s is mounted. "
msgstr ""
-#: e2fsck/unix.c:232
+#: e2fsck/unix.c:236
msgid ""
"Cannot continue, aborting.\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:233
+#: e2fsck/unix.c:237
msgid ""
"\n"
"\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:236
+#: e2fsck/unix.c:240
msgid "Do you really want to continue"
msgstr ""
-#: e2fsck/unix.c:238
+#: e2fsck/unix.c:242
msgid "check aborted.\n"
msgstr ""
-#: e2fsck/unix.c:260
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr ""
-#: e2fsck/unix.c:262
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr ""
-#: e2fsck/unix.c:266
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr ""
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:275
#, c-format
msgid " has gone %u days without being checked"
msgstr ""
-#: e2fsck/unix.c:277
+#: e2fsck/unix.c:281
msgid ", check forced.\n"
msgstr ""
-#: e2fsck/unix.c:280
+#: e2fsck/unix.c:284
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks\n"
msgstr ""
-#: e2fsck/unix.c:411
+#: e2fsck/unix.c:431
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr ""
-#: e2fsck/unix.c:463
-msgid "Couldn't allocate memory to parse extended options!\n"
-msgstr ""
-
-#: e2fsck/unix.c:489
+#: e2fsck/unix.c:502
msgid "Invalid EA version.\n"
msgstr ""
-#: e2fsck/unix.c:498
+#: e2fsck/unix.c:511
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:547
+#: e2fsck/unix.c:561
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr ""
-#: e2fsck/unix.c:551
+#: e2fsck/unix.c:565
msgid "Invalid completion information file descriptor"
msgstr ""
-#: e2fsck/unix.c:581
+#: e2fsck/unix.c:580
+msgid "Only one the options -p/-a, -n or -y may be specified."
+msgstr ""
+
+#: e2fsck/unix.c:601
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr ""
-#: e2fsck/unix.c:650
+#: e2fsck/unix.c:666
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr ""
-#: e2fsck/unix.c:688
+#: e2fsck/unix.c:704
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr ""
-#: e2fsck/unix.c:695
+#: e2fsck/unix.c:711
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr ""
-#: e2fsck/unix.c:773
+#: e2fsck/unix.c:789
msgid "Error: ext2fs library version out of date!\n"
msgstr ""
-#: e2fsck/unix.c:781
+#: e2fsck/unix.c:797
msgid "while trying to initialize program"
msgstr ""
-#: e2fsck/unix.c:795
+#: e2fsck/unix.c:811
#, c-format
msgid "\tUsing %s, %s\n"
msgstr ""
-#: e2fsck/unix.c:807
+#: e2fsck/unix.c:823
msgid "need terminal for interactive repairs"
msgstr ""
-#: e2fsck/unix.c:843
+#: e2fsck/unix.c:859
#, c-format
msgid "%s trying backup blocks...\n"
msgstr ""
-#: e2fsck/unix.c:844
+#: e2fsck/unix.c:860
msgid "Couldn't find ext2 superblock,"
msgstr ""
-#: e2fsck/unix.c:845
+#: e2fsck/unix.c:861
msgid "Group descriptors look bad..."
msgstr ""
-#: e2fsck/unix.c:856
+#: e2fsck/unix.c:872
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:862
+#: e2fsck/unix.c:878
msgid "Could this be a zero-length partition?\n"
msgstr ""
-#: e2fsck/unix.c:864
+#: e2fsck/unix.c:880
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr ""
-#: e2fsck/unix.c:869
+#: e2fsck/unix.c:885
msgid "Possibly non-existent or swap device?\n"
msgstr ""
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:888
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
msgstr ""
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:904
msgid "Get a newer version of e2fsck!"
msgstr ""
-#: e2fsck/unix.c:914
+#: e2fsck/unix.c:925
#, c-format
msgid "while checking ext3 journal for %s"
msgstr ""
-#: e2fsck/unix.c:925
+#: e2fsck/unix.c:936
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
msgstr ""
-#: e2fsck/unix.c:933
+#: e2fsck/unix.c:949
+#, c-format
+msgid "unable to set superblock flags on %s\n"
+msgstr ""
+
+#: e2fsck/unix.c:955
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr ""
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:984
msgid "Warning: compression support is experimental.\n"
msgstr ""
-#: e2fsck/unix.c:966
+#: e2fsck/unix.c:989
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
"\tbut filesystem %s has HTREE directories.\n"
msgstr ""
-#: e2fsck/unix.c:1009
+#: e2fsck/unix.c:1032
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr ""
-#: e2fsck/unix.c:1029
+#: e2fsck/unix.c:1052
msgid "while reading bad blocks inode"
msgstr ""
-#: e2fsck/unix.c:1031
+#: e2fsck/unix.c:1054
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr ""
-#: e2fsck/unix.c:1038
+#: e2fsck/unix.c:1061
msgid "Restarting e2fsck from the beginning...\n"
msgstr ""
-#: e2fsck/unix.c:1042
+#: e2fsck/unix.c:1065
msgid "while resetting context"
msgstr ""
-#: e2fsck/unix.c:1049
+#: e2fsck/unix.c:1072
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr ""
-#: e2fsck/unix.c:1054
+#: e2fsck/unix.c:1077
msgid "aborted"
msgstr ""
-#: e2fsck/unix.c:1062
+#: e2fsck/unix.c:1085
#, c-format
msgid ""
"\n"
"%s: ***** FILE SYSTEM WAS MODIFIED *****\n"
msgstr ""
-#: e2fsck/unix.c:1065
+#: e2fsck/unix.c:1088
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr ""
-#: e2fsck/unix.c:1071
+#: e2fsck/unix.c:1094
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: e2fsck/util.c:99 misc/util.c:68
+#: e2fsck/util.c:130 misc/util.c:68
msgid "yY"
msgstr ""
-#: e2fsck/util.c:100
+#: e2fsck/util.c:131
msgid "nN"
msgstr ""
-#: e2fsck/util.c:114
+#: e2fsck/util.c:145
msgid "<y>"
msgstr ""
-#: e2fsck/util.c:116
+#: e2fsck/util.c:147
msgid "<n>"
msgstr ""
-#: e2fsck/util.c:118
+#: e2fsck/util.c:149
msgid " (y/n)"
msgstr ""
-#: e2fsck/util.c:133
+#: e2fsck/util.c:164
msgid "cancelled!\n"
msgstr ""
-#: e2fsck/util.c:148
+#: e2fsck/util.c:179
msgid "yes\n"
msgstr ""
-#: e2fsck/util.c:150
+#: e2fsck/util.c:181
msgid "no\n"
msgstr ""
-#: e2fsck/util.c:160
+#: e2fsck/util.c:191
#, c-format
msgid ""
"%s? no\n"
"\n"
msgstr ""
-#: e2fsck/util.c:164
+#: e2fsck/util.c:195
#, c-format
msgid ""
"%s? yes\n"
"\n"
msgstr ""
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "yes"
msgstr ""
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "no"
msgstr ""
-#: e2fsck/util.c:181
+#: e2fsck/util.c:212
#, c-format
msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
msgstr ""
-#: e2fsck/util.c:186
+#: e2fsck/util.c:217
msgid "reading inode and block bitmaps"
msgstr ""
-#: e2fsck/util.c:191
+#: e2fsck/util.c:222
#, c-format
msgid "while retrying to read bitmaps for %s"
msgstr ""
-#: e2fsck/util.c:203
+#: e2fsck/util.c:234
msgid "writing block bitmaps"
msgstr ""
-#: e2fsck/util.c:208
+#: e2fsck/util.c:239
#, c-format
msgid "while retrying to write block bitmaps for %s"
msgstr ""
-#: e2fsck/util.c:215
+#: e2fsck/util.c:246
msgid "writing inode bitmaps"
msgstr ""
-#: e2fsck/util.c:220
+#: e2fsck/util.c:251
#, c-format
msgid "while retrying to write inode bitmaps for %s"
msgstr ""
-#: e2fsck/util.c:233
+#: e2fsck/util.c:264
#, c-format
msgid ""
"\n"
"\t(i.e., without -a or -p options)\n"
msgstr ""
-#: e2fsck/util.c:298
+#: e2fsck/util.c:329
#, c-format
msgid "Memory used: %dk/%dk (%dk/%dk), "
msgstr ""
-#: e2fsck/util.c:302
+#: e2fsck/util.c:333
#, c-format
msgid "Memory used: %d, "
msgstr ""
-#: e2fsck/util.c:308
+#: e2fsck/util.c:339
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr ""
-#: e2fsck/util.c:313
+#: e2fsck/util.c:344
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr ""
-#: e2fsck/util.c:327
+#: e2fsck/util.c:358
#, c-format
msgid "while reading inode %ld in %s"
msgstr ""
-#: e2fsck/util.c:340
+#: e2fsck/util.c:371
#, c-format
msgid "while writing inode %ld in %s"
msgstr ""
" [-c blocks_at_once] [-p num_passes] device [last_block [start_count]]\n"
msgstr ""
-#: misc/badblocks.c:171 misc/badblocks.c:198
+#: misc/badblocks.c:172 misc/badblocks.c:199
msgid "during seek"
msgstr ""
-#: misc/badblocks.c:178
+#: misc/badblocks.c:179
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr ""
-#: misc/badblocks.c:219
+#: misc/badblocks.c:220
msgid "during ext2fs_sync_device"
msgstr ""
-#: misc/badblocks.c:235 misc/badblocks.c:411
+#: misc/badblocks.c:236 misc/badblocks.c:412
msgid "while beginning bad block list iteration"
msgstr ""
-#: misc/badblocks.c:245 misc/badblocks.c:314 misc/badblocks.c:421
+#: misc/badblocks.c:246 misc/badblocks.c:315 misc/badblocks.c:422
msgid "while allocating buffers"
msgstr ""
-#: misc/badblocks.c:250
+#: misc/badblocks.c:251
msgid "Checking for bad blocks in read-only mode\n"
msgstr ""
-#: misc/badblocks.c:251 misc/badblocks.c:323 misc/badblocks.c:440
+#: misc/badblocks.c:252 misc/badblocks.c:324 misc/badblocks.c:441
#, c-format
msgid "From block %lu to %lu\n"
msgstr ""
-#: misc/badblocks.c:259
+#: misc/badblocks.c:260
msgid "Checking for bad blocks (read-only test): "
msgstr ""
-#: misc/badblocks.c:322
+#: misc/badblocks.c:323
msgid "Checking for bad blocks in read-write mode\n"
msgstr ""
-#: misc/badblocks.c:329
+#: misc/badblocks.c:330
#, c-format
msgid "Writing pattern 0x%08x: "
msgstr ""
-#: misc/badblocks.c:343 misc/badblocks.c:368
+#: misc/badblocks.c:344 misc/badblocks.c:369
#, c-format
msgid "during seek on block %d"
msgstr ""
-#: misc/badblocks.c:355
+#: misc/badblocks.c:356
msgid "Reading and comparing: "
msgstr ""
-#: misc/badblocks.c:428
+#: misc/badblocks.c:429
msgid "Initializing random test data\n"
msgstr ""
-#: misc/badblocks.c:439
+#: misc/badblocks.c:440
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr ""
-#: misc/badblocks.c:443
+#: misc/badblocks.c:444
msgid "Checking for bad blocks (non-destructive read-write test): "
msgstr ""
-#: misc/badblocks.c:452
+#: misc/badblocks.c:453
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
msgstr ""
-#: misc/badblocks.c:509
+#: misc/badblocks.c:510
#, c-format
msgid "during test data write, block %lu"
msgstr ""
-#: misc/badblocks.c:619 misc/util.c:140
+#: misc/badblocks.c:620 misc/util.c:140
#, c-format
msgid "%s is mounted; "
msgstr ""
-#: misc/badblocks.c:621
+#: misc/badblocks.c:622
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr ""
-#: misc/badblocks.c:625
+#: misc/badblocks.c:626
msgid "it's not safe to run badblocks!\n"
msgstr ""
-#: misc/badblocks.c:668 misc/mke2fs.c:881
+#: misc/badblocks.c:669 misc/mke2fs.c:885
#, c-format
msgid "bad block size - %s"
msgstr ""
-#: misc/badblocks.c:731
+#: misc/badblocks.c:732
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
msgstr ""
-#: misc/badblocks.c:737
+#: misc/badblocks.c:738
msgid "while trying to determine device size"
msgstr ""
-#: misc/badblocks.c:743 misc/mke2fs.c:1054
+#: misc/badblocks.c:744 misc/mke2fs.c:1059
#, c-format
msgid "bad blocks count - %s"
msgstr ""
-#: misc/badblocks.c:752
+#: misc/badblocks.c:753
#, c-format
msgid "bad starting block - %s"
msgstr ""
-#: misc/badblocks.c:758
+#: misc/badblocks.c:759
#, c-format
msgid "bad blocks range: %lu-%lu"
msgstr ""
-#: misc/badblocks.c:819
+#: misc/badblocks.c:820
msgid "creating in-memory bad blocks list"
msgstr ""
-#: misc/badblocks.c:834
+#: misc/badblocks.c:835
msgid "adding to in-memory bad block list"
msgstr ""
-#: misc/badblocks.c:858
+#: misc/badblocks.c:859
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr ""
"Journal number of users: %d\n"
msgstr ""
-#. Print version number and exit
-#: misc/dumpe2fs.c:312 misc/mke2fs.c:1040
+#: misc/dumpe2fs.c:312 misc/mke2fs.c:1045
#, c-format
msgid "\tUsing %s\n"
msgstr ""
-#: misc/dumpe2fs.c:339 misc/e2image.c:477 misc/tune2fs.c:721 resize/main.c:200
+#: misc/dumpe2fs.c:339 misc/e2image.c:479 misc/tune2fs.c:731 resize/main.c:200
msgid "Couldn't find valid filesystem superblock.\n"
msgstr ""
"%s: %s: error reading bitmaps: %s\n"
msgstr ""
-#: misc/e2label.c:57
+#: misc/e2image.c:50
#, c-format
-msgid "e2label: cannot open %s\n"
+msgid "Usage: %s [-r] device file\n"
msgstr ""
-#: misc/e2label.c:62
-msgid "e2label: cannot seek to superblock\n"
+#: misc/e2image.c:61
+msgid "Couldn't allocate header buffer\n"
msgstr ""
-#: misc/e2label.c:67
-msgid "e2label: error reading superblock\n"
+#: misc/e2image.c:80
+#, c-format
+msgid "short write (only %d bytes) forwriting image header"
msgstr ""
-#: misc/e2label.c:71
-msgid "e2label: not an ext2 filesystem\n"
+#: misc/e2image.c:99
+msgid "while writing superblock"
msgstr ""
-#: misc/e2label.c:96 misc/tune2fs.c:828
-msgid "Warning: label too long, truncating.\n"
+#: misc/e2image.c:107
+msgid "while writing inode table"
msgstr ""
-#: misc/e2label.c:99
-msgid "e2label: cannot seek to superblock again\n"
+#: misc/e2image.c:114
+msgid "while writing block bitmap"
msgstr ""
-#: misc/e2label.c:104
-msgid "e2label: error writing superblock\n"
+#: misc/e2image.c:121
+msgid "while writing inode bitmap"
msgstr ""
-#: misc/e2label.c:116 misc/tune2fs.c:427
-msgid "Usage: e2label device [newlabel]\n"
+#: misc/e2label.c:57
+#, c-format
+msgid "e2label: cannot open %s\n"
msgstr ""
-#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
+#: misc/e2label.c:62
+msgid "e2label: cannot seek to superblock\n"
msgstr ""
-#: misc/e2image.c:61
-msgid "Couldn't allocate header buffer\n"
+#: misc/e2label.c:67
+msgid "e2label: error reading superblock\n"
msgstr ""
-#: misc/e2image.c:80
-#, c-format
-msgid "short write (only %d bytes) forwriting image header"
+#: misc/e2label.c:71
+msgid "e2label: not an ext2 filesystem\n"
msgstr ""
-#: misc/e2image.c:99
-msgid "while writing superblock"
+#: misc/e2label.c:96 misc/tune2fs.c:838
+msgid "Warning: label too long, truncating.\n"
msgstr ""
-#: misc/e2image.c:107
-msgid "while writing inode table"
+#: misc/e2label.c:99
+msgid "e2label: cannot seek to superblock again\n"
msgstr ""
-#: misc/e2image.c:114
-msgid "while writing block bitmap"
+#: misc/e2label.c:104
+msgid "e2label: error writing superblock\n"
msgstr ""
-#: misc/e2image.c:121
-msgid "while writing inode bitmap"
+#: misc/e2label.c:116 misc/tune2fs.c:426
+msgid "Usage: e2label device [newlabel]\n"
msgstr ""
-#: misc/findsuper.c:135
+#: misc/findsuper.c:126
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr ""
-#: misc/findsuper.c:141
+#: misc/findsuper.c:132
#, c-format
msgid "skiprate should be a number, not %s\n"
msgstr ""
-#: misc/findsuper.c:146
+#: misc/findsuper.c:137
msgid "skipbytes must be a multiple of the sector size\n"
msgstr ""
-#: misc/findsuper.c:152
+#: misc/findsuper.c:143
#, c-format
msgid "startkb should be a number, not %s\n"
msgstr ""
-#: misc/findsuper.c:156
+#: misc/findsuper.c:147
#, c-format
msgid "startkb should be positive, not %Ld\n"
msgstr ""
-#. Now, go looking for the superblock !
-#: misc/findsuper.c:166
+#: misc/findsuper.c:157
#, c-format
msgid "starting at %Ld, with %d byte increments\n"
msgstr ""
-#: misc/findsuper.c:167
+#: misc/findsuper.c:158
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr ""
-#: misc/findsuper.c:213
+#: misc/findsuper.c:204
#, c-format
msgid ""
"\n"
"%14Ld: finished with errno %d\n"
msgstr ""
-#: misc/fsck.c:258
-#, c-format
-msgid "Could not determine filesystem type for %s\n"
-msgstr ""
-
-#: misc/fsck.c:278
+#: misc/fsck.c:331
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr ""
-#: misc/fsck.c:288
+#: misc/fsck.c:341
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr ""
-#: misc/fsck.c:308
+#: misc/fsck.c:356
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
"\n"
msgstr ""
-#: misc/fsck.c:422
+#: misc/fsck.c:455
#, c-format
msgid "fsck: %s: not found\n"
msgstr ""
-#: misc/fsck.c:535
+#: misc/fsck.c:568
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr ""
-#: misc/fsck.c:557
+#: misc/fsck.c:590
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr ""
-#: misc/fsck.c:563
+#: misc/fsck.c:596
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr ""
-#: misc/fsck.c:599
+#: misc/fsck.c:632
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr ""
-#: misc/fsck.c:659
+#: misc/fsck.c:687
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr ""
-#: misc/fsck.c:680
+#: misc/fsck.c:708
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
msgstr ""
-#: misc/fsck.c:699
+#: misc/fsck.c:727
msgid "Couldn't allocate memory for filesystem types\n"
msgstr ""
-#: misc/fsck.c:839
+#: misc/fsck.c:867
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr ""
-#: misc/fsck.c:895
+#: misc/fsck.c:923
msgid "Checking all file systems.\n"
msgstr ""
-#: misc/fsck.c:983
+#: misc/fsck.c:1009
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr ""
-#: misc/fsck.c:1003
+#: misc/fsck.c:1029
msgid "Usage: fsck [-ACNPRTV] [-t fstype] [fs-options] [filesys ...]\n"
msgstr ""
-#: misc/fsck.c:1047
+#: misc/fsck.c:1071
#, c-format
msgid "%s: too many devices\n"
msgstr ""
-#: misc/fsck.c:1057 misc/fsck.c:1126
+#: misc/fsck.c:1104 misc/fsck.c:1173
#, c-format
msgid "%s: too many arguments\n"
msgstr ""
-#: misc/get_device_by_label.c:443
-#, c-format
-msgid "WARNING: %s: bad UUID\n"
-msgstr ""
-
#: misc/lsattr.c:67
#, c-format
msgid "Usage: %s [-RVadlv] [files...]\n"
"\t[-r fs-revision] [-R raid_opts] [-qvSV] device [blocks-count]\n"
msgstr ""
-#: misc/mke2fs.c:228
+#: misc/mke2fs.c:232
#, c-format
msgid "Running command: %s\n"
msgstr ""
-#: misc/mke2fs.c:232
+#: misc/mke2fs.c:236
#, c-format
msgid "while trying run '%s'"
msgstr ""
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:243
msgid "while processing list of bad blocks from program"
msgstr ""
-#: misc/mke2fs.c:265
+#: misc/mke2fs.c:269
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr ""
-#: misc/mke2fs.c:267
+#: misc/mke2fs.c:271
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr ""
-#: misc/mke2fs.c:270
+#: misc/mke2fs.c:274
msgid "Aborting....\n"
msgstr ""
-#: misc/mke2fs.c:290
+#: misc/mke2fs.c:294
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:308
+#: misc/mke2fs.c:312
msgid "while marking bad blocks as used"
msgstr ""
-#: misc/mke2fs.c:361
+#: misc/mke2fs.c:365
msgid "done \n"
msgstr ""
-#: misc/mke2fs.c:396
+#: misc/mke2fs.c:400
msgid "while allocating zeroizing buffer"
msgstr ""
-#: misc/mke2fs.c:436
+#: misc/mke2fs.c:440
msgid "Writing inode tables: "
msgstr ""
-#: misc/mke2fs.c:447
+#: misc/mke2fs.c:451
#, c-format
msgid ""
"\n"
"Could not write %d blocks in inode table starting at %d: %s\n"
msgstr ""
-#: misc/mke2fs.c:470
+#: misc/mke2fs.c:474
msgid "while creating root dir"
msgstr ""
-#: misc/mke2fs.c:477
+#: misc/mke2fs.c:481
msgid "while reading root inode"
msgstr ""
-#: misc/mke2fs.c:486
+#: misc/mke2fs.c:490
msgid "while setting root inode ownership"
msgstr ""
-#: misc/mke2fs.c:504
+#: misc/mke2fs.c:508
msgid "while creating /lost+found"
msgstr ""
-#: misc/mke2fs.c:511
+#: misc/mke2fs.c:515
msgid "while looking up /lost+found"
msgstr ""
-#: misc/mke2fs.c:521
+#: misc/mke2fs.c:525
msgid "while expanding /lost+found"
msgstr ""
-#: misc/mke2fs.c:537
+#: misc/mke2fs.c:541
msgid "while setting bad block inode"
msgstr ""
-#: misc/mke2fs.c:569
+#: misc/mke2fs.c:573
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr ""
-#: misc/mke2fs.c:579
+#: misc/mke2fs.c:583
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr ""
-#: misc/mke2fs.c:595
+#: misc/mke2fs.c:599
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr ""
-#: misc/mke2fs.c:611
+#: misc/mke2fs.c:615
msgid "while initializing journal superblock"
msgstr ""
-#: misc/mke2fs.c:617
+#: misc/mke2fs.c:621
msgid "Zeroing journal device: "
msgstr ""
-#: misc/mke2fs.c:624
+#: misc/mke2fs.c:628
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr ""
-#: misc/mke2fs.c:635
+#: misc/mke2fs.c:639
msgid "while writing journal superblock"
msgstr ""
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:653
#, c-format
msgid ""
"warning: %d blocks unused.\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:654
+#: misc/mke2fs.c:658
#, c-format
msgid "Filesystem label=%s\n"
msgstr ""
-#: misc/mke2fs.c:655
+#: misc/mke2fs.c:659
msgid "OS type: "
msgstr ""
-#: misc/mke2fs.c:660
+#: misc/mke2fs.c:664
msgid "(unknown os)"
msgstr ""
-#: misc/mke2fs.c:663
+#: misc/mke2fs.c:667
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr ""
-#: misc/mke2fs.c:665
+#: misc/mke2fs.c:669
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr ""
-#: misc/mke2fs.c:667
+#: misc/mke2fs.c:671
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr ""
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:673
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr ""
-#: misc/mke2fs.c:672
+#: misc/mke2fs.c:676
#, c-format
msgid "First data block=%u\n"
msgstr ""
-#: misc/mke2fs.c:674
+#: misc/mke2fs.c:678
#, c-format
msgid "%u block groups\n"
msgstr ""
-#: misc/mke2fs.c:676
+#: misc/mke2fs.c:680
#, c-format
msgid "%u block group\n"
msgstr ""
-#: misc/mke2fs.c:677
+#: misc/mke2fs.c:681
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr ""
-#: misc/mke2fs.c:679
+#: misc/mke2fs.c:683
#, c-format
msgid "%u inodes per group\n"
msgstr ""
-#: misc/mke2fs.c:686
+#: misc/mke2fs.c:690
msgid "Superblock backups stored on blocks: "
msgstr ""
-#: misc/mke2fs.c:736
+#: misc/mke2fs.c:740
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr ""
-#: misc/mke2fs.c:761
+#: misc/mke2fs.c:765
msgid "Invalid stride parameter.\n"
msgstr ""
-#: misc/mke2fs.c:769
+#: misc/mke2fs.c:773
msgid ""
"\n"
"Bad raid options specified.\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:885
+#: misc/mke2fs.c:889
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr ""
-#: misc/mke2fs.c:901
+#: misc/mke2fs.c:906
#, c-format
msgid "bad fragment size - %s"
msgstr ""
-#: misc/mke2fs.c:907
+#: misc/mke2fs.c:912
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr ""
-#: misc/mke2fs.c:914
+#: misc/mke2fs.c:919
msgid "Illegal number for blocks per group"
msgstr ""
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:924
msgid "blocks per group must be multiple of 8"
msgstr ""
-#: misc/mke2fs.c:929
+#: misc/mke2fs.c:934
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr ""
-#: misc/mke2fs.c:948
+#: misc/mke2fs.c:953
msgid "in malloc for bad_blocks_filename"
msgstr ""
-#: misc/mke2fs.c:957
+#: misc/mke2fs.c:962
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr ""
-#: misc/mke2fs.c:989
+#: misc/mke2fs.c:994
#, c-format
msgid "bad inode size - %s"
msgstr ""
-#: misc/mke2fs.c:1025 misc/tune2fs.c:287
+#: misc/mke2fs.c:1030 misc/tune2fs.c:286
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr ""
-#: misc/mke2fs.c:1078 misc/mke2fs.c:1379
+#: misc/mke2fs.c:1087 misc/mke2fs.c:1396
#, c-format
msgid "while trying to open journal device %s\n"
msgstr ""
-#: misc/mke2fs.c:1091
+#: misc/mke2fs.c:1093
+#, c-format
+msgid "Journal dev blocksize (%d) smaller thanminimum blocksize %d\n"
+msgstr ""
+
+#: misc/mke2fs.c:1107
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr ""
-#: misc/mke2fs.c:1095
+#: misc/mke2fs.c:1111
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr ""
-#: misc/mke2fs.c:1115
+#: misc/mke2fs.c:1131
msgid "filesystem"
msgstr ""
-#: misc/mke2fs.c:1128 resize/main.c:222
+#: misc/mke2fs.c:1144 resize/main.c:222
msgid "while trying to determine filesystem size"
msgstr ""
-#: misc/mke2fs.c:1134
+#: misc/mke2fs.c:1150
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
msgstr ""
-#: misc/mke2fs.c:1141
+#: misc/mke2fs.c:1157
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
"\tto re-read your partition table.\n"
msgstr ""
-#: misc/mke2fs.c:1156
-msgid "Filesystem larger than apparent filesystem size."
+#: misc/mke2fs.c:1172
+msgid "Filesystem larger than apparent device size."
msgstr ""
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1197
msgid "blocks per group count out of range"
msgstr ""
-#: misc/mke2fs.c:1190
+#: misc/mke2fs.c:1207
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr ""
-#: misc/mke2fs.c:1196
+#: misc/mke2fs.c:1213
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr ""
-#: misc/mke2fs.c:1238
+#: misc/mke2fs.c:1255
msgid "while setting up superblock"
msgstr ""
-#: misc/mke2fs.c:1272
+#: misc/mke2fs.c:1289
#, c-format
msgid "unknown os - %s"
msgstr ""
-#: misc/mke2fs.c:1326
+#: misc/mke2fs.c:1343
msgid "while trying to allocate filesystem tables"
msgstr ""
-#: misc/mke2fs.c:1357
+#: misc/mke2fs.c:1374
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr ""
-#: misc/mke2fs.c:1372 misc/tune2fs.c:370
+#: misc/mke2fs.c:1389 misc/tune2fs.c:369
msgid "journal"
msgstr ""
-#: misc/mke2fs.c:1384
+#: misc/mke2fs.c:1401
#, c-format
msgid "Adding journal to device %s: "
msgstr ""
-#: misc/mke2fs.c:1391
+#: misc/mke2fs.c:1408
#, c-format
msgid ""
"\n"
"\twhile trying to add journal to device %s"
msgstr ""
-#: misc/mke2fs.c:1396 misc/mke2fs.c:1420 misc/tune2fs.c:392 misc/tune2fs.c:406
+#: misc/mke2fs.c:1413 misc/mke2fs.c:1437 misc/tune2fs.c:391 misc/tune2fs.c:405
msgid "done\n"
msgstr ""
-#: misc/mke2fs.c:1408
+#: misc/mke2fs.c:1425
#, c-format
msgid "Creating journal (%d blocks): "
msgstr ""
-#: misc/mke2fs.c:1416
+#: misc/mke2fs.c:1433
msgid ""
"\n"
"\twhile trying to create journal"
msgstr ""
-#: misc/mke2fs.c:1425
+#: misc/mke2fs.c:1442
msgid "Writing superblocks and filesystem accounting information: "
msgstr ""
-#: misc/mke2fs.c:1430
+#: misc/mke2fs.c:1447
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
msgstr ""
-#: misc/mke2fs.c:1433
+#: misc/mke2fs.c:1450
msgid ""
"done\n"
"\n"
msgid "Journal NOT removed\n"
msgstr ""
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:189
msgid "Journal removed\n"
msgstr ""
-#: misc/tune2fs.c:221
+#: misc/tune2fs.c:220
msgid "while reading journal inode"
msgstr ""
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:227
msgid "while reading bitmaps"
msgstr ""
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:234
msgid "while clearing journal inode"
msgstr ""
-#: misc/tune2fs.c:246
+#: misc/tune2fs.c:245
msgid "while writing journal inode"
msgstr ""
-#: misc/tune2fs.c:261
+#: misc/tune2fs.c:260
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr ""
-#: misc/tune2fs.c:303
+#: misc/tune2fs.c:302
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
msgstr ""
-#: misc/tune2fs.c:312
+#: misc/tune2fs.c:311
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
msgstr ""
-#: misc/tune2fs.c:365
+#: misc/tune2fs.c:364
msgid "The filesystem already has a journal.\n"
msgstr ""
-#: misc/tune2fs.c:376
+#: misc/tune2fs.c:375
#, c-format
msgid ""
"\n"
"\twhile trying to open journal on %s\n"
msgstr ""
-#: misc/tune2fs.c:380
+#: misc/tune2fs.c:379
#, c-format
msgid "Creating journal on device %s: "
msgstr ""
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:387
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr ""
-#: misc/tune2fs.c:394
+#: misc/tune2fs.c:393
msgid "Creating journal inode: "
msgstr ""
-#: misc/tune2fs.c:403
+#: misc/tune2fs.c:402
msgid ""
"\n"
"\twhile trying to create journal file"
msgstr ""
-#: misc/tune2fs.c:450
+#: misc/tune2fs.c:460
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr ""
-#: misc/tune2fs.c:472 misc/tune2fs.c:485
+#: misc/tune2fs.c:482 misc/tune2fs.c:495
#, c-format
msgid "bad mounts count - %s"
msgstr ""
-#: misc/tune2fs.c:501
+#: misc/tune2fs.c:511
#, c-format
msgid "bad error behavior - %s"
msgstr ""
-#: misc/tune2fs.c:524
+#: misc/tune2fs.c:534
#, c-format
msgid "bad gid/group name - %s"
msgstr ""
-#: misc/tune2fs.c:557
+#: misc/tune2fs.c:567
#, c-format
msgid "bad interval - %s"
msgstr ""
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:595
#, c-format
msgid "bad reserved block ratio - %s"
msgstr ""
-#: misc/tune2fs.c:600
+#: misc/tune2fs.c:610
msgid "-o may only be specified once"
msgstr ""
-#: misc/tune2fs.c:610
+#: misc/tune2fs.c:620
msgid "-O may only be specified once"
msgstr ""
-#: misc/tune2fs.c:620
+#: misc/tune2fs.c:630
#, c-format
msgid "bad reserved blocks count - %s"
msgstr ""
-#: misc/tune2fs.c:649
+#: misc/tune2fs.c:659
#, c-format
msgid "bad uid/user name - %s"
msgstr ""
-#: misc/tune2fs.c:744
+#: misc/tune2fs.c:754
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:750
+#: misc/tune2fs.c:760
#, c-format
msgid "Setting current mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:755
+#: misc/tune2fs.c:765
#, c-format
msgid "Setting error behavior to %d\n"
msgstr ""
-#: misc/tune2fs.c:760
+#: misc/tune2fs.c:770
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:765
+#: misc/tune2fs.c:775
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr ""
-#: misc/tune2fs.c:771
+#: misc/tune2fs.c:781
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr ""
-#: misc/tune2fs.c:777
+#: misc/tune2fs.c:787
#, c-format
msgid "reserved blocks count is too big (%ul)"
msgstr ""
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:793
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr ""
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:799
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
msgstr ""
-#: misc/tune2fs.c:796
+#: misc/tune2fs.c:806
#, c-format
msgid ""
"\n"
"Sparse superblock flag set. %s"
msgstr ""
-#: misc/tune2fs.c:803
+#: misc/tune2fs.c:813
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
msgstr ""
-#: misc/tune2fs.c:811
+#: misc/tune2fs.c:821
#, c-format
msgid ""
"\n"
"Sparse superblock flag cleared. %s"
msgstr ""
-#: misc/tune2fs.c:818
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr ""
-#: misc/tune2fs.c:824
+#: misc/tune2fs.c:834
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:867
msgid "Invalid UUID format\n"
msgstr ""
-#: misc/uuidgen.c:30
-#, c-format
-msgid "Usage: %s [-r] [-t]\n"
-msgstr ""
-
#: misc/util.c:72
msgid "Proceed anyway? (y,n) "
msgstr ""
"%g days, whichever comes first. Use tune2fs -c or -i to override.\n"
msgstr ""
+#: misc/uuidgen.c:30
+#, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr ""
+
+#: resize/extent.c:197
+msgid "# Extent dump:\n"
+msgstr ""
+
+#: resize/extent.c:198
+#, c-format
+msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
+msgstr ""
+
+#: resize/extent.c:201
+#, c-format
+msgid "#\t\t %u -> %u (%d)\n"
+msgstr ""
+
#: resize/main.c:32
#, c-format
msgid ""
msgid "blocks to be moved"
msgstr ""
-#: resize/resize2fs.c:808
+#: resize/resize2fs.c:811
msgid "Going into desperation mode for block allocations\n"
msgstr ""
-#: resize/resize2fs.c:901
+#: resize/resize2fs.c:904
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:971
+#: resize/resize2fs.c:974
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:1139
+#: resize/resize2fs.c:1142
#, c-format
msgid "Inode moved %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:1204
+#: resize/resize2fs.c:1207
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr ""
-#: resize/resize2fs.c:1330
+#: resize/resize2fs.c:1333
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr ""
-#: resize/resize2fs.c:1356
+#: resize/resize2fs.c:1359
#, c-format
msgid "%d blocks of zeros...\n"
msgstr ""
-#: resize/resize2fs.c:1391
+#: resize/resize2fs.c:1394
msgid "Inode table move finished.\n"
msgstr ""
-
-#: resize/extent.c:197
-msgid "# Extent dump:\n"
-msgstr ""
-
-#: resize/extent.c:198
-#, c-format
-msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
-msgstr ""
-
-#: resize/extent.c:201
-#, c-format
-msgid "#\t\t %u -> %u (%d)\n"
-msgstr ""
# Copyright (C) 2000 Theodore Ts'o
# Theodore Ts'o <tytso@alum.mit.edu>, 2000.
#
-#, fuzzy
+#
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs 1.18\n"
-"POT-Creation-Date: 2002-11-09 11:58-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2003-05-03 14:59-0400\n"
+"PO-Revision-Date: 2002-11-09 11:58-0500\n"
+"Last-Translator: Theodore Tso <tytso@mit.edu>\n"
+"Language-Team: E2fsprogs Test <tytso@mit.edu>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:187
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:191
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr ""
msgid "while reading the bad blocks inode"
msgstr ""
-#: e2fsck/badblocks.c:71 e2fsck/iscan.c:110 e2fsck/scantest.c:107
-#: e2fsck/unix.c:853 e2fsck/unix.c:885 misc/badblocks.c:771
-#: misc/badblocks.c:782 misc/badblocks.c:796 misc/badblocks.c:808
-#: misc/dumpe2fs.c:337 misc/e2image.c:475 misc/e2image.c:491 misc/mke2fs.c:203
-#: misc/tune2fs.c:718 resize/main.c:198
+#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
+#: e2fsck/unix.c:869 e2fsck/unix.c:901 misc/badblocks.c:772
+#: misc/badblocks.c:783 misc/badblocks.c:797 misc/badblocks.c:809
+#: misc/dumpe2fs.c:337 misc/e2image.c:477 misc/e2image.c:493 misc/mke2fs.c:207
+#: misc/tune2fs.c:728 resize/main.c:198
#, c-format
msgid "while trying to open %s"
msgstr ""
msgid "while trying popen '%s'"
msgstr ""
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:210
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:214
msgid "while reading in list of bad blocks from file"
msgstr ""
msgid "empty dir map"
msgstr ""
-#. Inode number 11 is usually lost+found
#: e2fsck/emptydir.c:97
#, c-format
msgid "Empty directory block %d (#%d) in inode %d\n"
msgid "Couldn't allocate block buffer (size=%d)\n"
msgstr ""
-#: e2fsck/flushb.c:44
+#: e2fsck/flushb.c:34
#, c-format
msgid "Usage: %s disk\n"
msgstr ""
"Hey stupid! Do you need help using this program?\n"
"Usage: %s disk\n"
-#: e2fsck/flushb.c:73
+#: e2fsck/flushb.c:63
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr ""
-#: e2fsck/iscan.c:44
+#: e2fsck/iscan.c:46
#, c-format
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr ""
"Hey stupid! Do you need help using this program?\n"
"Usage: %s [-F] [-I inode_buffer_blocks] device\n"
-#: e2fsck/iscan.c:81 e2fsck/unix.c:673 resize/main.c:175
+#: e2fsck/iscan.c:83 e2fsck/unix.c:689 resize/main.c:175
#, c-format
msgid "while opening %s for flushing"
msgstr ""
-#: e2fsck/iscan.c:86 e2fsck/unix.c:679 resize/main.c:182
+#: e2fsck/iscan.c:88 e2fsck/unix.c:695 resize/main.c:182
#, c-format
msgid "while trying to flush %s"
msgstr ""
-#: e2fsck/iscan.c:119 e2fsck/scantest.c:114 misc/e2image.c:377
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:377
msgid "while opening inode scan"
msgstr ""
-#: e2fsck/iscan.c:127 misc/e2image.c:395
+#: e2fsck/iscan.c:129 misc/e2image.c:395
msgid "while getting next inode"
msgstr ""
-#: e2fsck/iscan.c:136
+#: e2fsck/iscan.c:138
#, c-format
msgid "%d inodes scanned.\n"
msgstr ""
-#: e2fsck/journal.c:418
+#: e2fsck/journal.c:420
msgid "reading journal superblock\n"
msgstr ""
-#: e2fsck/journal.c:475
+#: e2fsck/journal.c:477
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr ""
-#: e2fsck/journal.c:484
+#: e2fsck/journal.c:486
#, c-format
msgid "%s: journal too short\n"
msgstr ""
-#: e2fsck/journal.c:756
+#: e2fsck/journal.c:758
#, c-format
msgid "%s: recovering journal\n"
msgstr ""
-#: e2fsck/journal.c:758
+#: e2fsck/journal.c:760
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr ""
-#: e2fsck/journal.c:779
+#: e2fsck/journal.c:781
#, c-format
msgid "while trying to re-open %s"
msgstr ""
msgid "<The NULL inode>"
msgstr ""
-#. 0
#: e2fsck/message.c:143
msgid "<The bad blocks inode>"
msgstr ""
-#. 1
-#. 2
#: e2fsck/message.c:145
msgid "<The ACL index inode>"
msgstr ""
-#. 3
#: e2fsck/message.c:146
msgid "<The ACL data inode>"
msgstr ""
-#. 4
#: e2fsck/message.c:147
msgid "<The boot loader inode>"
msgstr ""
-#. 5
#: e2fsck/message.c:148
msgid "<The undelete directory inode>"
msgstr ""
-#. 6
#: e2fsck/message.c:149
msgid "<The group descriptor inode>"
msgstr ""
-#. 7
#: e2fsck/message.c:150
msgid "<The journal inode>"
msgstr ""
-#. 8
#: e2fsck/message.c:151
msgid "<Reserved inode 9>"
msgstr ""
-#. 9
#: e2fsck/message.c:152
msgid "<Reserved inode 10>"
msgstr ""
msgid "returned from clone_file_block"
msgstr ""
-#.
-#. * Allocate bitmaps structures
-#.
-#: e2fsck/pass1.c:311
+#: e2fsck/pass1.c:296
msgid "in-use inode map"
msgstr ""
-#: e2fsck/pass1.c:320
+#: e2fsck/pass1.c:305
msgid "directory inode map"
msgstr ""
-#: e2fsck/pass1.c:328
+#: e2fsck/pass1.c:313
msgid "regular file inode map"
msgstr ""
-#: e2fsck/pass1.c:335
+#: e2fsck/pass1.c:320
msgid "in-use block map"
msgstr ""
-#: e2fsck/pass1.c:382
+#: e2fsck/pass1.c:367
msgid "doing inode scan"
msgstr ""
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:736
msgid "Pass 1"
msgstr ""
-#: e2fsck/pass1.c:809
+#: e2fsck/pass1.c:794
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr ""
-#: e2fsck/pass1.c:851
+#: e2fsck/pass1.c:836
msgid "bad inode map"
msgstr ""
-#: e2fsck/pass1.c:873
+#: e2fsck/pass1.c:858
msgid "inode in bad block map"
msgstr ""
-#: e2fsck/pass1.c:893
+#: e2fsck/pass1.c:878
msgid "imagic inode map"
msgstr ""
-#: e2fsck/pass1.c:920
+#: e2fsck/pass1.c:905
msgid "multiply claimed block map"
msgstr ""
-#: e2fsck/pass1.c:1019
+#: e2fsck/pass1.c:1004
msgid "ext attr block map"
msgstr ""
-#: e2fsck/pass1.c:1775
+#: e2fsck/pass1.c:1760
msgid "block bitmap"
msgstr ""
-#: e2fsck/pass1.c:1779
+#: e2fsck/pass1.c:1764
msgid "inode bitmap"
msgstr ""
-#: e2fsck/pass1.c:1783
+#: e2fsck/pass1.c:1768
msgid "inode table"
msgstr ""
-#: e2fsck/pass2.c:290
+#: e2fsck/pass2.c:291
msgid "Pass 2"
msgstr ""
-#.
-#. * Allocate some bitmaps to do loop detection.
-#.
-#: e2fsck/pass3.c:80
+#: e2fsck/pass3.c:79
msgid "inode done bitmap"
msgstr ""
-#: e2fsck/pass3.c:91
+#: e2fsck/pass3.c:90
msgid "Peak memory"
msgstr ""
-#: e2fsck/pass3.c:144
+#: e2fsck/pass3.c:143
msgid "Pass 3"
msgstr ""
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:333
msgid "inode loop detection bitmap"
msgstr ""
msgid "(no prompt)"
msgstr ""
-#. 0
#: e2fsck/problem.c:50
msgid "Fix"
msgstr ""
-#. 1
#: e2fsck/problem.c:51
msgid "Clear"
msgstr ""
-#. 2
#: e2fsck/problem.c:52
msgid "Relocate"
msgstr ""
-#. 3
#: e2fsck/problem.c:53
msgid "Allocate"
msgstr ""
-#. 4
#: e2fsck/problem.c:54
msgid "Expand"
msgstr ""
-#. 5
#: e2fsck/problem.c:55
msgid "Connect to /lost+found"
msgstr ""
-#. 6
#: e2fsck/problem.c:56
msgid "Create"
msgstr ""
-#. 7
#: e2fsck/problem.c:57
msgid "Salvage"
msgstr ""
-#. 8
#: e2fsck/problem.c:58
msgid "Truncate"
msgstr ""
-#. 9
#: e2fsck/problem.c:59
msgid "Clear inode"
msgstr ""
-#. 10
#: e2fsck/problem.c:60
msgid "Abort"
msgstr ""
-#. 11
#: e2fsck/problem.c:61
msgid "Split"
msgstr ""
-#. 12
#: e2fsck/problem.c:62
msgid "Continue"
msgstr ""
-#. 13
#: e2fsck/problem.c:63
msgid "Clone duplicate/bad blocks"
msgstr ""
-#. 14
#: e2fsck/problem.c:64
msgid "Delete file"
msgstr ""
-#. 15
#: e2fsck/problem.c:65
msgid "Suppress messages"
msgstr ""
-#. 16
#: e2fsck/problem.c:66
msgid "Unlink"
msgstr ""
-#. 17
#: e2fsck/problem.c:67
msgid "Clear HTree index"
msgstr ""
msgid "(NONE)"
msgstr ""
-#. 0
#: e2fsck/problem.c:77
msgid "FIXED"
msgstr ""
-#. 1
#: e2fsck/problem.c:78
msgid "CLEARED"
msgstr ""
-#. 2
#: e2fsck/problem.c:79
msgid "RELOCATED"
msgstr ""
-#. 3
#: e2fsck/problem.c:80
msgid "ALLOCATED"
msgstr ""
-#. 4
#: e2fsck/problem.c:81
msgid "EXPANDED"
msgstr ""
-#. 5
#: e2fsck/problem.c:82
msgid "RECONNECTED"
msgstr ""
-#. 6
#: e2fsck/problem.c:83
msgid "CREATED"
msgstr ""
-#. 7
#: e2fsck/problem.c:84
msgid "SALVAGED"
msgstr ""
-#. 8
#: e2fsck/problem.c:85
msgid "TRUNCATED"
msgstr ""
-#. 9
#: e2fsck/problem.c:86
msgid "INODE CLEARED"
msgstr ""
-#. 10
#: e2fsck/problem.c:87
msgid "ABORTED"
msgstr ""
-#. 11
#: e2fsck/problem.c:88
msgid "SPLIT"
msgstr ""
-#. 12
#: e2fsck/problem.c:89
msgid "CONTINUING"
msgstr ""
-#. 13
#: e2fsck/problem.c:90
msgid "DUPLICATE/BAD BLOCKS CLONED"
msgstr ""
-#. 14
#: e2fsck/problem.c:91
msgid "FILE DELETED"
msgstr ""
-#. 15
#: e2fsck/problem.c:92
msgid "SUPPRESSED"
msgstr ""
-#. 16
#: e2fsck/problem.c:93
msgid "UNLINKED"
msgstr ""
-#. 17
#: e2fsck/problem.c:94
msgid "HTREE INDEX CLEARED"
msgstr ""
-#. Pre-Pass 1 errors
-#. Block bitmap not in group
#: e2fsck/problem.c:103
msgid "@b @B for @g %g is not in @g. (@b %b)\n"
msgstr ""
-#. Inode bitmap not in group
#: e2fsck/problem.c:107
msgid "@i @B for @g %g is not in @g. (@b %b)\n"
msgstr ""
msgid "Pass 1: Checking @is, @bs, and sizes\n"
msgstr ""
-#. Root directory is not an inode
#: e2fsck/problem.c:320
msgid "@r is not a @d. "
msgstr ""
msgid "@E is duplicate '..' @e.\n"
msgstr ""
-#: e2fsck/problem.c:938 e2fsck/problem.c:1204
+#: e2fsck/problem.c:938 e2fsck/problem.c:1219
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr ""
msgid "@p @h %d: node (%B) has bad depth\n"
msgstr ""
-#: e2fsck/problem.c:1094
+#: e2fsck/problem.c:1092
+msgid "Duplicate @E found. "
+msgstr ""
+
+#: e2fsck/problem.c:1097
+#, c-format
+msgid ""
+"@E has a non-unique filename.\n"
+"Rename to %s"
+msgstr ""
+
+#: e2fsck/problem.c:1102
+msgid ""
+"Duplicate @e '%Dn' found.\n"
+"\tMarking %p (%i) to be rebuilt.\n"
+"\n"
+msgstr ""
+
+#: e2fsck/problem.c:1109
msgid "Pass 3: Checking @d connectivity\n"
msgstr ""
-#: e2fsck/problem.c:1099
+#: e2fsck/problem.c:1114
msgid "@r not allocated. "
msgstr ""
-#: e2fsck/problem.c:1104
+#: e2fsck/problem.c:1119
msgid "No room in @l @d. "
msgstr ""
-#: e2fsck/problem.c:1109
+#: e2fsck/problem.c:1124
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr ""
-#: e2fsck/problem.c:1114
+#: e2fsck/problem.c:1129
msgid "/@l not found. "
msgstr ""
-#: e2fsck/problem.c:1119
+#: e2fsck/problem.c:1134
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr ""
-#: e2fsck/problem.c:1124
+#: e2fsck/problem.c:1139
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr ""
-#: e2fsck/problem.c:1129
+#: e2fsck/problem.c:1144
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr ""
-#: e2fsck/problem.c:1134
+#: e2fsck/problem.c:1149
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr ""
-#: e2fsck/problem.c:1139
+#: e2fsck/problem.c:1154
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr ""
-#: e2fsck/problem.c:1144
+#: e2fsck/problem.c:1159
#, c-format
msgid "ext2fs_new_@b: %m while trying to create /@l @d\n"
msgstr ""
-#: e2fsck/problem.c:1149
+#: e2fsck/problem.c:1164
#, c-format
msgid "ext2fs_new_@i: %m while trying to create /@l @d\n"
msgstr ""
-#: e2fsck/problem.c:1154
+#: e2fsck/problem.c:1169
#, c-format
msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n"
msgstr ""
-#: e2fsck/problem.c:1159
+#: e2fsck/problem.c:1174
#, c-format
msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
msgstr ""
-#: e2fsck/problem.c:1164
+#: e2fsck/problem.c:1179
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr ""
-#: e2fsck/problem.c:1169
+#: e2fsck/problem.c:1184
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
"\n"
msgstr ""
-#: e2fsck/problem.c:1174
+#: e2fsck/problem.c:1189
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d entry\n"
"\n"
msgstr ""
-#: e2fsck/problem.c:1179
+#: e2fsck/problem.c:1194
msgid "@A @i @B (%N): %m\n"
msgstr ""
-#: e2fsck/problem.c:1184
+#: e2fsck/problem.c:1199
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1189
+#: e2fsck/problem.c:1204
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1194
+#: e2fsck/problem.c:1209
msgid "@r is not a @d; aborting.\n"
msgstr ""
-#: e2fsck/problem.c:1199
+#: e2fsck/problem.c:1214
msgid "Cannot proceed without a @r.\n"
msgstr ""
-#: e2fsck/problem.c:1209
+#: e2fsck/problem.c:1224
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr ""
-#: e2fsck/problem.c:1216
+#: e2fsck/problem.c:1231
msgid "Pass 3A: Optimizing directories\n"
msgstr ""
-#: e2fsck/problem.c:1221
+#: e2fsck/problem.c:1236
#, c-format
msgid "Failed to create dirs_to_hash iterator: %m"
msgstr ""
-#: e2fsck/problem.c:1226
+#: e2fsck/problem.c:1241
msgid "Failed to optimize directory %q (%d): %m"
msgstr ""
-#: e2fsck/problem.c:1231
+#: e2fsck/problem.c:1246
msgid "Optimizing directories: "
msgstr ""
-#: e2fsck/problem.c:1248
+#: e2fsck/problem.c:1263
msgid "Pass 4: Checking reference counts\n"
msgstr ""
-#: e2fsck/problem.c:1263
+#: e2fsck/problem.c:1278
msgid "@i %i ref count is %Il, @s %N. "
msgstr ""
-#: e2fsck/problem.c:1267
+#: e2fsck/problem.c:1282
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
"@i_link_info[%i] is %N, @i.i_links_count is %Il. They should be the same!\n"
msgstr ""
-#: e2fsck/problem.c:1277
+#: e2fsck/problem.c:1292
msgid "Pass 5: Checking @g summary information\n"
msgstr ""
-#: e2fsck/problem.c:1282
+#: e2fsck/problem.c:1297
msgid "Padding at end of @i @B is not set. "
msgstr ""
-#: e2fsck/problem.c:1287
+#: e2fsck/problem.c:1302
msgid "Padding at end of @b @B is not set. "
msgstr ""
-#: e2fsck/problem.c:1292
+#: e2fsck/problem.c:1307
msgid "@b @B differences: "
msgstr ""
-#: e2fsck/problem.c:1312
+#: e2fsck/problem.c:1327
msgid "@i @B differences: "
msgstr ""
-#: e2fsck/problem.c:1332
+#: e2fsck/problem.c:1347
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1337
+#: e2fsck/problem.c:1352
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1342
+#: e2fsck/problem.c:1357
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1347
+#: e2fsck/problem.c:1362
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr ""
-#: e2fsck/problem.c:1352
+#: e2fsck/problem.c:1367
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr ""
-#: e2fsck/problem.c:1357
+#: e2fsck/problem.c:1372
msgid ""
"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
"endpoints (%i, %j)\n"
msgstr ""
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1378
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr ""
-#: e2fsck/problem.c:1497
+#: e2fsck/problem.c:1512
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr ""
-#: e2fsck/problem.c:1569
+#: e2fsck/problem.c:1584
msgid "IGNORED"
msgstr ""
-#: e2fsck/scantest.c:79
+#: e2fsck/scantest.c:81
#, c-format
msgid "Memory used: %d, elapsed time: %6.3f/%6.3f/%6.3f\n"
msgstr ""
-#: e2fsck/scantest.c:98
+#: e2fsck/scantest.c:100
#, c-format
msgid "size of inode=%d\n"
msgstr ""
-#: e2fsck/scantest.c:119
+#: e2fsck/scantest.c:121
msgid "while starting inode scan"
msgstr ""
-#: e2fsck/scantest.c:130
+#: e2fsck/scantest.c:132
msgid "while doing inode scan"
msgstr ""
msgid "Byte swap"
msgstr ""
-#: e2fsck/unix.c:63
+#: e2fsck/unix.c:67
#, fuzzy, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
"\t\t[-I inode_buffer_blocks] [-P process_inode_size]\n"
"\t\t[-l|-L bad_blocks_file] [-C fd] device\n"
-#: e2fsck/unix.c:69
+#: e2fsck/unix.c:73
#, fuzzy
msgid ""
"\n"
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
" -l bad_blocks_file Add to badblocks list\n"
" -L bad_blocks_file Set badblocks list\n"
-#: e2fsck/unix.c:75
+#: e2fsck/unix.c:79
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
" -L bad_blocks_file Set badblocks list\n"
msgstr ""
-#: e2fsck/unix.c:109
+#: e2fsck/unix.c:113
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr ""
"%s: %d/%d stupid files (%0d.%d%% non-contiguous), %d/%d blocks wasted on "
"your worthless data\n"
-#: e2fsck/unix.c:124
+#: e2fsck/unix.c:128
#, c-format
msgid ""
"\n"
"%8d inodes used (%d%%)\n"
msgstr ""
-#: e2fsck/unix.c:126
+#: e2fsck/unix.c:130
#, c-format
msgid "%8d non-contiguous inodes (%0d.%d%%)\n"
msgstr ""
-#: e2fsck/unix.c:128
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr ""
-#: e2fsck/unix.c:130
+#: e2fsck/unix.c:134
#, c-format
msgid ""
"%8d blocks used (%d%%)\n"
"%8d bad blocks\n"
msgstr ""
-#: e2fsck/unix.c:134
+#: e2fsck/unix.c:138
#, c-format
msgid "%8d large files\n"
msgstr ""
-#: e2fsck/unix.c:135
+#: e2fsck/unix.c:139
#, c-format
msgid ""
"\n"
"%8d files\n"
msgstr ""
-#: e2fsck/unix.c:168
+#: e2fsck/unix.c:172
#, c-format
msgid "%8d large file%s\n"
msgstr ""
-#: e2fsck/unix.c:211 misc/badblocks.c:612 misc/tune2fs.c:734 misc/util.c:133
+#: e2fsck/unix.c:215 misc/badblocks.c:613 misc/tune2fs.c:744 misc/util.c:133
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr ""
-#: e2fsck/unix.c:226
+#: e2fsck/unix.c:230
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr ""
-#: e2fsck/unix.c:230
+#: e2fsck/unix.c:234
#, c-format
msgid "%s is mounted. "
msgstr ""
-#: e2fsck/unix.c:232
+#: e2fsck/unix.c:236
msgid ""
"Cannot continue, aborting.\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:233
+#: e2fsck/unix.c:237
msgid ""
"\n"
"\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:236
+#: e2fsck/unix.c:240
msgid "Do you really want to continue"
msgstr ""
-#: e2fsck/unix.c:238
+#: e2fsck/unix.c:242
msgid "check aborted.\n"
msgstr ""
-#: e2fsck/unix.c:260
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr ""
-#: e2fsck/unix.c:262
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr ""
-#: e2fsck/unix.c:266
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr ""
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:275
#, c-format
msgid " has gone %u days without being checked"
msgstr ""
-#: e2fsck/unix.c:277
+#: e2fsck/unix.c:281
msgid ", check forced.\n"
msgstr ""
-#: e2fsck/unix.c:280
+#: e2fsck/unix.c:284
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks\n"
msgstr ""
-#: e2fsck/unix.c:411
+#: e2fsck/unix.c:431
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr ""
-#: e2fsck/unix.c:463
-msgid "Couldn't allocate memory to parse extended options!\n"
-msgstr ""
-
-#: e2fsck/unix.c:489
+#: e2fsck/unix.c:502
msgid "Invalid EA version.\n"
msgstr ""
-#: e2fsck/unix.c:498
+#: e2fsck/unix.c:511
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:547
+#: e2fsck/unix.c:561
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr ""
-#: e2fsck/unix.c:551
+#: e2fsck/unix.c:565
msgid "Invalid completion information file descriptor"
msgstr ""
-#: e2fsck/unix.c:581
+#: e2fsck/unix.c:580
+msgid "Only one the options -p/-a, -n or -y may be specified."
+msgstr ""
+
+#: e2fsck/unix.c:601
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr ""
-#: e2fsck/unix.c:650
+#: e2fsck/unix.c:666
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr ""
-#: e2fsck/unix.c:688
+#: e2fsck/unix.c:704
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr ""
-#: e2fsck/unix.c:695
+#: e2fsck/unix.c:711
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr ""
-#: e2fsck/unix.c:773
+#: e2fsck/unix.c:789
msgid "Error: ext2fs library version out of date!\n"
msgstr ""
-#: e2fsck/unix.c:781
+#: e2fsck/unix.c:797
msgid "while trying to initialize program"
msgstr ""
-#: e2fsck/unix.c:795
+#: e2fsck/unix.c:811
#, c-format
msgid "\tUsing %s, %s\n"
msgstr ""
-#: e2fsck/unix.c:807
+#: e2fsck/unix.c:823
msgid "need terminal for interactive repairs"
msgstr ""
-#: e2fsck/unix.c:843
+#: e2fsck/unix.c:859
#, c-format
msgid "%s trying backup blocks...\n"
msgstr ""
-#: e2fsck/unix.c:844
+#: e2fsck/unix.c:860
msgid "Couldn't find ext2 superblock,"
msgstr ""
-#: e2fsck/unix.c:845
+#: e2fsck/unix.c:861
msgid "Group descriptors look bad..."
msgstr ""
-#: e2fsck/unix.c:856
+#: e2fsck/unix.c:872
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:862
+#: e2fsck/unix.c:878
msgid "Could this be a zero-length partition?\n"
msgstr ""
-#: e2fsck/unix.c:864
+#: e2fsck/unix.c:880
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr ""
-#: e2fsck/unix.c:869
+#: e2fsck/unix.c:885
msgid "Possibly non-existent or swap device?\n"
msgstr ""
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:888
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
msgstr ""
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:904
msgid "Get a newer version of e2fsck!"
msgstr ""
-#: e2fsck/unix.c:914
+#: e2fsck/unix.c:925
#, c-format
msgid "while checking ext3 journal for %s"
msgstr ""
-#: e2fsck/unix.c:925
+#: e2fsck/unix.c:936
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
msgstr ""
-#: e2fsck/unix.c:933
+#: e2fsck/unix.c:949
+#, c-format
+msgid "unable to set superblock flags on %s\n"
+msgstr ""
+
+#: e2fsck/unix.c:955
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr ""
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:984
msgid "Warning: compression support is experimental.\n"
msgstr ""
-#: e2fsck/unix.c:966
+#: e2fsck/unix.c:989
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
"\tbut filesystem %s has HTREE directories.\n"
msgstr ""
-#: e2fsck/unix.c:1009
+#: e2fsck/unix.c:1032
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr ""
-#: e2fsck/unix.c:1029
+#: e2fsck/unix.c:1052
msgid "while reading bad blocks inode"
msgstr ""
-#: e2fsck/unix.c:1031
+#: e2fsck/unix.c:1054
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr ""
-#: e2fsck/unix.c:1038
+#: e2fsck/unix.c:1061
msgid "Restarting e2fsck from the beginning...\n"
msgstr ""
-#: e2fsck/unix.c:1042
+#: e2fsck/unix.c:1065
msgid "while resetting context"
msgstr ""
-#: e2fsck/unix.c:1049
+#: e2fsck/unix.c:1072
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr ""
-#: e2fsck/unix.c:1054
+#: e2fsck/unix.c:1077
msgid "aborted"
msgstr ""
-#: e2fsck/unix.c:1062
+#: e2fsck/unix.c:1085
#, c-format
msgid ""
"\n"
"%s: ***** FILE SYSTEM WAS MODIFIED *****\n"
msgstr ""
-#: e2fsck/unix.c:1065
+#: e2fsck/unix.c:1088
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr ""
-#: e2fsck/unix.c:1071
+#: e2fsck/unix.c:1094
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: e2fsck/util.c:99 misc/util.c:68
+#: e2fsck/util.c:130 misc/util.c:68
msgid "yY"
msgstr ""
-#: e2fsck/util.c:100
+#: e2fsck/util.c:131
msgid "nN"
msgstr ""
-#: e2fsck/util.c:114
+#: e2fsck/util.c:145
msgid "<y>"
msgstr ""
-#: e2fsck/util.c:116
+#: e2fsck/util.c:147
msgid "<n>"
msgstr ""
-#: e2fsck/util.c:118
+#: e2fsck/util.c:149
msgid " (y/n)"
msgstr ""
-#: e2fsck/util.c:133
+#: e2fsck/util.c:164
msgid "cancelled!\n"
msgstr ""
-#: e2fsck/util.c:148
+#: e2fsck/util.c:179
msgid "yes\n"
msgstr ""
-#: e2fsck/util.c:150
+#: e2fsck/util.c:181
msgid "no\n"
msgstr ""
-#: e2fsck/util.c:160
+#: e2fsck/util.c:191
#, c-format
msgid ""
"%s? no\n"
"\n"
msgstr ""
-#: e2fsck/util.c:164
+#: e2fsck/util.c:195
#, c-format
msgid ""
"%s? yes\n"
"\n"
msgstr ""
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "yes"
msgstr ""
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "no"
msgstr ""
-#: e2fsck/util.c:181
+#: e2fsck/util.c:212
#, c-format
msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
msgstr ""
-#: e2fsck/util.c:186
+#: e2fsck/util.c:217
msgid "reading inode and block bitmaps"
msgstr ""
-#: e2fsck/util.c:191
+#: e2fsck/util.c:222
#, c-format
msgid "while retrying to read bitmaps for %s"
msgstr ""
-#: e2fsck/util.c:203
+#: e2fsck/util.c:234
msgid "writing block bitmaps"
msgstr ""
-#: e2fsck/util.c:208
+#: e2fsck/util.c:239
#, c-format
msgid "while retrying to write block bitmaps for %s"
msgstr ""
-#: e2fsck/util.c:215
+#: e2fsck/util.c:246
msgid "writing inode bitmaps"
msgstr ""
-#: e2fsck/util.c:220
+#: e2fsck/util.c:251
#, c-format
msgid "while retrying to write inode bitmaps for %s"
msgstr ""
-#: e2fsck/util.c:233
+#: e2fsck/util.c:264
#, c-format
msgid ""
"\n"
"\t(i.e., without -a or -p options)\n"
msgstr ""
-#: e2fsck/util.c:298
+#: e2fsck/util.c:329
#, c-format
msgid "Memory used: %dk/%dk (%dk/%dk), "
msgstr ""
-#: e2fsck/util.c:302
+#: e2fsck/util.c:333
#, c-format
msgid "Memory used: %d, "
msgstr ""
-#: e2fsck/util.c:308
+#: e2fsck/util.c:339
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr ""
-#: e2fsck/util.c:313
+#: e2fsck/util.c:344
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr ""
-#: e2fsck/util.c:327
+#: e2fsck/util.c:358
#, c-format
msgid "while reading inode %ld in %s"
msgstr ""
-#: e2fsck/util.c:340
+#: e2fsck/util.c:371
#, c-format
msgid "while writing inode %ld in %s"
msgstr ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwn]\n"
" [-c blocks_at_once] [-p num_passes] device blocks_count [start_count]\n"
-#: misc/badblocks.c:171 misc/badblocks.c:198
+#: misc/badblocks.c:172 misc/badblocks.c:199
msgid "during seek"
msgstr ""
-#: misc/badblocks.c:178
+#: misc/badblocks.c:179
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr ""
-#: misc/badblocks.c:219
+#: misc/badblocks.c:220
msgid "during ext2fs_sync_device"
msgstr ""
-#: misc/badblocks.c:235 misc/badblocks.c:411
+#: misc/badblocks.c:236 misc/badblocks.c:412
msgid "while beginning bad block list iteration"
msgstr ""
-#: misc/badblocks.c:245 misc/badblocks.c:314 misc/badblocks.c:421
+#: misc/badblocks.c:246 misc/badblocks.c:315 misc/badblocks.c:422
msgid "while allocating buffers"
msgstr ""
-#: misc/badblocks.c:250
+#: misc/badblocks.c:251
msgid "Checking for bad blocks in read-only mode\n"
msgstr ""
-#: misc/badblocks.c:251 misc/badblocks.c:323 misc/badblocks.c:440
+#: misc/badblocks.c:252 misc/badblocks.c:324 misc/badblocks.c:441
#, c-format
msgid "From block %lu to %lu\n"
msgstr ""
-#: misc/badblocks.c:259
+#: misc/badblocks.c:260
msgid "Checking for bad blocks (read-only test): "
msgstr ""
-#: misc/badblocks.c:322
+#: misc/badblocks.c:323
msgid "Checking for bad blocks in read-write mode\n"
msgstr ""
-#: misc/badblocks.c:329
+#: misc/badblocks.c:330
#, c-format
msgid "Writing pattern 0x%08x: "
msgstr ""
-#: misc/badblocks.c:343 misc/badblocks.c:368
+#: misc/badblocks.c:344 misc/badblocks.c:369
#, c-format
msgid "during seek on block %d"
msgstr ""
-#: misc/badblocks.c:355
+#: misc/badblocks.c:356
msgid "Reading and comparing: "
msgstr ""
-#: misc/badblocks.c:428
+#: misc/badblocks.c:429
msgid "Initializing random test data\n"
msgstr ""
-#: misc/badblocks.c:439
+#: misc/badblocks.c:440
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr ""
-#: misc/badblocks.c:443
+#: misc/badblocks.c:444
msgid "Checking for bad blocks (non-destructive read-write test): "
msgstr ""
-#: misc/badblocks.c:452
+#: misc/badblocks.c:453
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
msgstr ""
-#: misc/badblocks.c:509
+#: misc/badblocks.c:510
#, c-format
msgid "during test data write, block %lu"
msgstr ""
-#: misc/badblocks.c:619 misc/util.c:140
+#: misc/badblocks.c:620 misc/util.c:140
#, c-format
msgid "%s is mounted; "
msgstr ""
-#: misc/badblocks.c:621
+#: misc/badblocks.c:622
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr ""
-#: misc/badblocks.c:625
+#: misc/badblocks.c:626
msgid "it's not safe to run badblocks!\n"
msgstr ""
-#: misc/badblocks.c:668 misc/mke2fs.c:881
+#: misc/badblocks.c:669 misc/mke2fs.c:885
#, c-format
msgid "bad block size - %s"
msgstr ""
-#: misc/badblocks.c:731
+#: misc/badblocks.c:732
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
msgstr ""
-#: misc/badblocks.c:737
+#: misc/badblocks.c:738
msgid "while trying to determine device size"
msgstr ""
-#: misc/badblocks.c:743 misc/mke2fs.c:1054
+#: misc/badblocks.c:744 misc/mke2fs.c:1059
#, c-format
msgid "bad blocks count - %s"
msgstr ""
-#: misc/badblocks.c:752
+#: misc/badblocks.c:753
#, c-format
msgid "bad starting block - %s"
msgstr ""
-#: misc/badblocks.c:758
+#: misc/badblocks.c:759
#, c-format
msgid "bad blocks range: %lu-%lu"
msgstr ""
-#: misc/badblocks.c:819
+#: misc/badblocks.c:820
msgid "creating in-memory bad blocks list"
msgstr ""
-#: misc/badblocks.c:834
+#: misc/badblocks.c:835
msgid "adding to in-memory bad block list"
msgstr ""
-#: misc/badblocks.c:858
+#: misc/badblocks.c:859
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr ""
"Journal number of users: %d\n"
msgstr ""
-#. Print version number and exit
-#: misc/dumpe2fs.c:312 misc/mke2fs.c:1040
+#: misc/dumpe2fs.c:312 misc/mke2fs.c:1045
#, c-format
msgid "\tUsing %s\n"
msgstr ""
-#: misc/dumpe2fs.c:339 misc/e2image.c:477 misc/tune2fs.c:721 resize/main.c:200
+#: misc/dumpe2fs.c:339 misc/e2image.c:479 misc/tune2fs.c:731 resize/main.c:200
msgid "Couldn't find valid filesystem superblock.\n"
msgstr ""
"%s: %s: error reading bitmaps: %s\n"
msgstr ""
+#: misc/e2image.c:50
+#, fuzzy, c-format
+msgid "Usage: %s [-r] device file\n"
+msgstr ""
+"Hey stupid! Do you need help using this program?\n"
+"Usage: %s [-RVadlv] [files...]\n"
+
+#: misc/e2image.c:61
+msgid "Couldn't allocate header buffer\n"
+msgstr ""
+
+#: misc/e2image.c:80
+#, c-format
+msgid "short write (only %d bytes) forwriting image header"
+msgstr ""
+
+#: misc/e2image.c:99
+msgid "while writing superblock"
+msgstr ""
+
+#: misc/e2image.c:107
+msgid "while writing inode table"
+msgstr ""
+
+#: misc/e2image.c:114
+msgid "while writing block bitmap"
+msgstr ""
+
+#: misc/e2image.c:121
+msgid "while writing inode bitmap"
+msgstr ""
+
#: misc/e2label.c:57
#, c-format
msgid "e2label: cannot open %s\n"
msgid "e2label: not an ext2 filesystem\n"
msgstr ""
-#: misc/e2label.c:96 misc/tune2fs.c:828
+#: misc/e2label.c:96 misc/tune2fs.c:838
msgid "Warning: label too long, truncating.\n"
msgstr ""
msgid "e2label: error writing superblock\n"
msgstr ""
-#: misc/e2label.c:116 misc/tune2fs.c:427
+#: misc/e2label.c:116 misc/tune2fs.c:426
msgid "Usage: e2label device [newlabel]\n"
msgstr ""
"Hey stupid! Do you need help using this program?\n"
"Usage: e2label device [newlabel]\n"
-#: misc/e2image.c:50
-#, fuzzy, c-format
-msgid "Usage: %s [-r] device file\n"
-msgstr ""
-"Hey stupid! Do you need help using this program?\n"
-"Usage: %s [-RVadlv] [files...]\n"
-
-#: misc/e2image.c:61
-msgid "Couldn't allocate header buffer\n"
-msgstr ""
-
-#: misc/e2image.c:80
-#, c-format
-msgid "short write (only %d bytes) forwriting image header"
-msgstr ""
-
-#: misc/e2image.c:99
-msgid "while writing superblock"
-msgstr ""
-
-#: misc/e2image.c:107
-msgid "while writing inode table"
-msgstr ""
-
-#: misc/e2image.c:114
-msgid "while writing block bitmap"
-msgstr ""
-
-#: misc/e2image.c:121
-msgid "while writing inode bitmap"
-msgstr ""
-
-#: misc/findsuper.c:135
+#: misc/findsuper.c:126
#, fuzzy
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr ""
"Hey stupid! Do you need help using this program?\n"
"Usage: findsuper device [skiprate [start]]\n"
-#: misc/findsuper.c:141
+#: misc/findsuper.c:132
#, c-format
msgid "skiprate should be a number, not %s\n"
msgstr ""
-#: misc/findsuper.c:146
+#: misc/findsuper.c:137
msgid "skipbytes must be a multiple of the sector size\n"
msgstr ""
-#: misc/findsuper.c:152
+#: misc/findsuper.c:143
#, c-format
msgid "startkb should be a number, not %s\n"
msgstr ""
-#: misc/findsuper.c:156
+#: misc/findsuper.c:147
#, c-format
msgid "startkb should be positive, not %Ld\n"
msgstr ""
-#. Now, go looking for the superblock !
-#: misc/findsuper.c:166
+#: misc/findsuper.c:157
#, c-format
msgid "starting at %Ld, with %d byte increments\n"
msgstr ""
-#: misc/findsuper.c:167
+#: misc/findsuper.c:158
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr ""
-#: misc/findsuper.c:213
+#: misc/findsuper.c:204
#, c-format
msgid ""
"\n"
"%14Ld: finished with errno %d\n"
msgstr ""
-#: misc/fsck.c:258
-#, c-format
-msgid "Could not determine filesystem type for %s\n"
-msgstr ""
-
-#: misc/fsck.c:278
+#: misc/fsck.c:331
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr ""
-#: misc/fsck.c:288
+#: misc/fsck.c:341
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr ""
-#: misc/fsck.c:308
+#: misc/fsck.c:356
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
"\n"
msgstr ""
-#: misc/fsck.c:422
+#: misc/fsck.c:455
#, c-format
msgid "fsck: %s: not found\n"
msgstr ""
-#: misc/fsck.c:535
+#: misc/fsck.c:568
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr ""
-#: misc/fsck.c:557
+#: misc/fsck.c:590
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr ""
-#: misc/fsck.c:563
+#: misc/fsck.c:596
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr ""
-#: misc/fsck.c:599
+#: misc/fsck.c:632
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr ""
-#: misc/fsck.c:659
+#: misc/fsck.c:687
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr ""
-#: misc/fsck.c:680
+#: misc/fsck.c:708
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
msgstr ""
-#: misc/fsck.c:699
+#: misc/fsck.c:727
msgid "Couldn't allocate memory for filesystem types\n"
msgstr ""
-#: misc/fsck.c:839
+#: misc/fsck.c:867
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr ""
-#: misc/fsck.c:895
+#: misc/fsck.c:923
msgid "Checking all file systems.\n"
msgstr ""
-#: misc/fsck.c:983
+#: misc/fsck.c:1009
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr ""
-#: misc/fsck.c:1003
+#: misc/fsck.c:1029
#, fuzzy
msgid "Usage: fsck [-ACNPRTV] [-t fstype] [fs-options] [filesys ...]\n"
msgstr ""
"Hey stupid! Do you need help using this program?\n"
"Usage: fsck [-ACNPRTV] [-t fstype] [fs-options] filesys\n"
-#: misc/fsck.c:1047
+#: misc/fsck.c:1071
#, c-format
msgid "%s: too many devices\n"
msgstr ""
-#: misc/fsck.c:1057 misc/fsck.c:1126
+#: misc/fsck.c:1104 misc/fsck.c:1173
#, c-format
msgid "%s: too many arguments\n"
msgstr ""
-#: misc/get_device_by_label.c:443
-#, c-format
-msgid "WARNING: %s: bad UUID\n"
-msgstr ""
-
#: misc/lsattr.c:67
#, c-format
msgid "Usage: %s [-RVadlv] [files...]\n"
"\t[-r fs-revision] [-R raid_opts] [-s sparse-super-flag]\n"
"\t[-qvSV] device [blocks-count]\n"
-#: misc/mke2fs.c:228
+#: misc/mke2fs.c:232
#, c-format
msgid "Running command: %s\n"
msgstr ""
-#: misc/mke2fs.c:232
+#: misc/mke2fs.c:236
#, c-format
msgid "while trying run '%s'"
msgstr ""
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:243
msgid "while processing list of bad blocks from program"
msgstr ""
-#: misc/mke2fs.c:265
+#: misc/mke2fs.c:269
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr ""
-#: misc/mke2fs.c:267
+#: misc/mke2fs.c:271
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr ""
-#: misc/mke2fs.c:270
+#: misc/mke2fs.c:274
msgid "Aborting....\n"
msgstr ""
-#: misc/mke2fs.c:290
+#: misc/mke2fs.c:294
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:308
+#: misc/mke2fs.c:312
msgid "while marking bad blocks as used"
msgstr ""
-#: misc/mke2fs.c:361
+#: misc/mke2fs.c:365
msgid "done \n"
msgstr ""
-#: misc/mke2fs.c:396
+#: misc/mke2fs.c:400
msgid "while allocating zeroizing buffer"
msgstr ""
-#: misc/mke2fs.c:436
+#: misc/mke2fs.c:440
msgid "Writing inode tables: "
msgstr ""
-#: misc/mke2fs.c:447
+#: misc/mke2fs.c:451
#, c-format
msgid ""
"\n"
"Could not write %d blocks in inode table starting at %d: %s\n"
msgstr ""
-#: misc/mke2fs.c:470
+#: misc/mke2fs.c:474
msgid "while creating root dir"
msgstr ""
-#: misc/mke2fs.c:477
+#: misc/mke2fs.c:481
msgid "while reading root inode"
msgstr ""
-#: misc/mke2fs.c:486
+#: misc/mke2fs.c:490
msgid "while setting root inode ownership"
msgstr ""
-#: misc/mke2fs.c:504
+#: misc/mke2fs.c:508
msgid "while creating /lost+found"
msgstr ""
-#: misc/mke2fs.c:511
+#: misc/mke2fs.c:515
msgid "while looking up /lost+found"
msgstr ""
-#: misc/mke2fs.c:521
+#: misc/mke2fs.c:525
msgid "while expanding /lost+found"
msgstr ""
-#: misc/mke2fs.c:537
+#: misc/mke2fs.c:541
msgid "while setting bad block inode"
msgstr ""
-#: misc/mke2fs.c:569
+#: misc/mke2fs.c:573
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr ""
-#: misc/mke2fs.c:579
+#: misc/mke2fs.c:583
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr ""
-#: misc/mke2fs.c:595
+#: misc/mke2fs.c:599
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr ""
-#: misc/mke2fs.c:611
+#: misc/mke2fs.c:615
msgid "while initializing journal superblock"
msgstr ""
-#: misc/mke2fs.c:617
+#: misc/mke2fs.c:621
msgid "Zeroing journal device: "
msgstr ""
-#: misc/mke2fs.c:624
+#: misc/mke2fs.c:628
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr ""
-#: misc/mke2fs.c:635
+#: misc/mke2fs.c:639
msgid "while writing journal superblock"
msgstr ""
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:653
#, c-format
msgid ""
"warning: %d blocks unused.\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:654
+#: misc/mke2fs.c:658
#, c-format
msgid "Filesystem label=%s\n"
msgstr ""
-#: misc/mke2fs.c:655
+#: misc/mke2fs.c:659
msgid "OS type: "
msgstr ""
-#: misc/mke2fs.c:660
+#: misc/mke2fs.c:664
msgid "(unknown os)"
msgstr ""
-#: misc/mke2fs.c:663
+#: misc/mke2fs.c:667
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr ""
-#: misc/mke2fs.c:665
+#: misc/mke2fs.c:669
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr ""
-#: misc/mke2fs.c:667
+#: misc/mke2fs.c:671
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr ""
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:673
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr ""
-#: misc/mke2fs.c:672
+#: misc/mke2fs.c:676
#, c-format
msgid "First data block=%u\n"
msgstr ""
-#: misc/mke2fs.c:674
+#: misc/mke2fs.c:678
#, c-format
msgid "%u block groups\n"
msgstr ""
-#: misc/mke2fs.c:676
+#: misc/mke2fs.c:680
#, c-format
msgid "%u block group\n"
msgstr ""
-#: misc/mke2fs.c:677
+#: misc/mke2fs.c:681
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr ""
-#: misc/mke2fs.c:679
+#: misc/mke2fs.c:683
#, c-format
msgid "%u inodes per group\n"
msgstr ""
-#: misc/mke2fs.c:686
+#: misc/mke2fs.c:690
msgid "Superblock backups stored on blocks: "
msgstr ""
-#: misc/mke2fs.c:736
+#: misc/mke2fs.c:740
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr ""
-#: misc/mke2fs.c:761
+#: misc/mke2fs.c:765
msgid "Invalid stride parameter.\n"
msgstr ""
-#: misc/mke2fs.c:769
+#: misc/mke2fs.c:773
msgid ""
"\n"
"Bad raid options specified.\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:885
+#: misc/mke2fs.c:889
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr ""
-#: misc/mke2fs.c:901
+#: misc/mke2fs.c:906
#, c-format
msgid "bad fragment size - %s"
msgstr ""
-#: misc/mke2fs.c:907
+#: misc/mke2fs.c:912
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr ""
-#: misc/mke2fs.c:914
+#: misc/mke2fs.c:919
msgid "Illegal number for blocks per group"
msgstr ""
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:924
msgid "blocks per group must be multiple of 8"
msgstr ""
-#: misc/mke2fs.c:929
+#: misc/mke2fs.c:934
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr ""
-#: misc/mke2fs.c:948
+#: misc/mke2fs.c:953
msgid "in malloc for bad_blocks_filename"
msgstr ""
-#: misc/mke2fs.c:957
+#: misc/mke2fs.c:962
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr ""
-#: misc/mke2fs.c:989
+#: misc/mke2fs.c:994
#, c-format
msgid "bad inode size - %s"
msgstr ""
-#: misc/mke2fs.c:1025 misc/tune2fs.c:287
+#: misc/mke2fs.c:1030 misc/tune2fs.c:286
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr ""
-#: misc/mke2fs.c:1078 misc/mke2fs.c:1379
+#: misc/mke2fs.c:1087 misc/mke2fs.c:1396
#, c-format
msgid "while trying to open journal device %s\n"
msgstr ""
-#: misc/mke2fs.c:1091
+#: misc/mke2fs.c:1093
+#, c-format
+msgid "Journal dev blocksize (%d) smaller thanminimum blocksize %d\n"
+msgstr ""
+
+#: misc/mke2fs.c:1107
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr ""
-#: misc/mke2fs.c:1095
+#: misc/mke2fs.c:1111
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr ""
-#: misc/mke2fs.c:1115
+#: misc/mke2fs.c:1131
msgid "filesystem"
msgstr ""
-#: misc/mke2fs.c:1128 resize/main.c:222
+#: misc/mke2fs.c:1144 resize/main.c:222
msgid "while trying to determine filesystem size"
msgstr ""
-#: misc/mke2fs.c:1134
+#: misc/mke2fs.c:1150
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
msgstr ""
-#: misc/mke2fs.c:1141
+#: misc/mke2fs.c:1157
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
"\tto re-read your partition table.\n"
msgstr ""
-#: misc/mke2fs.c:1156
-msgid "Filesystem larger than apparent filesystem size."
+#: misc/mke2fs.c:1172
+msgid "Filesystem larger than apparent device size."
msgstr ""
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1197
msgid "blocks per group count out of range"
msgstr ""
-#: misc/mke2fs.c:1190
+#: misc/mke2fs.c:1207
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr ""
-#: misc/mke2fs.c:1196
+#: misc/mke2fs.c:1213
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr ""
-#: misc/mke2fs.c:1238
+#: misc/mke2fs.c:1255
msgid "while setting up superblock"
msgstr ""
-#: misc/mke2fs.c:1272
+#: misc/mke2fs.c:1289
#, c-format
msgid "unknown os - %s"
msgstr ""
-#: misc/mke2fs.c:1326
+#: misc/mke2fs.c:1343
msgid "while trying to allocate filesystem tables"
msgstr ""
-#: misc/mke2fs.c:1357
+#: misc/mke2fs.c:1374
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr ""
-#: misc/mke2fs.c:1372 misc/tune2fs.c:370
+#: misc/mke2fs.c:1389 misc/tune2fs.c:369
msgid "journal"
msgstr ""
-#: misc/mke2fs.c:1384
+#: misc/mke2fs.c:1401
#, c-format
msgid "Adding journal to device %s: "
msgstr ""
-#: misc/mke2fs.c:1391
+#: misc/mke2fs.c:1408
#, c-format
msgid ""
"\n"
"\twhile trying to add journal to device %s"
msgstr ""
-#: misc/mke2fs.c:1396 misc/mke2fs.c:1420 misc/tune2fs.c:392 misc/tune2fs.c:406
+#: misc/mke2fs.c:1413 misc/mke2fs.c:1437 misc/tune2fs.c:391 misc/tune2fs.c:405
msgid "done\n"
msgstr ""
-#: misc/mke2fs.c:1408
+#: misc/mke2fs.c:1425
#, c-format
msgid "Creating journal (%d blocks): "
msgstr ""
-#: misc/mke2fs.c:1416
+#: misc/mke2fs.c:1433
msgid ""
"\n"
"\twhile trying to create journal"
msgstr ""
-#: misc/mke2fs.c:1425
+#: misc/mke2fs.c:1442
msgid "Writing superblocks and filesystem accounting information: "
msgstr ""
-#: misc/mke2fs.c:1430
+#: misc/mke2fs.c:1447
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
msgstr ""
-#: misc/mke2fs.c:1433
+#: misc/mke2fs.c:1450
msgid ""
"done\n"
"\n"
msgid "Journal NOT removed\n"
msgstr ""
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:189
msgid "Journal removed\n"
msgstr ""
-#: misc/tune2fs.c:221
+#: misc/tune2fs.c:220
msgid "while reading journal inode"
msgstr ""
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:227
msgid "while reading bitmaps"
msgstr ""
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:234
msgid "while clearing journal inode"
msgstr ""
-#: misc/tune2fs.c:246
+#: misc/tune2fs.c:245
msgid "while writing journal inode"
msgstr ""
-#: misc/tune2fs.c:261
+#: misc/tune2fs.c:260
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr ""
-#: misc/tune2fs.c:303
+#: misc/tune2fs.c:302
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
msgstr ""
-#: misc/tune2fs.c:312
+#: misc/tune2fs.c:311
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
msgstr ""
-#: misc/tune2fs.c:365
+#: misc/tune2fs.c:364
msgid "The filesystem already has a journal.\n"
msgstr ""
-#: misc/tune2fs.c:376
+#: misc/tune2fs.c:375
#, c-format
msgid ""
"\n"
"\twhile trying to open journal on %s\n"
msgstr ""
-#: misc/tune2fs.c:380
+#: misc/tune2fs.c:379
#, c-format
msgid "Creating journal on device %s: "
msgstr ""
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:387
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr ""
-#: misc/tune2fs.c:394
+#: misc/tune2fs.c:393
msgid "Creating journal inode: "
msgstr ""
-#: misc/tune2fs.c:403
+#: misc/tune2fs.c:402
msgid ""
"\n"
"\twhile trying to create journal file"
msgstr ""
-#: misc/tune2fs.c:450
+#: misc/tune2fs.c:460
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr ""
-#: misc/tune2fs.c:472 misc/tune2fs.c:485
+#: misc/tune2fs.c:482 misc/tune2fs.c:495
#, c-format
msgid "bad mounts count - %s"
msgstr ""
-#: misc/tune2fs.c:501
+#: misc/tune2fs.c:511
#, c-format
msgid "bad error behavior - %s"
msgstr ""
-#: misc/tune2fs.c:524
+#: misc/tune2fs.c:534
#, c-format
msgid "bad gid/group name - %s"
msgstr ""
-#: misc/tune2fs.c:557
+#: misc/tune2fs.c:567
#, c-format
msgid "bad interval - %s"
msgstr ""
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:595
#, c-format
msgid "bad reserved block ratio - %s"
msgstr ""
-#: misc/tune2fs.c:600
+#: misc/tune2fs.c:610
msgid "-o may only be specified once"
msgstr ""
-#: misc/tune2fs.c:610
+#: misc/tune2fs.c:620
msgid "-O may only be specified once"
msgstr ""
-#: misc/tune2fs.c:620
+#: misc/tune2fs.c:630
#, c-format
msgid "bad reserved blocks count - %s"
msgstr ""
-#: misc/tune2fs.c:649
+#: misc/tune2fs.c:659
#, c-format
msgid "bad uid/user name - %s"
msgstr ""
-#: misc/tune2fs.c:744
+#: misc/tune2fs.c:754
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:750
+#: misc/tune2fs.c:760
#, c-format
msgid "Setting current mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:755
+#: misc/tune2fs.c:765
#, c-format
msgid "Setting error behavior to %d\n"
msgstr ""
-#: misc/tune2fs.c:760
+#: misc/tune2fs.c:770
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:765
+#: misc/tune2fs.c:775
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr ""
-#: misc/tune2fs.c:771
+#: misc/tune2fs.c:781
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr ""
-#: misc/tune2fs.c:777
+#: misc/tune2fs.c:787
#, c-format
msgid "reserved blocks count is too big (%ul)"
msgstr ""
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:793
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr ""
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:799
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
msgstr ""
-#: misc/tune2fs.c:796
+#: misc/tune2fs.c:806
#, c-format
msgid ""
"\n"
"Sparse superblock flag set. %s"
msgstr ""
-#: misc/tune2fs.c:803
+#: misc/tune2fs.c:813
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
msgstr ""
-#: misc/tune2fs.c:811
+#: misc/tune2fs.c:821
#, c-format
msgid ""
"\n"
"Sparse superblock flag cleared. %s"
msgstr ""
-#: misc/tune2fs.c:818
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr ""
-#: misc/tune2fs.c:824
+#: misc/tune2fs.c:834
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:867
msgid "Invalid UUID format\n"
msgstr ""
-#: misc/uuidgen.c:30
-#, c-format
-msgid "Usage: %s [-r] [-t]\n"
-msgstr ""
-"Hey stupid! Do you need help using this program?\n"
-"Usage: %s [-r] [-t]\n"
-
#: misc/util.c:72
msgid "Proceed anyway? (y,n) "
msgstr ""
"%g days, whichever comes first. Use tune2fs -c or -i to override.\n"
msgstr ""
+#: misc/uuidgen.c:30
+#, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr ""
+"Hey stupid! Do you need help using this program?\n"
+"Usage: %s [-r] [-t]\n"
+
+#: resize/extent.c:197
+msgid "# Extent dump:\n"
+msgstr ""
+
+#: resize/extent.c:198
+#, c-format
+msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
+msgstr ""
+
+#: resize/extent.c:201
+#, c-format
+msgid "#\t\t %u -> %u (%d)\n"
+msgstr ""
+
#: resize/main.c:32
#, c-format
msgid ""
msgid "blocks to be moved"
msgstr ""
-#: resize/resize2fs.c:808
+#: resize/resize2fs.c:811
msgid "Going into desperation mode for block allocations\n"
msgstr ""
-#: resize/resize2fs.c:901
+#: resize/resize2fs.c:904
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:971
+#: resize/resize2fs.c:974
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:1139
+#: resize/resize2fs.c:1142
#, c-format
msgid "Inode moved %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:1204
+#: resize/resize2fs.c:1207
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr ""
-#: resize/resize2fs.c:1330
+#: resize/resize2fs.c:1333
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr ""
-#: resize/resize2fs.c:1356
+#: resize/resize2fs.c:1359
#, c-format
msgid "%d blocks of zeros...\n"
msgstr ""
-#: resize/resize2fs.c:1391
+#: resize/resize2fs.c:1394
msgid "Inode table move finished.\n"
msgstr ""
-
-#: resize/extent.c:197
-msgid "# Extent dump:\n"
-msgstr ""
-
-#: resize/extent.c:198
-#, c-format
-msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
-msgstr ""
-
-#: resize/extent.c:201
-#, c-format
-msgid "#\t\t %u -> %u (%d)\n"
-msgstr ""
--- /dev/null
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
--- /dev/null
+# Sed script that remove the POT-Creation-Date line in the header entry
+# from a POT file.
+#
+# The distinction between the first and the following occurrences of the
+# pattern is achieved by looking at the hold space.
+/^"POT-Creation-Date: .*"$/{
+x
+# Test if the hold space is empty.
+s/P/P/
+ta
+# Yes it was empty. First occurrence. Remove the line.
+g
+d
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs 1.32\n"
-"POT-Creation-Date: 2002-11-09 11:58-0500\n"
+"POT-Creation-Date: 2003-05-03 14:59-0400\n"
"PO-Revision-Date: 2003-03-24 05:58+0200\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:187
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:191
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Hatalý blok %u kapsamdýþý; yoksayýldý.\n"
msgid "while reading the bad blocks inode"
msgstr "- hatalý bloklar düðümü okunurken hata oluþtu"
-#: e2fsck/badblocks.c:71 e2fsck/iscan.c:110 e2fsck/scantest.c:107
-#: e2fsck/unix.c:853 e2fsck/unix.c:885 misc/badblocks.c:771
-#: misc/badblocks.c:782 misc/badblocks.c:796 misc/badblocks.c:808
-#: misc/dumpe2fs.c:337 misc/e2image.c:475 misc/e2image.c:491 misc/mke2fs.c:203
-#: misc/tune2fs.c:718 resize/main.c:198
+#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
+#: e2fsck/unix.c:869 e2fsck/unix.c:901 misc/badblocks.c:772
+#: misc/badblocks.c:783 misc/badblocks.c:797 misc/badblocks.c:809
+#: misc/dumpe2fs.c:337 misc/e2image.c:477 misc/e2image.c:493 misc/mke2fs.c:207
+#: misc/tune2fs.c:728 resize/main.c:198
#, c-format
msgid "while trying to open %s"
msgstr "- %s açýlmaya çalýþýlýrken hata oluþtu"
msgid "while trying popen '%s'"
msgstr "- '%s' veri yolu açýlmaya çalýþýlýrken hata oluþtu"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:210
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:214
msgid "while reading in list of bad blocks from file"
msgstr "- dosyadan hatalý bloklar listesinin okunmasý sýrasýnda hata oluþtu"
#: e2fsck/badblocks.c:132
#, c-format
msgid "Warning illegal block %u found in bad block inode. Cleared.\n"
-msgstr "Uyarý: Kuraldýþý %u bloðu hatalý bloklar düðümünde bulundu. Temizlendi.\n"
+msgstr ""
+"Uyarý: Kuraldýþý %u bloðu hatalý bloklar düðümünde bulundu. Temizlendi.\n"
#: e2fsck/ehandler.c:53
#, c-format
msgid "empty dir map"
msgstr "boþ dizin eþlemi"
-#. Inode number 11 is usually lost+found
#: e2fsck/emptydir.c:97
#, c-format
msgid "Empty directory block %d (#%d) in inode %d\n"
msgid "Couldn't allocate block buffer (size=%d)\n"
msgstr "Blok tamponu ayrýlamadý (boyu=%d)\n"
-#: e2fsck/flushb.c:44
+#: e2fsck/flushb.c:34
#, c-format
msgid "Usage: %s disk\n"
msgstr "Kullanýmý: %s disk\n"
-#: e2fsck/flushb.c:73
+#: e2fsck/flushb.c:63
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr "BLKFLSBUF ioctl desteklenmiyor! Tamponlar boþaltýlamadý.\n"
-#: e2fsck/iscan.c:44
+#: e2fsck/iscan.c:46
#, c-format
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Kullanýmý: %s [-F] [-I düðüm_tampon_bloklarý] aygýt\n"
-#: e2fsck/iscan.c:81 e2fsck/unix.c:673 resize/main.c:175
+#: e2fsck/iscan.c:83 e2fsck/unix.c:689 resize/main.c:175
#, c-format
msgid "while opening %s for flushing"
msgstr "%s temizlik için açýlýrken hata oluþtu"
-#: e2fsck/iscan.c:86 e2fsck/unix.c:679 resize/main.c:182
+#: e2fsck/iscan.c:88 e2fsck/unix.c:695 resize/main.c:182
#, c-format
msgid "while trying to flush %s"
msgstr "%s boþaltýlmaya çalýþýlýrken hata oluþtu"
-#: e2fsck/iscan.c:119 e2fsck/scantest.c:114 misc/e2image.c:377
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:377
msgid "while opening inode scan"
msgstr "düðüm taramasý baþlatýlýrken hata oluþtu"
-#: e2fsck/iscan.c:127 misc/e2image.c:395
+#: e2fsck/iscan.c:129 misc/e2image.c:395
msgid "while getting next inode"
msgstr "sonraki düðüme geçilirken hata oluþtu"
-#: e2fsck/iscan.c:136
+#: e2fsck/iscan.c:138
#, c-format
msgid "%d inodes scanned.\n"
msgstr "%d düðüm tarandý.\n"
-#: e2fsck/journal.c:418
+#: e2fsck/journal.c:420
msgid "reading journal superblock\n"
msgstr "jurnal super bloku okunuyor\n"
-#: e2fsck/journal.c:475
+#: e2fsck/journal.c:477
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: geçerli jurnal super bloku yok\n"
-#: e2fsck/journal.c:484
+#: e2fsck/journal.c:486
#, c-format
msgid "%s: journal too short\n"
msgstr "%s: jurnal çok kýsa\n"
-#: e2fsck/journal.c:756
+#: e2fsck/journal.c:758
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: jurnal kurtarýlýyor\n"
-#: e2fsck/journal.c:758
+#: e2fsck/journal.c:760
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: salt-okunur durumdayken jurnal kurtarmasý yapýlamaz\n"
-#: e2fsck/journal.c:779
+#: e2fsck/journal.c:781
#, c-format
msgid "while trying to re-open %s"
msgstr "%s yeniden açýlmaya çalýþýlýrken hata oluþtu"
msgid "<The NULL inode>"
msgstr "<NULL düðüm>"
-#. 0
#: e2fsck/message.c:143
msgid "<The bad blocks inode>"
msgstr "<Hatalý bloklar düðümü>"
-#. 1
-#. 2
#: e2fsck/message.c:145
msgid "<The ACL index inode>"
msgstr "<ACL indeksinin düðümü>"
-#. 3
#: e2fsck/message.c:146
msgid "<The ACL data inode>"
msgstr "<ACL verisinin düðümü>"
-#. 4
#: e2fsck/message.c:147
msgid "<The boot loader inode>"
msgstr "<Önyükleyici düðümü>"
-#. 5
#: e2fsck/message.c:148
msgid "<The undelete directory inode>"
msgstr "<Kurtarýlan dizinin düðümü>"
-#. 6
#: e2fsck/message.c:149
msgid "<The group descriptor inode>"
msgstr "<Grup tanýmlayýcý düðümü>"
-#. 7
#: e2fsck/message.c:150
msgid "<The journal inode>"
msgstr "<Jurnal düðümü>"
-#. 8
#: e2fsck/message.c:151
msgid "<Reserved inode 9>"
msgstr "<Yedek düðüm 9>"
-#. 9
#: e2fsck/message.c:152
msgid "<Reserved inode 10>"
msgstr "<Yedek düðüm 10>"
msgid "returned from clone_file_block"
msgstr "clone_file_block iþlevinden döndürüldü"
-#.
-#. * Allocate bitmaps structures
-#.
-#: e2fsck/pass1.c:311
+#: e2fsck/pass1.c:296
msgid "in-use inode map"
msgstr "kullanýmdaki düðüm eþlemi"
-#: e2fsck/pass1.c:320
+#: e2fsck/pass1.c:305
msgid "directory inode map"
msgstr "dizin düðümü eþlemi"
-#: e2fsck/pass1.c:328
+#: e2fsck/pass1.c:313
msgid "regular file inode map"
msgstr "normal dosya düðümü eþlemi"
-#: e2fsck/pass1.c:335
+#: e2fsck/pass1.c:320
msgid "in-use block map"
msgstr "kullanýmdaki blok eþlemi"
-#: e2fsck/pass1.c:382
+#: e2fsck/pass1.c:367
msgid "doing inode scan"
msgstr "düðüm taramasý yapýlýyor"
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:736
msgid "Pass 1"
msgstr "1. geçiþ"
-#: e2fsck/pass1.c:809
+#: e2fsck/pass1.c:794
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "%u düðümünün dolaylý bloklarý okunuyor"
-#: e2fsck/pass1.c:851
+#: e2fsck/pass1.c:836
msgid "bad inode map"
msgstr "hatalý düðüm eþlemi"
-#: e2fsck/pass1.c:873
+#: e2fsck/pass1.c:858
msgid "inode in bad block map"
msgstr "hatalý blok eþlemindeki düðüm"
-#: e2fsck/pass1.c:893
+#: e2fsck/pass1.c:878
msgid "imagic inode map"
msgstr "imagic düðüm eþlemi"
-#: e2fsck/pass1.c:920
+#: e2fsck/pass1.c:905
msgid "multiply claimed block map"
msgstr "tekrarlanan bloklarýn eþlemi"
-#: e2fsck/pass1.c:1019
+#: e2fsck/pass1.c:1004
msgid "ext attr block map"
msgstr "ek özellik bloðu eþlemi"
-#: e2fsck/pass1.c:1775
+#: e2fsck/pass1.c:1760
msgid "block bitmap"
msgstr "blok biteþlemi"
-#: e2fsck/pass1.c:1779
+#: e2fsck/pass1.c:1764
msgid "inode bitmap"
msgstr "düðüm biteþlemi"
-#: e2fsck/pass1.c:1783
+#: e2fsck/pass1.c:1768
msgid "inode table"
msgstr "düðüm tablosu"
-#: e2fsck/pass2.c:290
+#: e2fsck/pass2.c:291
msgid "Pass 2"
msgstr "2. geçiþ"
-#.
-#. * Allocate some bitmaps to do loop detection.
-#.
-#: e2fsck/pass3.c:80
+#: e2fsck/pass3.c:79
msgid "inode done bitmap"
msgstr "düðümleri indeksli biteþlem"
-#: e2fsck/pass3.c:91
+#: e2fsck/pass3.c:90
msgid "Peak memory"
msgstr "Doruk bellek"
-#: e2fsck/pass3.c:144
+#: e2fsck/pass3.c:143
msgid "Pass 3"
msgstr "3. geçiþ"
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:333
msgid "inode loop detection bitmap"
msgstr "düðüm döngüsü saptama biteþlemi"
msgid "(no prompt)"
msgstr "(komut istemi yok)"
-#. 0
#: e2fsck/problem.c:50
msgid "Fix"
msgstr "Düzelt"
-#. 1
#: e2fsck/problem.c:51
msgid "Clear"
msgstr "Temizle"
-#. 2
#: e2fsck/problem.c:52
msgid "Relocate"
msgstr "Konumlandýr"
-#. 3
#: e2fsck/problem.c:53
msgid "Allocate"
msgstr "Tahsis et"
-#. 4
#: e2fsck/problem.c:54
msgid "Expand"
msgstr "Geniþlet"
-#. 5
#: e2fsck/problem.c:55
msgid "Connect to /lost+found"
msgstr "/lost+found a baðlan"
-#. 6
#: e2fsck/problem.c:56
msgid "Create"
msgstr "Oluþtur"
-#. 7
#: e2fsck/problem.c:57
msgid "Salvage"
msgstr "Kurtarýlacaklar"
-#. 8
#: e2fsck/problem.c:58
msgid "Truncate"
msgstr "Kýrp"
-#. 9
#: e2fsck/problem.c:59
msgid "Clear inode"
msgstr "Düðümü temizle"
-#. 10
#: e2fsck/problem.c:60
msgid "Abort"
msgstr "Vazgeç"
-#. 11
#: e2fsck/problem.c:61
msgid "Split"
msgstr "Ayýr"
-#. 12
#: e2fsck/problem.c:62
msgid "Continue"
msgstr "Devam et"
-#. 13
#: e2fsck/problem.c:63
msgid "Clone duplicate/bad blocks"
msgstr "tekrarlý/hatalý bloklalarý kopyala"
-#. 14
#: e2fsck/problem.c:64
msgid "Delete file"
msgstr "Dosyayý Sil"
-#. 15
#: e2fsck/problem.c:65
msgid "Suppress messages"
msgstr "Ýletileri engelle"
-#. 16
#: e2fsck/problem.c:66
msgid "Unlink"
msgstr "Baðý kaldýr"
-#. 17
#: e2fsck/problem.c:67
msgid "Clear HTree index"
msgstr "HTree indeksini temizle"
msgid "(NONE)"
msgstr "(HÝÇBÝRÝ)"
-#. 0
#: e2fsck/problem.c:77
msgid "FIXED"
msgstr "DÜZELTÝLDÝ"
-#. 1
#: e2fsck/problem.c:78
msgid "CLEARED"
msgstr "TEMÝZLENDÝ"
-#. 2
#: e2fsck/problem.c:79
msgid "RELOCATED"
msgstr "KONUMLANDI"
-#. 3
#: e2fsck/problem.c:80
msgid "ALLOCATED"
msgstr "TAHSÝS EDÝLDÝ"
-#. 4
#: e2fsck/problem.c:81
msgid "EXPANDED"
msgstr "GENÝÞLETÝLDÝ"
-#. 5
#: e2fsck/problem.c:82
msgid "RECONNECTED"
msgstr "TEKRAR BAÐLANDI"
-#. 6
#: e2fsck/problem.c:83
msgid "CREATED"
msgstr "OLUÞTURULDU"
-#. 7
#: e2fsck/problem.c:84
msgid "SALVAGED"
msgstr "KURTARILABÝLÝRLER LÝSTELENDÝ"
-#. 8
#: e2fsck/problem.c:85
msgid "TRUNCATED"
msgstr "KIRPILDI"
-#. 9
#: e2fsck/problem.c:86
msgid "INODE CLEARED"
msgstr "DÜÐÜM TEMÝZLENDÝ"
-#. 10
#: e2fsck/problem.c:87
msgid "ABORTED"
msgstr "VAZGEÇÝLDÝ"
-#. 11
#: e2fsck/problem.c:88
msgid "SPLIT"
msgstr "AYRILDI"
-#. 12
#: e2fsck/problem.c:89
msgid "CONTINUING"
msgstr "SÜRÜYOR"
-#. 13
#: e2fsck/problem.c:90
msgid "DUPLICATE/BAD BLOCKS CLONED"
msgstr "TEKRARLI/HATALI BLOKLAR KOPYALANDI"
-#. 14
#: e2fsck/problem.c:91
msgid "FILE DELETED"
msgstr "DOSYA SÝLÝNDÝ"
-#. 15
#: e2fsck/problem.c:92
msgid "SUPPRESSED"
msgstr "ENGELLENDÝ"
-#. 16
#: e2fsck/problem.c:93
msgid "UNLINKED"
msgstr "BAÐ KALDIRILDI"
-#. 17
#: e2fsck/problem.c:94
msgid "HTREE INDEX CLEARED"
msgstr "HTREE ÝNDEKSÝ TEMÝZLENDÝ"
-#. Pre-Pass 1 errors
-#. Block bitmap not in group
#: e2fsck/problem.c:103
msgid "@b @B for @g %g is not in @g. (@b %b)\n"
msgstr "%g grubunun blok biteþlemi grup içinde deðil. (blok %b)\n"
-#. Inode bitmap not in group
#: e2fsck/problem.c:107
msgid "@i @B for @g %g is not in @g. (@b %b)\n"
msgstr "%g grubunun düðüm biteþlemi grup içinde deðil. (blok %b)\n"
#: e2fsck/problem.c:190
msgid "External @j has multiple @f users (unsupported).\n"
-msgstr "Dýþ jurnal çok sayýda dosya sistemi kullanýcýsý içeriyor. (desteklenmiyor)\n"
+msgstr ""
+"Dýþ jurnal çok sayýda dosya sistemi kullanýcýsý içeriyor. (desteklenmiyor)\n"
#: e2fsck/problem.c:195
msgid "Can't find external @j\n"
#: e2fsck/problem.c:223
#, c-format
msgid "@S doesn't have has_@j flag, but has ext3 @j %s.\n"
-msgstr "Süper blok jurnal_mevcut bayraðý içermiyor, ama ext3 jurnal %s içeriyor.\n"
+msgstr ""
+"Süper blok jurnal_mevcut bayraðý içermiyor, ama ext3 jurnal %s içeriyor.\n"
#: e2fsck/problem.c:228
msgid "@S has ext3 needs_recovery flag set, but no @j.\n"
#: e2fsck/problem.c:248
msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
-msgstr "Yedek süper blokda kurtarma bayraðý temiz olduðundan jurnal herþeye raðmen çalýþacak.\n"
+msgstr ""
+"Yedek süper blokda kurtarma bayraðý temiz olduðundan jurnal herþeye raðmen "
+"çalýþacak.\n"
#: e2fsck/problem.c:253
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
#: e2fsck/problem.c:283
msgid "Ext3 @j @S has an unknown read-only feature flag set.\n"
-msgstr "Ext3 jurnal süper bloðu bilinmeyen salt-okunur özellikli bir bayrak içeriyor.\n"
+msgstr ""
+"Ext3 jurnal süper bloðu bilinmeyen salt-okunur özellikli bir bayrak "
+"içeriyor.\n"
#: e2fsck/problem.c:288
msgid "Ext3 @j @S has an unknown incompatible feature flag set.\n"
-msgstr "Ext3 jurnal süper bloðu bilinmeyen uyumsuz özellikli bir bayrak içeriyor.\n"
+msgstr ""
+"Ext3 jurnal süper bloðu bilinmeyen uyumsuz özellikli bir bayrak içeriyor.\n"
#: e2fsck/problem.c:293
msgid "@j version not supported by this e2fsck.\n"
msgid "Pass 1: Checking @is, @bs, and sizes\n"
msgstr "1. geçiþ: düðümler, bloklar ve uzunluklar denetleniyor\n"
-#. Root directory is not an inode
#: e2fsck/problem.c:320
msgid "@r is not a @d. "
msgstr "Kök düðümü bir dizin deðil. "
#: e2fsck/problem.c:350
msgid "@g %g's @b @B at %b @C.\n"
-msgstr "%g grubunun %b deki blok biteþlemi diðer dosya sistemi bloklarý ile çeliþiyor.\n"
+msgstr ""
+"%g grubunun %b deki blok biteþlemi diðer dosya sistemi bloklarý ile "
+"çeliþiyor.\n"
#: e2fsck/problem.c:355
msgid "@g %g's @i @B at %b @C.\n"
-msgstr "%g grubunun %b deki düðüm biteþlemi diðer dosya sistemi bloklarý ile çeliþiyor.\n"
+msgstr ""
+"%g grubunun %b deki düðüm biteþlemi diðer dosya sistemi bloklarý ile "
+"çeliþiyor.\n"
#: e2fsck/problem.c:360
msgid "@g %g's @i table at %b @C.\n"
-msgstr "%g grubunun %b deki düðüm tablosu diðer dosya sistemi bloklarý ile çeliþiyor.\n"
+msgstr ""
+"%g grubunun %b deki düðüm tablosu diðer dosya sistemi bloklarý ile "
+"çeliþiyor.\n"
#: e2fsck/problem.c:365
msgid "@g %g's @b @B (%b) is bad. "
#: e2fsck/problem.c:390
msgid "@b #%B (%b) overlaps @f metadata in @i %i. "
-msgstr "Düðüm %i içindeki blok #%B (%b) dosya sistemi metaverisinin üzerine taþýyor. "
+msgstr ""
+"Düðüm %i içindeki blok #%B (%b) dosya sistemi metaverisinin üzerine "
+"taþýyor. "
#: e2fsck/problem.c:395
#, c-format
#: e2fsck/problem.c:420
msgid "Bad @b %b used as bad @b indirect @b?!?\n"
-msgstr "Hatalý blok %b, hatalý blok yerine kullanýlan blok olarak kullanýlmýþ?!?\n"
+msgstr ""
+"Hatalý blok %b, hatalý blok yerine kullanýlan blok olarak kullanýlmýþ?!?\n"
#: e2fsck/problem.c:425
msgid ""
"to read it back in again.\n"
msgstr ""
"\n"
-"Bu aykýrýlýk e2fsck ile düzeltilemez; düzeltmek için hatalý bloklar\n "
-"listesini dökümleyecek 'dumpe2fs -b' komutunu ve sonra onu tekrar\n"
+"Bu aykýrýlýk e2fsck ile düzeltilemez; düzeltmek için hatalý bloklar\n"
+" listesini dökümleyecek 'dumpe2fs -b' komutunu ve sonra onu tekrar\n"
"geriye okuyacak olan 'e2fsck -L dosyaismi' komutunu kullanýn.\n"
#: e2fsck/problem.c:433
#: e2fsck/problem.c:450
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
-msgstr "Birincil grup tanýmlarýndaki blok %b, hatalý bloklar listesinde kayýtlý\n"
+msgstr ""
+"Birincil grup tanýmlarýndaki blok %b, hatalý bloklar listesinde kayýtlý\n"
#: e2fsck/problem.c:456
msgid "Warning: Group %g's @S (%b) is bad.\n"
#: e2fsck/problem.c:461
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
-msgstr "Uyarý %g grubunun grup tanýmlarý kopyasý bir hatalý blok içeriyor (%b).\n"
+msgstr ""
+"Uyarý %g grubunun grup tanýmlarý kopyasý bir hatalý blok içeriyor (%b).\n"
#: e2fsck/problem.c:467
msgid "Programming error? @b #%b claimed for no reason in process_bad_@b.\n"
#: e2fsck/problem.c:473
msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n"
-msgstr "%s için %g blok grubunda %N bitiþik bloða yer ayrýlýrken hata oluþtu: %m\n"
+msgstr ""
+"%s için %g blok grubunda %N bitiþik bloða yer ayrýlýrken hata oluþtu: %m\n"
#: e2fsck/problem.c:478
#, c-format
#: e2fsck/problem.c:528
#, c-format
msgid "Error while iterating over @bs in @i %i: %m\n"
-msgstr "Düðüm %i içindeki bloklar üzerinde iþlemler tekrarlanýrken hata oluþtu: %m\n"
+msgstr ""
+"Düðüm %i içindeki bloklar üzerinde iþlemler tekrarlanýrken hata oluþtu: %m\n"
#: e2fsck/problem.c:533
msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
#: e2fsck/problem.c:563
#, c-format
msgid "@i %i has @cion flag set on @f without @cion support. "
-msgstr "Düðüm %i sýkýþtýrma desteklenmeyen dosya sisteminde sýkýþtýrma bayraðý içeriyor. "
+msgstr ""
+"Düðüm %i sýkýþtýrma desteklenmeyen dosya sisteminde sýkýþtýrma bayraðý "
+"içeriyor. "
#: e2fsck/problem.c:583
msgid "@j is not regular file. "
#: e2fsck/problem.c:673
#, c-format
msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
-msgstr "Düðüm %i htree desteði bulunmayan dosya sisteminde INDEX_FL bayraðý içeriyor.\n"
+msgstr ""
+"Düðüm %i htree desteði bulunmayan dosya sisteminde INDEX_FL bayraðý "
+"içeriyor.\n"
#: e2fsck/problem.c:678
#, c-format
#: e2fsck/problem.c:693
#, c-format
msgid "@h %i uses an incompatible htree root node flag.\n"
-msgstr "HTREE dizin düðümü %i uyumsuz bir htree kök düðümü bayraðý kullanýyor.\n"
+msgstr ""
+"HTREE dizin düðümü %i uyumsuz bir htree kök düðümü bayraðý kullanýyor.\n"
#: e2fsck/problem.c:698
msgid "@h %i has a tree depth (%N) which is too big\n"
#: e2fsck/problem.c:741 e2fsck/problem.c:1062
msgid "Error addjusting refcount for @a @b %b (@i %i): %m\n"
-msgstr "Ek özellik bloðu %b (düðüm %i) için baþvuru sayýsý ayarlanýrken hata oluþtu: %m\n"
+msgstr ""
+"Ek özellik bloðu %b (düðüm %i) için baþvuru sayýsý ayarlanýrken hata oluþtu: "
+"%m\n"
#: e2fsck/problem.c:747
msgid "Pass 1C: Scan directories for @is with dup @bs.\n"
#: e2fsck/problem.c:853
msgid "First @e '%Dn' (inode=%Di) in @d @i %i (%p) @s '.'\n"
-msgstr "Dizin düðümü %i (%p) içindeki ilk girdi '%Dn' (düðüm=%Di) '.' olmalýydý.\n"
+msgstr ""
+"Dizin düðümü %i (%p) içindeki ilk girdi '%Dn' (düðüm=%Di) '.' olmalýydý.\n"
#: e2fsck/problem.c:858
msgid "Second @e '%Dn' (inode=%Di) in @d @i %i @s '..'\n"
msgid "@E is duplicate '..' @e.\n"
msgstr "@E tekrarlayan '..' girdisi içeriyor.\n"
-#: e2fsck/problem.c:938 e2fsck/problem.c:1204
+#: e2fsck/problem.c:938 e2fsck/problem.c:1219
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr "Ýç hata: %i için dizin bilgileri bulunamýyor.\n"
#: e2fsck/problem.c:1038
msgid "@p @h %d: node (%B) has bad min hash\n"
-msgstr "HTREE dizin düðümü %d içinde sorun: düðüm (%B) hatali asgari hash içeriyor\n"
+msgstr ""
+"HTREE dizin düðümü %d içinde sorun: düðüm (%B) hatali asgari hash içeriyor\n"
#: e2fsck/problem.c:1043
msgid "@p @h %d: node (%B) has bad max hash\n"
-msgstr "HTREE dizin düðümü %d içinde sorun: düðüm (%B) hatali azami hash içeriyor\n"
+msgstr ""
+"HTREE dizin düðümü %d içinde sorun: düðüm (%B) hatali azami hash içeriyor\n"
#: e2fsck/problem.c:1048
msgid "Invalid @h %d (%q). "
#: e2fsck/problem.c:1052
msgid "Forcibly clearing HTREE flag on @i %d (%q). (Beta test code)\n"
-msgstr "Düðüm %d (%q) üzerindeki HTREE bayraðý zorla temizleniyor. (Beta test kodu)\n"
+msgstr ""
+"Düðüm %d (%q) üzerindeki HTREE bayraðý zorla temizleniyor. (Beta test "
+"kodu)\n"
#: e2fsck/problem.c:1057
msgid "@p @h %d (%q): bad @b number %b.\n"
#: e2fsck/problem.c:1072
msgid "@p @h %d: node (%B) has bad limit (%N)\n"
-msgstr "HTREE dizin düðümü %d içinde sorun: düðüm (%B) hatalý sýnýr (%N) içeriyor\n"
+msgstr ""
+"HTREE dizin düðümü %d içinde sorun: düðüm (%B) hatalý sýnýr (%N) içeriyor\n"
#: e2fsck/problem.c:1077
msgid "@p @h %d: node (%B) has bad count (%N)\n"
-msgstr "HTREE dizin düðümü %d içinde sorun: düðüm (%B) hatalý sayým (%N) içeriyor.\n"
+msgstr ""
+"HTREE dizin düðümü %d içinde sorun: düðüm (%B) hatalý sayým (%N) içeriyor.\n"
#: e2fsck/problem.c:1082
msgid "@p @h %d: node (%B) has an unordered hash table\n"
-msgstr "HTREE dizin düðümü %d içinde sorun: düðüm (%B) sýrasýz bit hash tablosu içeriyor\n"
+msgstr ""
+"HTREE dizin düðümü %d içinde sorun: düðüm (%B) sýrasýz bit hash tablosu "
+"içeriyor\n"
#: e2fsck/problem.c:1087
msgid "@p @h %d: node (%B) has bad depth\n"
msgstr "HTREE dizin düðümü %d içinde sorun: düðüm (%B) hatalý derinlikte\n"
-#: e2fsck/problem.c:1094
+#: e2fsck/problem.c:1092
+#, fuzzy
+msgid "Duplicate @E found. "
+msgstr "Düðüm %i içindeki tekrarlanmýþ/hatalý blok(lar):"
+
+#: e2fsck/problem.c:1097
+#, c-format
+msgid ""
+"@E has a non-unique filename.\n"
+"Rename to %s"
+msgstr ""
+
+#: e2fsck/problem.c:1102
+msgid ""
+"Duplicate @e '%Dn' found.\n"
+"\tMarking %p (%i) to be rebuilt.\n"
+"\n"
+msgstr ""
+
+#: e2fsck/problem.c:1109
msgid "Pass 3: Checking @d connectivity\n"
msgstr "Geçiþ 3: Dizin baðlanabilirliði denetleniyor\n"
-#: e2fsck/problem.c:1099
+#: e2fsck/problem.c:1114
msgid "@r not allocated. "
msgstr "Kök düðümü tahsisli deðil. "
-#: e2fsck/problem.c:1104
+#: e2fsck/problem.c:1119
msgid "No room in @l @d. "
msgstr "lost+found dizininde yer yok. "
-#: e2fsck/problem.c:1109
+#: e2fsck/problem.c:1124
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr "Dizin düðümü %i (%p) baðlantýsýz\n"
-#: e2fsck/problem.c:1114
+#: e2fsck/problem.c:1129
msgid "/@l not found. "
msgstr "/lost+found dizini yok. "
-#: e2fsck/problem.c:1119
+#: e2fsck/problem.c:1134
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr "%Q (%i) daki '..' %P (%j), süperblok %q (%d).\n"
-#: e2fsck/problem.c:1124
+#: e2fsck/problem.c:1139
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr "/lost+found dizini ya yok ya da hatalý. tekrar baðlanýlamýyor.\n"
-#: e2fsck/problem.c:1129
+#: e2fsck/problem.c:1144
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr "/lost+found dizini geniþletilemiyor: %m\n"
-#: e2fsck/problem.c:1134
+#: e2fsck/problem.c:1149
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr "%i ye tekrar baðlanýlamýyor: %m\n"
-#: e2fsck/problem.c:1139
+#: e2fsck/problem.c:1154
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr "/lost+found dizini bulunmaya çalýþýlýrkan hata oluþtu: %m\n"
-#: e2fsck/problem.c:1144
+#: e2fsck/problem.c:1159
#, c-format
msgid "ext2fs_new_@b: %m while trying to create /@l @d\n"
msgstr ""
"ext2fs_new_block: %m\n"
"/lost+found dizini oluþturulmaya çalýþýlýrkan hata oluþtu.\n"
-#: e2fsck/problem.c:1149
+#: e2fsck/problem.c:1164
#, c-format
msgid "ext2fs_new_@i: %m while trying to create /@l @d\n"
msgstr ""
"ext2fs_new_inode: %m\n"
"/lost+found dizini oluþturulmaya çalýþýlýrkan hata oluþtu.\n"
-#: e2fsck/problem.c:1154
+#: e2fsck/problem.c:1169
#, c-format
msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n"
msgstr ""
"ext2fs_new_dir_block: %m\n"
"yeni dizin bloðu oluþturulurken hata.\n"
-#: e2fsck/problem.c:1159
+#: e2fsck/problem.c:1174
#, c-format
msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
msgstr ""
"ext2fs_write_dir_block: %m\n"
"/lost+found için dizin bloðu yazýlýrken hata oluþtu.\n"
-#: e2fsck/problem.c:1164
+#: e2fsck/problem.c:1179
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr "Düðüm %i üzerinde düðüm sayýsý ayarlanýrken hata oluþtu\n"
-#: e2fsck/problem.c:1169
+#: e2fsck/problem.c:1184
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
"Düðüm %i için üst düðüm belirlenemedi: %m\n"
"\n"
-#: e2fsck/problem.c:1174
+#: e2fsck/problem.c:1189
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d entry\n"
"Düðüm %i için üst düðüm belirlenemedi: üst dizin girdisi bulunamadý\n"
"\n"
-#: e2fsck/problem.c:1179
+#: e2fsck/problem.c:1194
msgid "@A @i @B (%N): %m\n"
msgstr "Düðüm biteþlemi (%N) ayrýlýrken hata oluþtu: %m\n"
-#: e2fsck/problem.c:1184
+#: e2fsck/problem.c:1199
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr "Kök dizini oluþturulurken hata (%s): %m\n"
-#: e2fsck/problem.c:1189
+#: e2fsck/problem.c:1204
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr "/lost+found dizini oluþturulurken hata (%s): %m\n"
-#: e2fsck/problem.c:1194
+#: e2fsck/problem.c:1209
msgid "@r is not a @d; aborting.\n"
msgstr "Kök düðümü bir dizin deðil; çýkýlýyor.\n"
-#: e2fsck/problem.c:1199
+#: e2fsck/problem.c:1214
msgid "Cannot proceed without a @r.\n"
msgstr "Bir kök düðümü olmaksýzýn iþlenemez.\n"
-#: e2fsck/problem.c:1209
+#: e2fsck/problem.c:1224
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr "/lost+found bir dizin deðil (düðüm = %i)\n"
-#: e2fsck/problem.c:1216
+#: e2fsck/problem.c:1231
msgid "Pass 3A: Optimizing directories\n"
msgstr "Pass 3A: Dizinler eniyileniyor\n"
-#: e2fsck/problem.c:1221
+#: e2fsck/problem.c:1236
#, c-format
msgid "Failed to create dirs_to_hash iterator: %m"
msgstr "dirs_to_hash yineleyici oluþturulamadý: %m"
-#: e2fsck/problem.c:1226
+#: e2fsck/problem.c:1241
msgid "Failed to optimize directory %q (%d): %m"
msgstr "Dizin %q (%d) eniyilenemedi: %m"
-#: e2fsck/problem.c:1231
+#: e2fsck/problem.c:1246
msgid "Optimizing directories: "
msgstr "Eniyilenen dizinler: "
-#: e2fsck/problem.c:1248
+#: e2fsck/problem.c:1263
msgid "Pass 4: Checking reference counts\n"
msgstr "Geçiþ 4: Baþvuru sayýsý denetleniyor\n"
-#: e2fsck/problem.c:1263
+#: e2fsck/problem.c:1278
msgid "@i %i ref count is %Il, @s %N. "
msgstr "Düðüm %i için baþvuru sayýsý %Il, %N olmalýydý. "
-#: e2fsck/problem.c:1267
+#: e2fsck/problem.c:1282
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
"düðüm_baðý_bilgileri[%i] = %N, düðüm.düðüm_baðý_sayýsý = %Il.\n"
"Bunlar ayný olmalýydý!\n"
-#: e2fsck/problem.c:1277
+#: e2fsck/problem.c:1292
msgid "Pass 5: Checking @g summary information\n"
msgstr "5. Geçiþ: grup özet bilgileri denetleniyor\n"
-#: e2fsck/problem.c:1282
+#: e2fsck/problem.c:1297
msgid "Padding at end of @i @B is not set. "
msgstr "Düðüm biteþleminin sonundaki alan belirlenmemiþ. "
-#: e2fsck/problem.c:1287
+#: e2fsck/problem.c:1302
msgid "Padding at end of @b @B is not set. "
msgstr "Blok biteþleminin sonundaki alan belirlenmemiþ. "
-#: e2fsck/problem.c:1292
+#: e2fsck/problem.c:1307
msgid "@b @B differences: "
msgstr "blok biteþlemi farklarý: "
-#: e2fsck/problem.c:1312
+#: e2fsck/problem.c:1327
msgid "@i @B differences: "
msgstr "düðüm biteþlemi farklarý: "
-#: e2fsck/problem.c:1332
+#: e2fsck/problem.c:1347
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr "%g. grup için serbest düðüm sayýsý yanlýþ (%i, sayýlan = %j).\n"
-#: e2fsck/problem.c:1337
+#: e2fsck/problem.c:1352
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr "%g. grup için dizin sayýsý yanlýþ (%i, sayýlan = %j).\n"
-#: e2fsck/problem.c:1342
+#: e2fsck/problem.c:1357
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr "Serbest düðüm sayýsý yanlýþ (%i, sayýlan = %j).\n"
-#: e2fsck/problem.c:1347
+#: e2fsck/problem.c:1362
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr "%g. grup için serbest blok sayýsý yanlýþ (%b, sayýlan = %c).\n"
-#: e2fsck/problem.c:1352
+#: e2fsck/problem.c:1367
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Serbest blok sayýsý yanlýþ (%b, sayýlan = %c).\n"
-#: e2fsck/problem.c:1357
+#: e2fsck/problem.c:1372
msgid ""
"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
"endpoints (%i, %j)\n"
"PROGRAMLAMA HATASI: dosya sistemi (#%N) biteþlem sýnýrlarý (%b, %c)\n"
"ile hesaplanan biteþlem sýnýrlarý (%i, %j) uyuþmuyor\n"
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1378
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr "Ýç hata: biteþlemin sonunda bozulma (%N)\n"
-#: e2fsck/problem.c:1497
+#: e2fsck/problem.c:1512
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr "Elde edilemeyen hata kodu ((0x%x)!\n"
-#: e2fsck/problem.c:1569
+#: e2fsck/problem.c:1584
msgid "IGNORED"
msgstr "YOKSAYILDI"
-#: e2fsck/scantest.c:79
+#: e2fsck/scantest.c:81
#, c-format
msgid "Memory used: %d, elapsed time: %6.3f/%6.3f/%6.3f\n"
msgstr "Kullanýlan bellek: %d, geçen süre: %6.3f/%6.3f/%6.3f\n"
-#: e2fsck/scantest.c:98
+#: e2fsck/scantest.c:100
#, c-format
msgid "size of inode=%d\n"
msgstr "düðüm uzunluðu = %d\n"
-#: e2fsck/scantest.c:119
+#: e2fsck/scantest.c:121
msgid "while starting inode scan"
msgstr "- düðüm taramasý baþlatýlýrken hata oluþtu"
-#: e2fsck/scantest.c:130
+#: e2fsck/scantest.c:132
msgid "while doing inode scan"
msgstr "- düðüm taramasý yapýlýrken hata oluþtu"
msgid "Byte swap"
msgstr "Ters baytlý"
-#: e2fsck/unix.c:63
+#: e2fsck/unix.c:67
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
" -D dizinler eniyilenir\n"
" -F tampon bellek iþlem öncesi boþaltýlýr\n"
" -r bu seçenek yoksayýlýr\n"
-" -s dosya sistemi bayt sýralamasý tersse kullanýlýr.\n"
+" -s dosya sistemi bayt sýralamasý tersse "
+"kullanýlýr.\n"
" Normal sýrada ise etkisizdir.\n"
" -S Mevcut bayt sýralamasýna bakýlmaksýzýn dosya\n"
" sisteminin bayt sýralamasý ters çevrilir\n"
"Çeviri hatalarýný <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
"\n"
-#: e2fsck/unix.c:69
+#: e2fsck/unix.c:73
+#, fuzzy
msgid ""
"\n"
"Emergency help:\n"
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
" -c hatalý bloklar bulunur ve belirlenir\n"
" -f disk bölümü temiz bile olsa denetim yapýlýr\n"
-#: e2fsck/unix.c:75
+#: e2fsck/unix.c:79
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
" -L hatalý_bloklar_dosyasý hatalý bloklar listesi belirtilen dosyadakiler\n"
" ile oluþturulur\n"
-#: e2fsck/unix.c:109
+#: e2fsck/unix.c:113
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr "%s: %d/%d dosya (%%%0d.%d yanyana olmayan düðüm), %d/%d blok\n"
-#: e2fsck/unix.c:124
+#: e2fsck/unix.c:128
#, c-format
msgid ""
"\n"
"\n"
"%8d düðüm kullanýlmýþ (%%%d)\n"
-#: e2fsck/unix.c:126
+#: e2fsck/unix.c:130
#, c-format
msgid "%8d non-contiguous inodes (%0d.%d%%)\n"
msgstr "%8d yanyana olmayan düðüm (%%%0d.%d)\n"
-#: e2fsck/unix.c:128
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr " ind/dind/tind bloklarýnýn düðüm sayýlarý: %d/%d/%d\n"
-#: e2fsck/unix.c:130
+#: e2fsck/unix.c:134
#, c-format
msgid ""
"%8d blocks used (%d%%)\n"
"%8d blok kullanýlmýþ (%%%d)\n"
"%8d hatalý blok\n"
-#: e2fsck/unix.c:134
+#: e2fsck/unix.c:138
#, c-format
msgid "%8d large files\n"
msgstr "%8d büyük dosya\n"
-#: e2fsck/unix.c:135
+#: e2fsck/unix.c:139
#, c-format
msgid ""
"\n"
"--------\n"
"%8d dosya\n"
-#: e2fsck/unix.c:168
+#: e2fsck/unix.c:172
#, c-format
msgid "%8d large file%s\n"
msgstr ""
"%8d büyük dosya\n"
"%s\n"
-#: e2fsck/unix.c:211 misc/badblocks.c:612 misc/tune2fs.c:734 misc/util.c:133
+#: e2fsck/unix.c:215 misc/badblocks.c:613 misc/tune2fs.c:744 misc/util.c:133
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr "- %s'in baðlý olup olmadýðý saptanmaya çalýþýlýrken hata oluþtu."
-#: e2fsck/unix.c:226
+#: e2fsck/unix.c:230
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "Uyarý! %s baðlý.\n"
-#: e2fsck/unix.c:230
+#: e2fsck/unix.c:234
#, c-format
msgid "%s is mounted. "
msgstr "%s baðlandý. "
-#: e2fsck/unix.c:232
+#: e2fsck/unix.c:236
msgid ""
"Cannot continue, aborting.\n"
"\n"
"Devam edilemiyor. çýkýlýyor.\n"
"\n"
-#: e2fsck/unix.c:233
+#: e2fsck/unix.c:237
msgid ""
"\n"
"\n"
"\n"
msgstr ""
"\n"
-"\nU****YARI!****e2fsck'nýn baðlý bir dosya sisteminde çalýþtýrýlmasý"
-"\nÇOK CÝDDÝ hasarlara sebep olabilir.\a****n"
"\n"
+"U****YARI!****e2fsck'nýn baðlý bir dosya sisteminde çalýþtýrýlmasý\n"
+"ÇOK CÝDDÝ hasarlara sebep olabilir.\a****n\n"
-#: e2fsck/unix.c:236
+#: e2fsck/unix.c:240
msgid "Do you really want to continue"
msgstr "Gerçekten devam etmek istiyor musunuz?"
-#: e2fsck/unix.c:238
+#: e2fsck/unix.c:242
msgid "check aborted.\n"
msgstr "denetim durdu.\n"
-#: e2fsck/unix.c:260
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr " hatalý bir dosya sistemi içeriyor"
-#: e2fsck/unix.c:262
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr " usulünce sistemden ayrýlmamýþ"
-#: e2fsck/unix.c:266
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " denetlenmeksizin %u kere baðlandý"
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:275
#, c-format
msgid " has gone %u days without being checked"
msgstr " denetlenmeksizin %u gün geçti"
-#: e2fsck/unix.c:277
+#: e2fsck/unix.c:281
msgid ", check forced.\n"
msgstr ", denetim baþlatýlacak.\n"
-#: e2fsck/unix.c:280
+#: e2fsck/unix.c:284
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks\n"
msgstr "%s: temiz, %d/%d dosya, %d/%d blok\n"
-#: e2fsck/unix.c:411
+#: e2fsck/unix.c:431
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "HATA: /dev/null açýlamadý (%s)\n"
-#: e2fsck/unix.c:463
-msgid "Couldn't allocate memory to parse extended options!\n"
-msgstr "Ek seçenekleri çözümlemek için bellek ayrýlamadý!\n"
-
-#: e2fsck/unix.c:489
+#: e2fsck/unix.c:502
msgid "Invalid EA version.\n"
msgstr "Ek özellik sürümü geçersiz.\n"
-#: e2fsck/unix.c:498
+#: e2fsck/unix.c:511
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
"\tea_ver=<ek_özellik_sürümü> (1 ya da 2)\n"
"\n"
-#: e2fsck/unix.c:547
+#: e2fsck/unix.c:561
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "Dosya tanýmlayýcý %d deðerlendirilirken hata: %s\n"
-#: e2fsck/unix.c:551
+#: e2fsck/unix.c:565
msgid "Invalid completion information file descriptor"
msgstr "Tamamlama bilgisi dosya tanýmlayýcýsý geçersiz"
-#: e2fsck/unix.c:581
+#: e2fsck/unix.c:580
+msgid "Only one the options -p/-a, -n or -y may be specified."
+msgstr ""
+
+#: e2fsck/unix.c:601
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr " -t seçeneði e2fsck'nýn bu sürümünde desteklenmiyor.\n"
-#: e2fsck/unix.c:650
+#: e2fsck/unix.c:666
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr "e2fsck'nýn bu sürümünde derlenmemiþ ters baytlý sistemler \n"
-#: e2fsck/unix.c:688
+#: e2fsck/unix.c:704
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr "Ters baytlar düzeltilirken uyumsuz seçeneklere izin verilmez.\n"
-#: e2fsck/unix.c:695
+#: e2fsck/unix.c:711
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
-msgstr " -c seçeneði ile -l ve -L seçenekleri ayný anda birlikte kullanýlamaz.\n"
+msgstr ""
+" -c seçeneði ile -l ve -L seçenekleri ayný anda birlikte kullanýlamaz.\n"
-#: e2fsck/unix.c:773
+#: e2fsck/unix.c:789
msgid "Error: ext2fs library version out of date!\n"
msgstr "Hata: ext2fs kitaplýk sürümü uygun deðil!\n"
-#: e2fsck/unix.c:781
+#: e2fsck/unix.c:797
msgid "while trying to initialize program"
msgstr "- uygulama baþlatýlmaya çelýþýlýrken hata oluþtu"
-#: e2fsck/unix.c:795
+#: e2fsck/unix.c:811
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\t%s, %s kullanýlýyor\n"
-#: e2fsck/unix.c:807
+#: e2fsck/unix.c:823
msgid "need terminal for interactive repairs"
msgstr "etkileþimli onarým için uçbirim gerekli"
-#: e2fsck/unix.c:843
+#: e2fsck/unix.c:859
#, c-format
msgid "%s trying backup blocks...\n"
msgstr "%s yedekleme bloklarý deneniyor...\n"
-#: e2fsck/unix.c:844
+#: e2fsck/unix.c:860
msgid "Couldn't find ext2 superblock,"
msgstr "ext2 süperbloðu bulunamadý,"
-#: e2fsck/unix.c:845
+#: e2fsck/unix.c:861
msgid "Group descriptors look bad..."
msgstr "Grup tanýmlayýcýlar hatalý görünüyor..."
-#: e2fsck/unix.c:856
+#: e2fsck/unix.c:872
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
"destekliyor gibi. (Ya da dosya sisteminin süperbloðu bozuk olabilir)\n"
"\n"
-#: e2fsck/unix.c:862
+#: e2fsck/unix.c:878
msgid "Could this be a zero-length partition?\n"
msgstr "Bu sýfýr uzunluklu bir disk bölümü olabilir mi?\n"
-#: e2fsck/unix.c:864
+#: e2fsck/unix.c:880
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Dosya sistemine %s eriþiminiz olmalý ya da root olmalýsýnýz\n"
-#: e2fsck/unix.c:869
+#: e2fsck/unix.c:885
msgid "Possibly non-existent or swap device?\n"
msgstr "Bu mevcut olmayan bir aygýt ya da bir takas aygýtý mý acaba?\n"
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:888
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
"Disk yazma korumalý; -n seçeneðini kullanarak salt-oku kipinde\n"
"denetim yapýnýz.\n"
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:904
msgid "Get a newer version of e2fsck!"
msgstr "e2fsck'nýn daha yeni bir sürümünü alýn!"
-#: e2fsck/unix.c:914
+#: e2fsck/unix.c:925
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "- %s için ext3 jurnali denetlenirken hata oluþtu"
-#: e2fsck/unix.c:925
+#: e2fsck/unix.c:936
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
"Uyarý: Dosya sistemi salt-oku kipinde denetlendiðinden\n"
"jurnal kurtarmasý atlanýyor.\n"
-#: e2fsck/unix.c:933
+#: e2fsck/unix.c:949
+#, fuzzy, c-format
+msgid "unable to set superblock flags on %s\n"
+msgstr ""
+"\n"
+"Süperblok azaltma bayraðý konuldu. %s"
+
+#: e2fsck/unix.c:955
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "- %s ext3 jurnal dosyasý kurtarýlmaya çalýþýlýrken hata oluþtu"
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:984
msgid "Warning: compression support is experimental.\n"
msgstr "Uyarý: sýkýþtýrma desteði deneyseldir.\n"
-#: e2fsck/unix.c:966
+#: e2fsck/unix.c:989
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
"E2fsck HTREE desteði ile derlenmemiþ,\n"
"\tama dosya sistemi %s HTREE dizinleri içeriyor.\n"
-#: e2fsck/unix.c:1009
+#: e2fsck/unix.c:1032
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr "%s Dosya sisteminde baytlar zaten normal.\n"
-#: e2fsck/unix.c:1029
+#: e2fsck/unix.c:1052
msgid "while reading bad blocks inode"
msgstr "- hatalý bloklar düðümü okunmaya çalýþýlýrken hata oluþtu"
-#: e2fsck/unix.c:1031
+#: e2fsck/unix.c:1054
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Bu pek hayra alamet deðil, ama üstüne gidilecek...\n"
-#: e2fsck/unix.c:1038
+#: e2fsck/unix.c:1061
msgid "Restarting e2fsck from the beginning...\n"
msgstr "e2fsck baþtan baþlýyor...\n"
-#: e2fsck/unix.c:1042
+#: e2fsck/unix.c:1065
msgid "while resetting context"
msgstr "- baðlam sýfýrlanýrken hata oluþtu"
-#: e2fsck/unix.c:1049
+#: e2fsck/unix.c:1072
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck durduruldu.\n"
-#: e2fsck/unix.c:1054
+#: e2fsck/unix.c:1077
msgid "aborted"
msgstr "çýktý"
-#: e2fsck/unix.c:1062
+#: e2fsck/unix.c:1085
#, c-format
msgid ""
"\n"
"\n"
"%s: ***** DOSYA SÝSTEMÝ DEÐÝÞTÝRÝLDÝ *****\n"
-#: e2fsck/unix.c:1065
+#: e2fsck/unix.c:1088
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** MAKÝNAYI YENÝDEN BAÞLATIN *****\n"
-#: e2fsck/unix.c:1071
+#: e2fsck/unix.c:1094
#, c-format
msgid ""
"\n"
"%s: ********** UYARI: Dosya sistemi hala hatalý **********\n"
"\n"
-#: e2fsck/util.c:99 misc/util.c:68
+#: e2fsck/util.c:130 misc/util.c:68
msgid "yY"
msgstr "eE"
-#: e2fsck/util.c:100
+#: e2fsck/util.c:131
msgid "nN"
msgstr "hH"
-#: e2fsck/util.c:114
+#: e2fsck/util.c:145
msgid "<y>"
msgstr "<e>"
-#: e2fsck/util.c:116
+#: e2fsck/util.c:147
msgid "<n>"
msgstr "<h>"
-#: e2fsck/util.c:118
+#: e2fsck/util.c:149
msgid " (y/n)"
msgstr " (e/h)"
-#: e2fsck/util.c:133
+#: e2fsck/util.c:164
msgid "cancelled!\n"
msgstr "durduruldu!\n"
-#: e2fsck/util.c:148
+#: e2fsck/util.c:179
msgid "yes\n"
msgstr "evet\n"
-#: e2fsck/util.c:150
+#: e2fsck/util.c:181
msgid "no\n"
msgstr "hayýr\n"
-#: e2fsck/util.c:160
+#: e2fsck/util.c:191
#, c-format
msgid ""
"%s? no\n"
"%s? hayýr\n"
"\n"
-#: e2fsck/util.c:164
+#: e2fsck/util.c:195
#, c-format
msgid ""
"%s? yes\n"
"%s? evet\n"
"\n"
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "yes"
msgstr "evet"
-#: e2fsck/util.c:168
+#: e2fsck/util.c:199
msgid "no"
msgstr "hayýr"
-#: e2fsck/util.c:181
+#: e2fsck/util.c:212
#, c-format
msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
msgstr "e2fsck_read_bitmaps: %s için biteþlem bloklarý kuraldýþý"
-#: e2fsck/util.c:186
+#: e2fsck/util.c:217
msgid "reading inode and block bitmaps"
msgstr "düðüm ve blok biteþlemleri okunuyor"
-#: e2fsck/util.c:191
+#: e2fsck/util.c:222
#, c-format
msgid "while retrying to read bitmaps for %s"
msgstr "- %s için biteþlemlerin okunmasý yinelenirken hata oluþtu"
-#: e2fsck/util.c:203
+#: e2fsck/util.c:234
msgid "writing block bitmaps"
msgstr "blok biteþlemleri yazýlýyor"
-#: e2fsck/util.c:208
+#: e2fsck/util.c:239
#, c-format
msgid "while retrying to write block bitmaps for %s"
msgstr "- %s için blok biteþlemlerinin yazýlmasý yinelenirken hata oluþtu"
-#: e2fsck/util.c:215
+#: e2fsck/util.c:246
msgid "writing inode bitmaps"
msgstr "düðüm biteþlemleri yazýlýyor"
-#: e2fsck/util.c:220
+#: e2fsck/util.c:251
#, c-format
msgid "while retrying to write inode bitmaps for %s"
msgstr "- %s için düðüm biteþlemlerinin yazýlmasý yinelenirken hata oluþtu"
-#: e2fsck/util.c:233
+#: e2fsck/util.c:264
#, c-format
msgid ""
"\n"
"%s: BEKLENMEYEN UYGUNSUZLUK; fsck ÇALIÞTIRMALISINIZ.\n"
"\t(-a ve -p seçeneklerini kullanmadan)\n"
-#: e2fsck/util.c:298
+#: e2fsck/util.c:329
#, c-format
msgid "Memory used: %dk/%dk (%dk/%dk), "
msgstr "Kullanýlan bellek: %dk/%dk (%dk/%dk), "
-#: e2fsck/util.c:302
+#: e2fsck/util.c:333
#, c-format
msgid "Memory used: %d, "
msgstr "Kullanýlan bellek: %d, "
-#: e2fsck/util.c:308
+#: e2fsck/util.c:339
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr "zaman: %5.2f/%5.2f/%5.2f\n"
-#: e2fsck/util.c:313
+#: e2fsck/util.c:344
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr "geçen süre: %6.3f\n"
-#: e2fsck/util.c:327
+#: e2fsck/util.c:358
#, c-format
msgid "while reading inode %ld in %s"
msgstr "- %ld düðümü %s den okunurken hata oluþtu"
-#: e2fsck/util.c:340
+#: e2fsck/util.c:371
#, c-format
msgid "while writing inode %ld in %s"
msgstr "- %ld düðümü %s e yazýlýrken hata oluþtu"
"Çeviri hatalarýný <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
"\n"
-#: misc/badblocks.c:171 misc/badblocks.c:198
+#: misc/badblocks.c:172 misc/badblocks.c:199
msgid "during seek"
msgstr "eriþim sýrasýnda"
-#: misc/badblocks.c:178
+#: misc/badblocks.c:179
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr "do_read için tuhaf deðer (%ld)\n"
-#: misc/badblocks.c:219
+#: misc/badblocks.c:220
msgid "during ext2fs_sync_device"
msgstr "ext2fs_sync_device sýrasýnda"
-#: misc/badblocks.c:235 misc/badblocks.c:411
+#: misc/badblocks.c:236 misc/badblocks.c:412
msgid "while beginning bad block list iteration"
msgstr "- hatalý blok listesi yinelemesine baþlanýrken hata oluþtu"
-#: misc/badblocks.c:245 misc/badblocks.c:314 misc/badblocks.c:421
+#: misc/badblocks.c:246 misc/badblocks.c:315 misc/badblocks.c:422
msgid "while allocating buffers"
msgstr "- tampon bellek ayrýlýrken hata oluþtu"
-#: misc/badblocks.c:250
+#: misc/badblocks.c:251
msgid "Checking for bad blocks in read-only mode\n"
msgstr "Hatalý bloklar salt-okunur kipte denetleniyor\n"
-#: misc/badblocks.c:251 misc/badblocks.c:323 misc/badblocks.c:440
+#: misc/badblocks.c:252 misc/badblocks.c:324 misc/badblocks.c:441
#, c-format
msgid "From block %lu to %lu\n"
msgstr "Blok %lu dan %lu ya kadar\n"
-#: misc/badblocks.c:259
+#: misc/badblocks.c:260
msgid "Checking for bad blocks (read-only test): "
msgstr "Hatalý bloklar için denetleniyor (salt-oku testi): "
-#: misc/badblocks.c:322
+#: misc/badblocks.c:323
msgid "Checking for bad blocks in read-write mode\n"
msgstr "Hatalý bloklar oku-yaz kipinde denetleniyor\n"
-#: misc/badblocks.c:329
+#: misc/badblocks.c:330
#, c-format
msgid "Writing pattern 0x%08x: "
msgstr "Maske 0x%08x yazýlýyor: "
-#: misc/badblocks.c:343 misc/badblocks.c:368
+#: misc/badblocks.c:344 misc/badblocks.c:369
#, c-format
msgid "during seek on block %d"
msgstr "%d bloðuna eriþim sýrasýnda"
-#: misc/badblocks.c:355
+#: misc/badblocks.c:356
msgid "Reading and comparing: "
msgstr "Okunuyor ve karþýlaþtýrýlýyor: "
-#: misc/badblocks.c:428
+#: misc/badblocks.c:429
msgid "Initializing random test data\n"
msgstr "Rasgele test verisi hazýrlanýyor\n"
-#: misc/badblocks.c:439
+#: misc/badblocks.c:440
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr "Hatalý bloklar veri bozmayan oku-yaz kipinde denetleniyor\n"
-#: misc/badblocks.c:443
+#: misc/badblocks.c:444
msgid "Checking for bad blocks (non-destructive read-write test): "
msgstr "Hatalý bloklar için denetleniyor (veri bozmayan oku-yaz testi): "
-#: misc/badblocks.c:452
+#: misc/badblocks.c:453
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
"\n"
"Kesme yakalandý, kaldýrýlýyor\n"
-#: misc/badblocks.c:509
+#: misc/badblocks.c:510
#, c-format
msgid "during test data write, block %lu"
msgstr "veri yazma denemesi sýrasýnda, blok %lu"
-#: misc/badblocks.c:619 misc/util.c:140
+#: misc/badblocks.c:620 misc/util.c:140
#, c-format
msgid "%s is mounted; "
msgstr "%s baðlandý; "
-#: misc/badblocks.c:621
+#: misc/badblocks.c:622
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
-msgstr "badblocks n'olursa olsun çalýþtýrýlacak. Ýnþallah /etc/mtab yanlýþtýr.\n"
+msgstr ""
+"badblocks n'olursa olsun çalýþtýrýlacak. Ýnþallah /etc/mtab yanlýþtýr.\n"
-#: misc/badblocks.c:625
+#: misc/badblocks.c:626
msgid "it's not safe to run badblocks!\n"
msgstr "'badblocks' çalýþtýrmak güvenli deðil!\n"
-#: misc/badblocks.c:668 misc/mke2fs.c:881
+#: misc/badblocks.c:669 misc/mke2fs.c:885
#, c-format
msgid "bad block size - %s"
msgstr "blok uzunluðu hatalý - %s"
-#: misc/badblocks.c:731
+#: misc/badblocks.c:732
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
msgstr "Aygýt alaný saptanamadý; Elle bir deðer girmelisiniz\n"
-#: misc/badblocks.c:737
+#: misc/badblocks.c:738
msgid "while trying to determine device size"
msgstr "- aygýt alaný saptanmaya çalýþýlýrken hata oluþtu"
-#: misc/badblocks.c:743 misc/mke2fs.c:1054
+#: misc/badblocks.c:744 misc/mke2fs.c:1059
#, c-format
msgid "bad blocks count - %s"
msgstr "blok sayýsý hatalý - %s"
-#: misc/badblocks.c:752
+#: misc/badblocks.c:753
#, c-format
msgid "bad starting block - %s"
msgstr "baþlangýç bloðu hatalý - %s"
-#: misc/badblocks.c:758
+#: misc/badblocks.c:759
#, c-format
msgid "bad blocks range: %lu-%lu"
msgstr "hatalý bloklar aralýðý: %lu-%lu"
-#: misc/badblocks.c:819
+#: misc/badblocks.c:820
msgid "creating in-memory bad blocks list"
msgstr "hatalý bloklar listesi bellekte oluþturuluyor"
-#: misc/badblocks.c:834
+#: misc/badblocks.c:835
msgid "adding to in-memory bad block list"
msgstr "bellekteki hatalý bloklar listesine ekleniyor"
-#: misc/badblocks.c:858
+#: misc/badblocks.c:859
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr "Geçiþ tamamlandý, %u hatalý blok bulundu.\n"
"\n"
" A: eriþim zamaný güncellenmez\n"
" a: sadece dosyanýn sonuna ekleme yapýlabilir. root deðiþtirebilir.\n"
-" c: sýkýþtýrýlmýþ; dosyanýn okuma-yazma sýrasýndaki açýlmasý/sýkýþtýrýlmasý\n"
+" c: sýkýþtýrýlmýþ; dosyanýn okuma-yazma sýrasýndaki açýlmasý/"
+"sýkýþtýrýlmasý\n"
" çekirdeðin denetimindedir.\n"
" d: dökümlenmez; dump uygulamasýndan etkilenmez.\n"
" D: bir dizine uygulanýr ve dizindeki deðiþiklikler eþzamanlý iþlenir.\n"
-" i: deðiþmez; dosya içeriði silinemez, yazýlamaz, dosyaya bað oluþturulamaz\n"
+" i: deðiþmez; dosya içeriði silinemez, yazýlamaz, dosyaya bað "
+"oluþturulamaz\n"
" ve ismi deðiþtirilemez. Sadece root bu özelliði deðiþtirebilir.\n"
" j: jurnal; dosya sistemi ext3 olarak baðlanmýþsa bu özellik etkisizdir\n"
-" s: silinme güvenliði; bu özellik verilen bir dosya silindiðinde veri alaný\n"
+" s: silinme güvenliði; bu özellik verilen bir dosya silindiðinde veri "
+"alaný\n"
" sýfýrlarla doldurulur\n"
" S: eþzamanlý güncellemeler; bu özelliði içeren bir dosyaya tüm\n"
-" deðiþiklikler anýnda yazýlýr, sistemin 'sync' seçeneði ile baðlanmasýna\n"
+" deðiþiklikler anýnda yazýlýr, sistemin 'sync' seçeneði ile "
+"baðlanmasýna\n"
" eþdeðer özellik saðlar\n"
" u: silinememezlik; bu dosya silindiðinde içeriði saklanýr, silecek\n"
" kullanýcýya silinme sýrasýnda sorulmasýný saðlar.\n"
#: misc/dumpe2fs.c:128
msgid ", Group descriptors at "
-msgstr " \n Grup tanýmlayýcý: "
+msgstr ""
+" \n"
+" Grup tanýmlayýcý: "
#: misc/dumpe2fs.c:140
msgid " Group descriptor at "
-msgstr " \n Grup tanýmlayýcý: "
+msgstr ""
+" \n"
+" Grup tanýmlayýcý: "
#: misc/dumpe2fs.c:146
msgid " Block bitmap at "
#: misc/dumpe2fs.c:151
msgid ", Inode bitmap at "
-msgstr " \n Düðüm biteþlemi: "
+msgstr ""
+" \n"
+" Düðüm biteþlemi: "
#: misc/dumpe2fs.c:156
msgid ""
"\n"
" Inode table at "
-msgstr "\n Düðüm tablosu: "
+msgstr ""
+"\n"
+" Düðüm tablosu: "
#: misc/dumpe2fs.c:163
#, c-format
msgid ""
"\n"
" %d free blocks, %d free inodes, %d directories\n"
-msgstr "\n %d serbest blok, %d serbest düðüm, %d dizin\n"
+msgstr ""
+"\n"
+" %d serbest blok, %d serbest düðüm, %d dizin\n"
#: misc/dumpe2fs.c:169
msgid " Free blocks: "
"Jurnal baþlangýcý: %d\n"
"Jurnal kullanýcý sayýsý: %d\n"
-#. Print version number and exit
-#: misc/dumpe2fs.c:312 misc/mke2fs.c:1040
+#: misc/dumpe2fs.c:312 misc/mke2fs.c:1045
#, c-format
msgid "\tUsing %s\n"
msgstr "\t%s kullanýlýyor\n"
-#: misc/dumpe2fs.c:339 misc/e2image.c:477 misc/tune2fs.c:721 resize/main.c:200
+#: misc/dumpe2fs.c:339 misc/e2image.c:479 misc/tune2fs.c:731 resize/main.c:200
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Geçerli süperblok bulunamadý.\n"
"\n"
"%s: %s: biteþlemler okunurken hata oluþtu: %s\n"
-#: misc/e2label.c:57
-#, c-format
-msgid "e2label: cannot open %s\n"
-msgstr "e2label: %s açýlamýyor\n"
-
-#: misc/e2label.c:62
-msgid "e2label: cannot seek to superblock\n"
-msgstr "e2label: süperbloka eriþilemiyor\n"
-
-#: misc/e2label.c:67
-msgid "e2label: error reading superblock\n"
-msgstr "e2label: süperblok okunurken hata oluþtu\n"
-
-#: misc/e2label.c:71
-msgid "e2label: not an ext2 filesystem\n"
-msgstr "e2label: bir ext2 dosya sistemi deðil\n"
-
-#: misc/e2label.c:96 misc/tune2fs.c:828
-msgid "Warning: label too long, truncating.\n"
-msgstr "Uyarý: etiket çok uzun, kýrpýlýyor.\n"
-
-#: misc/e2label.c:99
-msgid "e2label: cannot seek to superblock again\n"
-msgstr "e2label: süperbloða yine eriþilemedi\n"
-
-#: misc/e2label.c:104
-msgid "e2label: error writing superblock\n"
-msgstr "e2label: süperbloða yazýlýrken hata oluþtu\n"
-
-#: misc/e2label.c:116 misc/tune2fs.c:427
-msgid "Usage: e2label device [newlabel]\n"
-msgstr ""
-" \n"
-"Kullanýmý: e2label AYGIT [etiket]\n"
-"AYGIT bölüm ismini atamak/okumak için kullanýlýr.\n"
-"\n"
-
#: misc/e2image.c:50
#, c-format
msgid "Usage: %s [-r] device file\n"
"Örn: 4GB lýk bir sistem için yaklaþýk 3MB lýk bir görüntü dosyasý\n"
"oluþturulur. Bu dosya, dosya sistemini kurtarmak için uzmanlarca\n"
"kullanýlabilir. Belli aralýklarla bu dosyanýn baþka bir dosya sistemine\n"
-"kaydedilmesi önerilir. -r seçeneði temel biçemli bir dosya üretir, çok büyük\n"
+"kaydedilmesi önerilir. -r seçeneði temel biçemli bir dosya üretir, çok "
+"büyük\n"
"olacaðýndan önerilmez. DOSYA yerine - verilirse dosya standart çýktýya\n"
"yazýlýr.\n"
msgid "while writing inode bitmap"
msgstr "- düðüm biteþlemi yazýlýrken hata oluþtu"
-#: misc/findsuper.c:135
+#: misc/e2label.c:57
+#, c-format
+msgid "e2label: cannot open %s\n"
+msgstr "e2label: %s açýlamýyor\n"
+
+#: misc/e2label.c:62
+msgid "e2label: cannot seek to superblock\n"
+msgstr "e2label: süperbloka eriþilemiyor\n"
+
+#: misc/e2label.c:67
+msgid "e2label: error reading superblock\n"
+msgstr "e2label: süperblok okunurken hata oluþtu\n"
+
+#: misc/e2label.c:71
+msgid "e2label: not an ext2 filesystem\n"
+msgstr "e2label: bir ext2 dosya sistemi deðil\n"
+
+#: misc/e2label.c:96 misc/tune2fs.c:838
+msgid "Warning: label too long, truncating.\n"
+msgstr "Uyarý: etiket çok uzun, kýrpýlýyor.\n"
+
+#: misc/e2label.c:99
+msgid "e2label: cannot seek to superblock again\n"
+msgstr "e2label: süperbloða yine eriþilemedi\n"
+
+#: misc/e2label.c:104
+msgid "e2label: error writing superblock\n"
+msgstr "e2label: süperbloða yazýlýrken hata oluþtu\n"
+
+#: misc/e2label.c:116 misc/tune2fs.c:426
+msgid "Usage: e2label device [newlabel]\n"
+msgstr ""
+" \n"
+"Kullanýmý: e2label AYGIT [etiket]\n"
+"AYGIT bölüm ismini atamak/okumak için kullanýlýr.\n"
+"\n"
+
+#: misc/findsuper.c:126
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr "Kullanýmý: findsuper aygýt [atlanacak_baytlar [baþlangýç_kb]]\n"
-#: misc/findsuper.c:141
+#: misc/findsuper.c:132
#, c-format
msgid "skiprate should be a number, not %s\n"
msgstr "atlama_oraný bir sayý olmalý, %s deðil\n"
-#: misc/findsuper.c:146
+#: misc/findsuper.c:137
msgid "skipbytes must be a multiple of the sector size\n"
msgstr "atlanacak_baytlar sektör boyunun katlarý olmalý\n"
-#: misc/findsuper.c:152
+#: misc/findsuper.c:143
#, c-format
msgid "startkb should be a number, not %s\n"
msgstr "baþlangýç_kb bir sayý olmalý, %s deðil\n"
-#: misc/findsuper.c:156
+#: misc/findsuper.c:147
#, c-format
msgid "startkb should be positive, not %Ld\n"
msgstr "baþlangýç_kb poritif olmalý, %Ld deðil\n"
-#. Now, go looking for the superblock !
-#: misc/findsuper.c:166
+#: misc/findsuper.c:157
#, c-format
msgid "starting at %Ld, with %d byte increments\n"
msgstr "%Ld de baþlayýp %d bayt arttýrýmla\n"
-#: misc/findsuper.c:167
+#: misc/findsuper.c:158
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr " thisoff blok ds_blok_boyu blokboyu grup son_baðlama\n"
-#: misc/findsuper.c:213
+#: misc/findsuper.c:204
#, c-format
msgid ""
"\n"
"\n"
"%14Ld: %d hatasý ile bitti\n"
-#: misc/fsck.c:258
-#, c-format
-msgid "Could not determine filesystem type for %s\n"
-msgstr "%s için dosya sistemi türü saptanamadý\n"
-
-#: misc/fsck.c:278
+#: misc/fsck.c:331
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr "UYARI: %s açýlamadý: %s\n"
-#: misc/fsck.c:288
+#: misc/fsck.c:341
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr "UYARI: %2$s nin %1$d. satýrýnda biçem hatasý\n"
-#: misc/fsck.c:308
+#: misc/fsck.c:356
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
"\tdüzeltmelisiniz.\n"
"\n"
-#: misc/fsck.c:422
+#: misc/fsck.c:455
#, c-format
msgid "fsck: %s: not found\n"
msgstr "fsck: %s: yok\n"
-#: misc/fsck.c:535
+#: misc/fsck.c:568
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr "%s: bekliyor: Baþka ast süreç yok?!?\n"
-#: misc/fsck.c:557
+#: misc/fsck.c:590
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr "Uyarý... %s %s aygýtý için %d sinyali ile çýktý.\n"
-#: misc/fsck.c:563
+#: misc/fsck.c:596
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr "%s %s: durum %x, asla olmamalýydý.\n"
-#: misc/fsck.c:599
+#: misc/fsck.c:632
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "%s ile bitti (çýkýþ durumu: %d)\n"
-#: misc/fsck.c:659
+#: misc/fsck.c:687
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr "%s: Hata %d: fsck.%s %s için çalýtýrýlýrken oluþtu.\n"
-#: misc/fsck.c:680
+#: misc/fsck.c:708
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
"-t ile ister tüm dosya sistemi türleri belirtilsin ister bir dosya sistemi\n"
"türü belirtilmesin, ya 'no' ya da '!' öneki kullanýlmalýdýr.\n"
-#: misc/fsck.c:699
+#: misc/fsck.c:727
msgid "Couldn't allocate memory for filesystem types\n"
msgstr "Dosya sistemi türleri için bellek ayrýlamadý\n"
-#: misc/fsck.c:839
+#: misc/fsck.c:867
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr "fsck: %s denetlenemiyor: fsck.%s yok\n"
-#: misc/fsck.c:895
+#: misc/fsck.c:923
msgid "Checking all file systems.\n"
msgstr "Tüm dosya sistemleri denetleniyor.\n"
-#: misc/fsck.c:983
+#: misc/fsck.c:1009
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--beklemede-- (%d. geçiþ)\n"
-#: misc/fsck.c:1003
+#: misc/fsck.c:1029
msgid "Usage: fsck [-ACNPRTV] [-t fstype] [fs-options] [filesys ...]\n"
msgstr ""
"Kullanýmý:\n"
"bir bölüm etiketi ya da UUID verilebilir.\n"
"\n"
"Seçenekler:\n"
-" -s Denetimi hýzlandýrýr. Etkileþimli kipte iyi bir seçimdir.\n"
+" -s Denetimi hýzlandýrýr. Etkileþimli kipte iyi bir "
+"seçimdir.\n"
" -t dstürü Denetlenecek dosya sistemlerinin türleri belirtilir.\n"
" -A /etc/fstab dosyasýndaki denetlenmesi öngörülmüþ\n"
" sistemlerin denetimleri yapýlýr.\n"
" -C Denetim süreci bir göstergeyle gösterilir.\n"
" -N Denetim yapýlýyormuþ gibi görünür, bir þey yapýlmaz.\n"
" -P -A seçeneði ile birlikte kullanýlarak kök dosya sistemi\n"
-" denetlenirken diðer dosya sistemleri de paralel denetlenir\n"
+" denetlenirken diðer dosya sistemleri de paralel "
+"denetlenir\n"
" -R -A seçeneði ile kullanýldýðýnda kök dosya sistemi\n"
" denetlenmez.\n"
" -T Baþlangýçta baþlýk gösterilmez.\n"
"Çeviri hatalarýný <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
"\n"
-#: misc/fsck.c:1047
+#: misc/fsck.c:1071
#, c-format
msgid "%s: too many devices\n"
msgstr "%s: aygýt sayýsý çok fazla\n"
-#: misc/fsck.c:1057 misc/fsck.c:1126
+#: misc/fsck.c:1104 misc/fsck.c:1173
#, c-format
msgid "%s: too many arguments\n"
msgstr "%s: argüman sayýsý fazla\n"
-#: misc/get_device_by_label.c:443
-#, c-format
-msgid "WARNING: %s: bad UUID\n"
-msgstr "UYARI: %s: Evrensel tek kimlik (UUID) hatalý\n"
-
#: misc/lsattr.c:67
#, c-format
msgid "Usage: %s [-RVadlv] [files...]\n"
" -g her-gruptaki-blok-sayýsý\n"
" -i dosya-indeksi-uzunluðu boþ bir dizinin disk üzerinde kaplayabileceði\n"
" en küçük alan, bayt cinsinden verilir.\n"
-" -j ext3 dosya sistemi için jurnal dosyasý oluþturur\n"
-" -J ile jurnal dosyasýnýn özellikleri verilmezse\n"
+" -j ext3 dosya sistemi için jurnal dosyasý "
+"oluþturur\n"
+" -J ile jurnal dosyasýnýn özellikleri "
+"verilmezse\n"
" dosya öntanýmlý özelliklrele oluþturulur.\n"
" DÝKKAT: Linux çekirdeðinde ext3 desteði yoksa\n"
" sistem ext2 olarak kullanýlabilir\n"
" -M son-baðlanan-dizin dosya istemine son baðlanan dizin belirtilir\n"
" -n dosya sistemi oluþturulmaz, sadece iþlemleri\n"
" gösterir\n"
-" -N dosya-indeksi-sayýsý sistemdeki toplam dosya indeksi sayýsý belirtilir\n"
-" -o iþletim-sistemi dosya sisteminin 'creator os' alanýna yazýlacak\n"
+" -N dosya-indeksi-sayýsý sistemdeki toplam dosya indeksi sayýsý "
+"belirtilir\n"
+" -o iþletim-sistemi dosya sisteminin 'creator os' alanýna "
+"yazýlacak\n"
" deðer. Normalde Linux'tur.\n"
" -O özellik[,...] belirtilen özellikte dosya sistemi oluþturur.\n"
" Özellikler aþaðýda verilmiþtir.\n"
" -R raid_seçenekleri bu seçenekler için man sayfasýna bakýnýz\n"
" -S kurtarma amacýyla sadece süper blok ve grup\n"
" tanýmlayýcýlar yeniden yazýlýr\n"
-" -T dosya-sistemi-türü dosya sisteminin nasýl kullanýlacaðý belirtilir\n"
+" -T dosya-sistemi-türü dosya sisteminin nasýl kullanýlacaðý "
+"belirtilir\n"
" Türler için man sayfasýna bakýnýz.\n"
" -v iþlem sýrasýnda ayrýntýlý bilgi verilir\n"
" -V sürüm bilgileri gösterilir ve çýkar\n"
"Jurnal seçenekleri:\n"
-" size=jurnal-uzunluðu Jurnal dosyasýnýn uzunluðu MB olarak belirtilir\n"
+" size=jurnal-uzunluðu Jurnal dosyasýnýn uzunluðu MB olarak "
+"belirtilir\n"
" device=dýþ-jurnal-aygýtý Baþka bir aygýt üzerindeki jurnal dosyasýnýn\n"
" kullanýlmasý saðlanýr.\n"
"\n"
"Özellikler:\n"
" sparse_super Yedek süperbloklarýn sayýsýný sýnýrlamakta kullanýlýr.\n"
" filetype Dizin kayýtlarýnda dosya türü bilgisi saklanýr.\n"
-" has_journal -j seçeneði ile ayný. Bir ext3 jurnal dosyasý oluþturur.\n"
+" has_journal -j seçeneði ile ayný. Bir ext3 jurnal dosyasý "
+"oluþturur.\n"
"\n"
"Çeviri hatalarýný <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
"\n"
-#: misc/mke2fs.c:228
+#: misc/mke2fs.c:232
#, c-format
msgid "Running command: %s\n"
msgstr "Çalýþan komut: %s\n"
-#: misc/mke2fs.c:232
+#: misc/mke2fs.c:236
#, c-format
msgid "while trying run '%s'"
msgstr "- '%s' çalýþtýrýlýrken hata oluþtu"
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:243
msgid "while processing list of bad blocks from program"
msgstr "- hatalý bloklar listesi iþlenirken hata oluþtu"
-#: misc/mke2fs.c:265
+#: misc/mke2fs.c:269
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr "Birincil süperblok/grup tanýmý alanýndaki blok %d hatalý\n"
-#: misc/mke2fs.c:267
+#: misc/mke2fs.c:271
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr ""
"Bir dosya sistemi oluþturulurken %d den %d ye kadar olan\n"
"bloklar hatasýz olmak zorundadýr.\n"
-#: misc/mke2fs.c:270
+#: misc/mke2fs.c:274
msgid "Aborting....\n"
msgstr "Çýkýlýyor...\n"
-#: misc/mke2fs.c:290
+#: misc/mke2fs.c:294
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
"\"hatalý bloklar\" içeriyor.\n"
"\n"
-#: misc/mke2fs.c:308
+#: misc/mke2fs.c:312
msgid "while marking bad blocks as used"
msgstr "- hatalý bloklar kullanýlmýþ olarak imlenirken hata oluþtu"
-#: misc/mke2fs.c:361
+#: misc/mke2fs.c:365
msgid "done \n"
msgstr "bitti \n"
-#: misc/mke2fs.c:396
+#: misc/mke2fs.c:400
msgid "while allocating zeroizing buffer"
msgstr "- sýfýrlama tampon belleði ayrýlýrken hata oluþtu"
-#: misc/mke2fs.c:436
+#: misc/mke2fs.c:440
msgid "Writing inode tables: "
msgstr "Düðüm tablolarý yazýlýyor: "
-#: misc/mke2fs.c:447
+#: misc/mke2fs.c:451
#, c-format
msgid ""
"\n"
"\n"
"%2d de baþlayan düðüm tablosundaki %1d blok yazýlamadý: %3s\n"
-#: misc/mke2fs.c:470
+#: misc/mke2fs.c:474
msgid "while creating root dir"
msgstr "- kök dizin oluþturulurken hata"
-#: misc/mke2fs.c:477
+#: misc/mke2fs.c:481
msgid "while reading root inode"
msgstr "- kök düðümü okunurken hata oluþtu"
-#: misc/mke2fs.c:486
+#: misc/mke2fs.c:490
msgid "while setting root inode ownership"
msgstr "- kök düðümünün sahibi belirlenirken hata oluþtu"
-#: misc/mke2fs.c:504
+#: misc/mke2fs.c:508
msgid "while creating /lost+found"
msgstr "- /lost+found dizini oluþturulurken hata oluþtu"
-#: misc/mke2fs.c:511
+#: misc/mke2fs.c:515
msgid "while looking up /lost+found"
msgstr "- /lost+found dizine bakýlýrken hata oluþtu"
-#: misc/mke2fs.c:521
+#: misc/mke2fs.c:525
msgid "while expanding /lost+found"
msgstr "- /lost+found dizini geniþletilirken hata oluþtu"
-#: misc/mke2fs.c:537
+#: misc/mke2fs.c:541
msgid "while setting bad block inode"
msgstr "- hatalý blok düðümü belirlenirken hata oluþtu"
-#: misc/mke2fs.c:569
+#: misc/mke2fs.c:573
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "%d-%d arasýndaki sektörler silinirken bellek yetmedi\n"
-#: misc/mke2fs.c:579
+#: misc/mke2fs.c:583
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "Uyarý: blok 0 okunamadý: %s\n"
-#: misc/mke2fs.c:595
+#: misc/mke2fs.c:599
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "Uyarý: %d. sektör silinemedi: %s\n"
-#: misc/mke2fs.c:611
+#: misc/mke2fs.c:615
msgid "while initializing journal superblock"
msgstr "- jurnal superbloðu ilklendirilirken hata oluþtu"
-#: misc/mke2fs.c:617
+#: misc/mke2fs.c:621
msgid "Zeroing journal device: "
msgstr "Jurnal aygýtý temizleniyor: "
-#: misc/mke2fs.c:624
+#: misc/mke2fs.c:628
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr "- jurnal aygýtý temizlenirken (blok %u, %d blok) hata oluþtu"
-#: misc/mke2fs.c:635
+#: misc/mke2fs.c:639
msgid "while writing journal superblock"
msgstr "- jurnal süperbloðu yazýlýrken hata oluþtu"
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:653
#, c-format
msgid ""
"warning: %d blocks unused.\n"
"uyarý: %d blok kullanýlmamýþ.\n"
"\n"
-#: misc/mke2fs.c:654
+#: misc/mke2fs.c:658
#, c-format
msgid "Filesystem label=%s\n"
msgstr "Dosya sistemi ismi = %s\n"
-#: misc/mke2fs.c:655
+#: misc/mke2fs.c:659
msgid "OS type: "
msgstr "Ýþl. Sist. türü: "
-#: misc/mke2fs.c:660
+#: misc/mke2fs.c:664
msgid "(unknown os)"
msgstr "(bilinmeyen iþl. sist.)"
-#: misc/mke2fs.c:663
+#: misc/mke2fs.c:667
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Blok boyu = %u (günlük kaydý = %u)\n"
-#: misc/mke2fs.c:665
+#: misc/mke2fs.c:669
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Adýmlama boyu = %u (günlük kaydý = %u)\n"
-#: misc/mke2fs.c:667
+#: misc/mke2fs.c:671
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u düðüm, %u blok\n"
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:673
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u blok (%%%2.2f) süper kullanýcý için ayrýldý\n"
-#: misc/mke2fs.c:672
+#: misc/mke2fs.c:676
#, c-format
msgid "First data block=%u\n"
msgstr "Ýlk veri bloðu = %u\n"
-#: misc/mke2fs.c:674
+#: misc/mke2fs.c:678
#, c-format
msgid "%u block groups\n"
msgstr "%u blok grubu\n"
-#: misc/mke2fs.c:676
+#: misc/mke2fs.c:680
#, c-format
msgid "%u block group\n"
msgstr "%u blok grubu\n"
-#: misc/mke2fs.c:677
+#: misc/mke2fs.c:681
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "Grup baþýna %u blok ve %u sekme\n"
-#: misc/mke2fs.c:679
+#: misc/mke2fs.c:683
#, c-format
msgid "%u inodes per group\n"
msgstr "grup baþýna %u düðüm\n"
-#: misc/mke2fs.c:686
+#: misc/mke2fs.c:690
msgid "Superblock backups stored on blocks: "
msgstr "Süperbloklarýn bulunduðu bloklar:"
-#: misc/mke2fs.c:736
+#: misc/mke2fs.c:740
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr "Raid seçenekleri için bellek ayrýlamadý!\n"
-#: misc/mke2fs.c:761
+#: misc/mke2fs.c:765
msgid "Invalid stride parameter.\n"
msgstr "'stride' parametresi geçersiz.\n"
-#: misc/mke2fs.c:769
+#: misc/mke2fs.c:773
msgid ""
"\n"
"Bad raid options specified.\n"
"\tstride=<bloklardaki adým uzunluðu>\n"
"\n"
-#: misc/mke2fs.c:885
+#: misc/mke2fs.c:889
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Uyarý: blok uzunluðu %d birçok sistemde kullanýmdýþýdýr.\n"
-#: misc/mke2fs.c:901
+#: misc/mke2fs.c:906
#, c-format
msgid "bad fragment size - %s"
msgstr "sekme boyu hatalý - %s"
-#: misc/mke2fs.c:907
+#: misc/mke2fs.c:912
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Uyarý: sekmeler desteklenmediðinden -f seçeneði yoksayýlýyor\n"
-#: misc/mke2fs.c:914
+#: misc/mke2fs.c:919
msgid "Illegal number for blocks per group"
msgstr "Grup baþýna blok sayýsý kuraldýþý"
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:924
msgid "blocks per group must be multiple of 8"
msgstr "grup baþýna blok sayýsý 8'in katlarý olmalýdýr"
-#: misc/mke2fs.c:929
+#: misc/mke2fs.c:934
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr "düðüm oraný %s hatalý (en az %d/en çok %d)"
-#: misc/mke2fs.c:948
+#: misc/mke2fs.c:953
msgid "in malloc for bad_blocks_filename"
msgstr "- bad_blocks_filename için bellek ayrýlýrken"
-#: misc/mke2fs.c:957
+#: misc/mke2fs.c:962
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr "yedek blok yüzdesi hatalý - %s"
-#: misc/mke2fs.c:989
+#: misc/mke2fs.c:994
#, c-format
msgid "bad inode size - %s"
msgstr "düðüm uzunluðu hatalý - %s"
-#: misc/mke2fs.c:1025 misc/tune2fs.c:287
+#: misc/mke2fs.c:1030 misc/tune2fs.c:286
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Geçersiz dosya sistemi seçeneði: %s\n"
-#: misc/mke2fs.c:1078 misc/mke2fs.c:1379
+#: misc/mke2fs.c:1087 misc/mke2fs.c:1396
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "- %s jurnal aygýtý açýlmaya çalýþýlýrken hata\n"
-#: misc/mke2fs.c:1091
+#: misc/mke2fs.c:1093
+#, c-format
+msgid "Journal dev blocksize (%d) smaller thanminimum blocksize %d\n"
+msgstr ""
+
+#: misc/mke2fs.c:1107
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "%d baytlýk bloklar sistem için çok büyük (en çok %d)"
-#: misc/mke2fs.c:1095
+#: misc/mke2fs.c:1111
#, c-format
-msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
-msgstr "Uyarý: %d baytlýk bloklar sistem için çok büyük (en çok %d), ama devam ediliyor\n"
+msgid ""
+"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgstr ""
+"Uyarý: %d baytlýk bloklar sistem için çok büyük (en çok %d), ama devam "
+"ediliyor\n"
-#: misc/mke2fs.c:1115
+#: misc/mke2fs.c:1131
msgid "filesystem"
msgstr "dosya sistemi"
-#: misc/mke2fs.c:1128 resize/main.c:222
+#: misc/mke2fs.c:1144 resize/main.c:222
msgid "while trying to determine filesystem size"
msgstr "- dosya sistemi uzunluðu saptanmaya çalýþýlýrken hata oluþtu"
-#: misc/mke2fs.c:1134
+#: misc/mke2fs.c:1150
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
"Aygýt alaný saptanamadý; dosya sistemi için\n"
"bir uzunluk belirtmelisiniz\n"
-#: misc/mke2fs.c:1141
+#: misc/mke2fs.c:1157
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
"Disk bölümleme tablosunun yeniden okunmasý için sisteminizi yeniden\n"
"baþlatmalýsýnýz.\n"
-#: misc/mke2fs.c:1156
-msgid "Filesystem larger than apparent filesystem size."
+#: misc/mke2fs.c:1172
+#, fuzzy
+msgid "Filesystem larger than apparent device size."
msgstr "Dosya sisteminin uzunluðu görünürdeki uzunluktan büyük."
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1197
msgid "blocks per group count out of range"
msgstr "Grup baþýna blok sayýsý kapsamdýþý"
-#: misc/mke2fs.c:1190
+#: misc/mke2fs.c:1207
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr "düðüm uzunluðu %d hatalý (en az %d/en çok %d)"
-#: misc/mke2fs.c:1196
+#: misc/mke2fs.c:1213
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr "Uyarý: %d baytlýk düðümler bir çok sistemde kullanýmdýþýdýr.\n"
-#: misc/mke2fs.c:1238
+#: misc/mke2fs.c:1255
msgid "while setting up superblock"
msgstr "- süperblok ayarlanýrken hata oluþtu"
-#: misc/mke2fs.c:1272
+#: misc/mke2fs.c:1289
#, c-format
msgid "unknown os - %s"
msgstr "bilinmeyen iþletim sistemi - %s"
-#: misc/mke2fs.c:1326
+#: misc/mke2fs.c:1343
msgid "while trying to allocate filesystem tables"
msgstr "- dosya sistemi tablolarý ayrýlmaya çalýþýlýrken hata oluþtu"
-#: misc/mke2fs.c:1357
+#: misc/mke2fs.c:1374
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "dosya sisteminin sonunda blok %u sýfýrlanýrken"
-#: misc/mke2fs.c:1372 misc/tune2fs.c:370
+#: misc/mke2fs.c:1389 misc/tune2fs.c:369
msgid "journal"
msgstr "jurnal"
-#: misc/mke2fs.c:1384
+#: misc/mke2fs.c:1401
#, c-format
msgid "Adding journal to device %s: "
msgstr "%s'e jurnal ekleniyor: "
-#: misc/mke2fs.c:1391
+#: misc/mke2fs.c:1408
#, c-format
msgid ""
"\n"
"\n"
"\tjurnal %s e eklenmeye çalýþýlýrken hata oluþtu"
-#: misc/mke2fs.c:1396 misc/mke2fs.c:1420 misc/tune2fs.c:392 misc/tune2fs.c:406
+#: misc/mke2fs.c:1413 misc/mke2fs.c:1437 misc/tune2fs.c:391 misc/tune2fs.c:405
msgid "done\n"
msgstr "tamam\n"
-#: misc/mke2fs.c:1408
+#: misc/mke2fs.c:1425
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Jurnal oluþturuluyor (%d blok): "
-#: misc/mke2fs.c:1416
+#: misc/mke2fs.c:1433
msgid ""
"\n"
"\twhile trying to create journal"
"\n"
"\tjurnal oluþturulmaya çalýþýlýrken hata oluþtu"
-#: misc/mke2fs.c:1425
+#: misc/mke2fs.c:1442
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Süperbloklarýn ve dosya sisteminin hesap bilgileri yazýlýyor: "
-#: misc/mke2fs.c:1430
+#: misc/mke2fs.c:1447
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
"\n"
"Uyarý, süperbloklarýn tamamýna yazma sorunu var."
-#: misc/mke2fs.c:1433
+#: misc/mke2fs.c:1450
msgid ""
"done\n"
"\n"
"Dosya sisteminin ayarlanabilir parametrelerini deðiþtirmekte kullanýlýr.\n"
"\n"
"Seçenekler:\n"
-" -c SAYI Ýki dosyasistemi denetimi arasýnda dosya sisteminin\n"
+" -c SAYI Ýki dosyasistemi denetimi arasýnda dosya "
+"sisteminin\n"
" en çok kaç defa baðlanabileceði belirtilir.\n"
" -C SAYI -c ile ayný\n"
" -e hata-davranýþý Hata oluþtuðunda ne yapýlacaðý belirtilir.\n"
" 'continue': hata yoksayýlýr. 'remount-ro': dosya\n"
" sistemi salt-okunur olarak baðlanýr. 'panic':\n"
" çekirdek paniði oluþur.\n"
-" -g grup Yedek bloklarýn hangi kullanýcý grubuna ayrýlacaðý\n"
+" -g grup Yedek bloklarýn hangi kullanýcý grubuna "
+"ayrýlacaðý\n"
" belirtilir. Grup ismi ya da numarasý verilebilir.\n"
" -u kullanýcý Yedek bloklarýn hangi kullanýcýya ayrýlacaðý\n"
-" belirtilir. Kull. ismi ya da numarasý verilebilir.\n"
+" belirtilir. Kull. ismi ya da numarasý "
+"verilebilir.\n"
" -i süre[d|m|w] Ýki denetim arasýndaki en büyük süre belirtilir.\n"
" Gün(d), ay(m), hafta(w) olarak verilebilir. 0 ile\n"
" zamana baðlý denetim ayarý kaldýrýlýr.\n"
" -T son-denetim-zamaný Betiklerle kullanmak içindir\n"
" -U UUID|clear|random|time\n"
" Dosya sisteminin evrensel tek kimliði veya (UUID)\n"
-" hangi yöntemle belirleneceði belirtilir.'clear' ile\n"
+" hangi yöntemle belirleneceði belirtilir.'clear' "
+"ile\n"
" silinir; 'random' rasgele, 'time' zamana göre bir\n"
" kimlik üretir.\n"
"\n"
"Jurnal seçenekleri:\n"
-" size=jurnal-uzunluðu Jurnal dosyasýnýn uzunluðu MB olarak belirtilir\n"
+" size=jurnal-uzunluðu Jurnal dosyasýnýn uzunluðu MB olarak "
+"belirtilir\n"
" device=dýþ-jurnal-aygýtý Baþka bir aygýt üzerindeki jurnal dosyasýnýn\n"
" kullanýlmasý saðlanýr.\n"
"\n"
msgid "Journal NOT removed\n"
msgstr "Jurnal silinMEdi\n"
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:189
msgid "Journal removed\n"
msgstr "Jurnal silindi\n"
-#: misc/tune2fs.c:221
+#: misc/tune2fs.c:220
msgid "while reading journal inode"
msgstr "- jurnal düðümü okunurken hata oluþtu"
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:227
msgid "while reading bitmaps"
msgstr "- biteþlemler okunurken hata oluþtu"
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:234
msgid "while clearing journal inode"
msgstr "- jurnal düðümü temizlenirken hata oluþtu"
-#: misc/tune2fs.c:246
+#: misc/tune2fs.c:245
msgid "while writing journal inode"
msgstr "- jurnal düðümü yazýlýrken hata oluþtu"
-#: misc/tune2fs.c:261
+#: misc/tune2fs.c:260
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Geçersiz dosya sistemi seçeneði belirtidi: %s\n"
-#: misc/tune2fs.c:303
+#: misc/tune2fs.c:302
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
"has_journal bayraðý sadece dosya sistemi baðlý deðilken ya da salt-okunur\n"
"baðlýyken temizlenebilir.\n"
-#: misc/tune2fs.c:312
+#: misc/tune2fs.c:311
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
"needs_recovery bayraðý gerekiyor. Lütfen has_journal bayraðý\n"
"temizlenmeden önce e2fsck çalýþtýrýn.\n"
-#: misc/tune2fs.c:365
+#: misc/tune2fs.c:364
msgid "The filesystem already has a journal.\n"
msgstr "Dosya sisteminde bir jurnal dosyasý zaten var.\n"
-#: misc/tune2fs.c:376
+#: misc/tune2fs.c:375
#, c-format
msgid ""
"\n"
"\n"
"\t%s üzerindeki jurnal açýlmaya çalýþýlýrken hata oluþtu\n"
-#: misc/tune2fs.c:380
+#: misc/tune2fs.c:379
#, c-format
msgid "Creating journal on device %s: "
msgstr "%s üzerinde jurnal dosyasý oluþturuluyor: "
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:387
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "- %s üzerindeki jurnal dosyasýna dosya sistemi eklenirken hata oluþtu"
-#: misc/tune2fs.c:394
+#: misc/tune2fs.c:393
msgid "Creating journal inode: "
msgstr "Jurnal düðümü oluþturuluyor: "
-#: misc/tune2fs.c:403
+#: misc/tune2fs.c:402
msgid ""
"\n"
"\twhile trying to create journal file"
"\n"
"\tjurnal dosyasý oluþturulmaya çalýþýlýrken hata oluþtu"
-#: misc/tune2fs.c:450
+#: misc/tune2fs.c:460
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Tarih/zaman belirteci çözümlenemedi: %s"
-#: misc/tune2fs.c:472 misc/tune2fs.c:485
+#: misc/tune2fs.c:482 misc/tune2fs.c:495
#, c-format
msgid "bad mounts count - %s"
msgstr "baðlama sayýsý hatalý - %s"
-#: misc/tune2fs.c:501
+#: misc/tune2fs.c:511
#, c-format
msgid "bad error behavior - %s"
msgstr "hata davranýþý hatalý - %s"
-#: misc/tune2fs.c:524
+#: misc/tune2fs.c:534
#, c-format
msgid "bad gid/group name - %s"
msgstr "grup ismi/numarasý hatalý -%s"
-#: misc/tune2fs.c:557
+#: misc/tune2fs.c:567
#, c-format
msgid "bad interval - %s"
msgstr "süre hatalý - %s"
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:595
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "yedek blok oraný hatalý - %s"
-#: misc/tune2fs.c:600
+#: misc/tune2fs.c:610
msgid "-o may only be specified once"
msgstr "-o yalnýz bir kere kullanýlabilir"
-#: misc/tune2fs.c:610
+#: misc/tune2fs.c:620
msgid "-O may only be specified once"
msgstr "-O yalnýz bir kere kullanýlabilir"
-#: misc/tune2fs.c:620
+#: misc/tune2fs.c:630
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "yedek blok sayýsý hatalý - %s"
-#: misc/tune2fs.c:649
+#: misc/tune2fs.c:659
#, c-format
msgid "bad uid/user name - %s"
msgstr "kullanýcý ismi/numarasý hatalý - %s"
-#: misc/tune2fs.c:744
+#: misc/tune2fs.c:754
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "En fazla baðlama sayýsý %d olarak belirleniyor\n"
-#: misc/tune2fs.c:750
+#: misc/tune2fs.c:760
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Þimdiki baðlama sayýsý %d olarak belirleniyor\n"
-#: misc/tune2fs.c:755
+#: misc/tune2fs.c:765
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Hata davranýþý %d olarak belirleniyor\n"
-#: misc/tune2fs.c:760
+#: misc/tune2fs.c:770
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Yedek bloklarýn grup numarasý %lu olarak belirleniyor\n"
-#: misc/tune2fs.c:765
+#: misc/tune2fs.c:775
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr "Denetimler arasýndaki süre %lu saniye olarak belirleniyor\n"
-#: misc/tune2fs.c:771
+#: misc/tune2fs.c:781
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr "Yedek bloklarýn yüzdesi %lu (%u blok) olarak belirleniyor\n"
-#: misc/tune2fs.c:777
+#: misc/tune2fs.c:787
#, c-format
msgid "reserved blocks count is too big (%ul)"
msgstr "yedek blok sayýsý çok büyük (%ul)"
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:793
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Yedek blok sayýsý %lu olarak belirleniyor\n"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:799
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
"\n"
"Dosya sistemindeki süperbloklar zaten azaltýlmýþ.\n"
-#: misc/tune2fs.c:796
+#: misc/tune2fs.c:806
#, c-format
msgid ""
"\n"
"\n"
"Süperblok azaltma bayraðý konuldu. %s"
-#: misc/tune2fs.c:803
+#: misc/tune2fs.c:813
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
"\n"
"Dosya sisteminde süperblok azaltma bayraðý zaten etkin deðil.\n"
-#: misc/tune2fs.c:811
+#: misc/tune2fs.c:821
#, c-format
msgid ""
"\n"
"\n"
"Süperblok azaltma bayraðý temizlendi. %s"
-#: misc/tune2fs.c:818
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Dosya sisteminin son denetim zamaný %s yapýlýyor\n"
-#: misc/tune2fs.c:824
+#: misc/tune2fs.c:834
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Ayrýlan bloklarýn kullanýcý numarasý %lu olarak ayarlanýyor\n"
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:867
msgid "Invalid UUID format\n"
msgstr "Geçersiz UUID biçemi\n"
-#: misc/uuidgen.c:30
-#, c-format
-msgid "Usage: %s [-r] [-t]\n"
-msgstr ""
-"Kullanýmý: %s [seçenek]\n"
-"Evrendeki tek tanýmlayýcýyý (UUID) oluþturur.\n"
-"\n"
-"Seçenekler:\n"
-" -r rasgele sayý üreteci kullanýlarak rasgele bir numara üretilir\n"
-" -t varsa eternet kartýnýn adresi ve sistem zamanýna göre bir\n"
-" numara üretir\n"
-"\n"
-"Çeviri hatalarýný <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
-"\n"
-
#: misc/util.c:72
msgid "Proceed anyway? (y,n) "
msgstr "Yine de devam edilsin mi? (e/h) "
"gerçekleþirse, otomatik olarak denetlenecektir. Bu deðerleri deðiþtirmek\n"
"için tune2fs'yi -c veya -i seçeneði ile çalýþtýrýnýz.\n"
+#: misc/uuidgen.c:30
+#, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr ""
+"Kullanýmý: %s [seçenek]\n"
+"Evrendeki tek tanýmlayýcýyý (UUID) oluþturur.\n"
+"\n"
+"Seçenekler:\n"
+" -r rasgele sayý üreteci kullanýlarak rasgele bir numara üretilir\n"
+" -t varsa eternet kartýnýn adresi ve sistem zamanýna göre bir\n"
+" numara üretir\n"
+"\n"
+"Çeviri hatalarýný <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
+"\n"
+
+#: resize/extent.c:197
+msgid "# Extent dump:\n"
+msgstr "# Ek döküm:\n"
+
+#: resize/extent.c:198
+#, c-format
+msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
+msgstr "#\tNum = %d, Boy = %d, Ýmleç = %d, Sýralý = %d\n"
+
+#: resize/extent.c:201
+#, c-format
+msgid "#\t\t %u -> %u (%d)\n"
+msgstr "#\t\t %u -> %u (%d)\n"
+
#: resize/main.c:32
#, c-format
msgid ""
msgid "blocks to be moved"
msgstr "taþýnacak bloklar"
-#: resize/resize2fs.c:808
+#: resize/resize2fs.c:811
msgid "Going into desperation mode for block allocations\n"
msgstr "Blok tahsislerinde umutsuz kipe geçiliyor\n"
-#: resize/resize2fs.c:901
+#: resize/resize2fs.c:904
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr "%d blok taþýnýyor %u->%u\n"
-#: resize/resize2fs.c:971
+#: resize/resize2fs.c:974
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr "düðüm = %u, block_sayýsý = %lld, %u->%u\n"
-#: resize/resize2fs.c:1139
+#: resize/resize2fs.c:1142
#, c-format
msgid "Inode moved %u->%u\n"
msgstr "Düðüm taþýndý %u->%u\n"
-#: resize/resize2fs.c:1204
+#: resize/resize2fs.c:1207
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr "Düðüm çevirisi (dizin = %u, isim= %.*s, %u->%u)\n"
-#: resize/resize2fs.c:1330
+#: resize/resize2fs.c:1333
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
-msgstr "Düðüm tablosu %d. grubun bloklarý %u -> %u arasýnda taþýnýyor (fark %d)\n"
+msgstr ""
+"Düðüm tablosu %d. grubun bloklarý %u -> %u arasýnda taþýnýyor (fark %d)\n"
-#: resize/resize2fs.c:1356
+#: resize/resize2fs.c:1359
#, c-format
msgid "%d blocks of zeros...\n"
msgstr "%d sýfýrlý blok...\n"
-#: resize/resize2fs.c:1391
+#: resize/resize2fs.c:1394
msgid "Inode table move finished.\n"
msgstr "Düðüm tablosunun taþýnmasý tamamlandý.\n"
-#: resize/extent.c:197
-msgid "# Extent dump:\n"
-msgstr "# Ek döküm:\n"
+#~ msgid "Couldn't allocate memory to parse extended options!\n"
+#~ msgstr "Ek seçenekleri çözümlemek için bellek ayrýlamadý!\n"
-#: resize/extent.c:198
-#, c-format
-msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
-msgstr "#\tNum = %d, Boy = %d, Ýmleç = %d, Sýralý = %d\n"
+#~ msgid "Could not determine filesystem type for %s\n"
+#~ msgstr "%s için dosya sistemi türü saptanamadý\n"
-#: resize/extent.c:201
-#, c-format
-msgid "#\t\t %u -> %u (%d)\n"
-msgstr "#\t\t %u -> %u (%d)\n"
+#~ msgid "WARNING: %s: bad UUID\n"
+#~ msgstr "UYARI: %s: Evrensel tek kimlik (UUID) hatalý\n"
#~ msgid "bmap journal inode %ld, block %d\n"
#~ msgstr "bmap jurnal dosya indeksi %ld, blok %d\n"
#~ msgstr ""
#~ "\n"
#~ "Denetlenecek aygýt(lar) belirtilmedi!\n"
-
+2003-05-03 Theodore Ts'o <tytso@mit.edu>
+
+ * Makefile.in: Add $(LIBINTL) to the link line so we can support
+ using the internal gettext library.
+
+ * resize2fs.h: Add #ifndef protection around LOCALEDIR definition.
+
2003-04-21 Theodore Ts'o <tytso@mit.edu>
* Release of E2fsprogs 1.33
$(srcdir)/main.c \
$(srcdir)/sim_progress.c
-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
+LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBINTL)
DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
-STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
+STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(LIBINTL)
STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
.c.o:
all:: $(PROGS) $(TEST_PROGS) $(MANPAGES)
resize2fs: $(RESIZE_OBJS) $(DEPLIBS)
- $(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS)
+ $(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS)
resize2fs.static: $(RESIZE_OBJS) $(STATIC_DEPLIBS)
$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \
$(SUBSTITUTE) $(srcdir)/resize2fs.8.in resize2fs.8
test_extent: $(TEST_EXTENT_OBJS)
- $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
+ $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
installdirs:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(root_sbindir) \
#else
#define N_(a) (a)
#endif
-/* FIXME */
+#ifndef NLS_CAT_NAME
#define NLS_CAT_NAME "e2fsprogs"
+#endif
+#ifndef LOCALEDIR
#define LOCALEDIR "/usr/share/locale"
-/* FIXME */
+#endif
#else
#define _(a) (a)
#define N_(a) a
OSDN Git Service
