From 46287848c20cdbb0f666c770ae5ff650d58887ea Mon Sep 17 00:00:00 2001 From: John Darrington Date: Tue, 27 Jan 2004 00:50:27 +0000 Subject: [PATCH] Removed some generated files. Removed references to `fiasco' (except historical data). --- intl/ChangeLog | 4 - intl/Makefile.in | 337 -------- intl/VERSION | 1 - intl/bindtextdom.c | 369 --------- intl/config.charset | 466 ----------- intl/dcgettext.c | 59 -- intl/dcigettext.c | 1206 ---------------------------- intl/dcngettext.c | 61 -- intl/dgettext.c | 59 -- intl/dngettext.c | 61 -- intl/eval-plural.h | 114 --- intl/explodename.c | 192 ----- intl/finddomain.c | 198 ----- intl/gettext.c | 64 -- intl/gettextP.h | 242 ------ intl/gmo.h | 148 ---- intl/hash-string.h | 59 -- intl/intl-compat.c | 131 --- intl/l10nflist.c | 453 ----------- intl/libgnuintl.h | 296 ------- intl/loadinfo.h | 156 ---- intl/loadmsgcat.c | 1316 ------------------------------ intl/localcharset.c | 369 --------- intl/locale.alias | 78 -- intl/localealias.c | 419 ---------- intl/localename.c | 772 ------------------ intl/ngettext.c | 68 -- intl/os2compat.c | 98 --- intl/os2compat.h | 46 -- intl/osdep.c | 24 - intl/plural-exp.c | 156 ---- intl/plural-exp.h | 126 --- intl/plural.c | 1322 ------------------------------ intl/plural.y | 409 ---------- intl/ref-add.sin | 31 - intl/ref-del.sin | 26 - intl/textdomain.c | 142 ---- m4/ChangeLog | 34 - m4/Makefile.am | 1 - m4/codeset.m4 | 23 - m4/gettext.m4 | 587 -------------- m4/glibc21.m4 | 32 - m4/iconv.m4 | 103 --- m4/intdiv0.m4 | 72 -- m4/inttypes-pri.m4 | 32 - m4/inttypes.m4 | 27 - m4/inttypes_h.m4 | 28 - m4/isc-posix.m4 | 26 - m4/lcmessage.m4 | 32 - m4/lib-ld.m4 | 97 --- m4/lib-link.m4 | 554 ------------- m4/lib-prefix.m4 | 148 ---- m4/nls.m4 | 49 -- m4/po.m4 | 197 ----- m4/progtest.m4 | 59 -- m4/stdint_h.m4 | 28 - m4/uintmax_t.m4 | 29 - m4/ulonglong.m4 | 23 - po/Makevars | 2 +- po/en_GB.po | 1856 ++++++++++++++++++++---------------------- po/pspp.pot | 1860 ++++++++++++++++++++----------------------- 61 files changed, 1724 insertions(+), 14253 deletions(-) delete mode 100644 intl/ChangeLog delete mode 100644 intl/Makefile.in delete mode 100644 intl/VERSION delete mode 100644 intl/bindtextdom.c delete mode 100644 intl/config.charset delete mode 100644 intl/dcgettext.c delete mode 100644 intl/dcigettext.c delete mode 100644 intl/dcngettext.c delete mode 100644 intl/dgettext.c delete mode 100644 intl/dngettext.c delete mode 100644 intl/eval-plural.h delete mode 100644 intl/explodename.c delete mode 100644 intl/finddomain.c delete mode 100644 intl/gettext.c delete mode 100644 intl/gettextP.h delete mode 100644 intl/gmo.h delete mode 100644 intl/hash-string.h delete mode 100644 intl/intl-compat.c delete mode 100644 intl/l10nflist.c delete mode 100644 intl/libgnuintl.h delete mode 100644 intl/loadinfo.h delete mode 100644 intl/loadmsgcat.c delete mode 100644 intl/localcharset.c delete mode 100644 intl/locale.alias delete mode 100644 intl/localealias.c delete mode 100644 intl/localename.c delete mode 100644 intl/ngettext.c delete mode 100644 intl/os2compat.c delete mode 100644 intl/os2compat.h delete mode 100644 intl/osdep.c delete mode 100644 intl/plural-exp.c delete mode 100644 intl/plural-exp.h delete mode 100644 intl/plural.c delete mode 100644 intl/plural.y delete mode 100644 intl/ref-add.sin delete mode 100644 intl/ref-del.sin delete mode 100644 intl/textdomain.c delete mode 100644 m4/ChangeLog delete mode 100644 m4/Makefile.am delete mode 100644 m4/codeset.m4 delete mode 100644 m4/gettext.m4 delete mode 100644 m4/glibc21.m4 delete mode 100644 m4/iconv.m4 delete mode 100644 m4/intdiv0.m4 delete mode 100644 m4/inttypes-pri.m4 delete mode 100644 m4/inttypes.m4 delete mode 100644 m4/inttypes_h.m4 delete mode 100644 m4/isc-posix.m4 delete mode 100644 m4/lcmessage.m4 delete mode 100644 m4/lib-ld.m4 delete mode 100644 m4/lib-link.m4 delete mode 100644 m4/lib-prefix.m4 delete mode 100644 m4/nls.m4 delete mode 100644 m4/po.m4 delete mode 100644 m4/progtest.m4 delete mode 100644 m4/stdint_h.m4 delete mode 100644 m4/uintmax_t.m4 delete mode 100644 m4/ulonglong.m4 diff --git a/intl/ChangeLog b/intl/ChangeLog deleted file mode 100644 index 65ec50f7..00000000 --- a/intl/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -2002-08-06 GNU - - * Version 0.11.5 released. - diff --git a/intl/Makefile.in b/intl/Makefile.in deleted file mode 100644 index 0486dc93..00000000 --- a/intl/Makefile.in +++ /dev/null @@ -1,337 +0,0 @@ -# Makefile for directory with message catalog handling in GNU NLS Utilities. -# 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 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. - -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = /bin/sh - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -transform = @program_transform_name@ -libdir = @libdir@ -includedir = @includedir@ -datadir = @datadir@ -localedir = $(datadir)/locale -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 = @INTL_LIBTOOL_SUFFIX_PREFIX@ - -AR = ar -CC = @CC@ -LIBTOOL = @LIBTOOL@ -RANLIB = @RANLIB@ -YACC = @INTLBISON@ -y -d -YFLAGS = --name-prefix=__gettext - -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) 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 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 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 = Makefile.in \ -config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) -DISTFILES.generated = plural.c -DISTFILES.normal = VERSION -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 .y .o .lo .sin .sed -.c.o: - $(COMPILE) $< -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) $< - -.y.c: - $(YACC) $(YFLAGS) --output $@ $< - rm -f $*.h - -.sin.sed: - sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@ - mv t-$@ $@ - -INCLUDES = -I.. -I. -I$(top_srcdir)/intl - -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 libgnuintl.a: $(OBJECTS) - rm -f $@ - $(AR) cru $@ $(OBJECTS) - $(RANLIB) $@ - -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 - -charset.alias: config.charset - $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ - mv t-$@ $@ - -check: all - -# This installation goal is only used in GNU gettext. Packages which -# 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 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 \ - $(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 \ - if test @GLIBC21@ = no; then \ - orig=charset.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ - fi; \ - fi; \ - $(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 \ - $(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 \ - 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: - 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 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 - -TAGS: $(HEADERS) $(SOURCES) - here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) - -id: ID - -ID: $(HEADERS) $(SOURCES) - here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) - - -mostlyclean: - 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 - 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;" - @echo "it deletes files that may require special tools to rebuild." - - -# 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 - if test "$(PACKAGE)" = gettext; then \ - additional="$(DISTFILES.gettext)"; \ - else \ - additional="$(DISTFILES.normal)"; \ - fi; \ - $(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 - -Makefile: Makefile.in ../config.status - cd .. \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -# 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: diff --git a/intl/VERSION b/intl/VERSION deleted file mode 100644 index acc8052f..00000000 --- a/intl/VERSION +++ /dev/null @@ -1 +0,0 @@ -GNU gettext library from gettext-0.11.5 diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c deleted file mode 100644 index d582ce11..00000000 --- a/intl/bindtextdom.c +++ /dev/null @@ -1,369 +0,0 @@ -/* Implementation of the bindtextdomain(3) function - 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 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 -#endif - -#include -#include -#include - -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif -#include "gettextP.h" - -#ifdef _LIBC -/* We have to handle multi-threaded applications. */ -# include -#else -/* 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 . */ -#ifndef offsetof -# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) -#endif - -/* @@ end of prolog @@ */ - -/* Contains the default location of the message catalogs. */ -extern const char _nl_default_dirname[]; - -/* 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 - 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 BINDTEXTDOMAIN __bindtextdomain -# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset -# ifndef strdup -# define strdup(str) __strdup (str) -# endif -#else -# define BINDTEXTDOMAIN libintl_bindtextdomain -# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset -#endif - -/* 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 **dirnamep; - const char **codesetp; -{ - struct binding *binding; - int modified; - - /* Some sanity checks. */ - if (domainname == NULL || domainname[0] == '\0') - { - 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) - { - 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) - { - if (dirnamep) - { - const char *dirname = *dirnamep; - - 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 - result = strdup (dirname); -#else - 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 (codesetp) - { - const char *codeset = *codesetp; - - 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. */ - size_t len = strlen (domainname) + 1; - struct binding *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 (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 - result = strdup (dirname); - if (__builtin_expect (result == NULL, 0)) - goto failed_dirname; -#else - size_t len = strlen (dirname) + 1; - result = (char *) malloc (len); - if (__builtin_expect (result == NULL, 0)) - goto failed_dirname; - memcpy (result, dirname, len); -#endif - 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 - result = strdup (codeset); - if (__builtin_expect (result == NULL, 0)) - goto failed_codeset; -#else - 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 - || strcmp (domainname, _nl_domain_bindings->domainname) < 0) - { - new_binding->next = _nl_domain_bindings; - _nl_domain_bindings = new_binding; - } - else - { - binding = _nl_domain_bindings; - while (binding->next != NULL - && strcmp (domainname, binding->next->domainname) > 0) - binding = binding->next; - - new_binding->next = binding->next; - binding->next = 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; - } - } - - /* 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 -/* Aliases for function names in GNU C Library. */ -weak_alias (__bindtextdomain, bindtextdomain); -weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset); -#endif diff --git a/intl/config.charset b/intl/config.charset deleted file mode 100644 index 4f98b5b0..00000000 --- a/intl/config.charset +++ /dev/null @@ -1,466 +0,0 @@ -#! /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 " - echo "# and Bruno Haible ." - 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 diff --git a/intl/dcgettext.c b/intl/dcgettext.c deleted file mode 100644 index ca6a1c82..00000000 --- a/intl/dcgettext.c +++ /dev/null @@ -1,59 +0,0 @@ -/* Implementation of the dcgettext(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 -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#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 DCGETTEXT __dcgettext -# define DCIGETTEXT __dcigettext -#else -# define DCGETTEXT libintl_dcgettext -# define DCIGETTEXT libintl_dcigettext -#endif - -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ -char * -DCGETTEXT (domainname, msgid, category) - const char *domainname; - const char *msgid; - int category; -{ - 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 diff --git a/intl/dcigettext.c b/intl/dcigettext.c deleted file mode 100644 index f2f01524..00000000 --- a/intl/dcigettext.c +++ /dev/null @@ -1,1206 +0,0 @@ -/* 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 to provide a prototype for mempcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#ifdef __GNUC__ -# define alloca __builtin_alloca -# define HAVE_ALLOCA 1 -#else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca -char *alloca (); -# endif -# endif -# endif -#endif - -#include -#ifndef errno -extern int errno; -#endif -#ifndef __set_errno -# define __set_errno(val) errno = (val) -#endif - -#include -#include -#include - -#if defined HAVE_UNISTD_H || defined _LIBC -# include -#endif - -#include - -#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 -#endif - -#if defined HAVE_SYS_PARAM_H || defined _LIBC -# include -#endif - -#include "gettextP.h" -#include "plural-exp.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif -#include "hash-string.h" - -/* Thread safetyness. */ -#ifdef _LIBC -# include -#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 . */ -#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 -#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 -#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 - -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 diff --git a/intl/dcngettext.c b/intl/dcngettext.c deleted file mode 100644 index 17d9ce3e..00000000 --- a/intl/dcngettext.c +++ /dev/null @@ -1,61 +0,0 @@ -/* 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 -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#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 diff --git a/intl/dgettext.c b/intl/dgettext.c deleted file mode 100644 index cf5b4037..00000000 --- a/intl/dgettext.c +++ /dev/null @@ -1,59 +0,0 @@ -/* 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 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 -#endif - -#include - -#include "gettextP.h" -#ifdef _LIBC -# include -#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 DGETTEXT __dgettext -# define DCGETTEXT INTUSE(__dcgettext) -#else -# define DGETTEXT libintl_dgettext -# define DCGETTEXT libintl_dcgettext -#endif - -/* Look up MSGID in the DOMAINNAME message catalog of the current - LC_MESSAGES locale. */ -char * -DGETTEXT (domainname, msgid) - const char *domainname; - const char *msgid; -{ - return DCGETTEXT (domainname, msgid, LC_MESSAGES); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__dgettext, dgettext); -#endif diff --git a/intl/dngettext.c b/intl/dngettext.c deleted file mode 100644 index 0afbd2e1..00000000 --- a/intl/dngettext.c +++ /dev/null @@ -1,61 +0,0 @@ -/* 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 -#endif - -#include - -#include "gettextP.h" -#ifdef _LIBC -# include -#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 diff --git a/intl/eval-plural.h b/intl/eval-plural.h deleted file mode 100644 index 19c7ca6a..00000000 --- a/intl/eval-plural.h +++ /dev/null @@ -1,114 +0,0 @@ -/* 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; -} diff --git a/intl/explodename.c b/intl/explodename.c deleted file mode 100644 index 2985064c..00000000 --- a/intl/explodename.c +++ /dev/null @@ -1,192 +0,0 @@ -/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. - Contributed by Ulrich Drepper , 1995. - - 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 -#endif - -#include -#include -#include - -#include "loadinfo.h" - -/* On some strange systems still no definition of NULL is found. Sigh! */ -#ifndef NULL -# if defined __STDC__ && __STDC__ -# define NULL ((void *) 0) -# else -# define NULL 0 -# endif -#endif - -/* @@ 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) - char *name; - const char **language; - const char **modifier; - const char **territory; - const char **codeset; - const char **normalized_codeset; - const char **special; - const char **sponsor; - const char **revision; -{ - enum { undecided, xpg, cen } syntax; - char *cp; - int mask; - - *modifier = NULL; - *territory = NULL; - *codeset = NULL; - *normalized_codeset = NULL; - *special = NULL; - *sponsor = NULL; - *revision = NULL; - - /* Now we determine the single parts of the locale name. First - look for the language. Termination symbols are `_' and `@' if - we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ - mask = 0; - syntax = undecided; - *language = cp = name; - cp = _nl_find_language (*language); - - if (*language == cp) - /* This does not make sense: language has to be specified. Use - this entry as it is without exploding. Perhaps it is an alias. */ - cp = strchr (*language, '\0'); - else if (cp[0] == '_') - { - /* Next is the territory. */ - cp[0] = '\0'; - *territory = ++cp; - - while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@' - && cp[0] != '+' && cp[0] != ',' && cp[0] != '_') - ++cp; - - mask |= TERRITORY; - - if (cp[0] == '.') - { - /* Next is the codeset. */ - syntax = xpg; - cp[0] = '\0'; - *codeset = ++cp; - - while (cp[0] != '\0' && cp[0] != '@') - ++cp; - - mask |= XPG_CODESET; - - if (*codeset != cp && (*codeset)[0] != '\0') - { - *normalized_codeset = _nl_normalize_codeset (*codeset, - cp - *codeset); - if (strcmp (*codeset, *normalized_codeset) == 0) - free ((char *) *normalized_codeset); - else - mask |= XPG_NORM_CODESET; - } - } - } - - if (cp[0] == '@' || (syntax != xpg && cp[0] == '+')) - { - /* Next is the modifier. */ - syntax = cp[0] == '@' ? xpg : cen; - cp[0] = '\0'; - *modifier = ++cp; - - while (syntax == cen && cp[0] != '\0' && cp[0] != '+' - && cp[0] != ',' && cp[0] != '_') - ++cp; - - mask |= XPG_MODIFIER | CEN_AUDIENCE; - } - - if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_')) - { - syntax = cen; - - if (cp[0] == '+') - { - /* Next is special application (CEN syntax). */ - cp[0] = '\0'; - *special = ++cp; - - while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_') - ++cp; - - mask |= CEN_SPECIAL; - } - - if (cp[0] == ',') - { - /* Next is sponsor (CEN syntax). */ - cp[0] = '\0'; - *sponsor = ++cp; - - while (cp[0] != '\0' && cp[0] != '_') - ++cp; - - mask |= CEN_SPONSOR; - } - - if (cp[0] == '_') - { - /* Next is revision (CEN syntax). */ - cp[0] = '\0'; - *revision = ++cp; - - mask |= CEN_REVISION; - } - } - - /* For CEN syntax values it might be important to have the - separator character in the file name, not for XPG syntax. */ - if (syntax == xpg) - { - if (*territory != NULL && (*territory)[0] == '\0') - mask &= ~TERRITORY; - - if (*codeset != NULL && (*codeset)[0] == '\0') - mask &= ~XPG_CODESET; - - if (*modifier != NULL && (*modifier)[0] == '\0') - mask &= ~XPG_MODIFIER; - } - - return mask; -} diff --git a/intl/finddomain.c b/intl/finddomain.c deleted file mode 100644 index 2f103d55..00000000 --- a/intl/finddomain.c +++ /dev/null @@ -1,198 +0,0 @@ -/* Handle list of needed message catalogs - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. - - 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 -#endif - -#include -#include -#include -#include - -#if defined HAVE_UNISTD_H || defined _LIBC -# include -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ -/* List of already loaded domains. */ -static struct loaded_l10nfile *_nl_loaded_domains; - - -/* Return a data structure describing the message catalog described by - the DOMAINNAME and CATEGORY parameters with respect to the currently - established bindings. */ -struct loaded_l10nfile * -internal_function -_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; - const char *modifier; - const char *territory; - const char *codeset; - const char *normalized_codeset; - const char *special; - const char *sponsor; - const char *revision; - const char *alias_value; - int mask; - - /* LOCALE can consist of up to four recognized parts for the XPG syntax: - - language[_territory[.codeset]][@modifier] - - and six parts for the CEN syntax: - - language[_territory][+audience][+special][,[sponsor][_revision]] - - Beside the first part all of them are allowed to be missing. If - the full specified locale is not found, the less specific one are - looked for. The various parts will be stripped off according to - the following order: - (1) revision - (2) sponsor - (3) special - (4) codeset - (5) normalized codeset - (6) territory - (7) audience/modifier - */ - - /* If we have already tested for this locale entry there has to - be one data set in the list of loaded domains. */ - retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, - strlen (dirname) + 1, 0, locale, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, domainname, 0); - if (retval != NULL) - { - /* We know something about this locale. */ - int cnt; - - if (retval->decided == 0) - _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], domainbinding); - - if (retval->successor[cnt]->data != NULL) - break; - } - return cnt >= 0 ? retval : NULL; - /* NOTREACHED */ - } - - /* See whether the locale value is an alias. If yes its value - *overwrites* the alias name. No test for the original value is - done. */ - alias_value = _nl_expand_alias (locale); - if (alias_value != NULL) - { -#if defined _LIBC || defined HAVE_STRDUP - locale = strdup (alias_value); - if (locale == NULL) - return NULL; -#else - size_t len = strlen (alias_value) + 1; - locale = (char *) malloc (len); - if (locale == NULL) - return NULL; - - memcpy (locale, alias_value, len); -#endif - } - - /* Now we determine the single parts of the locale name. First - look for the language. Termination symbols are `_' and `@' if - we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ - mask = _nl_explode_name (locale, &language, &modifier, &territory, - &codeset, &normalized_codeset, &special, - &sponsor, &revision); - - /* Create all possible locale entries which might be interested in - generalization. */ - retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, - strlen (dirname) + 1, mask, language, territory, - codeset, normalized_codeset, modifier, special, - sponsor, revision, domainname, 1); - if (retval == NULL) - /* This means we are out of core. */ - return NULL; - - if (retval->decided == 0) - _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], domainbinding); - if (retval->successor[cnt]->data != NULL) - break; - } - } - - /* The room for an alias was dynamically allocated. Free it now. */ - 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; -} - - -#ifdef _LIBC -static void __attribute__ ((unused)) -free_mem (void) -{ - struct loaded_l10nfile *runp = _nl_loaded_domains; - - while (runp != NULL) - { - struct loaded_l10nfile *here = runp; - if (runp->data != NULL) - _nl_unload_domain ((struct loaded_domain *) runp->data); - runp = runp->next; - free ((char *) here->filename); - free (here); - } -} - -text_set_element (__libc_subfreeres, free_mem); -#endif diff --git a/intl/gettext.c b/intl/gettext.c deleted file mode 100644 index 43d689f5..00000000 --- a/intl/gettext.c +++ /dev/null @@ -1,64 +0,0 @@ -/* Implementation of gettext(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 -#endif - -#ifdef _LIBC -# define __need_NULL -# include -#else -# include /* Just for NULL. */ -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#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 GETTEXT __gettext -# define DCGETTEXT INTUSE(__dcgettext) -#else -# define GETTEXT libintl_gettext -# define DCGETTEXT libintl_dcgettext -#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 * -GETTEXT (msgid) - const char *msgid; -{ - return DCGETTEXT (NULL, msgid, LC_MESSAGES); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__gettext, gettext); -#endif diff --git a/intl/gettextP.h b/intl/gettextP.h deleted file mode 100644 index f085c59b..00000000 --- a/intl/gettextP.h +++ /dev/null @@ -1,242 +0,0 @@ -/* Header describing internals of libintl library. - Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. - - 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 _GETTEXTP_H -#define _GETTEXTP_H - -#include /* Get size_t. */ - -#ifdef _LIBC -# include "../iconv/gconv_int.h" -#else -# if HAVE_ICONV -# include -# endif -#endif - -#include "loadinfo.h" - -#include "gmo.h" /* Get nls_uint32. */ - -/* @@ end of prolog @@ */ - -#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 - -/* 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 - - -#ifdef _LIBC -# include -# define SWAP(i) bswap_32 (i) -#else -static inline nls_uint32 -SWAP (i) - nls_uint32 i; -{ - return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); -} -#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; - /* 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; - /* 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 *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, - struct binding *__domainbinding)) - internal_function; -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 @@ */ - -#endif /* gettextP.h */ diff --git a/intl/gmo.h b/intl/gmo.h deleted file mode 100644 index d1fe4d6b..00000000 --- a/intl/gmo.h +++ /dev/null @@ -1,148 +0,0 @@ -/* 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 - -/* @@ 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 ) 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 */ diff --git a/intl/hash-string.h b/intl/hash-string.h deleted file mode 100644 index b267a877..00000000 --- a/intl/hash-string.h +++ /dev/null @@ -1,59 +0,0 @@ -/* 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 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. */ - -/* @@ end of prolog @@ */ - -#ifndef PARAMS -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -#endif - -/* We assume to have `unsigned long int' value with at least 32 bits. */ -#define HASHWORDBITS 32 - - -/* 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 int hash_string PARAMS ((const char *__str_param)); - -static inline unsigned long int -hash_string (str_param) - const char *str_param; -{ - unsigned long int hval, g; - const char *str = str_param; - - /* Compute the hash value for the given string. */ - hval = 0; - while (*str != '\0') - { - hval <<= 4; - hval += (unsigned long int) *str++; - g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); - if (g != 0) - { - hval ^= g >> (HASHWORDBITS - 8); - hval ^= g; - } - } - return hval; -} diff --git a/intl/intl-compat.c b/intl/intl-compat.c deleted file mode 100644 index da890159..00000000 --- a/intl/intl-compat.c +++ /dev/null @@ -1,131 +0,0 @@ -/* intl-compat.c - Stub functions to call gettext functions from GNU gettext - Library. - 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 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 -#endif - -#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 include file. */ - - -#undef gettext -#undef dgettext -#undef dcgettext -#undef ngettext -#undef dngettext -#undef dcngettext -#undef textdomain -#undef bindtextdomain -#undef bind_textdomain_codeset - - -char * -gettext (msgid) - const char *msgid; -{ - return libintl_gettext (msgid); -} - - -char * -dgettext (domainname, msgid) - const char *domainname; - const char *msgid; -{ - return libintl_dgettext (domainname, msgid); -} - - -char * -dcgettext (domainname, msgid, category) - const char *domainname; - const char *msgid; - int category; -{ - return libintl_dcgettext (domainname, msgid, category); -} - - -char * -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 *msgid1; - const char *msgid2; - unsigned long int n; -{ - return libintl_dngettext (domainname, msgid1, msgid2, n); -} - - -char * -dcngettext (domainname, msgid1, msgid2, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; - int category; -{ - return libintl_dcngettext (domainname, msgid1, msgid2, n, category); -} - - -char * -textdomain (domainname) - const char *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); -} diff --git a/intl/l10nflist.c b/intl/l10nflist.c deleted file mode 100644 index ec8713f8..00000000 --- a/intl/l10nflist.c +++ /dev/null @@ -1,453 +0,0 @@ -/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc. - Contributed by Ulrich Drepper , 1995. - - 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 to provide a prototype for stpcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#if defined _LIBC || defined HAVE_ARGZ_H -# include -#endif -#include -#include -#include - -#include "loadinfo.h" - -/* On some strange systems still no definition of NULL is found. Sigh! */ -#ifndef NULL -# if defined __STDC__ && __STDC__ -# define NULL ((void *) 0) -# else -# define NULL 0 -# endif -#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. */ -# ifndef stpcpy -# define stpcpy(dest, src) __stpcpy(dest, src) -# endif -#else -# ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); -# 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 -/* Returns the number of strings in ARGZ. */ -static size_t argz_count__ PARAMS ((const char *argz, size_t len)); - -static size_t -argz_count__ (argz, len) - const char *argz; - size_t len; -{ - size_t count = 0; - while (len > 0) - { - size_t part_len = strlen (argz); - argz += part_len + 1; - len -= part_len + 1; - count++; - } - return 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 -/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's - except the last into the character SEP. */ -static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); - -static void -argz_stringify__ (argz, len, sep) - char *argz; - size_t len; - int sep; -{ - while (len > 0) - { - size_t part_len = strlen (argz); - argz += part_len; - len -= part_len + 1; - if (len > 0) - *argz++ = sep; - } -} -# 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 -static char *argz_next__ PARAMS ((char *argz, size_t argz_len, - const char *entry)); - -static char * -argz_next__ (argz, argz_len, entry) - char *argz; - size_t argz_len; - const char *entry; -{ - if (entry) - { - if (entry < argz + argz_len) - entry = strchr (entry, '\0') + 1; - - return entry >= argz + argz_len ? NULL : (char *) entry; - } - else - if (argz_len > 0) - return argz; - else - return 0; -} -# undef __argz_next -# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) -#endif /* !_LIBC && !HAVE___ARGZ_NEXT */ - - -/* Return number of bits set in X. */ -static int pop PARAMS ((int x)); - -static inline int -pop (x) - int x; -{ - /* We assume that no more than 16 bits are used. */ - x = ((x & ~0x5555) >> 1) + (x & 0x5555); - x = ((x & ~0x3333) >> 2) + (x & 0x3333); - x = ((x >> 4) + x) & 0x0f0f; - x = ((x >> 8) + x) & 0xff; - - return x; -} - - -struct loaded_l10nfile * -_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, - territory, codeset, normalized_codeset, modifier, special, - sponsor, revision, filename, do_allocate) - struct loaded_l10nfile **l10nfile_list; - const char *dirlist; - size_t dirlist_len; - int mask; - const char *language; - const char *territory; - const char *codeset; - const char *normalized_codeset; - const char *modifier; - const char *special; - const char *sponsor; - const char *revision; - const char *filename; - int do_allocate; -{ - char *abs_filename; - 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 & TERRITORY) != 0 - ? strlen (territory) + 1 : 0) - + ((mask & XPG_CODESET) != 0 - ? strlen (codeset) + 1 : 0) - + ((mask & XPG_NORM_CODESET) != 0 - ? strlen (normalized_codeset) + 1 : 0) - + (((mask & XPG_MODIFIER) != 0 - || (mask & CEN_AUDIENCE) != 0) - ? strlen (modifier) + 1 : 0) - + ((mask & CEN_SPECIAL) != 0 - ? strlen (special) + 1 : 0) - + (((mask & CEN_SPONSOR) != 0 - || (mask & CEN_REVISION) != 0) - ? (1 + ((mask & CEN_SPONSOR) != 0 - ? strlen (sponsor) : 0) - + ((mask & CEN_REVISION) != 0 - ? strlen (revision) + 1 : 0)) : 0) - + 1 + strlen (filename) + 1); - - if (abs_filename == NULL) - return NULL; - - /* Construct file name. */ - 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) - { - *cp++ = '_'; - cp = stpcpy (cp, territory); - } - if ((mask & XPG_CODESET) != 0) - { - *cp++ = '.'; - cp = stpcpy (cp, codeset); - } - if ((mask & XPG_NORM_CODESET) != 0) - { - *cp++ = '.'; - cp = stpcpy (cp, normalized_codeset); - } - if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0) - { - /* This component can be part of both syntaces but has different - leading characters. For CEN we use `+', else `@'. */ - *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@'; - cp = stpcpy (cp, modifier); - } - if ((mask & CEN_SPECIAL) != 0) - { - *cp++ = '+'; - cp = stpcpy (cp, special); - } - if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0) - { - *cp++ = ','; - if ((mask & CEN_SPONSOR) != 0) - cp = stpcpy (cp, sponsor); - if ((mask & CEN_REVISION) != 0) - { - *cp++ = '_'; - cp = stpcpy (cp, revision); - } - } - - *cp++ = '/'; - stpcpy (cp, filename); - - /* Look in list of already loaded domains whether it is already - available. */ - lastp = l10nfile_list; - for (retval = *l10nfile_list; retval != NULL; retval = retval->next) - if (retval->filename != NULL) - { - int compare = strcmp (retval->filename, abs_filename); - if (compare == 0) - /* We found it! */ - break; - if (compare < 0) - { - /* It's not in the list. */ - retval = NULL; - break; - } - - lastp = &retval->next; - } - - if (retval != NULL || do_allocate == 0) - { - free (abs_filename); - return retval; - } - - 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; - - /* 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; - - retval->next = *lastp; - *lastp = retval; - - entries = 0; - /* 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)) - { - 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, dirlist, dirlist_len, - cnt, language, territory, codeset, - normalized_codeset, modifier, special, - sponsor, revision, filename, 1); - } - retval->successor[entries] = NULL; - - return retval; -} - -/* 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. */ -const char * -_nl_normalize_codeset (codeset, name_len) - const char *codeset; - size_t name_len; -{ - int len = 0; - int only_digit = 1; - char *retval; - char *wp; - size_t cnt; - - for (cnt = 0; cnt < name_len; ++cnt) - if (isalnum ((unsigned char) codeset[cnt])) - { - ++len; - - if (isalpha ((unsigned char) codeset[cnt])) - only_digit = 0; - } - - retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1); - - if (retval != NULL) - { - if (only_digit) - wp = stpcpy (retval, "iso"); - else - wp = retval; - - for (cnt = 0; cnt < name_len; ++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'; - } - - return (const char *) 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 diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h deleted file mode 100644 index ed25fe9f..00000000 --- a/intl/libgnuintl.h +++ /dev/null @@ -1,296 +0,0 @@ -/* 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 - -/* 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, defines __LOCALE_H (or _LOCALE_H in Solaris 2.5) - then includes (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 */ diff --git a/intl/loadinfo.h b/intl/loadinfo.h deleted file mode 100644 index 1d3ba616..00000000 --- a/intl/loadinfo.h +++ /dev/null @@ -1,156 +0,0 @@ -/* Copyright (C) 1996-1999, 2000-2002 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1996. - - 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 _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__ || 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 -#define CEN_SPECIAL 4 -#define XPG_NORM_CODESET 8 -#define XPG_CODESET 16 -#define TERRITORY 32 -#define CEN_AUDIENCE 64 -#define XPG_MODIFIER 128 - -#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE) -#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER) - - -struct loaded_l10nfile -{ - const char *filename; - int decided; - - const void *data; - - struct loaded_l10nfile *next; - struct loaded_l10nfile *successor[1]; -}; - - -/* 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 *language, const char *territory, - const char *codeset, - const char *normalized_codeset, - const char *modifier, const char *special, - 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 **codeset, - const char **normalized_codeset, - 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 */ diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c deleted file mode 100644 index 516f5211..00000000 --- a/intl/loadmsgcat.c +++ /dev/null @@ -1,1316 +0,0 @@ -/* Load needed message catalogs. - 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 to provide a prototype for mempcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include -#include - -#ifdef __GNUC__ -# define alloca __builtin_alloca -# define HAVE_ALLOCA 1 -#else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca -char *alloca (); -# endif -# endif -# endif -#endif - -#include -#include - -#if defined HAVE_UNISTD_H || defined _LIBC -# include -#endif - -#ifdef _LIBC -# include -# include -#endif - -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ - || (defined _LIBC && defined _POSIX_MAPPED_FILES) -# include -# undef HAVE_MMAP -# define HAVE_MMAP 1 -#else -# undef HAVE_MMAP -#endif - -#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC -# include -#endif -#if defined HAVE_INTTYPES_H || defined _LIBC -# include -#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 . - 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 @@ */ - -#ifdef _LIBC -/* Rename the non ISO C functions. This is required by the standard - because some ISO C functions will require linking with this object - file and the name space must not be polluted. */ -# define open __open -# define close __close -# define read __read -# define mmap __mmap -# 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 . */ -#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; - - -/* 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, 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; - int use_mmap = 0; - 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 - syntax. */ - if (domain_file->filename == NULL) - return; - - /* Try to open the addressed file. */ - fd = open (domain_file->filename, O_RDONLY | O_BINARY); - if (fd == -1) - return; - - /* We must know about the size of the file. */ - 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; - } - -#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 (__builtin_expect (data != (struct mo_file_header *) -1, 1)) - { - /* mmap() call was successful. */ - close (fd); - use_mmap = 1; - } -#endif - - /* If the data is not yet available (i.e. mmap'ed) we try to load - it manually. */ - if (data == (struct mo_file_header *) -1) - { - size_t to_read; - char *read_ptr; - - data = (struct mo_file_header *) malloc (size); - if (data == NULL) - return; - - to_read = size; - read_ptr = (char *) data; - do - { - long int nb = (long int) read (fd, read_ptr, to_read); - if (nb <= 0) - { -#ifdef EINTR - if (nb == -1 && errno == EINTR) - continue; -#endif - close (fd); - return; - } - read_ptr += nb; - to_read -= nb; - } - while (to_read > 0); - - close (fd); - } - - /* Using the magic number we can test whether it really is a message - catalog file. */ - if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED, - 0)) - { - /* The magic number is wrong: not a message catalog file. */ -#ifdef HAVE_MMAP - if (use_mmap) - munmap ((caddr_t) data, size); - else -#endif - free (data); - return; - } - - domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); - if (domain == NULL) - return; - domain_file->data = domain; - - domain->data = (char *) data; - domain->use_mmap = use_mmap; - domain->mmap_size = size; - domain->must_swap = data->magic != _MAGIC; - domain->malloced = NULL; - - /* Fill in the information about the available tables. */ - 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 = (const struct string_desc *) - ((char *) data + W (domain->must_swap, data->orig_tab_offset)); - 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 = - (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 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); - else -#endif - free (data); - free (domain); - domain_file->data = NULL; - return; - } - - /* 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); -} - - -#ifdef _LIBC -void -internal_function -_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); - else -# endif /* _POSIX_MAPPED_FILES */ - free ((void *) domain->data); - - free (domain); -} -#endif diff --git a/intl/localcharset.c b/intl/localcharset.c deleted file mode 100644 index 2b1564e2..00000000 --- a/intl/localcharset.c +++ /dev/null @@ -1,369 +0,0 @@ -/* 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 . */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#if HAVE_STDDEF_H -# include -#endif - -#include -#if HAVE_STRING_H -# include -#else -# include -#endif -#if HAVE_STDLIB_H -# include -#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 -# else -# if HAVE_SETLOCALE -# include -# endif -# endif -#elif defined WIN32 -# define WIN32_LEAN_AND_MEAN -# include -#endif -#if defined OS2 -# define INCL_DOS -# include -#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; -} diff --git a/intl/locale.alias b/intl/locale.alias deleted file mode 100644 index bd7b9b31..00000000 --- a/intl/locale.alias +++ /dev/null @@ -1,78 +0,0 @@ -# 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 diff --git a/intl/localealias.c b/intl/localealias.c deleted file mode 100644 index 456e41e3..00000000 --- a/intl/localealias.c +++ /dev/null @@ -1,419 +0,0 @@ -/* Handle aliases for locale names. - 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 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 to provide a prototype for mempcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#if defined _LIBC || defined HAVE___FSETLOCKING -# include -#endif -#include - -#ifdef __GNUC__ -# define alloca __builtin_alloca -# define HAVE_ALLOCA 1 -#else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca -char *alloca (); -# endif -# endif -# endif -#endif - -#include -#include - -#include "gettextP.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 strcasecmp __strcasecmp - -# 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 - -__libc_lock_define_initialized (static, lock); -#endif - -#ifndef internal_function -# define internal_function -#endif - -/* 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 -# define freea(p) /* nothing */ -#else -# 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 -{ - const char *alias; - const char *value; -}; - - -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; -static size_t maxmap; - - -/* Prototypes for local functions. */ -static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) - internal_function; -static int extend_alias_table PARAMS ((void)); -static int alias_compare PARAMS ((const struct alias_map *map1, - const struct alias_map *map2)); - - -const char * -_nl_expand_alias (name) - const char *name; -{ - static const char *locale_alias_path; - struct alias_map *retval; - const char *result = NULL; - size_t added; - -#ifdef _LIBC - __libc_lock_lock (lock); -#endif - - if (locale_alias_path == NULL) - locale_alias_path = LOCALE_ALIAS_PATH; - - do - { - struct alias_map item; - - item.alias = name; - - if (nmap > 0) - retval = (struct alias_map *) bsearch (&item, map, nmap, - sizeof (struct alias_map), - (int (*) PARAMS ((const void *, - const void *)) - ) alias_compare); - else - retval = NULL; - - /* We really found an alias. Return the value. */ - if (retval != NULL) - { - result = retval->value; - break; - } - - /* Perhaps we can find another alias file. */ - added = 0; - while (added == 0 && locale_alias_path[0] != '\0') - { - const char *start; - - while (locale_alias_path[0] == PATH_SEPARATOR) - ++locale_alias_path; - start = locale_alias_path; - - while (locale_alias_path[0] != '\0' - && locale_alias_path[0] != PATH_SEPARATOR) - ++locale_alias_path; - - if (start < locale_alias_path) - added = read_alias_file (start, locale_alias_path - start); - } - } - while (added != 0); - -#ifdef _LIBC - __libc_lock_unlock (lock); -#endif - - return result; -} - - -static size_t -internal_function -read_alias_file (fname, fname_len) - const char *fname; - int fname_len; -{ - FILE *fp; - char *full_fname; - size_t added; - static const char aliasfile[] = "/locale.alias"; - - full_fname = (char *) alloca (fname_len + sizeof aliasfile); -#ifdef HAVE_MEMPCPY - mempcpy (mempcpy (full_fname, fname, fname_len), - aliasfile, sizeof aliasfile); -#else - memcpy (full_fname, fname, fname_len); - memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); -#endif - - fp = fopen (full_fname, "r"); - freea (full_fname); - if (fp == NULL) - return 0; - -#ifdef HAVE___FSETLOCKING - /* No threads present. */ - __fsetlocking (fp, FSETLOCKING_BYCALLER); -#endif - - added = 0; - 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 - */ - char buf[BUFSIZ]; - char *alias; - char *value; - char *cp; - - if (FGETS (buf, sizeof buf, fp) == NULL) - /* EOF reached. */ - break; - - /* Possibly not the whole line fits into the buffer. Ignore - the rest of the line. */ - if (strchr (buf, '\n') == NULL) - { - char altbuf[BUFSIZ]; - do - 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; - while (strchr (altbuf, '\n') == NULL); - } - - cp = buf; - /* Ignore leading white space. */ - 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 ((unsigned char) cp[0])) - ++cp; - /* Terminate alias name. */ - if (cp[0] != '\0') - *cp++ = '\0'; - - /* Now look for the beginning of the value. */ - while (isspace ((unsigned char) cp[0])) - ++cp; - - if (cp[0] != '\0') - { - size_t alias_len; - size_t value_len; - - value = cp++; - while (cp[0] != '\0' && !isspace ((unsigned char) cp[0])) - ++cp; - /* Terminate value. */ - if (cp[0] == '\n') - { - /* This has to be done to make the following test - for the end of line possible. We are looking for - the terminating '\n' which do not overwrite here. */ - *cp++ = '\0'; - *cp = '\n'; - } - else if (cp[0] != '\0') - *cp++ = '\0'; - - if (nmap >= maxmap) - if (__builtin_expect (extend_alias_table (), 0)) - return added; - - alias_len = strlen (alias) + 1; - value_len = strlen (value) + 1; - - if (string_space_act + alias_len + value_len > string_space_max) - { - /* Increase size of memory pool. */ - size_t new_size = (string_space_max - + (alias_len + value_len > 1024 - ? 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)) - { - 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; - } - - map[nmap].alias = memcpy (&string_space[string_space_act], - alias, alias_len); - string_space_act += alias_len; - - map[nmap].value = memcpy (&string_space[string_space_act], - value, value_len); - string_space_act += value_len; - - ++nmap; - ++added; - } - } - } - - /* Should we test for ferror()? I think we have to silently ignore - errors. --drepper */ - fclose (fp); - - if (added > 0) - qsort (map, nmap, sizeof (struct alias_map), - (int (*) PARAMS ((const void *, const void *))) alias_compare); - - return added; -} - - -static int -extend_alias_table () -{ - size_t new_size; - struct alias_map *new_map; - - new_size = maxmap == 0 ? 100 : 2 * maxmap; - new_map = (struct alias_map *) realloc (map, (new_size - * sizeof (struct alias_map))); - if (new_map == NULL) - /* Simply don't extend: we don't have any more core. */ - return -1; - - map = new_map; - maxmap = new_size; - return 0; -} - - -#ifdef _LIBC -static void __attribute__ ((unused)) -free_mem (void) -{ - if (string_space != NULL) - free (string_space); - if (map != NULL) - free (map); -} -text_set_element (__libc_subfreeres, free_mem); -#endif - - -static int -alias_compare (map1, map2) - const struct alias_map *map1; - const struct alias_map *map2; -{ -#if defined _LIBC || defined HAVE_STRCASECMP - return strcasecmp (map1->alias, map2->alias); -#else - const unsigned char *p1 = (const unsigned char *) map1->alias; - const unsigned char *p2 = (const unsigned char *) map2->alias; - unsigned char c1, c2; - - if (p1 == p2) - return 0; - - do - { - /* I know this seems to be odd but the tolower() function in - some systems libc cannot handle nonalpha characters. */ - c1 = isupper (*p1) ? tolower (*p1) : *p1; - c2 = isupper (*p2) ? tolower (*p2) : *p2; - if (c1 == '\0') - break; - ++p1; - ++p2; - } - while (c1 == c2); - - return c1 - c2; -#endif -} diff --git a/intl/localename.c b/intl/localename.c deleted file mode 100644 index faacecd5..00000000 --- a/intl/localename.c +++ /dev/null @@ -1,772 +0,0 @@ -/* 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 , 1995. */ -/* Win32 code written by Tor Lillqvist . */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include - -#if defined _WIN32 || defined __WIN32__ -# undef WIN32 /* avoid warning on mingw32 */ -# define WIN32 -#endif - -#ifdef WIN32 -# define WIN32_LEAN_AND_MEAN -# include -/* 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 -} diff --git a/intl/ngettext.c b/intl/ngettext.c deleted file mode 100644 index 69fe1f74..00000000 --- a/intl/ngettext.c +++ /dev/null @@ -1,68 +0,0 @@ -/* 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 -#endif - -#ifdef _LIBC -# define __need_NULL -# include -#else -# include /* Just for NULL. */ -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -#include - -/* @@ 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 diff --git a/intl/os2compat.c b/intl/os2compat.c deleted file mode 100644 index c8dc33e7..00000000 --- a/intl/os2compat.c +++ /dev/null @@ -1,98 +0,0 @@ -/* 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 -#endif - -#include -#include -#include - -/* 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); -} diff --git a/intl/os2compat.h b/intl/os2compat.h deleted file mode 100644 index 4f74e8c0..00000000 --- a/intl/os2compat.h +++ /dev/null @@ -1,46 +0,0 @@ -/* 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) diff --git a/intl/osdep.c b/intl/osdep.c deleted file mode 100644 index b3725983..00000000 --- a/intl/osdep.c +++ /dev/null @@ -1,24 +0,0 @@ -/* 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 diff --git a/intl/plural-exp.c b/intl/plural-exp.c deleted file mode 100644 index c937c011..00000000 --- a/intl/plural-exp.c +++ /dev/null @@ -1,156 +0,0 @@ -/* Expression parsing for plural form selection. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 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 -#endif - -#include -#include -#include - -#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; - } -} diff --git a/intl/plural-exp.h b/intl/plural-exp.h deleted file mode 100644 index 9e5d1658..00000000 --- a/intl/plural-exp.h +++ /dev/null @@ -1,126 +0,0 @@ -/* Expression parsing and evaluation for plural form selection. - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. - Written by Ulrich Drepper , 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 */ diff --git a/intl/plural.c b/intl/plural.c deleted file mode 100644 index c9ff63fb..00000000 --- a/intl/plural.c +++ /dev/null @@ -1,1322 +0,0 @@ - -/* 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 , 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 - because may include arbitrary system headers. */ -#if defined _AIX && !defined __GNUC__ - #pragma alloca -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#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 - -#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 -#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 -#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 */ - #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 - -/* 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 - -#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" - - 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. */ -} diff --git a/intl/plural.y b/intl/plural.y deleted file mode 100644 index 616b7c11..00000000 --- a/intl/plural.y +++ /dev/null @@ -1,409 +0,0 @@ -%{ -/* Expression parsing for plural form selection. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 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 - because may include arbitrary system headers. */ -#if defined _AIX && !defined __GNUC__ - #pragma alloca -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#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 EQUOP2 CMPOP2 ADDOP2 MULOP2 -%token NUMBER -%type 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. */ -} diff --git a/intl/ref-add.sin b/intl/ref-add.sin deleted file mode 100644 index 167374e3..00000000 --- a/intl/ref-add.sin +++ /dev/null @@ -1,31 +0,0 @@ -# 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 . -# -/^# Packages using this file: / { - s/# Packages using this file:// - ta - :a - s/ @PACKAGE@ / @PACKAGE@ / - tb - s/ $/ @PACKAGE@ / - :b - s/^/# Packages using this file:/ -} diff --git a/intl/ref-del.sin b/intl/ref-del.sin deleted file mode 100644 index 613cf37f..00000000 --- a/intl/ref-del.sin +++ /dev/null @@ -1,26 +0,0 @@ -# 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 . -# -/^# Packages using this file: / { - s/# Packages using this file:// - s/ @PACKAGE@ / / - s/^/# Packages using this file:/ -} diff --git a/intl/textdomain.c b/intl/textdomain.c deleted file mode 100644 index f259c696..00000000 --- a/intl/textdomain.c +++ /dev/null @@ -1,142 +0,0 @@ -/* Implementation of the textdomain(3) function. - 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 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 -#endif - -#include -#include - -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif -#include "gettextP.h" - -#ifdef _LIBC -/* We have to handle multi-threaded applications. */ -# include -#else -/* 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[] attribute_hidden; - -/* Default text domain in which entries for gettext(3) are to be found. */ -extern const char *_nl_current_default_domain 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 - 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 TEXTDOMAIN __textdomain -# ifndef strdup -# define strdup(str) __strdup (str) -# endif -#else -# 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". */ -char * -TEXTDOMAIN (domainname) - const char *domainname; -{ - char *new_domain; - char *old_domain; - - /* A NULL pointer requests the current setting. */ - if (domainname == NULL) - return (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; - 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 - new_domain = strdup (domainname); -#else - size_t len = strlen (domainname) + 1; - 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); - } - - __libc_rwlock_unlock (_nl_state_lock); - - return new_domain; -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__textdomain, textdomain); -#endif diff --git a/m4/ChangeLog b/m4/ChangeLog deleted file mode 100644 index 804ee6ac..00000000 --- a/m4/ChangeLog +++ /dev/null @@ -1,34 +0,0 @@ -2003-12-13 gettextize - - * gettext.m4: Upgrade to gettext-0.11.5. - * inttypes_h.m4: Upgrade to gettext-0.11.5. - * lib-ld.m4: Upgrade to gettext-0.11.5. - * lib-link.m4: Upgrade to gettext-0.11.5. - * lib-prefix.m4: Upgrade to gettext-0.11.5. - * progtest.m4: Upgrade to gettext-0.11.5. - * stdint_h.m4: Upgrade to gettext-0.11.5. - * uintmax_t.m4: Upgrade to gettext-0.11.5. - -2003-12-08 gettextize - - * codeset.m4: New file, from gettext-0.12.1. - * gettext.m4: New file, from gettext-0.12.1. - * glibc21.m4: New file, from gettext-0.12.1. - * iconv.m4: New file, from gettext-0.12.1. - * intdiv0.m4: New file, from gettext-0.12.1. - * inttypes.m4: New file, from gettext-0.12.1. - * inttypes_h.m4: New file, from gettext-0.12.1. - * inttypes-pri.m4: New file, from gettext-0.12.1. - * isc-posix.m4: New file, from gettext-0.12.1. - * lcmessage.m4: New file, from gettext-0.12.1. - * lib-ld.m4: New file, from gettext-0.12.1. - * lib-link.m4: New file, from gettext-0.12.1. - * lib-prefix.m4: New file, from gettext-0.12.1. - * nls.m4: New file, from gettext-0.12.1. - * po.m4: New file, from gettext-0.12.1. - * progtest.m4: New file, from gettext-0.12.1. - * stdint_h.m4: New file, from gettext-0.12.1. - * uintmax_t.m4: New file, from gettext-0.12.1. - * ulonglong.m4: New file, from gettext-0.12.1. - * Makefile.am: New file. - diff --git a/m4/Makefile.am b/m4/Makefile.am deleted file mode 100644 index 2924f677..00000000 --- a/m4/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 diff --git a/m4/codeset.m4 b/m4/codeset.m4 deleted file mode 100644 index 59535ebc..00000000 --- a/m4/codeset.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# 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 ], - [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 and nl_langinfo(CODESET).]) - fi -]) diff --git a/m4/gettext.m4 b/m4/gettext.m4 deleted file mode 100644 index 45cad855..00000000 --- a/m4/gettext.m4 +++ /dev/null @@ -1,587 +0,0 @@ -# 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 , 1995-2000. -dnl Bruno Haible , 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 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 - 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_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - - 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 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 -]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 -]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 -]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 - - 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)" - 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 - - 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 - ]) - - 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 - USE_NLS=no - fi - fi - - if test "$USE_NLS" = "yes"; then - - 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 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(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) - - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) - - 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], []) diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 deleted file mode 100644 index 9c9f3db3..00000000 --- a/m4/glibc21.m4 +++ /dev/null @@ -1,32 +0,0 @@ -# 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 -#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" - ] -) diff --git a/m4/iconv.m4 b/m4/iconv.m4 deleted file mode 100644 index c5f35798..00000000 --- a/m4/iconv.m4 +++ /dev/null @@ -1,103 +0,0 @@ -# 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 -#include ], - [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 -#include ], - [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 -#include -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 -]) diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4 deleted file mode 100644 index 55dddcf1..00000000 --- a/m4/intdiv0.m4 +++ /dev/null @@ -1,72 +0,0 @@ -# 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 -#include - -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 - - 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.]) -]) diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 deleted file mode 100644 index fd007c31..00000000 --- a/m4/inttypes-pri.m4 +++ /dev/null @@ -1,32 +0,0 @@ -# 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 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 -#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 exists and defines unusable PRI* macros.]) - fi -]) diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 deleted file mode 100644 index ab370ffe..00000000 --- a/m4/inttypes.m4 +++ /dev/null @@ -1,27 +0,0 @@ -# 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 exists and doesn't clash with -# . - -AC_DEFUN([gt_HEADER_INTTYPES_H], -[ - AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, - [ - AC_TRY_COMPILE( - [#include -#include ], - [], 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 exists and doesn't clash with .]) - fi -]) diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 deleted file mode 100644 index 400a1118..00000000 --- a/m4/inttypes_h.m4 +++ /dev/null @@ -1,28 +0,0 @@ -# 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 exists, -# doesn't clash with , 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 -#include ], - [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 exists, doesn't clash with , - and declares uintmax_t. ]) - fi -]) diff --git a/m4/isc-posix.m4 b/m4/isc-posix.m4 deleted file mode 100644 index 1319dd1c..00000000 --- a/m4/isc-posix.m4 +++ /dev/null @@ -1,26 +0,0 @@ -# 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"]) - ] -) diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4 deleted file mode 100644 index ffd4008b..00000000 --- a/m4/lcmessage.m4 +++ /dev/null @@ -1,32 +0,0 @@ -# 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 , 1995. - -# Check whether LC_MESSAGES is available in . - -AC_DEFUN([AM_LC_MESSAGES], -[ - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi -]) diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 deleted file mode 100644 index ddb57323..00000000 --- a/m4/lib-ld.m4 +++ /dev/null @@ -1,97 +0,0 @@ -# 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 &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 - 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 -]) diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 deleted file mode 100644 index 6b942510..00000000 --- a/m4/lib-link.m4 +++ /dev/null @@ -1,554 +0,0 @@ -# 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. - -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 -]) diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 deleted file mode 100644 index b8b79ab9..00000000 --- a/m4/lib-prefix.m4 +++ /dev/null @@ -1,148 +0,0 @@ -# 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 -]) - -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" -]) diff --git a/m4/nls.m4 b/m4/nls.m4 deleted file mode 100644 index 36bc4931..00000000 --- a/m4/nls.m4 +++ /dev/null @@ -1,49 +0,0 @@ -# nls.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -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 , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_DEFUN([AM_NLS], -[ - 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) -]) - -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 it. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - case "$ac_aux_dir" in - /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; - *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; - esac - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) -]) diff --git a/m4/po.m4 b/m4/po.m4 deleted file mode 100644 index 861e3dec..00000000 --- a/m4/po.m4 +++ /dev/null @@ -1,197 +0,0 @@ -# po.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -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 , 1995-2000. -dnl Bruno Haible , 2000-2003. - -dnl Checks for all prerequisites of the po subdirectory. -AC_DEFUN([AM_PO_SUBDIRS], -[ - AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - AC_REQUIRE([AM_NLS])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.12 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= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - dnl Remove leftover from FreeBSD xgettext call. - 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= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && - (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /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" - POMAKEFILEDEPS="POTFILES.in" - # 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 "$OBSOLETE_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_' - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - eval 'ALL_LINGUAS''=$OBSOLETE_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" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|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 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - ]) -]) diff --git a/m4/progtest.m4 b/m4/progtest.m4 deleted file mode 100644 index 443c8e30..00000000 --- a/m4/progtest.m4 +++ /dev/null @@ -1,59 +0,0 @@ -# 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 , 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], -[# 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]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 deleted file mode 100644 index 4b5a4ac6..00000000 --- a/m4/stdint_h.m4 +++ /dev/null @@ -1,28 +0,0 @@ -# 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 exists, -# doesn't clash with , 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 -#include ], - [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 exists, doesn't clash with , - and declares uintmax_t. ]) - fi -]) diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4 deleted file mode 100644 index ec3a8b92..00000000 --- a/m4/uintmax_t.m4 +++ /dev/null @@ -1,29 +0,0 @@ -# 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 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 and don't define.]) - fi -]) diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4 deleted file mode 100644 index c375e474..00000000 --- a/m4/ulonglong.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# 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 -]) diff --git a/po/Makevars b/po/Makevars index a90b844c..9c66c3de 100644 --- a/po/Makevars +++ b/po/Makevars @@ -34,7 +34,7 @@ COPYRIGHT_HOLDER = Free Software Foundation, Inc. # It can be your email address, or a mailing list address where translators # can write to without being subscribed, or the URL of a web page through # which the translators can contact you. -MSGID_BUGS_ADDRESS = fiasco-dev@gnu.org +MSGID_BUGS_ADDRESS = pspp-dev@gnu.org # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. diff --git a/po/en_GB.po b/po/en_GB.po index 246d1877..4202e78f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -3,12 +3,11 @@ # This file is distributed under the General Public License Version 2 # Ben Pfaff , 2003. # - msgid "" msgstr "" "Project-Id-Version: PSPP 0.3.1\n" -"Report-Msgid-Bugs-To: bugs-gnu-pspp@gnu.org\n" -"POT-Creation-Date: 2003-12-23 11:16+0800\n" +"Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" +"POT-Creation-Date: 2004-01-27 08:20+0800\n" "PO-Revision-Date: 2004-01-23 13:04+0800\n" "Last-Translator: John Darrington \n" "Language-Team: John Darrington \n" @@ -17,275 +16,275 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: src/crosstabs.q:272 +#: src/crosstabs.q:255 msgid "" "Missing mode REPORT not allowed in general mode. Assuming MISSING=TABLE." msgstr "" -#: src/crosstabs.q:282 +#: src/crosstabs.q:265 msgid "Write mode ALL not allowed in general mode. Assuming WRITE=CELLS." msgstr "" -#: src/crosstabs.q:366 +#: src/crosstabs.q:324 msgid "expecting BY" msgstr "" -#: src/crosstabs.q:439 +#: src/crosstabs.q:391 msgid "VARIABLES must be specified before TABLES." msgstr "" -#: src/crosstabs.q:476 +#: src/crosstabs.q:428 #, c-format msgid "Maximum value (%ld) less than minimum value (%ld)." msgstr "" -#: src/crosstabs.q:937 +#: src/crosstabs.q:865 msgid "Summary." msgstr "" -#: src/crosstabs.q:939 +#: src/crosstabs.q:867 msgid "Cases" msgstr "" -#: src/crosstabs.q:940 src/frequencies.q:997 +#: src/crosstabs.q:868 src/frequencies.q:999 msgid "Valid" msgstr "" -#: src/crosstabs.q:941 src/frequencies.q:1064 +#: src/crosstabs.q:869 src/frequencies.q:1066 msgid "Missing" msgstr "" -#: src/crosstabs.q:942 src/crosstabs.q:1143 src/crosstabs.q:1872 -#: src/frequencies.q:1073 +#: src/crosstabs.q:870 src/crosstabs.q:1071 src/crosstabs.q:1800 +#: src/frequencies.q:1075 msgid "Total" msgstr "" -#: src/crosstabs.q:952 +#: src/crosstabs.q:880 msgid "N" msgstr "" -#: src/crosstabs.q:953 src/frequencies.q:1001 src/frequencies.q:1002 -#: src/frequencies.q:1003 +#: src/crosstabs.q:881 src/frequencies.q:1003 src/frequencies.q:1004 +#: src/frequencies.q:1005 msgid "Percent" msgstr "" -#: src/crosstabs.q:1192 +#: src/crosstabs.q:1120 msgid "count" msgstr "" -#: src/crosstabs.q:1193 +#: src/crosstabs.q:1121 msgid "row %" msgstr "" -#: src/crosstabs.q:1194 +#: src/crosstabs.q:1122 msgid "column %" msgstr "" -#: src/crosstabs.q:1195 +#: src/crosstabs.q:1123 msgid "total %" msgstr "" -#: src/crosstabs.q:1196 +#: src/crosstabs.q:1124 msgid "expected" msgstr "" -#: src/crosstabs.q:1197 +#: src/crosstabs.q:1125 msgid "residual" msgstr "" -#: src/crosstabs.q:1198 +#: src/crosstabs.q:1126 msgid "std. resid." msgstr "" -#: src/crosstabs.q:1199 +#: src/crosstabs.q:1127 msgid "adj. resid." msgstr "" -#: src/crosstabs.q:1232 src/crosstabs.q:1259 src/crosstabs.q:1279 -#: src/crosstabs.q:1300 +#: src/crosstabs.q:1160 src/crosstabs.q:1187 src/crosstabs.q:1207 +#: src/crosstabs.q:1228 msgid "Statistic" msgstr "" -#: src/crosstabs.q:1233 src/crosstabs.q:1260 src/crosstabs.q:1280 -#: src/crosstabs.q:1302 src/frequencies.q:999 src/frequencies.q:1116 -#: src/sysfile-info.c:526 src/vfm.c:1114 +#: src/crosstabs.q:1161 src/crosstabs.q:1188 src/crosstabs.q:1208 +#: src/crosstabs.q:1230 src/frequencies.q:1001 src/frequencies.q:1118 +#: src/sysfile-info.c:536 src/vfm.c:1094 msgid "Value" msgstr "" -#: src/crosstabs.q:1234 +#: src/crosstabs.q:1162 msgid "df" msgstr "" -#: src/crosstabs.q:1236 +#: src/crosstabs.q:1164 msgid "Asymp. Sig. (2-sided)" msgstr "" -#: src/crosstabs.q:1238 +#: src/crosstabs.q:1166 msgid "Exact. Sig. (2-sided)" msgstr "" -#: src/crosstabs.q:1240 +#: src/crosstabs.q:1168 msgid "Exact. Sig. (1-sided)" msgstr "" -#: src/crosstabs.q:1258 src/crosstabs.q:1299 +#: src/crosstabs.q:1186 src/crosstabs.q:1227 msgid "Category" msgstr "" -#: src/crosstabs.q:1261 src/crosstabs.q:1303 +#: src/crosstabs.q:1189 src/crosstabs.q:1231 msgid "Asymp. Std. Error" msgstr "" -#: src/crosstabs.q:1262 src/crosstabs.q:1304 +#: src/crosstabs.q:1190 src/crosstabs.q:1232 msgid "Approx. T" msgstr "" -#: src/crosstabs.q:1263 src/crosstabs.q:1305 +#: src/crosstabs.q:1191 src/crosstabs.q:1233 msgid "Approx. Sig." msgstr "" -#: src/crosstabs.q:1278 +#: src/crosstabs.q:1206 #, c-format msgid " 95%% Confidence Interval" msgstr "" -#: src/crosstabs.q:1281 +#: src/crosstabs.q:1209 msgid "Lower" msgstr "" -#: src/crosstabs.q:1282 +#: src/crosstabs.q:1210 msgid "Upper" msgstr "" -#: src/crosstabs.q:1301 +#: src/crosstabs.q:1229 msgid "Type" msgstr "" -#: src/crosstabs.q:2049 +#: src/crosstabs.q:1977 msgid "Pearson Chi-Square" msgstr "" -#: src/crosstabs.q:2050 +#: src/crosstabs.q:1978 msgid "Likelihood Ratio" msgstr "" -#: src/crosstabs.q:2051 +#: src/crosstabs.q:1979 msgid "Fisher's Exact Test" msgstr "" -#: src/crosstabs.q:2052 +#: src/crosstabs.q:1980 msgid "Continuity Correction" msgstr "" -#: src/crosstabs.q:2053 +#: src/crosstabs.q:1981 msgid "Linear-by-Linear Association" msgstr "" -#: src/crosstabs.q:2090 src/crosstabs.q:2160 src/crosstabs.q:2219 +#: src/crosstabs.q:2018 src/crosstabs.q:2088 src/crosstabs.q:2147 msgid "N of Valid Cases" msgstr "" -#: src/crosstabs.q:2106 src/crosstabs.q:2235 +#: src/crosstabs.q:2034 src/crosstabs.q:2163 msgid "Nominal by Nominal" msgstr "" -#: src/crosstabs.q:2107 src/crosstabs.q:2236 +#: src/crosstabs.q:2035 src/crosstabs.q:2164 msgid "Ordinal by Ordinal" msgstr "" -#: src/crosstabs.q:2108 +#: src/crosstabs.q:2036 msgid "Interval by Interval" msgstr "" -#: src/crosstabs.q:2109 +#: src/crosstabs.q:2037 msgid "Measure of Agreement" msgstr "" -#: src/crosstabs.q:2114 +#: src/crosstabs.q:2042 msgid "Phi" msgstr "" -#: src/crosstabs.q:2115 +#: src/crosstabs.q:2043 msgid "Cramer's V" msgstr "" -#: src/crosstabs.q:2116 +#: src/crosstabs.q:2044 msgid "Contingency Coefficient" msgstr "" -#: src/crosstabs.q:2117 +#: src/crosstabs.q:2045 msgid "Kendall's tau-b" msgstr "" -#: src/crosstabs.q:2118 +#: src/crosstabs.q:2046 msgid "Kendall's tau-c" msgstr "" -#: src/crosstabs.q:2119 +#: src/crosstabs.q:2047 msgid "Gamma" msgstr "" -#: src/crosstabs.q:2120 +#: src/crosstabs.q:2048 msgid "Spearman Correlation" msgstr "" -#: src/crosstabs.q:2121 +#: src/crosstabs.q:2049 msgid "Pearson's R" msgstr "" -#: src/crosstabs.q:2122 +#: src/crosstabs.q:2050 msgid "Kappa" msgstr "" -#: src/crosstabs.q:2192 +#: src/crosstabs.q:2120 #, c-format msgid "Odds Ratio for %s (%g / %g)" msgstr "" -#: src/crosstabs.q:2195 +#: src/crosstabs.q:2123 #, c-format msgid "Odds Ratio for %s (%.*s / %.*s)" msgstr "" -#: src/crosstabs.q:2203 +#: src/crosstabs.q:2131 #, c-format msgid "For cohort %s = %g" msgstr "" -#: src/crosstabs.q:2206 +#: src/crosstabs.q:2134 #, c-format msgid "For cohort %s = %.*s" msgstr "" -#: src/crosstabs.q:2237 +#: src/crosstabs.q:2165 msgid "Nominal by Interval" msgstr "" -#: src/crosstabs.q:2242 +#: src/crosstabs.q:2170 msgid "Lambda" msgstr "" -#: src/crosstabs.q:2243 +#: src/crosstabs.q:2171 msgid "Goodman and Kruskal tau" msgstr "" -#: src/crosstabs.q:2244 +#: src/crosstabs.q:2172 msgid "Uncertainty Coefficient" msgstr "" -#: src/crosstabs.q:2245 +#: src/crosstabs.q:2173 msgid "Somers' d" msgstr "" -#: src/crosstabs.q:2246 +#: src/crosstabs.q:2174 msgid "Eta" msgstr "" -#: src/crosstabs.q:2251 +#: src/crosstabs.q:2179 msgid "Symmetric" msgstr "" -#: src/crosstabs.q:2252 src/crosstabs.q:2253 +#: src/crosstabs.q:2180 src/crosstabs.q:2181 #, c-format msgid "%s Dependent" msgstr "" @@ -402,7 +401,7 @@ msgstr "" msgid "Rng" msgstr "" -#: src/descript.q:167 src/sfm-read.c:1265 +#: src/descript.q:167 src/sfm-read.c:1202 msgid "range" msgstr "" @@ -438,7 +437,7 @@ msgstr "" msgid "sum" msgstr "" -#: src/descript.q:213 src/list.q:159 +#: src/descript.q:213 src/list.q:144 msgid "No variables specified." msgstr "" @@ -451,74 +450,74 @@ msgstr "" msgid "It's not possible to sort on `%s' without displaying `%s'." msgstr "" -#: src/descript.q:296 +#: src/descript.q:295 msgid "" "At least one case in the data file had a weight value that was system-" "missing, zero, or negative. These case(s) were ignored." msgstr "" -#: src/descript.q:337 +#: src/descript.q:336 msgid "" "Names for z-score variables must be given for individual variables, not for " "groups of variables." msgstr "" -#: src/descript.q:345 +#: src/descript.q:344 msgid "Name for z-score variable expected." msgstr "" -#: src/descript.q:350 +#: src/descript.q:349 #, c-format msgid "" "Z-score variable name `%s' is a duplicate variable name with a current " "variable." msgstr "" -#: src/descript.q:359 +#: src/descript.q:358 #, c-format msgid "Z-score variable name `%s' is used multiple times." msgstr "" -#: src/descript.q:367 +#: src/descript.q:366 msgid "`)' expected after z-score variable name." msgstr "" -#: src/descript.q:427 +#: src/descript.q:426 msgid "" "Ran out of generic names for Z-score variables. There are only 126 generic " "names: ZSC001-ZSC0999, STDZ01-STDZ09, ZZZZ01-ZZZZ09, ZQZQ01-ZQZQ09." msgstr "" -#: src/descript.q:456 +#: src/descript.q:455 msgid "Mapping of variables to corresponding Z-scores." msgstr "" -#: src/descript.q:461 +#: src/descript.q:460 msgid "Source" msgstr "" -#: src/descript.q:462 +#: src/descript.q:461 msgid "Target" msgstr "" -#: src/descript.q:549 src/descript.q:555 +#: src/descript.q:548 src/descript.q:554 msgid "Z-score of " msgstr "" -#: src/descript.q:800 src/data-list.c:729 src/data-list.c:865 src/print.c:822 -#: src/sysfile-info.c:129 src/sysfile-info.c:360 src/vfm.c:1113 +#: src/descript.q:792 src/data-list.c:732 src/data-list.c:869 src/print.c:805 +#: src/sysfile-info.c:135 src/sysfile-info.c:370 src/vfm.c:1093 msgid "Variable" msgstr "" -#: src/descript.q:804 +#: src/descript.q:796 msgid "Valid N" msgstr "" -#: src/descript.q:805 +#: src/descript.q:797 msgid "Missing N" msgstr "" -#: src/descript.q:832 +#: src/descript.q:824 #, c-format msgid "Valid cases = %g; cases with missing value(s) = %g." msgstr "" @@ -530,11 +529,11 @@ msgid "" "possible to redefine a file handle within a session." msgstr "" -#: src/file-handle.q:88 src/autorecode.c:121 src/command.c:712 -#: src/compute.c:359 src/data-list.c:386 src/data-list.c:838 -#: src/data-list.c:1641 src/do-if.c:265 src/get.c:435 src/lexer.c:384 -#: src/loop.c:248 src/matrix-data.c:526 src/print.c:357 src/print.c:1098 -#: src/recode.c:409 src/sel-if.c:56 src/sel-if.c:136 src/vector.c:208 +#: src/file-handle.q:88 src/autorecode.c:121 src/command.c:696 +#: src/compute.c:284 src/data-list.c:372 src/data-list.c:842 +#: src/data-list.c:1645 src/do-if.c:264 src/get.c:359 src/lexer.c:384 +#: src/loop.c:248 src/matrix-data.c:506 src/print.c:340 src/print.c:1081 +#: src/recode.c:409 src/sel-if.c:56 src/sel-if.c:136 src/vector.c:197 msgid "expecting end of command" msgstr "" @@ -555,36 +554,28 @@ msgid "" "assumed." msgstr "" -#: src/file-handle.q:125 -msgid "" -"/RECFORM SPANNED is not implemented, as the author doesn't know what it is " -"supposed to do. Send the author a note." -msgstr "" - -#: src/file-handle.q:138 +#: src/file-handle.q:126 src/file-handle.q:140 +#, c-format msgid "" -"/MODE IMAGE is not implemented, as the author doesn't know what it is " -"supposed to do. Send the author a note." +"%s is not implemented, as the author doesn't know what it is supposed to " +"do. Send a note to %s." msgstr "" -#: src/file-handle.q:145 -msgid "/MODE MULTIPUNCH is not implemented. If you care, complain." -msgstr "" - -#: src/file-handle.q:149 -msgid "/MODE 360 is not implemented. If you care, complain." +#: src/file-handle.q:147 src/file-handle.q:150 +#, c-format +msgid "%s is not implemented. If you care, complain." msgstr "" -#: src/file-handle.q:231 +#: src/file-handle.q:232 #, c-format msgid "File handle `%s' has not been previously declared on FILE HANDLE." msgstr "" -#: src/file-handle.q:318 +#: src/file-handle.q:319 msgid "" msgstr "" -#: src/file-handle.q:337 +#: src/file-handle.q:338 msgid "expecting a file name or handle" msgstr "" @@ -596,121 +587,121 @@ msgstr "" msgid "Mode" msgstr "" -#: src/frequencies.q:269 +#: src/frequencies.q:268 msgid "" "At most one of BARCHART, HISTOGRAM, or HBAR should be given. HBAR will be " "assumed. Argument values will be given precedence increasing along the " "order given." msgstr "" -#: src/frequencies.q:350 +#: src/frequencies.q:349 #, c-format msgid "" "MAX must be greater than or equal to MIN, if both are specified. However, " "MIN was specified as %g and MAX as %g. MIN and MAX will be ignored." msgstr "" -#: src/frequencies.q:628 +#: src/frequencies.q:627 msgid "" "Upper limit of integer mode value range must be greater than lower limit." msgstr "" -#: src/frequencies.q:640 +#: src/frequencies.q:639 #, c-format msgid "Variable %s specified multiple times on VARIABLES subcommand." msgstr "" -#: src/frequencies.q:653 +#: src/frequencies.q:652 #, c-format msgid "Integer mode specified, but %s is not a numeric variable." msgstr "" -#: src/frequencies.q:713 +#: src/frequencies.q:714 msgid "`)' expected after GROUPED interval list." msgstr "" -#: src/frequencies.q:723 +#: src/frequencies.q:724 #, c-format msgid "Variables %s specified on GROUPED but not on VARIABLES." msgstr "" -#: src/frequencies.q:726 +#: src/frequencies.q:727 #, c-format msgid "Variables %s specified multiple times on GROUPED subcommand." msgstr "" -#: src/frequencies.q:785 +#: src/frequencies.q:787 msgid "Percentile list expected after PERCENTILES." msgstr "" -#: src/frequencies.q:793 +#: src/frequencies.q:795 msgid "Percentiles must be greater than 0 and less than 100." msgstr "" -#: src/frequencies.q:998 src/frequencies.q:1088 src/frequencies.q:1089 -#: src/frequencies.q:1119 +#: src/frequencies.q:1000 src/frequencies.q:1090 src/frequencies.q:1091 +#: src/frequencies.q:1121 msgid "Cum" msgstr "" -#: src/frequencies.q:1000 +#: src/frequencies.q:1002 msgid "Frequency" msgstr "" -#: src/frequencies.q:1019 +#: src/frequencies.q:1021 msgid "Value Label" msgstr "" -#: src/frequencies.q:1117 +#: src/frequencies.q:1119 msgid "Freq" msgstr "" -#: src/frequencies.q:1118 src/frequencies.q:1120 +#: src/frequencies.q:1120 src/frequencies.q:1122 msgid "Pct" msgstr "" -#: src/frequencies.q:1275 +#: src/frequencies.q:1277 #, c-format msgid "No valid data for variable %s; statistics not displayed." msgstr "" -#: src/frequencies.q:1298 +#: src/frequencies.q:1300 msgid "Percentile" msgstr "" -#: src/list.q:167 +#: src/list.q:152 #, c-format msgid "" "The first case (%ld) specified precedes the last case (%ld) specified. The " "values will be swapped." msgstr "" -#: src/list.q:175 +#: src/list.q:160 #, c-format msgid "" "The first case (%ld) to list is less than 1. The value is being reset to 1." msgstr "" -#: src/list.q:181 +#: src/list.q:166 #, c-format msgid "" "The last case (%ld) to list is less than 1. The value is being reset to 1." msgstr "" -#: src/list.q:187 +#: src/list.q:172 #, c-format msgid "The step value %ld is less than 1. The value is being reset to 1." msgstr "" -#: src/list.q:215 +#: src/list.q:199 msgid "`/FORMAT WEIGHT' specified, but weighting is not on." msgstr "" -#: src/list.q:275 src/html.c:402 +#: src/list.q:259 src/html.c:402 #, c-format msgid "Cannot open first page on HTML device %s." msgstr "" -#: src/list.q:453 +#: src/list.q:445 msgid "Line" msgstr "" @@ -718,48 +709,43 @@ msgstr "" msgid "Missing required subcommand TABLES." msgstr "" -#: src/means.q:153 +#: src/means.q:144 msgid "TABLES or CROSSBREAK subcommand may not appear more than once." msgstr "" -#: src/means.q:201 +#: src/means.q:181 #, c-format msgid "" "Variable %s specified on TABLES or CROSSBREAK, but not specified on " "VARIABLES." msgstr "" -#: src/means.q:215 +#: src/means.q:195 #, c-format msgid "LOWEST and HIGHEST may not be used for independent variables (%s)." msgstr "" -#: src/means.q:223 +#: src/means.q:203 #, c-format msgid "" "Independent variables (%s) may not have noninteger endpoints in their ranges." msgstr "" -#: src/means.q:244 -#, c-format -msgid "Variable %s is multiply specified on TABLES or CROSSBREAK." -msgstr "" - -#: src/means.q:270 +#: src/means.q:236 msgid "VARIABLES must precede TABLES." msgstr "" -#: src/means.q:327 +#: src/means.q:293 #, c-format msgid "Upper value (%g) is less than lower value (%g) on VARIABLES subcommand." msgstr "" -#: src/set.q:216 -msgid "BLOCK is obsolete." -msgstr "" - -#: src/set.q:219 -msgid "BOXSTRING is obsolete." +#: src/set.q:216 src/set.q:219 src/set.q:237 src/set.q:306 src/set.q:312 +#: src/set.q:320 src/set.q:327 src/set.q:329 src/set.q:348 src/set.q:352 +#: src/set.q:356 src/set.q:370 src/set.q:372 src/set.q:376 src/set.q:693 +#: src/set.q:774 src/set.q:855 +#, c-format +msgid "%s is obsolete." msgstr "" #: src/set.q:223 @@ -770,10 +756,6 @@ msgstr "" msgid "CPI must be greater than 0." msgstr "" -#: src/set.q:237 -msgid "HISTOGRAM is obsolete." -msgstr "" - #: src/set.q:241 msgid "LPI must be greater than 0." msgstr "" @@ -802,14 +784,6 @@ msgstr "" msgid "MXLOOPS must be at least 1." msgstr "" -#: src/set.q:306 -msgid "MXMEMORY is obsolete." -msgstr "" - -#: src/set.q:312 -msgid "SCRIPTTAB is obsolete." -msgstr "" - #: src/set.q:314 msgid "TBFONTS not implemented." msgstr "" @@ -818,38 +792,6 @@ msgstr "" msgid "TB1 not implemented." msgstr "" -#: src/set.q:320 -msgid "WORKSPACE is obsolete." -msgstr "" - -#: src/set.q:327 -msgid "AUTOMENU is obsolete." -msgstr "" - -#: src/set.q:329 -msgid "BEEP is obsolete." -msgstr "" - -#: src/set.q:348 -msgid "EJECT is obsolete." -msgstr "" - -#: src/set.q:352 -msgid "HELPWINDOWS is obsolete." -msgstr "" - -#: src/set.q:356 -msgid "MENUS is obsolete." -msgstr "" - -#: src/set.q:370 -msgid "PTRANSLATE is obsolete." -msgstr "" - -#: src/set.q:376 -msgid "XSORT is obsolete." -msgstr "" - #: src/set.q:390 #, c-format msgid "" @@ -895,120 +837,107 @@ msgstr "Text colour must be in range 0-15." msgid "Background color must be in range 0-7." msgstr "Background colour must be in range 0-7." - #: src/set.q:730 msgid "Border color must be in range 0-7." msgstr "Border colour must be in range 0-7." - -#: src/set.q:774 -msgid "RCOLOR is obsolete." -msgstr "" - #: src/set.q:786 msgid "Lower window color must be between 0 and 6." msgstr "Lower window colour must be between 0 and 6." - #: src/set.q:800 msgid "Upper window color must be between 0 and 6." msgstr "Upper window colour must be between 0 and 6." - #: src/set.q:812 msgid "Frame color must be between 0 and 6." msgstr "Frame colour must be between 0 and 6." - #: src/set.q:845 msgid "VIEWLENGTH not implemented." msgstr "" -#: src/set.q:855 -msgid "WORKDEV is obsolete." -msgstr "" - #: src/set.q:864 msgid "Drive letter expected in WORKDEV subcommand." msgstr "" -#: src/t-test.q:469 +#: src/t-test.q:453 msgid "expecting variable name in GROUPS subcommand" msgstr "" -#: src/t-test.q:474 +#: src/t-test.q:458 #, c-format msgid "Long string variable %s is not valid here." msgstr "" -#: src/t-test.q:490 +#: src/t-test.q:474 msgid "" "When applying GROUPS to a string variable, at least one value must be " "specified." msgstr "" -#: src/t-test.q:580 +#: src/t-test.q:565 #, c-format msgid "" "PAIRED was specified but the number of variables preceding WITH (%d) did not " "match the number following (%d)." msgstr "" -#: src/t-test.q:596 +#: src/t-test.q:581 msgid "At least two variables must be specified on PAIRS." msgstr "" -#: src/aggregate.c:189 +#: src/aggregate.c:188 msgid "OUTFILE specified multiple times." msgstr "" -#: src/aggregate.c:215 +#: src/aggregate.c:214 msgid "while expecting COLUMNWISE" msgstr "" -#: src/aggregate.c:230 +#: src/aggregate.c:229 msgid "BREAK specified multiple times." msgstr "" -#: src/aggregate.c:259 +#: src/aggregate.c:258 msgid "BREAK subcommand not specified." msgstr "" -#: src/aggregate.c:502 +#: src/aggregate.c:494 msgid "expecting aggregation function" msgstr "" -#: src/aggregate.c:518 +#: src/aggregate.c:510 #, c-format msgid "Unknown aggregation function %s." msgstr "" -#: src/aggregate.c:533 +#: src/aggregate.c:525 msgid "expecting `('" msgstr "" -#: src/aggregate.c:568 +#: src/aggregate.c:560 #, c-format msgid "Missing argument %d to %s." msgstr "" -#: src/aggregate.c:576 +#: src/aggregate.c:568 #, c-format msgid "Arguments to %s must be of same type as source variables." msgstr "" -#: src/aggregate.c:586 src/expr-prs.c:665 +#: src/aggregate.c:578 src/expr-prs.c:664 msgid "expecting `)'" msgstr "" -#: src/aggregate.c:598 src/autorecode.c:110 +#: src/aggregate.c:590 src/autorecode.c:110 #, c-format msgid "" "Number of source variables (%d) does not match number of target variables (%" "d)." msgstr "" -#: src/aggregate.c:669 +#: src/aggregate.c:657 #, c-format msgid "" "Variable name %s is not unique within the aggregate file dictionary, which " @@ -1020,17 +949,17 @@ msgstr "" msgid "Variable %s is %s in target file, but %s in source file." msgstr "" -#: src/apply-dict.c:71 src/apply-dict.c:72 src/expr-prs.c:1124 -#: src/expr-prs.c:1469 src/expr-prs.c:1485 src/formats.c:103 -#: src/pfm-read.c:653 src/print.c:717 src/sfm-read.c:982 src/sfm-read.c:1108 -#: src/sfm-read.c:1109 +#: src/apply-dict.c:71 src/apply-dict.c:72 src/expr-prs.c:1127 +#: src/expr-prs.c:1472 src/expr-prs.c:1488 src/formats.c:103 +#: src/pfm-read.c:636 src/print.c:700 src/sfm-read.c:916 src/sfm-read.c:1042 +#: src/sfm-read.c:1043 msgid "string" msgstr "" -#: src/apply-dict.c:71 src/apply-dict.c:72 src/expr-prs.c:1124 -#: src/expr-prs.c:1466 src/expr-prs.c:1483 src/formats.c:103 -#: src/pfm-read.c:653 src/print.c:717 src/sfm-read.c:982 src/sfm-read.c:1108 -#: src/sfm-read.c:1109 +#: src/apply-dict.c:71 src/apply-dict.c:72 src/expr-prs.c:1127 +#: src/expr-prs.c:1469 src/expr-prs.c:1486 src/formats.c:103 +#: src/pfm-read.c:636 src/print.c:700 src/sfm-read.c:916 src/sfm-read.c:1042 +#: src/sfm-read.c:1043 msgid "numeric" msgstr "" @@ -1045,16 +974,16 @@ msgid "" "Cannot apply missing values from source file to long string variable %s." msgstr "" -#: src/apply-dict.c:162 +#: src/apply-dict.c:163 msgid "No matching variables found between the source and target files." msgstr "" -#: src/ascii.c:216 +#: src/ascii.c:218 #, c-format msgid "ASCII driver initializing as `%s'..." msgstr "" -#: src/ascii.c:273 +#: src/ascii.c:276 #, c-format msgid "" "ascii driver: Area of page excluding margins and headers must be at least 59 " @@ -1062,104 +991,104 @@ msgid "" "by %d lines." msgstr "" -#: src/ascii.c:378 src/html.c:102 src/postscript.c:474 +#: src/ascii.c:381 src/html.c:102 src/postscript.c:458 #, c-format msgid "%s: Initialization complete." msgstr "" -#: src/ascii.c:389 src/html.c:114 src/postscript.c:487 +#: src/ascii.c:392 src/html.c:114 src/postscript.c:471 #, c-format msgid "%s: Beginning closing..." msgstr "" -#: src/ascii.c:399 src/html.c:119 src/postscript.c:506 +#: src/ascii.c:402 src/html.c:119 src/postscript.c:490 #, c-format msgid "%s: Finished closing." msgstr "" -#: src/ascii.c:460 +#: src/ascii.c:464 #, c-format msgid "" "Bad index value for `box' key: syntax is box[INDEX], 0 <= INDEX < %d " "decimal, with INDEX expressed in base 4." msgstr "" -#: src/ascii.c:466 +#: src/ascii.c:470 #, c-format msgid "Duplicate value for key `%s'." msgstr "" -#: src/ascii.c:475 +#: src/ascii.c:479 #, c-format msgid "Unknown configuration parameter `%s' for ascii device driver." msgstr "" -#: src/ascii.c:488 +#: src/ascii.c:492 #, c-format msgid "" "Unknown character set `%s'. Valid character sets are `ascii' and `latin1'." msgstr "" -#: src/ascii.c:497 +#: src/ascii.c:501 #, c-format msgid "" "Unknown overstrike style `%s'. Valid overstrike styles are `single' and " "`line'." msgstr "" -#: src/ascii.c:506 +#: src/ascii.c:510 #, c-format msgid "" "Unknown carriage return style `%s'. Valid carriage return styles are `cr' " "and `bs'." msgstr "" -#: src/ascii.c:518 src/postscript.c:696 +#: src/ascii.c:522 src/postscript.c:680 #, c-format msgid "Positive integer required as value for `%s'." msgstr "" -#: src/ascii.c:549 +#: src/ascii.c:553 #, c-format msgid "Zero or positive integer required as value for `%s'." msgstr "" -#: src/ascii.c:619 src/postscript.c:655 +#: src/ascii.c:623 src/postscript.c:639 #, c-format msgid "Boolean value expected for %s." msgstr "" -#: src/ascii.c:648 src/ascii.c:663 src/ascii.c:680 +#: src/ascii.c:655 src/ascii.c:670 src/ascii.c:687 #, c-format msgid "ASCII output driver: %s: %s" msgstr "" -#: src/ascii.c:749 +#: src/ascii.c:756 #, c-format msgid "ascii_line_horz: bad hline (%d,%d),%d out of (%d,%d)\n" msgstr "" -#: src/ascii.c:783 +#: src/ascii.c:790 #, c-format msgid "ascii_line_vert: bad vline %d,(%d,%d) out of (%d,%d)\n" msgstr "" -#: src/ascii.c:813 +#: src/ascii.c:820 #, c-format msgid "ascii_line_intersection: bad intsct (%d,%d) out of (%d,%d)\n" msgstr "" -#: src/ascii.c:975 +#: src/ascii.c:968 #, c-format msgid "%s: horiz=%d, vert=%d\n" msgstr "" -#: src/ascii.c:1147 +#: src/ascii.c:1140 #, c-format msgid "Writing `%s': %s" msgstr "" -#: src/ascii.c:1541 src/postscript.c:2124 +#: src/ascii.c:1541 src/postscript.c:2095 #, c-format msgid "%s - Page %d" msgstr "" @@ -1174,19 +1103,12 @@ msgstr "" msgid "Duplicate variable name %s among target variables." msgstr "" -#: src/cmdline.c:111 -msgid "-f not yet implemented\n" -msgstr "" - -#: src/cmdline.c:129 -msgid "-n not yet implemented\n" -msgstr "" - -#: src/cmdline.c:140 -msgid "-p not yet implemented\n" +#: src/cmdline.c:112 src/cmdline.c:131 src/cmdline.c:143 src/command.c:196 +#, c-format +msgid "%s is not yet implemented." msgstr "" -#: src/cmdline.c:153 +#: src/cmdline.c:157 msgid "" "\n" "Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.\n" @@ -1196,7 +1118,7 @@ msgid "" "Written by Ben Pfaff ." msgstr "" -#: src/cmdline.c:213 +#: src/cmdline.c:217 #, c-format msgid "" "PSPP, a program for statistical analysis of sample data.\n" @@ -1240,37 +1162,32 @@ msgid "" "\n" msgstr "" -#: src/cmdline.c:245 +#: src/cmdline.c:249 #, c-format msgid "" "\n" "Report bugs to <%s>.\n" msgstr "" -#: src/command.c:159 +#: src/command.c:134 #, c-format msgid "%s not allowed inside FILE TYPE/END FILE TYPE." msgstr "" -#: src/command.c:163 +#: src/command.c:138 #, c-format msgid "%s not allowed inside FILE TYPE GROUPED/END FILE TYPE." msgstr "" -#: src/command.c:166 +#: src/command.c:141 msgid "RECORD TYPE must be the first command inside a FILE TYPE structure." msgstr "" -#: src/command.c:211 +#: src/command.c:186 msgid "This line does not begin with a valid command name." msgstr "" -#: src/command.c:221 -#, c-format -msgid "%s is not yet implemented." -msgstr "" - -#: src/command.c:239 +#: src/command.c:214 #, c-format msgid "" "%s is not allowed (1) before a command to specify the input program, such as " @@ -1278,106 +1195,106 @@ msgid "" "PROGRAM and END INPUT PROGRAM." msgstr "" -#: src/command.c:243 +#: src/command.c:218 #, c-format msgid "%s is not allowed within an input program." msgstr "" -#: src/command.c:244 src/command.c:245 +#: src/command.c:219 src/command.c:220 #, c-format msgid "%s is only allowed within an input program." msgstr "" -#: src/command.c:254 +#: src/command.c:229 #, c-format msgid "%s command beginning\n" msgstr "" -#: src/command.c:290 +#: src/command.c:265 #, c-format msgid "" "%s command completed\n" "\n" msgstr "" -#: src/command.c:305 +#: src/command.c:280 msgid "The identifier(s) specified do not form a valid command name:" msgstr "" -#: src/command.c:308 +#: src/command.c:283 msgid "The identifier(s) specified do not form a complete command name:" msgstr "" -#: src/command.c:432 +#: src/command.c:407 msgid "" "This command is not accepted in a syntax file. Instead, use FINISH to " "terminate a syntax file." msgstr "" -#: src/command.c:450 +#: src/command.c:425 msgid "" "This command is not executed in interactive mode. Instead, PSPP drops down " "to the command prompt. Use EXIT if you really want to quit." msgstr "" -#: src/command.c:541 +#: src/command.c:516 msgid "The sentinel may not be the empty string." msgstr "" -#: src/command.c:599 src/command.c:730 +#: src/command.c:573 msgid "This command not allowed when the SAFER option is set." msgstr "" -#: src/command.c:612 +#: src/command.c:596 #, c-format msgid "Error removing `%s': %s." msgstr "" -#: src/command.c:662 +#: src/command.c:646 #, c-format msgid "Couldn't fork: %s." msgstr "" -#: src/command.c:703 +#: src/command.c:687 #, c-format msgid "Error executing command: %s." msgstr "" -#: src/command.c:753 +#: src/command.c:733 msgid "No operating system support for this command." msgstr "" -#: src/command.c:782 +#: src/command.c:762 msgid "This command is not valid in a syntax file." msgstr "" -#: src/compute.c:138 src/compute.c:184 src/compute.c:290 src/compute.c:327 +#: src/compute.c:141 src/compute.c:200 #, c-format msgid "" "When executing COMPUTE: SYSMIS is not a valid value as an index into vector %" "s." msgstr "" -#: src/compute.c:141 src/compute.c:187 src/compute.c:293 src/compute.c:330 +#: src/compute.c:144 src/compute.c:204 #, c-format msgid "" "When executing COMPUTE: %g is not a valid value as an index into vector %s." msgstr "" -#: src/compute.c:420 +#: src/compute.c:343 #, c-format msgid "There is no vector named %s." msgstr "" -#: src/compute.c:469 +#: src/compute.c:449 msgid "Extra characters after expression." msgstr "" -#: src/count.c:187 +#: src/count.c:172 msgid "Destination cannot be a string variable." msgstr "" -#: src/count.c:297 +#: src/count.c:286 #, c-format msgid "" "%g THRU %g is not a valid range. The number following THRU must be at least " @@ -1427,428 +1344,429 @@ msgstr "" msgid "Unrecognized character in field." msgstr "" -#: src/data-in.c:337 src/data-in.c:586 +#: src/data-in.c:337 src/data-in.c:587 msgid "Field must have even length." msgstr "" -#: src/data-in.c:347 src/data-in.c:596 +#: src/data-in.c:347 src/data-in.c:597 msgid "Field must contain only hex digits." msgstr "" -#: src/data-in.c:384 +#: src/data-in.c:385 +#, c-format msgid "" "Quality of zoned decimal (Z) input format code is suspect. Check your " -"results three times, report bugs to author." +"results three times. Report bugs to %s." msgstr "" -#: src/data-in.c:396 +#: src/data-in.c:397 msgid "Zoned decimal field contains fewer than 2 characters." msgstr "" -#: src/data-in.c:404 +#: src/data-in.c:405 msgid "Bad sign byte in zoned decimal number." msgstr "" -#: src/data-in.c:421 +#: src/data-in.c:422 msgid "Format error in zoned decimal number." msgstr "" -#: src/data-in.c:435 +#: src/data-in.c:436 msgid "Error in syntax of zoned decimal number." msgstr "" -#: src/data-in.c:636 +#: src/data-in.c:637 msgid "Unexpected end of field." msgstr "" -#: src/data-in.c:662 +#: src/data-in.c:663 msgid "Digit expected in field." msgstr "" -#: src/data-in.c:687 +#: src/data-in.c:688 #, c-format msgid "Day (%ld) must be between 1 and 31." msgstr "" -#: src/data-in.c:712 +#: src/data-in.c:713 msgid "Delimiter expected between fields in date." msgstr "" -#: src/data-in.c:809 +#: src/data-in.c:810 #, c-format msgid "Month (%ld) must be between 1 and 12." msgstr "" -#: src/data-in.c:850 +#: src/data-in.c:851 #, c-format msgid "Month (%s) must be between I and XII." msgstr "" -#: src/data-in.c:877 +#: src/data-in.c:878 #, c-format msgid "Month name (%s...) is too long." msgstr "" -#: src/data-in.c:888 +#: src/data-in.c:889 #, c-format msgid "Bad month name (%s)." msgstr "" -#: src/data-in.c:904 +#: src/data-in.c:905 #, c-format msgid "Year (%ld) must be between 1582 and 19999." msgstr "" -#: src/data-in.c:915 +#: src/data-in.c:916 #, c-format msgid "Trailing garbage \"%s\" following date." msgstr "" -#: src/data-in.c:930 +#: src/data-in.c:931 #, c-format msgid "Julian day (%d) must be between 1 and 366." msgstr "" -#: src/data-in.c:942 +#: src/data-in.c:943 #, c-format msgid "Year (%d) must be between 1582 and 19999." msgstr "" -#: src/data-in.c:958 +#: src/data-in.c:959 #, c-format msgid "Quarter (%ld) must be between 1 and 4." msgstr "" -#: src/data-in.c:968 +#: src/data-in.c:969 msgid "`Q' expected between quarter and year." msgstr "" -#: src/data-in.c:984 +#: src/data-in.c:985 #, c-format msgid "Week (%ld) must be between 1 and 53." msgstr "" -#: src/data-in.c:995 +#: src/data-in.c:996 msgid "`WK' expected between week and year." msgstr "" -#: src/data-in.c:1018 +#: src/data-in.c:1019 msgid "Delimiter expected between fields in time." msgstr "" -#: src/data-in.c:1030 +#: src/data-in.c:1031 #, c-format msgid "Hour (%ld) must be positive." msgstr "" -#: src/data-in.c:1042 +#: src/data-in.c:1043 #, c-format msgid "Minute (%ld) must be between 0 and 59." msgstr "" -#: src/data-in.c:1089 +#: src/data-in.c:1090 #, c-format msgid "Hour (%ld) must be between 0 and 23." msgstr "" -#: src/data-in.c:1103 src/data-in.c:1138 +#: src/data-in.c:1104 src/data-in.c:1139 msgid "Day of the week expected in date value." msgstr "" -#: src/data-in.c:1189 +#: src/data-in.c:1190 msgid "Date is not in valid range between 15 Oct 1582 and 31 Dec 19999." msgstr "" -#: src/data-in.c:1511 +#: src/data-in.c:1512 #, c-format msgid "Field too long (%d characters). Truncated after character %d." msgstr "" -#: src/data-list.c:154 +#: src/data-list.c:137 msgid "" "DATA LIST may not use a different file from that specified on its " "surrounding FILE TYPE." msgstr "" -#: src/data-list.c:173 +#: src/data-list.c:156 msgid "The END subcommand may only be specified once." msgstr "" -#: src/data-list.c:209 +#: src/data-list.c:195 msgid "Only one of FIXED, FREE, or LIST may be specified." msgstr "" -#: src/data-list.c:335 src/print.c:318 +#: src/data-list.c:321 src/print.c:301 #, c-format msgid "" "The record number specified, %ld, is before the previous record, %d. Data " "fields must be listed in order of increasing record number." msgstr "" -#: src/data-list.c:367 src/data-list.c:1630 +#: src/data-list.c:353 src/data-list.c:1634 msgid "" "SPSS-like or FORTRAN-like format specification expected after variable names." msgstr "" -#: src/data-list.c:378 src/print.c:350 +#: src/data-list.c:364 src/print.c:333 msgid "" "Variables are specified on records that should not exist according to " "RECORDS subcommand." msgstr "" -#: src/data-list.c:410 src/data-list.c:423 src/print.c:527 src/print.c:540 +#: src/data-list.c:396 src/data-list.c:409 src/print.c:510 src/print.c:523 msgid "Column positions for fields must be positive." msgstr "" -#: src/data-list.c:428 +#: src/data-list.c:414 msgid "The ending column for a field must be greater than the starting column." msgstr "" -#: src/data-list.c:452 src/print.c:568 +#: src/data-list.c:438 src/print.c:551 msgid "A format specifier on this line has extra characters on the end." msgstr "" -#: src/data-list.c:467 src/print.c:584 +#: src/data-list.c:453 src/print.c:567 msgid "The value for number of decimal places must be at least 1." msgstr "" -#: src/data-list.c:481 src/print.c:597 +#: src/data-list.c:467 src/print.c:580 #, c-format msgid "Input format %s doesn't accept decimal places." msgstr "" -#: src/data-list.c:502 src/print.c:617 +#: src/data-list.c:488 src/print.c:600 #, c-format msgid "The %d columns %d-%d can't be evenly divided into %d fields." msgstr "" -#: src/data-list.c:535 src/data-list.c:622 src/data-list.c:821 +#: src/data-list.c:528 src/data-list.c:625 src/data-list.c:825 #, c-format msgid "%s is a duplicate variable name." msgstr "" -#: src/data-list.c:540 +#: src/data-list.c:533 #, c-format msgid "There is already a variable %s of a different type." msgstr "" -#: src/data-list.c:547 +#: src/data-list.c:540 #, c-format msgid "There is already a string variable %s of a different width." msgstr "" -#: src/data-list.c:611 src/print.c:706 +#: src/data-list.c:614 src/print.c:689 msgid "" "The number of format specifications exceeds the number of variable names " "given." msgstr "" -#: src/data-list.c:695 src/print.c:790 +#: src/data-list.c:698 src/print.c:773 msgid "" "There aren't enough format specifications to match the number of variable " "names given." msgstr "" -#: src/data-list.c:730 src/print.c:823 +#: src/data-list.c:733 src/print.c:806 msgid "Record" msgstr "" -#: src/data-list.c:731 src/print.c:824 +#: src/data-list.c:734 src/print.c:807 msgid "Columns" msgstr "" -#: src/data-list.c:732 src/data-list.c:866 src/print.c:825 +#: src/data-list.c:735 src/data-list.c:870 src/print.c:808 msgid "Format" msgstr "" -#: src/data-list.c:755 +#: src/data-list.c:758 #, c-format msgid "Reading %d record from file %s." msgid_plural "Reading %d records from file %s." msgstr[0] "" msgstr[1] "" -#: src/data-list.c:758 +#: src/data-list.c:761 #, c-format msgid "Reading %d record from the command file." msgid_plural "Reading %d records from the command file." msgstr[0] "" msgstr[1] "" -#: src/data-list.c:765 src/data-list.c:766 +#: src/data-list.c:768 src/data-list.c:769 msgid "Occurrence data specifications." msgstr "" -#: src/data-list.c:889 +#: src/data-list.c:893 #, c-format msgid "Reading free-form data from file %s." msgstr "" -#: src/data-list.c:890 +#: src/data-list.c:894 msgid "Reading free-form data from the command file." msgstr "" -#: src/data-list.c:941 src/matrix-data.c:959 +#: src/data-list.c:945 src/matrix-data.c:939 msgid "Scope of string exceeds line." msgstr "" -#: src/data-list.c:1002 +#: src/data-list.c:1006 msgid "Attempt to read past end of file." msgstr "" -#: src/data-list.c:1031 +#: src/data-list.c:1035 msgid "abort in write_case()\n" msgstr "" -#: src/data-list.c:1059 +#: src/data-list.c:1063 #, c-format msgid "Partial case of %d of %d records discarded." msgstr "" -#: src/data-list.c:1108 +#: src/data-list.c:1112 #, c-format msgid "Partial case discarded. The first variable missing was %s." msgstr "" -#: src/data-list.c:1149 +#: src/data-list.c:1153 #, c-format msgid "" "Missing value(s) for all variables from %s onward. These will be filled " "with the system-missing value or blanks, as appropriate." msgstr "" -#: src/data-list.c:1307 +#: src/data-list.c:1311 msgid "" "REPEATING DATA must use the same file as its corresponding DATA LIST or FILE " "TYPE." msgstr "" -#: src/data-list.c:1317 +#: src/data-list.c:1321 msgid "STARTS subcommand given multiple times." msgstr "" -#: src/data-list.c:1341 +#: src/data-list.c:1345 #, c-format msgid "STARTS beginning column (%d) exceeds STARTS ending column (%d)." msgstr "" -#: src/data-list.c:1352 +#: src/data-list.c:1356 msgid "OCCURS subcommand given multiple times." msgstr "" -#: src/data-list.c:1365 +#: src/data-list.c:1369 msgid "LENGTH subcommand given multiple times." msgstr "" -#: src/data-list.c:1378 +#: src/data-list.c:1382 msgid "CONTINUED subcommand given multiple times." msgstr "" -#: src/data-list.c:1397 +#: src/data-list.c:1401 #, c-format msgid "CONTINUED beginning column (%d) exceeds CONTINUED ending column (%d)." msgstr "" -#: src/data-list.c:1411 +#: src/data-list.c:1415 msgid "ID subcommand given multiple times." msgstr "" -#: src/data-list.c:1420 +#: src/data-list.c:1424 #, c-format msgid "ID beginning column (%ld) must be positive." msgstr "" -#: src/data-list.c:1435 +#: src/data-list.c:1439 #, c-format msgid "ID ending column (%ld) must be positive." msgstr "" -#: src/data-list.c:1441 +#: src/data-list.c:1445 #, c-format msgid "ID ending column (%ld) cannot be less than ID beginning column (%d)." msgstr "" -#: src/data-list.c:1480 +#: src/data-list.c:1484 msgid "Missing required specification STARTS." msgstr "" -#: src/data-list.c:1482 +#: src/data-list.c:1486 msgid "Missing required specification OCCURS." msgstr "" -#: src/data-list.c:1489 +#: src/data-list.c:1493 msgid "ID specified without CONTINUED." msgstr "" -#: src/data-list.c:1577 +#: src/data-list.c:1581 msgid "String variable not allowed here." msgstr "" -#: src/data-list.c:1587 +#: src/data-list.c:1591 #, c-format msgid "%s (%d) must be at least 1." msgstr "" -#: src/data-list.c:1593 +#: src/data-list.c:1597 #, c-format msgid "Variable or integer expected for %s." msgstr "" -#: src/data-list.c:1732 +#: src/data-list.c:1736 #, c-format msgid "Mismatched case ID (%s). Expected value was %s." msgstr "" -#: src/data-list.c:1764 +#: src/data-list.c:1768 #, c-format msgid "" -"Variable %s startging in column %d extends beyond physical record length of %" +"Variable %s starting in column %d extends beyond physical record length of %" "d." msgstr "" -#: src/data-list.c:1832 +#: src/data-list.c:1836 #, c-format msgid "Invalid value %d for OCCURS." msgstr "" -#: src/data-list.c:1838 +#: src/data-list.c:1842 #, c-format msgid "Beginning column for STARTS (%d) must be at least 1." msgstr "" -#: src/data-list.c:1846 +#: src/data-list.c:1850 #, c-format msgid "Ending column for STARTS (%d) is less than beginning column (%d)." msgstr "" -#: src/data-list.c:1854 +#: src/data-list.c:1858 #, c-format msgid "Invalid value %d for LENGTH." msgstr "" -#: src/data-list.c:1861 +#: src/data-list.c:1865 #, c-format msgid "Beginning column for CONTINUED (%d) must be at least 1." msgstr "" -#: src/data-list.c:1869 +#: src/data-list.c:1873 #, c-format msgid "Ending column for CONTINUED (%d) is less than beginning column (%d)." msgstr "" -#: src/data-list.c:1892 +#: src/data-list.c:1896 #, c-format msgid "" "Number of repetitions specified on OCCURS (%d) exceed number of repetitions " "available in space on STARTS (%d), and CONTINUED not specified." msgstr "" -#: src/data-list.c:1909 +#: src/data-list.c:1913 #, c-format msgid "Unexpected end of file with %d repetitions remaining out of %d." msgstr "" -#: src/data-out.c:143 src/sfm-read.c:487 src/sysfile-info.c:113 +#: src/data-out.c:143 src/sfm-read.c:470 src/sysfile-info.c:116 msgid "Unknown" msgstr "" @@ -1858,258 +1776,259 @@ msgid "" "missing value." msgstr "" -#: src/data-out.c:361 +#: src/data-out.c:362 +#, c-format msgid "" "Quality of zoned decimal (Z) output format code is suspect. Check your " -"results, report bugs to author." +"results. Report bugs to %s." msgstr "" -#: src/data-out.c:368 +#: src/data-out.c:369 msgid "The system-missing value cannot be output as a zoned decimal number." msgstr "" -#: src/data-out.c:381 +#: src/data-out.c:382 #, c-format msgid "Number %g too big to fit in field with format Z%d.%d." msgstr "" -#: src/data-out.c:773 +#: src/data-out.c:774 #, c-format msgid "Time value %g too large in magnitude to convert to alphanumeric time." msgstr "" -#: src/data-out.c:826 +#: src/data-out.c:827 #, c-format msgid "Weekday index %d does not lie between 1 and 7." msgstr "" -#: src/data-out.c:847 +#: src/data-out.c:848 #, c-format msgid "Month index %d does not lie between 1 and 12." msgstr "" -#: src/data-out.c:959 +#: src/data-out.c:960 #, c-format msgid "" "Year %d cannot be represented in four digits for output formatting purposes." msgstr "" -#: src/dfm.c:90 +#: src/dfm.c:74 #, c-format msgid "%s: Closing data-file handle %s." msgstr "" -#: src/dfm.c:112 +#: src/dfm.c:96 msgid "<>" msgstr "" -#: src/dfm.c:134 +#: src/dfm.c:118 #, c-format msgid "%s: Opening data-file handle %s for reading." msgstr "" -#: src/dfm.c:151 src/dfm.c:168 +#: src/dfm.c:135 src/dfm.c:152 msgid "BEGIN DATA expected." msgstr "" -#: src/dfm.c:188 +#: src/dfm.c:172 #, c-format msgid "An error occurred while opening \"%s\" for reading as a data file: %s." msgstr "" -#: src/dfm.c:217 +#: src/dfm.c:201 #, c-format msgid "%s: Opening data-file handle %s for writing." msgstr "" -#: src/dfm.c:223 +#: src/dfm.c:207 msgid "Cannot open the inline file for writing." msgstr "" -#: src/dfm.c:238 +#: src/dfm.c:222 #, c-format msgid "An error occurred while opening \"%s\" for writing as a data file: %s." msgstr "" -#: src/dfm.c:383 +#: src/dfm.c:367 msgid "" "Unexpected end-of-file while reading data in BEGIN DATA. This probably " "indicates a missing or misformatted END DATA command. END DATA must appear " "by itself on a single line with exactly one space between words." msgstr "" -#: src/dfm.c:416 src/dfm.c:437 +#: src/dfm.c:400 src/dfm.c:421 #, c-format msgid "Error reading file %s: %s." msgstr "" -#: src/dfm.c:440 +#: src/dfm.c:424 #, c-format msgid "%s: Partial record at end of file." msgstr "" -#: src/dfm.c:496 +#: src/dfm.c:482 #, c-format msgid "Cannot read from file %s already opened for %s." msgstr "" -#: src/dfm.c:510 +#: src/dfm.c:496 #, c-format msgid "Attempt to read beyond end-of-file on file %s." msgstr "" -#: src/dfm.c:604 +#: src/dfm.c:590 #, c-format msgid "Cannot write to file %s already opened for %s." msgstr "" -#: src/dfm.c:628 +#: src/dfm.c:614 #, c-format msgid "Error writing file %s: %s." msgstr "" -#: src/dfm.c:671 +#: src/dfm.c:657 msgid "" "This command is not valid here since the current input program does not " "access the inline file." msgstr "" -#: src/dfm.c:678 +#: src/dfm.c:664 msgid "inline file: Opening for reading." msgstr "" -#: src/dfm.c:692 +#: src/dfm.c:678 msgid "Skipping remaining inline data." msgstr "" -#: src/dfm.c:704 +#: src/dfm.c:690 msgid "reading as a data file" msgstr "" -#: src/dfm.c:711 +#: src/dfm.c:697 msgid "writing as a data file" msgstr "" -#: src/do-if.c:119 +#: src/do-if.c:118 msgid "There is no DO IF to match with this ELSE IF." msgstr "" -#: src/do-if.c:124 +#: src/do-if.c:123 msgid "The ELSE command must follow all ELSE IF commands in a DO IF structure." msgstr "" -#: src/do-if.c:147 +#: src/do-if.c:146 msgid "End of command expected." msgstr "" -#: src/do-if.c:165 +#: src/do-if.c:164 msgid "There is no DO IF to match with this ELSE." msgstr "" -#: src/do-if.c:171 +#: src/do-if.c:170 msgid "" "There may be at most one ELSE clause in each DO IF structure. It must be " "the last clause." msgstr "" -#: src/do-if.c:208 +#: src/do-if.c:207 msgid "There is no DO IF to match with this END IF." msgstr "" -#: src/do-if.c:294 +#: src/do-if.c:293 #, c-format msgid "DO IF %d: true\n" msgstr "" -#: src/do-if.c:299 +#: src/do-if.c:298 #, c-format msgid "DO IF %d: false\n" msgstr "" -#: src/do-if.c:304 +#: src/do-if.c:303 #, c-format msgid "DO IF %d: missing\n" msgstr "" -#: src/error.c:130 +#: src/error.c:113 msgid "Terminating NOW due to a fatal error!" msgstr "" -#: src/error.c:207 +#: src/error.c:190 msgid "Terminating execution of syntax file due to error." msgstr "" -#: src/error.c:209 +#: src/error.c:192 #, c-format msgid "Errors (%d) exceeds limit (%d)." msgstr "" -#: src/error.c:212 +#: src/error.c:195 #, c-format msgid "Warnings (%d) exceed limit (%d)." msgstr "" -#: src/error.c:270 +#: src/error.c:253 msgid "fatal" msgstr "" -#: src/error.c:272 src/error.c:279 src/error.c:282 src/expr-prs.c:1460 +#: src/error.c:255 src/error.c:262 src/error.c:265 src/expr-prs.c:1463 msgid "error" msgstr "" -#: src/error.c:273 src/error.c:280 src/error.c:283 +#: src/error.c:256 src/error.c:263 src/error.c:266 msgid "warning" msgstr "" -#: src/error.c:274 src/error.c:284 +#: src/error.c:257 src/error.c:267 msgid "note" msgstr "" -#: src/error.c:276 src/error.c:277 +#: src/error.c:259 src/error.c:260 msgid "installation error" msgstr "" -#: src/expr-evl.c:1181 +#: src/expr-evl.c:1164 msgid "" "A number being treated as a Boolean in an expression was found to have a " "value other than 0 (false), 1 (true), or the system-missing value. The " "result was forced to 0." msgstr "" -#: src/expr-evl.c:1225 +#: src/expr-evl.c:1208 #, c-format msgid "" "SYSMIS is not a valid index value for vector %s. The result will be set to " "SYSMIS." msgstr "" -#: src/expr-evl.c:1229 +#: src/expr-evl.c:1212 #, c-format msgid "" "%g is not a valid index value for vector %s. The result will be set to " "SYSMIS." msgstr "" -#: src/expr-evl.c:1247 +#: src/expr-evl.c:1230 #, c-format msgid "" "SYSMIS is not a valid index value for vector %s. The result will be set to " "the empty string." msgstr "" -#: src/expr-evl.c:1252 +#: src/expr-evl.c:1235 #, c-format msgid "" "%g is not a valid index value for vector %s. The result will be set to the " "empty string." msgstr "" -#: src/expr-evl.c:1357 +#: src/expr-evl.c:1340 #, c-format msgid "evaluate_expression(): not implemented: %s\n" msgstr "" -#: src/expr-evl.c:1360 +#: src/expr-evl.c:1343 #, c-format msgid "evaluate_expression(): not implemented: %d\n" msgstr "" @@ -2142,185 +2061,185 @@ msgid "" "Boolean value was found to have a constant value other than 0, 1, or SYSMIS." msgstr "" -#: src/expr-prs.c:141 +#: src/expr-prs.c:140 msgid "" "A string expression was supplied in a place where a Boolean expression was " "expected." msgstr "" -#: src/expr-prs.c:152 +#: src/expr-prs.c:151 msgid "" "A numeric expression was expected in a place where one was not supplied." msgstr "" -#: src/expr-prs.c:160 +#: src/expr-prs.c:159 msgid "A string expression was expected in a place where one was not supplied." msgstr "" -#: src/expr-prs.c:174 +#: src/expr-prs.c:173 msgid "The OR operator cannot take string operands." msgstr "" -#: src/expr-prs.c:222 +#: src/expr-prs.c:221 msgid "The AND operator cannot take string operands." msgstr "" -#: src/expr-prs.c:271 +#: src/expr-prs.c:270 msgid "The NOT operator cannot take a string operand." msgstr "" -#: src/expr-prs.c:298 +#: src/expr-prs.c:297 msgid "" "Strings cannot be compared with numeric or Boolean values with the " "relational operators = >= > <= < <>." msgstr "" -#: src/expr-prs.c:355 +#: src/expr-prs.c:354 msgid "The `+' and `-' operators may only be used with numeric operands." msgstr "" -#: src/expr-prs.c:407 +#: src/expr-prs.c:406 msgid "The `*' and `/' operators may only be used with numeric operands." msgstr "" -#: src/expr-prs.c:458 +#: src/expr-prs.c:457 msgid "The unary minus (-) operator can only take a numeric operand." msgstr "" -#: src/expr-prs.c:488 +#: src/expr-prs.c:487 msgid "Both operands to the ** operator must be numeric." msgstr "" -#: src/expr-prs.c:582 +#: src/expr-prs.c:581 msgid "Use of $LENGTH is obsolete, returning default of 66." msgstr "" -#: src/expr-prs.c:587 +#: src/expr-prs.c:586 msgid "Use of $WIDTH is obsolete, returning default of 131." msgstr "" -#: src/expr-prs.c:592 +#: src/expr-prs.c:591 #, c-format msgid "Unknown system variable %s." msgstr "" -#: src/expr-prs.c:631 +#: src/expr-prs.c:630 msgid "expecting variable name" msgstr "" -#: src/expr-prs.c:673 +#: src/expr-prs.c:672 msgid "in expression" msgstr "" -#: src/expr-prs.c:850 +#: src/expr-prs.c:853 msgid "Argument 2 to LAG must be a small positive integer constant." msgstr "" -#: src/expr-prs.c:923 src/expr-prs.c:962 +#: src/expr-prs.c:926 src/expr-prs.c:965 #, c-format msgid "" "Type mismatch in argument %d of %s, which was expected to be of %s type. It " "was actually of %s type. " msgstr "" -#: src/expr-prs.c:949 +#: src/expr-prs.c:952 #, c-format msgid "%s cannot take Boolean operands." msgstr "" -#: src/expr-prs.c:981 +#: src/expr-prs.c:984 msgid "in function call" msgstr "" -#: src/expr-prs.c:995 +#: src/expr-prs.c:998 msgid "RANGE requires an odd number of arguments, but at least three." msgstr "" -#: src/expr-prs.c:1005 +#: src/expr-prs.c:1008 #, c-format msgid "%s requires at least two arguments." msgstr "" -#: src/expr-prs.c:1020 +#: src/expr-prs.c:1023 #, c-format msgid "%s.%d requires at least %d arguments." msgstr "" -#: src/expr-prs.c:1062 +#: src/expr-prs.c:1065 #, c-format msgid "" "Argument %d to CONCAT is type %s. All arguments to CONCAT must be strings." msgstr "" -#: src/expr-prs.c:1121 +#: src/expr-prs.c:1124 #, c-format msgid "" "Argument %d to %s was expected to be of %s type. It was actually of type %s." msgstr "" -#: src/expr-prs.c:1140 +#: src/expr-prs.c:1143 #, c-format msgid "%s is not a numeric format." msgstr "" -#: src/expr-prs.c:1166 +#: src/expr-prs.c:1169 #, c-format msgid "Too few arguments to function %s." msgstr "" -#: src/expr-prs.c:1198 +#: src/expr-prs.c:1201 #, c-format msgid "" "Type mismatch in argument %d of %s, which was expected to be numeric. It " "was actually type %s." msgstr "" -#: src/expr-prs.c:1207 +#: src/expr-prs.c:1210 #, c-format msgid "Missing comma following argument %d of %s." msgstr "" -#: src/expr-prs.c:1245 +#: src/expr-prs.c:1248 msgid "The index value after a vector name must be numeric." msgstr "" -#: src/expr-prs.c:1252 +#: src/expr-prs.c:1255 msgid "`)' expected after a vector index value." msgstr "" -#: src/expr-prs.c:1285 +#: src/expr-prs.c:1288 #, c-format msgid "There is no function named %s." msgstr "" -#: src/expr-prs.c:1290 +#: src/expr-prs.c:1293 #, c-format msgid "Function %s may not be given a minimum number of arguments." msgstr "" -#: src/expr-prs.c:1299 +#: src/expr-prs.c:1302 #, c-format msgid "expecting `)' after %s function" msgstr "" -#: src/expr-prs.c:1463 +#: src/expr-prs.c:1466 msgid "Boolean" msgstr "" -#: src/expr-prs.c:1692 +#: src/expr-prs.c:1695 msgid "!!TERMINAL!!" msgstr "" -#: src/expr-prs.c:1718 +#: src/expr-prs.c:1721 msgid "!!SENTINEL!!" msgstr "" -#: src/expr-prs.c:1721 +#: src/expr-prs.c:1724 #, c-format msgid "!!ERROR%d!!" msgstr "" -#: src/expr-prs.c:1739 +#: src/expr-prs.c:1742 msgid "postfix:" msgstr "" @@ -2373,7 +2292,7 @@ msgstr "" msgid "YES or NO expected after ORDERED." msgstr "" -#: src/file-type.c:245 src/file-type.c:550 src/get.c:419 +#: src/file-type.c:245 src/file-type.c:548 src/get.c:343 msgid "while expecting a valid subcommand" msgstr "" @@ -2389,94 +2308,94 @@ msgstr "" msgid "CASE and RECORD must specify different variable names." msgstr "" -#: src/file-type.c:317 +#: src/file-type.c:315 msgid "Column value must be positive." msgstr "" -#: src/file-type.c:332 +#: src/file-type.c:330 msgid "Ending column precedes beginning column." msgstr "" -#: src/file-type.c:351 +#: src/file-type.c:349 msgid "Bad format specifier name." msgstr "" -#: src/file-type.c:412 src/file-type.c:571 +#: src/file-type.c:410 src/file-type.c:569 msgid "" "This command may only appear within a FILE TYPE/END FILE TYPE structure." msgstr "" -#: src/file-type.c:419 +#: src/file-type.c:417 msgid "OTHER may appear only on the last RECORD TYPE command." msgstr "" -#: src/file-type.c:429 +#: src/file-type.c:427 msgid "No input commands (DATA LIST, REPEATING DATA) for above RECORD TYPE." msgstr "" -#: src/file-type.c:483 +#: src/file-type.c:481 msgid "" "The CASE subcommand is not allowed on the RECORD TYPE command for FILE TYPE " "MIXED." msgstr "" -#: src/file-type.c:493 +#: src/file-type.c:491 msgid "" "No variable name may be specified for the CASE subcommand on RECORD TYPE." msgstr "" -#: src/file-type.c:501 +#: src/file-type.c:499 msgid "" "The CASE column specification on RECORD TYPE must give a format specifier " "that is the same type as that of the CASE column specification given on FILE " "TYPE." msgstr "" -#: src/file-type.c:517 +#: src/file-type.c:515 msgid "WARN or NOWARN expected on DUPLICATE subcommand." msgstr "" -#: src/file-type.c:531 +#: src/file-type.c:529 msgid "WARN or NOWARN expected on MISSING subcommand." msgstr "" -#: src/file-type.c:544 +#: src/file-type.c:542 msgid "YES or NO expected on SPREAD subcommand." msgstr "" -#: src/file-type.c:584 +#: src/file-type.c:582 msgid "No input commands (DATA LIST, REPEATING DATA) on above RECORD TYPE." msgstr "" -#: src/file-type.c:591 +#: src/file-type.c:589 msgid "No commands between FILE TYPE and END FILE TYPE." msgstr "" -#: src/file-type.c:656 +#: src/file-type.c:654 #, c-format msgid "Unknown record type \"%.*s\"." msgstr "" -#: src/file-type.c:680 +#: src/file-type.c:678 #, c-format msgid "Unknown record type %g." msgstr "" -#: src/filename.c:238 +#: src/filename.c:221 #, c-format msgid "Searching for `%s'..." msgstr "" -#: src/filename.c:246 src/filename.c:278 +#: src/filename.c:229 src/filename.c:261 msgid "Search unsuccessful!" msgstr "" -#: src/filename.c:271 +#: src/filename.c:254 #, c-format msgid "Found `%s'." msgstr "" -#: src/filename.c:686 +#: src/filename.c:669 #, c-format msgid "Not opening pipe file `%s' because SAFER option set." msgstr "" @@ -2486,131 +2405,131 @@ msgstr "" msgid "Could not create acceptable variant for variable %s." msgstr "" -#: src/flip.c:176 +#: src/flip.c:177 msgid "Cannot create more than 99999 variable names." msgstr "" -#: src/flip.c:290 +#: src/flip.c:293 #, c-format msgid "Error reading FLIP source file: %s." msgstr "" -#: src/flip.c:366 +#: src/flip.c:369 msgid "Could not create temporary file for FLIP." msgstr "" -#: src/flip.c:376 src/flip.c:395 +#: src/flip.c:379 src/flip.c:398 #, c-format msgid "Error writing FLIP file: %s." msgstr "" -#: src/flip.c:431 +#: src/flip.c:434 msgid "Error creating FLIP source file." msgstr "" -#: src/flip.c:434 +#: src/flip.c:437 #, c-format msgid "Error rewinding FLIP file: %s." msgstr "" -#: src/flip.c:443 +#: src/flip.c:446 #, c-format msgid "Error reading FLIP file: %s." msgstr "" -#: src/flip.c:455 +#: src/flip.c:458 #, c-format msgid "Error seeking FLIP source file: %s." msgstr "" -#: src/flip.c:460 +#: src/flip.c:463 #, c-format msgid "Error writing FLIP source file: %s." msgstr "" -#: src/flip.c:468 +#: src/flip.c:471 #, c-format msgid "Error rewind FLIP source file: %s." msgstr "" -#: src/format.c:75 +#: src/format.c:74 msgid "X and T format specifiers not allowed here." msgstr "" -#: src/format.c:81 +#: src/format.c:80 #, c-format msgid "%s is not a valid data format." msgstr "" -#: src/format.c:112 +#: src/format.c:111 #, c-format msgid "Format %s may not be used as an input format." msgstr "" -#: src/format.c:117 +#: src/format.c:116 #, c-format msgid "" "Input format %s specifies a bad width %d. Format %s requires a width " "between %d and %d." msgstr "" -#: src/format.c:124 +#: src/format.c:123 #, c-format msgid "" "Input format %s specifies an odd width %d, but format %s requires an even " "width between %d and %d." msgstr "" -#: src/format.c:131 +#: src/format.c:130 #, c-format msgid "" "Input format %s specifies a bad number of implied decimal places %d. Input " "format %s allows up to 16 implied decimal places." msgstr "" -#: src/format.c:151 +#: src/format.c:150 #, c-format msgid "" "Output format %s specifies a bad width %d. Format %s requires a width " "between %d and %d." msgstr "" -#: src/format.c:161 +#: src/format.c:160 #, c-format msgid "" "Output format %s requires minimum width %d to allow %d decimal places. Try %" "s%d.%d instead of %s." msgstr "" -#: src/format.c:169 +#: src/format.c:168 #, c-format msgid "" "Output format %s specifies an odd width %d, but output format %s requires an " "even width between %d and %d." msgstr "" -#: src/format.c:176 +#: src/format.c:175 #, c-format msgid "" "Output format %s specifies a bad number of implied decimal places %d. " "Output format %s allows a number of implied decimal places between 1 and 16." msgstr "" -#: src/format.c:193 +#: src/format.c:192 #, c-format msgid "Can't display a string variable of width %d with format specifier %s." msgstr "" -#: src/format.c:303 +#: src/format.c:302 msgid "Format specifier expected." msgstr "" -#: src/format.c:314 +#: src/format.c:313 #, c-format msgid "Data format %s does not specify a width." msgstr "" -#: src/format.c:331 +#: src/format.c:330 #, c-format msgid "Data format %s is not valid." msgstr "" @@ -2624,7 +2543,7 @@ msgstr "" msgid "Format %s may not be assigned to a %s variable." msgstr "" -#: src/formats.c:123 src/numeric.c:66 src/numeric.c:140 +#: src/formats.c:123 src/numeric.c:66 src/numeric.c:139 msgid "`)' expected after output format." msgstr "" @@ -2636,20 +2555,20 @@ msgstr "" msgid " Name Print Write\n" msgstr "" -#: src/get.c:124 +#: src/get.c:110 msgid "GET translation table from file to memory:\n" msgstr "" -#: src/get.c:129 src/get.c:1473 +#: src/get.c:115 src/get.c:1398 #, c-format msgid " %8s from %3d,%3d to %3d,%3d\n" msgstr "" -#: src/get.c:425 +#: src/get.c:349 msgid "All variables deleted from system file dictionary." msgstr "" -#: src/get.c:471 +#: src/get.c:396 #, c-format msgid "" "Cannot rename %s as %s because there already exists a variable named %s. To " @@ -2657,106 +2576,106 @@ msgid "" "as \"/RENAME (A=B)(B=C)(C=A)\", or equivalently, \"/RENAME (A B C=B C A)\"." msgstr "" -#: src/get.c:496 +#: src/get.c:421 msgid "`=' expected after variable list." msgstr "" -#: src/get.c:503 +#: src/get.c:428 #, c-format msgid "" -"Number of variables on left side of `=' (%d) do not match number of " +"Number of variables on left side of `=' (%d) does not match number of " "variables on right side (%d), in parenthesized group %d of RENAME subcommand." msgstr "" -#: src/get.c:521 +#: src/get.c:441 #, c-format -msgid "Duplicate variables name %s." +msgid "Requested renaming duplicates variable name %s." msgstr "" -#: src/get.c:544 +#: src/get.c:461 msgid "" "\n" "Variables in dictionary:\n" msgstr "" -#: src/get.c:656 +#: src/get.c:582 msgid "The BY subcommand may be given once at most." msgstr "" -#: src/get.c:723 +#: src/get.c:649 msgid "The active file may not be specified more than once." msgstr "" -#: src/get.c:732 +#: src/get.c:658 msgid "Cannot specify the active file since no active file has been defined." msgstr "" -#: src/get.c:764 +#: src/get.c:690 msgid "" "IN, FIRST, and LAST subcommands may not occur before the first FILE or TABLE." msgstr "" -#: src/get.c:796 +#: src/get.c:722 #, c-format msgid "Multiple %s subcommands for a single FILE or TABLE." msgstr "" -#: src/get.c:806 +#: src/get.c:732 #, c-format msgid "Duplicate variable name %s while creating %s variable." msgstr "" -#: src/get.c:820 +#: src/get.c:746 msgid "" "RENAME, KEEP, and DROP subcommands may not occur before the first FILE or " "TABLE." msgstr "" -#: src/get.c:844 +#: src/get.c:770 msgid "The BY subcommand is required when a TABLE subcommand is given." msgstr "" -#: src/get.c:865 +#: src/get.c:791 #, c-format msgid "File %s lacks BY variable %s." msgstr "" -#: src/get.c:1372 +#: src/get.c:1311 #, c-format msgid "" "Variable %s in file %s (%s) has different type or width from the same " "variable in earlier file (%s)." msgstr "" -#: src/get.c:1424 +#: src/get.c:1360 msgid "expecting COMM or TAPE" msgstr "" -#: src/get.c:1468 +#: src/get.c:1393 msgid "IMPORT translation table from file to memory:\n" msgstr "" -#: src/getline.c:160 +#: src/getline.c:161 #, c-format msgid "Can't find `%s' in include file search path." msgstr "" -#: src/getline.c:315 +#: src/getline.c:316 #, c-format msgid "%s: Opening as syntax file." msgstr "" -#: src/getline.c:320 +#: src/getline.c:321 #, c-format msgid "Opening `%s': %s." msgstr "" -#: src/getline.c:329 src/html.c:330 src/postscript.c:1479 +#: src/getline.c:330 src/html.c:330 src/postscript.c:1463 #, c-format msgid "Reading `%s': %s." msgstr "" -#: src/getline.c:387 +#: src/getline.c:388 #, c-format msgid "Closing `%s': %s." msgstr "" @@ -2782,54 +2701,6 @@ msgstr "" msgid "Assuming screen of size 79x25." msgstr "" -#: src/glob.c:323 -msgid "Jan" -msgstr "" - -#: src/glob.c:323 -msgid "Feb" -msgstr "" - -#: src/glob.c:323 -msgid "Mar" -msgstr "" - -#: src/glob.c:323 -msgid "Apr" -msgstr "" - -#: src/glob.c:323 -msgid "May" -msgstr "" - -#: src/glob.c:323 -msgid "Jun" -msgstr "" - -#: src/glob.c:324 -msgid "Jul" -msgstr "" - -#: src/glob.c:324 -msgid "Aug" -msgstr "" - -#: src/glob.c:324 -msgid "Sep" -msgstr "" - -#: src/glob.c:324 -msgid "Oct" -msgstr "" - -#: src/glob.c:324 -msgid "Nov" -msgstr "" - -#: src/glob.c:324 -msgid "Dec" -msgstr "" - #: src/groff-font.c:107 #, c-format msgid "%s: Opening Groff font file..." @@ -2973,7 +2844,7 @@ msgstr "" msgid "<>" msgstr "" -#: src/hash.c:496 +#: src/hash.c:492 msgid "hash table:" msgstr "" @@ -3007,11 +2878,11 @@ msgstr "" msgid "%s: %s: Opening HTML prologue..." msgstr "" -#: src/html.c:268 src/html.c:279 src/postscript.c:1371 src/postscript.c:1382 +#: src/html.c:268 src/html.c:279 src/postscript.c:1355 src/postscript.c:1366 msgid "nobody" msgstr "" -#: src/html.c:275 src/html.c:280 src/postscript.c:1378 src/postscript.c:1383 +#: src/html.c:275 src/html.c:280 src/postscript.c:1362 src/postscript.c:1367 msgid "nowhere" msgstr "" @@ -3034,31 +2905,31 @@ msgstr "" msgid "Unrecognized filename format." msgstr "" -#: src/inpt-pgm.c:79 +#: src/inpt-pgm.c:83 msgid "No matching INPUT PROGRAM command." msgstr "" -#: src/inpt-pgm.c:84 +#: src/inpt-pgm.c:88 msgid "" "No data-input or transformation commands specified between INPUT PROGRAM and " "END INPUT PROGRAM." msgstr "" -#: src/inpt-pgm.c:300 src/inpt-pgm.c:443 +#: src/inpt-pgm.c:265 src/inpt-pgm.c:408 msgid "" "This command may only be executed between INPUT PROGRAM and END INPUT " "PROGRAM." msgstr "" -#: src/inpt-pgm.c:359 +#: src/inpt-pgm.c:324 msgid "COLUMN subcommand multiply specified." msgstr "" -#: src/inpt-pgm.c:373 +#: src/inpt-pgm.c:338 msgid "expecting file handle name" msgstr "" -#: src/inpt-pgm.c:416 +#: src/inpt-pgm.c:381 msgid "" "REREAD: Column numbers must be positive finite numbers. Column set to 1." msgstr "" @@ -3122,11 +2993,11 @@ msgstr "" msgid "The rest of this command has been discarded." msgstr "" -#: src/lexer.c:822 src/print.c:1191 +#: src/lexer.c:822 src/print.c:1174 msgid "" msgstr "" -#: src/lexer.c:948 src/pfm-read.c:149 src/repeat.c:225 +#: src/lexer.c:948 src/pfm-read.c:132 src/repeat.c:226 msgid "Unexpected end of file." msgstr "" @@ -3215,176 +3086,176 @@ msgid "" "fully executed to this point." msgstr "" -#: src/matrix-data.c:203 +#: src/matrix-data.c:186 msgid "VARIABLES subcommand multiply specified." msgstr "" -#: src/matrix-data.c:218 +#: src/matrix-data.c:201 msgid "VARNAME_ cannot be explicitly specified on VARIABLES." msgstr "" -#: src/matrix-data.c:284 +#: src/matrix-data.c:267 msgid "in FORMAT subcommand" msgstr "" -#: src/matrix-data.c:295 +#: src/matrix-data.c:278 msgid "SPLIT subcommand multiply specified." msgstr "" -#: src/matrix-data.c:302 +#: src/matrix-data.c:285 msgid "in SPLIT subcommand" msgstr "" -#: src/matrix-data.c:311 +#: src/matrix-data.c:294 msgid "Split variable may not be named ROWTYPE_ or VARNAME_." msgstr "" -#: src/matrix-data.c:347 +#: src/matrix-data.c:327 #, c-format msgid "Split variable %s is already another type." msgstr "" -#: src/matrix-data.c:362 +#: src/matrix-data.c:342 msgid "FACTORS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:377 +#: src/matrix-data.c:357 #, c-format msgid "Factor variable %s is already another type." msgstr "" -#: src/matrix-data.c:392 +#: src/matrix-data.c:372 msgid "CELLS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:398 src/matrix-data.c:417 +#: src/matrix-data.c:378 src/matrix-data.c:397 msgid "expecting positive integer" msgstr "" -#: src/matrix-data.c:411 +#: src/matrix-data.c:391 msgid "N subcommand multiply specified." msgstr "" -#: src/matrix-data.c:432 +#: src/matrix-data.c:412 msgid "CONTENTS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:452 +#: src/matrix-data.c:432 msgid "Nested parentheses not allowed." msgstr "" -#: src/matrix-data.c:462 +#: src/matrix-data.c:442 msgid "Mismatched right parenthesis (`(')." msgstr "" -#: src/matrix-data.c:467 +#: src/matrix-data.c:447 msgid "Empty parentheses not allowed." msgstr "" -#: src/matrix-data.c:480 src/matrix-data.c:488 +#: src/matrix-data.c:460 src/matrix-data.c:468 msgid "in CONTENTS subcommand" msgstr "" -#: src/matrix-data.c:495 +#: src/matrix-data.c:475 #, c-format msgid "Content multiply specified for %s." msgstr "" -#: src/matrix-data.c:512 +#: src/matrix-data.c:492 msgid "Missing right parenthesis." msgstr "" -#: src/matrix-data.c:532 +#: src/matrix-data.c:512 msgid "Missing VARIABLES subcommand." msgstr "" -#: src/matrix-data.c:538 +#: src/matrix-data.c:518 msgid "" "CONTENTS subcommand not specified: assuming file contains only CORR matrix." msgstr "" -#: src/matrix-data.c:548 +#: src/matrix-data.c:528 msgid "" "Missing CELLS subcommand. CELLS is required when ROWTYPE_ is not given in " "the data and factors are present." msgstr "" -#: src/matrix-data.c:556 +#: src/matrix-data.c:536 msgid "Split file values must be present in the data when ROWTYPE_ is present." msgstr "" -#: src/matrix-data.c:612 +#: src/matrix-data.c:592 msgid "No continuous variables specified." msgstr "" -#: src/matrix-data.c:1026 +#: src/matrix-data.c:1006 #, c-format msgid "End of line expected %s while reading %s." msgstr "" -#: src/matrix-data.c:1212 +#: src/matrix-data.c:1193 #, c-format msgid "expecting value for %s %s" msgstr "" -#: src/matrix-data.c:1362 +#: src/matrix-data.c:1344 #, c-format msgid "Syntax error expecting SPLIT FILE value %s." msgstr "" -#: src/matrix-data.c:1371 +#: src/matrix-data.c:1353 #, c-format msgid "Expecting value %g for %s." msgstr "" -#: src/matrix-data.c:1410 src/matrix-data.c:1833 +#: src/matrix-data.c:1391 src/matrix-data.c:1820 #, c-format msgid "Syntax error expecting factor value %s." msgstr "" -#: src/matrix-data.c:1419 +#: src/matrix-data.c:1400 #, c-format msgid "Syntax error expecting value %g for %s %s." msgstr "" -#: src/matrix-data.c:1626 +#: src/matrix-data.c:1610 #, c-format msgid "Syntax error %s expecting SPLIT FILE value." msgstr "" -#: src/matrix-data.c:1747 +#: src/matrix-data.c:1734 #, c-format msgid "" "Expected %d lines of data for %s content; actually saw %d lines. No data " "will be output for this content." msgstr "" -#: src/matrix-data.c:1778 +#: src/matrix-data.c:1765 #, c-format msgid "Multiply specified ROWTYPE_ %s." msgstr "" -#: src/matrix-data.c:1783 +#: src/matrix-data.c:1770 #, c-format msgid "Syntax error %s expecting ROWTYPE_ string." msgstr "" -#: src/matrix-data.c:1802 +#: src/matrix-data.c:1789 #, c-format msgid "Syntax error %s." msgstr "" -#: src/matrix-data.c:1948 +#: src/matrix-data.c:1935 #, c-format msgid "Duplicate specification for %s." msgstr "" -#: src/matrix-data.c:1960 +#: src/matrix-data.c:1947 #, c-format msgid "Too many rows of matrix data for %s." msgstr "" -#: src/matrix-data.c:2005 +#: src/matrix-data.c:1992 #, c-format msgid "Syntax error expecting value for %s %s." msgstr "" @@ -3427,7 +3298,7 @@ msgstr "" msgid "String is not of proper length." msgstr "" -#: src/mis-val.c:326 src/repeat.c:483 +#: src/mis-val.c:326 src/repeat.c:484 msgid "String expected." msgstr "" @@ -3448,452 +3319,447 @@ msgstr "" msgid "(!!!INTERNAL ERROR--%d!!!)\n" msgstr "" -#: src/modify-vars.c:115 +#: src/modify-vars.c:108 msgid "REORDER subcommand may be given at most once." msgstr "" -#: src/modify-vars.c:138 +#: src/modify-vars.c:131 msgid "Cannot specify ALL after specifying a set of variables." msgstr "" -#: src/modify-vars.c:148 +#: src/modify-vars.c:141 msgid "`(' expected on REORDER subcommand." msgstr "" -#: src/modify-vars.c:160 +#: src/modify-vars.c:153 msgid "`)' expected following variable names on REORDER subcommand." msgstr "" -#: src/modify-vars.c:193 +#: src/modify-vars.c:171 msgid "RENAME subcommand may be given at most once." msgstr "" -#: src/modify-vars.c:206 +#: src/modify-vars.c:184 msgid "`(' expected on RENAME subcommand." msgstr "" -#: src/modify-vars.c:214 +#: src/modify-vars.c:192 msgid "" "`=' expected between lists of new and old variable names on RENAME " "subcommand." msgstr "" -#: src/modify-vars.c:224 src/rename-vars.c:74 +#: src/modify-vars.c:200 src/rename-vars.c:70 #, c-format msgid "" "Differing number of variables in old name list (%d) and in new name list (%" "d)." msgstr "" -#: src/modify-vars.c:235 +#: src/modify-vars.c:211 msgid "`)' expected after variable lists on RENAME subcommand." msgstr "" -#: src/modify-vars.c:252 +#: src/modify-vars.c:225 msgid "" "KEEP subcommand may be given at most once. It may notbe given in " "conjunction with the DROP subcommand." msgstr "" -#: src/modify-vars.c:291 +#: src/modify-vars.c:267 msgid "" -"DROP subcommand may be given at most once. It may notbe given in " +"DROP subcommand may be given at most once. It may not be given in " "conjunction with the KEEP subcommand." msgstr "" -#: src/modify-vars.c:317 +#: src/modify-vars.c:293 #, c-format msgid "Unrecognized subcommand name `%s'." msgstr "" -#: src/modify-vars.c:319 +#: src/modify-vars.c:295 msgid "Subcommand name expected." msgstr "" -#: src/modify-vars.c:327 +#: src/modify-vars.c:303 msgid "`/' or `.' expected." msgstr "" -#: src/modify-vars.c:494 src/rename-vars.c:124 -#, c-format -msgid "Duplicate variable name `%s' after renaming." -msgstr "" - #: src/numeric.c:59 #, c-format msgid "Format type %s may not be used with a numeric variable." msgstr "" -#: src/numeric.c:79 src/numeric.c:162 src/vector.c:167 +#: src/numeric.c:78 src/numeric.c:161 src/vector.c:158 #, c-format msgid "There is already a variable named %s." msgstr "" -#: src/numeric.c:133 +#: src/numeric.c:132 #, c-format msgid "Format type %s may not be used with a string variable." msgstr "" -#: src/output.c:85 +#: src/output.c:87 msgid "Attempt to iterate driver list reentrantly." msgstr "" -#: src/output.c:162 +#: src/output.c:164 #, c-format msgid "Unknown output driver `%s'." msgstr "" -#: src/output.c:164 +#: src/output.c:166 #, c-format msgid "Output driver `%s' referenced but never defined." msgstr "" -#: src/output.c:294 +#: src/output.c:296 msgid "Cannot find output initialization file. Use `-vv' to view search path." msgstr "" -#: src/output.c:299 +#: src/output.c:301 #, c-format msgid "%s: Opening device description file..." msgstr "" -#: src/output.c:303 src/output.c:1163 src/postscript.c:1113 +#: src/output.c:305 src/output.c:1165 src/postscript.c:1097 #, c-format msgid "Opening %s: %s." msgstr "" -#: src/output.c:314 src/output.c:1174 src/postscript.c:1130 +#: src/output.c:316 src/output.c:1176 src/postscript.c:1114 #, c-format msgid "Reading %s: %s." msgstr "" -#: src/output.c:336 src/output.c:488 +#: src/output.c:338 src/output.c:490 msgid "Syntax error." msgstr "" -#: src/output.c:346 src/postscript.c:1141 +#: src/output.c:348 src/postscript.c:1125 #, c-format msgid "Closing %s: %s." msgstr "" -#: src/output.c:351 +#: src/output.c:353 msgid "No output drivers are active." msgstr "" -#: src/output.c:354 +#: src/output.c:356 msgid "Device definition file read successfully." msgstr "" -#: src/output.c:356 +#: src/output.c:358 msgid "Error reading device definition file." msgstr "" -#: src/output.c:460 +#: src/output.c:462 msgid "" "Driver classes:\n" "\t" msgstr "" -#: src/output.c:589 +#: src/output.c:591 msgid "Syntax error in string constant." msgstr "" -#: src/output.c:620 +#: src/output.c:622 msgid "Syntax error in options." msgstr "" -#: src/output.c:630 +#: src/output.c:632 msgid "Syntax error in options (`=' expected)." msgstr "" -#: src/output.c:637 +#: src/output.c:639 msgid "Syntax error in options (value expected after `=')." msgstr "" -#: src/output.c:709 +#: src/output.c:711 msgid "Driver name expected." msgstr "" -#: src/output.c:730 +#: src/output.c:732 msgid "Class name expected." msgstr "" -#: src/output.c:739 +#: src/output.c:741 #, c-format msgid "Unknown output driver class `%s'." msgstr "" -#: src/output.c:746 +#: src/output.c:748 #, c-format msgid "Can't initialize output driver class `%s'." msgstr "" -#: src/output.c:753 +#: src/output.c:755 #, c-format msgid "Can't initialize output driver `%s' of class `%s'." msgstr "" -#: src/output.c:775 +#: src/output.c:777 #, c-format msgid "Unknown device type `%s'." msgstr "" -#: src/output.c:787 +#: src/output.c:789 #, c-format msgid "Can't complete initialization of output driver `%s' of class `%s'." msgstr "" -#: src/output.c:834 +#: src/output.c:836 #, c-format msgid "Can't deinitialize output driver class `%s'." msgstr "" -#: src/output.c:907 +#: src/output.c:909 #, c-format msgid "Trying to find keyword `%s'...\n" msgstr "" -#: src/output.c:1024 +#: src/output.c:1026 #, c-format msgid "Unit \"%s\" is unknown in dimension \"%s\"." msgstr "" -#: src/output.c:1039 +#: src/output.c:1041 #, c-format msgid "Bad dimension \"%s\"." msgstr "" -#: src/output.c:1065 +#: src/output.c:1067 #, c-format msgid "`x' expected in paper size `%s'." msgstr "" -#: src/output.c:1075 +#: src/output.c:1077 #, c-format msgid "Trailing garbage `%s' on paper size `%s'." msgstr "" -#: src/output.c:1124 +#: src/output.c:1126 msgid "Paper size name must not be empty." msgstr "" -#: src/output.c:1155 +#: src/output.c:1157 msgid "Cannot find `papersize' configuration file." msgstr "" -#: src/output.c:1159 +#: src/output.c:1161 #, c-format msgid "%s: Opening paper size definition file..." msgstr "" -#: src/output.c:1201 +#: src/output.c:1203 msgid "Syntax error in paper size definition." msgstr "" -#: src/output.c:1230 +#: src/output.c:1232 msgid "Paper size definition file read successfully." msgstr "" -#: src/output.c:1232 +#: src/output.c:1234 msgid "Error reading paper size definition file." msgstr "" -#: src/output.c:1301 +#: src/output.c:1303 #, c-format msgid "Error closing page on %s device of %s class." msgstr "" -#: src/output.c:1305 +#: src/output.c:1307 #, c-format msgid "Error opening page on %s device of %s class." msgstr "" -#: src/pfm-read.c:106 +#: src/pfm-read.c:89 #, c-format msgid "portable file %s corrupt at offset %ld: " msgstr "" -#: src/pfm-read.c:125 src/pfm-write.c:501 +#: src/pfm-read.c:108 src/pfm-write.c:501 #, c-format msgid "%s: Closing portable file: %s." msgstr "" -#: src/pfm-read.c:157 +#: src/pfm-read.c:140 msgid "Bad line end." msgstr "" -#: src/pfm-read.c:238 +#: src/pfm-read.c:221 #, c-format msgid "Cannot read file %s as portable file: already opened for %s." msgstr "" -#: src/pfm-read.c:244 +#: src/pfm-read.c:227 #, c-format msgid "%s: Opening portable-file handle %s for reading." msgstr "" -#: src/pfm-read.c:252 +#: src/pfm-read.c:235 #, c-format msgid "" "An error occurred while opening \"%s\" for reading as a portable file: %s." msgstr "" -#: src/pfm-read.c:286 +#: src/pfm-read.c:269 msgid "Data record expected." msgstr "" -#: src/pfm-read.c:288 +#: src/pfm-read.c:271 msgid "Read portable-file dictionary successfully." msgstr "" -#: src/pfm-read.c:297 +#: src/pfm-read.c:280 msgid "Error reading portable-file dictionary." msgstr "" -#: src/pfm-read.c:395 +#: src/pfm-read.c:378 msgid "Missing numeric terminator." msgstr "" -#: src/pfm-read.c:432 +#: src/pfm-read.c:415 msgid "Bad integer format." msgstr "" -#: src/pfm-read.c:462 +#: src/pfm-read.c:445 #, c-format msgid "Bad string length %d." msgstr "" -#: src/pfm-read.c:561 +#: src/pfm-read.c:544 #, c-format msgid "Bad date string length %d." msgstr "" -#: src/pfm-read.c:565 +#: src/pfm-read.c:548 msgid "Bad character in date." msgstr "" -#: src/pfm-read.c:585 +#: src/pfm-read.c:568 #, c-format msgid "Bad time string length %d." msgstr "" -#: src/pfm-read.c:589 +#: src/pfm-read.c:572 msgid "Bad character in time." msgstr "" -#: src/pfm-read.c:639 -#, c-format -msgid "%s: Bad format specifier byte %d." -msgstr "" - -#: src/pfm-read.c:648 src/sfm-read.c:966 src/sfm-read.c:976 +#: src/pfm-read.c:622 src/pfm-read.c:631 src/sfm-read.c:900 src/sfm-read.c:910 #, c-format msgid "%s: Bad format specifier byte (%d)." msgstr "" -#: src/pfm-read.c:650 +#: src/pfm-read.c:633 #, c-format msgid "%s variable %s has %s format specifier %s." msgstr "" -#: src/pfm-read.c:651 src/print.c:629 src/sfm-read.c:980 +#: src/pfm-read.c:634 src/print.c:612 src/sfm-read.c:914 msgid "String" msgstr "" -#: src/pfm-read.c:651 src/print.c:629 src/sfm-read.c:980 +#: src/pfm-read.c:634 src/print.c:612 src/sfm-read.c:914 msgid "Numeric" msgstr "" -#: src/pfm-read.c:689 +#: src/pfm-read.c:673 msgid "Expected variable count record." msgstr "" -#: src/pfm-read.c:693 +#: src/pfm-read.c:677 #, c-format msgid "Invalid number of variables %d." msgstr "" -#: src/pfm-read.c:703 +#: src/pfm-read.c:687 #, c-format msgid "Unexpected flag value %d." msgstr "" -#: src/pfm-read.c:727 +#: src/pfm-read.c:701 +#, c-format +msgid "Weight variable name (%s) truncated." +msgstr "" + +#: src/pfm-read.c:716 msgid "Expected variable record." msgstr "" -#: src/pfm-read.c:733 +#: src/pfm-read.c:722 #, c-format msgid "Invalid variable width %d." msgstr "" -#: src/pfm-read.c:751 +#: src/pfm-read.c:740 #, c-format msgid "position %d: Variable name has %u characters." msgstr "" -#: src/pfm-read.c:755 +#: src/pfm-read.c:744 #, c-format msgid "position %d: Variable name begins with invalid character." msgstr "" -#: src/pfm-read.c:759 +#: src/pfm-read.c:748 #, c-format msgid "position %d: Variable name begins with lowercase letter %c." msgstr "" -#: src/pfm-read.c:772 +#: src/pfm-read.c:761 #, c-format msgid "position %d: Variable name character %d is lowercase letter %c." msgstr "" -#: src/pfm-read.c:782 +#: src/pfm-read.c:771 #, c-format msgid "position %d: character `\\%03o' is not valid in a variable name." msgstr "" -#: src/pfm-read.c:793 +#: src/pfm-read.c:782 #, c-format msgid "Duplicate variable name %s." msgstr "" -#: src/pfm-read.c:837 +#: src/pfm-read.c:826 #, c-format msgid "Bad missing values for %s." msgstr "" -#: src/pfm-read.c:859 +#: src/pfm-read.c:849 #, c-format msgid "Weighting variable %s not present in dictionary." msgstr "" -#: src/pfm-read.c:927 +#: src/pfm-read.c:922 #, c-format msgid "Unknown variable %s while parsing value labels." msgstr "" -#: src/pfm-read.c:930 +#: src/pfm-read.c:925 #, c-format msgid "" "Cannot assign value labels to %s and %s, which have different variable types " "or widths." msgstr "" -#: src/pfm-read.c:963 +#: src/pfm-read.c:958 #, c-format msgid "Duplicate label for value %g for variable %s." msgstr "" -#: src/pfm-read.c:966 +#: src/pfm-read.c:961 #, c-format msgid "Duplicate label for value `%.*s' for variable %s." msgstr "" -#: src/pfm-read.c:1036 +#: src/pfm-read.c:1031 msgid "End of file midway through case." msgstr "" -#: src/pfm-read.c:1046 +#: src/pfm-read.c:1041 msgid "reading as a portable file" msgstr "" @@ -3930,12 +3796,12 @@ msgstr "" msgid "writing as a portable file" msgstr "" -#: src/postscript.c:339 +#: src/postscript.c:323 #, c-format msgid "PostScript driver initializing as `%s'..." msgstr "" -#: src/postscript.c:463 +#: src/postscript.c:447 #, c-format msgid "" "PostScript driver: The defined page is not long enough to hold margins and " @@ -3943,182 +3809,182 @@ msgid "" "room for %d lines of each font at the default size of %d.%03d points." msgstr "" -#: src/postscript.c:593 +#: src/postscript.c:577 #, c-format msgid "Unknown configuration parameter `%s' for PostScript device driver." msgstr "" -#: src/postscript.c:609 +#: src/postscript.c:593 #, c-format msgid "" "Unknown orientation `%s'. Valid orientations are `portrait' and `landscape'." msgstr "" -#: src/postscript.c:621 +#: src/postscript.c:605 msgid "" "Unknown value for `data'. Valid values are `clean7bit', `clean8bit', and " "`binary'." msgstr "" -#: src/postscript.c:630 +#: src/postscript.c:614 msgid "Unknown value for `line-ends'. Valid values are `lf' and `crlf'." msgstr "" -#: src/postscript.c:639 +#: src/postscript.c:623 msgid "Unknown value for `line-style'. Valid values are `thick' and `double'." msgstr "" -#: src/postscript.c:701 +#: src/postscript.c:685 #, c-format msgid "" "Default font size must be at least 1 point (value of 1000 for key `%s')." msgstr "" -#: src/postscript.c:733 +#: src/postscript.c:717 #, c-format msgid "Value for `%s' must be a dimension of positive length (i.e., `1in')." msgstr "" -#: src/postscript.c:796 +#: src/postscript.c:780 #, c-format msgid "Nonnegative integer required as value for `%s'." msgstr "" -#: src/postscript.c:922 +#: src/postscript.c:906 #, c-format msgid "%s: %s: Opening PostScript font encoding..." msgstr "" -#: src/postscript.c:928 +#: src/postscript.c:912 #, c-format msgid "" "PostScript driver: Cannot open encoding file `%s': %s. Substituting " "ISOLatin1Encoding for missing encoding." msgstr "" -#: src/postscript.c:970 +#: src/postscript.c:954 msgid "PostScript driver: Invalid numeric format." msgstr "" -#: src/postscript.c:975 +#: src/postscript.c:959 #, c-format msgid "" "PostScript driver: Codes must be between 0 and 255. (%d is not allowed.)" msgstr "" -#: src/postscript.c:1011 +#: src/postscript.c:995 #, c-format msgid "PostScript driver: Error closing encoding file `%s'." msgstr "" -#: src/postscript.c:1014 +#: src/postscript.c:998 #, c-format msgid "%s: PostScript font encoding read successfully." msgstr "" -#: src/postscript.c:1108 +#: src/postscript.c:1092 #, c-format msgid "%s: %s: Opening PostScript encoding list file." msgstr "" -#: src/postscript.c:1143 +#: src/postscript.c:1127 #, c-format msgid "%s: PostScript encoding list file read successfully." msgstr "" -#: src/postscript.c:1157 +#: src/postscript.c:1141 msgid "<>" msgstr "" -#: src/postscript.c:1315 +#: src/postscript.c:1299 msgid "" "Cannot find PostScript prologue. The use of `-vv' on the command line is " "suggested as a debugging aid." msgstr "" -#: src/postscript.c:1320 +#: src/postscript.c:1304 #, c-format msgid "%s: %s: Opening PostScript prologue..." msgstr "" -#: src/postscript.c:1492 +#: src/postscript.c:1476 #, c-format msgid "%s: PostScript prologue read successfully." msgstr "" -#: src/postscript.c:1496 +#: src/postscript.c:1480 #, c-format msgid "%s: Error reading PostScript prologue." msgstr "" -#: src/postscript.c:1666 +#: src/postscript.c:1650 #, c-format msgid "PostScript output driver: %s: %s" msgstr "" -#: src/postscript.c:2363 +#: src/postscript.c:2334 #, c-format msgid "PostScript driver: Cannot find encoding `%s' for PostScript font `%s'." msgstr "" -#: src/print.c:207 +#: src/print.c:190 msgid "expecting a valid subcommand" msgstr "" -#: src/print.c:387 src/print.c:404 +#: src/print.c:370 src/print.c:387 #, c-format msgid "%g is not a valid column location." msgstr "" -#: src/print.c:398 +#: src/print.c:381 #, c-format msgid "Column location expected following `%d-'." msgstr "" -#: src/print.c:409 +#: src/print.c:392 #, c-format msgid "" "%d-%ld is not a valid column range. The second column must be greater than " "or equal to the first." msgstr "" -#: src/print.c:515 +#: src/print.c:498 #, c-format msgid "" "%s is not of the same type as %s. To specify variables of different types " "in the same variable list, use a FORTRAN-like format specifier." msgstr "" -#: src/print.c:545 +#: src/print.c:528 msgid "" "The ending column for a field must not be less than the starting column." msgstr "" -#: src/print.c:628 +#: src/print.c:611 #, c-format msgid "%s variables cannot be displayed with format %s." msgstr "" -#: src/print.c:715 +#: src/print.c:698 #, c-format msgid "Display format %s may not be used with a %s variable." msgstr "" -#: src/print.c:865 +#: src/print.c:848 #, c-format msgid "Writing %3d records to file %s." msgstr "" -#: src/print.c:866 +#: src/print.c:849 #, c-format msgid "Writing %3d records to the listing file." msgstr "" -#: src/print.c:1080 +#: src/print.c:1063 msgid "A file name or handle was expected in the OUTFILE subcommand." msgstr "" -#: src/print.c:1132 +#: src/print.c:1115 #, c-format msgid "" "The expression on PRINT SPACE evaluated to %d. It's not possible to PRINT " @@ -4164,52 +4030,57 @@ msgid "" "numeric." msgstr "" -#: src/recode.c:505 +#: src/recode.c:504 msgid "" "Inconsistent output types. The output values must be all numeric or all " "string." msgstr "" -#: src/recode.c:556 +#: src/recode.c:555 msgid "following LO THRU" msgstr "" -#: src/recode.c:572 src/recode.c:601 +#: src/recode.c:571 src/recode.c:600 msgid "in source value" msgstr "" -#: src/recode.c:614 +#: src/recode.c:613 msgid "" "Keyword CONVERT may only be used with string input values and numeric output " "values." msgstr "" -#: src/recode.c:870 +#: src/recode.c:869 msgid "!!END!!" msgstr "" -#: src/recode.c:891 src/recode.c:907 +#: src/recode.c:890 src/recode.c:906 msgid "!!ERROR!!" msgstr "" -#: src/rename-vars.c:59 +#: src/rename-vars.c:55 msgid "`(' expected." msgstr "" -#: src/rename-vars.c:67 +#: src/rename-vars.c:63 msgid "`=' expected between lists of new and old variable names." msgstr "" -#: src/rename-vars.c:85 +#: src/rename-vars.c:81 msgid "`)' expected after variable names." msgstr "" -#: src/repeat.c:158 +#: src/rename-vars.c:91 +#, c-format +msgid "Renaming would duplicate variable name %s." +msgstr "" + +#: src/repeat.c:159 #, c-format msgid "Identifier %s is given twice." msgstr "" -#: src/repeat.c:201 +#: src/repeat.c:202 #, c-format msgid "" "There must be the same number of substitutions for each dummy variable " @@ -4217,11 +4088,11 @@ msgid "" "s as well, but %d were specified." msgstr "" -#: src/repeat.c:310 +#: src/repeat.c:311 msgid "No commands in scope." msgstr "" -#: src/repeat.c:510 +#: src/repeat.c:511 msgid "No matching DO REPEAT." msgstr "" @@ -4246,117 +4117,117 @@ msgstr "" msgid "Only last instance of this command is in effect." msgstr "" -#: src/sfm-read.c:167 +#: src/sfm-read.c:150 msgid "corrupt system file: " msgstr "" -#: src/sfm-read.c:183 src/sfm-write.c:741 +#: src/sfm-read.c:166 src/sfm-write.c:740 #, c-format msgid "%s: Closing system file: %s." msgstr "" -#: src/sfm-read.c:256 +#: src/sfm-read.c:239 #, c-format msgid "Cannot read file %s as system file: already opened for %s." msgstr "" -#: src/sfm-read.c:261 +#: src/sfm-read.c:244 #, c-format msgid "%s: Opening system-file handle %s for reading." msgstr "" -#: src/sfm-read.c:269 +#: src/sfm-read.c:252 #, c-format msgid "" "An error occurred while opening \"%s\" for reading as a system file: %s." msgstr "" -#: src/sfm-read.c:303 +#: src/sfm-read.c:286 #, c-format msgid "" "%s: Weighting variable may not be a continuation of a long string variable." msgstr "" -#: src/sfm-read.c:306 +#: src/sfm-read.c:289 #, c-format msgid "%s: Weighting variable may not be a string variable." msgstr "" -#: src/sfm-read.c:331 +#: src/sfm-read.c:314 #, c-format msgid "" "%s: Orphaned variable index record (type 4). Type 4 records must always " "immediately follow type 3 records." msgstr "" -#: src/sfm-read.c:386 +#: src/sfm-read.c:369 #, c-format msgid "%s: Unrecognized record type 7, subtype %d encountered in system file." msgstr "" -#: src/sfm-read.c:410 +#: src/sfm-read.c:393 #, c-format msgid "%s: Unrecognized record type %d." msgstr "" -#: src/sfm-read.c:416 +#: src/sfm-read.c:399 msgid "Read system-file dictionary successfully." msgstr "" -#: src/sfm-read.c:426 +#: src/sfm-read.c:409 msgid "Error reading system-file header." msgstr "" -#: src/sfm-read.c:450 +#: src/sfm-read.c:433 #, c-format msgid "" "%s: Bad size (%d) or count (%d) field on record type 7, subtype 3.\tExpected " "size %d, count 8." msgstr "" -#: src/sfm-read.c:462 +#: src/sfm-read.c:445 #, c-format msgid "" "%s: Floating-point representation in system file is not IEEE-754. PSPP " "cannot convert between floating-point formats." msgstr "" -#: src/sfm-read.c:477 +#: src/sfm-read.c:460 #, c-format msgid "" "%s: File-indicated endianness (%s) does not match endianness intuited from " "file header (%s)." msgstr "" -#: src/sfm-read.c:479 src/sfm-read.c:480 +#: src/sfm-read.c:462 src/sfm-read.c:463 msgid "big-endian" msgstr "" -#: src/sfm-read.c:479 src/sfm-read.c:480 +#: src/sfm-read.c:462 src/sfm-read.c:463 msgid "little-endian" msgstr "" -#: src/sfm-read.c:481 +#: src/sfm-read.c:464 msgid "unknown" msgstr "" -#: src/sfm-read.c:485 +#: src/sfm-read.c:468 #, c-format msgid "%s: File-indicated character representation code (%s) is not ASCII." msgstr "" -#: src/sfm-read.c:487 +#: src/sfm-read.c:470 msgid "DEC Kanji" msgstr "" -#: src/sfm-read.c:506 +#: src/sfm-read.c:489 #, c-format msgid "" "%s: Bad size (%d) or count (%d) field on record type 7, subtype 4.\tExpected " "size %d, count 8." msgstr "" -#: src/sfm-read.c:521 +#: src/sfm-read.c:504 #, c-format msgid "" "%s: File-indicated value is different from internal value for at least one " @@ -4364,316 +4235,316 @@ msgid "" "%g; LOWEST: %g, %g." msgstr "" -#: src/sfm-read.c:565 +#: src/sfm-read.c:535 #, c-format msgid "" "%s: Bad magic. Proper system files begin with the four characters `$FL2'. " "This file will not be read." msgstr "" -#: src/sfm-read.c:608 +#: src/sfm-read.c:578 #, c-format msgid "" "%s: File layout code has unexpected value %d. Value should be 2, in big-" "endian or little-endian format." msgstr "" -#: src/sfm-read.c:624 +#: src/sfm-read.c:594 #, c-format msgid "%s: Number of elements per case (%d) is not between 1 and %d." msgstr "" -#: src/sfm-read.c:631 +#: src/sfm-read.c:601 #, c-format msgid "" "%s: Index of weighting variable (%d) is not between 0 and number of elements " "per case (%d)." msgstr "" -#: src/sfm-read.c:637 +#: src/sfm-read.c:607 #, c-format msgid "%s: Number of cases in file (%ld) is not between -1 and %d." msgstr "" -#: src/sfm-read.c:642 +#: src/sfm-read.c:612 #, c-format msgid "%s: Compression bias (%g) is not the usual value of 100." msgstr "" -#: src/sfm-read.c:739 +#: src/sfm-read.c:705 #, c-format msgid "%s: position %d: Bad record type (%d); the expected value was 2." msgstr "" -#: src/sfm-read.c:748 +#: src/sfm-read.c:714 #, c-format msgid "" "%s: position %d: String variable does not have proper number of continuation " "records." msgstr "" -#: src/sfm-read.c:756 +#: src/sfm-read.c:722 #, c-format msgid "%s: position %d: Superfluous long string continuation record." msgstr "" -#: src/sfm-read.c:761 +#: src/sfm-read.c:727 #, c-format msgid "%s: position %d: Bad variable type code %d." msgstr "" -#: src/sfm-read.c:764 +#: src/sfm-read.c:730 #, c-format msgid "%s: position %d: Variable label indicator field is not 0 or 1." msgstr "" -#: src/sfm-read.c:768 +#: src/sfm-read.c:734 #, c-format msgid "" "%s: position %d: Missing value indicator field is not -3, -2, 0, 1, 2, or 3." msgstr "" -#: src/sfm-read.c:780 +#: src/sfm-read.c:740 #, c-format msgid "%s: position %d: Variable name begins with invalid character." msgstr "" -#: src/sfm-read.c:783 +#: src/sfm-read.c:743 #, c-format msgid "%s: position %d: Variable name begins with lowercase letter %c." msgstr "" -#: src/sfm-read.c:786 +#: src/sfm-read.c:746 #, c-format msgid "" "%s: position %d: Variable name begins with octothorpe (`#'). Scratch " "variables should not appear in system files." msgstr "" -#: src/sfm-read.c:800 +#: src/sfm-read.c:760 #, c-format msgid "%s: position %d: Variable name character %d is lowercase letter %c." msgstr "" -#: src/sfm-read.c:808 +#: src/sfm-read.c:768 #, c-format msgid "" "%s: position %d: character `\\%03o' (%c) is not valid in a variable name." msgstr "" -#: src/sfm-read.c:849 +#: src/sfm-read.c:776 +#, c-format +msgid "%s: Duplicate variable name `%s' within system file." +msgstr "" + +#: src/sfm-read.c:801 #, c-format msgid "%s: Variable %s indicates variable label of invalid length %d." msgstr "" -#: src/sfm-read.c:865 +#: src/sfm-read.c:817 #, c-format msgid "%s: Long string variable %s may not have missing values." msgstr "" -#: src/sfm-read.c:889 +#: src/sfm-read.c:841 #, c-format msgid "" "%s: String variable %s may not have missing values specified as a range." msgstr "" -#: src/sfm-read.c:926 +#: src/sfm-read.c:878 #, c-format msgid "%s: Long string continuation records omitted at end of dictionary." msgstr "" -#: src/sfm-read.c:929 +#: src/sfm-read.c:881 #, c-format msgid "" "%s: System file header indicates %d variable positions but %d were read from " "file." msgstr "" -#: src/sfm-read.c:939 -#, c-format -msgid "%s: Duplicate variable name `%s' within system file." -msgstr "" - -#: src/sfm-read.c:979 +#: src/sfm-read.c:913 #, c-format msgid "%s: %s variable %s has %s format specifier %s." msgstr "" -#: src/sfm-read.c:1058 +#: src/sfm-read.c:992 #, c-format msgid "" "%s: Variable index record (type 4) does not immediately follow value label " "record (type 3) as it should." msgstr "" -#: src/sfm-read.c:1068 +#: src/sfm-read.c:1002 #, c-format msgid "" "%s: Number of variables associated with a value label (%d) is not between 1 " "and the number of variables (%d)." msgstr "" -#: src/sfm-read.c:1084 +#: src/sfm-read.c:1018 #, c-format msgid "" "%s: Variable index associated with value label (%d) is not between 1 and the " "number of values (%d)." msgstr "" -#: src/sfm-read.c:1091 +#: src/sfm-read.c:1025 #, c-format msgid "" "%s: Variable index associated with value label (%d) refers to a continuation " "of a string variable, not to an actual variable." msgstr "" -#: src/sfm-read.c:1095 +#: src/sfm-read.c:1029 #, c-format msgid "%s: Value labels are not allowed on long string variables (%s)." msgstr "" -#: src/sfm-read.c:1105 +#: src/sfm-read.c:1039 #, c-format msgid "" "%s: Variables associated with value label are not all of identical type. " "Variable %s has %s type, but variable %s has %s type." msgstr "" -#: src/sfm-read.c:1145 +#: src/sfm-read.c:1079 #, c-format msgid "%s: File contains duplicate label for value %g for variable %s." msgstr "" -#: src/sfm-read.c:1148 +#: src/sfm-read.c:1082 #, c-format msgid "%s: File contains duplicate label for value `%.*s' for variable %s." msgstr "" -#: src/sfm-read.c:1184 src/sfm-read.c:1461 +#: src/sfm-read.c:1119 src/sfm-read.c:1394 #, c-format msgid "%s: Reading system file: %s." msgstr "" -#: src/sfm-read.c:1186 src/sfm-read.c:1366 src/sfm-read.c:1407 +#: src/sfm-read.c:1121 src/sfm-read.c:1303 src/sfm-read.c:1344 #, c-format msgid "%s: Unexpected end of file." msgstr "" -#: src/sfm-read.c:1203 +#: src/sfm-read.c:1139 #, c-format msgid "%s: System file contains multiple type 6 (document) records." msgstr "" -#: src/sfm-read.c:1209 +#: src/sfm-read.c:1144 #, c-format msgid "%s: Number of document lines (%ld) must be greater than 0." msgstr "" -#: src/sfm-read.c:1229 +#: src/sfm-read.c:1168 msgid "dictionary:\n" msgstr "" -#: src/sfm-read.c:1238 +#: src/sfm-read.c:1176 msgid "num" msgstr "" -#: src/sfm-read.c:1239 +#: src/sfm-read.c:1177 msgid "str" msgstr "" -#: src/sfm-read.c:1243 +#: src/sfm-read.c:1180 msgid "left" msgstr "" -#: src/sfm-read.c:1243 +#: src/sfm-read.c:1180 msgid "right" msgstr "" -#: src/sfm-read.c:1249 +#: src/sfm-read.c:1186 msgid "none" msgstr "" -#: src/sfm-read.c:1253 +#: src/sfm-read.c:1190 msgid "one" msgstr "" -#: src/sfm-read.c:1257 +#: src/sfm-read.c:1194 msgid "two" msgstr "" -#: src/sfm-read.c:1261 +#: src/sfm-read.c:1198 msgid "three" msgstr "" -#: src/sfm-read.c:1269 +#: src/sfm-read.c:1206 msgid "low" msgstr "" -#: src/sfm-read.c:1273 +#: src/sfm-read.c:1210 msgid "high" msgstr "" -#: src/sfm-read.c:1277 +#: src/sfm-read.c:1214 msgid "range+1" msgstr "" -#: src/sfm-read.c:1281 +#: src/sfm-read.c:1218 msgid "low+1" msgstr "" -#: src/sfm-read.c:1285 +#: src/sfm-read.c:1222 msgid "high+1" msgstr "" -#: src/sfm-read.c:1319 +#: src/sfm-read.c:1256 #, c-format msgid "%s: Error reading file: %s." msgstr "" -#: src/sfm-read.c:1357 +#: src/sfm-read.c:1294 #, c-format msgid "%s: Compressed data is corrupted. Data ends partway through a case." msgstr "" -#: src/sfm-read.c:1463 +#: src/sfm-read.c:1396 #, c-format msgid "%s: Partial record at end of system file." msgstr "" -#: src/sfm-read.c:1501 +#: src/sfm-read.c:1434 msgid "reading as a system file" msgstr "" -#: src/sfm-write.c:113 +#: src/sfm-write.c:96 #, c-format msgid "Cannot write file %s as system file: already opened for %s." msgstr "" -#: src/sfm-write.c:118 +#: src/sfm-write.c:101 #, c-format msgid "%s: Opening system-file handle %s for writing." msgstr "" -#: src/sfm-write.c:128 +#: src/sfm-write.c:111 #, c-format msgid "" "An error occurred while opening \"%s\" for writing as a system file: %s." msgstr "" -#: src/sfm-write.c:181 +#: src/sfm-write.c:164 msgid "Wrote system-file header successfully." msgstr "" -#: src/sfm-write.c:186 +#: src/sfm-write.c:169 msgid "Error writing system-file header." msgstr "" -#: src/sfm-write.c:605 +#: src/sfm-write.c:604 #, c-format msgid "%s: Writing system file: %s." msgstr "" -#: src/sfm-write.c:751 +#: src/sfm-write.c:750 msgid "writing as a system file" msgstr "" @@ -4695,265 +4566,265 @@ msgstr "" msgid "%s: Error removing directory for temporary files: %s." msgstr "" -#: src/sort.c:520 +#: src/sort.c:522 #, c-format msgid "" "Out of memory. Could not allocate room for minimum of %d cases of %d bytes " "each. (PSPP workspace is currently restricted to a maximum of %d KB.)" msgstr "" -#: src/sort.c:532 +#: src/sort.c:534 #, c-format msgid "allocated %d cases == %d bytes\n" msgstr "" -#: src/sort.c:570 +#: src/sort.c:572 #, c-format msgid "%s: Error writing temporary file: %s." msgstr "" -#: src/sort.c:582 +#: src/sort.c:584 #, c-format msgid "SORT: Closing handle %d." msgstr "" -#: src/sort.c:588 src/sort.c:812 +#: src/sort.c:590 src/sort.c:815 #, c-format msgid "%s: Error closing temporary file: %s." msgstr "" -#: src/sort.c:610 src/sort.c:626 +#: src/sort.c:612 src/sort.c:628 #, c-format msgid "SORT: %s: Opening for writing as run %d." msgstr "" -#: src/sort.c:632 +#: src/sort.c:634 #, c-format msgid "%s: Error opening temporary file for reading: %s." msgstr "" -#: src/sort.c:658 src/sort.c:674 +#: src/sort.c:660 src/sort.c:676 #, c-format msgid "%s: Error creating temporary file: %s." msgstr "" -#: src/sort.c:816 src/sort.c:977 src/sort.c:1027 src/sort.c:1197 -#: src/sort.c:1204 +#: src/sort.c:819 src/sort.c:981 src/sort.c:1031 src/sort.c:1203 +#: src/sort.c:1210 #, c-format msgid "%s: Error removing temporary file: %s." msgstr "" -#: src/sort.c:959 +#: src/sort.c:963 msgid "merging runs" msgstr "" -#: src/sort.c:967 +#: src/sort.c:971 #, c-format msgid " into run %d(%d)\n" msgstr "" -#: src/sort.c:986 +#: src/sort.c:990 msgid "Out of memory expanding Huffman priority queue." msgstr "" -#: src/sort.c:1038 +#: src/sort.c:1042 #, c-format msgid "%s: Error creating temporary file for merge: %s." msgstr "" -#: src/sort.c:1066 src/sort.c:1124 +#: src/sort.c:1070 src/sort.c:1130 #, c-format msgid "%s: Error reading temporary file in merge: %s." msgstr "" -#: src/sort.c:1069 src/sort.c:1128 +#: src/sort.c:1073 src/sort.c:1134 #, c-format msgid "%s: Unexpected end of temporary file in merge." msgstr "" -#: src/sort.c:1094 +#: src/sort.c:1099 #, c-format msgid "%s: Error writing temporary file in merge: %s." msgstr "" -#: src/sort.c:1144 src/sort.c:1177 +#: src/sort.c:1150 src/sort.c:1183 #, c-format msgid "%s: Error closing temporary file in merge: %s." msgstr "" -#: src/sort.c:1149 +#: src/sort.c:1155 #, c-format msgid "%s: Error removing temporary file in merge: %s." msgstr "" -#: src/sort.c:1248 +#: src/sort.c:1254 #, c-format msgid "%s: Cannot open sort result file: %s." msgstr "" -#: src/sort.c:1259 +#: src/sort.c:1265 #, c-format msgid "%s: Error reading sort result file: %s." msgstr "" -#: src/sort.c:1262 +#: src/sort.c:1268 #, c-format msgid "%s: Unexpected end of sort result file: %s." msgstr "" -#: src/sort.c:1273 +#: src/sort.c:1279 #, c-format msgid "%s: Error closing sort result file: %s." msgstr "" -#: src/sort.c:1277 +#: src/sort.c:1283 #, c-format msgid "%s: Error removing sort result file: %s." msgstr "" -#: src/sysfile-info.c:98 +#: src/sysfile-info.c:97 msgid "File:" msgstr "" -#: src/sysfile-info.c:100 +#: src/sysfile-info.c:99 msgid "Label:" msgstr "" -#: src/sysfile-info.c:102 +#: src/sysfile-info.c:103 msgid "No label." msgstr "" -#: src/sysfile-info.c:103 +#: src/sysfile-info.c:106 msgid "Created:" msgstr "" -#: src/sysfile-info.c:106 +#: src/sysfile-info.c:109 msgid "Endian:" msgstr "" -#: src/sysfile-info.c:107 +#: src/sysfile-info.c:110 msgid "Big." msgstr "" -#: src/sysfile-info.c:107 +#: src/sysfile-info.c:110 msgid "Little." msgstr "" -#: src/sysfile-info.c:108 +#: src/sysfile-info.c:111 msgid "Variables:" msgstr "" -#: src/sysfile-info.c:111 +#: src/sysfile-info.c:114 msgid "Cases:" msgstr "" -#: src/sysfile-info.c:114 +#: src/sysfile-info.c:117 msgid "Type:" msgstr "" -#: src/sysfile-info.c:115 +#: src/sysfile-info.c:118 msgid "System File." msgstr "" -#: src/sysfile-info.c:116 +#: src/sysfile-info.c:119 msgid "Weight:" msgstr "" -#: src/sysfile-info.c:118 +#: src/sysfile-info.c:123 msgid "Not weighted." msgstr "" -#: src/sysfile-info.c:119 +#: src/sysfile-info.c:125 msgid "Mode:" msgstr "" -#: src/sysfile-info.c:121 +#: src/sysfile-info.c:127 #, c-format msgid "Compression %s." msgstr "" -#: src/sysfile-info.c:121 +#: src/sysfile-info.c:127 msgid "on" msgstr "" -#: src/sysfile-info.c:121 +#: src/sysfile-info.c:127 msgid "off" msgstr "" -#: src/sysfile-info.c:130 src/sysfile-info.c:367 +#: src/sysfile-info.c:136 src/sysfile-info.c:377 msgid "Description" msgstr "" -#: src/sysfile-info.c:131 src/sysfile-info.c:364 +#: src/sysfile-info.c:137 src/sysfile-info.c:374 msgid "Position" msgstr "" -#: src/sysfile-info.c:189 +#: src/sysfile-info.c:196 msgid "The active file does not have a file label." msgstr "" -#: src/sysfile-info.c:192 +#: src/sysfile-info.c:199 msgid "File label:" msgstr "" -#: src/sysfile-info.c:254 +#: src/sysfile-info.c:261 msgid "No variables to display." msgstr "" -#: src/sysfile-info.c:273 +#: src/sysfile-info.c:280 msgid "Macros not supported." msgstr "" -#: src/sysfile-info.c:281 +#: src/sysfile-info.c:290 msgid "The active file dictionary does not contain any documents." msgstr "" -#: src/sysfile-info.c:289 +#: src/sysfile-info.c:299 msgid "Documents in the active file:" msgstr "" -#: src/sysfile-info.c:369 src/sysfile-info.c:527 src/vfm.c:1115 +#: src/sysfile-info.c:379 src/sysfile-info.c:537 src/vfm.c:1095 msgid "Label" msgstr "" -#: src/sysfile-info.c:441 +#: src/sysfile-info.c:451 #, c-format msgid "Format: %s" msgstr "" -#: src/sysfile-info.c:448 +#: src/sysfile-info.c:458 #, c-format msgid "Print Format: %s" msgstr "" -#: src/sysfile-info.c:451 +#: src/sysfile-info.c:461 #, c-format msgid "Write Format: %s" msgstr "" -#: src/sysfile-info.c:459 +#: src/sysfile-info.c:469 msgid "Missing Values: " msgstr "" -#: src/sysfile-info.c:581 +#: src/sysfile-info.c:593 msgid "No vectors defined." msgstr "" -#: src/sysfile-info.c:596 +#: src/sysfile-info.c:608 msgid "Vector" msgstr "" -#: src/tab.c:276 +#: src/tab.c:259 #, c-format msgid "bad vline: x=%d+%d=%d y=(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n" msgstr "" -#: src/tab.c:312 +#: src/tab.c:295 #, c-format msgid "bad hline: x=(%d+%d=%d,%d+%d=%d) y=%d+%d=%d in table size (%d,%d)\n" msgstr "" -#: src/tab.c:352 +#: src/tab.c:335 #, c-format msgid "" "bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n" @@ -4988,7 +4859,7 @@ msgstr "" msgid "%s after: %s\n" msgstr "" -#: src/title.c:132 +#: src/title.c:137 #, c-format msgid "Document entered %s %02d:%02d:%02d by %s (%s):" msgstr "" @@ -5041,163 +4912,158 @@ msgstr "" msgid "(no variable label)" msgstr "" -#: src/vars-prs.c:113 -#, c-format -msgid "%s is not declared as a variable." -msgstr "" - -#: src/vars-prs.c:131 +#: src/vars-prs.c:46 #, c-format msgid "%s is not a variable name." msgstr "" -#: src/vars-prs.c:230 +#: src/vars-prs.c:194 #, c-format msgid "%s TO %s is not valid syntax since %s precedes %s in the dictionary." msgstr "" -#: src/vars-prs.c:239 +#: src/vars-prs.c:204 #, c-format msgid "" "When using the TO keyword to specify several variables, both variables must " "be from the same variable dictionaries, of either ordinary, scratch, or " -"system variables. %s and %s are from different dictionaries." +"system variables. %s is a %s variable, whereas %s is %s." msgstr "" -#: src/vars-prs.c:256 +#: src/vars-prs.c:222 #, c-format msgid "Scratch variables (such as %s) are not allowed here." msgstr "" -#: src/vars-prs.c:279 +#: src/vars-prs.c:245 #, c-format msgid "" "%s is not a numeric variable. It will not be included in the variable list." msgstr "" -#: src/vars-prs.c:285 +#: src/vars-prs.c:248 #, c-format msgid "" "%s is not a string variable. It will not be included in the variable list." msgstr "" -#: src/vars-prs.c:291 +#: src/vars-prs.c:252 #, c-format msgid "" "%s and %s are not the same type. All variables in this variable list must " "be of the same type. %s will be omitted from list." msgstr "" -#: src/vars-prs.c:299 +#: src/vars-prs.c:257 #, c-format msgid "Variable %s appears twice in variable list." msgstr "" -#: src/vars-prs.c:370 +#: src/vars-prs.c:334 msgid "incorrect use of TO convention" msgstr "" -#: src/vars-prs.c:410 +#: src/vars-prs.c:380 msgid "Scratch variables not allowed here." msgstr "" -#: src/vars-prs.c:432 +#: src/vars-prs.c:402 msgid "Prefixes don't match in use of TO convention." msgstr "" -#: src/vars-prs.c:437 +#: src/vars-prs.c:407 msgid "Bad bounds in use of TO convention." msgstr "" -#: src/vector.c:80 +#: src/vector.c:69 #, c-format msgid "Vector name %s is given twice." msgstr "" -#: src/vector.c:86 +#: src/vector.c:75 #, c-format msgid "There is already a vector with name %s." msgstr "" -#: src/vector.c:105 +#: src/vector.c:96 msgid "" "A slash must be used to separate each vector specification when using the " "long form. Commands such as VECTOR A,B=Q1 TO Q20 are not supported." msgstr "" -#: src/vector.c:139 +#: src/vector.c:130 msgid "Vectors must have at least one element." msgstr "" -#: src/vector.c:153 +#: src/vector.c:144 #, c-format msgid "%s%d is too long for a variable name." msgstr "" -#: src/vector.c:195 +#: src/vector.c:184 msgid "" "The syntax for this command does not match the expected syntax for either " "the long form or the short form of VECTOR." msgstr "" -#: src/vfm.c:310 +#: src/vfm.c:293 #, c-format msgid "" "Workspace overflow predicted. Max workspace is currently set to %d KB (%d " "cases at %d bytes each). Paging active file to disk." msgstr "" -#: src/vfm.c:377 +#: src/vfm.c:365 msgid "" msgstr "" -#: src/vfm.c:636 +#: src/vfm.c:612 #, c-format msgid "" "An error occurred attempting to create a temporary file for use as the " "active file: %s." msgstr "" -#: src/vfm.c:654 +#: src/vfm.c:630 #, c-format msgid "" "An error occurred while attempting to read from a temporary file created for " "the active file: %s." msgstr "" -#: src/vfm.c:682 +#: src/vfm.c:658 #, c-format msgid "" "An error occurred while attempting to write to a temporary file used as the " "active file: %s." msgstr "" -#: src/vfm.c:696 +#: src/vfm.c:672 #, c-format msgid "" "An error occurred while attempting to rewind a temporary file used as the " "active file: %s." msgstr "" -#: src/vfm.c:811 +#: src/vfm.c:787 msgid "Virtual memory exhausted. Paging active file to disk." msgstr "" -#: src/vfm.c:814 +#: src/vfm.c:790 #, c-format msgid "" "Workspace limit of %d KB (%d cases at %d bytes each) overflowed. Paging " "active file to disk." msgstr "" -#: src/vfm.c:838 src/vfm.c:875 +#: src/vfm.c:814 src/vfm.c:851 #, c-format msgid "" "An error occurred while attempting to write to a temporary file created as " "the active file, while paging to disk: %s." msgstr "" -#: src/vfm.c:988 +#: src/vfm.c:965 msgid "transform: " msgstr "" @@ -5208,7 +5074,3 @@ msgstr "" #: src/weight.c:66 msgid "The weighting variable may not be scratch." msgstr "" - -#: src/weight.c:106 -msgid "bad weighting variable, canceling\n" -msgstr "" diff --git a/po/pspp.pot b/po/pspp.pot index 77f04838..31d1bb7c 100644 --- a/po/pspp.pot +++ b/po/pspp.pot @@ -1,14 +1,14 @@ -# PSPP A program for statistical analysis of sampled data. -# Copyright (C) 2003 Free Software Foundation, Inc. -# This file is distributed under the General Public License Version 2 -# Ben Pfaff , 2003. +# Message strings for PSPP +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PSPP package. +# Ben Pfaff # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PSPP VERSION\n" -"Report-Msgid-Bugs-To: bugs-gnu-pspp@gnu.org\n" -"POT-Creation-Date: 2003-12-23 11:16+0800\n" +"Project-Id-Version: PSPP 0.3.1\n" +"Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" +"POT-Creation-Date: 2004-01-27 08:20+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,275 +17,275 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: src/crosstabs.q:272 +#: src/crosstabs.q:255 msgid "" "Missing mode REPORT not allowed in general mode. Assuming MISSING=TABLE." msgstr "" -#: src/crosstabs.q:282 +#: src/crosstabs.q:265 msgid "Write mode ALL not allowed in general mode. Assuming WRITE=CELLS." msgstr "" -#: src/crosstabs.q:366 +#: src/crosstabs.q:324 msgid "expecting BY" msgstr "" -#: src/crosstabs.q:439 +#: src/crosstabs.q:391 msgid "VARIABLES must be specified before TABLES." msgstr "" -#: src/crosstabs.q:476 +#: src/crosstabs.q:428 #, c-format msgid "Maximum value (%ld) less than minimum value (%ld)." msgstr "" -#: src/crosstabs.q:937 +#: src/crosstabs.q:865 msgid "Summary." msgstr "" -#: src/crosstabs.q:939 +#: src/crosstabs.q:867 msgid "Cases" msgstr "" -#: src/crosstabs.q:940 src/frequencies.q:997 +#: src/crosstabs.q:868 src/frequencies.q:999 msgid "Valid" msgstr "" -#: src/crosstabs.q:941 src/frequencies.q:1064 +#: src/crosstabs.q:869 src/frequencies.q:1066 msgid "Missing" msgstr "" -#: src/crosstabs.q:942 src/crosstabs.q:1143 src/crosstabs.q:1872 -#: src/frequencies.q:1073 +#: src/crosstabs.q:870 src/crosstabs.q:1071 src/crosstabs.q:1800 +#: src/frequencies.q:1075 msgid "Total" msgstr "" -#: src/crosstabs.q:952 +#: src/crosstabs.q:880 msgid "N" msgstr "" -#: src/crosstabs.q:953 src/frequencies.q:1001 src/frequencies.q:1002 -#: src/frequencies.q:1003 +#: src/crosstabs.q:881 src/frequencies.q:1003 src/frequencies.q:1004 +#: src/frequencies.q:1005 msgid "Percent" msgstr "" -#: src/crosstabs.q:1192 +#: src/crosstabs.q:1120 msgid "count" msgstr "" -#: src/crosstabs.q:1193 +#: src/crosstabs.q:1121 msgid "row %" msgstr "" -#: src/crosstabs.q:1194 +#: src/crosstabs.q:1122 msgid "column %" msgstr "" -#: src/crosstabs.q:1195 +#: src/crosstabs.q:1123 msgid "total %" msgstr "" -#: src/crosstabs.q:1196 +#: src/crosstabs.q:1124 msgid "expected" msgstr "" -#: src/crosstabs.q:1197 +#: src/crosstabs.q:1125 msgid "residual" msgstr "" -#: src/crosstabs.q:1198 +#: src/crosstabs.q:1126 msgid "std. resid." msgstr "" -#: src/crosstabs.q:1199 +#: src/crosstabs.q:1127 msgid "adj. resid." msgstr "" -#: src/crosstabs.q:1232 src/crosstabs.q:1259 src/crosstabs.q:1279 -#: src/crosstabs.q:1300 +#: src/crosstabs.q:1160 src/crosstabs.q:1187 src/crosstabs.q:1207 +#: src/crosstabs.q:1228 msgid "Statistic" msgstr "" -#: src/crosstabs.q:1233 src/crosstabs.q:1260 src/crosstabs.q:1280 -#: src/crosstabs.q:1302 src/frequencies.q:999 src/frequencies.q:1116 -#: src/sysfile-info.c:526 src/vfm.c:1114 +#: src/crosstabs.q:1161 src/crosstabs.q:1188 src/crosstabs.q:1208 +#: src/crosstabs.q:1230 src/frequencies.q:1001 src/frequencies.q:1118 +#: src/sysfile-info.c:536 src/vfm.c:1094 msgid "Value" msgstr "" -#: src/crosstabs.q:1234 +#: src/crosstabs.q:1162 msgid "df" msgstr "" -#: src/crosstabs.q:1236 +#: src/crosstabs.q:1164 msgid "Asymp. Sig. (2-sided)" msgstr "" -#: src/crosstabs.q:1238 +#: src/crosstabs.q:1166 msgid "Exact. Sig. (2-sided)" msgstr "" -#: src/crosstabs.q:1240 +#: src/crosstabs.q:1168 msgid "Exact. Sig. (1-sided)" msgstr "" -#: src/crosstabs.q:1258 src/crosstabs.q:1299 +#: src/crosstabs.q:1186 src/crosstabs.q:1227 msgid "Category" msgstr "" -#: src/crosstabs.q:1261 src/crosstabs.q:1303 +#: src/crosstabs.q:1189 src/crosstabs.q:1231 msgid "Asymp. Std. Error" msgstr "" -#: src/crosstabs.q:1262 src/crosstabs.q:1304 +#: src/crosstabs.q:1190 src/crosstabs.q:1232 msgid "Approx. T" msgstr "" -#: src/crosstabs.q:1263 src/crosstabs.q:1305 +#: src/crosstabs.q:1191 src/crosstabs.q:1233 msgid "Approx. Sig." msgstr "" -#: src/crosstabs.q:1278 +#: src/crosstabs.q:1206 #, c-format msgid " 95%% Confidence Interval" msgstr "" -#: src/crosstabs.q:1281 +#: src/crosstabs.q:1209 msgid "Lower" msgstr "" -#: src/crosstabs.q:1282 +#: src/crosstabs.q:1210 msgid "Upper" msgstr "" -#: src/crosstabs.q:1301 +#: src/crosstabs.q:1229 msgid "Type" msgstr "" -#: src/crosstabs.q:2049 +#: src/crosstabs.q:1977 msgid "Pearson Chi-Square" msgstr "" -#: src/crosstabs.q:2050 +#: src/crosstabs.q:1978 msgid "Likelihood Ratio" msgstr "" -#: src/crosstabs.q:2051 +#: src/crosstabs.q:1979 msgid "Fisher's Exact Test" msgstr "" -#: src/crosstabs.q:2052 +#: src/crosstabs.q:1980 msgid "Continuity Correction" msgstr "" -#: src/crosstabs.q:2053 +#: src/crosstabs.q:1981 msgid "Linear-by-Linear Association" msgstr "" -#: src/crosstabs.q:2090 src/crosstabs.q:2160 src/crosstabs.q:2219 +#: src/crosstabs.q:2018 src/crosstabs.q:2088 src/crosstabs.q:2147 msgid "N of Valid Cases" msgstr "" -#: src/crosstabs.q:2106 src/crosstabs.q:2235 +#: src/crosstabs.q:2034 src/crosstabs.q:2163 msgid "Nominal by Nominal" msgstr "" -#: src/crosstabs.q:2107 src/crosstabs.q:2236 +#: src/crosstabs.q:2035 src/crosstabs.q:2164 msgid "Ordinal by Ordinal" msgstr "" -#: src/crosstabs.q:2108 +#: src/crosstabs.q:2036 msgid "Interval by Interval" msgstr "" -#: src/crosstabs.q:2109 +#: src/crosstabs.q:2037 msgid "Measure of Agreement" msgstr "" -#: src/crosstabs.q:2114 +#: src/crosstabs.q:2042 msgid "Phi" msgstr "" -#: src/crosstabs.q:2115 +#: src/crosstabs.q:2043 msgid "Cramer's V" msgstr "" -#: src/crosstabs.q:2116 +#: src/crosstabs.q:2044 msgid "Contingency Coefficient" msgstr "" -#: src/crosstabs.q:2117 +#: src/crosstabs.q:2045 msgid "Kendall's tau-b" msgstr "" -#: src/crosstabs.q:2118 +#: src/crosstabs.q:2046 msgid "Kendall's tau-c" msgstr "" -#: src/crosstabs.q:2119 +#: src/crosstabs.q:2047 msgid "Gamma" msgstr "" -#: src/crosstabs.q:2120 +#: src/crosstabs.q:2048 msgid "Spearman Correlation" msgstr "" -#: src/crosstabs.q:2121 +#: src/crosstabs.q:2049 msgid "Pearson's R" msgstr "" -#: src/crosstabs.q:2122 +#: src/crosstabs.q:2050 msgid "Kappa" msgstr "" -#: src/crosstabs.q:2192 +#: src/crosstabs.q:2120 #, c-format msgid "Odds Ratio for %s (%g / %g)" msgstr "" -#: src/crosstabs.q:2195 +#: src/crosstabs.q:2123 #, c-format msgid "Odds Ratio for %s (%.*s / %.*s)" msgstr "" -#: src/crosstabs.q:2203 +#: src/crosstabs.q:2131 #, c-format msgid "For cohort %s = %g" msgstr "" -#: src/crosstabs.q:2206 +#: src/crosstabs.q:2134 #, c-format msgid "For cohort %s = %.*s" msgstr "" -#: src/crosstabs.q:2237 +#: src/crosstabs.q:2165 msgid "Nominal by Interval" msgstr "" -#: src/crosstabs.q:2242 +#: src/crosstabs.q:2170 msgid "Lambda" msgstr "" -#: src/crosstabs.q:2243 +#: src/crosstabs.q:2171 msgid "Goodman and Kruskal tau" msgstr "" -#: src/crosstabs.q:2244 +#: src/crosstabs.q:2172 msgid "Uncertainty Coefficient" msgstr "" -#: src/crosstabs.q:2245 +#: src/crosstabs.q:2173 msgid "Somers' d" msgstr "" -#: src/crosstabs.q:2246 +#: src/crosstabs.q:2174 msgid "Eta" msgstr "" -#: src/crosstabs.q:2251 +#: src/crosstabs.q:2179 msgid "Symmetric" msgstr "" -#: src/crosstabs.q:2252 src/crosstabs.q:2253 +#: src/crosstabs.q:2180 src/crosstabs.q:2181 #, c-format msgid "%s Dependent" msgstr "" @@ -402,7 +402,7 @@ msgstr "" msgid "Rng" msgstr "" -#: src/descript.q:167 src/sfm-read.c:1265 +#: src/descript.q:167 src/sfm-read.c:1202 msgid "range" msgstr "" @@ -438,7 +438,7 @@ msgstr "" msgid "sum" msgstr "" -#: src/descript.q:213 src/list.q:159 +#: src/descript.q:213 src/list.q:144 msgid "No variables specified." msgstr "" @@ -451,74 +451,74 @@ msgstr "" msgid "It's not possible to sort on `%s' without displaying `%s'." msgstr "" -#: src/descript.q:296 +#: src/descript.q:295 msgid "" "At least one case in the data file had a weight value that was system-" "missing, zero, or negative. These case(s) were ignored." msgstr "" -#: src/descript.q:337 +#: src/descript.q:336 msgid "" "Names for z-score variables must be given for individual variables, not for " "groups of variables." msgstr "" -#: src/descript.q:345 +#: src/descript.q:344 msgid "Name for z-score variable expected." msgstr "" -#: src/descript.q:350 +#: src/descript.q:349 #, c-format msgid "" "Z-score variable name `%s' is a duplicate variable name with a current " "variable." msgstr "" -#: src/descript.q:359 +#: src/descript.q:358 #, c-format msgid "Z-score variable name `%s' is used multiple times." msgstr "" -#: src/descript.q:367 +#: src/descript.q:366 msgid "`)' expected after z-score variable name." msgstr "" -#: src/descript.q:427 +#: src/descript.q:426 msgid "" "Ran out of generic names for Z-score variables. There are only 126 generic " "names: ZSC001-ZSC0999, STDZ01-STDZ09, ZZZZ01-ZZZZ09, ZQZQ01-ZQZQ09." msgstr "" -#: src/descript.q:456 +#: src/descript.q:455 msgid "Mapping of variables to corresponding Z-scores." msgstr "" -#: src/descript.q:461 +#: src/descript.q:460 msgid "Source" msgstr "" -#: src/descript.q:462 +#: src/descript.q:461 msgid "Target" msgstr "" -#: src/descript.q:549 src/descript.q:555 +#: src/descript.q:548 src/descript.q:554 msgid "Z-score of " msgstr "" -#: src/descript.q:800 src/data-list.c:729 src/data-list.c:865 src/print.c:822 -#: src/sysfile-info.c:129 src/sysfile-info.c:360 src/vfm.c:1113 +#: src/descript.q:792 src/data-list.c:732 src/data-list.c:869 src/print.c:805 +#: src/sysfile-info.c:135 src/sysfile-info.c:370 src/vfm.c:1093 msgid "Variable" msgstr "" -#: src/descript.q:804 +#: src/descript.q:796 msgid "Valid N" msgstr "" -#: src/descript.q:805 +#: src/descript.q:797 msgid "Missing N" msgstr "" -#: src/descript.q:832 +#: src/descript.q:824 #, c-format msgid "Valid cases = %g; cases with missing value(s) = %g." msgstr "" @@ -530,11 +530,11 @@ msgid "" "possible to redefine a file handle within a session." msgstr "" -#: src/file-handle.q:88 src/autorecode.c:121 src/command.c:712 -#: src/compute.c:359 src/data-list.c:386 src/data-list.c:838 -#: src/data-list.c:1641 src/do-if.c:265 src/get.c:435 src/lexer.c:384 -#: src/loop.c:248 src/matrix-data.c:526 src/print.c:357 src/print.c:1098 -#: src/recode.c:409 src/sel-if.c:56 src/sel-if.c:136 src/vector.c:208 +#: src/file-handle.q:88 src/autorecode.c:121 src/command.c:696 +#: src/compute.c:284 src/data-list.c:372 src/data-list.c:842 +#: src/data-list.c:1645 src/do-if.c:264 src/get.c:359 src/lexer.c:384 +#: src/loop.c:248 src/matrix-data.c:506 src/print.c:340 src/print.c:1081 +#: src/recode.c:409 src/sel-if.c:56 src/sel-if.c:136 src/vector.c:197 msgid "expecting end of command" msgstr "" @@ -555,36 +555,28 @@ msgid "" "assumed." msgstr "" -#: src/file-handle.q:125 -msgid "" -"/RECFORM SPANNED is not implemented, as the author doesn't know what it is " -"supposed to do. Send the author a note." -msgstr "" - -#: src/file-handle.q:138 +#: src/file-handle.q:126 src/file-handle.q:140 +#, c-format msgid "" -"/MODE IMAGE is not implemented, as the author doesn't know what it is " -"supposed to do. Send the author a note." +"%s is not implemented, as the author doesn't know what it is supposed to " +"do. Send a note to %s." msgstr "" -#: src/file-handle.q:145 -msgid "/MODE MULTIPUNCH is not implemented. If you care, complain." -msgstr "" - -#: src/file-handle.q:149 -msgid "/MODE 360 is not implemented. If you care, complain." +#: src/file-handle.q:147 src/file-handle.q:150 +#, c-format +msgid "%s is not implemented. If you care, complain." msgstr "" -#: src/file-handle.q:231 +#: src/file-handle.q:232 #, c-format msgid "File handle `%s' has not been previously declared on FILE HANDLE." msgstr "" -#: src/file-handle.q:318 +#: src/file-handle.q:319 msgid "" msgstr "" -#: src/file-handle.q:337 +#: src/file-handle.q:338 msgid "expecting a file name or handle" msgstr "" @@ -596,121 +588,121 @@ msgstr "" msgid "Mode" msgstr "" -#: src/frequencies.q:269 +#: src/frequencies.q:268 msgid "" "At most one of BARCHART, HISTOGRAM, or HBAR should be given. HBAR will be " "assumed. Argument values will be given precedence increasing along the " "order given." msgstr "" -#: src/frequencies.q:350 +#: src/frequencies.q:349 #, c-format msgid "" "MAX must be greater than or equal to MIN, if both are specified. However, " "MIN was specified as %g and MAX as %g. MIN and MAX will be ignored." msgstr "" -#: src/frequencies.q:628 +#: src/frequencies.q:627 msgid "" "Upper limit of integer mode value range must be greater than lower limit." msgstr "" -#: src/frequencies.q:640 +#: src/frequencies.q:639 #, c-format msgid "Variable %s specified multiple times on VARIABLES subcommand." msgstr "" -#: src/frequencies.q:653 +#: src/frequencies.q:652 #, c-format msgid "Integer mode specified, but %s is not a numeric variable." msgstr "" -#: src/frequencies.q:713 +#: src/frequencies.q:714 msgid "`)' expected after GROUPED interval list." msgstr "" -#: src/frequencies.q:723 +#: src/frequencies.q:724 #, c-format msgid "Variables %s specified on GROUPED but not on VARIABLES." msgstr "" -#: src/frequencies.q:726 +#: src/frequencies.q:727 #, c-format msgid "Variables %s specified multiple times on GROUPED subcommand." msgstr "" -#: src/frequencies.q:785 +#: src/frequencies.q:787 msgid "Percentile list expected after PERCENTILES." msgstr "" -#: src/frequencies.q:793 +#: src/frequencies.q:795 msgid "Percentiles must be greater than 0 and less than 100." msgstr "" -#: src/frequencies.q:998 src/frequencies.q:1088 src/frequencies.q:1089 -#: src/frequencies.q:1119 +#: src/frequencies.q:1000 src/frequencies.q:1090 src/frequencies.q:1091 +#: src/frequencies.q:1121 msgid "Cum" msgstr "" -#: src/frequencies.q:1000 +#: src/frequencies.q:1002 msgid "Frequency" msgstr "" -#: src/frequencies.q:1019 +#: src/frequencies.q:1021 msgid "Value Label" msgstr "" -#: src/frequencies.q:1117 +#: src/frequencies.q:1119 msgid "Freq" msgstr "" -#: src/frequencies.q:1118 src/frequencies.q:1120 +#: src/frequencies.q:1120 src/frequencies.q:1122 msgid "Pct" msgstr "" -#: src/frequencies.q:1275 +#: src/frequencies.q:1277 #, c-format msgid "No valid data for variable %s; statistics not displayed." msgstr "" -#: src/frequencies.q:1298 +#: src/frequencies.q:1300 msgid "Percentile" msgstr "" -#: src/list.q:167 +#: src/list.q:152 #, c-format msgid "" "The first case (%ld) specified precedes the last case (%ld) specified. The " "values will be swapped." msgstr "" -#: src/list.q:175 +#: src/list.q:160 #, c-format msgid "" "The first case (%ld) to list is less than 1. The value is being reset to 1." msgstr "" -#: src/list.q:181 +#: src/list.q:166 #, c-format msgid "" "The last case (%ld) to list is less than 1. The value is being reset to 1." msgstr "" -#: src/list.q:187 +#: src/list.q:172 #, c-format msgid "The step value %ld is less than 1. The value is being reset to 1." msgstr "" -#: src/list.q:215 +#: src/list.q:199 msgid "`/FORMAT WEIGHT' specified, but weighting is not on." msgstr "" -#: src/list.q:275 src/html.c:402 +#: src/list.q:259 src/html.c:402 #, c-format msgid "Cannot open first page on HTML device %s." msgstr "" -#: src/list.q:453 +#: src/list.q:445 msgid "Line" msgstr "" @@ -718,48 +710,43 @@ msgstr "" msgid "Missing required subcommand TABLES." msgstr "" -#: src/means.q:153 +#: src/means.q:144 msgid "TABLES or CROSSBREAK subcommand may not appear more than once." msgstr "" -#: src/means.q:201 +#: src/means.q:181 #, c-format msgid "" "Variable %s specified on TABLES or CROSSBREAK, but not specified on " "VARIABLES." msgstr "" -#: src/means.q:215 +#: src/means.q:195 #, c-format msgid "LOWEST and HIGHEST may not be used for independent variables (%s)." msgstr "" -#: src/means.q:223 +#: src/means.q:203 #, c-format msgid "" "Independent variables (%s) may not have noninteger endpoints in their ranges." msgstr "" -#: src/means.q:244 -#, c-format -msgid "Variable %s is multiply specified on TABLES or CROSSBREAK." -msgstr "" - -#: src/means.q:270 +#: src/means.q:236 msgid "VARIABLES must precede TABLES." msgstr "" -#: src/means.q:327 +#: src/means.q:293 #, c-format msgid "Upper value (%g) is less than lower value (%g) on VARIABLES subcommand." msgstr "" -#: src/set.q:216 -msgid "BLOCK is obsolete." -msgstr "" - -#: src/set.q:219 -msgid "BOXSTRING is obsolete." +#: src/set.q:216 src/set.q:219 src/set.q:237 src/set.q:306 src/set.q:312 +#: src/set.q:320 src/set.q:327 src/set.q:329 src/set.q:348 src/set.q:352 +#: src/set.q:356 src/set.q:370 src/set.q:372 src/set.q:376 src/set.q:693 +#: src/set.q:774 src/set.q:855 +#, c-format +msgid "%s is obsolete." msgstr "" #: src/set.q:223 @@ -770,10 +757,6 @@ msgstr "" msgid "CPI must be greater than 0." msgstr "" -#: src/set.q:237 -msgid "HISTOGRAM is obsolete." -msgstr "" - #: src/set.q:241 msgid "LPI must be greater than 0." msgstr "" @@ -802,14 +785,6 @@ msgstr "" msgid "MXLOOPS must be at least 1." msgstr "" -#: src/set.q:306 -msgid "MXMEMORY is obsolete." -msgstr "" - -#: src/set.q:312 -msgid "SCRIPTTAB is obsolete." -msgstr "" - #: src/set.q:314 msgid "TBFONTS not implemented." msgstr "" @@ -818,38 +793,6 @@ msgstr "" msgid "TB1 not implemented." msgstr "" -#: src/set.q:320 -msgid "WORKSPACE is obsolete." -msgstr "" - -#: src/set.q:327 -msgid "AUTOMENU is obsolete." -msgstr "" - -#: src/set.q:329 -msgid "BEEP is obsolete." -msgstr "" - -#: src/set.q:348 -msgid "EJECT is obsolete." -msgstr "" - -#: src/set.q:352 -msgid "HELPWINDOWS is obsolete." -msgstr "" - -#: src/set.q:356 -msgid "MENUS is obsolete." -msgstr "" - -#: src/set.q:370 -msgid "PTRANSLATE is obsolete." -msgstr "" - -#: src/set.q:376 -msgid "XSORT is obsolete." -msgstr "" - #: src/set.q:390 #, c-format msgid "" @@ -899,10 +842,6 @@ msgstr "" msgid "Border color must be in range 0-7." msgstr "" -#: src/set.q:774 -msgid "RCOLOR is obsolete." -msgstr "" - #: src/set.q:786 msgid "Lower window color must be between 0 and 6." msgstr "" @@ -919,91 +858,87 @@ msgstr "" msgid "VIEWLENGTH not implemented." msgstr "" -#: src/set.q:855 -msgid "WORKDEV is obsolete." -msgstr "" - #: src/set.q:864 msgid "Drive letter expected in WORKDEV subcommand." msgstr "" -#: src/t-test.q:469 +#: src/t-test.q:453 msgid "expecting variable name in GROUPS subcommand" msgstr "" -#: src/t-test.q:474 +#: src/t-test.q:458 #, c-format msgid "Long string variable %s is not valid here." msgstr "" -#: src/t-test.q:490 +#: src/t-test.q:474 msgid "" "When applying GROUPS to a string variable, at least one value must be " "specified." msgstr "" -#: src/t-test.q:580 +#: src/t-test.q:565 #, c-format msgid "" "PAIRED was specified but the number of variables preceding WITH (%d) did not " "match the number following (%d)." msgstr "" -#: src/t-test.q:596 +#: src/t-test.q:581 msgid "At least two variables must be specified on PAIRS." msgstr "" -#: src/aggregate.c:189 +#: src/aggregate.c:188 msgid "OUTFILE specified multiple times." msgstr "" -#: src/aggregate.c:215 +#: src/aggregate.c:214 msgid "while expecting COLUMNWISE" msgstr "" -#: src/aggregate.c:230 +#: src/aggregate.c:229 msgid "BREAK specified multiple times." msgstr "" -#: src/aggregate.c:259 +#: src/aggregate.c:258 msgid "BREAK subcommand not specified." msgstr "" -#: src/aggregate.c:502 +#: src/aggregate.c:494 msgid "expecting aggregation function" msgstr "" -#: src/aggregate.c:518 +#: src/aggregate.c:510 #, c-format msgid "Unknown aggregation function %s." msgstr "" -#: src/aggregate.c:533 +#: src/aggregate.c:525 msgid "expecting `('" msgstr "" -#: src/aggregate.c:568 +#: src/aggregate.c:560 #, c-format msgid "Missing argument %d to %s." msgstr "" -#: src/aggregate.c:576 +#: src/aggregate.c:568 #, c-format msgid "Arguments to %s must be of same type as source variables." msgstr "" -#: src/aggregate.c:586 src/expr-prs.c:665 +#: src/aggregate.c:578 src/expr-prs.c:664 msgid "expecting `)'" msgstr "" -#: src/aggregate.c:598 src/autorecode.c:110 +#: src/aggregate.c:590 src/autorecode.c:110 #, c-format msgid "" "Number of source variables (%d) does not match number of target variables (%" "d)." msgstr "" -#: src/aggregate.c:669 +#: src/aggregate.c:657 #, c-format msgid "" "Variable name %s is not unique within the aggregate file dictionary, which " @@ -1015,17 +950,17 @@ msgstr "" msgid "Variable %s is %s in target file, but %s in source file." msgstr "" -#: src/apply-dict.c:71 src/apply-dict.c:72 src/expr-prs.c:1124 -#: src/expr-prs.c:1469 src/expr-prs.c:1485 src/formats.c:103 -#: src/pfm-read.c:653 src/print.c:717 src/sfm-read.c:982 src/sfm-read.c:1108 -#: src/sfm-read.c:1109 +#: src/apply-dict.c:71 src/apply-dict.c:72 src/expr-prs.c:1127 +#: src/expr-prs.c:1472 src/expr-prs.c:1488 src/formats.c:103 +#: src/pfm-read.c:636 src/print.c:700 src/sfm-read.c:916 src/sfm-read.c:1042 +#: src/sfm-read.c:1043 msgid "string" msgstr "" -#: src/apply-dict.c:71 src/apply-dict.c:72 src/expr-prs.c:1124 -#: src/expr-prs.c:1466 src/expr-prs.c:1483 src/formats.c:103 -#: src/pfm-read.c:653 src/print.c:717 src/sfm-read.c:982 src/sfm-read.c:1108 -#: src/sfm-read.c:1109 +#: src/apply-dict.c:71 src/apply-dict.c:72 src/expr-prs.c:1127 +#: src/expr-prs.c:1469 src/expr-prs.c:1486 src/formats.c:103 +#: src/pfm-read.c:636 src/print.c:700 src/sfm-read.c:916 src/sfm-read.c:1042 +#: src/sfm-read.c:1043 msgid "numeric" msgstr "" @@ -1040,16 +975,16 @@ msgid "" "Cannot apply missing values from source file to long string variable %s." msgstr "" -#: src/apply-dict.c:162 +#: src/apply-dict.c:163 msgid "No matching variables found between the source and target files." msgstr "" -#: src/ascii.c:216 +#: src/ascii.c:218 #, c-format msgid "ASCII driver initializing as `%s'..." msgstr "" -#: src/ascii.c:273 +#: src/ascii.c:276 #, c-format msgid "" "ascii driver: Area of page excluding margins and headers must be at least 59 " @@ -1057,104 +992,104 @@ msgid "" "by %d lines." msgstr "" -#: src/ascii.c:378 src/html.c:102 src/postscript.c:474 +#: src/ascii.c:381 src/html.c:102 src/postscript.c:458 #, c-format msgid "%s: Initialization complete." msgstr "" -#: src/ascii.c:389 src/html.c:114 src/postscript.c:487 +#: src/ascii.c:392 src/html.c:114 src/postscript.c:471 #, c-format msgid "%s: Beginning closing..." msgstr "" -#: src/ascii.c:399 src/html.c:119 src/postscript.c:506 +#: src/ascii.c:402 src/html.c:119 src/postscript.c:490 #, c-format msgid "%s: Finished closing." msgstr "" -#: src/ascii.c:460 +#: src/ascii.c:464 #, c-format msgid "" "Bad index value for `box' key: syntax is box[INDEX], 0 <= INDEX < %d " "decimal, with INDEX expressed in base 4." msgstr "" -#: src/ascii.c:466 +#: src/ascii.c:470 #, c-format msgid "Duplicate value for key `%s'." msgstr "" -#: src/ascii.c:475 +#: src/ascii.c:479 #, c-format msgid "Unknown configuration parameter `%s' for ascii device driver." msgstr "" -#: src/ascii.c:488 +#: src/ascii.c:492 #, c-format msgid "" "Unknown character set `%s'. Valid character sets are `ascii' and `latin1'." msgstr "" -#: src/ascii.c:497 +#: src/ascii.c:501 #, c-format msgid "" "Unknown overstrike style `%s'. Valid overstrike styles are `single' and " "`line'." msgstr "" -#: src/ascii.c:506 +#: src/ascii.c:510 #, c-format msgid "" "Unknown carriage return style `%s'. Valid carriage return styles are `cr' " "and `bs'." msgstr "" -#: src/ascii.c:518 src/postscript.c:696 +#: src/ascii.c:522 src/postscript.c:680 #, c-format msgid "Positive integer required as value for `%s'." msgstr "" -#: src/ascii.c:549 +#: src/ascii.c:553 #, c-format msgid "Zero or positive integer required as value for `%s'." msgstr "" -#: src/ascii.c:619 src/postscript.c:655 +#: src/ascii.c:623 src/postscript.c:639 #, c-format msgid "Boolean value expected for %s." msgstr "" -#: src/ascii.c:648 src/ascii.c:663 src/ascii.c:680 +#: src/ascii.c:655 src/ascii.c:670 src/ascii.c:687 #, c-format msgid "ASCII output driver: %s: %s" msgstr "" -#: src/ascii.c:749 +#: src/ascii.c:756 #, c-format msgid "ascii_line_horz: bad hline (%d,%d),%d out of (%d,%d)\n" msgstr "" -#: src/ascii.c:783 +#: src/ascii.c:790 #, c-format msgid "ascii_line_vert: bad vline %d,(%d,%d) out of (%d,%d)\n" msgstr "" -#: src/ascii.c:813 +#: src/ascii.c:820 #, c-format msgid "ascii_line_intersection: bad intsct (%d,%d) out of (%d,%d)\n" msgstr "" -#: src/ascii.c:975 +#: src/ascii.c:968 #, c-format msgid "%s: horiz=%d, vert=%d\n" msgstr "" -#: src/ascii.c:1147 +#: src/ascii.c:1140 #, c-format msgid "Writing `%s': %s" msgstr "" -#: src/ascii.c:1541 src/postscript.c:2124 +#: src/ascii.c:1541 src/postscript.c:2095 #, c-format msgid "%s - Page %d" msgstr "" @@ -1169,19 +1104,12 @@ msgstr "" msgid "Duplicate variable name %s among target variables." msgstr "" -#: src/cmdline.c:111 -msgid "-f not yet implemented\n" -msgstr "" - -#: src/cmdline.c:129 -msgid "-n not yet implemented\n" -msgstr "" - -#: src/cmdline.c:140 -msgid "-p not yet implemented\n" +#: src/cmdline.c:112 src/cmdline.c:131 src/cmdline.c:143 src/command.c:196 +#, c-format +msgid "%s is not yet implemented." msgstr "" -#: src/cmdline.c:153 +#: src/cmdline.c:157 msgid "" "\n" "Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.\n" @@ -1191,7 +1119,7 @@ msgid "" "Written by Ben Pfaff ." msgstr "" -#: src/cmdline.c:213 +#: src/cmdline.c:217 #, c-format msgid "" "PSPP, a program for statistical analysis of sample data.\n" @@ -1235,37 +1163,32 @@ msgid "" "\n" msgstr "" -#: src/cmdline.c:245 +#: src/cmdline.c:249 #, c-format msgid "" "\n" "Report bugs to <%s>.\n" msgstr "" -#: src/command.c:159 +#: src/command.c:134 #, c-format msgid "%s not allowed inside FILE TYPE/END FILE TYPE." msgstr "" -#: src/command.c:163 +#: src/command.c:138 #, c-format msgid "%s not allowed inside FILE TYPE GROUPED/END FILE TYPE." msgstr "" -#: src/command.c:166 +#: src/command.c:141 msgid "RECORD TYPE must be the first command inside a FILE TYPE structure." msgstr "" -#: src/command.c:211 +#: src/command.c:186 msgid "This line does not begin with a valid command name." msgstr "" -#: src/command.c:221 -#, c-format -msgid "%s is not yet implemented." -msgstr "" - -#: src/command.c:239 +#: src/command.c:214 #, c-format msgid "" "%s is not allowed (1) before a command to specify the input program, such as " @@ -1273,106 +1196,106 @@ msgid "" "PROGRAM and END INPUT PROGRAM." msgstr "" -#: src/command.c:243 +#: src/command.c:218 #, c-format msgid "%s is not allowed within an input program." msgstr "" -#: src/command.c:244 src/command.c:245 +#: src/command.c:219 src/command.c:220 #, c-format msgid "%s is only allowed within an input program." msgstr "" -#: src/command.c:254 +#: src/command.c:229 #, c-format msgid "%s command beginning\n" msgstr "" -#: src/command.c:290 +#: src/command.c:265 #, c-format msgid "" "%s command completed\n" "\n" msgstr "" -#: src/command.c:305 +#: src/command.c:280 msgid "The identifier(s) specified do not form a valid command name:" msgstr "" -#: src/command.c:308 +#: src/command.c:283 msgid "The identifier(s) specified do not form a complete command name:" msgstr "" -#: src/command.c:432 +#: src/command.c:407 msgid "" "This command is not accepted in a syntax file. Instead, use FINISH to " "terminate a syntax file." msgstr "" -#: src/command.c:450 +#: src/command.c:425 msgid "" "This command is not executed in interactive mode. Instead, PSPP drops down " "to the command prompt. Use EXIT if you really want to quit." msgstr "" -#: src/command.c:541 +#: src/command.c:516 msgid "The sentinel may not be the empty string." msgstr "" -#: src/command.c:599 src/command.c:730 +#: src/command.c:573 msgid "This command not allowed when the SAFER option is set." msgstr "" -#: src/command.c:612 +#: src/command.c:596 #, c-format msgid "Error removing `%s': %s." msgstr "" -#: src/command.c:662 +#: src/command.c:646 #, c-format msgid "Couldn't fork: %s." msgstr "" -#: src/command.c:703 +#: src/command.c:687 #, c-format msgid "Error executing command: %s." msgstr "" -#: src/command.c:753 +#: src/command.c:733 msgid "No operating system support for this command." msgstr "" -#: src/command.c:782 +#: src/command.c:762 msgid "This command is not valid in a syntax file." msgstr "" -#: src/compute.c:138 src/compute.c:184 src/compute.c:290 src/compute.c:327 +#: src/compute.c:141 src/compute.c:200 #, c-format msgid "" "When executing COMPUTE: SYSMIS is not a valid value as an index into vector %" "s." msgstr "" -#: src/compute.c:141 src/compute.c:187 src/compute.c:293 src/compute.c:330 +#: src/compute.c:144 src/compute.c:204 #, c-format msgid "" "When executing COMPUTE: %g is not a valid value as an index into vector %s." msgstr "" -#: src/compute.c:420 +#: src/compute.c:343 #, c-format msgid "There is no vector named %s." msgstr "" -#: src/compute.c:469 +#: src/compute.c:449 msgid "Extra characters after expression." msgstr "" -#: src/count.c:187 +#: src/count.c:172 msgid "Destination cannot be a string variable." msgstr "" -#: src/count.c:297 +#: src/count.c:286 #, c-format msgid "" "%g THRU %g is not a valid range. The number following THRU must be at least " @@ -1422,428 +1345,429 @@ msgstr "" msgid "Unrecognized character in field." msgstr "" -#: src/data-in.c:337 src/data-in.c:586 +#: src/data-in.c:337 src/data-in.c:587 msgid "Field must have even length." msgstr "" -#: src/data-in.c:347 src/data-in.c:596 +#: src/data-in.c:347 src/data-in.c:597 msgid "Field must contain only hex digits." msgstr "" -#: src/data-in.c:384 +#: src/data-in.c:385 +#, c-format msgid "" "Quality of zoned decimal (Z) input format code is suspect. Check your " -"results three times, report bugs to author." +"results three times. Report bugs to %s." msgstr "" -#: src/data-in.c:396 +#: src/data-in.c:397 msgid "Zoned decimal field contains fewer than 2 characters." msgstr "" -#: src/data-in.c:404 +#: src/data-in.c:405 msgid "Bad sign byte in zoned decimal number." msgstr "" -#: src/data-in.c:421 +#: src/data-in.c:422 msgid "Format error in zoned decimal number." msgstr "" -#: src/data-in.c:435 +#: src/data-in.c:436 msgid "Error in syntax of zoned decimal number." msgstr "" -#: src/data-in.c:636 +#: src/data-in.c:637 msgid "Unexpected end of field." msgstr "" -#: src/data-in.c:662 +#: src/data-in.c:663 msgid "Digit expected in field." msgstr "" -#: src/data-in.c:687 +#: src/data-in.c:688 #, c-format msgid "Day (%ld) must be between 1 and 31." msgstr "" -#: src/data-in.c:712 +#: src/data-in.c:713 msgid "Delimiter expected between fields in date." msgstr "" -#: src/data-in.c:809 +#: src/data-in.c:810 #, c-format msgid "Month (%ld) must be between 1 and 12." msgstr "" -#: src/data-in.c:850 +#: src/data-in.c:851 #, c-format msgid "Month (%s) must be between I and XII." msgstr "" -#: src/data-in.c:877 +#: src/data-in.c:878 #, c-format msgid "Month name (%s...) is too long." msgstr "" -#: src/data-in.c:888 +#: src/data-in.c:889 #, c-format msgid "Bad month name (%s)." msgstr "" -#: src/data-in.c:904 +#: src/data-in.c:905 #, c-format msgid "Year (%ld) must be between 1582 and 19999." msgstr "" -#: src/data-in.c:915 +#: src/data-in.c:916 #, c-format msgid "Trailing garbage \"%s\" following date." msgstr "" -#: src/data-in.c:930 +#: src/data-in.c:931 #, c-format msgid "Julian day (%d) must be between 1 and 366." msgstr "" -#: src/data-in.c:942 +#: src/data-in.c:943 #, c-format msgid "Year (%d) must be between 1582 and 19999." msgstr "" -#: src/data-in.c:958 +#: src/data-in.c:959 #, c-format msgid "Quarter (%ld) must be between 1 and 4." msgstr "" -#: src/data-in.c:968 +#: src/data-in.c:969 msgid "`Q' expected between quarter and year." msgstr "" -#: src/data-in.c:984 +#: src/data-in.c:985 #, c-format msgid "Week (%ld) must be between 1 and 53." msgstr "" -#: src/data-in.c:995 +#: src/data-in.c:996 msgid "`WK' expected between week and year." msgstr "" -#: src/data-in.c:1018 +#: src/data-in.c:1019 msgid "Delimiter expected between fields in time." msgstr "" -#: src/data-in.c:1030 +#: src/data-in.c:1031 #, c-format msgid "Hour (%ld) must be positive." msgstr "" -#: src/data-in.c:1042 +#: src/data-in.c:1043 #, c-format msgid "Minute (%ld) must be between 0 and 59." msgstr "" -#: src/data-in.c:1089 +#: src/data-in.c:1090 #, c-format msgid "Hour (%ld) must be between 0 and 23." msgstr "" -#: src/data-in.c:1103 src/data-in.c:1138 +#: src/data-in.c:1104 src/data-in.c:1139 msgid "Day of the week expected in date value." msgstr "" -#: src/data-in.c:1189 +#: src/data-in.c:1190 msgid "Date is not in valid range between 15 Oct 1582 and 31 Dec 19999." msgstr "" -#: src/data-in.c:1511 +#: src/data-in.c:1512 #, c-format msgid "Field too long (%d characters). Truncated after character %d." msgstr "" -#: src/data-list.c:154 +#: src/data-list.c:137 msgid "" "DATA LIST may not use a different file from that specified on its " "surrounding FILE TYPE." msgstr "" -#: src/data-list.c:173 +#: src/data-list.c:156 msgid "The END subcommand may only be specified once." msgstr "" -#: src/data-list.c:209 +#: src/data-list.c:195 msgid "Only one of FIXED, FREE, or LIST may be specified." msgstr "" -#: src/data-list.c:335 src/print.c:318 +#: src/data-list.c:321 src/print.c:301 #, c-format msgid "" "The record number specified, %ld, is before the previous record, %d. Data " "fields must be listed in order of increasing record number." msgstr "" -#: src/data-list.c:367 src/data-list.c:1630 +#: src/data-list.c:353 src/data-list.c:1634 msgid "" "SPSS-like or FORTRAN-like format specification expected after variable names." msgstr "" -#: src/data-list.c:378 src/print.c:350 +#: src/data-list.c:364 src/print.c:333 msgid "" "Variables are specified on records that should not exist according to " "RECORDS subcommand." msgstr "" -#: src/data-list.c:410 src/data-list.c:423 src/print.c:527 src/print.c:540 +#: src/data-list.c:396 src/data-list.c:409 src/print.c:510 src/print.c:523 msgid "Column positions for fields must be positive." msgstr "" -#: src/data-list.c:428 +#: src/data-list.c:414 msgid "The ending column for a field must be greater than the starting column." msgstr "" -#: src/data-list.c:452 src/print.c:568 +#: src/data-list.c:438 src/print.c:551 msgid "A format specifier on this line has extra characters on the end." msgstr "" -#: src/data-list.c:467 src/print.c:584 +#: src/data-list.c:453 src/print.c:567 msgid "The value for number of decimal places must be at least 1." msgstr "" -#: src/data-list.c:481 src/print.c:597 +#: src/data-list.c:467 src/print.c:580 #, c-format msgid "Input format %s doesn't accept decimal places." msgstr "" -#: src/data-list.c:502 src/print.c:617 +#: src/data-list.c:488 src/print.c:600 #, c-format msgid "The %d columns %d-%d can't be evenly divided into %d fields." msgstr "" -#: src/data-list.c:535 src/data-list.c:622 src/data-list.c:821 +#: src/data-list.c:528 src/data-list.c:625 src/data-list.c:825 #, c-format msgid "%s is a duplicate variable name." msgstr "" -#: src/data-list.c:540 +#: src/data-list.c:533 #, c-format msgid "There is already a variable %s of a different type." msgstr "" -#: src/data-list.c:547 +#: src/data-list.c:540 #, c-format msgid "There is already a string variable %s of a different width." msgstr "" -#: src/data-list.c:611 src/print.c:706 +#: src/data-list.c:614 src/print.c:689 msgid "" "The number of format specifications exceeds the number of variable names " "given." msgstr "" -#: src/data-list.c:695 src/print.c:790 +#: src/data-list.c:698 src/print.c:773 msgid "" "There aren't enough format specifications to match the number of variable " "names given." msgstr "" -#: src/data-list.c:730 src/print.c:823 +#: src/data-list.c:733 src/print.c:806 msgid "Record" msgstr "" -#: src/data-list.c:731 src/print.c:824 +#: src/data-list.c:734 src/print.c:807 msgid "Columns" msgstr "" -#: src/data-list.c:732 src/data-list.c:866 src/print.c:825 +#: src/data-list.c:735 src/data-list.c:870 src/print.c:808 msgid "Format" msgstr "" -#: src/data-list.c:755 +#: src/data-list.c:758 #, c-format msgid "Reading %d record from file %s." msgid_plural "Reading %d records from file %s." msgstr[0] "" msgstr[1] "" -#: src/data-list.c:758 +#: src/data-list.c:761 #, c-format msgid "Reading %d record from the command file." msgid_plural "Reading %d records from the command file." msgstr[0] "" msgstr[1] "" -#: src/data-list.c:765 src/data-list.c:766 +#: src/data-list.c:768 src/data-list.c:769 msgid "Occurrence data specifications." msgstr "" -#: src/data-list.c:889 +#: src/data-list.c:893 #, c-format msgid "Reading free-form data from file %s." msgstr "" -#: src/data-list.c:890 +#: src/data-list.c:894 msgid "Reading free-form data from the command file." msgstr "" -#: src/data-list.c:941 src/matrix-data.c:959 +#: src/data-list.c:945 src/matrix-data.c:939 msgid "Scope of string exceeds line." msgstr "" -#: src/data-list.c:1002 +#: src/data-list.c:1006 msgid "Attempt to read past end of file." msgstr "" -#: src/data-list.c:1031 +#: src/data-list.c:1035 msgid "abort in write_case()\n" msgstr "" -#: src/data-list.c:1059 +#: src/data-list.c:1063 #, c-format msgid "Partial case of %d of %d records discarded." msgstr "" -#: src/data-list.c:1108 +#: src/data-list.c:1112 #, c-format msgid "Partial case discarded. The first variable missing was %s." msgstr "" -#: src/data-list.c:1149 +#: src/data-list.c:1153 #, c-format msgid "" "Missing value(s) for all variables from %s onward. These will be filled " "with the system-missing value or blanks, as appropriate." msgstr "" -#: src/data-list.c:1307 +#: src/data-list.c:1311 msgid "" "REPEATING DATA must use the same file as its corresponding DATA LIST or FILE " "TYPE." msgstr "" -#: src/data-list.c:1317 +#: src/data-list.c:1321 msgid "STARTS subcommand given multiple times." msgstr "" -#: src/data-list.c:1341 +#: src/data-list.c:1345 #, c-format msgid "STARTS beginning column (%d) exceeds STARTS ending column (%d)." msgstr "" -#: src/data-list.c:1352 +#: src/data-list.c:1356 msgid "OCCURS subcommand given multiple times." msgstr "" -#: src/data-list.c:1365 +#: src/data-list.c:1369 msgid "LENGTH subcommand given multiple times." msgstr "" -#: src/data-list.c:1378 +#: src/data-list.c:1382 msgid "CONTINUED subcommand given multiple times." msgstr "" -#: src/data-list.c:1397 +#: src/data-list.c:1401 #, c-format msgid "CONTINUED beginning column (%d) exceeds CONTINUED ending column (%d)." msgstr "" -#: src/data-list.c:1411 +#: src/data-list.c:1415 msgid "ID subcommand given multiple times." msgstr "" -#: src/data-list.c:1420 +#: src/data-list.c:1424 #, c-format msgid "ID beginning column (%ld) must be positive." msgstr "" -#: src/data-list.c:1435 +#: src/data-list.c:1439 #, c-format msgid "ID ending column (%ld) must be positive." msgstr "" -#: src/data-list.c:1441 +#: src/data-list.c:1445 #, c-format msgid "ID ending column (%ld) cannot be less than ID beginning column (%d)." msgstr "" -#: src/data-list.c:1480 +#: src/data-list.c:1484 msgid "Missing required specification STARTS." msgstr "" -#: src/data-list.c:1482 +#: src/data-list.c:1486 msgid "Missing required specification OCCURS." msgstr "" -#: src/data-list.c:1489 +#: src/data-list.c:1493 msgid "ID specified without CONTINUED." msgstr "" -#: src/data-list.c:1577 +#: src/data-list.c:1581 msgid "String variable not allowed here." msgstr "" -#: src/data-list.c:1587 +#: src/data-list.c:1591 #, c-format msgid "%s (%d) must be at least 1." msgstr "" -#: src/data-list.c:1593 +#: src/data-list.c:1597 #, c-format msgid "Variable or integer expected for %s." msgstr "" -#: src/data-list.c:1732 +#: src/data-list.c:1736 #, c-format msgid "Mismatched case ID (%s). Expected value was %s." msgstr "" -#: src/data-list.c:1764 +#: src/data-list.c:1768 #, c-format msgid "" -"Variable %s startging in column %d extends beyond physical record length of %" +"Variable %s starting in column %d extends beyond physical record length of %" "d." msgstr "" -#: src/data-list.c:1832 +#: src/data-list.c:1836 #, c-format msgid "Invalid value %d for OCCURS." msgstr "" -#: src/data-list.c:1838 +#: src/data-list.c:1842 #, c-format msgid "Beginning column for STARTS (%d) must be at least 1." msgstr "" -#: src/data-list.c:1846 +#: src/data-list.c:1850 #, c-format msgid "Ending column for STARTS (%d) is less than beginning column (%d)." msgstr "" -#: src/data-list.c:1854 +#: src/data-list.c:1858 #, c-format msgid "Invalid value %d for LENGTH." msgstr "" -#: src/data-list.c:1861 +#: src/data-list.c:1865 #, c-format msgid "Beginning column for CONTINUED (%d) must be at least 1." msgstr "" -#: src/data-list.c:1869 +#: src/data-list.c:1873 #, c-format msgid "Ending column for CONTINUED (%d) is less than beginning column (%d)." msgstr "" -#: src/data-list.c:1892 +#: src/data-list.c:1896 #, c-format msgid "" "Number of repetitions specified on OCCURS (%d) exceed number of repetitions " "available in space on STARTS (%d), and CONTINUED not specified." msgstr "" -#: src/data-list.c:1909 +#: src/data-list.c:1913 #, c-format msgid "Unexpected end of file with %d repetitions remaining out of %d." msgstr "" -#: src/data-out.c:143 src/sfm-read.c:487 src/sysfile-info.c:113 +#: src/data-out.c:143 src/sfm-read.c:470 src/sysfile-info.c:116 msgid "Unknown" msgstr "" @@ -1853,258 +1777,259 @@ msgid "" "missing value." msgstr "" -#: src/data-out.c:361 +#: src/data-out.c:362 +#, c-format msgid "" "Quality of zoned decimal (Z) output format code is suspect. Check your " -"results, report bugs to author." +"results. Report bugs to %s." msgstr "" -#: src/data-out.c:368 +#: src/data-out.c:369 msgid "The system-missing value cannot be output as a zoned decimal number." msgstr "" -#: src/data-out.c:381 +#: src/data-out.c:382 #, c-format msgid "Number %g too big to fit in field with format Z%d.%d." msgstr "" -#: src/data-out.c:773 +#: src/data-out.c:774 #, c-format msgid "Time value %g too large in magnitude to convert to alphanumeric time." msgstr "" -#: src/data-out.c:826 +#: src/data-out.c:827 #, c-format msgid "Weekday index %d does not lie between 1 and 7." msgstr "" -#: src/data-out.c:847 +#: src/data-out.c:848 #, c-format msgid "Month index %d does not lie between 1 and 12." msgstr "" -#: src/data-out.c:959 +#: src/data-out.c:960 #, c-format msgid "" "Year %d cannot be represented in four digits for output formatting purposes." msgstr "" -#: src/dfm.c:90 +#: src/dfm.c:74 #, c-format msgid "%s: Closing data-file handle %s." msgstr "" -#: src/dfm.c:112 +#: src/dfm.c:96 msgid "<>" msgstr "" -#: src/dfm.c:134 +#: src/dfm.c:118 #, c-format msgid "%s: Opening data-file handle %s for reading." msgstr "" -#: src/dfm.c:151 src/dfm.c:168 +#: src/dfm.c:135 src/dfm.c:152 msgid "BEGIN DATA expected." msgstr "" -#: src/dfm.c:188 +#: src/dfm.c:172 #, c-format msgid "An error occurred while opening \"%s\" for reading as a data file: %s." msgstr "" -#: src/dfm.c:217 +#: src/dfm.c:201 #, c-format msgid "%s: Opening data-file handle %s for writing." msgstr "" -#: src/dfm.c:223 +#: src/dfm.c:207 msgid "Cannot open the inline file for writing." msgstr "" -#: src/dfm.c:238 +#: src/dfm.c:222 #, c-format msgid "An error occurred while opening \"%s\" for writing as a data file: %s." msgstr "" -#: src/dfm.c:383 +#: src/dfm.c:367 msgid "" "Unexpected end-of-file while reading data in BEGIN DATA. This probably " "indicates a missing or misformatted END DATA command. END DATA must appear " "by itself on a single line with exactly one space between words." msgstr "" -#: src/dfm.c:416 src/dfm.c:437 +#: src/dfm.c:400 src/dfm.c:421 #, c-format msgid "Error reading file %s: %s." msgstr "" -#: src/dfm.c:440 +#: src/dfm.c:424 #, c-format msgid "%s: Partial record at end of file." msgstr "" -#: src/dfm.c:496 +#: src/dfm.c:482 #, c-format msgid "Cannot read from file %s already opened for %s." msgstr "" -#: src/dfm.c:510 +#: src/dfm.c:496 #, c-format msgid "Attempt to read beyond end-of-file on file %s." msgstr "" -#: src/dfm.c:604 +#: src/dfm.c:590 #, c-format msgid "Cannot write to file %s already opened for %s." msgstr "" -#: src/dfm.c:628 +#: src/dfm.c:614 #, c-format msgid "Error writing file %s: %s." msgstr "" -#: src/dfm.c:671 +#: src/dfm.c:657 msgid "" "This command is not valid here since the current input program does not " "access the inline file." msgstr "" -#: src/dfm.c:678 +#: src/dfm.c:664 msgid "inline file: Opening for reading." msgstr "" -#: src/dfm.c:692 +#: src/dfm.c:678 msgid "Skipping remaining inline data." msgstr "" -#: src/dfm.c:704 +#: src/dfm.c:690 msgid "reading as a data file" msgstr "" -#: src/dfm.c:711 +#: src/dfm.c:697 msgid "writing as a data file" msgstr "" -#: src/do-if.c:119 +#: src/do-if.c:118 msgid "There is no DO IF to match with this ELSE IF." msgstr "" -#: src/do-if.c:124 +#: src/do-if.c:123 msgid "The ELSE command must follow all ELSE IF commands in a DO IF structure." msgstr "" -#: src/do-if.c:147 +#: src/do-if.c:146 msgid "End of command expected." msgstr "" -#: src/do-if.c:165 +#: src/do-if.c:164 msgid "There is no DO IF to match with this ELSE." msgstr "" -#: src/do-if.c:171 +#: src/do-if.c:170 msgid "" "There may be at most one ELSE clause in each DO IF structure. It must be " "the last clause." msgstr "" -#: src/do-if.c:208 +#: src/do-if.c:207 msgid "There is no DO IF to match with this END IF." msgstr "" -#: src/do-if.c:294 +#: src/do-if.c:293 #, c-format msgid "DO IF %d: true\n" msgstr "" -#: src/do-if.c:299 +#: src/do-if.c:298 #, c-format msgid "DO IF %d: false\n" msgstr "" -#: src/do-if.c:304 +#: src/do-if.c:303 #, c-format msgid "DO IF %d: missing\n" msgstr "" -#: src/error.c:130 +#: src/error.c:113 msgid "Terminating NOW due to a fatal error!" msgstr "" -#: src/error.c:207 +#: src/error.c:190 msgid "Terminating execution of syntax file due to error." msgstr "" -#: src/error.c:209 +#: src/error.c:192 #, c-format msgid "Errors (%d) exceeds limit (%d)." msgstr "" -#: src/error.c:212 +#: src/error.c:195 #, c-format msgid "Warnings (%d) exceed limit (%d)." msgstr "" -#: src/error.c:270 +#: src/error.c:253 msgid "fatal" msgstr "" -#: src/error.c:272 src/error.c:279 src/error.c:282 src/expr-prs.c:1460 +#: src/error.c:255 src/error.c:262 src/error.c:265 src/expr-prs.c:1463 msgid "error" msgstr "" -#: src/error.c:273 src/error.c:280 src/error.c:283 +#: src/error.c:256 src/error.c:263 src/error.c:266 msgid "warning" msgstr "" -#: src/error.c:274 src/error.c:284 +#: src/error.c:257 src/error.c:267 msgid "note" msgstr "" -#: src/error.c:276 src/error.c:277 +#: src/error.c:259 src/error.c:260 msgid "installation error" msgstr "" -#: src/expr-evl.c:1181 +#: src/expr-evl.c:1164 msgid "" "A number being treated as a Boolean in an expression was found to have a " "value other than 0 (false), 1 (true), or the system-missing value. The " "result was forced to 0." msgstr "" -#: src/expr-evl.c:1225 +#: src/expr-evl.c:1208 #, c-format msgid "" "SYSMIS is not a valid index value for vector %s. The result will be set to " "SYSMIS." msgstr "" -#: src/expr-evl.c:1229 +#: src/expr-evl.c:1212 #, c-format msgid "" "%g is not a valid index value for vector %s. The result will be set to " "SYSMIS." msgstr "" -#: src/expr-evl.c:1247 +#: src/expr-evl.c:1230 #, c-format msgid "" "SYSMIS is not a valid index value for vector %s. The result will be set to " "the empty string." msgstr "" -#: src/expr-evl.c:1252 +#: src/expr-evl.c:1235 #, c-format msgid "" "%g is not a valid index value for vector %s. The result will be set to the " "empty string." msgstr "" -#: src/expr-evl.c:1357 +#: src/expr-evl.c:1340 #, c-format msgid "evaluate_expression(): not implemented: %s\n" msgstr "" -#: src/expr-evl.c:1360 +#: src/expr-evl.c:1343 #, c-format msgid "evaluate_expression(): not implemented: %d\n" msgstr "" @@ -2137,185 +2062,185 @@ msgid "" "Boolean value was found to have a constant value other than 0, 1, or SYSMIS." msgstr "" -#: src/expr-prs.c:141 +#: src/expr-prs.c:140 msgid "" "A string expression was supplied in a place where a Boolean expression was " "expected." msgstr "" -#: src/expr-prs.c:152 +#: src/expr-prs.c:151 msgid "" "A numeric expression was expected in a place where one was not supplied." msgstr "" -#: src/expr-prs.c:160 +#: src/expr-prs.c:159 msgid "A string expression was expected in a place where one was not supplied." msgstr "" -#: src/expr-prs.c:174 +#: src/expr-prs.c:173 msgid "The OR operator cannot take string operands." msgstr "" -#: src/expr-prs.c:222 +#: src/expr-prs.c:221 msgid "The AND operator cannot take string operands." msgstr "" -#: src/expr-prs.c:271 +#: src/expr-prs.c:270 msgid "The NOT operator cannot take a string operand." msgstr "" -#: src/expr-prs.c:298 +#: src/expr-prs.c:297 msgid "" "Strings cannot be compared with numeric or Boolean values with the " "relational operators = >= > <= < <>." msgstr "" -#: src/expr-prs.c:355 +#: src/expr-prs.c:354 msgid "The `+' and `-' operators may only be used with numeric operands." msgstr "" -#: src/expr-prs.c:407 +#: src/expr-prs.c:406 msgid "The `*' and `/' operators may only be used with numeric operands." msgstr "" -#: src/expr-prs.c:458 +#: src/expr-prs.c:457 msgid "The unary minus (-) operator can only take a numeric operand." msgstr "" -#: src/expr-prs.c:488 +#: src/expr-prs.c:487 msgid "Both operands to the ** operator must be numeric." msgstr "" -#: src/expr-prs.c:582 +#: src/expr-prs.c:581 msgid "Use of $LENGTH is obsolete, returning default of 66." msgstr "" -#: src/expr-prs.c:587 +#: src/expr-prs.c:586 msgid "Use of $WIDTH is obsolete, returning default of 131." msgstr "" -#: src/expr-prs.c:592 +#: src/expr-prs.c:591 #, c-format msgid "Unknown system variable %s." msgstr "" -#: src/expr-prs.c:631 +#: src/expr-prs.c:630 msgid "expecting variable name" msgstr "" -#: src/expr-prs.c:673 +#: src/expr-prs.c:672 msgid "in expression" msgstr "" -#: src/expr-prs.c:850 +#: src/expr-prs.c:853 msgid "Argument 2 to LAG must be a small positive integer constant." msgstr "" -#: src/expr-prs.c:923 src/expr-prs.c:962 +#: src/expr-prs.c:926 src/expr-prs.c:965 #, c-format msgid "" "Type mismatch in argument %d of %s, which was expected to be of %s type. It " "was actually of %s type. " msgstr "" -#: src/expr-prs.c:949 +#: src/expr-prs.c:952 #, c-format msgid "%s cannot take Boolean operands." msgstr "" -#: src/expr-prs.c:981 +#: src/expr-prs.c:984 msgid "in function call" msgstr "" -#: src/expr-prs.c:995 +#: src/expr-prs.c:998 msgid "RANGE requires an odd number of arguments, but at least three." msgstr "" -#: src/expr-prs.c:1005 +#: src/expr-prs.c:1008 #, c-format msgid "%s requires at least two arguments." msgstr "" -#: src/expr-prs.c:1020 +#: src/expr-prs.c:1023 #, c-format msgid "%s.%d requires at least %d arguments." msgstr "" -#: src/expr-prs.c:1062 +#: src/expr-prs.c:1065 #, c-format msgid "" "Argument %d to CONCAT is type %s. All arguments to CONCAT must be strings." msgstr "" -#: src/expr-prs.c:1121 +#: src/expr-prs.c:1124 #, c-format msgid "" "Argument %d to %s was expected to be of %s type. It was actually of type %s." msgstr "" -#: src/expr-prs.c:1140 +#: src/expr-prs.c:1143 #, c-format msgid "%s is not a numeric format." msgstr "" -#: src/expr-prs.c:1166 +#: src/expr-prs.c:1169 #, c-format msgid "Too few arguments to function %s." msgstr "" -#: src/expr-prs.c:1198 +#: src/expr-prs.c:1201 #, c-format msgid "" "Type mismatch in argument %d of %s, which was expected to be numeric. It " "was actually type %s." msgstr "" -#: src/expr-prs.c:1207 +#: src/expr-prs.c:1210 #, c-format msgid "Missing comma following argument %d of %s." msgstr "" -#: src/expr-prs.c:1245 +#: src/expr-prs.c:1248 msgid "The index value after a vector name must be numeric." msgstr "" -#: src/expr-prs.c:1252 +#: src/expr-prs.c:1255 msgid "`)' expected after a vector index value." msgstr "" -#: src/expr-prs.c:1285 +#: src/expr-prs.c:1288 #, c-format msgid "There is no function named %s." msgstr "" -#: src/expr-prs.c:1290 +#: src/expr-prs.c:1293 #, c-format msgid "Function %s may not be given a minimum number of arguments." msgstr "" -#: src/expr-prs.c:1299 +#: src/expr-prs.c:1302 #, c-format msgid "expecting `)' after %s function" msgstr "" -#: src/expr-prs.c:1463 +#: src/expr-prs.c:1466 msgid "Boolean" msgstr "" -#: src/expr-prs.c:1692 +#: src/expr-prs.c:1695 msgid "!!TERMINAL!!" msgstr "" -#: src/expr-prs.c:1718 +#: src/expr-prs.c:1721 msgid "!!SENTINEL!!" msgstr "" -#: src/expr-prs.c:1721 +#: src/expr-prs.c:1724 #, c-format msgid "!!ERROR%d!!" msgstr "" -#: src/expr-prs.c:1739 +#: src/expr-prs.c:1742 msgid "postfix:" msgstr "" @@ -2368,7 +2293,7 @@ msgstr "" msgid "YES or NO expected after ORDERED." msgstr "" -#: src/file-type.c:245 src/file-type.c:550 src/get.c:419 +#: src/file-type.c:245 src/file-type.c:548 src/get.c:343 msgid "while expecting a valid subcommand" msgstr "" @@ -2384,94 +2309,94 @@ msgstr "" msgid "CASE and RECORD must specify different variable names." msgstr "" -#: src/file-type.c:317 +#: src/file-type.c:315 msgid "Column value must be positive." msgstr "" -#: src/file-type.c:332 +#: src/file-type.c:330 msgid "Ending column precedes beginning column." msgstr "" -#: src/file-type.c:351 +#: src/file-type.c:349 msgid "Bad format specifier name." msgstr "" -#: src/file-type.c:412 src/file-type.c:571 +#: src/file-type.c:410 src/file-type.c:569 msgid "" "This command may only appear within a FILE TYPE/END FILE TYPE structure." msgstr "" -#: src/file-type.c:419 +#: src/file-type.c:417 msgid "OTHER may appear only on the last RECORD TYPE command." msgstr "" -#: src/file-type.c:429 +#: src/file-type.c:427 msgid "No input commands (DATA LIST, REPEATING DATA) for above RECORD TYPE." msgstr "" -#: src/file-type.c:483 +#: src/file-type.c:481 msgid "" "The CASE subcommand is not allowed on the RECORD TYPE command for FILE TYPE " "MIXED." msgstr "" -#: src/file-type.c:493 +#: src/file-type.c:491 msgid "" "No variable name may be specified for the CASE subcommand on RECORD TYPE." msgstr "" -#: src/file-type.c:501 +#: src/file-type.c:499 msgid "" "The CASE column specification on RECORD TYPE must give a format specifier " "that is the same type as that of the CASE column specification given on FILE " "TYPE." msgstr "" -#: src/file-type.c:517 +#: src/file-type.c:515 msgid "WARN or NOWARN expected on DUPLICATE subcommand." msgstr "" -#: src/file-type.c:531 +#: src/file-type.c:529 msgid "WARN or NOWARN expected on MISSING subcommand." msgstr "" -#: src/file-type.c:544 +#: src/file-type.c:542 msgid "YES or NO expected on SPREAD subcommand." msgstr "" -#: src/file-type.c:584 +#: src/file-type.c:582 msgid "No input commands (DATA LIST, REPEATING DATA) on above RECORD TYPE." msgstr "" -#: src/file-type.c:591 +#: src/file-type.c:589 msgid "No commands between FILE TYPE and END FILE TYPE." msgstr "" -#: src/file-type.c:656 +#: src/file-type.c:654 #, c-format msgid "Unknown record type \"%.*s\"." msgstr "" -#: src/file-type.c:680 +#: src/file-type.c:678 #, c-format msgid "Unknown record type %g." msgstr "" -#: src/filename.c:238 +#: src/filename.c:221 #, c-format msgid "Searching for `%s'..." msgstr "" -#: src/filename.c:246 src/filename.c:278 +#: src/filename.c:229 src/filename.c:261 msgid "Search unsuccessful!" msgstr "" -#: src/filename.c:271 +#: src/filename.c:254 #, c-format msgid "Found `%s'." msgstr "" -#: src/filename.c:686 +#: src/filename.c:669 #, c-format msgid "Not opening pipe file `%s' because SAFER option set." msgstr "" @@ -2481,131 +2406,131 @@ msgstr "" msgid "Could not create acceptable variant for variable %s." msgstr "" -#: src/flip.c:176 +#: src/flip.c:177 msgid "Cannot create more than 99999 variable names." msgstr "" -#: src/flip.c:290 +#: src/flip.c:293 #, c-format msgid "Error reading FLIP source file: %s." msgstr "" -#: src/flip.c:366 +#: src/flip.c:369 msgid "Could not create temporary file for FLIP." msgstr "" -#: src/flip.c:376 src/flip.c:395 +#: src/flip.c:379 src/flip.c:398 #, c-format msgid "Error writing FLIP file: %s." msgstr "" -#: src/flip.c:431 +#: src/flip.c:434 msgid "Error creating FLIP source file." msgstr "" -#: src/flip.c:434 +#: src/flip.c:437 #, c-format msgid "Error rewinding FLIP file: %s." msgstr "" -#: src/flip.c:443 +#: src/flip.c:446 #, c-format msgid "Error reading FLIP file: %s." msgstr "" -#: src/flip.c:455 +#: src/flip.c:458 #, c-format msgid "Error seeking FLIP source file: %s." msgstr "" -#: src/flip.c:460 +#: src/flip.c:463 #, c-format msgid "Error writing FLIP source file: %s." msgstr "" -#: src/flip.c:468 +#: src/flip.c:471 #, c-format msgid "Error rewind FLIP source file: %s." msgstr "" -#: src/format.c:75 +#: src/format.c:74 msgid "X and T format specifiers not allowed here." msgstr "" -#: src/format.c:81 +#: src/format.c:80 #, c-format msgid "%s is not a valid data format." msgstr "" -#: src/format.c:112 +#: src/format.c:111 #, c-format msgid "Format %s may not be used as an input format." msgstr "" -#: src/format.c:117 +#: src/format.c:116 #, c-format msgid "" "Input format %s specifies a bad width %d. Format %s requires a width " "between %d and %d." msgstr "" -#: src/format.c:124 +#: src/format.c:123 #, c-format msgid "" "Input format %s specifies an odd width %d, but format %s requires an even " "width between %d and %d." msgstr "" -#: src/format.c:131 +#: src/format.c:130 #, c-format msgid "" "Input format %s specifies a bad number of implied decimal places %d. Input " "format %s allows up to 16 implied decimal places." msgstr "" -#: src/format.c:151 +#: src/format.c:150 #, c-format msgid "" "Output format %s specifies a bad width %d. Format %s requires a width " "between %d and %d." msgstr "" -#: src/format.c:161 +#: src/format.c:160 #, c-format msgid "" "Output format %s requires minimum width %d to allow %d decimal places. Try %" "s%d.%d instead of %s." msgstr "" -#: src/format.c:169 +#: src/format.c:168 #, c-format msgid "" "Output format %s specifies an odd width %d, but output format %s requires an " "even width between %d and %d." msgstr "" -#: src/format.c:176 +#: src/format.c:175 #, c-format msgid "" "Output format %s specifies a bad number of implied decimal places %d. " "Output format %s allows a number of implied decimal places between 1 and 16." msgstr "" -#: src/format.c:193 +#: src/format.c:192 #, c-format msgid "Can't display a string variable of width %d with format specifier %s." msgstr "" -#: src/format.c:303 +#: src/format.c:302 msgid "Format specifier expected." msgstr "" -#: src/format.c:314 +#: src/format.c:313 #, c-format msgid "Data format %s does not specify a width." msgstr "" -#: src/format.c:331 +#: src/format.c:330 #, c-format msgid "Data format %s is not valid." msgstr "" @@ -2619,7 +2544,7 @@ msgstr "" msgid "Format %s may not be assigned to a %s variable." msgstr "" -#: src/formats.c:123 src/numeric.c:66 src/numeric.c:140 +#: src/formats.c:123 src/numeric.c:66 src/numeric.c:139 msgid "`)' expected after output format." msgstr "" @@ -2631,20 +2556,20 @@ msgstr "" msgid " Name Print Write\n" msgstr "" -#: src/get.c:124 +#: src/get.c:110 msgid "GET translation table from file to memory:\n" msgstr "" -#: src/get.c:129 src/get.c:1473 +#: src/get.c:115 src/get.c:1398 #, c-format msgid " %8s from %3d,%3d to %3d,%3d\n" msgstr "" -#: src/get.c:425 +#: src/get.c:349 msgid "All variables deleted from system file dictionary." msgstr "" -#: src/get.c:471 +#: src/get.c:396 #, c-format msgid "" "Cannot rename %s as %s because there already exists a variable named %s. To " @@ -2652,106 +2577,106 @@ msgid "" "as \"/RENAME (A=B)(B=C)(C=A)\", or equivalently, \"/RENAME (A B C=B C A)\"." msgstr "" -#: src/get.c:496 +#: src/get.c:421 msgid "`=' expected after variable list." msgstr "" -#: src/get.c:503 +#: src/get.c:428 #, c-format msgid "" -"Number of variables on left side of `=' (%d) do not match number of " +"Number of variables on left side of `=' (%d) does not match number of " "variables on right side (%d), in parenthesized group %d of RENAME subcommand." msgstr "" -#: src/get.c:521 +#: src/get.c:441 #, c-format -msgid "Duplicate variables name %s." +msgid "Requested renaming duplicates variable name %s." msgstr "" -#: src/get.c:544 +#: src/get.c:461 msgid "" "\n" "Variables in dictionary:\n" msgstr "" -#: src/get.c:656 +#: src/get.c:582 msgid "The BY subcommand may be given once at most." msgstr "" -#: src/get.c:723 +#: src/get.c:649 msgid "The active file may not be specified more than once." msgstr "" -#: src/get.c:732 +#: src/get.c:658 msgid "Cannot specify the active file since no active file has been defined." msgstr "" -#: src/get.c:764 +#: src/get.c:690 msgid "" "IN, FIRST, and LAST subcommands may not occur before the first FILE or TABLE." msgstr "" -#: src/get.c:796 +#: src/get.c:722 #, c-format msgid "Multiple %s subcommands for a single FILE or TABLE." msgstr "" -#: src/get.c:806 +#: src/get.c:732 #, c-format msgid "Duplicate variable name %s while creating %s variable." msgstr "" -#: src/get.c:820 +#: src/get.c:746 msgid "" "RENAME, KEEP, and DROP subcommands may not occur before the first FILE or " "TABLE." msgstr "" -#: src/get.c:844 +#: src/get.c:770 msgid "The BY subcommand is required when a TABLE subcommand is given." msgstr "" -#: src/get.c:865 +#: src/get.c:791 #, c-format msgid "File %s lacks BY variable %s." msgstr "" -#: src/get.c:1372 +#: src/get.c:1311 #, c-format msgid "" "Variable %s in file %s (%s) has different type or width from the same " "variable in earlier file (%s)." msgstr "" -#: src/get.c:1424 +#: src/get.c:1360 msgid "expecting COMM or TAPE" msgstr "" -#: src/get.c:1468 +#: src/get.c:1393 msgid "IMPORT translation table from file to memory:\n" msgstr "" -#: src/getline.c:160 +#: src/getline.c:161 #, c-format msgid "Can't find `%s' in include file search path." msgstr "" -#: src/getline.c:315 +#: src/getline.c:316 #, c-format msgid "%s: Opening as syntax file." msgstr "" -#: src/getline.c:320 +#: src/getline.c:321 #, c-format msgid "Opening `%s': %s." msgstr "" -#: src/getline.c:329 src/html.c:330 src/postscript.c:1479 +#: src/getline.c:330 src/html.c:330 src/postscript.c:1463 #, c-format msgid "Reading `%s': %s." msgstr "" -#: src/getline.c:387 +#: src/getline.c:388 #, c-format msgid "Closing `%s': %s." msgstr "" @@ -2777,54 +2702,6 @@ msgstr "" msgid "Assuming screen of size 79x25." msgstr "" -#: src/glob.c:323 -msgid "Jan" -msgstr "" - -#: src/glob.c:323 -msgid "Feb" -msgstr "" - -#: src/glob.c:323 -msgid "Mar" -msgstr "" - -#: src/glob.c:323 -msgid "Apr" -msgstr "" - -#: src/glob.c:323 -msgid "May" -msgstr "" - -#: src/glob.c:323 -msgid "Jun" -msgstr "" - -#: src/glob.c:324 -msgid "Jul" -msgstr "" - -#: src/glob.c:324 -msgid "Aug" -msgstr "" - -#: src/glob.c:324 -msgid "Sep" -msgstr "" - -#: src/glob.c:324 -msgid "Oct" -msgstr "" - -#: src/glob.c:324 -msgid "Nov" -msgstr "" - -#: src/glob.c:324 -msgid "Dec" -msgstr "" - #: src/groff-font.c:107 #, c-format msgid "%s: Opening Groff font file..." @@ -2968,7 +2845,7 @@ msgstr "" msgid "<>" msgstr "" -#: src/hash.c:496 +#: src/hash.c:492 msgid "hash table:" msgstr "" @@ -3002,11 +2879,11 @@ msgstr "" msgid "%s: %s: Opening HTML prologue..." msgstr "" -#: src/html.c:268 src/html.c:279 src/postscript.c:1371 src/postscript.c:1382 +#: src/html.c:268 src/html.c:279 src/postscript.c:1355 src/postscript.c:1366 msgid "nobody" msgstr "" -#: src/html.c:275 src/html.c:280 src/postscript.c:1378 src/postscript.c:1383 +#: src/html.c:275 src/html.c:280 src/postscript.c:1362 src/postscript.c:1367 msgid "nowhere" msgstr "" @@ -3029,31 +2906,31 @@ msgstr "" msgid "Unrecognized filename format." msgstr "" -#: src/inpt-pgm.c:79 +#: src/inpt-pgm.c:83 msgid "No matching INPUT PROGRAM command." msgstr "" -#: src/inpt-pgm.c:84 +#: src/inpt-pgm.c:88 msgid "" "No data-input or transformation commands specified between INPUT PROGRAM and " "END INPUT PROGRAM." msgstr "" -#: src/inpt-pgm.c:300 src/inpt-pgm.c:443 +#: src/inpt-pgm.c:265 src/inpt-pgm.c:408 msgid "" "This command may only be executed between INPUT PROGRAM and END INPUT " "PROGRAM." msgstr "" -#: src/inpt-pgm.c:359 +#: src/inpt-pgm.c:324 msgid "COLUMN subcommand multiply specified." msgstr "" -#: src/inpt-pgm.c:373 +#: src/inpt-pgm.c:338 msgid "expecting file handle name" msgstr "" -#: src/inpt-pgm.c:416 +#: src/inpt-pgm.c:381 msgid "" "REREAD: Column numbers must be positive finite numbers. Column set to 1." msgstr "" @@ -3117,11 +2994,11 @@ msgstr "" msgid "The rest of this command has been discarded." msgstr "" -#: src/lexer.c:822 src/print.c:1191 +#: src/lexer.c:822 src/print.c:1174 msgid "" msgstr "" -#: src/lexer.c:948 src/pfm-read.c:149 src/repeat.c:225 +#: src/lexer.c:948 src/pfm-read.c:132 src/repeat.c:226 msgid "Unexpected end of file." msgstr "" @@ -3210,176 +3087,176 @@ msgid "" "fully executed to this point." msgstr "" -#: src/matrix-data.c:203 +#: src/matrix-data.c:186 msgid "VARIABLES subcommand multiply specified." msgstr "" -#: src/matrix-data.c:218 +#: src/matrix-data.c:201 msgid "VARNAME_ cannot be explicitly specified on VARIABLES." msgstr "" -#: src/matrix-data.c:284 +#: src/matrix-data.c:267 msgid "in FORMAT subcommand" msgstr "" -#: src/matrix-data.c:295 +#: src/matrix-data.c:278 msgid "SPLIT subcommand multiply specified." msgstr "" -#: src/matrix-data.c:302 +#: src/matrix-data.c:285 msgid "in SPLIT subcommand" msgstr "" -#: src/matrix-data.c:311 +#: src/matrix-data.c:294 msgid "Split variable may not be named ROWTYPE_ or VARNAME_." msgstr "" -#: src/matrix-data.c:347 +#: src/matrix-data.c:327 #, c-format msgid "Split variable %s is already another type." msgstr "" -#: src/matrix-data.c:362 +#: src/matrix-data.c:342 msgid "FACTORS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:377 +#: src/matrix-data.c:357 #, c-format msgid "Factor variable %s is already another type." msgstr "" -#: src/matrix-data.c:392 +#: src/matrix-data.c:372 msgid "CELLS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:398 src/matrix-data.c:417 +#: src/matrix-data.c:378 src/matrix-data.c:397 msgid "expecting positive integer" msgstr "" -#: src/matrix-data.c:411 +#: src/matrix-data.c:391 msgid "N subcommand multiply specified." msgstr "" -#: src/matrix-data.c:432 +#: src/matrix-data.c:412 msgid "CONTENTS subcommand multiply specified." msgstr "" -#: src/matrix-data.c:452 +#: src/matrix-data.c:432 msgid "Nested parentheses not allowed." msgstr "" -#: src/matrix-data.c:462 +#: src/matrix-data.c:442 msgid "Mismatched right parenthesis (`(')." msgstr "" -#: src/matrix-data.c:467 +#: src/matrix-data.c:447 msgid "Empty parentheses not allowed." msgstr "" -#: src/matrix-data.c:480 src/matrix-data.c:488 +#: src/matrix-data.c:460 src/matrix-data.c:468 msgid "in CONTENTS subcommand" msgstr "" -#: src/matrix-data.c:495 +#: src/matrix-data.c:475 #, c-format msgid "Content multiply specified for %s." msgstr "" -#: src/matrix-data.c:512 +#: src/matrix-data.c:492 msgid "Missing right parenthesis." msgstr "" -#: src/matrix-data.c:532 +#: src/matrix-data.c:512 msgid "Missing VARIABLES subcommand." msgstr "" -#: src/matrix-data.c:538 +#: src/matrix-data.c:518 msgid "" "CONTENTS subcommand not specified: assuming file contains only CORR matrix." msgstr "" -#: src/matrix-data.c:548 +#: src/matrix-data.c:528 msgid "" "Missing CELLS subcommand. CELLS is required when ROWTYPE_ is not given in " "the data and factors are present." msgstr "" -#: src/matrix-data.c:556 +#: src/matrix-data.c:536 msgid "Split file values must be present in the data when ROWTYPE_ is present." msgstr "" -#: src/matrix-data.c:612 +#: src/matrix-data.c:592 msgid "No continuous variables specified." msgstr "" -#: src/matrix-data.c:1026 +#: src/matrix-data.c:1006 #, c-format msgid "End of line expected %s while reading %s." msgstr "" -#: src/matrix-data.c:1212 +#: src/matrix-data.c:1193 #, c-format msgid "expecting value for %s %s" msgstr "" -#: src/matrix-data.c:1362 +#: src/matrix-data.c:1344 #, c-format msgid "Syntax error expecting SPLIT FILE value %s." msgstr "" -#: src/matrix-data.c:1371 +#: src/matrix-data.c:1353 #, c-format msgid "Expecting value %g for %s." msgstr "" -#: src/matrix-data.c:1410 src/matrix-data.c:1833 +#: src/matrix-data.c:1391 src/matrix-data.c:1820 #, c-format msgid "Syntax error expecting factor value %s." msgstr "" -#: src/matrix-data.c:1419 +#: src/matrix-data.c:1400 #, c-format msgid "Syntax error expecting value %g for %s %s." msgstr "" -#: src/matrix-data.c:1626 +#: src/matrix-data.c:1610 #, c-format msgid "Syntax error %s expecting SPLIT FILE value." msgstr "" -#: src/matrix-data.c:1747 +#: src/matrix-data.c:1734 #, c-format msgid "" "Expected %d lines of data for %s content; actually saw %d lines. No data " "will be output for this content." msgstr "" -#: src/matrix-data.c:1778 +#: src/matrix-data.c:1765 #, c-format msgid "Multiply specified ROWTYPE_ %s." msgstr "" -#: src/matrix-data.c:1783 +#: src/matrix-data.c:1770 #, c-format msgid "Syntax error %s expecting ROWTYPE_ string." msgstr "" -#: src/matrix-data.c:1802 +#: src/matrix-data.c:1789 #, c-format msgid "Syntax error %s." msgstr "" -#: src/matrix-data.c:1948 +#: src/matrix-data.c:1935 #, c-format msgid "Duplicate specification for %s." msgstr "" -#: src/matrix-data.c:1960 +#: src/matrix-data.c:1947 #, c-format msgid "Too many rows of matrix data for %s." msgstr "" -#: src/matrix-data.c:2005 +#: src/matrix-data.c:1992 #, c-format msgid "Syntax error expecting value for %s %s." msgstr "" @@ -3422,7 +3299,7 @@ msgstr "" msgid "String is not of proper length." msgstr "" -#: src/mis-val.c:326 src/repeat.c:483 +#: src/mis-val.c:326 src/repeat.c:484 msgid "String expected." msgstr "" @@ -3443,452 +3320,447 @@ msgstr "" msgid "(!!!INTERNAL ERROR--%d!!!)\n" msgstr "" -#: src/modify-vars.c:115 +#: src/modify-vars.c:108 msgid "REORDER subcommand may be given at most once." msgstr "" -#: src/modify-vars.c:138 +#: src/modify-vars.c:131 msgid "Cannot specify ALL after specifying a set of variables." msgstr "" -#: src/modify-vars.c:148 +#: src/modify-vars.c:141 msgid "`(' expected on REORDER subcommand." msgstr "" -#: src/modify-vars.c:160 +#: src/modify-vars.c:153 msgid "`)' expected following variable names on REORDER subcommand." msgstr "" -#: src/modify-vars.c:193 +#: src/modify-vars.c:171 msgid "RENAME subcommand may be given at most once." msgstr "" -#: src/modify-vars.c:206 +#: src/modify-vars.c:184 msgid "`(' expected on RENAME subcommand." msgstr "" -#: src/modify-vars.c:214 +#: src/modify-vars.c:192 msgid "" "`=' expected between lists of new and old variable names on RENAME " "subcommand." msgstr "" -#: src/modify-vars.c:224 src/rename-vars.c:74 +#: src/modify-vars.c:200 src/rename-vars.c:70 #, c-format msgid "" "Differing number of variables in old name list (%d) and in new name list (%" "d)." msgstr "" -#: src/modify-vars.c:235 +#: src/modify-vars.c:211 msgid "`)' expected after variable lists on RENAME subcommand." msgstr "" -#: src/modify-vars.c:252 +#: src/modify-vars.c:225 msgid "" "KEEP subcommand may be given at most once. It may notbe given in " "conjunction with the DROP subcommand." msgstr "" -#: src/modify-vars.c:291 +#: src/modify-vars.c:267 msgid "" -"DROP subcommand may be given at most once. It may notbe given in " +"DROP subcommand may be given at most once. It may not be given in " "conjunction with the KEEP subcommand." msgstr "" -#: src/modify-vars.c:317 +#: src/modify-vars.c:293 #, c-format msgid "Unrecognized subcommand name `%s'." msgstr "" -#: src/modify-vars.c:319 +#: src/modify-vars.c:295 msgid "Subcommand name expected." msgstr "" -#: src/modify-vars.c:327 +#: src/modify-vars.c:303 msgid "`/' or `.' expected." msgstr "" -#: src/modify-vars.c:494 src/rename-vars.c:124 -#, c-format -msgid "Duplicate variable name `%s' after renaming." -msgstr "" - #: src/numeric.c:59 #, c-format msgid "Format type %s may not be used with a numeric variable." msgstr "" -#: src/numeric.c:79 src/numeric.c:162 src/vector.c:167 +#: src/numeric.c:78 src/numeric.c:161 src/vector.c:158 #, c-format msgid "There is already a variable named %s." msgstr "" -#: src/numeric.c:133 +#: src/numeric.c:132 #, c-format msgid "Format type %s may not be used with a string variable." msgstr "" -#: src/output.c:85 +#: src/output.c:87 msgid "Attempt to iterate driver list reentrantly." msgstr "" -#: src/output.c:162 +#: src/output.c:164 #, c-format msgid "Unknown output driver `%s'." msgstr "" -#: src/output.c:164 +#: src/output.c:166 #, c-format msgid "Output driver `%s' referenced but never defined." msgstr "" -#: src/output.c:294 +#: src/output.c:296 msgid "Cannot find output initialization file. Use `-vv' to view search path." msgstr "" -#: src/output.c:299 +#: src/output.c:301 #, c-format msgid "%s: Opening device description file..." msgstr "" -#: src/output.c:303 src/output.c:1163 src/postscript.c:1113 +#: src/output.c:305 src/output.c:1165 src/postscript.c:1097 #, c-format msgid "Opening %s: %s." msgstr "" -#: src/output.c:314 src/output.c:1174 src/postscript.c:1130 +#: src/output.c:316 src/output.c:1176 src/postscript.c:1114 #, c-format msgid "Reading %s: %s." msgstr "" -#: src/output.c:336 src/output.c:488 +#: src/output.c:338 src/output.c:490 msgid "Syntax error." msgstr "" -#: src/output.c:346 src/postscript.c:1141 +#: src/output.c:348 src/postscript.c:1125 #, c-format msgid "Closing %s: %s." msgstr "" -#: src/output.c:351 +#: src/output.c:353 msgid "No output drivers are active." msgstr "" -#: src/output.c:354 +#: src/output.c:356 msgid "Device definition file read successfully." msgstr "" -#: src/output.c:356 +#: src/output.c:358 msgid "Error reading device definition file." msgstr "" -#: src/output.c:460 +#: src/output.c:462 msgid "" "Driver classes:\n" "\t" msgstr "" -#: src/output.c:589 +#: src/output.c:591 msgid "Syntax error in string constant." msgstr "" -#: src/output.c:620 +#: src/output.c:622 msgid "Syntax error in options." msgstr "" -#: src/output.c:630 +#: src/output.c:632 msgid "Syntax error in options (`=' expected)." msgstr "" -#: src/output.c:637 +#: src/output.c:639 msgid "Syntax error in options (value expected after `=')." msgstr "" -#: src/output.c:709 +#: src/output.c:711 msgid "Driver name expected." msgstr "" -#: src/output.c:730 +#: src/output.c:732 msgid "Class name expected." msgstr "" -#: src/output.c:739 +#: src/output.c:741 #, c-format msgid "Unknown output driver class `%s'." msgstr "" -#: src/output.c:746 +#: src/output.c:748 #, c-format msgid "Can't initialize output driver class `%s'." msgstr "" -#: src/output.c:753 +#: src/output.c:755 #, c-format msgid "Can't initialize output driver `%s' of class `%s'." msgstr "" -#: src/output.c:775 +#: src/output.c:777 #, c-format msgid "Unknown device type `%s'." msgstr "" -#: src/output.c:787 +#: src/output.c:789 #, c-format msgid "Can't complete initialization of output driver `%s' of class `%s'." msgstr "" -#: src/output.c:834 +#: src/output.c:836 #, c-format msgid "Can't deinitialize output driver class `%s'." msgstr "" -#: src/output.c:907 +#: src/output.c:909 #, c-format msgid "Trying to find keyword `%s'...\n" msgstr "" -#: src/output.c:1024 +#: src/output.c:1026 #, c-format msgid "Unit \"%s\" is unknown in dimension \"%s\"." msgstr "" -#: src/output.c:1039 +#: src/output.c:1041 #, c-format msgid "Bad dimension \"%s\"." msgstr "" -#: src/output.c:1065 +#: src/output.c:1067 #, c-format msgid "`x' expected in paper size `%s'." msgstr "" -#: src/output.c:1075 +#: src/output.c:1077 #, c-format msgid "Trailing garbage `%s' on paper size `%s'." msgstr "" -#: src/output.c:1124 +#: src/output.c:1126 msgid "Paper size name must not be empty." msgstr "" -#: src/output.c:1155 +#: src/output.c:1157 msgid "Cannot find `papersize' configuration file." msgstr "" -#: src/output.c:1159 +#: src/output.c:1161 #, c-format msgid "%s: Opening paper size definition file..." msgstr "" -#: src/output.c:1201 +#: src/output.c:1203 msgid "Syntax error in paper size definition." msgstr "" -#: src/output.c:1230 +#: src/output.c:1232 msgid "Paper size definition file read successfully." msgstr "" -#: src/output.c:1232 +#: src/output.c:1234 msgid "Error reading paper size definition file." msgstr "" -#: src/output.c:1301 +#: src/output.c:1303 #, c-format msgid "Error closing page on %s device of %s class." msgstr "" -#: src/output.c:1305 +#: src/output.c:1307 #, c-format msgid "Error opening page on %s device of %s class." msgstr "" -#: src/pfm-read.c:106 +#: src/pfm-read.c:89 #, c-format msgid "portable file %s corrupt at offset %ld: " msgstr "" -#: src/pfm-read.c:125 src/pfm-write.c:501 +#: src/pfm-read.c:108 src/pfm-write.c:501 #, c-format msgid "%s: Closing portable file: %s." msgstr "" -#: src/pfm-read.c:157 +#: src/pfm-read.c:140 msgid "Bad line end." msgstr "" -#: src/pfm-read.c:238 +#: src/pfm-read.c:221 #, c-format msgid "Cannot read file %s as portable file: already opened for %s." msgstr "" -#: src/pfm-read.c:244 +#: src/pfm-read.c:227 #, c-format msgid "%s: Opening portable-file handle %s for reading." msgstr "" -#: src/pfm-read.c:252 +#: src/pfm-read.c:235 #, c-format msgid "" "An error occurred while opening \"%s\" for reading as a portable file: %s." msgstr "" -#: src/pfm-read.c:286 +#: src/pfm-read.c:269 msgid "Data record expected." msgstr "" -#: src/pfm-read.c:288 +#: src/pfm-read.c:271 msgid "Read portable-file dictionary successfully." msgstr "" -#: src/pfm-read.c:297 +#: src/pfm-read.c:280 msgid "Error reading portable-file dictionary." msgstr "" -#: src/pfm-read.c:395 +#: src/pfm-read.c:378 msgid "Missing numeric terminator." msgstr "" -#: src/pfm-read.c:432 +#: src/pfm-read.c:415 msgid "Bad integer format." msgstr "" -#: src/pfm-read.c:462 +#: src/pfm-read.c:445 #, c-format msgid "Bad string length %d." msgstr "" -#: src/pfm-read.c:561 +#: src/pfm-read.c:544 #, c-format msgid "Bad date string length %d." msgstr "" -#: src/pfm-read.c:565 +#: src/pfm-read.c:548 msgid "Bad character in date." msgstr "" -#: src/pfm-read.c:585 +#: src/pfm-read.c:568 #, c-format msgid "Bad time string length %d." msgstr "" -#: src/pfm-read.c:589 +#: src/pfm-read.c:572 msgid "Bad character in time." msgstr "" -#: src/pfm-read.c:639 -#, c-format -msgid "%s: Bad format specifier byte %d." -msgstr "" - -#: src/pfm-read.c:648 src/sfm-read.c:966 src/sfm-read.c:976 +#: src/pfm-read.c:622 src/pfm-read.c:631 src/sfm-read.c:900 src/sfm-read.c:910 #, c-format msgid "%s: Bad format specifier byte (%d)." msgstr "" -#: src/pfm-read.c:650 +#: src/pfm-read.c:633 #, c-format msgid "%s variable %s has %s format specifier %s." msgstr "" -#: src/pfm-read.c:651 src/print.c:629 src/sfm-read.c:980 +#: src/pfm-read.c:634 src/print.c:612 src/sfm-read.c:914 msgid "String" msgstr "" -#: src/pfm-read.c:651 src/print.c:629 src/sfm-read.c:980 +#: src/pfm-read.c:634 src/print.c:612 src/sfm-read.c:914 msgid "Numeric" msgstr "" -#: src/pfm-read.c:689 +#: src/pfm-read.c:673 msgid "Expected variable count record." msgstr "" -#: src/pfm-read.c:693 +#: src/pfm-read.c:677 #, c-format msgid "Invalid number of variables %d." msgstr "" -#: src/pfm-read.c:703 +#: src/pfm-read.c:687 #, c-format msgid "Unexpected flag value %d." msgstr "" -#: src/pfm-read.c:727 +#: src/pfm-read.c:701 +#, c-format +msgid "Weight variable name (%s) truncated." +msgstr "" + +#: src/pfm-read.c:716 msgid "Expected variable record." msgstr "" -#: src/pfm-read.c:733 +#: src/pfm-read.c:722 #, c-format msgid "Invalid variable width %d." msgstr "" -#: src/pfm-read.c:751 +#: src/pfm-read.c:740 #, c-format msgid "position %d: Variable name has %u characters." msgstr "" -#: src/pfm-read.c:755 +#: src/pfm-read.c:744 #, c-format msgid "position %d: Variable name begins with invalid character." msgstr "" -#: src/pfm-read.c:759 +#: src/pfm-read.c:748 #, c-format msgid "position %d: Variable name begins with lowercase letter %c." msgstr "" -#: src/pfm-read.c:772 +#: src/pfm-read.c:761 #, c-format msgid "position %d: Variable name character %d is lowercase letter %c." msgstr "" -#: src/pfm-read.c:782 +#: src/pfm-read.c:771 #, c-format msgid "position %d: character `\\%03o' is not valid in a variable name." msgstr "" -#: src/pfm-read.c:793 +#: src/pfm-read.c:782 #, c-format msgid "Duplicate variable name %s." msgstr "" -#: src/pfm-read.c:837 +#: src/pfm-read.c:826 #, c-format msgid "Bad missing values for %s." msgstr "" -#: src/pfm-read.c:859 +#: src/pfm-read.c:849 #, c-format msgid "Weighting variable %s not present in dictionary." msgstr "" -#: src/pfm-read.c:927 +#: src/pfm-read.c:922 #, c-format msgid "Unknown variable %s while parsing value labels." msgstr "" -#: src/pfm-read.c:930 +#: src/pfm-read.c:925 #, c-format msgid "" "Cannot assign value labels to %s and %s, which have different variable types " "or widths." msgstr "" -#: src/pfm-read.c:963 +#: src/pfm-read.c:958 #, c-format msgid "Duplicate label for value %g for variable %s." msgstr "" -#: src/pfm-read.c:966 +#: src/pfm-read.c:961 #, c-format msgid "Duplicate label for value `%.*s' for variable %s." msgstr "" -#: src/pfm-read.c:1036 +#: src/pfm-read.c:1031 msgid "End of file midway through case." msgstr "" -#: src/pfm-read.c:1046 +#: src/pfm-read.c:1041 msgid "reading as a portable file" msgstr "" @@ -3925,12 +3797,12 @@ msgstr "" msgid "writing as a portable file" msgstr "" -#: src/postscript.c:339 +#: src/postscript.c:323 #, c-format msgid "PostScript driver initializing as `%s'..." msgstr "" -#: src/postscript.c:463 +#: src/postscript.c:447 #, c-format msgid "" "PostScript driver: The defined page is not long enough to hold margins and " @@ -3938,182 +3810,182 @@ msgid "" "room for %d lines of each font at the default size of %d.%03d points." msgstr "" -#: src/postscript.c:593 +#: src/postscript.c:577 #, c-format msgid "Unknown configuration parameter `%s' for PostScript device driver." msgstr "" -#: src/postscript.c:609 +#: src/postscript.c:593 #, c-format msgid "" "Unknown orientation `%s'. Valid orientations are `portrait' and `landscape'." msgstr "" -#: src/postscript.c:621 +#: src/postscript.c:605 msgid "" "Unknown value for `data'. Valid values are `clean7bit', `clean8bit', and " "`binary'." msgstr "" -#: src/postscript.c:630 +#: src/postscript.c:614 msgid "Unknown value for `line-ends'. Valid values are `lf' and `crlf'." msgstr "" -#: src/postscript.c:639 +#: src/postscript.c:623 msgid "Unknown value for `line-style'. Valid values are `thick' and `double'." msgstr "" -#: src/postscript.c:701 +#: src/postscript.c:685 #, c-format msgid "" "Default font size must be at least 1 point (value of 1000 for key `%s')." msgstr "" -#: src/postscript.c:733 +#: src/postscript.c:717 #, c-format msgid "Value for `%s' must be a dimension of positive length (i.e., `1in')." msgstr "" -#: src/postscript.c:796 +#: src/postscript.c:780 #, c-format msgid "Nonnegative integer required as value for `%s'." msgstr "" -#: src/postscript.c:922 +#: src/postscript.c:906 #, c-format msgid "%s: %s: Opening PostScript font encoding..." msgstr "" -#: src/postscript.c:928 +#: src/postscript.c:912 #, c-format msgid "" "PostScript driver: Cannot open encoding file `%s': %s. Substituting " "ISOLatin1Encoding for missing encoding." msgstr "" -#: src/postscript.c:970 +#: src/postscript.c:954 msgid "PostScript driver: Invalid numeric format." msgstr "" -#: src/postscript.c:975 +#: src/postscript.c:959 #, c-format msgid "" "PostScript driver: Codes must be between 0 and 255. (%d is not allowed.)" msgstr "" -#: src/postscript.c:1011 +#: src/postscript.c:995 #, c-format msgid "PostScript driver: Error closing encoding file `%s'." msgstr "" -#: src/postscript.c:1014 +#: src/postscript.c:998 #, c-format msgid "%s: PostScript font encoding read successfully." msgstr "" -#: src/postscript.c:1108 +#: src/postscript.c:1092 #, c-format msgid "%s: %s: Opening PostScript encoding list file." msgstr "" -#: src/postscript.c:1143 +#: src/postscript.c:1127 #, c-format msgid "%s: PostScript encoding list file read successfully." msgstr "" -#: src/postscript.c:1157 +#: src/postscript.c:1141 msgid "<>" msgstr "" -#: src/postscript.c:1315 +#: src/postscript.c:1299 msgid "" "Cannot find PostScript prologue. The use of `-vv' on the command line is " "suggested as a debugging aid." msgstr "" -#: src/postscript.c:1320 +#: src/postscript.c:1304 #, c-format msgid "%s: %s: Opening PostScript prologue..." msgstr "" -#: src/postscript.c:1492 +#: src/postscript.c:1476 #, c-format msgid "%s: PostScript prologue read successfully." msgstr "" -#: src/postscript.c:1496 +#: src/postscript.c:1480 #, c-format msgid "%s: Error reading PostScript prologue." msgstr "" -#: src/postscript.c:1666 +#: src/postscript.c:1650 #, c-format msgid "PostScript output driver: %s: %s" msgstr "" -#: src/postscript.c:2363 +#: src/postscript.c:2334 #, c-format msgid "PostScript driver: Cannot find encoding `%s' for PostScript font `%s'." msgstr "" -#: src/print.c:207 +#: src/print.c:190 msgid "expecting a valid subcommand" msgstr "" -#: src/print.c:387 src/print.c:404 +#: src/print.c:370 src/print.c:387 #, c-format msgid "%g is not a valid column location." msgstr "" -#: src/print.c:398 +#: src/print.c:381 #, c-format msgid "Column location expected following `%d-'." msgstr "" -#: src/print.c:409 +#: src/print.c:392 #, c-format msgid "" "%d-%ld is not a valid column range. The second column must be greater than " "or equal to the first." msgstr "" -#: src/print.c:515 +#: src/print.c:498 #, c-format msgid "" "%s is not of the same type as %s. To specify variables of different types " "in the same variable list, use a FORTRAN-like format specifier." msgstr "" -#: src/print.c:545 +#: src/print.c:528 msgid "" "The ending column for a field must not be less than the starting column." msgstr "" -#: src/print.c:628 +#: src/print.c:611 #, c-format msgid "%s variables cannot be displayed with format %s." msgstr "" -#: src/print.c:715 +#: src/print.c:698 #, c-format msgid "Display format %s may not be used with a %s variable." msgstr "" -#: src/print.c:865 +#: src/print.c:848 #, c-format msgid "Writing %3d records to file %s." msgstr "" -#: src/print.c:866 +#: src/print.c:849 #, c-format msgid "Writing %3d records to the listing file." msgstr "" -#: src/print.c:1080 +#: src/print.c:1063 msgid "A file name or handle was expected in the OUTFILE subcommand." msgstr "" -#: src/print.c:1132 +#: src/print.c:1115 #, c-format msgid "" "The expression on PRINT SPACE evaluated to %d. It's not possible to PRINT " @@ -4159,52 +4031,57 @@ msgid "" "numeric." msgstr "" -#: src/recode.c:505 +#: src/recode.c:504 msgid "" "Inconsistent output types. The output values must be all numeric or all " "string." msgstr "" -#: src/recode.c:556 +#: src/recode.c:555 msgid "following LO THRU" msgstr "" -#: src/recode.c:572 src/recode.c:601 +#: src/recode.c:571 src/recode.c:600 msgid "in source value" msgstr "" -#: src/recode.c:614 +#: src/recode.c:613 msgid "" "Keyword CONVERT may only be used with string input values and numeric output " "values." msgstr "" -#: src/recode.c:870 +#: src/recode.c:869 msgid "!!END!!" msgstr "" -#: src/recode.c:891 src/recode.c:907 +#: src/recode.c:890 src/recode.c:906 msgid "!!ERROR!!" msgstr "" -#: src/rename-vars.c:59 +#: src/rename-vars.c:55 msgid "`(' expected." msgstr "" -#: src/rename-vars.c:67 +#: src/rename-vars.c:63 msgid "`=' expected between lists of new and old variable names." msgstr "" -#: src/rename-vars.c:85 +#: src/rename-vars.c:81 msgid "`)' expected after variable names." msgstr "" -#: src/repeat.c:158 +#: src/rename-vars.c:91 +#, c-format +msgid "Renaming would duplicate variable name %s." +msgstr "" + +#: src/repeat.c:159 #, c-format msgid "Identifier %s is given twice." msgstr "" -#: src/repeat.c:201 +#: src/repeat.c:202 #, c-format msgid "" "There must be the same number of substitutions for each dummy variable " @@ -4212,11 +4089,11 @@ msgid "" "s as well, but %d were specified." msgstr "" -#: src/repeat.c:310 +#: src/repeat.c:311 msgid "No commands in scope." msgstr "" -#: src/repeat.c:510 +#: src/repeat.c:511 msgid "No matching DO REPEAT." msgstr "" @@ -4241,117 +4118,117 @@ msgstr "" msgid "Only last instance of this command is in effect." msgstr "" -#: src/sfm-read.c:167 +#: src/sfm-read.c:150 msgid "corrupt system file: " msgstr "" -#: src/sfm-read.c:183 src/sfm-write.c:741 +#: src/sfm-read.c:166 src/sfm-write.c:740 #, c-format msgid "%s: Closing system file: %s." msgstr "" -#: src/sfm-read.c:256 +#: src/sfm-read.c:239 #, c-format msgid "Cannot read file %s as system file: already opened for %s." msgstr "" -#: src/sfm-read.c:261 +#: src/sfm-read.c:244 #, c-format msgid "%s: Opening system-file handle %s for reading." msgstr "" -#: src/sfm-read.c:269 +#: src/sfm-read.c:252 #, c-format msgid "" "An error occurred while opening \"%s\" for reading as a system file: %s." msgstr "" -#: src/sfm-read.c:303 +#: src/sfm-read.c:286 #, c-format msgid "" "%s: Weighting variable may not be a continuation of a long string variable." msgstr "" -#: src/sfm-read.c:306 +#: src/sfm-read.c:289 #, c-format msgid "%s: Weighting variable may not be a string variable." msgstr "" -#: src/sfm-read.c:331 +#: src/sfm-read.c:314 #, c-format msgid "" "%s: Orphaned variable index record (type 4). Type 4 records must always " "immediately follow type 3 records." msgstr "" -#: src/sfm-read.c:386 +#: src/sfm-read.c:369 #, c-format msgid "%s: Unrecognized record type 7, subtype %d encountered in system file." msgstr "" -#: src/sfm-read.c:410 +#: src/sfm-read.c:393 #, c-format msgid "%s: Unrecognized record type %d." msgstr "" -#: src/sfm-read.c:416 +#: src/sfm-read.c:399 msgid "Read system-file dictionary successfully." msgstr "" -#: src/sfm-read.c:426 +#: src/sfm-read.c:409 msgid "Error reading system-file header." msgstr "" -#: src/sfm-read.c:450 +#: src/sfm-read.c:433 #, c-format msgid "" "%s: Bad size (%d) or count (%d) field on record type 7, subtype 3.\tExpected " "size %d, count 8." msgstr "" -#: src/sfm-read.c:462 +#: src/sfm-read.c:445 #, c-format msgid "" "%s: Floating-point representation in system file is not IEEE-754. PSPP " "cannot convert between floating-point formats." msgstr "" -#: src/sfm-read.c:477 +#: src/sfm-read.c:460 #, c-format msgid "" "%s: File-indicated endianness (%s) does not match endianness intuited from " "file header (%s)." msgstr "" -#: src/sfm-read.c:479 src/sfm-read.c:480 +#: src/sfm-read.c:462 src/sfm-read.c:463 msgid "big-endian" msgstr "" -#: src/sfm-read.c:479 src/sfm-read.c:480 +#: src/sfm-read.c:462 src/sfm-read.c:463 msgid "little-endian" msgstr "" -#: src/sfm-read.c:481 +#: src/sfm-read.c:464 msgid "unknown" msgstr "" -#: src/sfm-read.c:485 +#: src/sfm-read.c:468 #, c-format msgid "%s: File-indicated character representation code (%s) is not ASCII." msgstr "" -#: src/sfm-read.c:487 +#: src/sfm-read.c:470 msgid "DEC Kanji" msgstr "" -#: src/sfm-read.c:506 +#: src/sfm-read.c:489 #, c-format msgid "" "%s: Bad size (%d) or count (%d) field on record type 7, subtype 4.\tExpected " "size %d, count 8." msgstr "" -#: src/sfm-read.c:521 +#: src/sfm-read.c:504 #, c-format msgid "" "%s: File-indicated value is different from internal value for at least one " @@ -4359,316 +4236,316 @@ msgid "" "%g; LOWEST: %g, %g." msgstr "" -#: src/sfm-read.c:565 +#: src/sfm-read.c:535 #, c-format msgid "" "%s: Bad magic. Proper system files begin with the four characters `$FL2'. " "This file will not be read." msgstr "" -#: src/sfm-read.c:608 +#: src/sfm-read.c:578 #, c-format msgid "" "%s: File layout code has unexpected value %d. Value should be 2, in big-" "endian or little-endian format." msgstr "" -#: src/sfm-read.c:624 +#: src/sfm-read.c:594 #, c-format msgid "%s: Number of elements per case (%d) is not between 1 and %d." msgstr "" -#: src/sfm-read.c:631 +#: src/sfm-read.c:601 #, c-format msgid "" "%s: Index of weighting variable (%d) is not between 0 and number of elements " "per case (%d)." msgstr "" -#: src/sfm-read.c:637 +#: src/sfm-read.c:607 #, c-format msgid "%s: Number of cases in file (%ld) is not between -1 and %d." msgstr "" -#: src/sfm-read.c:642 +#: src/sfm-read.c:612 #, c-format msgid "%s: Compression bias (%g) is not the usual value of 100." msgstr "" -#: src/sfm-read.c:739 +#: src/sfm-read.c:705 #, c-format msgid "%s: position %d: Bad record type (%d); the expected value was 2." msgstr "" -#: src/sfm-read.c:748 +#: src/sfm-read.c:714 #, c-format msgid "" "%s: position %d: String variable does not have proper number of continuation " "records." msgstr "" -#: src/sfm-read.c:756 +#: src/sfm-read.c:722 #, c-format msgid "%s: position %d: Superfluous long string continuation record." msgstr "" -#: src/sfm-read.c:761 +#: src/sfm-read.c:727 #, c-format msgid "%s: position %d: Bad variable type code %d." msgstr "" -#: src/sfm-read.c:764 +#: src/sfm-read.c:730 #, c-format msgid "%s: position %d: Variable label indicator field is not 0 or 1." msgstr "" -#: src/sfm-read.c:768 +#: src/sfm-read.c:734 #, c-format msgid "" "%s: position %d: Missing value indicator field is not -3, -2, 0, 1, 2, or 3." msgstr "" -#: src/sfm-read.c:780 +#: src/sfm-read.c:740 #, c-format msgid "%s: position %d: Variable name begins with invalid character." msgstr "" -#: src/sfm-read.c:783 +#: src/sfm-read.c:743 #, c-format msgid "%s: position %d: Variable name begins with lowercase letter %c." msgstr "" -#: src/sfm-read.c:786 +#: src/sfm-read.c:746 #, c-format msgid "" "%s: position %d: Variable name begins with octothorpe (`#'). Scratch " "variables should not appear in system files." msgstr "" -#: src/sfm-read.c:800 +#: src/sfm-read.c:760 #, c-format msgid "%s: position %d: Variable name character %d is lowercase letter %c." msgstr "" -#: src/sfm-read.c:808 +#: src/sfm-read.c:768 #, c-format msgid "" "%s: position %d: character `\\%03o' (%c) is not valid in a variable name." msgstr "" -#: src/sfm-read.c:849 +#: src/sfm-read.c:776 +#, c-format +msgid "%s: Duplicate variable name `%s' within system file." +msgstr "" + +#: src/sfm-read.c:801 #, c-format msgid "%s: Variable %s indicates variable label of invalid length %d." msgstr "" -#: src/sfm-read.c:865 +#: src/sfm-read.c:817 #, c-format msgid "%s: Long string variable %s may not have missing values." msgstr "" -#: src/sfm-read.c:889 +#: src/sfm-read.c:841 #, c-format msgid "" "%s: String variable %s may not have missing values specified as a range." msgstr "" -#: src/sfm-read.c:926 +#: src/sfm-read.c:878 #, c-format msgid "%s: Long string continuation records omitted at end of dictionary." msgstr "" -#: src/sfm-read.c:929 +#: src/sfm-read.c:881 #, c-format msgid "" "%s: System file header indicates %d variable positions but %d were read from " "file." msgstr "" -#: src/sfm-read.c:939 -#, c-format -msgid "%s: Duplicate variable name `%s' within system file." -msgstr "" - -#: src/sfm-read.c:979 +#: src/sfm-read.c:913 #, c-format msgid "%s: %s variable %s has %s format specifier %s." msgstr "" -#: src/sfm-read.c:1058 +#: src/sfm-read.c:992 #, c-format msgid "" "%s: Variable index record (type 4) does not immediately follow value label " "record (type 3) as it should." msgstr "" -#: src/sfm-read.c:1068 +#: src/sfm-read.c:1002 #, c-format msgid "" "%s: Number of variables associated with a value label (%d) is not between 1 " "and the number of variables (%d)." msgstr "" -#: src/sfm-read.c:1084 +#: src/sfm-read.c:1018 #, c-format msgid "" "%s: Variable index associated with value label (%d) is not between 1 and the " "number of values (%d)." msgstr "" -#: src/sfm-read.c:1091 +#: src/sfm-read.c:1025 #, c-format msgid "" "%s: Variable index associated with value label (%d) refers to a continuation " "of a string variable, not to an actual variable." msgstr "" -#: src/sfm-read.c:1095 +#: src/sfm-read.c:1029 #, c-format msgid "%s: Value labels are not allowed on long string variables (%s)." msgstr "" -#: src/sfm-read.c:1105 +#: src/sfm-read.c:1039 #, c-format msgid "" "%s: Variables associated with value label are not all of identical type. " "Variable %s has %s type, but variable %s has %s type." msgstr "" -#: src/sfm-read.c:1145 +#: src/sfm-read.c:1079 #, c-format msgid "%s: File contains duplicate label for value %g for variable %s." msgstr "" -#: src/sfm-read.c:1148 +#: src/sfm-read.c:1082 #, c-format msgid "%s: File contains duplicate label for value `%.*s' for variable %s." msgstr "" -#: src/sfm-read.c:1184 src/sfm-read.c:1461 +#: src/sfm-read.c:1119 src/sfm-read.c:1394 #, c-format msgid "%s: Reading system file: %s." msgstr "" -#: src/sfm-read.c:1186 src/sfm-read.c:1366 src/sfm-read.c:1407 +#: src/sfm-read.c:1121 src/sfm-read.c:1303 src/sfm-read.c:1344 #, c-format msgid "%s: Unexpected end of file." msgstr "" -#: src/sfm-read.c:1203 +#: src/sfm-read.c:1139 #, c-format msgid "%s: System file contains multiple type 6 (document) records." msgstr "" -#: src/sfm-read.c:1209 +#: src/sfm-read.c:1144 #, c-format msgid "%s: Number of document lines (%ld) must be greater than 0." msgstr "" -#: src/sfm-read.c:1229 +#: src/sfm-read.c:1168 msgid "dictionary:\n" msgstr "" -#: src/sfm-read.c:1238 +#: src/sfm-read.c:1176 msgid "num" msgstr "" -#: src/sfm-read.c:1239 +#: src/sfm-read.c:1177 msgid "str" msgstr "" -#: src/sfm-read.c:1243 +#: src/sfm-read.c:1180 msgid "left" msgstr "" -#: src/sfm-read.c:1243 +#: src/sfm-read.c:1180 msgid "right" msgstr "" -#: src/sfm-read.c:1249 +#: src/sfm-read.c:1186 msgid "none" msgstr "" -#: src/sfm-read.c:1253 +#: src/sfm-read.c:1190 msgid "one" msgstr "" -#: src/sfm-read.c:1257 +#: src/sfm-read.c:1194 msgid "two" msgstr "" -#: src/sfm-read.c:1261 +#: src/sfm-read.c:1198 msgid "three" msgstr "" -#: src/sfm-read.c:1269 +#: src/sfm-read.c:1206 msgid "low" msgstr "" -#: src/sfm-read.c:1273 +#: src/sfm-read.c:1210 msgid "high" msgstr "" -#: src/sfm-read.c:1277 +#: src/sfm-read.c:1214 msgid "range+1" msgstr "" -#: src/sfm-read.c:1281 +#: src/sfm-read.c:1218 msgid "low+1" msgstr "" -#: src/sfm-read.c:1285 +#: src/sfm-read.c:1222 msgid "high+1" msgstr "" -#: src/sfm-read.c:1319 +#: src/sfm-read.c:1256 #, c-format msgid "%s: Error reading file: %s." msgstr "" -#: src/sfm-read.c:1357 +#: src/sfm-read.c:1294 #, c-format msgid "%s: Compressed data is corrupted. Data ends partway through a case." msgstr "" -#: src/sfm-read.c:1463 +#: src/sfm-read.c:1396 #, c-format msgid "%s: Partial record at end of system file." msgstr "" -#: src/sfm-read.c:1501 +#: src/sfm-read.c:1434 msgid "reading as a system file" msgstr "" -#: src/sfm-write.c:113 +#: src/sfm-write.c:96 #, c-format msgid "Cannot write file %s as system file: already opened for %s." msgstr "" -#: src/sfm-write.c:118 +#: src/sfm-write.c:101 #, c-format msgid "%s: Opening system-file handle %s for writing." msgstr "" -#: src/sfm-write.c:128 +#: src/sfm-write.c:111 #, c-format msgid "" "An error occurred while opening \"%s\" for writing as a system file: %s." msgstr "" -#: src/sfm-write.c:181 +#: src/sfm-write.c:164 msgid "Wrote system-file header successfully." msgstr "" -#: src/sfm-write.c:186 +#: src/sfm-write.c:169 msgid "Error writing system-file header." msgstr "" -#: src/sfm-write.c:605 +#: src/sfm-write.c:604 #, c-format msgid "%s: Writing system file: %s." msgstr "" -#: src/sfm-write.c:751 +#: src/sfm-write.c:750 msgid "writing as a system file" msgstr "" @@ -4690,265 +4567,265 @@ msgstr "" msgid "%s: Error removing directory for temporary files: %s." msgstr "" -#: src/sort.c:520 +#: src/sort.c:522 #, c-format msgid "" "Out of memory. Could not allocate room for minimum of %d cases of %d bytes " "each. (PSPP workspace is currently restricted to a maximum of %d KB.)" msgstr "" -#: src/sort.c:532 +#: src/sort.c:534 #, c-format msgid "allocated %d cases == %d bytes\n" msgstr "" -#: src/sort.c:570 +#: src/sort.c:572 #, c-format msgid "%s: Error writing temporary file: %s." msgstr "" -#: src/sort.c:582 +#: src/sort.c:584 #, c-format msgid "SORT: Closing handle %d." msgstr "" -#: src/sort.c:588 src/sort.c:812 +#: src/sort.c:590 src/sort.c:815 #, c-format msgid "%s: Error closing temporary file: %s." msgstr "" -#: src/sort.c:610 src/sort.c:626 +#: src/sort.c:612 src/sort.c:628 #, c-format msgid "SORT: %s: Opening for writing as run %d." msgstr "" -#: src/sort.c:632 +#: src/sort.c:634 #, c-format msgid "%s: Error opening temporary file for reading: %s." msgstr "" -#: src/sort.c:658 src/sort.c:674 +#: src/sort.c:660 src/sort.c:676 #, c-format msgid "%s: Error creating temporary file: %s." msgstr "" -#: src/sort.c:816 src/sort.c:977 src/sort.c:1027 src/sort.c:1197 -#: src/sort.c:1204 +#: src/sort.c:819 src/sort.c:981 src/sort.c:1031 src/sort.c:1203 +#: src/sort.c:1210 #, c-format msgid "%s: Error removing temporary file: %s." msgstr "" -#: src/sort.c:959 +#: src/sort.c:963 msgid "merging runs" msgstr "" -#: src/sort.c:967 +#: src/sort.c:971 #, c-format msgid " into run %d(%d)\n" msgstr "" -#: src/sort.c:986 +#: src/sort.c:990 msgid "Out of memory expanding Huffman priority queue." msgstr "" -#: src/sort.c:1038 +#: src/sort.c:1042 #, c-format msgid "%s: Error creating temporary file for merge: %s." msgstr "" -#: src/sort.c:1066 src/sort.c:1124 +#: src/sort.c:1070 src/sort.c:1130 #, c-format msgid "%s: Error reading temporary file in merge: %s." msgstr "" -#: src/sort.c:1069 src/sort.c:1128 +#: src/sort.c:1073 src/sort.c:1134 #, c-format msgid "%s: Unexpected end of temporary file in merge." msgstr "" -#: src/sort.c:1094 +#: src/sort.c:1099 #, c-format msgid "%s: Error writing temporary file in merge: %s." msgstr "" -#: src/sort.c:1144 src/sort.c:1177 +#: src/sort.c:1150 src/sort.c:1183 #, c-format msgid "%s: Error closing temporary file in merge: %s." msgstr "" -#: src/sort.c:1149 +#: src/sort.c:1155 #, c-format msgid "%s: Error removing temporary file in merge: %s." msgstr "" -#: src/sort.c:1248 +#: src/sort.c:1254 #, c-format msgid "%s: Cannot open sort result file: %s." msgstr "" -#: src/sort.c:1259 +#: src/sort.c:1265 #, c-format msgid "%s: Error reading sort result file: %s." msgstr "" -#: src/sort.c:1262 +#: src/sort.c:1268 #, c-format msgid "%s: Unexpected end of sort result file: %s." msgstr "" -#: src/sort.c:1273 +#: src/sort.c:1279 #, c-format msgid "%s: Error closing sort result file: %s." msgstr "" -#: src/sort.c:1277 +#: src/sort.c:1283 #, c-format msgid "%s: Error removing sort result file: %s." msgstr "" -#: src/sysfile-info.c:98 +#: src/sysfile-info.c:97 msgid "File:" msgstr "" -#: src/sysfile-info.c:100 +#: src/sysfile-info.c:99 msgid "Label:" msgstr "" -#: src/sysfile-info.c:102 +#: src/sysfile-info.c:103 msgid "No label." msgstr "" -#: src/sysfile-info.c:103 +#: src/sysfile-info.c:106 msgid "Created:" msgstr "" -#: src/sysfile-info.c:106 +#: src/sysfile-info.c:109 msgid "Endian:" msgstr "" -#: src/sysfile-info.c:107 +#: src/sysfile-info.c:110 msgid "Big." msgstr "" -#: src/sysfile-info.c:107 +#: src/sysfile-info.c:110 msgid "Little." msgstr "" -#: src/sysfile-info.c:108 +#: src/sysfile-info.c:111 msgid "Variables:" msgstr "" -#: src/sysfile-info.c:111 +#: src/sysfile-info.c:114 msgid "Cases:" msgstr "" -#: src/sysfile-info.c:114 +#: src/sysfile-info.c:117 msgid "Type:" msgstr "" -#: src/sysfile-info.c:115 +#: src/sysfile-info.c:118 msgid "System File." msgstr "" -#: src/sysfile-info.c:116 +#: src/sysfile-info.c:119 msgid "Weight:" msgstr "" -#: src/sysfile-info.c:118 +#: src/sysfile-info.c:123 msgid "Not weighted." msgstr "" -#: src/sysfile-info.c:119 +#: src/sysfile-info.c:125 msgid "Mode:" msgstr "" -#: src/sysfile-info.c:121 +#: src/sysfile-info.c:127 #, c-format msgid "Compression %s." msgstr "" -#: src/sysfile-info.c:121 +#: src/sysfile-info.c:127 msgid "on" msgstr "" -#: src/sysfile-info.c:121 +#: src/sysfile-info.c:127 msgid "off" msgstr "" -#: src/sysfile-info.c:130 src/sysfile-info.c:367 +#: src/sysfile-info.c:136 src/sysfile-info.c:377 msgid "Description" msgstr "" -#: src/sysfile-info.c:131 src/sysfile-info.c:364 +#: src/sysfile-info.c:137 src/sysfile-info.c:374 msgid "Position" msgstr "" -#: src/sysfile-info.c:189 +#: src/sysfile-info.c:196 msgid "The active file does not have a file label." msgstr "" -#: src/sysfile-info.c:192 +#: src/sysfile-info.c:199 msgid "File label:" msgstr "" -#: src/sysfile-info.c:254 +#: src/sysfile-info.c:261 msgid "No variables to display." msgstr "" -#: src/sysfile-info.c:273 +#: src/sysfile-info.c:280 msgid "Macros not supported." msgstr "" -#: src/sysfile-info.c:281 +#: src/sysfile-info.c:290 msgid "The active file dictionary does not contain any documents." msgstr "" -#: src/sysfile-info.c:289 +#: src/sysfile-info.c:299 msgid "Documents in the active file:" msgstr "" -#: src/sysfile-info.c:369 src/sysfile-info.c:527 src/vfm.c:1115 +#: src/sysfile-info.c:379 src/sysfile-info.c:537 src/vfm.c:1095 msgid "Label" msgstr "" -#: src/sysfile-info.c:441 +#: src/sysfile-info.c:451 #, c-format msgid "Format: %s" msgstr "" -#: src/sysfile-info.c:448 +#: src/sysfile-info.c:458 #, c-format msgid "Print Format: %s" msgstr "" -#: src/sysfile-info.c:451 +#: src/sysfile-info.c:461 #, c-format msgid "Write Format: %s" msgstr "" -#: src/sysfile-info.c:459 +#: src/sysfile-info.c:469 msgid "Missing Values: " msgstr "" -#: src/sysfile-info.c:581 +#: src/sysfile-info.c:593 msgid "No vectors defined." msgstr "" -#: src/sysfile-info.c:596 +#: src/sysfile-info.c:608 msgid "Vector" msgstr "" -#: src/tab.c:276 +#: src/tab.c:259 #, c-format msgid "bad vline: x=%d+%d=%d y=(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n" msgstr "" -#: src/tab.c:312 +#: src/tab.c:295 #, c-format msgid "bad hline: x=(%d+%d=%d,%d+%d=%d) y=%d+%d=%d in table size (%d,%d)\n" msgstr "" -#: src/tab.c:352 +#: src/tab.c:335 #, c-format msgid "" "bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n" @@ -4983,7 +4860,7 @@ msgstr "" msgid "%s after: %s\n" msgstr "" -#: src/title.c:132 +#: src/title.c:137 #, c-format msgid "Document entered %s %02d:%02d:%02d by %s (%s):" msgstr "" @@ -5036,163 +4913,158 @@ msgstr "" msgid "(no variable label)" msgstr "" -#: src/vars-prs.c:113 -#, c-format -msgid "%s is not declared as a variable." -msgstr "" - -#: src/vars-prs.c:131 +#: src/vars-prs.c:46 #, c-format msgid "%s is not a variable name." msgstr "" -#: src/vars-prs.c:230 +#: src/vars-prs.c:194 #, c-format msgid "%s TO %s is not valid syntax since %s precedes %s in the dictionary." msgstr "" -#: src/vars-prs.c:239 +#: src/vars-prs.c:204 #, c-format msgid "" "When using the TO keyword to specify several variables, both variables must " "be from the same variable dictionaries, of either ordinary, scratch, or " -"system variables. %s and %s are from different dictionaries." +"system variables. %s is a %s variable, whereas %s is %s." msgstr "" -#: src/vars-prs.c:256 +#: src/vars-prs.c:222 #, c-format msgid "Scratch variables (such as %s) are not allowed here." msgstr "" -#: src/vars-prs.c:279 +#: src/vars-prs.c:245 #, c-format msgid "" "%s is not a numeric variable. It will not be included in the variable list." msgstr "" -#: src/vars-prs.c:285 +#: src/vars-prs.c:248 #, c-format msgid "" "%s is not a string variable. It will not be included in the variable list." msgstr "" -#: src/vars-prs.c:291 +#: src/vars-prs.c:252 #, c-format msgid "" "%s and %s are not the same type. All variables in this variable list must " "be of the same type. %s will be omitted from list." msgstr "" -#: src/vars-prs.c:299 +#: src/vars-prs.c:257 #, c-format msgid "Variable %s appears twice in variable list." msgstr "" -#: src/vars-prs.c:370 +#: src/vars-prs.c:334 msgid "incorrect use of TO convention" msgstr "" -#: src/vars-prs.c:410 +#: src/vars-prs.c:380 msgid "Scratch variables not allowed here." msgstr "" -#: src/vars-prs.c:432 +#: src/vars-prs.c:402 msgid "Prefixes don't match in use of TO convention." msgstr "" -#: src/vars-prs.c:437 +#: src/vars-prs.c:407 msgid "Bad bounds in use of TO convention." msgstr "" -#: src/vector.c:80 +#: src/vector.c:69 #, c-format msgid "Vector name %s is given twice." msgstr "" -#: src/vector.c:86 +#: src/vector.c:75 #, c-format msgid "There is already a vector with name %s." msgstr "" -#: src/vector.c:105 +#: src/vector.c:96 msgid "" "A slash must be used to separate each vector specification when using the " "long form. Commands such as VECTOR A,B=Q1 TO Q20 are not supported." msgstr "" -#: src/vector.c:139 +#: src/vector.c:130 msgid "Vectors must have at least one element." msgstr "" -#: src/vector.c:153 +#: src/vector.c:144 #, c-format msgid "%s%d is too long for a variable name." msgstr "" -#: src/vector.c:195 +#: src/vector.c:184 msgid "" "The syntax for this command does not match the expected syntax for either " "the long form or the short form of VECTOR." msgstr "" -#: src/vfm.c:310 +#: src/vfm.c:293 #, c-format msgid "" "Workspace overflow predicted. Max workspace is currently set to %d KB (%d " "cases at %d bytes each). Paging active file to disk." msgstr "" -#: src/vfm.c:377 +#: src/vfm.c:365 msgid "" msgstr "" -#: src/vfm.c:636 +#: src/vfm.c:612 #, c-format msgid "" "An error occurred attempting to create a temporary file for use as the " "active file: %s." msgstr "" -#: src/vfm.c:654 +#: src/vfm.c:630 #, c-format msgid "" "An error occurred while attempting to read from a temporary file created for " "the active file: %s." msgstr "" -#: src/vfm.c:682 +#: src/vfm.c:658 #, c-format msgid "" "An error occurred while attempting to write to a temporary file used as the " "active file: %s." msgstr "" -#: src/vfm.c:696 +#: src/vfm.c:672 #, c-format msgid "" "An error occurred while attempting to rewind a temporary file used as the " "active file: %s." msgstr "" -#: src/vfm.c:811 +#: src/vfm.c:787 msgid "Virtual memory exhausted. Paging active file to disk." msgstr "" -#: src/vfm.c:814 +#: src/vfm.c:790 #, c-format msgid "" "Workspace limit of %d KB (%d cases at %d bytes each) overflowed. Paging " "active file to disk." msgstr "" -#: src/vfm.c:838 src/vfm.c:875 +#: src/vfm.c:814 src/vfm.c:851 #, c-format msgid "" "An error occurred while attempting to write to a temporary file created as " "the active file, while paging to disk: %s." msgstr "" -#: src/vfm.c:988 +#: src/vfm.c:965 msgid "transform: " msgstr "" @@ -5203,7 +5075,3 @@ msgstr "" #: src/weight.c:66 msgid "The weighting variable may not be scratch." msgstr "" - -#: src/weight.c:106 -msgid "bad weighting variable, canceling\n" -msgstr "" -- 2.30.2