From ef8f98d0c8928a14afb4b6c7fc6c50be0bff2d10 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Thu, 19 Jul 2001 12:24:17 +0000 Subject: [PATCH] Reverted to gettext 0.10.35 in intl/ added m4/ directory to allow system independent rebuild of configure stuff git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@736 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 4 + Makefile.am | 15 +- Makefile.in | 40 +- aclocal.m4 | 674 +++++++++--------- config.h.in | 61 +- configure | 1637 ++++++++++++++++++++++++++++---------------- configure.in | 3 +- intl/ChangeLog | 1086 ++++++++++++++++++++++++++++- intl/Makefile.in | 234 ++----- intl/VERSION | 2 +- intl/bindtextdom.c | 335 +++------ intl/dcgettext.c | 608 +++++++++++++++- intl/dgettext.c | 11 +- intl/explodename.c | 13 +- intl/finddomain.c | 51 +- intl/gettext.c | 21 +- intl/gettext.h | 18 +- intl/gettextP.h | 178 +---- intl/hash-string.h | 11 +- intl/intl-compat.c | 113 +-- intl/l10nflist.c | 33 +- intl/libgettext.h | 174 ++++- intl/loadinfo.h | 32 +- intl/loadmsgcat.c | 390 +---------- intl/localealias.c | 119 ++-- intl/textdomain.c | 85 +-- m4/gettext.m4 | 329 +++++++++ m4/largefile.m4 | 92 +++ m4/lcmessage.m4 | 22 + m4/progtest.m4 | 47 ++ po/ca.po | 254 +++---- po/cs.po | 254 +++---- po/de.po | 254 +++---- po/es.po | 254 +++---- po/fi.po | 254 +++---- po/fr.po | 254 +++---- po/gl.po | 254 +++---- po/hu.po | 254 +++---- po/id.po | 254 +++---- po/it.po | 254 +++---- po/no.po | 254 +++---- po/ru.po | 254 +++---- po/sv.po | 254 +++---- po/uk.po | 254 +++---- 44 files changed, 5948 insertions(+), 4046 deletions(-) create mode 100644 m4/gettext.m4 create mode 100644 m4/largefile.m4 create mode 100644 m4/lcmessage.m4 create mode 100644 m4/progtest.m4 diff --git a/ChangeLog b/ChangeLog index 2cc1ff34..36fcb60b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ CVS code - +- General + - Reverted included gettext from 0.10.38 to 0.10.35 in intl/ dir. + - Added m4/ directory to allow rebuilding using only the internal + version of gettext.m4 (Albert Chin). - nano.c: main() - Change the getop option to 'F' (David Lawrence Ramsey) diff --git a/Makefile.am b/Makefile.am index a547ae97..7eebfc09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,10 @@ ## $Id$ +AUTOMAKE_OPTIONS = gnu no-dependencies +M4DIR = $(srcdir)/m4 +ACLOCAL_AMFLAGS = -I $(M4DIR) +ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 \ + $(M4DIR)/lcmessage.m4 $(M4DIR)/progtest.m4 + bin_PROGRAMS = nano nano_SOURCES = color.c \ cut.c \ @@ -14,16 +20,19 @@ nano_SOURCES = color.c \ winio.c man_MANS = nano.1 -nano_LDADD = @INTLLIBS@ +nano_LDADD = @GLIB_LIBS@ @INTLLIBS@ info_TEXINFOS = nano.texi MAKEINFO = makeinfo --no-split EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \ README THANKS TODO install-sh missing mkinstalldirs \ - nano.1 nano.1.html faq.html nanorc.sample + nano.1 nano.1.html faq.html nanorc.sample $(ACINCLUDE_INPUTS) SUBDIRS = po intl -localedir = $(datadir)/locale +localedir = @LOCALE_DIR@ INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@ + +$(srcdir)/acinclude.m4: $(ACINCLUDE_INPUTS) + cat $(ACINCLUDE_INPUTS) > $@ diff --git a/Makefile.in b/Makefile.in index 09f60c07..57b35c99 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -57,27 +57,26 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CURSES_LIB = @CURSES_LIB@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CONFIG = @GLIB_CONFIG@ GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GNU_LOCALE_DIR = @GNU_LOCALE_DIR@ +GT_NO = @GT_NO@ +GT_YES = @GT_YES@ +INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ +INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -LIBICONV = @LIBICONV@ +LOCALE_DIR = @LOCALE_DIR@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ @@ -87,23 +86,30 @@ RANLIB = @RANLIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +l = @l@ + +AUTOMAKE_OPTIONS = gnu no-dependencies +M4DIR = $(srcdir)/m4 +ACLOCAL_AMFLAGS = -I $(M4DIR) +ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 $(M4DIR)/lcmessage.m4 $(M4DIR)/progtest.m4 + bin_PROGRAMS = nano nano_SOURCES = color.c cut.c files.c global.c move.c nano.c nano.h proto.h rcfile.c search.c utils.c winio.c man_MANS = nano.1 -nano_LDADD = @INTLLIBS@ +nano_LDADD = @GLIB_LIBS@ @INTLLIBS@ info_TEXINFOS = nano.texi MAKEINFO = makeinfo --no-split -EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO install-sh missing mkinstalldirs nano.1 nano.1.html faq.html nanorc.sample +EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO install-sh missing mkinstalldirs nano.1 nano.1.html faq.html nanorc.sample $(ACINCLUDE_INPUTS) SUBDIRS = po intl -localedir = $(datadir)/locale +localedir = @LOCALE_DIR@ INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -156,9 +162,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status $(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) @@ -318,7 +324,7 @@ uninstall-info: else ii=; fi; \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - test -z "$ii" \ + test -z "$$ii" \ || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ done @$(NORMAL_UNINSTALL) @@ -521,10 +527,11 @@ distdir: $(DISTFILES) -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) + $(mkinstalldirs) $(distdir)/$(M4DIR) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -632,6 +639,9 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +$(srcdir)/acinclude.m4: $(ACINCLUDE_INPUTS) + cat $(ACINCLUDE_INPUTS) > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/aclocal.m4 b/aclocal.m4 index 65007764..85b332d5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +dnl aclocal.m4 generated automatically by aclocal 1.4-p4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -143,6 +143,99 @@ AC_DEFUN([AC_ISC_POSIX], ] ) +#serial 19 + +dnl By default, many hosts won't let programs access large files; +dnl one must use special compiler options to get large-file access to work. +dnl For more details about this brain damage please see: +dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html + +dnl Written by Paul Eggert . + +dnl Internal subroutine of AC_SYS_LARGEFILE. +dnl AC_SYS_LARGEFILE_TEST_INCLUDES +AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES, + [[#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply "#define LARGE_OFF_T 9223372036854775807", + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +# define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; + ]]) + +dnl Internal subroutine of AC_SYS_LARGEFILE. +dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY) +AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE, + [AC_CACHE_CHECK([for $1 value needed for large files], $3, + [$3=no + AC_TRY_COMPILE([$5], + [$6], + , + [AC_TRY_COMPILE([#define $1 $2] +[$5] + , + [$6], + [$3=$2])])]) + if test "[$]$3" != no; then + AC_DEFINE_UNQUOTED([$1], [$]$3, [$4]) + fi]) + +AC_DEFUN(NANO_AC_SYS_LARGEFILE, + [AC_REQUIRE([AC_PROG_CC]) + AC_ARG_ENABLE(largefile, + [ --disable-largefile omit support for large files]) + if test "$enable_largefile" != no; then + + AC_CACHE_CHECK([for special C compiler options needed for large files], + ac_cv_sys_largefile_CC, + [ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , , + [ac_save_CC="$CC" + CC="$CC -n32" + AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , + ac_cv_sys_largefile_CC=' -n32') + CC="$ac_save_CC"]) + fi]) + if test "$ac_cv_sys_largefile_CC" != no; then + CC="$CC$ac_cv_sys_largefile_CC" + fi + + AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, + ac_cv_sys_file_offset_bits, + [Number of bits in a file offset, on hosts where this is settable.], + AC_SYS_LARGEFILE_TEST_INCLUDES) + AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, + ac_cv_sys_large_files, + [Define for large files, on AIX-style hosts.], + AC_SYS_LARGEFILE_TEST_INCLUDES) + fi + ]) + +AC_DEFUN(AC_FUNC_FSEEKO, + [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, + ac_cv_sys_largefile_source, + [Define to make fseeko visible on some hosts (e.g. glibc 2.2).], + [#include ], [return !fseeko;]) + # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug + # in glibc 2.1.3, but that breaks too many other things. + # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. + + AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko, + [ac_cv_func_fseeko=no + AC_TRY_LINK([#include ], + [return fseeko && fseeko (stdin, 0, 0);], + [ac_cv_func_fseeko=yes])]) + if test $ac_cv_func_fseeko != no; then + AC_DEFINE(HAVE_FSEEKO, 1, + [Define if fseeko (and presumably ftello) exists and is declared.]) + fi]) + # Configure paths for GLIB # Owen Taylor 97-11-3 @@ -344,41 +437,15 @@ main () # Ulrich Drepper , 1995. # # This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public License +# be used in projects which are not available under the GNU Public License # but which still want to provide support for the GNU gettext functionality. # Please note that the actual code is *not* freely available. -# serial 9 +# serial 108 -dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]). -dnl If TOOLSYMBOL is specified and 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). Otherwise, 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. -dnl LIBDIR 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 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_WITH_NLS], +AC_PREREQ(2.13) dnl Minimum Autoconf version required. + +AC_DEFUN(NANO_AM_WITH_NLS, [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, @@ -387,15 +454,23 @@ AC_DEFUN([AM_WITH_NLS], AC_MSG_RESULT($USE_NLS) AC_SUBST(USE_NLS) - BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no - INTLLIBS= + + AC_ARG_WITH(locale-dir, + [ --with-locale-dir=DIR specify locale directory], + LOCALE_DIR=$withval) + test -z "$LOCALE_DIR" && LOCALE_DIR='$(datadir)/locale' + AC_SUBST(LOCALE_DIR) + + AC_ARG_WITH(gnu-locale-dir, + [ --with-gnu-locale-dir=DIR specify GNU locale directory], + GNU_LOCALE_DIR=$withval) + test -z "$GNU_LOCALE_DIR" && GNU_LOCALE_DIR='$(prefix)/share/locale' + AC_SUBST(GNU_LOCALE_DIR) dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, - [Define to 1 if translation of program messages to the user's native language - is requested.]) + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested.]) AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], @@ -406,74 +481,83 @@ AC_DEFUN([AM_WITH_NLS], 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 to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= CATOBJEXT=NONE - dnl Add a version number to the cache macros. - define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc]) - define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl]) - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include -extern int _nl_msg_cat_cntr;], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) - if test "$gt_cv_func_gnugettext_libc" != "yes"; then - AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $LIBICONV" - AC_TRY_LINK([#include -extern int _nl_msg_cat_cntr;], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) - LIBS="$gt_save_LIBS"]) + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, gettext)]) 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 - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - dnl If iconv() is in a separate libiconv library, then anyone - dnl linking with libintl{.a,.so} also needs to link with - dnl libiconv. - INTLLIBS="-lintl $LIBICONV" - fi - - gt_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - LIBS="$gt_save_LIBS" - - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - fi - - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - - CATOBJEXT=.gmo - fi + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$ac_cv_lib_intl_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT, 1, + [Define to 1 if you have gettext and don't want to use GNU gettext.]) + NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi ]) if test "$CATOBJEXT" = "NONE"; then - dnl GNU gettext is not found in the C library. + AC_MSG_CHECKING([whether catgets can be used]) + AC_ARG_WITH(catgets, + [ --with-catgets use catgets functions if available], + nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) + AC_MSG_RESULT($nls_cv_use_catgets) + + if test "$nls_cv_use_catgets" = "yes"; then + dnl No gettext in C library. Try catgets next. + AC_CHECK_LIB(i, main) + AC_CHECK_FUNC(catgets, + [AC_DEFINE(HAVE_CATGETS, 1, + [Define as 1 if you have catgets and don't want to use GNU gettext.]) + INTLOBJS="\$(CATOBJS)" + AC_PATH_PROG(GENCAT, gencat, no)dnl + if test "$GENCAT" != "no"; then + AC_PATH_PROG(GMSGFMT, gmsgfmt, no) + if test "$GMSGFMT" = "no"; then + NANO_AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) + fi + NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.cat + INSTOBJEXT=.cat + DATADIRNAME=lib + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi]) + fi + fi + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. dnl Fall back on GNU gettext library. nls_cv_use_gnu_gettext=yes fi @@ -482,17 +566,21 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. INTLOBJS="\$(GETTOBJS)" - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) AC_SUBST(MSGFMT) - BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes CATOBJEXT=.gmo - INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h fi dnl Test whether we really found GNU xgettext. @@ -508,74 +596,29 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" fi fi - dnl We need to process the po/ directory. + # We need to process the po/ directory. POSUB=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'` - 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" - sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - fi - ;; - esac - done]) - - - 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 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]) + DATADIRNAME=share + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h fi - if test $ac_verc_fail = yes; then - INTLBISON=: + if test -z "$nls_cv_header_intl"; then + # Clean out junk possibly left behind by a previous configuration. + rm -f intl/libintl.h + fi + AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) + + + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes fi dnl These rules are solely for the distribution goal. While doing this @@ -587,38 +630,22 @@ changequote([,])dnl done dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) AC_SUBST(CATALOGS) AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) AC_SUBST(INTLLIBS) AC_SUBST(INTLOBJS) AC_SUBST(POFILES) AC_SUBST(POSUB) - - 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 Usage: Just like AM_WITH_NLS, which see. -AC_DEFUN([AM_GNU_GETTEXT], +AC_DEFUN(NANO_AM_GNU_GETTEXT, [AC_REQUIRE([AC_PROG_MAKE_SET])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 @@ -628,18 +655,21 @@ AC_DEFUN([AM_GNU_GETTEXT], 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_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 getcwd getegid geteuid \ -getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ -strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +strdup __argz_count __argz_stringify __argz_next]) - AM_ICONV - AM_LANGINFO_CODESET - AM_LC_MESSAGES - AM_WITH_NLS([$1],[$2],[$3]) + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY, 1, [Define to 1 if you have the stpcpy function.]) + fi + + NANO_AM_LC_MESSAGES + NANO_AM_WITH_NLS if test "x$CATOBJEXT" != "x"; then if test "x$ALL_LINGUAS" = "x"; then @@ -647,21 +677,10 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) else AC_MSG_CHECKING(for catalogs to be installed) NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - for desiredlang in ${LINGUAS-$ALL_LINGUAS}; 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 - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac done LINGUAS=$NEW_LINGUAS AC_MSG_RESULT($LINGUAS) @@ -673,8 +692,47 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) fi fi + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + test -d intl || mkdir intl + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but $(top_srcdir). + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). dnl Try to locate is. MKINSTALLDIRS= if test -n "$ac_aux_dir"; then @@ -685,11 +743,74 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) fi AC_SUBST(MKINSTALLDIRS) - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + case "$srcdir" in + .) + posrcprefix="../" ;; + /* | [[A-Za-z]]:*) + posrcprefix="$srcdir/" ;; + *) + posrcprefix="../$srcdir/" ;; + esac + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES ]) +# Search path for a program which passes the given test. +# Ulrich Drepper , 1996. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN(NANO_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 -n "[$]$1"; then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + # Search path for a program which passes the given test. # Ulrich Drepper , 1996. # @@ -738,139 +859,26 @@ fi AC_SUBST($1)dnl ]) -#serial 2 - -# 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" - ] -) - -#serial AM2 - -dnl From Bruno Haible. - -AC_DEFUN([AM_ICONV], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - - AC_ARG_WITH([libiconv-prefix], -[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi - if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi - done - ]) - - 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 -liconv" - 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.]) - 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 - LIBICONV= - if test "$am_cv_lib_iconv" = yes; then - LIBICONV="-liconv" - fi - AC_SUBST(LIBICONV) -]) - -#serial AM1 - -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 -]) - # Check whether LC_MESSAGES is available in . # Ulrich Drepper , 1995. # # This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public License +# be used in projects which are not available under the GNU Public License # but which still want to provide support for the GNU gettext functionality. # Please note that the actual code is *not* freely available. # serial 2 -AC_DEFUN([AM_LC_MESSAGES], +AC_PREREQ(2.13) dnl Minimum Autoconf version required. + +AC_DEFUN(NANO_AM_LC_MESSAGES, [if test $ac_cv_header_locale_h = yes; then AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include ], [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.]) + [Define if your locale.h file contains LC_MESSAGES.]) fi fi]) diff --git a/config.h.in b/config.h.in index dab21292..dd6d78ab 100644 --- a/config.h.in +++ b/config.h.in @@ -112,36 +112,15 @@ /* Define if you have the dcgettext function. */ #undef HAVE_DCGETTEXT -/* Define if you have the feof_unlocked function. */ -#undef HAVE_FEOF_UNLOCKED - -/* Define if you have the fgets_unlocked function. */ -#undef HAVE_FGETS_UNLOCKED - /* Define if you have the getcwd function. */ #undef HAVE_GETCWD -/* Define if you have the getegid function. */ -#undef HAVE_GETEGID - -/* Define if you have the geteuid function. */ -#undef HAVE_GETEUID - -/* Define if you have the getgid function. */ -#undef HAVE_GETGID - /* Define if you have the getopt_long function. */ #undef HAVE_GETOPT_LONG /* Define if you have the getpagesize function. */ #undef HAVE_GETPAGESIZE -/* Define if you have the getuid function. */ -#undef HAVE_GETUID - -/* Define if you have the mempcpy function. */ -#undef HAVE_MEMPCPY - /* Define if you have the munmap function. */ #undef HAVE_MUNMAP @@ -169,12 +148,6 @@ /* Define if you have the strdup function. */ #undef HAVE_STRDUP -/* Define if you have the strtoul function. */ -#undef HAVE_STRTOUL - -/* Define if you have the tsearch function. */ -#undef HAVE_TSEARCH - /* Define if you have the vsnprintf function. */ #undef HAVE_VSNPRINTF @@ -208,12 +181,6 @@ /* Define if you have the header file. */ #undef HAVE_REGEX_H -/* Define if you have the header file. */ -#undef HAVE_STDDEF_H - -/* Define if you have the header file. */ -#undef HAVE_STDLIB_H - /* Define if you have the header file. */ #undef HAVE_STRING_H @@ -229,28 +196,36 @@ /* Define if you have the header file. */ #undef HAVE_UNISTD_H +/* Define if you have the i library (-li). */ +#undef HAVE_LIBI + +/* Define if you have the intl library (-lintl). */ +#undef HAVE_LIBINTL + /* Name of package */ #undef PACKAGE /* Version number of package */ #undef VERSION -/* Define if you have the iconv() function. */ -#undef HAVE_ICONV +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS -/* Define as const if the declaration of iconv() needs const. */ -#undef ICONV_CONST +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES -/* Define if you have and nl_langinfo(CODESET). */ -#undef HAVE_LANGINFO_CODESET +/* Define to 1 if you have the stpcpy function. */ +#undef HAVE_STPCPY -/* Define if your file defines LC_MESSAGES. */ +/* Define if your locale.h file contains LC_MESSAGES. */ #undef HAVE_LC_MESSAGES -/* Define to 1 if translation of program messages to the user's native language - is requested. */ +/* Define to 1 if NLS is requested. */ #undef ENABLE_NLS -/* Define if the GNU gettext() function is already present or preinstalled. */ +/* Define to 1 if you have gettext and don't want to use GNU gettext. */ #undef HAVE_GETTEXT +/* Define as 1 if you have catgets and don't want to use GNU gettext. */ +#undef HAVE_CATGETS + diff --git a/configure b/configure index 63366929..8a69a9ca 100755 --- a/configure +++ b/configure @@ -11,6 +11,8 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --disable-largefile omit support for large files" ac_help="$ac_help --enable-tiny Disable features for the sake of size (currently disables detailed help and i18n)" @@ -46,12 +48,16 @@ ac_help="$ac_help --disable-glibtest Do not try to compile and run a test GLIB program" ac_help="$ac_help --enable-debug Enable debugging (def disabled)" -ac_help="$ac_help - --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib" ac_help="$ac_help --disable-nls do not use Native Language Support" +ac_help="$ac_help + --with-locale-dir=DIR specify locale directory" +ac_help="$ac_help + --with-gnu-locale-dir=DIR specify GNU locale directory" ac_help="$ac_help --with-included-gettext use the GNU gettext library included here" +ac_help="$ac_help + --with-catgets use catgets functions if available" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -593,7 +599,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:597: checking for a BSD compatible install" >&5 +echo "configure:603: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -646,7 +652,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:650: checking whether build environment is sane" >&5 +echo "configure:656: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -703,7 +709,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:707: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:713: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -749,7 +755,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:753: checking for working aclocal" >&5 +echo "configure:759: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -762,7 +768,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:766: checking for working autoconf" >&5 +echo "configure:772: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -775,7 +781,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:779: checking for working automake" >&5 +echo "configure:785: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -788,7 +794,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:792: checking for working autoheader" >&5 +echo "configure:798: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -801,7 +807,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:805: checking for working makeinfo" >&5 +echo "configure:811: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -822,7 +828,7 @@ ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv no" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:826: checking for $ac_word" >&5 +echo "configure:832: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -852,7 +858,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:856: checking for $ac_word" >&5 +echo "configure:862: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -903,7 +909,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:907: checking for $ac_word" >&5 +echo "configure:913: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -935,7 +941,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:939: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:945: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -946,12 +952,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 950 "configure" +#line 956 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -977,12 +983,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:981: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:987: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:986: checking whether we are using GNU C" >&5 +echo "configure:992: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -991,7 +997,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1010,7 +1016,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1014: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1020: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1043,7 +1049,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1047: checking for strerror in -lcposix" >&5 +echo "configure:1053: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1051,7 +1057,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1085,8 +1091,223 @@ fi + # Check whether --enable-largefile or --disable-largefile was given. +if test "${enable_largefile+set}" = set; then + enableval="$enable_largefile" + : +fi + + if test "$enable_largefile" != no; then + + echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6 +echo "configure:1104: checking for special C compiler options needed for large files" >&5 +if eval "test \"`echo '$''{'ac_cv_sys_largefile_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat > conftest.$ac_ext < + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply "#define LARGE_OFF_T 9223372036854775807", + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +# define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; + +int main() { + +; return 0; } +EOF +if { (eval echo configure:1129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_save_CC="$CC" + CC="$CC -n32" + cat > conftest.$ac_ext < + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply "#define LARGE_OFF_T 9223372036854775807", + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +# define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; + +int main() { + +; return 0; } +EOF +if { (eval echo configure:1154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_sys_largefile_CC=' -n32' +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + CC="$ac_save_CC" +fi +rm -f conftest* + fi +fi + +echo "$ac_t""$ac_cv_sys_largefile_CC" 1>&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC="$CC$ac_cv_sys_largefile_CC" + fi + + echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6 +echo "configure:1174: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_cv_sys_file_offset_bits=no + cat > conftest.$ac_ext < + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply "#define LARGE_OFF_T 9223372036854775807", + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +# define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; + +int main() { + +; return 0; } +EOF +if { (eval echo configure:1196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply "#define LARGE_OFF_T 9223372036854775807", + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +# define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; + + +int main() { + +; return 0; } +EOF +if { (eval echo configure:1221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_sys_file_offset_bits=64 +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_sys_file_offset_bits" 1>&6 + if test "$ac_cv_sys_file_offset_bits" != no; then + cat >> confdefs.h <&6 +echo "configure:1241: checking for _LARGE_FILES value needed for large files" >&5 +if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_cv_sys_large_files=no + cat > conftest.$ac_ext < + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply "#define LARGE_OFF_T 9223372036854775807", + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +# define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; + +int main() { + +; return 0; } +EOF +if { (eval echo configure:1263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply "#define LARGE_OFF_T 9223372036854775807", + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +# define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; + + +int main() { + +; return 0; } +EOF +if { (eval echo configure:1288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_sys_large_files=1 +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_sys_large_files" 1>&6 + if test "$ac_cv_sys_large_files" != no; then + cat >> confdefs.h <&6 -echo "configure:1090: checking how to run the C preprocessor" >&5 +echo "configure:1311: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1101,13 +1322,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1118,13 +1339,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1135,13 +1356,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1166,12 +1387,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1170: checking for ANSI C header files" >&5 +echo "configure:1391: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1179,7 +1400,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1196,7 +1417,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1214,7 +1435,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1235,7 +1456,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1246,7 +1467,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1273,17 +1494,17 @@ for ac_hdr in fcntl.h unistd.h malloc.h termios.h termio.h limits.h getopt.h reg do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1277: checking for $ac_hdr" >&5 +echo "configure:1498: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1494,7 +1715,7 @@ fi echo $ac_n "checking whether to use slang""... $ac_c" 1>&6 -echo "configure:1498: checking whether to use slang" >&5 +echo "configure:1719: checking whether to use slang" >&5 CURSES_LIB_NAME="" # Check whether --with-slang or --without-slang was given. if test "${with_slang+set}" = set; then @@ -1514,17 +1735,17 @@ if test "${with_slang+set}" = set; then ac_safe=`echo "slcurses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for slcurses.h""... $ac_c" 1>&6 -echo "configure:1518: checking for slcurses.h" >&5 +echo "configure:1739: checking for slcurses.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1541,21 +1762,21 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for SLtt_initialize in -lslang""... $ac_c" 1>&6 -echo "configure:1545: checking for SLtt_initialize in -lslang" >&5 +echo "configure:1766: checking for SLtt_initialize in -lslang" >&5 _libs=$LIBS LIBS="$LIBS -lslang" if test "$cross_compiling" = yes; then echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2 else cat > conftest.$ac_ext < #include int main () { SLtt_initialize (NULL); return 0; } EOF -if { (eval echo configure:1559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1578,7 +1799,7 @@ else # We might need the term library for termlib in ncurses curses termcap terminfo termlib; do echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6 -echo "configure:1582: checking for tputs in -l${termlib}" >&5 +echo "configure:1803: checking for tputs in -l${termlib}" >&5 ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1586,7 +1807,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l${termlib} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1621,20 +1842,20 @@ fi done echo $ac_n "checking for SLtt_initialize in -lslang $tcap""... $ac_c" 1>&6 -echo "configure:1625: checking for SLtt_initialize in -lslang $tcap" >&5 +echo "configure:1846: checking for SLtt_initialize in -lslang $tcap" >&5 LIBS="$LIBS $tcap" if test "$cross_compiling" = yes; then echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2 else cat > conftest.$ac_ext < #include int main () { SLtt_initialize (NULL); return 0; } EOF -if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1656,20 +1877,20 @@ else echo "$ac_t""no" 1>&6 # We might need the math library echo $ac_n "checking for SLtt_initialize in -lslang $tcap -lm""... $ac_c" 1>&6 -echo "configure:1660: checking for SLtt_initialize in -lslang $tcap -lm" >&5 +echo "configure:1881: checking for SLtt_initialize in -lslang $tcap -lm" >&5 LIBS="$LIBS -lm" if test "$cross_compiling" = yes; then echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2 else cat > conftest.$ac_ext < #include int main () { SLtt_initialize (NULL); return 0; } EOF -if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1726,12 +1947,12 @@ fi for ac_func in snprintf vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1730: checking for $ac_func" >&5 +echo "configure:1951: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1833,7 +2054,7 @@ fi # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1837: checking for $ac_word" >&5 +echo "configure:2058: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1868,7 +2089,7 @@ fi min_glib_version=1.2.4 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:1872: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:2093: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -1891,7 +2112,7 @@ echo "configure:1872: checking for GLIB - version >= $min_glib_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -1967,7 +2188,7 @@ main () } EOF -if { (eval echo configure:1971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2001,7 +2222,7 @@ fi CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -2011,7 +2232,7 @@ int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:2015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -2058,12 +2279,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2062: checking return type of signal handlers" >&5 +echo "configure:2283: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2080,7 +2301,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2099,12 +2320,12 @@ EOF echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2103: checking for vprintf" >&5 +echo "configure:2324: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2151,12 +2372,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2155: checking for _doprnt" >&5 +echo "configure:2376: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2206,12 +2427,12 @@ fi for ac_func in getopt_long do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2210: checking for $ac_func" >&5 +echo "configure:2431: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2267,17 +2488,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2271: checking for $ac_hdr" >&5 +echo "configure:2492: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2304,7 +2525,7 @@ fi done echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:2308: checking for tgetent in -lncurses" >&5 +echo "configure:2529: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2312,7 +2533,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2348,7 +2569,7 @@ fi if eval "test x$CURSES_LIB_NAME = x" then echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:2352: checking for tgetent in -lcurses" >&5 +echo "configure:2573: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2356,7 +2577,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2393,7 +2614,7 @@ fi if eval "test x$CURSES_LIB_NAME = x" then echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:2397: checking for initscr in -lcurses" >&5 +echo "configure:2618: checking for initscr in -lcurses" >&5 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2401,7 +2622,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2437,7 +2658,7 @@ fi if eval "test x$CURSES_LIB_NAME = x" then echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:2441: checking for tgetent in -ltermcap" >&5 +echo "configure:2662: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2445,7 +2666,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2490,7 +2711,7 @@ fi echo $ac_n "checking for use_default_colors in -l$CURSES_LIB_NAME""... $ac_c" 1>&6 -echo "configure:2494: checking for use_default_colors in -l$CURSES_LIB_NAME" >&5 +echo "configure:2715: checking for use_default_colors in -l$CURSES_LIB_NAME" >&5 ac_lib_var=`echo $CURSES_LIB_NAME'_'use_default_colors | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2498,7 +2719,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$CURSES_LIB_NAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2534,7 +2755,7 @@ fi if test x$slang_support != xyes; then echo $ac_n "checking for wresize in -l$CURSES_LIB_NAME""... $ac_c" 1>&6 -echo "configure:2538: checking for wresize in -l$CURSES_LIB_NAME" >&5 +echo "configure:2759: checking for wresize in -l$CURSES_LIB_NAME" >&5 ac_lib_var=`echo $CURSES_LIB_NAME'_'wresize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2542,7 +2763,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$CURSES_LIB_NAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2577,7 +2798,7 @@ else fi echo $ac_n "checking for resizeterm in -l$CURSES_LIB_NAME""... $ac_c" 1>&6 -echo "configure:2581: checking for resizeterm in -l$CURSES_LIB_NAME" >&5 +echo "configure:2802: checking for resizeterm in -l$CURSES_LIB_NAME" >&5 ac_lib_var=`echo $CURSES_LIB_NAME'_'resizeterm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2585,7 +2806,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$CURSES_LIB_NAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2622,12 +2843,12 @@ fi # Taken from aumix (can't tell form the variable name?) echo $ac_n "checking for private member _use_keypad in WINDOW""... $ac_c" 1>&6 -echo "configure:2626: checking for private member _use_keypad in WINDOW" >&5 +echo "configure:2847: checking for private member _use_keypad in WINDOW" >&5 if eval "test \"`echo '$''{'aumix_cv_struct_window_usekeypad'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2638,7 +2859,7 @@ int main() { WINDOW w; w._use_keypad; ; return 0; } EOF -if { (eval echo configure:2642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* aumix_cv_struct_window_usekeypad=yes else @@ -2681,37 +2902,10 @@ then LDFLAGS="$LDFLAGS $glib_libs" fi - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:2692: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2715: checking for $ac_word" >&5 +echo "configure:2909: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2739,12 +2933,12 @@ else fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2743: checking for working const" >&5 +echo "configure:2937: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2814,21 +3008,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2818: checking for inline" >&5 +echo "configure:3012: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2854,12 +3048,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2858: checking for off_t" >&5 +echo "configure:3052: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2887,12 +3081,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2891: checking for size_t" >&5 +echo "configure:3085: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2922,19 +3116,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2926: checking for working alloca.h" >&5 +echo "configure:3120: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2955,12 +3149,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2959: checking for alloca" >&5 +echo "configure:3153: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -3020,12 +3214,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:3024: checking whether alloca needs Cray hooks" >&5 +echo "configure:3218: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3054: checking for $ac_func" >&5 +echo "configure:3248: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3105,7 +3299,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3109: checking stack direction for C alloca" >&5 +echo "configure:3303: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3113,7 +3307,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -3157,17 +3351,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3161: checking for $ac_hdr" >&5 +echo "configure:3355: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3196,12 +3390,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3200: checking for $ac_func" >&5 +echo "configure:3394: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3249,7 +3443,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3253: checking for working mmap" >&5 +echo "configure:3447: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3257,7 +3451,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -3419,60 +3613,23 @@ EOF fi - - echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:3425: checking whether we are using the GNU C Library 2.1 or newer" >&5 -if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "Lucky GNU user" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_gnu_library_2_1=yes -else - rm -rf conftest* - ac_cv_gnu_library_2_1=no -fi -rm -f conftest* - - - -fi - -echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6 - - GLIBC21="$ac_cv_gnu_library_2_1" - - - - for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h + + for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3466: checking for $ac_hdr" >&5 +echo "configure:3623: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3498,17 +3655,16 @@ else fi done - for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ -getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ -strdup strtoul tsearch __argz_count __argz_stringify __argz_next + for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \ +strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3507: checking for $ac_func" >&5 +echo "configure:3663: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3556,184 +3712,85 @@ fi done - - - # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. -if test "${with_libiconv_prefix+set}" = set; then - withval="$with_libiconv_prefix" - - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi - if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi - done - -fi - - - echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:3575: checking for iconv" >&5 -if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - cat > conftest.$ac_ext < -#include -int main() { -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); -; return 0; } -EOF -if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_func_iconv=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS -liconv" - cat > conftest.$ac_ext < -#include -int main() { -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); -; return 0; } -EOF -if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - LIBS="$am_save_LIBS" - fi - -fi - -echo "$ac_t""$am_cv_func_iconv" 1>&6 - if test "$am_cv_func_iconv" = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ICONV 1 -EOF - - echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:3636: checking for iconv declaration" >&5 - if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext < -#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 - -int main() { - -; return 0; } -EOF -if { (eval echo configure:3661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - am_cv_proto_iconv_arg1="" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - am_cv_proto_iconv_arg1="const" -fi -rm -f conftest* - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" -fi - - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - echo "$ac_t""${ac_t:- - }$am_cv_proto_iconv" 1>&6 - cat >> confdefs.h <&6 -echo "configure:3690: checking for nl_langinfo and CODESET" >&5 -if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then + if test "${ac_cv_func_stpcpy+set}" != "set"; then + for ac_func in stpcpy +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:3720: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + int main() { -char* cs = nl_langinfo(CODESET); + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + ; return 0; } EOF -if { (eval echo configure:3702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - am_cv_langinfo_codeset=yes + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - am_cv_langinfo_codeset=no + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi -echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 - if test $am_cv_langinfo_codeset = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_LANGINFO_CODESET 1 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_STPCPY 1 EOF - fi + fi if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3725: checking for LC_MESSAGES" >&5 +echo "configure:3782: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -3754,7 +3811,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3758: checking whether NLS is requested" >&5 +echo "configure:3815: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -3766,9 +3823,25 @@ fi echo "$ac_t""$USE_NLS" 1>&6 - BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no - INTLLIBS= + + # Check whether --with-locale-dir or --without-locale-dir was given. +if test "${with_locale_dir+set}" = set; then + withval="$with_locale_dir" + LOCALE_DIR=$withval +fi + + test -z "$LOCALE_DIR" && LOCALE_DIR='$(datadir)/locale' + + + # Check whether --with-gnu-locale-dir or --without-gnu-locale-dir was given. +if test "${with_gnu_locale_dir+set}" = set; then + withval="$with_gnu_locale_dir" + GNU_LOCALE_DIR=$withval +fi + + test -z "$GNU_LOCALE_DIR" && GNU_LOCALE_DIR='$(prefix)/share/locale' + if test "$USE_NLS" = "yes"; then cat >> confdefs.h <<\EOF @@ -3776,7 +3849,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3780: checking whether included gettext is requested" >&5 +echo "configure:3853: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -3789,24 +3862,23 @@ fi nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - CATOBJEXT=NONE - - - + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3800: checking for libintl.h" >&5 +echo "configure:3872: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3822,144 +3894,132 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:3827: checking for GNU gettext in libc" >&5 -if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then + echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 +echo "configure:3899: checking for gettext in libc" >&5 +if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -extern int _nl_msg_cat_cntr; int main() { -bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr +return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - gt_cv_func_gnugettext1_libc=yes + gt_cv_func_gettext_libc=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - gt_cv_func_gnugettext1_libc=no + gt_cv_func_gettext_libc=no fi rm -f conftest* fi -echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 +echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then - echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:3857: checking for GNU gettext in libintl" >&5 -if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then + if test "$gt_cv_func_gettext_libc" != "yes"; then + echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 +echo "configure:3927: checking for bindtextdomain in -lintl" >&5 +ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $LIBICONV" - cat > conftest.$ac_ext < conftest.$ac_ext < -extern int _nl_msg_cat_cntr; -int main() { -bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr -; return 0; } -EOF -if { (eval echo configure:3873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - gt_cv_func_gnugettext1_libintl=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - gt_cv_func_gnugettext1_libintl=no -fi -rm -f conftest* - LIBS="$gt_save_LIBS" -fi - -echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6 - fi - - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ - && test "$PACKAGE" != gettext; }; then - cat >> confdefs.h <<\EOF -#define HAVE_GETTEXT 1 -EOF - - - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then - INTLLIBS="-lintl $LIBICONV" - fi - - gt_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - for ac_func in dcgettext -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3906: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func(); +char bindtextdomain(); int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - +bindtextdomain() ; return 0; } EOF -if { (eval echo configure:3934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 +echo "configure:3962: checking for gettext in -lintl" >&5 +ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lintl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo intl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 fi -done - LIBS="$gt_save_LIBS" +else + echo "$ac_t""no" 1>&6 +fi - # Extract the first word of "msgfmt", so it can be a program name with args. + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$ac_cv_lib_intl_gettext" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_GETTEXT 1 +EOF + + # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3963: checking for $ac_word" >&5 +echo "configure:4023: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3989,11 +4049,66 @@ if test -n "$MSGFMT"; then else echo "$ac_t""no" 1>&6 fi - if test "$MSGFMT" != "no"; then - # Extract the first word of "gmsgfmt", so it can be a program name with args. + if test "$MSGFMT" != "no"; then + for ac_func in dcgettext +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:4057: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:4085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3997: checking for $ac_word" >&5 +echo "configure:4112: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4026,12 +4141,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - - # Extract the first word of "xgettext", so it can be a program name with args. + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4035: checking for $ac_word" >&5 +echo "configure:4148: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4062,15 +4175,300 @@ else echo "$ac_t""no" 1>&6 fi + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + CATOBJEXT=.gmo + DATADIRNAME=share +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo + DATADIRNAME=lib +fi +rm -f conftest* + INSTOBJEXT=.mo + fi + fi else echo "$ac_t""no" 1>&6 fi + if test "$CATOBJEXT" = "NONE"; then + echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 +echo "configure:4211: checking whether catgets can be used" >&5 + # Check whether --with-catgets or --without-catgets was given. +if test "${with_catgets+set}" = set; then + withval="$with_catgets" + nls_cv_use_catgets=$withval +else + nls_cv_use_catgets=no +fi + + echo "$ac_t""$nls_cv_use_catgets" 1>&6 + + if test "$nls_cv_use_catgets" = "yes"; then + echo $ac_n "checking for main in -li""... $ac_c" 1>&6 +echo "configure:4224: checking for main in -li" >&5 +ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-li $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo i | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + echo $ac_n "checking for catgets""... $ac_c" 1>&6 +echo "configure:4267: checking for catgets" >&5 +if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char catgets(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_catgets) || defined (__stub___catgets) +choke me +#else +catgets(); +#endif + +; return 0; } +EOF +if { (eval echo configure:4295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_catgets=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_catgets=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_CATGETS 1 +EOF + + INTLOBJS="\$(CATOBJS)" + # Extract the first word of "gencat", so it can be a program name with args. +set dummy gencat; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4317: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GENCAT" in + /*) + ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GENCAT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no" + ;; +esac +fi +GENCAT="$ac_cv_path_GENCAT" +if test -n "$GENCAT"; then + echo "$ac_t""$GENCAT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + if test "$GENCAT" != "no"; then + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4353: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GMSGFMT" in + /*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GMSGFMT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" + ;; +esac +fi +GMSGFMT="$ac_cv_path_GMSGFMT" +if test -n "$GMSGFMT"; then + echo "$ac_t""$GMSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test "$GMSGFMT" = "no"; then + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4390: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GMSGFMT" in + /*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then + ac_cv_path_GMSGFMT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" + ;; +esac +fi +GMSGFMT="$ac_cv_path_GMSGFMT" +if test -n "$GMSGFMT"; then + echo "$ac_t""$GMSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + # Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4425: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$XGETTEXT" in + /*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test -n "$XGETTEXT"; then + echo "$ac_t""$XGETTEXT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.cat + INSTOBJEXT=.cat + DATADIRNAME=lib + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi +else + echo "$ac_t""no" 1>&6 +fi + + fi + fi + if test "$CATOBJEXT" = "NONE"; then nls_cv_use_gnu_gettext=yes fi @@ -4081,7 +4479,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4085: checking for $ac_word" >&5 +echo "configure:4483: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4115,7 +4513,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4119: checking for $ac_word" >&5 +echo "configure:4517: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4151,7 +4549,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4155: checking for $ac_word" >&5 +echo "configure:4553: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4183,11 +4581,15 @@ else fi - BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes CATOBJEXT=.gmo - INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h fi if test "$XGETTEXT" != ":"; then @@ -4199,65 +4601,26 @@ fi fi fi - POSUB=po + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h fi + if test -z "$nls_cv_header_intl"; then + # Clean out junk possibly left behind by a previous configuration. + rm -f intl/libintl.h + fi + - if test "$PACKAGE" = gettext; then - BUILD_INCLUDED_LIBINTL=yes - fi - - for ac_prog in bison -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4217: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$INTLBISON"; then - ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_INTLBISON="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -INTLBISON="$ac_cv_prog_INTLBISON" -if test -n "$INTLBISON"; then - echo "$ac_t""$INTLBISON" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$INTLBISON" && break -done - - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:4250: checking version of bison" >&5 - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - echo "$ac_t""$ac_prog_version" 1>&6 - fi - if test $ac_verc_fail = yes; then - INTLBISON=: + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes fi for lang in $ALL_LINGUAS; do @@ -4274,17 +4637,7 @@ echo "configure:4250: checking version of bison" >&5 - - nls_cv_header_intl= - nls_cv_header_libgt= - - DATADIRNAME=share - - INSTOBJEXT=.mo - - - GENCAT=gencat @@ -4293,23 +4646,12 @@ echo "configure:4250: checking version of bison" >&5 LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4297: checking for catalogs to be installed" >&5 +echo "configure:4650: checking for catalogs to be installed" >&5 NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - for desiredlang in ${LINGUAS-$ALL_LINGUAS}; 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 - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac done LINGUAS=$NEW_LINGUAS echo "$ac_t""$LINGUAS" 1>&6 @@ -4320,6 +4662,66 @@ echo "configure:4297: checking for catalogs to be installed" >&5 fi fi + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + + + test -d intl || mkdir intl + if test "$CATOBJEXT" = ".cat"; then + ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 +echo "configure:4678: checking for linux/version.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:4688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + msgformat=linux +else + echo "$ac_t""no" 1>&6 +msgformat=xopen +fi + + + sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + fi + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed + + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + + + MKINSTALLDIRS= if test -n "$ac_aux_dir"; then MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" @@ -4329,8 +4731,21 @@ echo "configure:4297: checking for catalogs to be installed" >&5 fi - INTL_LIBTOOL_SUFFIX_PREFIX= + l= + + test -d po || mkdir po + case "$srcdir" in + .) + posrcprefix="../" ;; + /* | [A-Za-z]:*) + posrcprefix="$srcdir/" ;; + *) + posrcprefix="../$srcdir/" ;; + esac + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES trap '' 1 2 15 @@ -4483,34 +4898,31 @@ s%@GLIB_CONFIG@%$GLIB_CONFIG%g s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g s%@GLIB_LIBS@%$GLIB_LIBS%g s%@CURSES_LIB@%$CURSES_LIB%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g s%@RANLIB@%$RANLIB%g s%@ALLOCA@%$ALLOCA%g -s%@GLIBC21@%$GLIBC21%g -s%@LIBICONV@%$LIBICONV%g s%@USE_NLS@%$USE_NLS%g +s%@LOCALE_DIR@%$LOCALE_DIR%g +s%@GNU_LOCALE_DIR@%$GNU_LOCALE_DIR%g s%@MSGFMT@%$MSGFMT%g s%@GMSGFMT@%$GMSGFMT%g s%@XGETTEXT@%$XGETTEXT%g -s%@INTLBISON@%$INTLBISON%g -s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g +s%@GENCAT@%$GENCAT%g s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g s%@CATALOGS@%$CATALOGS%g s%@CATOBJEXT@%$CATOBJEXT%g +s%@DATADIRNAME@%$DATADIRNAME%g s%@GMOFILES@%$GMOFILES%g +s%@INSTOBJEXT@%$INSTOBJEXT%g +s%@INTLDEPS@%$INTLDEPS%g s%@INTLLIBS@%$INTLLIBS%g s%@INTLOBJS@%$INTLOBJS%g s%@POFILES@%$POFILES%g s%@POSUB@%$POSUB%g -s%@DATADIRNAME@%$DATADIRNAME%g -s%@INSTOBJEXT@%$INSTOBJEXT%g -s%@GENCAT@%$GENCAT%g +s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g +s%@GT_NO@%$GT_NO%g +s%@GT_YES@%$GT_YES%g s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g -s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g +s%@l@%$l%g CEOF EOF @@ -4718,6 +5130,51 @@ cat >> $CONFIG_STATUS <<\EOF fi fi; done +EOF + +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +srcdir=$ac_given_srcdir +while test -n "$ac_sources"; do + set $ac_dests; ac_dest=$1; shift; ac_dests=$* + set $ac_sources; ac_source=$1; shift; ac_sources=$* + + echo "linking $srcdir/$ac_source to $ac_dest" + + if test ! -r $srcdir/$ac_source; then + { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; } + fi + rm -f $ac_dest + + # Make relative symlinks. + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'` + if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then + # The dest file is in a subdirectory. + test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir" + ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dest_dir_suffix. + ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dest_dir_suffix= ac_dots= + fi + + case "$srcdir" in + [/$]*) ac_rel_source="$srcdir/$ac_source" ;; + *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;; + esac + + # Make a symlink if possible; otherwise try a hard link. + if ln -s $ac_rel_source $ac_dest 2>/dev/null || + ln $srcdir/$ac_source $ac_dest; then : + else + { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; } + fi +done EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h -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'` - 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" - sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - fi - ;; - esac - done +case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac exit 0 EOF diff --git a/configure.in b/configure.in index 21670cbe..592135d6 100644 --- a/configure.in +++ b/configure.in @@ -8,6 +8,7 @@ ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv no" dnl Checks for programs. AC_PROG_CC AC_ISC_POSIX +NANO_AC_SYS_LARGEFILE dnl Checks for header files. AC_HEADER_STDC @@ -289,6 +290,6 @@ then fi dnl i18n stuff - pretty incomplete for now -AM_GNU_GETTEXT +NANO_AM_GNU_GETTEXT AC_OUTPUT([Makefile intl/Makefile po/Makefile.in]) diff --git a/intl/ChangeLog b/intl/ChangeLog index df904de3..19895015 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,4 +1,1086 @@ -2001-05-23 GNU +1998-04-29 Ulrich Drepper - * Version 0.10.38 released. + * intl/localealias.c (read_alias_file): Use unsigned char for + local variables. Remove unused variable tp. + * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char * + for type of codeset. For loosing Solaris systems. + * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset. + * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable + len if not needed. + Patches by Jim Meyering. +1998-04-28 Ulrich Drepper + + * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if + mmap is not supported. + + * hash-string.h: Don't include . + +1998-04-27 Ulrich Drepper + + * textdomain.c: Use strdup is available. + + * localealias.c: Define HAVE_MEMPCPY so that we can use this + function. Define and use semapahores to protect modfication of + global objects when compiling for glibc. Add code to allow + freeing alias table. + + * l10nflist.c: Don't assume stpcpy not being a macro. + + * gettextP.h: Define internal_function macri if not already done. + Use glibc byte-swap macros instead of defining SWAP when compiled + for glibc. + (struct loaded_domain): Add elements to allow unloading. + + * Makefile.in (distclean): Don't remove libintl.h here. + + * bindtextdomain.c: Carry over changes from glibc. Use strdup if + available. + + * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal + functions. Add memory freeing code for glibc. + + * dgettext.c: Update copyright. + + * explodename.c: Include stdlib.h and string.h only if they exist. + Use strings.h eventually. + + * finddomain.c: Mark internal functions. Use strdup if available. + Add memory freeing code for glibc. + +1997-10-10 20:00 Ulrich Drepper + + * libgettext.h: Fix dummy textdomain and bindtextdomain macros. + They should return reasonable values. + Reported by Tom Tromey . + +1997-09-16 03:33 Ulrich Drepper + + * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined. + * intlh.inst.in: Likewise. + Reported by Jean-Marc Lasgouttes . + + * libintl.glibc: Update from current glibc version. + +1997-09-06 02:10 Ulrich Drepper + + * intlh.inst.in: Reformat copyright. + +1997-08-19 15:22 Ulrich Drepper + + * dcgettext.c (DCGETTEXT): Remove wrong comment. + +1997-08-16 00:13 Ulrich Drepper + + * Makefile.in (install-data): Don't change directory to install. + +1997-08-01 14:30 Ulrich Drepper + + * cat-compat.c: Fix copyright. + + * localealias.c: Don't define strchr unless !HAVE_STRCHR. + + * loadmsgcat.c: Update copyright. Fix typos. + + * l10nflist.c: Don't define strchr unless !HAVE_STRCHR. + (_nl_make_l10nflist): Handle sponsor and revision correctly. + + * gettext.c: Update copyright. + * gettext.h: Likewise. + * hash-string.h: Likewise. + + * finddomain.c: Remoave dead code. Define strchr only if + !HAVE_STRCHR. + + * explodename.c: Include . + + * explodename.c: Reformat copyright text. + (_nl_explode_name): Fix typo. + + * dcgettext.c: Define and use __set_errno. + (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is + not defined. + + * bindtextdom.c: Pretty printing. + +1997-05-01 02:25 Ulrich Drepper + + * dcgettext.c (guess_category_value): Don't depend on + HAVE_LC_MESSAGES. We don't need the macro here. + Patch by Bruno Haible . + + * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL + macro. Instead use HAVE_LOCALE_NULL and define it when using + glibc, as in dcgettext.c. + Patch by Bruno Haible . + + * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois + Pinard. + +Mon Mar 10 06:51:17 1997 Ulrich Drepper + + * Makefile.in: Implement handling of libtool. + + * gettextP.h: Change data structures for use of generic lowlevel + i18n file handling. + +Wed Dec 4 20:21:18 1996 Ulrich Drepper + + * textdomain.c: Put parentheses around arguments of memcpy macro + definition. + * localealias.c: Likewise. + * l10nflist.c: Likewise. + * finddomain.c: Likewise. + * bindtextdom.c: Likewise. + Reported by Thomas Esken. + +Mon Nov 25 22:57:51 1996 Ulrich Drepper + + * textdomain.c: Move definition of `memcpy` macro to right + position. + +Fri Nov 22 04:01:58 1996 Ulrich Drepper + + * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using + bcopy if not already defined. Reported by Thomas Esken. + * bindtextdom.c: Likewise. + * l10nflist.c: Likewise. + * localealias.c: Likewise. + * textdomain.c: Likewise. + +Tue Oct 29 11:10:27 1996 Ulrich Drepper + + * Makefile.in (libdir): Change to use exec_prefix instead of + prefix. Reported by Knut-HЕvardAksnes . + +Sat Aug 31 03:07:09 1996 Ulrich Drepper + + * l10nflist.c (_nl_normalize_codeset): We convert to lower case, + so don't prepend uppercase `ISO' for only numeric arg. + +Fri Jul 19 00:15:46 1996 Ulrich Drepper + + * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after + definition of _GNU_SOURCE. Patch by Roland McGrath. + + * Makefile.in (uninstall): Fix another bug with `for' loop and + empty arguments. Patch by Jim Meyering. Correct name os + uninstalled files: no intl- prefix anymore. + + * Makefile.in (install-data): Again work around shells which + cannot handle mpty for list. Reported by Jim Meyering. + +Sat Jul 13 18:11:35 1996 Ulrich Drepper + + * Makefile.in (install): Split goal. Now depend on install-exec + and install-data. + (install-exec, install-data): New goals. Created from former + install goal. + Reported by Karl Berry. + +Sat Jun 22 04:58:14 1996 Ulrich Drepper + + * Makefile.in (MKINSTALLDIRS): New variable. Path to + mkinstalldirs script. + (install): use MKINSTALLDIRS variable or if the script is not present + try to find it in the $top_scrdir). + +Wed Jun 19 02:56:56 1996 Ulrich Drepper + + * l10nflist.c: Linux libc *partly* includes the argz_* functions. + Grr. Work around by renaming the static version and use macros + for renaming. + +Tue Jun 18 20:11:17 1996 Ulrich Drepper + + * l10nflist.c: Correct presence test macros of __argz_* functions. + + * l10nflist.c: Include based on test of it instead when + __argz_* functions are available. + Reported by Andreas Schwab. + +Thu Jun 13 15:17:44 1996 Ulrich Drepper + + * explodename.c, l10nflist.c: Define NULL for dumb systems. + +Tue Jun 11 17:05:13 1996 Ulrich Drepper + + * intlh.inst.in, libgettext.h (dcgettext): Rename local variable + result to __result to prevent name clash. + + * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to + get prototype for stpcpy and strcasecmp. + + * intlh.inst.in, libgettext.h: Move declaration of + `_nl_msg_cat_cntr' outside __extension__ block to prevent warning + from gcc's -Wnested-extern option. + +Fri Jun 7 01:58:00 1996 Ulrich Drepper + + * Makefile.in (install): Remove comment. + +Thu Jun 6 17:28:17 1996 Ulrich Drepper + + * Makefile.in (install): Work around for another Buglix stupidity. + Always use an `else' close for `if's. Reported by Nelson Beebe. + + * Makefile.in (intlh.inst): Correct typo in phony rule. + Reported by Nelson Beebe. + +Thu Jun 6 01:49:52 1996 Ulrich Drepper + + * dcgettext.c (read_alias_file): Rename variable alloca_list to + block_list as the macro calls assume. + Patch by Eric Backus. + + * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using + malloc. + (read_alias_file): Rename varriabe alloca_list to block_list as the + macro calls assume. + Patch by Eric Backus. + + * l10nflist.c: Correct conditional for inclusion. + Reported by Roland McGrath. + + * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not + all-@USE_NLS@. + + * Makefile.in (install): intlh.inst comes from local dir, not + $(srcdir). + + * Makefile.in (intlh.inst): Special handling of this goal. If + used in gettext, this is really a rul to construct this file. If + used in any other package it is defined as a .PHONY rule with + empty body. + + * finddomain.c: Extract locale file information handling into + l10nfile.c. Rename local stpcpy__ function to stpcpy. + + * dcgettext.c (stpcpy): Add local definition. + + * l10nflist.c: Solve some portability problems. Patches partly by + Thomas Esken. Add local definition of stpcpy. + +Tue Jun 4 02:47:49 1996 Ulrich Drepper + + * intlh.inst.in: Don't depend including on + HAVE_LOCALE_H. Instead configure must rewrite this fiile + depending on the result of the configure run. + + * Makefile.in (install): libintl.inst is now called intlh.inst. + Add rules for updating intlh.inst from intlh.inst.in. + + * libintl.inst: Renamed to intlh.inst.in. + + * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1 + because gcc has __buitlin_alloca. + Reported by Roland McGrath. + +Mon Jun 3 00:32:16 1996 Ulrich Drepper + + * Makefile.in (installcheck): New goal to fulfill needs of + automake's distcheck. + + * Makefile.in (install): Reorder commands so that VERSION is + found. + + * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in + @datadir@/gettext. + (COMSRCS): Add l10nfile.c. + (OBJECTS): Add l10nfile.o. + (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common). + (DISTFILE.gettext): Remove $(DISTFILES.common). + (all-gettext): Remove goal. + (install): If $(PACKAGE) = gettext install, otherwose do nothing. No + package but gettext itself should install libintl.h + headers. + (dist): Extend goal to work for gettext, too. + (dist-gettext): Remove goal. + + * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc. + +Sun Jun 2 17:33:06 1996 Ulrich Drepper + + * loadmsgcat.c (_nl_load_domain): Parameter is now comes from + find_l10nfile. + +Sat Jun 1 02:23:03 1996 Ulrich Drepper + + * l10nflist.c (__argz_next): Add definition. + + * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca + code. Use new l10nfile handling. + + * localealias.c [!HAVE_ALLOCA]: Add code for handling missing + alloca code. + + * l10nflist.c: Initial revision. + +Tue Apr 2 18:51:18 1996 Ulrich Drepper + + * Makefile.in (all-gettext): New goal. Same as all-yes. + +Thu Mar 28 23:01:22 1996 Karl Eichwalder + + * Makefile.in (gettextsrcdir): Define using @datadir@. + +Tue Mar 26 12:39:14 1996 Ulrich Drepper + + * finddomain.c: Include . Reported by Roland McGrath. + +Sat Mar 23 02:00:35 1996 Ulrich Drepper + + * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing + with external declaration. + +Sat Mar 2 00:47:09 1996 Ulrich Drepper + + * Makefile.in (all-no): Rename from all_no. + +Sat Feb 17 00:25:59 1996 Ulrich Drepper + + * gettextP.h [loaded_domain]: Array `successor' must now contain up + to 63 elements (because of codeset name normalization). + + * finddomain.c: Implement codeset name normalization. + +Thu Feb 15 04:39:09 1996 Ulrich Drepper + + * Makefile.in (all): Define to `all-@USE_NLS@'. + (all-yes, all_no): New goals. `all-no' is noop, `all-yes' + is former all. + +Mon Jan 15 21:46:01 1996 Howard Gayle + + * localealias.c (alias_compare): Increment string pointers in loop + of strcasecmp replacement. + +Fri Dec 29 21:16:34 1995 Ulrich Drepper + + * Makefile.in (install-src): Who commented this goal out ? :-) + +Fri Dec 29 15:08:16 1995 Ulrich Drepper + + * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls + should not effect it because a missing catalog is no error. + Reported by Harald Knig . + +Tue Dec 19 22:09:13 1995 Ulrich Drepper + + * Makefile.in (Makefile): Explicitly use $(SHELL) for running + shell scripts. + +Fri Dec 15 17:34:59 1995 Andreas Schwab + + * Makefile.in (install-src): Only install library and header when + we use the own implementation. Don't do it when using the + system's gettext or catgets functions. + + * dcgettext.c (find_msg): Must not swap domain->hash_size here. + +Sat Dec 9 16:24:37 1995 Ulrich Drepper + + * localealias.c, libintl.inst, libgettext.h, hash-string.h, + gettextP.h, finddomain.c, dcgettext.c, cat-compat.c: + Use PARAMS instead of __P. Suggested by Roland McGrath. + +Tue Dec 5 11:39:14 1995 Larry Schwimmer + + * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if + !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty. + +Mon Dec 4 15:42:07 1995 Ulrich Drepper + + * Makefile.in (install-src): + Install libintl.inst instead of libintl.h.install. + +Sat Dec 2 22:51:38 1995 Marcus Daniels + + * cat-compat.c (textdomain): + Reverse order in which files are tried you load. First + try local file, when this failed absolute path. + +Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe + + * cat-compat.c (bindtextdomain): Add missing { }. + +Sun Nov 26 18:21:41 1995 Ulrich Drepper + + * libintl.inst: Add missing __P definition. Reported by Nelson Beebe. + + * Makefile.in: + Add dummy `all' and `dvi' goals. Reported by Tom Tromey. + +Sat Nov 25 16:12:01 1995 Franc,ois Pinard + + * hash-string.h: Capitalize arguments of macros. + +Sat Nov 25 12:01:36 1995 Ulrich Drepper + + * Makefile.in (DISTFILES): Prevent files names longer than 13 + characters. libintl.h.glibc->libintl.glibc, + libintl.h.install->libintl.inst. Reported by Joshua R. Poulson. + +Sat Nov 25 11:31:12 1995 Eric Backus + + * dcgettext.c: Fix bug in preprocessor conditionals. + +Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe + + * libgettext.h: Solaris cc does not understand + #if !SYMBOL1 && !SYMBOL2. Sad but true. + +Thu Nov 23 16:22:14 1995 Ulrich Drepper + + * hash-string.h (hash_string): + Fix for machine with >32 bit `unsigned long's. + + * dcgettext.c (DCGETTEXT): + Fix horrible bug in loop for alternative translation. + +Thu Nov 23 01:45:29 1995 Ulrich Drepper + + * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed: + Some further simplifications in message number generation. + +Mon Nov 20 21:08:43 1995 Ulrich Drepper + + * libintl.h.glibc: Use __const instead of const in prototypes. + + * Makefile.in (install-src): + Install libintl.h.install instead of libintl.h. This + is a stripped-down version. Suggested by Peter Miller. + + * libintl.h.install, libintl.h.glibc: Initial revision. + + * localealias.c (_nl_expand_alias, read_alias_file): + Protect prototypes in type casts by __P. + +Tue Nov 14 16:43:58 1995 Ulrich Drepper + + * hash-string.h: Correct prototype for hash_string. + +Sun Nov 12 12:42:30 1995 Ulrich Drepper + + * hash-string.h (hash_string): Add prototype. + + * gettextP.h: Fix copyright. + (SWAP): Add prototype. + +Wed Nov 8 22:56:33 1995 Ulrich Drepper + + * localealias.c (read_alias_file): Forgot sizeof. + Avoid calling *printf function. This introduces a big overhead. + Patch by Roland McGrath. + +Tue Nov 7 14:21:08 1995 Ulrich Drepper + + * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy. + + * finddomain.c (stpcpy): + Define substitution function local. The macro was to flaky. + + * cat-compat.c: Fix typo. + + * xopen-msg.sed, linux-msg.sed: + While bringing message number to right place only accept digits. + + * linux-msg.sed, xopen-msg.sed: Now that the counter does not have + leading 0s we don't need to remove them. Reported by Marcus + Daniels. + + * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in + dependency. Reported by Marcus Daniels. + + * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement. + Generally cleanup using #if instead of #ifndef. + + * Makefile.in: Correct typos in comment. By Franc,ois Pinard. + +Mon Nov 6 00:27:02 1995 Ulrich Drepper + + * Makefile.in (install-src): Don't install libintl.h and libintl.a + if we use an available gettext implementation. + +Sun Nov 5 22:02:08 1995 Ulrich Drepper + + * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported + by Franc,ois Pinard. + + * libgettext.h: Use #if instead of #ifdef/#ifndef. + + * finddomain.c: + Comments describing what has to be done should start with FIXME. + +Sun Nov 5 19:38:01 1995 Ulrich Drepper + + * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning. + DISTFILES.common names the files common to both dist goals. + DISTFILES.gettext are the files only distributed in GNU gettext. + +Sun Nov 5 17:32:54 1995 Ulrich Drepper + + * dcgettext.c (DCGETTEXT): Correct searching in derived locales. + This was necessary since a change in _nl_find_msg several weeks + ago. I really don't know this is still not fixed. + +Sun Nov 5 12:43:12 1995 Ulrich Drepper + + * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This + might mark a special condition. + + * finddomain.c (make_entry_rec): Don't make illegal entry as decided. + + * Makefile.in (dist): Suppress error message when ln failed. + Get files from $(srcdir) explicitly. + + * libgettext.h (gettext_const): Rename to gettext_noop. + +Fri Nov 3 07:36:50 1995 Ulrich Drepper + + * finddomain.c (make_entry_rec): + Protect against wrong locale names by testing mask. + + * libgettext.h (gettext_const): Add macro definition. + Capitalize macro arguments. + +Thu Nov 2 23:15:51 1995 Ulrich Drepper + + * finddomain.c (_nl_find_domain): + Test for pointer != NULL before accessing value. + Reported by Tom Tromey. + + * gettext.c (NULL): + Define as (void*)0 instad of 0. Reported by Franc,ois Pinard. + +Mon Oct 30 21:28:52 1995 Ulrich Drepper + + * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering. + +Sat Oct 28 23:20:47 1995 Ulrich Drepper + + * libgettext.h: Disable dcgettext optimization for Solaris 2.3. + + * localealias.c (alias_compare): + Peter Miller reported that tolower in some systems is + even dumber than I thought. Protect call by `isupper'. + +Fri Oct 27 22:22:51 1995 Ulrich Drepper + + * Makefile.in (libdir, includedir): New variables. + (install-src): Install libintl.a and libintl.h in correct dirs. + +Fri Oct 27 22:07:29 1995 Ulrich Drepper + + * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c. + + * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques. + + * localealias.c: + Fix typo and superflous test. Reported by Christian von Roques. + +Fri Oct 6 11:52:05 1995 Ulrich Drepper + + * finddomain.c (_nl_find_domain): + Correct some remainder from the pre-CEN syntax. Now + we don't have a constant number of successors anymore. + +Wed Sep 27 21:41:13 1995 Ulrich Drepper + + * Makefile.in (DISTFILES): Add libintl.h.glibc. + + * Makefile.in (dist-libc): Add goal for packing sources for glibc. + (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc. + + * loadmsgcat.c: Forget to continue #if line. + + * localealias.c: + [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name + space clean. + + * dcgettext.c, finddomain.c: Better comment to last change. + + * loadmsgcat.c: + [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to + __fstat, __open, __close, __read, __mmap, and __munmap resp + to keep ANSI C name space clean. + + * finddomain.c: + [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean. + + * dcgettext.c: + [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to + keep ANSI C name space clean. + + * libgettext.h: + Include sys/types.h for those old SysV systems out there. + Reported by Francesco Potorti`. + + * loadmsgcat.c (use_mmap): Define if compiled for glibc. + + * bindtextdom.c: Include all those standard headers + unconditionally if _LIBC is defined. + + * finddomain.c: Fix 2 times defiend -> defined. + + * textdomain.c: Include libintl.h instead of libgettext.h when + compiling for glibc. Include all those standard headers + unconditionally if _LIBC is defined. + + * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc. + + * gettext.c: + Include libintl.h instead of libgettext.h when compiling for glibc. + Get NULL from stddef.h if we compile for glibc. + + * finddomain.c: Include libintl.h instead of libgettext.h when + compiling for glibc. Include all those standard headers + unconditionally if _LIBC is defined. + + * dcgettext.c: Include all those standard headers unconditionally + if _LIBC is defined. + + * dgettext.c: If compiled in glibc include libintl.h instead of + libgettext.h. + (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc. + + * dcgettext.c: If compiled in glibc include libintl.h instead of + libgettext.h. + (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc. + + * bindtextdom.c: + If compiled in glibc include libintl.h instead of libgettext.h. + +Mon Sep 25 22:23:06 1995 Ulrich Drepper + + * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0. + Reported by Marcus Daniels. + + * cat-compat.c (bindtextdomain): + String used in putenv must not be recycled. + Reported by Marcus Daniels. + + * libgettext.h (__USE_GNU_GETTEXT): + Additional symbol to signal that we use GNU gettext + library. + + * cat-compat.c (bindtextdomain): + Fix bug with the strange stpcpy replacement. + Reported by Nelson Beebe. + +Sat Sep 23 08:23:51 1995 Ulrich Drepper + + * cat-compat.c: Include for stpcpy prototype. + + * localealias.c (read_alias_file): + While expand strdup code temporary variable `cp' hided + higher level variable with same name. Rename to `tp'. + + * textdomain.c (textdomain): + Avoid warning by using temporary variable in strdup code. + + * finddomain.c (_nl_find_domain): Remove unused variable `application'. + +Thu Sep 21 15:51:44 1995 Ulrich Drepper + + * localealias.c (alias_compare): + Use strcasecmp() only if available. Else use + implementation in place. + + * intl-compat.c: + Wrapper functions now call *__ functions instead of __*. + + * libgettext.h: Declare prototypes for *__ functions instead for __*. + + * cat-compat.c, loadmsgcat.c: + Don't use xmalloc, xstrdup, and stpcpy. These functions are not part + of the standard libc and so prevent libintl.a from being used + standalone. + + * bindtextdom.c: + Don't use xmalloc, xstrdup, and stpcpy. These functions are not part + of the standard libc and so prevent libintl.a from being used + standalone. + Rename to bindtextdomain__ if not used in GNU C Library. + + * dgettext.c: + Rename function to dgettext__ if not used in GNU C Library. + + * gettext.c: + Don't use xmalloc, xstrdup, and stpcpy. These functions are not part + of the standard libc and so prevent libintl.a from being used + standalone. + Functions now called gettext__ if not used in GNU C Library. + + * dcgettext.c, localealias.c, textdomain.c, finddomain.c: + Don't use xmalloc, xstrdup, and stpcpy. These functions are not part + of the standard libc and so prevent libintl.a from being used + standalone. + +Sun Sep 17 23:14:49 1995 Ulrich Drepper + + * finddomain.c: Correct some bugs in handling of CEN standard + locale definitions. + +Thu Sep 7 01:49:28 1995 Ulrich Drepper + + * finddomain.c: Implement CEN syntax. + + * gettextP.h (loaded_domain): Extend number of successors to 31. + +Sat Aug 19 19:25:29 1995 Ulrich Drepper + + * Makefile.in (aliaspath): Remove path to X11 locale dir. + + * Makefile.in: Make install-src depend on install. This helps + gettext to install the sources and other packages can use the + install goal. + +Sat Aug 19 15:19:33 1995 Ulrich Drepper + + * Makefile.in (uninstall): Remove stuff installed by install-src. + +Tue Aug 15 13:13:53 1995 Ulrich Drepper + + * VERSION.in: Initial revision. + + * Makefile.in (DISTFILES): + Add VERSION file. This is not necessary for gettext, but + for other packages using this library. + +Tue Aug 15 06:16:44 1995 Ulrich Drepper + + * gettextP.h (_nl_find_domain): + New prototype after changing search strategy. + + * finddomain.c (_nl_find_domain): + We now try only to find a specified catalog. Fall back to other + catalogs listed in the locale list is now done in __dcgettext. + + * dcgettext.c (__dcgettext): + Now we provide message fall back even to different languages. + I.e. if a message is not available in one language all the other + in the locale list a tried. Formerly fall back was only possible + within one language. Implemented by moving one loop from + _nl_find_domain to here. + +Mon Aug 14 23:45:50 1995 Ulrich Drepper + + * Makefile.in (gettextsrcdir): + Directory where source of GNU gettext library are made + available. + (INSTALL, INSTALL_DATA): Programs used for installing sources. + (gettext-src): New. Rule to install GNU gettext sources for use in + gettextize shell script. + +Sun Aug 13 14:40:48 1995 Ulrich Drepper + + * loadmsgcat.c (_nl_load_domain): + Use mmap for loading only when munmap function is + also available. + + * Makefile.in (install): Depend on `all' goal. + +Wed Aug 9 11:04:33 1995 Ulrich Drepper + + * localealias.c (read_alias_file): + Do not overwrite '\n' when terminating alias value string. + + * localealias.c (read_alias_file): + Handle long lines. Ignore the rest not fitting in + the buffer after the initial `fgets' call. + +Wed Aug 9 00:54:29 1995 Ulrich Drepper + + * gettextP.h (_nl_load_domain): + Add prototype, replacing prototype for _nl_load_msg_cat. + + * finddomain.c (_nl_find_domain): + Remove unneeded variable filename and filename_len. + (expand_alias): Remove prototype because functions does not + exist anymore. + + * localealias.c (read_alias_file): + Change type of fname_len parameter to int. + (xmalloc): Add prototype. + + * loadmsgcat.c: Better prototypes for xmalloc. + +Tue Aug 8 22:30:39 1995 Ulrich Drepper + + * finddomain.c (_nl_find_domain): + Allow alias name to be constructed from the four components. + + * Makefile.in (aliaspath): New variable. Set to preliminary value. + (SOURCES): Add localealias.c. + (OBJECTS): Add localealias.o. + + * gettextP.h: Add prototype for _nl_expand_alias. + + * finddomain.c: Aliasing handled in intl/localealias.c. + + * localealias.c: Aliasing for locale names. + + * bindtextdom.c: Better prototypes for xmalloc and xstrdup. + +Mon Aug 7 23:47:42 1995 Ulrich Drepper + + * Makefile.in (DISTFILES): gettext.perl is now found in misc/. + + * cat-compat.c (bindtextdomain): + Correct implementation. dirname parameter was not used. + Reported by Marcus Daniels. + + * gettextP.h (loaded_domain): + New fields `successor' and `decided' for oo, lazy + message handling implementation. + + * dcgettext.c: + Adopt for oo, lazy message handliing. + Now we can inherit translations from less specific locales. + (find_msg): New function. + + * loadmsgcat.c, finddomain.c: + Complete rewrite. Implement oo, lazy message handling :-). + We now have an additional environment variable `LANGUAGE' with + a higher priority than LC_ALL for the LC_MESSAGE locale. + Here we can set a colon separated list of specifications each + of the form `language[_territory[.codeset]][@modifier]'. + +Sat Aug 5 09:55:42 1995 Ulrich Drepper + + * finddomain.c (unistd.h): + Include to get _PC_PATH_MAX defined on system having it. + +Fri Aug 4 22:42:00 1995 Ulrich Drepper + + * finddomain.c (stpcpy): Include prototype. + + * Makefile.in (dist): Remove `copying instead' message. + +Wed Aug 2 18:52:03 1995 Ulrich Drepper + + * Makefile.in (ID, TAGS): Do not use $^. + +Tue Aug 1 20:07:11 1995 Ulrich Drepper + + * Makefile.in (TAGS, ID): Use $^ as command argument. + (TAGS): Give etags -o option t write to current directory, + not $(srcdir). + (ID): Use $(srcdir) instead os $(top_srcdir)/src. + (distclean): Remove ID. + +Sun Jul 30 11:51:46 1995 Ulrich Drepper + + * Makefile.in (gnulocaledir): + New variable, always using share/ for data directory. + (DEFS): Add GNULOCALEDIR, used in finddomain.c. + + * finddomain.c (_nl_default_dirname): + Set to GNULOCALEDIR, because it always has to point + to the directory where GNU gettext Library writes it to. + + * intl-compat.c (textdomain, bindtextdomain): + Undefine macros before function definition. + +Sat Jul 22 01:10:02 1995 Ulrich Drepper + + * libgettext.h (_LIBINTL_H): + Protect definition in case where this file is included as + libgettext.h on Solaris machines. Add comment about this. + +Wed Jul 19 02:36:42 1995 Ulrich Drepper + + * intl-compat.c (textdomain): Correct typo. + +Wed Jul 19 01:51:35 1995 Ulrich Drepper + + * dcgettext.c (dcgettext): Function now called __dcgettext. + + * dgettext.c (dgettext): Now called __dgettext and calls + __dcgettext. + + * gettext.c (gettext): + Function now called __gettext and calls __dgettext. + + * textdomain.c (textdomain): Function now called __textdomain. + + * bindtextdom.c (bindtextdomain): Function now called + __bindtextdomain. + + * intl-compat.c: Initial revision. + + * Makefile.in (SOURCES): Add intl-compat.c. + (OBJECTS): We always compile the GNU gettext library functions. + OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o, + and intl-compat.o. + (GETTOBJS): Contains now only intl-compat.o. + + * libgettext.h: + Re-include protection matches dualistic character of libgettext.h. + For all functions in GNU gettext library define __ counter part. + + * finddomain.c (strchr): Define as index if not found in C library. + (_nl_find_domain): For relative paths paste / in between. + +Tue Jul 18 16:37:45 1995 Ulrich Drepper + + * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h. + + * xopen-msg.sed: Fix bug with `msgstr ""' lines. + A little bit better comments. + +Tue Jul 18 01:18:27 1995 Ulrich Drepper + + * Makefile.in: + po-mode.el, makelinks, combine-sh are now found in ../misc. + + * po-mode.el, makelinks, combine-sh, elisp-comp: + Moved to ../misc/. + + * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__. + +Sun Jul 16 22:33:02 1995 Ulrich Drepper + + * Makefile.in (INSTALL, INSTALL_DATA): New variables. + (install-data, uninstall): Install/uninstall .elc file. + + * po-mode.el (Installation comment): + Add .pox as possible extension of .po files. + +Sun Jul 16 13:23:27 1995 Ulrich Drepper + + * elisp-comp: Complete new version by Franc,ois: This does not + fail when not compiling in the source directory. + +Sun Jul 16 00:12:17 1995 Ulrich Drepper + + * Makefile.in (../po/cat-id-tbl.o): + Use $(MAKE) instead of make for recursive make. + + * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh. + (install-exec): Add missing dummy goal. + (install-data, uninstall): @ in multi-line shell command at + beginning, not in front of echo. Reported by Eric Backus. + +Sat Jul 15 00:21:28 1995 Ulrich Drepper + + * Makefile.in (DISTFILES): + Rename libgettext.perl to gettext.perl to fit in 14 chars + file systems. + + * gettext.perl: + Rename to gettext.perl to fit in 14 chars file systems. + +Thu Jul 13 23:17:20 1995 Ulrich Drepper + + * cat-compat.c: If !STDC_HEADERS try to include malloc.h. + +Thu Jul 13 20:55:02 1995 Ulrich Drepper + + * po2tbl.sed.in: Pretty printing. + + * linux-msg.sed, xopen-msg.sed: + Correct bugs with handling substitute flags in branches. + + * hash-string.h (hash_string): + Old K&R compilers don't under stand `unsigned char'. + + * gettext.h (nls_uint32): + Some old K&R compilers (eg HP) don't understand `unsigned int'. + + * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes. + +Thu Jul 13 01:34:33 1995 Ulrich Drepper + + * Makefile.in (ELCFILES): New variable. + (DISTFILES): Add elisp-comp. + Add implicit rule for .el -> .elc compilation. + (install-data): install $ELCFILES + (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp. + + * elisp-comp: Initial revision + +Wed Jul 12 16:14:52 1995 Ulrich Drepper + + * Makefile.in: + cat-id-tbl.c is now found in po/. This enables us to use an identical + intl/ directory in all packages. + + * dcgettext.c (dcgettext): hashing does not work for table size <= 2. + + * textdomain.c: fix typo (#if def -> #if defined) + +Tue Jul 11 18:44:43 1995 Ulrich Drepper + + * Makefile.in (stamp-cat-id): use top_srcdir to address source files + (DISTFILES,distclean): move tupdate.perl to src/ + + * po-to-tbl.sed.in: + add additional jump to clear change flag to recognize multiline strings + +Tue Jul 11 01:32:50 1995 Ulrich Drepper + + * textdomain.c: Protect inclusion of stdlib.h and string.h. + + * loadmsgcat.c: Protect inclusion of stdlib.h. + + * libgettext.h: Protect inclusion of locale.h. + Allow use in C++ programs. + Define NULL is not happened already. + + * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of + po-to-tbl.sed. + (distclean): remove po-to-tbl.sed and tupdate.perl. + + * tupdate.perl.in: Substitute Perl path even in exec line. + Don't include entries without translation from old .po file. + +Tue Jul 4 00:41:51 1995 Ulrich Drepper + + * tupdate.perl.in: use "Updated: " in msgid "". + + * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR). + Define getenv if !__STDC__. + + * bindtextdom.c: Protect stdlib.h and string.h inclusion. + Define free if !__STDC__. + + * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. + Define free if !__STDC__. + + * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. + +Mon Jul 3 23:56:30 1995 Ulrich Drepper + + * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR. + Remove unneeded $(srcdir) from Makefile.in dependency. + + * makelinks: Add copyright and short description. + + * po-mode.el: Last version for 0.7. + + * tupdate.perl.in: Fix die message. + + * dcgettext.c: Protect include of string.h. + + * gettext.c: Protect include of stdlib.h and further tries to get NULL. + + * finddomain.c: Some corrections in includes. + + * Makefile.in (INCLUDES): Prune list correct path to Makefile.in. + + * po-to-tbl.sed: Adopt for new .po file format. + + * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format. + +Sun Jul 2 23:55:03 1995 Ulrich Drepper + + * tupdate.perl.in: Complete rewrite for new .po file format. + +Sun Jul 2 02:06:50 1995 Ulrich Drepper + + * First official release. This directory contains all the code + needed to internationalize own packages. It provides functions + which allow to use the X/Open catgets function with an interface + like the Uniforum gettext function. For system which does not + have neither of those a complete implementation is provided. diff --git a/intl/Makefile.in b/intl/Makefile.in index 889ba239..a41fb579 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -1,5 +1,5 @@ # Makefile for directory with message catalog handling in GNU NLS Utilities. -# Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,106 +28,75 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ transform = @program_transform_name@ -libdir = @libdir@ -includedir = @includedir@ -datadir = @datadir@ +libdir = $(exec_prefix)/lib +includedir = $(prefix)/include +datadir = $(prefix)/@DATADIRNAME@ localedir = $(datadir)/locale -gettextsrcdir = $(datadir)/gettext/intl -aliaspath = $(localedir) +gnulocaledir = $(prefix)/share/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@ +l = @l@ 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)\" @DEFS@ +DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ +-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@ CPPFLAGS = @CPPFLAGS@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h +HEADERS = $(COMHDRS) libgettext.h loadinfo.h COMHDRS = gettext.h gettextP.h hash-string.h -SOURCES = $(COMSRCS) intl-compat.c +SOURCES = $(COMSRCS) intl-compat.c cat-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 \ -localcharset.c +explodename.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 localcharset.$lo +explodename.$lo +CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$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.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \ +xopen-msg.sed $(HEADERS) $(SOURCES) DISTFILES.normal = VERSION -DISTFILES.gettext = libintl.glibc -DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.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=1 -LTV_REVISION=1 -LTV_AGE=0 +DISTFILES.gettext = libintl.glibc intlh.inst.in .SUFFIXES: -.SUFFIXES: .c .y .o .lo .sin .sed +.SUFFIXES: .c .o .lo .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 +INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib 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) +all-yes: libintl.$la intlh.inst +all-no: + +libintl.a: $(OBJECTS) rm -f $@ $(AR) cru $@ $(OBJECTS) $(RANLIB) $@ -libintl.la libgnuintl.la: $(OBJECTS) - $(LIBTOOL) --mode=link \ - $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ - $(OBJECTS) @LIBICONV@ \ - -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ - -rpath $(libdir) \ - -no-undefined +libintl.la: $(OBJECTS) + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ + -version-info 1:0 -rpath $(libdir) -libintl.h: libgnuintl.h - cp $(srcdir)/libgnuintl.h libintl.h - -charset.alias: config.charset - $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ - mv t-$@ $@ +../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot + cd ../po && $(MAKE) cat-id-tbl.$lo check: all @@ -135,70 +104,36 @@ check: all # only use the library should use install instead. # We must not install the libintl.h/libintl.a files if we are on a -# system which has the GNU gettext() function in its C library or in a -# separate library. +# system which has the gettext() function in its C library or in a +# separate library or use the catgets interface. A special case is +# where configure found a previously installed GNU gettext library. # 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 \ - $(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; \ + if test -r $(MKINSTALLDIRS); then \ + $(MKINSTALLDIRS) $(libdir) $(includedir); \ else \ - if test @GLIBC21@ = no; then \ - orig=charset.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ - fi; \ + $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ 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; \ + $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ + $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ 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; \ + if test -r $(MKINSTALLDIRS); then \ + $(MKINSTALLDIRS) $(gettextsrcdir); \ + else \ + $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ + fi; \ + $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \ dists="$(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; \ + $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \ done; \ else \ : ; \ @@ -208,51 +143,14 @@ install-data: all 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 $(DISTFILES.common) $(DISTFILES.generated); do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - else \ - : ; \ - fi + dists="$(DISTFILES.common)"; \ + for file in $$dists; do \ + rm -f $(gettextsrcdir)/$$file; \ + done info dvi: -$(OBJECTS): ../config.h libgnuintl.h +$(OBJECTS): ../config.h libgettext.h bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h @@ -268,19 +166,12 @@ 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 + rm -f *.a *.o *.lo core core.* clean: mostlyclean distclean: clean - rm -f Makefile ID TAGS - if test "$(PACKAGE)" = gettext; then \ - rm -f ChangeLog.inst $(DISTFILES.normal); \ - else \ - : ; \ - fi + rm -f Makefile ID TAGS po2msg.sed po2tbl.sed libintl.h maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @@ -290,23 +181,34 @@ maintainer-clean: distclean # 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 +dist distdir: Makefile $(DISTFILES) 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; \ - ln $$dir/$$file $(distdir) 2> /dev/null \ - || cp -p $$dir/$$file $(distdir); \ + for file in $(DISTFILES.common) $$additional; do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ done +dist-libc: + tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc + Makefile: Makefile.in ../config.status cd .. \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +# The dependency for intlh.inst is different in gettext and all other +# packages. Because we cannot you GNU make features we have to solve +# the problem while rewriting Makefile.in. +@GT_YES@intlh.inst: intlh.inst.in ../config.status +@GT_YES@ cd .. \ +@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ +@GT_YES@ $(SHELL) ./config.status +@GT_NO@.PHONY: intlh.inst +@GT_NO@intlh.inst: + # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/intl/VERSION b/intl/VERSION index 268da64a..ee66b061 100644 --- a/intl/VERSION +++ b/intl/VERSION @@ -1 +1 @@ -GNU gettext library from gettext-0.10.38 +GNU gettext library from gettext-0.10.35 diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c index 7e5a74a4..d9c3f349 100644 --- a/intl/bindtextdom.c +++ b/intl/bindtextdom.c @@ -1,5 +1,5 @@ /* Implementation of the bindtextdomain(3) function - Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 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 @@ -19,40 +19,33 @@ # include #endif -#include -#include -#include +#if defined STDC_HEADERS || defined _LIBC +# include +#else +# ifdef HAVE_MALLOC_H +# include +# else +void free (); +# endif +#endif + +#if defined HAVE_STRING_H || defined _LIBC +# include +#else +# include +# ifndef memcpy +# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) +# endif +#endif #ifdef _LIBC # include #else -# include "libgnuintl.h" +# include "libgettext.h" #endif +#include "gettext.h" #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 _nl_default_dirname__ -# define _nl_domain_bindings _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. */ @@ -61,9 +54,6 @@ 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) - /* Names for the libintl functions are a problem. They must not clash with existing names and they should follow ANSI C. But this source @@ -71,48 +61,25 @@ __libc_rwlock_define (extern, _nl_state_lock) prefix. So we have to make a difference here. */ #ifdef _LIBC # define BINDTEXTDOMAIN __bindtextdomain -# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset # ifndef strdup # define strdup(str) __strdup (str) # endif #else # define BINDTEXTDOMAIN bindtextdomain__ -# define BIND_TEXTDOMAIN_CODESET 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) +/* 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 **dirnamep; - const char **codesetp; + const char *dirname; { 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; + return NULL; for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) { @@ -128,173 +95,83 @@ set_binding_values (domainname, dirnamep, codesetp) } } + if (dirname == NULL) + /* The current binding has be to returned. */ + return binding == NULL ? (char *) _nl_default_dirname : binding->dirname; + if (binding != NULL) { - if (dirnamep) + /* The domain is already bound. If the new value and the old + one are equal we simply do nothing. Otherwise replace the + old binding. */ + if (strcmp (dirname, binding->dirname) != 0) { - const char *dirname = *dirnamep; + char *new_dirname; - if (dirname == NULL) - /* The current binding has be to returned. */ - *dirnamep = binding->dirname; + if (strcmp (dirname, _nl_default_dirname) == 0) + new_dirname = (char *) _nl_default_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); + new_dirname = strdup (dirname); + if (new_dirname == NULL) + return NULL; #else - size_t len = strlen (dirname) + 1; - result = (char *) malloc (len); - if (__builtin_expect (result != NULL, 1)) - memcpy (result, dirname, len); + size_t len = strlen (dirname) + 1; + new_dirname = (char *) malloc (len); + if (new_dirname == NULL) + return NULL; + + memcpy (new_dirname, dirname, len); #endif - } - - if (__builtin_expect (result != NULL, 1)) - { - if (binding->dirname != _nl_default_dirname) - free (binding->dirname); - - binding->dirname = result; - modified = 1; - } - } - *dirnamep = result; } + + if (binding->dirname != _nl_default_dirname) + free (binding->dirname); + + binding->dirname = new_dirname; } - - 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; +#if !defined _LIBC && !defined HAVE_STRDUP + size_t len; +#endif struct binding *new_binding = - (struct binding *) malloc (offsetof (struct binding, domainname) + len); + (struct binding *) malloc (sizeof (*new_binding)); - if (__builtin_expect (new_binding == NULL, 0)) - goto failed; + if (new_binding == NULL) + return NULL; +#if defined _LIBC || defined HAVE_STRDUP + new_binding->domainname = strdup (domainname); + if (new_binding->domainname == NULL) + return NULL; +#else + len = strlen (domainname) + 1; + new_binding->domainname = (char *) malloc (len); + if (new_binding->domainname == NULL) + return NULL; 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. */ + + if (strcmp (dirname, _nl_default_dirname) == 0) 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; + { +#if defined _LIBC || defined HAVE_STRDUP + new_binding->dirname = strdup (dirname); + if (new_binding->dirname == NULL) + return NULL; +#else + len = strlen (dirname) + 1; + new_binding->dirname = (char *) malloc (len); + if (new_binding->dirname == NULL) + return NULL; + memcpy (new_binding->dirname, dirname, len); +#endif + } /* Now enqueue it. */ if (_nl_domain_bindings == NULL @@ -314,55 +191,13 @@ set_binding_values (domainname, dirnamep, codesetp) 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; - } + binding = new_binding; } - /* 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; + return binding->dirname; } #ifdef _LIBC -/* Aliases for function names in GNU C Library. */ +/* Alias for function name in GNU C Library. */ weak_alias (__bindtextdomain, bindtextdomain); -weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset); #endif diff --git a/intl/dcgettext.c b/intl/dcgettext.c index 469e78de..0f7bb486 100644 --- a/intl/dcgettext.c +++ b/intl/dcgettext.c @@ -1,5 +1,5 @@ /* Implementation of the dcgettext(3) function. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 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 @@ -19,25 +19,220 @@ # include #endif +#include + +#if defined __GNUC__ && !defined C_ALLOCA +# define alloca __builtin_alloca +# define HAVE_ALLOCA 1 +#else +# if (defined HAVE_ALLOCA_H || defined _LIBC) && !defined C_ALLOCA +# 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 + +#if defined STDC_HEADERS || defined _LIBC +# include +#else +char *getenv (); +# ifdef HAVE_MALLOC_H +# include +# else +void free (); +# endif +#endif + +#if defined HAVE_STRING_H || defined _LIBC +# ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +# endif +# include +#else +# include +#endif +#if !HAVE_STRCHR && !defined _LIBC +# ifndef strchr +# define strchr index +# endif +#endif + +#if defined HAVE_UNISTD_H || defined _LIBC +# include +#endif + +#include "gettext.h" #include "gettextP.h" #ifdef _LIBC # include #else -# include "libgnuintl.h" +# include "libgettext.h" #endif +#include "hash-string.h" /* @@ end of prolog @@ */ +#ifdef _LIBC +/* Rename the non ANSI C functions. This is required by the standard + because some ANSI C functions will require linking with this object + file and the name space must not be polluted. */ +# define getcwd __getcwd +# ifndef stpcpy +# define stpcpy __stpcpy +# endif +#else +# if !defined HAVE_GETCWD +char *getwd (); +# define getcwd(buf, max) getwd (buf) +# else +char *getcwd (); +# endif +# ifndef HAVE_STPCPY +static char *stpcpy PARAMS ((char *dest, const char *src)); +# endif +#endif + +/* Amount to increase buffer size by in each try. */ +#define PATH_INCR 32 + +/* The following is from pathmax.h. */ +/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define + PATH_MAX but might cause redefinition warnings when sys/param.h is + later included (as on MORE/BSD 4.3). */ +#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__)) +# include +#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 + +/* XPG3 defines the result of `setlocale (category, NULL)' as: + ``Directs `setlocale()' to query `category' and return the current + setting of `local'.'' + However it does not specify the exact format. And even worse: POSIX + defines this not at all. So we can use this feature only on selected + system (e.g. those using GNU C Library). */ +#ifdef _LIBC +# define HAVE_LOCALE_NULL +#endif + +/* Name of the default domain used for gettext(3) prior any call to + textdomain(3). The default value for this is "messages". */ +const char _nl_default_default_domain[] = "messages"; + +/* Value used as the default domain for gettext(3). */ +const char *_nl_current_default_domain = _nl_default_default_domain; + +/* Contains the default location of the message catalogs. */ +const char _nl_default_dirname[] = GNULOCALEDIR; + +/* List with bindings of specific domains created by bindtextdomain() + calls. */ +struct binding *_nl_domain_bindings; + +/* Prototypes for local functions. */ +static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file, + const char *msgid)) internal_function; +static const char *category_to_name PARAMS ((int category)) internal_function; +static const char *guess_category_value PARAMS ((int category, + const char *categoryname)) + internal_function; + + +/* For those loosing systems which don't have `alloca' we have to add + some additional code emulating it. */ +#ifdef HAVE_ALLOCA +/* Nothing has to be done. */ +# define ADD_BLOCK(list, address) /* nothing */ +# define FREE_BLOCKS(list) /* nothing */ +#else +struct block_list +{ + void *address; + struct block_list *next; +}; +# define ADD_BLOCK(list, addr) \ + do { \ + struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ + /* If we cannot get a free block we cannot add the new element to \ + the list. */ \ + if (newp != NULL) { \ + newp->address = (addr); \ + newp->next = (list); \ + (list) = newp; \ + } \ + } while (0) +# define FREE_BLOCKS(list) \ + do { \ + while (list != NULL) { \ + struct block_list *old = list; \ + list = list->next; \ + free (old); \ + } \ + } while (0) +# undef alloca +# define alloca(size) (malloc (size)) +#endif /* have alloca */ + + /* Names for the libintl functions are a problem. They must not clash with existing names and they should follow ANSI C. But this source code is also used in GNU C Library where the names have a __ prefix. So we have to make a difference here. */ #ifdef _LIBC # define DCGETTEXT __dcgettext -# define DCIGETTEXT __dcigettext #else # define DCGETTEXT dcgettext__ -# define DCIGETTEXT dcigettext__ +#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 +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 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY @@ -48,10 +243,413 @@ DCGETTEXT (domainname, msgid, category) const char *msgid; int category; { - return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category); +#ifndef HAVE_ALLOCA + struct block_list *block_list = NULL; +#endif + struct loaded_l10nfile *domain; + struct binding *binding; + const char *categoryname; + const char *categoryvalue; + char *dirname, *xdomainname; + char *single_locale; + char *retval; + int saved_errno = errno; + + /* If no real MSGID is given return NULL. */ + if (msgid == NULL) + return NULL; + + /* See whether this is a SUID binary or not. */ + DETERMINE_SECURE; + + /* 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; + + /* First find matching binding. */ + for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) + { + int compare = strcmp (domainname, binding->domainname); + if (compare == 0) + /* We found it! */ + break; + if (compare < 0) + { + /* It is not in the list. */ + binding = NULL; + break; + } + } + + if (binding == NULL) + dirname = (char *) _nl_default_dirname; + else if (binding->dirname[0] == '/') + dirname = binding->dirname; + else + { + /* We have a relative path. Make it absolute now. */ + size_t dirname_len = strlen (binding->dirname) + 1; + size_t path_max; + char *ret; + + path_max = (unsigned int) PATH_MAX; + path_max += 2; /* The getcwd docs say to do this. */ + + dirname = (char *) alloca (path_max + dirname_len); + ADD_BLOCK (block_list, dirname); + + __set_errno (0); + while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE) + { + path_max += PATH_INCR; + dirname = (char *) alloca (path_max + dirname_len); + ADD_BLOCK (block_list, dirname); + __set_errno (0); + } + + if (ret == NULL) + { + /* We cannot get the current working directory. Don't signal an + error but simply return the default string. */ + FREE_BLOCKS (block_list); + __set_errno (saved_errno); + return (char *) msgid; + } + + stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); + } + + /* Now determine the symbolic name of CATEGORY and its value. */ + categoryname = category_to_name (category); + categoryvalue = guess_category_value (category, categoryname); + + xdomainname = (char *) alloca (strlen (categoryname) + + strlen (domainname) + 5); + ADD_BLOCK (block_list, xdomainname); + + stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), + domainname), + ".mo"); + + /* Creating working area. */ + single_locale = (char *) alloca (strlen (categoryvalue) + 1); + ADD_BLOCK (block_list, single_locale); + + + /* Search for the given string. This is a loop because we perhaps + got an ordered list of languages to consider for 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 + && (memchr (single_locale, '/', + _nl_find_language (single_locale) - single_locale) + != NULL)) + /* 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); + __set_errno (saved_errno); + return (char *) msgid; + } + + + /* Find structure describing the message catalog matching the + DOMAINNAME and CATEGORY. */ + domain = _nl_find_domain (dirname, single_locale, xdomainname); + + if (domain != NULL) + { + retval = find_msg (domain, msgid); + + if (retval == NULL) + { + int cnt; + + for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) + { + retval = find_msg (domain->successor[cnt], msgid); + + if (retval != NULL) + break; + } + } + + if (retval != NULL) + { + FREE_BLOCKS (block_list); + __set_errno (saved_errno); + return retval; + } + } + } + /* NOTREACHED */ } #ifdef _LIBC /* Alias for function name in GNU C Library. */ weak_alias (__dcgettext, dcgettext); #endif + + +static char * +internal_function +find_msg (domain_file, msgid) + struct loaded_l10nfile *domain_file; + const char *msgid; +{ + size_t act = 0; + size_t top, bottom; + struct loaded_domain *domain; + + if (domain_file->decided == 0) + _nl_load_domain (domain_file); + + if (domain_file->data == NULL) + return NULL; + + domain = (struct loaded_domain *) domain_file->data; + + /* Locate the MSGID and its translation. */ + if (domain->hash_size > 2 && domain->hash_tab != NULL) + { + /* Use the hashing table. */ + nls_uint32 len = strlen (msgid); + nls_uint32 hash_val = hash_string (msgid); + nls_uint32 idx = hash_val % domain->hash_size; + nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); + nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); + + if (nstr == 0) + /* Hash table entry is empty. */ + return NULL; + + if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len + && strcmp (msgid, + domain->data + W (domain->must_swap, + domain->orig_tab[nstr - 1].offset)) == 0) + return (char *) domain->data + W (domain->must_swap, + domain->trans_tab[nstr - 1].offset); + + while (1) + { + if (idx >= domain->hash_size - incr) + idx -= domain->hash_size - incr; + else + idx += incr; + + nstr = W (domain->must_swap, domain->hash_tab[idx]); + if (nstr == 0) + /* Hash table entry is empty. */ + return NULL; + + if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len + && strcmp (msgid, + domain->data + W (domain->must_swap, + domain->orig_tab[nstr - 1].offset)) + == 0) + return (char *) domain->data + + W (domain->must_swap, domain->trans_tab[nstr - 1].offset); + } + /* NOTREACHED */ + } + + /* Now we try the default method: binary search in the sorted + array of messages. */ + bottom = 0; + top = domain->nstrings; + while (bottom < top) + { + int cmp_val; + + act = (bottom + top) / 2; + cmp_val = strcmp (msgid, domain->data + + W (domain->must_swap, + domain->orig_tab[act].offset)); + if (cmp_val < 0) + top = act; + else if (cmp_val > 0) + bottom = act + 1; + else + break; + } + + /* If an translation is found return this. */ + return bottom >= top ? NULL : (char *) domain->data + + W (domain->must_swap, + domain->trans_tab[act].offset); +} + + +/* Return string representation of locale CATEGORY. */ +static const char * +internal_function +category_to_name (category) + int category; +{ + const char *retval; + + switch (category) + { +#ifdef LC_COLLATE + case LC_COLLATE: + retval = "LC_COLLATE"; + break; +#endif +#ifdef LC_CTYPE + case LC_CTYPE: + retval = "LC_CTYPE"; + break; +#endif +#ifdef LC_MONETARY + case LC_MONETARY: + retval = "LC_MONETARY"; + break; +#endif +#ifdef LC_NUMERIC + case LC_NUMERIC: + retval = "LC_NUMERIC"; + break; +#endif +#ifdef LC_TIME + case LC_TIME: + retval = "LC_TIME"; + break; +#endif +#ifdef LC_MESSAGES + case LC_MESSAGES: + retval = "LC_MESSAGES"; + break; +#endif +#ifdef LC_RESPONSE + case LC_RESPONSE: + retval = "LC_RESPONSE"; + break; +#endif +#ifdef LC_ALL + case LC_ALL: + /* This might not make sense but is perhaps better than any other + value. */ + retval = "LC_ALL"; + break; +#endif + default: + /* If you have a better idea for a default value let me know. */ + retval = "LC_XXX"; + } + + return retval; +} + +/* Guess value of current locale from value of the environment variables. */ +static const char * +internal_function +guess_category_value (category, categoryname) + int category; + const char *categoryname; +{ + const char *retval; + + /* The highest priority value is the `LANGUAGE' environment + variable. This is a GNU extension. */ + retval = getenv ("LANGUAGE"); + if (retval != NULL && retval[0] != '\0') + return retval; + + /* `LANGUAGE' is not set. So we have to proceed with the POSIX + methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some + systems this can be done by the `setlocale' function itself. */ +#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL + return setlocale (category, NULL); +#else + /* Setting of LC_ALL overwrites all other. */ + retval = getenv ("LC_ALL"); + if (retval != NULL && retval[0] != '\0') + return retval; + + /* Next comes the name of the desired category. */ + retval = getenv (categoryname); + if (retval != NULL && retval[0] != '\0') + return retval; + + /* Last possibility is the LANG environment variable. */ + retval = getenv ("LANG"); + if (retval != NULL && retval[0] != '\0') + return retval; + + /* We use C as the default domain. POSIX says this is implementation + defined. */ + return "C"; +#endif +} + +/* @@ begin of epilog @@ */ + +/* We don't want libintl.a to depend on any other library. So we + avoid the non-standard function stpcpy. In GNU C Library this + function is available, though. Also allow the symbol HAVE_STPCPY + to be defined. */ +#if !_LIBC && !HAVE_STPCPY +static char * +stpcpy (dest, src) + char *dest; + const char *src; +{ + while ((*dest++ = *src++) != '\0') + /* Do nothing. */ ; + return dest - 1; +} +#endif + + +#ifdef _LIBC +/* If we want to free all resources we have to do some work at + program's end. */ +static void __attribute__ ((unused)) +free_mem (void) +{ + struct binding *runp; + + for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next) + { + free (runp->domainname); + if (runp->dirname != _nl_default_dirname) + /* Yes, this is a pointer comparison. */ + free (runp->dirname); + } + + if (_nl_current_default_domain != _nl_default_default_domain) + /* Yes, again a pointer comparison. */ + free ((char *) _nl_current_default_domain); +} + +text_set_element (__libc_subfreeres, free_mem); +#endif diff --git a/intl/dgettext.c b/intl/dgettext.c index c5130411..0510c2b0 100644 --- a/intl/dgettext.c +++ b/intl/dgettext.c @@ -1,5 +1,5 @@ -/* Implementation of the dgettext(3) function. - Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc. +/* Implementation of the dgettext(3) function + Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,13 +19,14 @@ # include #endif -#include +#if defined HAVE_LOCALE_H || defined _LIBC +# include +#endif -#include "gettextP.h" #ifdef _LIBC # include #else -# include "libgnuintl.h" +# include "libgettext.h" #endif /* @@ end of prolog @@ */ diff --git a/intl/explodename.c b/intl/explodename.c index c4ddcc41..7f480973 100644 --- a/intl/explodename.c +++ b/intl/explodename.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -19,8 +19,15 @@ # include #endif -#include -#include +#if defined STDC_HEADERS || defined _LIBC +# include +#endif + +#if defined HAVE_STRING_H || defined _LIBC +# include +#else +# include +#endif #include #include "loadinfo.h" diff --git a/intl/finddomain.c b/intl/finddomain.c index 4882554f..81ea29bf 100644 --- a/intl/finddomain.c +++ b/intl/finddomain.c @@ -1,6 +1,6 @@ /* Handle list of needed message catalogs - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. + Copyright (C) 1995, 1996, 1997, 1998 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 General Public License as published by @@ -20,20 +20,45 @@ # include #endif +#include +#include #include #include -#include -#include + +#if defined STDC_HEADERS || defined _LIBC +# include +#else +# ifdef HAVE_MALLOC_H +# include +# else +void free (); +# endif +#endif + +#if defined HAVE_STRING_H || defined _LIBC +# include +#else +# include +# ifndef memcpy +# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) +# endif +#endif +#if !HAVE_STRCHR && !defined _LIBC +# ifndef strchr +# define strchr index +# endif +#endif #if defined HAVE_UNISTD_H || defined _LIBC # include #endif +#include "gettext.h" #include "gettextP.h" #ifdef _LIBC # include #else -# include "libgnuintl.h" +# include "libgettext.h" #endif /* @@ end of prolog @@ */ @@ -46,11 +71,10 @@ static struct loaded_l10nfile *_nl_loaded_domains; established bindings. */ struct loaded_l10nfile * internal_function -_nl_find_domain (dirname, locale, domainname, domainbinding) +_nl_find_domain (dirname, locale, domainname) const char *dirname; char *locale; const char *domainname; - struct binding *domainbinding; { struct loaded_l10nfile *retval; const char *language; @@ -96,7 +120,7 @@ _nl_find_domain (dirname, locale, domainname, domainbinding) int cnt; if (retval->decided == 0) - _nl_load_domain (retval, domainbinding); + _nl_load_domain (retval); if (retval->data != NULL) return retval; @@ -104,7 +128,7 @@ _nl_find_domain (dirname, locale, domainname, domainbinding) for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) { if (retval->successor[cnt]->decided == 0) - _nl_load_domain (retval->successor[cnt], domainbinding); + _nl_load_domain (retval->successor[cnt]); if (retval->successor[cnt]->data != NULL) break; @@ -151,14 +175,14 @@ _nl_find_domain (dirname, locale, domainname, domainbinding) return NULL; if (retval->decided == 0) - _nl_load_domain (retval, domainbinding); + _nl_load_domain (retval); 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); + _nl_load_domain (retval->successor[cnt]); if (retval->successor[cnt]->data != NULL) break; } @@ -168,10 +192,6 @@ _nl_find_domain (dirname, locale, domainname, domainbinding) 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; } @@ -188,7 +208,6 @@ free_mem (void) if (runp->data != NULL) _nl_unload_domain ((struct loaded_domain *) runp->data); runp = runp->next; - free ((char *) here->filename); free (here); } } diff --git a/intl/gettext.c b/intl/gettext.c index a6402055..d929f98d 100644 --- a/intl/gettext.c +++ b/intl/gettext.c @@ -1,5 +1,5 @@ /* Implementation of gettext(3) function. - Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 1997 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,14 +23,21 @@ # define __need_NULL # include #else -# include /* Just for NULL. */ +# ifdef STDC_HEADERS +# include /* Just for NULL. */ +# else +# ifdef HAVE_STRING_H +# include +# else +# define NULL ((void *) 0) +# endif +# endif #endif -#include "gettextP.h" #ifdef _LIBC # include #else -# include "libgnuintl.h" +# include "libgettext.h" #endif /* @@ end of prolog @@ */ @@ -41,10 +48,10 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define GETTEXT __gettext -# define DCGETTEXT __dcgettext +# define DGETTEXT __dgettext #else # define GETTEXT gettext__ -# define DCGETTEXT dcgettext__ +# define DGETTEXT dgettext__ #endif /* Look up MSGID in the current default message catalog for the current @@ -54,7 +61,7 @@ char * GETTEXT (msgid) const char *msgid; { - return DCGETTEXT (NULL, msgid, LC_MESSAGES); + return DGETTEXT (NULL, msgid); } #ifdef _LIBC diff --git a/intl/gettext.h b/intl/gettext.h index eb588907..3cd23d7d 100644 --- a/intl/gettext.h +++ b/intl/gettext.h @@ -1,5 +1,5 @@ -/* Description of GNU message catalog format: general file layout. - Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc. +/* Internal header for GNU gettext internationalization functions. + Copyright (C) 1995, 1997 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,13 +11,16 @@ 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. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #ifndef _GETTEXT_H #define _GETTEXT_H 1 +#include + #if HAVE_LIMITS_H || _LIBC # include #endif @@ -34,8 +37,9 @@ /* 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. */ + doing that would require that the configure script compile and *run* + the resulting executable. Locally running cross-compiled executables + is usually not possible. */ #if __STDC__ # define UINT_MAX_32_BITS 4294967295U diff --git a/intl/gettextP.h b/intl/gettextP.h index ee8ca48e..00c52031 100644 --- a/intl/gettextP.h +++ b/intl/gettextP.h @@ -1,6 +1,6 @@ -/* Header describing internals of libintl library. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. +/* Header describing internals of gettext library + Copyright (C) 1995, 1996, 1997, 1998 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 General Public License as published by @@ -19,20 +19,8 @@ #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 "gettext.h" /* Get nls_uint32. */ - /* @@ end of prolog @@ */ #ifndef PARAMS @@ -47,12 +35,6 @@ # 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 - #ifndef W # define W(flag, data) ((flag) ? SWAP (data) : (data)) #endif @@ -62,6 +44,8 @@ # include # define SWAP(i) bswap_32 (i) #else +static nls_uint32 SWAP PARAMS ((nls_uint32 i)); + static inline nls_uint32 SWAP (i) nls_uint32 i; @@ -71,52 +55,6 @@ SWAP (i) #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, /* Module operation. */ - plus, /* Addition. */ - minus, /* Subtraction. */ - less_than, /* Comparison. */ - greater_than, /* Comparison. */ - less_or_equal, /* Comparison. */ - greater_or_equal, /* Comparison. */ - equal, /* Comparision for equality. */ - not_equal, /* Comparision 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; -}; - - -/* The representation of an opened message catalog. */ struct loaded_domain { const char *data; @@ -128,123 +66,23 @@ struct loaded_domain struct string_desc *trans_tab; nls_uint32 hash_size; nls_uint32 *hash_tab; - int codeset_cntr; -#ifdef _LIBC - __gconv_t conv; -#else -# if HAVE_ICONV - iconv_t conv; -# endif -#endif - char **conv_tab; - - struct expression *plural; - unsigned long int nplurals; }; -/* We want to allocate a string at the end of the struct. But ISO C - doesn't allow zero sized arrays. */ -#ifdef __GNUC__ -# define ZERO 0 -#else -# define ZERO 1 -#endif - -/* A set of settings bound to a message domain. Used to store settings - from bindtextdomain() and bind_textdomain_codeset(). */ struct binding { struct binding *next; + char *domainname; char *dirname; - int codeset_cntr; /* Incremented each time codeset changes. */ - char *codeset; - char domainname[ZERO]; }; -/* A counter which is incremented each time some previous translations - become invalid. - This variable is part of the external ABI of the GNU libintl. */ -extern int _nl_msg_cat_cntr; - struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, char *__locale, - const char *__domainname, - struct binding *__domainbinding)) + const char *__domainname)) internal_function; -void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain, - struct binding *__domainbinding)) +void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) 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 *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)); -#endif - -#ifdef _LIBC -extern void __gettext_free_exp PARAMS ((struct expression *exp)) - internal_function; -extern int __gettextparse PARAMS ((void *arg)); -#else -extern void gettext_free_exp__ PARAMS ((struct expression *exp)) - internal_function; -extern int gettextparse__ PARAMS ((void *arg)); -#endif /* @@ begin of epilog @@ */ diff --git a/intl/hash-string.h b/intl/hash-string.h index 37d4ce1a..939e9582 100644 --- a/intl/hash-string.h +++ b/intl/hash-string.h @@ -1,5 +1,5 @@ -/* Description of GNU message catalog format: string hashing function. - Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. +/* Implements a string hashing function. + Copyright (C) 1995, 1997 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,9 +11,10 @@ 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. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* @@ end of prolog @@ */ diff --git a/intl/intl-compat.c b/intl/intl-compat.c index b8edaa17..503efa0f 100644 --- a/intl/intl-compat.c +++ b/intl/intl-compat.c @@ -1,6 +1,6 @@ /* intl-compat.c - Stub functions to call gettext functions from GNU gettext Library. - Copyright (C) 1995, 2000, 2001 Software Foundation, Inc. + Copyright (C) 1995 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 @@ -20,79 +20,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ # include #endif -#include "libgnuintl.h" -#include "gettextP.h" +#include "libgettext.h" /* @@ end of prolog @@ */ -/* This file redirects the gettext functions (without prefix or suffix) to - those defined in the included GNU gettext library (with "__" suffix). - It is compiled into libintl when the included GNU gettext library is - configured --with-included-gettext. - - This redirection works also in the case that the system C library or - the system libintl library contain gettext/textdomain/... functions. - If it didn't, we would need to add preprocessor level redirections to - libgnuintl.h of the following form: - -# define gettext gettext__ -# define dgettext dgettext__ -# define dcgettext dcgettext__ -# define ngettext ngettext__ -# define dngettext dngettext__ -# define dcngettext dcngettext__ -# define textdomain textdomain__ -# define bindtextdomain bindtextdomain__ -# define bind_textdomain_codeset bind_textdomain_codeset__ - - How does this redirection work? There are two cases. - A. When libintl.a is linked into an executable, it works because - functions defined in the executable always override functions in - the shared libraries. - B. When libintl.so is used, it works because - 1. those systems defining gettext/textdomain/... in the C library - (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are - ELF systems and define these symbols as weak, thus explicitly - letting other shared libraries override it. - 2. those systems defining gettext/textdomain/... in a standalone - libintl.so library (namely, Solaris 2.3 and newer) have this - shared library in /usr/lib, and the linker will search /usr/lib - *after* the directory where the GNU gettext library is installed. - - A third case, namely when libintl.a is linked into a shared library - whose name is not libintl.so, is not supported. In this case, on - Solaris, when -lintl precedes the linker option for the shared library - containing GNU gettext, the system's gettext would indeed override - the GNU gettext. Anyone doing this kind of stuff must be clever enough - to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker - command line. */ - #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 gettext__ (msgid); -} - - -char * -dgettext (domainname, msgid) +bindtextdomain (domainname, dirname) const char *domainname; - const char *msgid; + const char *dirname; { - return dgettext__ (domainname, msgid); + return bindtextdomain__ (domainname, dirname); } @@ -107,35 +52,19 @@ dcgettext (domainname, msgid, category) char * -ngettext (msgid1, msgid2, n) - const char *msgid1; - const char *msgid2; - unsigned long int n; +dgettext (domainname, msgid) + const char *domainname; + const char *msgid; { - return ngettext__ (msgid1, msgid2, n); + return dgettext__ (domainname, msgid); } char * -dngettext (domainname, msgid1, msgid2, n) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; +gettext (msgid) + const char *msgid; { - return 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 dcngettext__ (domainname, msgid1, msgid2, n, category); + return gettext__ (msgid); } @@ -145,21 +74,3 @@ textdomain (domainname) { return textdomain__ (domainname); } - - -char * -bindtextdomain (domainname, dirname) - const char *domainname; - const char *dirname; -{ - return bindtextdomain__ (domainname, dirname); -} - - -char * -bind_textdomain_codeset (domainname, codeset) - const char *domainname; - const char *codeset; -{ - return bind_textdomain_codeset__ (domainname, codeset); -} diff --git a/intl/l10nflist.c b/intl/l10nflist.c index 557253eb..30f5f645 100644 --- a/intl/l10nflist.c +++ b/intl/l10nflist.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. +/* Handle list of needed message catalogs + Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -15,18 +16,22 @@ 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 HAVE_STRING_H || defined _LIBC +# ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +# endif +# include +#else +# include +# ifndef memcpy +# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) +# endif +#endif #if !HAVE_STRCHR && !defined _LIBC # ifndef strchr # define strchr index @@ -38,7 +43,10 @@ #endif #include #include -#include + +#if defined STDC_HEADERS || defined _LIBC +# include +#endif #include "loadinfo.h" @@ -216,7 +224,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, /* Construct file name. */ memcpy (abs_filename, dirlist, dirlist_len); - __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR); + __argz_stringify (abs_filename, dirlist_len, ':'); cp = abs_filename + (dirlist_len - 1); *cp++ = '/'; cp = stpcpy (cp, language); @@ -341,8 +349,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, /* 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. */ + names. */ const char * _nl_normalize_codeset (codeset, name_len) const char *codeset; diff --git a/intl/libgettext.h b/intl/libgettext.h index 553382ca..3a92960a 100644 --- a/intl/libgettext.h +++ b/intl/libgettext.h @@ -1,5 +1,5 @@ -/* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. +/* Message catalogs for internationalization. + Copyright (C) 1995, 1996, 1997, 1998 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 @@ -15,34 +15,168 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _LIBGETTEXT_H -#define _LIBGETTEXT_H 1 +/* Because on some systems (e.g. Solaris) we sometimes have to include + the systems libintl.h as well as this file we have more complex + include protection above. But the systems header might perhaps also + define _LIBINTL_H and therefore we have to protect the definition here. */ + +#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H +#ifndef _LIBINTL_H +# define _LIBINTL_H 1 +#endif +#define _LIBGETTEXT_H 1 + +/* We define an additional symbol to signal that we use the GNU + implementation of gettext. */ +#define __USE_GNU_GETTEXT 1 + +#include + +#if HAVE_LOCALE_H +# include +#endif + + +#ifdef __cplusplus +extern "C" { +#endif + +/* @@ end of prolog @@ */ + +#ifndef PARAMS +# if __STDC__ || defined __cplusplus +# define PARAMS(args) args +# else +# define PARAMS(args) () +# endif +#endif + +#ifndef NULL +# if !defined __cplusplus || defined __GNUC__ +# define NULL ((void *) 0) +# else +# define NULL (0) +# endif +#endif + +#if !HAVE_LC_MESSAGES +/* This value determines the behaviour of the gettext() and dgettext() + function. But some system does not have this defined. Define it + to a default value. */ +# define LC_MESSAGES (-1) +#endif + + +/* Declarations for gettext-using-catgets interface. Derived from + Jim Meyering's libintl.h. */ +struct _msg_ent +{ + const char *_msg; + int _msg_number; +}; + + +#if HAVE_CATGETS +/* These two variables are defined in the automatically by po-to-tbl.sed + generated file `cat-id-tbl.c'. */ +extern const struct _msg_ent _msg_tbl[]; +extern int _msg_tbl_length; +#endif + + +/* For automatical extraction of messages sometimes no real + translation is needed. Instead the string itself is the result. */ +#define gettext_noop(Str) (Str) + +/* Look up MSGID in the current default message catalog for the current + LC_MESSAGES locale. If not found, returns MSGID itself (the default + text). */ +extern char *gettext PARAMS ((const char *__msgid)); +extern char *gettext__ PARAMS ((const char *__msgid)); + +/* Look up MSGID in the DOMAINNAME message catalog for the current + LC_MESSAGES locale. */ +extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); +extern char *dgettext__ PARAMS ((const char *__domainname, + const char *__msgid)); + +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ +extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, + int __category)); +extern char *dcgettext__ PARAMS ((const char *__domainname, + const char *__msgid, int __category)); + + +/* 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". */ +extern char *textdomain PARAMS ((const char *__domainname)); +extern char *textdomain__ PARAMS ((const char *__domainname)); + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +extern char *bindtextdomain PARAMS ((const char *__domainname, + const char *__dirname)); +extern char *bindtextdomain__ PARAMS ((const char *__domainname, + const char *__dirname)); -/* NLS can be disabled through the configure --disable-nls option. */ #if ENABLE_NLS -/* Get declarations of GNU message catalog functions. */ -# include +/* Solaris 2.3 has the gettext function but dcgettext is missing. + So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4 + has dcgettext. */ +# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT) + +# define gettext(Msgid) \ + dgettext (NULL, Msgid) + +# define dgettext(Domainname, Msgid) \ + dcgettext (Domainname, Msgid, LC_MESSAGES) + +# if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7 +/* This global variable is defined in loadmsgcat.c. We need a sign, + whether a new catalog was loaded, which can be associated with all + translations. */ +extern int _nl_msg_cat_cntr; + +# define dcgettext(Domainname, Msgid, Category) \ + (__extension__ \ + ({ \ + char *__result; \ + if (__builtin_constant_p (Msgid)) \ + { \ + static char *__translation__; \ + static int __catalog_counter__; \ + if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ + { \ + __translation__ = \ + dcgettext__ (Domainname, Msgid, Category); \ + __catalog_counter__ = _nl_msg_cat_cntr; \ + } \ + __result = __translation__; \ + } \ + else \ + __result = dcgettext__ (Domainname, Msgid, Category); \ + __result; \ + })) +# endif +# endif #else # define gettext(Msgid) (Msgid) # define dgettext(Domainname, Msgid) (Msgid) # define dcgettext(Domainname, Msgid, Category) (Msgid) -# define ngettext(Msgid1, Msgid2, N) \ - ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) -# define dngettext(Domainname, Msgid1, Msgid2, N) \ - ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) -# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ - ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) -# define textdomain(Domainname) ((char *) (Domainname)) -# define bindtextdomain(Domainname, Dirname) ((char *) (Dirname)) -# define bind_textdomain_codeset(Domainname, Codeset) ((char *) (Codeset)) +# define textdomain(Domainname) ((char *) Domainname) +# define bindtextdomain(Domainname, Dirname) ((char *) Dirname) #endif -/* For automatical extraction of messages sometimes no real - translation is needed. Instead the string itself is the result. */ -#define gettext_noop(Str) (Str) +/* @@ begin of epilog @@ */ -#endif /* _LIBGETTEXT_H */ +#ifdef __cplusplus +} +#endif + +#endif diff --git a/intl/loadinfo.h b/intl/loadinfo.h index 5171a8f6..1c4524ab 100644 --- a/intl/loadinfo.h +++ b/intl/loadinfo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -16,9 +16,6 @@ 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 - #ifndef PARAMS # if __STDC__ # define PARAMS(args) args @@ -27,25 +24,6 @@ # 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 @@ -72,10 +50,6 @@ struct loaded_l10nfile }; -/* 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)); @@ -92,8 +66,6 @@ _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, extern const char *_nl_expand_alias PARAMS ((const char *name)); -/* normalized_codeset is dynamically allocated and has to be freed by - the caller. */ extern int _nl_explode_name PARAMS ((char *name, const char **language, const char **modifier, const char **territory, @@ -104,5 +76,3 @@ extern int _nl_explode_name PARAMS ((char *name, const char **language, const char **revision)); extern char *_nl_find_language PARAMS ((const char *name)); - -#endif /* loadinfo.h */ diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c index d589243b..2c6a5650 100644 --- a/intl/loadmsgcat.c +++ b/intl/loadmsgcat.c @@ -1,5 +1,5 @@ /* Load needed message catalogs. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 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 @@ -15,52 +15,22 @@ 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 +#if defined STDC_HEADERS || defined _LIBC +# include #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 @@ -73,10 +43,6 @@ char *alloca (); #include "gettext.h" #include "gettextP.h" -#ifdef _LIBC -# include "../locale/localeinfo.h" -#endif - /* @@ end of prolog @@ */ #ifdef _LIBC @@ -90,275 +56,29 @@ char *alloca (); # define munmap __munmap #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 PLURAL_PARSE __gettextparse -#else -# define PLURAL_PARSE gettextparse__ -#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 - /* 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; +int _nl_msg_cat_cntr = 0; -#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 - } -}; -static 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; -static 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 - - -/* 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 (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 libiconv, we want to use transliteration. */ -# if _LIBICONV_VERSION >= 0x0105 - len = strlen (outcharset); - { - char *tmp = (char *) alloca (len + 10 + 1); - memcpy (tmp, outcharset, len); - memcpy (tmp + len, "//TRANSLIT", 10 + 1); - outcharset = tmp; - } -# endif - domain->conv = iconv_open (outcharset, charset); -# if _LIBICONV_VERSION >= 0x0105 - freea (outcharset); -# endif -# 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) +_nl_load_domain (domain_file) 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; - 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 @@ -367,19 +87,14 @@ _nl_load_domain (domain_file, domainbinding) return; /* Try to open the addressed file. */ - fd = open (domain_file->filename, O_RDONLY | O_BINARY); + fd = open (domain_file->filename, O_RDONLY); 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)) + if (fstat (fd, &st) != 0 + || (size = (size_t) st.st_size) != st.st_size + || size < sizeof (struct mo_file_header)) { /* Something went wrong. */ close (fd); @@ -392,7 +107,7 @@ _nl_load_domain (domain_file, domainbinding) data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); - if (__builtin_expect (data != (struct mo_file_header *) -1, 1)) + if (data != (struct mo_file_header *) -1) { /* mmap() call was successful. */ close (fd); @@ -416,15 +131,12 @@ _nl_load_domain (domain_file, domainbinding) do { long int nb = (long int) read (fd, read_ptr, to_read); - if (nb <= 0) + if (nb == -1) { -#ifdef EINTR - if (nb == -1 && errno == EINTR) - continue; -#endif close (fd); return; } + read_ptr += nb; to_read -= nb; } @@ -435,8 +147,7 @@ _nl_load_domain (domain_file, domainbinding) /* 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)) + if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED) { /* The magic number is wrong: not a message catalog file. */ #ifdef HAVE_MMAP @@ -448,11 +159,12 @@ _nl_load_domain (domain_file, domainbinding) return; } - domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); - if (domain == NULL) + domain_file->data + = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); + if (domain_file->data == NULL) return; - domain_file->data = domain; + domain = (struct loaded_domain *) domain_file->data; domain->data = (char *) data; domain->use_mmap = use_mmap; domain->mmap_size = size; @@ -484,62 +196,9 @@ _nl_load_domain (domain_file, domainbinding) 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. */ - 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 - { - /* First get the number. */ - char *endp; - unsigned long int n; - struct parse_args args; - - nplurals += 9; - while (*nplurals != '\0' && isspace (*nplurals)) - ++nplurals; -#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 - domain->nplurals = n; - if (nplurals == endp) - goto no_plural; - - /* 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; - domain->plural = 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 (); - domain->plural = &germanic_plural; - domain->nplurals = 2; - } + /* Show that one domain is changed. This might make some cached + translations invalid. */ + ++_nl_msg_cat_cntr; } @@ -549,16 +208,11 @@ internal_function _nl_unload_domain (domain) struct loaded_domain *domain; { - if (domain->plural != &germanic_plural) - __gettext_free_exp (domain->plural); - - _nl_free_domain_conv (domain); - -# ifdef _POSIX_MAPPED_FILES +#ifdef _POSIX_MAPPED_FILES if (domain->use_mmap) munmap ((caddr_t) domain->data, domain->mmap_size); else -# endif /* _POSIX_MAPPED_FILES */ +#endif /* _POSIX_MAPPED_FILES */ free ((void *) domain->data); free (domain); diff --git a/intl/localealias.c b/intl/localealias.c index 76f19a9a..861020dd 100644 --- a/intl/localealias.c +++ b/intl/localealias.c @@ -1,5 +1,6 @@ /* Handle aliases for locale names. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 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 General Public License as published by @@ -15,13 +16,6 @@ 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 @@ -47,15 +41,35 @@ char *alloca (); # endif #endif -#include +#if defined STDC_HEADERS || defined _LIBC +# include +#else +char *getenv (); +# ifdef HAVE_MALLOC_H +# include +# else +void free (); +# endif +#endif -#include +#if defined HAVE_STRING_H || defined _LIBC +# ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +# endif +# include +#else +# include +# ifndef memcpy +# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) +# endif +#endif #if !HAVE_STRCHR && !defined _LIBC # ifndef strchr # define strchr index # endif #endif +#include "gettext.h" #include "gettextP.h" /* @@ end of prolog @@ */ @@ -81,14 +95,40 @@ __libc_lock_define_initialized (static, lock); # define internal_function #endif -/* For those losing systems which don't have `alloca' we have to add +/* For those loosing systems which don't have `alloca' we have to add some additional code emulating it. */ #ifdef HAVE_ALLOCA -# define freea(p) /* nothing */ +/* Nothing has to be done. */ +# define ADD_BLOCK(list, address) /* nothing */ +# define FREE_BLOCKS(list) /* nothing */ #else -# define alloca(n) malloc (n) -# define freea(p) free (p) -#endif +struct block_list +{ + void *address; + struct block_list *next; +}; +# define ADD_BLOCK(list, addr) \ + do { \ + struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ + /* If we cannot get a free block we cannot add the new element to \ + the list. */ \ + if (newp != NULL) { \ + newp->address = (addr); \ + newp->next = (list); \ + (list) = newp; \ + } \ + } while (0) +# define FREE_BLOCKS(list) \ + do { \ + while (list != NULL) { \ + struct block_list *old = list; \ + list = list->next; \ + free (old); \ + } \ + } while (0) +# undef alloca +# define alloca(size) (malloc (size)) +#endif /* have alloca */ #if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED # undef fgets @@ -107,18 +147,18 @@ struct alias_map }; -static char *string_space; -static size_t string_space_act; -static size_t string_space_max; +static char *string_space = NULL; +static size_t string_space_act = 0; +static size_t string_space_max = 0; static struct alias_map *map; -static size_t nmap; -static size_t maxmap; +static size_t nmap = 0; +static size_t maxmap = 0; /* 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 void extend_alias_table PARAMS ((void)); static int alias_compare PARAMS ((const struct alias_map *map1, const struct alias_map *map2)); @@ -164,12 +204,11 @@ _nl_expand_alias (name) { const char *start; - while (locale_alias_path[0] == PATH_SEPARATOR) + while (locale_alias_path[0] == ':') ++locale_alias_path; start = locale_alias_path; - while (locale_alias_path[0] != '\0' - && locale_alias_path[0] != PATH_SEPARATOR) + while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':') ++locale_alias_path; if (start < locale_alias_path) @@ -192,12 +231,16 @@ read_alias_file (fname, fname_len) const char *fname; int fname_len; { +#ifndef HAVE_ALLOCA + struct block_list *block_list = NULL; +#endif FILE *fp; char *full_fname; size_t added; static const char aliasfile[] = "/locale.alias"; full_fname = (char *) alloca (fname_len + sizeof aliasfile); + ADD_BLOCK (block_list, full_fname); #ifdef HAVE_MEMPCPY mempcpy (mempcpy (full_fname, fname, fname_len), aliasfile, sizeof aliasfile); @@ -207,9 +250,11 @@ read_alias_file (fname, fname_len) #endif fp = fopen (full_fname, "r"); - freea (full_fname); if (fp == NULL) - return 0; + { + FREE_BLOCKS (block_list); + return 0; + } added = 0; while (!feof (fp)) @@ -281,8 +326,7 @@ read_alias_file (fname, fname_len) *cp++ = '\0'; if (nmap >= maxmap) - if (__builtin_expect (extend_alias_table (), 0)) - return added; + extend_alias_table (); alias_len = strlen (alias) + 1; value_len = strlen (value) + 1; @@ -295,19 +339,10 @@ read_alias_file (fname, fname_len) ? 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; - } + FREE_BLOCKS (block_list); + return added; } - string_space = new_pool; string_space_max = new_size; } @@ -334,11 +369,12 @@ read_alias_file (fname, fname_len) qsort (map, nmap, sizeof (struct alias_map), (int (*) PARAMS ((const void *, const void *))) alias_compare); + FREE_BLOCKS (block_list); return added; } -static int +static void extend_alias_table () { size_t new_size; @@ -349,11 +385,10 @@ extend_alias_table () * sizeof (struct alias_map))); if (new_map == NULL) /* Simply don't extend: we don't have any more core. */ - return -1; + return; map = new_map; maxmap = new_size; - return 0; } diff --git a/intl/textdomain.c b/intl/textdomain.c index 05c2fd76..88557460 100644 --- a/intl/textdomain.c +++ b/intl/textdomain.c @@ -1,5 +1,6 @@ /* Implementation of the textdomain(3) function. - Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 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 General Public License as published by @@ -19,32 +20,23 @@ # include #endif -#include -#include +#if defined STDC_HEADERS || defined _LIBC +# include +#endif + +#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC +# include +#else +# include +# ifndef memcpy +# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) +# endif +#endif #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 _nl_default_default_domain__ -# define _nl_current_default_domain _nl_current_default_domain__ +# include "libgettext.h" #endif /* @@ end of prolog @@ */ @@ -69,9 +61,6 @@ extern const char *_nl_current_default_domain; # define TEXTDOMAIN textdomain__ #endif -/* Lock variable to protect the global data in the gettext implementation. */ -__libc_rwlock_define (extern, _nl_state_lock) - /* 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". */ @@ -79,60 +68,38 @@ char * TEXTDOMAIN (domainname) const char *domainname; { - char *new_domain; - char *old_domain; + char *old; /* 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; + old = (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; + _nl_current_default_domain = _nl_default_default_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); + _nl_current_default_domain = strdup (domainname); #else size_t len = strlen (domainname) + 1; - new_domain = (char *) malloc (len); - if (new_domain != NULL) - memcpy (new_domain, domainname, len); + char *cp = (char *) malloc (len); + if (cp != NULL) + memcpy (cp, domainname, len); + _nl_current_default_domain = cp; #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 != _nl_default_default_domain) + free (old); - if (old_domain != new_domain && old_domain != _nl_default_default_domain) - free (old_domain); - } - - __libc_rwlock_unlock (_nl_state_lock); - - return new_domain; + return (char *) _nl_current_default_domain; } #ifdef _LIBC diff --git a/m4/gettext.m4 b/m4/gettext.m4 new file mode 100644 index 00000000..890dd49a --- /dev/null +++ b/m4/gettext.m4 @@ -0,0 +1,329 @@ +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 108 + +AC_PREREQ(2.13) dnl Minimum Autoconf version required. + +AC_DEFUN(NANO_AM_WITH_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) + + USE_INCLUDED_LIBINTL=no + + AC_ARG_WITH(locale-dir, + [ --with-locale-dir=DIR specify locale directory], + LOCALE_DIR=$withval) + test -z "$LOCALE_DIR" && LOCALE_DIR='$(datadir)/locale' + AC_SUBST(LOCALE_DIR) + + AC_ARG_WITH(gnu-locale-dir, + [ --with-gnu-locale-dir=DIR specify GNU locale directory], + GNU_LOCALE_DIR=$withval) + test -z "$GNU_LOCALE_DIR" && GNU_LOCALE_DIR='$(prefix)/share/locale' + AC_SUBST(GNU_LOCALE_DIR) + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested.]) + 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 gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) + + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, gettext)]) + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$ac_cv_lib_intl_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT, 1, + [Define to 1 if you have gettext and don't want to use GNU gettext.]) + NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi + ]) + + if test "$CATOBJEXT" = "NONE"; then + AC_MSG_CHECKING([whether catgets can be used]) + AC_ARG_WITH(catgets, + [ --with-catgets use catgets functions if available], + nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) + AC_MSG_RESULT($nls_cv_use_catgets) + + if test "$nls_cv_use_catgets" = "yes"; then + dnl No gettext in C library. Try catgets next. + AC_CHECK_LIB(i, main) + AC_CHECK_FUNC(catgets, + [AC_DEFINE(HAVE_CATGETS, 1, + [Define as 1 if you have catgets and don't want to use GNU gettext.]) + INTLOBJS="\$(CATOBJS)" + AC_PATH_PROG(GENCAT, gencat, no)dnl + if test "$GENCAT" != "no"; then + AC_PATH_PROG(GMSGFMT, gmsgfmt, no) + if test "$GMSGFMT" = "no"; then + NANO_AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) + fi + NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.cat + INSTOBJEXT=.cat + DATADIRNAME=lib + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi]) + fi + fi + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi + if test -z "$nls_cv_header_intl"; then + # Clean out junk possibly left behind by a previous configuration. + rm -f intl/libintl.h + fi + AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) + + + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes + fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + +AC_DEFUN(NANO_AM_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +strdup __argz_count __argz_stringify __argz_next]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY, 1, [Define to 1 if you have the stpcpy function.]) + fi + + NANO_AM_LC_MESSAGES + NANO_AM_WITH_NLS + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + test -d intl || mkdir intl + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) + + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + case "$srcdir" in + .) + posrcprefix="../" ;; + /* | [[A-Za-z]]:*) + posrcprefix="$srcdir/" ;; + *) + posrcprefix="../$srcdir/" ;; + esac + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) diff --git a/m4/largefile.m4 b/m4/largefile.m4 new file mode 100644 index 00000000..c8d41e3e --- /dev/null +++ b/m4/largefile.m4 @@ -0,0 +1,92 @@ +#serial 19 + +dnl By default, many hosts won't let programs access large files; +dnl one must use special compiler options to get large-file access to work. +dnl For more details about this brain damage please see: +dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html + +dnl Written by Paul Eggert . + +dnl Internal subroutine of AC_SYS_LARGEFILE. +dnl AC_SYS_LARGEFILE_TEST_INCLUDES +AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES, + [[#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply "#define LARGE_OFF_T 9223372036854775807", + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +# define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; + ]]) + +dnl Internal subroutine of AC_SYS_LARGEFILE. +dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY) +AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE, + [AC_CACHE_CHECK([for $1 value needed for large files], $3, + [$3=no + AC_TRY_COMPILE([$5], + [$6], + , + [AC_TRY_COMPILE([#define $1 $2] +[$5] + , + [$6], + [$3=$2])])]) + if test "[$]$3" != no; then + AC_DEFINE_UNQUOTED([$1], [$]$3, [$4]) + fi]) + +AC_DEFUN(NANO_AC_SYS_LARGEFILE, + [AC_REQUIRE([AC_PROG_CC]) + AC_ARG_ENABLE(largefile, + [ --disable-largefile omit support for large files]) + if test "$enable_largefile" != no; then + + AC_CACHE_CHECK([for special C compiler options needed for large files], + ac_cv_sys_largefile_CC, + [ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , , + [ac_save_CC="$CC" + CC="$CC -n32" + AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , + ac_cv_sys_largefile_CC=' -n32') + CC="$ac_save_CC"]) + fi]) + if test "$ac_cv_sys_largefile_CC" != no; then + CC="$CC$ac_cv_sys_largefile_CC" + fi + + AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, + ac_cv_sys_file_offset_bits, + [Number of bits in a file offset, on hosts where this is settable.], + AC_SYS_LARGEFILE_TEST_INCLUDES) + AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, + ac_cv_sys_large_files, + [Define for large files, on AIX-style hosts.], + AC_SYS_LARGEFILE_TEST_INCLUDES) + fi + ]) + +AC_DEFUN(AC_FUNC_FSEEKO, + [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, + ac_cv_sys_largefile_source, + [Define to make fseeko visible on some hosts (e.g. glibc 2.2).], + [#include ], [return !fseeko;]) + # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug + # in glibc 2.1.3, but that breaks too many other things. + # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. + + AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko, + [ac_cv_func_fseeko=no + AC_TRY_LINK([#include ], + [return fseeko && fseeko (stdin, 0, 0);], + [ac_cv_func_fseeko=yes])]) + if test $ac_cv_func_fseeko != no; then + AC_DEFINE(HAVE_FSEEKO, 1, + [Define if fseeko (and presumably ftello) exists and is declared.]) + fi]) diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4 new file mode 100644 index 00000000..e4c39ac2 --- /dev/null +++ b/m4/lcmessage.m4 @@ -0,0 +1,22 @@ +# Check whether LC_MESSAGES is available in . +# Ulrich Drepper , 1995. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 2 + +AC_PREREQ(2.13) dnl Minimum Autoconf version required. + +AC_DEFUN(NANO_AM_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your locale.h file contains LC_MESSAGES.]) + fi + fi]) diff --git a/m4/progtest.m4 b/m4/progtest.m4 new file mode 100644 index 00000000..95773fef --- /dev/null +++ b/m4/progtest.m4 @@ -0,0 +1,47 @@ +# Search path for a program which passes the given test. +# Ulrich Drepper , 1996. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN(NANO_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 -n "[$]$1"; then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) diff --git a/po/ca.po b/po/ca.po index 4f5c0dc1..284e246d 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1.0\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2001-05-02 19:14+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -24,133 +24,133 @@ msgstr "add_to_cutbuffer cridat amb inptr->data = %s\n" msgid "Blew away cutbuffer =)\n" msgstr "Hem foragitat el cuttbuffer =)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: no som a la primera lМnia i la anterior Иs NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "%d lМnies llegides" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" no trobat" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "Nou Fitxer" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "Fitxer \"%s\" Иs un directori" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "El fitxer \"%s\" Иs un dispositiu" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "S'estЮ llegint el Fitxer" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "Fitxer a inserir [des de ./] " -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "filename Иs %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Cancel╥lat" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "No he pogut obrir el fitxer per a escriure: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "Escrites >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "No he pogut tancar %s: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "No he pogut obrir %s per a escriure: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "No he pogut establir permisos %o en %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "%d lМnies escrites" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 #, fuzzy msgid "Append" msgstr "Suspendre" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "Desar" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "Nom de Fitxer a escriure" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "El fitxer existeix, SOBREESCRIURE ?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(mИs)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "No puc ascendre de directori" # y, c-format #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "No es pot obrir \"%s\": %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 msgid "Goto Directory" msgstr "Anar a Directori" -#: files.c:1954 +#: files.c:1965 msgid "Goto Cancelled" msgstr "Anar a Cancel╥lat" @@ -211,300 +211,300 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Invocar el menЗ d'ajuda" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Escriure el fitxer actual a disc" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "Sortir de nano" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "Anar a un nЗmero de lМnia especМfic" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Justificar el parЮgraf actual" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "Desjustificar desprИs d'un justificar" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "ReemplaГar text al editor" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Inserir un altre fitxer dins del actual" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "Cercar un text al editor" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "Moure a la pЮgina anterior" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "Moure a la pЮgina segЭent" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Tallar la lМnia actual i desar-la al cutbuffer" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Enganxar el cutbuffer a la lМnia actual" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "Mostrar la posiciС del cursor" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "Invocar el corrector ortogrЮfic (si estЮ disponible)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "Moure una lМnia cap a dalt" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "Moure una lМnia cap a baix" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "Moure endavant un carЮcter" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "Moure endarrere un carЮcter" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "Moure al principi de la lМnia actual" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "Moure al final de la lМnia actual" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "Anar a la primera lМnia del fitxer" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "Anar a la darrera lМnia del fitxer" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Redibuixar la pantalla actual" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Marcar text a la posiciС actual del cursor" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Suprimir el carЮcter sota el cursor" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Suprimir el carЮcter a l'esquerra del cursor" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "Inserir un carЮcter tab" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "Inserir un retorn a la posiciС del cursor" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "Fer que la recerca actual siga sensible a majЗscules" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "Anar a l'explorador de fitxers" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Cancel╥lar la funciС actual" -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "Moure al final de la lМnia actual" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "Recerca Cancel╥lada" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "Expressions regulars" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "Veure Ajuda" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Sortir" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Desar" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Justificar" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "L. Fitxer" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "ReemplaГar" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Cercar" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "PЮg Ant" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "PЮg Seg" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "TallarTxt" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "Desjustificar" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "EnganTxt" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Pos Act" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Ortografia" -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Dalt" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Baix" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "Endavant" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "Endarrere" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Inici" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "Fi" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "Refrescar" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "MarcarTxt" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Suprimir" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "RetrocИs" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Tab" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Retorn" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "Anar a LМnia" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "Primera LМnia" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "зltima LМnia" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Cancel╥lar" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "Maj/Min" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "Endarrere" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Cancel╥lar" + +#: global.c:438 msgid "No Replace" msgstr "No ReemplaГar" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "A Fitxers" -#: global.c:522 +#: global.c:525 msgid "Goto" msgstr "Anar a" @@ -960,92 +960,92 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "Maj/Min" -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "Cercar%s%s" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (a reemplaГar)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "Recerca Cancel╥lada" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" no trobat" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "Recerca RecomenГada" -#: search.c:421 +#: search.c:426 #, c-format msgid "Replaced %d occurrences" msgstr "%d ocurrХncies reemplaГadas" -#: search.c:423 +#: search.c:428 msgid "Replaced 1 occurrence" msgstr "1 ocurrХncia reemplaГada" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "ReemplaГar Cancel╥lat" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "ReemplaГar aquesta instЮncia?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "Impossible de reemplaГar: subexpressiС desconeguda!" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "ReemplaГar amb [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "ReemplaГar amb" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Introdueix nЗmero de lМnia" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "Avortat" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Au vinga, sigues assenyat" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "nano: malloc: memРria insuficient!" -#: utils.c:160 +#: utils.c:173 msgid "nano: calloc: out of memory!" msgstr "nano: calloc: memРria insuficient!" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr "nano: realloc: memРria insuficient!" diff --git a/po/cs.po b/po/cs.po index 23d72db2..7b72215d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0.0\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "Last-Translator: VАclav Haisman \n" "Language-Team: N/A\n" "MIME-Version: 1.0\n" @@ -22,133 +22,133 @@ msgstr "add_to_cutbuffer vol msgid "Blew away cutbuffer =)\n" msgstr "Blew away cutbuffer =)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: nejsme na prvnМ ЬАdce a pЬedchozМ je NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "PЬeХteno %d ЬАdek" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" nenalezen" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "NovЩ Soubor" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "Soubor \"%s\" je adresАЬ" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, fuzzy, c-format msgid "File \"%s\" is a device file" msgstr "Soubor \"%s\" je soubor zaЬМzenМ" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "хtu Soubor" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "Soubor pro vlo╬enМ [z ./] " -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "jmИno souboru je %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Zru╧eno" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Nemohu otevЬМt soubor pro zАpis: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "ZapsАno >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Nemohu zavЬМt %s: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Nemohu otevЬМt %s pro zАpis: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Nemohu nastavit pЬМstupvА prАva %o na %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "ZapsАno %d ЬАdek" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 #, fuzzy msgid "Append" msgstr "Zastavit" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "Zapi╧" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "JmИno Souboru pro zapsАnМ" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "Soubor existuje, PьEPSAT ?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(vМce)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "Nemohu se pЬesunout o adresАЬ vЩ╧e" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, fuzzy, c-format msgid "Can't open \"%s\": %s" msgstr "Nemohu zavЬМt %s: %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 #, fuzzy msgid "Goto Directory" msgstr "Jdi na ьАdku" -#: files.c:1954 +#: files.c:1965 #, fuzzy msgid "Goto Cancelled" msgstr "Zru╧eno" @@ -211,306 +211,306 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Vyvolat menu nАpovЛdy" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Zapsat aktuАlnМ soubor na disk" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "UkonХit nano" -#: global.c:247 +#: global.c:245 #, fuzzy msgid "Goto a specific line number" msgstr "Jdi na ЬАdku" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Zarovnej aktuАlnМ odstavec" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "Zru╧ pЬedchozМ zarovnАnМ" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "ZamЛn text v editoru" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Vlo╬ soubor do aktuАlnМho souboru" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "Hledej text v editoru" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "PЬesuР se na pЬedchozМ obrazovku" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "PЬesuР se na dal╧М obrazovku" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Vyjmi aktuАlnМ ЬАdku a ulo╬ ji v cutbufferu" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Vlo╬ z cutbufferu do aktuАlnМ ЬАdky" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "Uka╬ pozici kurzoru" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "Vyvolej kontrolu pravopisu (pokud je k dispozici)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "PЬesun o rАdek nahoru" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "PЬesun o ЬАdek dolu" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "PЬesun o znak dopЬedu" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "PЬesun o znak zpЛt" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "PЬesun na zaХАtek aktuАlnМ ЬАdky" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "PЬesun na konec aktuАlnМ ЬАdky" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "PЬesun na prvnМ ЬАdku souboru" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "PЬesun na poslednМ ЬАdku souboru" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Obnov (pЬekresli) obrazovku" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "OznaХ text na souХasnИ pozici kurzoru" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Sma╬ znak pod kurzorem" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Sma╬ znak nalevo od kurzoru" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "Vlo╬ znak tabulАtoru" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "Vlo╬ konec ЬАdky na pozici kurzoru" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "(Ne)rozly╧uj malА/VELKа pМsmena v souХasnИm vyhledАvАnМ nebo zАmЛnЛ" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "Jdi do prohlМ╬eХ souborЫ" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Zru╧ aktuАlnМ funkci" -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "PЬesun na konec aktuАlnМ ЬАdky" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "HledАnМ Zru╧eno" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "RegulАrnМ vЩrazy" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "NАpovЛda" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Konec" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Zapi╧" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "ZarovnАnМ" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 #, fuzzy msgid "Read File" msgstr "хМst Soubor" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 #, fuzzy msgid "Replace" msgstr "ZАmЛna" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Kde Je" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "PЬedchozМ Strana" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "Dal╧М Strana" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "Vyjmi Text" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "OdZarovnej" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "Zru╧ vyjmutМ textu" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Pozice Kurzoru" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Pravopis" -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Nahoru" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Dolu" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "DopЬedu" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "ZpЛt" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "DomЫ" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "Konec" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "Obnov" -#: global.c:371 +#: global.c:369 #, fuzzy msgid "Mark Text" msgstr "OznaХ Text" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Zma╬" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "Backspace" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Tab" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Enter" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "Jdi na ьАdku" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "PrvnМ ьАdka" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "PoslednМ ьАdka" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Storno" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "Case Sens" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "ZpЛt" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Storno" + +#: global.c:438 #, fuzzy msgid "No Replace" msgstr "Bez zАmЛny" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 #, fuzzy msgid "To Files" msgstr "K SouborЫm" -#: global.c:522 +#: global.c:525 #, fuzzy msgid "Goto" msgstr "Jdi na ьАdku" @@ -969,94 +969,94 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "Case Sens" -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "HledАnМ" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (k zАmЛnЛ)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "HledАnМ Zru╧eno" -#: search.c:216 +#: search.c:221 #, fuzzy, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" nenalezen" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "HledАnМ Zalomeno" -#: search.c:421 +#: search.c:426 #, fuzzy, c-format msgid "Replaced %d occurrences" msgstr "ZamЛnЛno %d vЩskytЫ" -#: search.c:423 +#: search.c:428 #, fuzzy msgid "Replaced 1 occurrence" msgstr "ZamЛnЛn 1 vЩskyt" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "ZАmЛna Zru╧ena" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "ZamЛnit tuto instanci?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "ZАmЛna selhala: neznАmЩ podvЩraz!" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "ZamЛn s [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "ZamЛn s" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Zadej ХМslo ЬАdky" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "PЬeru╧eno" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Notak, buО rozumnЩ." -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "nano: malloc: nedostatek pamЛti!" -#: utils.c:160 +#: utils.c:173 #, fuzzy msgid "nano: calloc: out of memory!" msgstr "nano: malloc: nedostatek pamЛti!" -#: utils.c:170 +#: utils.c:183 #, fuzzy msgid "nano: realloc: out of memory!" msgstr "nano: malloc: nedostatek pamЛti!" diff --git a/po/de.po b/po/de.po index eed72f29..fd8b6d69 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.0\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2001-02-08 17:56+0200\n" "Last-Translator: Florian KЖnig \n" "Language-Team: German \n" @@ -24,133 +24,133 @@ msgstr "add_to_cutbuffer aufgerufen mit inptr->data = %s\n" msgid "Blew away cutbuffer =)\n" msgstr "Inhalt der Zwischenablage verworfen\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: nicht in der ersten Zeile und prev ist NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "%d Zeilen gelesen" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" nicht gefunden" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "Neue Datei" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "Datei \"%s\" ist ein Verzeichnis" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "Datei \"%s\" ist eine GerДtedatei" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "Lese Datei" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "Datei einfЭgen [von ./] " -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "Dateiname ist %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Abgebrochen" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Konnte nicht in Datei schreiben: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "Schrieb >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Konnte %s nicht schlieъen: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Konnte %s nicht zum Schreiben Жffnen: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Konnte Rechte %o fЭr %s nicht setzen: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "%d Zeilen geschrieben" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 #, fuzzy msgid "Append" msgstr "Suspend" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "Speichern" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "Dateiname zum Speichern" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "Datei exisitiert, эBERSCHREIBEN ?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(mehr)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "Konnte nicht in │bergeordnetes Verzeichnis wechseln" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "Konnte \"%s\" nicht Жffnen: %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 #, fuzzy msgid "Goto Directory" msgstr "Zu Zeile" -#: files.c:1954 +#: files.c:1965 #, fuzzy msgid "Goto Cancelled" msgstr "Abgebrochen" @@ -212,303 +212,303 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Hilfe-MenЭ anzeigen" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Datei speichern" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "nano beenden" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "Zu einer Zeile springen" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Absatz ausrichten" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "Absatzausrochtung rЭckgДngig machen" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "Text im Editor ersetzen" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Datei einfЭgen" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "Im Editor nach Text suchen" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "Zu der vorhergehenden Seite springen" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "Zu der folgenden Seite springen" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Zeile ausschneiden und in dir Zwischenablage speichern" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Aus der Zwischenablage einfЭgen" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "Cursoposition anzeigen" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "RechtschreibprЭfung aufrufen (wenn verfЭgbar)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "Zur vorhergehenden Zeile springen" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "Zur folgenden Zeile springen" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "Zum folgenden Zeichen springen" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "Zum vorhergehenden Zeichen springen" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "Zum Zeilenanfang springen" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "Zum Zeilenende springen" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "Zur ersten Zeile springen" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "Zur letzten Zeile springen" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Bildschirm auffrischen (neu zeichnen)" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Text an der derzeitigen Cursorposition markieren" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Zeichen an der Cursorposition lЖschen" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Zeichen links vom Cursor lЖschen" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "Tabulator einfЭgen" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "Zeilenumbruch an der Cursorposition einfЭgen" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "" "Groъ- und Kleinschreibung bei Suche oder Erstzen (nicht) berЭcksichtigen" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "Zum Dateibrowser" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Funktion abbrechen" -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "Zum Zeilenende springen" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "Suche abgebrochen" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "RegulДre AusdrЭcke" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "Hilfe" -#: global.c:289 +#: global.c:287 #, fuzzy msgid "Close" msgstr "mouse" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Beenden" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Speichern" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Ausrichten" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "Datei Жffnen" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "Ersetzen" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Wo ist" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "Seite zurЭck" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "Seite vor" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "Ausschneiden" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "Ausrichten rЭckgДngig" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "Ausschneiden rЭckgДngig" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Cursor" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Rechtschr." -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Hoch" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Runter" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "VorwДrts" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "ZurЭck" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Pos 1" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "Ende" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "Auffrischen" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "Text markieren" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "LЖschen" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "RЭcktaste" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Tab" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Enter" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "Zu Zeile" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "Erste Zeile" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "Letzte Zeile" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Abbrechen" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "GROSZ/klein" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "ZurЭck" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 #, fuzzy msgid "Regexp" msgstr "regulДrer Ausdruck" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Abbrechen" + +#: global.c:438 msgid "No Replace" msgstr "Keine Ersetzung" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "In Dateien" -#: global.c:522 +#: global.c:525 #, fuzzy msgid "Goto" msgstr "Zu Zeile" @@ -975,95 +975,95 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "GROSZ/klein" -#: search.c:127 +#: search.c:130 #, fuzzy msgid "Regexp " msgstr "regulДrer Ausdruck" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "Suche" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (zu ersetzen)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "Suche abgebrochen" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" nicht gefunden" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "Suche in neue Zeile umgebrochen" -#: search.c:421 +#: search.c:426 #, fuzzy, c-format msgid "Replaced %d occurrences" msgstr "%d Ersetzungen vorgenommen" -#: search.c:423 +#: search.c:428 #, fuzzy msgid "Replaced 1 occurrence" msgstr "1 Ersetzung vorgenommen" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "Ersetzung abgebrochen" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "Fundstelle ersetzen?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "Ersetzung gescheitert: unbekannter Unterausdruck" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "Ersetzen mit [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "Ersetzen mit" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Zeilennummer eingeben" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "Abgebrochen" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Komm schon, sei vernЭnftig" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "nano: malloc: Kein Speicher verfЭgbar!" -#: utils.c:160 +#: utils.c:173 #, fuzzy msgid "nano: calloc: out of memory!" msgstr "nano: malloc: Kein Speicher verfЭgbar!" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr "nano: realloc: Kein Speicher verfЭgbar!" diff --git a/po/es.po b/po/es.po index beb086a6..1e2f4dc1 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1.0\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2001-05-02 19:10+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Spanish \n" @@ -24,131 +24,131 @@ msgstr "add_to_cutbuffer llamado con inptr->data = %s\n" msgid "Blew away cutbuffer =)\n" msgstr "Nos hemos cargado el cutbuffer =)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: no estamos en la primera lМnea y la anterior es NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "%d lМneas leМdas" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" no encontrado" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "Nuevo Fichero" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "Fichero \"%s\" es un directorio" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "El fichero \"%s\" es un dispositivo" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "Leyendo Fichero" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "Fichero a insertar [desde ./] " -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "filename es %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Cancelado" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "No pude abrir el fichero para escribir: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "EscribМ >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "No pude cerrar %s: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "No pude abrir %s para escribir: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "No pude establecer permisos %o en %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "%d lМneas escritas" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "%s SelecciСn a Fichero" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 msgid "Append" msgstr "AЯadir" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 msgid "Write" msgstr "Escribir" -#: files.c:1078 +#: files.c:1089 #, c-format msgid "File Name to %s" msgstr "Nombre de Fichero a %s" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "El fichero existe, © SOBREESCRIBIR ?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(mАs)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "No puedo ascender de directorio" # y, c-format #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "No se puede abrir \"%s\": %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 msgid "Goto Directory" msgstr "Ir a Directorio" -#: files.c:1954 +#: files.c:1965 msgid "Goto Cancelled" msgstr "Ir a Cancelado" @@ -208,296 +208,296 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Invocar el menЗ de ayuda" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Escribir el fichero actual a disco" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "Salir de nano" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "Ir a un nЗmero de lМnea en concreto" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Justificar el pАrrafo actual" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "Desjustificar despuИs de un justificar" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "Reemplazar texto en el editor" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Insertar otro fichero en el actual" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "Buscar un texto en el editor" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "Moverse a la pАgina anterior" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "Moverse a la pАgina siguiente" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Cortar la lМnea actual y guardarla en el cutbuffer" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Pegar el cutbuffer en la lМnea actual" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "Mostrar la posiciСn del cursor" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "Invocar el corrector ortogrАfico (si estА disponible)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "Moverse una lМnea hacia arriba" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "Moverse una lМnea hacia abajo" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "Moverse hacia adelante un carАcter" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "Moverse hacia atrАs un carАcter" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "Moverse al principio de la lМnea actual" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "Moverse al final de la lМnea actual" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "Ir a la primera lМnea del fichero" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "Ir a la Зltima lМnea del fichero" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Redibujar la pantalla actual" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Marcar texto en la posiciСn actual del cursor" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Borrar el carАcter bajo el cursor" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Borrar el carАcter a la izquierda del cursor" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "Insertar un carАcter tab" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "Insertar un retorno de carro en la posiciСn del cursor" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "Hacer que la bЗsqueda actual sea sensible a mayЗsculas" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "Ir al navegador de ficheros" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Cancelar la funciСn actual" -#: global.c:279 +#: global.c:277 msgid "Append to the current file" msgstr "AЯadir al fichero actual" -#: global.c:280 +#: global.c:278 msgid "Search Backwards" msgstr "Buscar hacia atrАs" -#: global.c:281 +#: global.c:279 msgid "Use Regular Expressions" msgstr "Usar Expresiones regulares" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "Ver Ayuda" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Salir" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Guardar" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Justificar" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "L Fichero" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "Reemplazar" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Buscar" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "PАg Ant" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "PАg Sig" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "CortarTxt" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "Desjustificar" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "PegarTxt" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Pos Act" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "OrtografМa" -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Arriba" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Abajo" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "Adelante" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "AtrАs" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Inicio" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "Fin" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "Refrescar" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "MarcarTxt" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Suprimir" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "Borrar" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Tab" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Enter" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "Ir a LМnea" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "Primera LМnea" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "зltima LМnea" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Cancelar" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "May/Min" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 msgid "Backward" msgstr "Hacia AtrАs" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "Expreg" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Cancelar" + +#: global.c:438 msgid "No Replace" msgstr "No Reemplazar" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "A Ficheros" -#: global.c:522 +#: global.c:525 msgid "Goto" msgstr "Ir a" @@ -956,90 +956,90 @@ msgstr "Errores encontrados en fichero .nanorc" msgid "Unable to open ~/.nanorc file, %s" msgstr "Imposible abrir fichero ~/.nanorc, %s" -#: search.c:126 +#: search.c:129 msgid "Case Sensitive " msgstr "May/Min " -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "Expreg " -#: search.c:128 +#: search.c:131 msgid "Search" msgstr "Buscar" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr " Hacia AtrАs" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (a reemplazar)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "BЗsqueda Cancelada" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" no encontrado" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "BЗsqueda Recomenzada" -#: search.c:421 +#: search.c:426 #, c-format msgid "Replaced %d occurrences" msgstr "%d ocurrencias reemplazadas" -#: search.c:423 +#: search.c:428 msgid "Replaced 1 occurrence" msgstr "1 ocurrencia reemplazada" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "Reemplazar Cancelado" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "©Reemplazar esta instancia?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "Fallo en reemplazar: ║subexpresiСn desconocida!" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "Reemplazar con [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "Reemplazar con" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Introduce nЗmero de lМnea" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "Abortado" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Venga ya, se razonable" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "nano: malloc: memoria insuficiente!" -#: utils.c:160 +#: utils.c:173 msgid "nano: calloc: out of memory!" msgstr "nano: calloc: memoria insuficiente!" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr "nano: realloc: memoria insuficiente!" diff --git a/po/fi.po b/po/fi.po index f1d34e5f..888016c6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 0.9.18\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2001-01-12 17:21+02:00\n" "Last-Translator: Pauli Virtanen \n" "Language-Team: Finnish \n" @@ -22,133 +22,133 @@ msgstr "add_to_cutbuffer funktion parametri inptr->data = %s\n" msgid "Blew away cutbuffer =)\n" msgstr "Leiketila katosi =)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: ei ensimmДisellД rivillД ja prev on NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "%d riviД luettu" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "Ei lЖytynyt: \"%s\"" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "Uusi tiedosto" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "\"%s\" on hakemisto" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "\"%s\" on laitetiedosto" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "Lukee tiedostoa" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "LisДttДvД tiedosto [hakemistossa ./]" -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "tiedoston nimi on %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Peruttu" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Tiedostoa ei voitu avata luettavaksi: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "Kirjoitettu: >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Tiedostoa %s ei voitu sulkea: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Tiedostoa %s ei voitu avata kirjoittamista varten: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Oikeuksia %o ei voitu asettaa tiedostolle %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "%d riviД kirjoitettu" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 #, fuzzy msgid "Append" msgstr "KeskeytД" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "Kirjoita" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "Kirjoitettavan tiedoston nimi" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "Tiedosto on jo olemassa, korvataanko?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(lisДД)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "Ei voi siirtyД ylДhakemistoon" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "Hakemistoa \"%s\" ei voi avata: %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 #, fuzzy msgid "Goto Directory" msgstr "Siirry" -#: files.c:1954 +#: files.c:1965 #, fuzzy msgid "Goto Cancelled" msgstr "Peruttu" @@ -210,300 +210,300 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Avaa ohjevalikko" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Kirjoita nykyinen tiedosto levylle" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "Poistu Nanosta" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "Siirry tietylle riville" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Tasaa nykyinen kappale" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "Poista tasaus tasauksen jДlkeen" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "Etsi ja korvaa tekstiД" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "LisДД toinen tiedosto nykyiseen tiedostoon" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "Etsi tekstiД" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "Siirry edelliseen ruutuun" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "Siirry seuraavaan ruutuun" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Leikkaa nykyinen rivi leiketilaan" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Kopioi rivi leiketilasta nykyiselle riville" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "NДytД kohdistimen sijainti" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "KДynnistД oikoluin (jos saatavilla)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "Siirry yksi rivi ylЖspДin" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "Siirry yksi rivi alaspДin" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "Siirry yksi merkki eteenpДin" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "Siirry yksi merkki taaksepДin" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "Siirry nykyisen rivin alkuun" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "Siirry nykyisen rivin loppuun" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "Siirry tiedoston ensimmДiselle riville" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "Siirry tiedoston viimeiselle riville" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "PiirrД ruutu uudestaan" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Merkitse kohdistimen kohdalla oleva teksti" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Poista kohdistimen kohdalla oleva merkki" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Poista kohdistimesta vasemmalle oleva merkki" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "LisДД sarkainmerkki" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "LisДД rivinvaihto kohdistimen kohdalle" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "Muuta etsintД- tai korvaustoiminnon kirjainkoosta piittaamista." -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "Siirry tiedostoselaimeen" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Peru nykyinen toiminto." -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "Siirry nykyisen rivin loppuun" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "EtsintД peruttu" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "SДДnnЖlliset lausekkeet" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "Ohjeita" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Lopeta" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Kirjoita" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Tasaa" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "Lue tied." -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "Korvaa" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Etsi" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "Ed. sivu" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "Seur. sivu" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "Leikkaa" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "Poista tasaus" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "LiitД" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Sijainti" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Oikolue" -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "YlЖs" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Alas" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "EteenpДin" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "Takaisin" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Home" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "End" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "PiirrД uudelleen" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "Merkitse tekstiД" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Poista" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "Askelpalautin" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Sarkain" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Enter" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "Siirry" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "1. rivi" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "Viim. rivi" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Peru" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "Kirj. koko" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "Takaisin" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Peru" + +#: global.c:438 msgid "No Replace" msgstr "дlД korvaa" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "Tiedosto" -#: global.c:522 +#: global.c:525 #, fuzzy msgid "Goto" msgstr "Siirry" @@ -959,93 +959,93 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "Kirj. koko" -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "EtsintД%s%s" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (korvattava)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "EtsintД peruttu" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" ei lЖytynyt" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "EtsintД jatkuu" -#: search.c:421 +#: search.c:426 #, fuzzy, c-format msgid "Replaced %d occurrences" msgstr "%d kohtaa korvattu" -#: search.c:423 +#: search.c:428 #, fuzzy msgid "Replaced 1 occurrence" msgstr "1 kohta korvattu" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "Korvaus peruttu" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "Korvataanko tДmД kohta?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "Korvaus epДonnistui: tuntematon alilauseke!" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "Korvaa merkkijonolla [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "Korvaa merkkijonolla" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Kirjoita rivin numero" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "Keskeytetty" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Jotakin jДrkevДД, kiitos?" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "" -#: utils.c:160 +#: utils.c:173 msgid "nano: calloc: out of memory!" msgstr "" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr "" diff --git a/po/fr.po b/po/fr.po index ee3f30ad..e63f6b52 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.9\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2000-07-09 01:32+0100\n" "Last-Translator: Clement Laforet \n" "Language-Team: French \n" @@ -24,134 +24,134 @@ msgstr "add_to_cutbuffer appel msgid "Blew away cutbuffer =)\n" msgstr "cutbuffer annihilИ -)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "" "read_line: la position actuelle n'est pas la premiХre ligne et la prИcИdente " "est NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "%d lignes lues" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" non trouvИ" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "Nouveau fichier" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "Le fichier \"%s\" est un rИpertoire" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, fuzzy, c-format msgid "File \"%s\" is a device file" msgstr "Le fichier \"%s\" est un rИpertoire" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "Lecture du fichier" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "Fichier Ю insИrer [depuis ./] " -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "Le nom du fichier est %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "AnnulИ" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Impossible d'ouvrir le fichier en Иcriture: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "иcrit >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Impossible de fermer %s: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Impossible d'ouvrir %s en Иcriture: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Impossible de donner les permissions %o Ю %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "%d lignes Иcrites" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 msgid "Append" msgstr "" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "Sauvegarde" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "Nom du fichier dans lequel Иcrire" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "Fichier existant, Иcrire par-dessus ?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, fuzzy, c-format msgid "Can't open \"%s\": %s" msgstr "Impossible de fermer %s: %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 #, fuzzy msgid "Goto Directory" msgstr "-> ligne" -#: files.c:1954 +#: files.c:1965 #, fuzzy msgid "Goto Cancelled" msgstr "AnnulИ" @@ -216,307 +216,307 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Appelle le menu d'aide" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Ecrit le fichier en cours sur le disque" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "Quitte Nano" -#: global.c:247 +#: global.c:245 #, fuzzy msgid "Goto a specific line number" msgstr "Entrer le numИro de ligne" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Justifie le paragraphe courant" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "Remplace le texte dans l'Иditeur" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "InsХre un autre fichier dans le fichier courant" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "Recherche d'une chaНne dans l'Иditeur" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "Retourne a l'Иcran prИcХdent" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "Aller au prochain Иcran" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Supprime la ligne courante et la stocke en mИmoire" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Copie la chaНne en mИmoire vers la ligne courante" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "Affiche la position du curseur" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "Appel du correcteur orthographique (s'il est disponible)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "DИplace d'une ligne vers le haut" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "DИplace d'une ligne vers le bas" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "DИplace d'un caractХre en avant" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "DИplace d'un caractХre en arriere" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "DИplace vers le dИbut de la ligne courante" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "DИplace vers la fin de la ligne courante" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "Va Ю la premiХre ligne du fichier" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "Va Ю la derniХre ligne du fichier" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Rafraichit (redessine) l'ecran courant" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Marquer le texte Ю la position actuelle du curseur" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Supprime le caractХre oЫ se trouve le curseur" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Supprime le caractХre Ю la gauche du curseur" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "InsХre une tabulation" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "InsХre un retour-chariot Ю la position du curseur" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "ExИcuter rechercher/remplacer avec/sans rspect de la casse" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Annule la fonction courante" -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "DИplace vers la fin de la ligne courante" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "Recherche annulИe" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "-R\t\tUtilisation des expressions rИguliХres pour la recherche\n" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "Appelle l'aide" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Quitte" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Sauvegarde" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Justifier" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 #, fuzzy msgid "Read File" msgstr "Lect. fichier" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 #, fuzzy msgid "Replace" msgstr "Remplacer par" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Recherche" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "Page prИc." -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "Page suiv." -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "Couper" -#: global.c:335 +#: global.c:333 #, fuzzy msgid "UnJustify" msgstr "Justifier" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "Annul. Coup" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Pos. curseur" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Corriger" -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Haut" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Bas" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "En avant" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "En arriХre" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Debut Doc." -#: global.c:365 +#: global.c:363 msgid "End" msgstr "Fin Doc0" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "RafraНchir" -#: global.c:371 +#: global.c:369 #, fuzzy msgid "Mark Text" msgstr "Marque enregistrИe" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Supprimer" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "Backspace" # No translation... -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Tabulation" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "EntrИe" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "-> ligne" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "PremiХre ligne" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "DerniХre Ligne" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Annuler" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "Casse respectИe" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "En arriХre" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Annuler" + +#: global.c:438 msgid "No Replace" msgstr "Pas de remplacement" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 #, fuzzy msgid "To Files" msgstr "Nouveau fichier" -#: global.c:522 +#: global.c:525 #, fuzzy msgid "Goto" msgstr "-> ligne" @@ -981,95 +981,95 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "Casse respectИe" -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "Recherche%s%s" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 #, fuzzy msgid " (to replace)" msgstr " (remplacer par)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "Recherche annulИe" -#: search.c:216 +#: search.c:221 #, fuzzy, c-format msgid "\"%s...\" not found" msgstr "\"%s\" non trouvИ" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "La recherche a bouclИ" -#: search.c:421 +#: search.c:426 #, fuzzy, c-format msgid "Replaced %d occurrences" msgstr "%d occurences remplacИes" -#: search.c:423 +#: search.c:428 #, fuzzy msgid "Replaced 1 occurrence" msgstr "1 occurence remplacИe" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "Remplacement annulИ" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "Remplacer cette occurence?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "Remplacer par [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "Rempacer par" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Entrer le numИro de ligne" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "AnnulИ" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Allez, soyez raisonnable" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "nano: malloc: plus de mИmoire!" -#: utils.c:160 +#: utils.c:173 #, fuzzy msgid "nano: calloc: out of memory!" msgstr "nano: malloc: plus de mИmoire!" -#: utils.c:170 +#: utils.c:183 #, fuzzy msgid "nano: realloc: out of memory!" msgstr "nano: malloc: plus de mИmoire!" diff --git a/po/gl.po b/po/gl.po index 8f7e764b..f19d987a 100644 --- a/po/gl.po +++ b/po/gl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.1.0\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2001-04-30 00:16+02:00\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -22,132 +22,132 @@ msgstr "chamouse a add_to_cutbuffer con inptr->data = %s\n" msgid "Blew away cutbuffer =)\n" msgstr "Borrouse o buffer de cortado =)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: non se estА na primeira liЯa, e prev И NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "LИronse %d liЯas" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "Non se atopou \"%s\"" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "Ficheiro Novo" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "O ficheiro \"%s\" И un directorio" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "O ficheiro \"%s\" И un ficheiro de dispositivo" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "Lendo o Ficheiro" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "Ficheiro a inserir [dende ./]" -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "filename И %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Cancelado" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Non se puido abri-lo ficheiro para escribir: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "EscribМuse >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Non se puido pechar %s: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Non se puido abrir %s para escribir: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Non se puideron estabrece-los permisos %o en %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "EscribМronse %d liЯas" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 #, fuzzy msgid "Append" msgstr "Suspender" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "Gravar" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "Nome do Ficheiro a escribir" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "O ficheiro xa existe, ©SOBRESCRIBIR?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(mАis)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "Non se pode ascender por un directorio" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "Non se puido abrir \"%s\": %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 msgid "Goto Directory" msgstr "Ir a un Directorio" -#: files.c:1954 +#: files.c:1965 msgid "Goto Cancelled" msgstr "Ir-A Cancelado" @@ -208,300 +208,300 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Chamar ao menЗ de axuda" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Grava-lo ficheiro actual no disco" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "SaМr de nano" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "Ir a un determinado nЗmero de liЯa" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Xustifica-lo parАgrafo actual" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "Des-xustificar despois de xustificar" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "SubstituМr texto no editor" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Inserir outro ficheiro no actual" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "Buscar texto no editor" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "Pasar А pantalla anterior" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "Pasar А seguinte pantalla" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Corta-la liЯa actual e gardala no buffer de cortado" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Pegar do buffer de cortado na liЯa actual" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "Amosa-la posiciСn do cursor" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "Chamar ao corrector ortogrАfico (se hai un)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "Subir unha liЯa" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "Baixar unha liЯa" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "Avanzar un carАcter" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "Recuar un carАcter" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "Ir ao principio da liЯa actual" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "Ir А fin da liЯa actual" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "Ir А primeira liЯa do ficheiro" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "Ir А derradeira liЯa do ficheiro" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Actualiza-la pantalla actual" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Marca-lo texto da posiciСn actual do cursor" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Borra-lo carАcter de embaixo do cursor" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Borra-lo carАcter А esquerda do cursor" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "Inserir unha tabulaciСn" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "Inserir un retorno de carro na posiciСn do cursor" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "Face-la busca ou substituciСn actual (in)sensible Аs maiЗsculas" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "Ir ao navegador de ficheiros" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Cancela-la funciСn actual" -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "Ir А fin da liЯa actual" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "Busca Cancelada" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "ExpresiСns regulares" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "Axuda" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "SaМr" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Gravar" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Xustif." -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "Ler Fich." -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "Substit." -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Buscar" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "PАx. Ant." -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "PАx. Seg." -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "Cortar" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "Des-Xust." -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "Pegar" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Pos. Act." -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Ortograf." -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Arriba" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Abaixo" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "Adiante" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "AtrАs" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Inicio" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "Fin" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "Actualizar" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "Marcar" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Borrar" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "Retroceso" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Tabulador" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Enter" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "Ir А LiЯa" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "Pri. LiЯa" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "Der. LiЯa" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Cancelar" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "MaiЗ./Min." -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "AtrАs" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Cancelar" + +#: global.c:438 msgid "No Replace" msgstr "Non Subst." -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "A Ficheiros" -#: global.c:522 +#: global.c:525 msgid "Goto" msgstr "Ir-A" @@ -956,92 +956,92 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "MaiЗ./Min." -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "Busca%s%s" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (para substituМr)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "Busca Cancelada" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "Non se atopou \"%s...\"" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "Buscando dende o Principio" -#: search.c:421 +#: search.c:426 #, c-format msgid "Replaced %d occurrences" msgstr "FixИronse %d substituciСns" -#: search.c:423 +#: search.c:428 msgid "Replaced 1 occurrence" msgstr "FМxose 1 substituciСn" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "SubstituciСn Cancelada" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "©SubstituМr?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "Fallou a substituciСn: subexpresiСn descoЯecida" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "SubstituМr por [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "SubstituМr por" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Introduza o nЗmero de liЯa" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "Abortado" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Vamos, sexa razonable" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "" -#: utils.c:160 +#: utils.c:173 msgid "nano: calloc: out of memory!" msgstr "" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr "" diff --git a/po/hu.po b/po/hu.po index 97f0c250..0f0ad2dc 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 0.9.99pre2\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2001-02-03 07:47-0000\n" "Last-Translator: Szabolcs Horvath \n" "Language-Team: Hungarian \n" @@ -23,133 +23,133 @@ msgstr "add_to_cutbuffer az inptr->data-val lett megh msgid "Blew away cutbuffer =)\n" msgstr "a cutbuffert elfЗjta a szИl =)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: ez nem az elsУ sor Иs a prew ИrtИke NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "%d sort beolvastam" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" nem talАlhatС" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "зj fАjl" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "A megadott fАjl \"%s\" egy kЖnyvtАr" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "A fАjl \"%s\" egy eszkЖzfАjl" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "FАjl beolvasАsa" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "FАjl beszЗrАsa [a ./-bСl] " -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "a fАjl neve %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "MegszakМtva" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Nem tudom a fАjlt МrАsra megnyitni: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "мrtam >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Nem tudom lezАrni %s: %s." #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Nem tudom %s-t megnyitni МrАsra: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Nem tudom a jogosultsАgokat beАllМtani %o on %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "%d sort elmentettem" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 #, fuzzy msgid "Append" msgstr "FelfЭggesztett" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "MentИs" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "MentИs mint" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "A fАjl mАr lИtezik, felЭlМrjam?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(tovАbb)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "Nem tudok a kЖnyvtАrfАn feljebb lИpni" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "Nem tudom megnyitni \"%s\": %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 #, fuzzy msgid "Goto Directory" msgstr "UgrАs" -#: files.c:1954 +#: files.c:1965 #, fuzzy msgid "Goto Cancelled" msgstr "MegszakМtva" @@ -211,300 +211,300 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "A sЗgС meghМvАsa" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Az aktuАlis fАjl lemezre mentИse" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "KilИpИs a nanobСl" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "UgrАs a megadott szАmЗ sorra" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Az adott bekezdИs sorkizАrt legyen" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "A sorkizАrtsАg megszЭntetИse" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "SzЖveg kicserИlИse" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Egy mАsik fАjl beszЗrАsa" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "SzЖveg keresИse" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "UgrАs az elУzУ oldalra" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "UgrАs a kЖvetkezУ oldalra" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Az aktuАlis sor kivАgАsa a cutbufferbe" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "A cutbufferben lИvУ sor beillesztИse az aktuАlis sorba" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "A kurzor helyИnek mutatАsa" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "A helyesМrАs-ellenУrzУ indМtАsa (ha elИrhetУ)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "UgrАs az elУzУ sorra" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "UgrАs a kЖvetkezУ sorra" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "UgrАs a kЖvetkezУ karakterre" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "UgrАs az elУzУ karakterre" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "UgrАs a sor elejИre" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "UgrАs a sor vИgИre" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "UgrАs az elsУ sorra" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "UgrАs a legutolsС sorra" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "A kИpernyУ frissМtИse" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "A szЖveg megjelЖlИse az aktuАlis kurzorpozМciСban" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "A kurzor helyИn lИvУ karakter tЖrlИse" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "A kurzor elУtt АllС karakter tЖrlИse" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "TabulАtor karakter beszЗrАsa" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "\"Kocsivissza\" karakter beillesztИse a kurzor helyИre" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "Ebben a keresИsben/cserИben a kis/nagy betШk (nem )szАmМtanak" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "TallСzАs" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Az aktuАlis mШvelet megszakМtАsa" -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "UgrАs a sor vИgИre" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "KeresИs megszakМtva" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "RegulАris kifejezИsek" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "SЗgС" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "KilИpИs" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "MentИs" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "SorkizАr" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "FАjlBeolv" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "Csere" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "KeresИs" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "ElУzУOldal" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "KЖvetkezУ" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "KivАgАs" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "NSorkizАr" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "Beilleszt" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "PozМciС" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Helyes-e?" -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Fel" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Le" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "ElУre" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "Vissza" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Eleje" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "VИge" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "FrissМt" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "MegjelЖl" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "TЖrЖl" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "VisszalИp" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "TabulАtor" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Enter" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "UgrАs" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "ElsУ sor" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "UtolsС sor" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "MИgsem" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "kis/Nagy" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "Vissza" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "MИgsem" + +#: global.c:438 msgid "No Replace" msgstr "Nem cserИl" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "TallСzАs" -#: global.c:522 +#: global.c:525 #, fuzzy msgid "Goto" msgstr "UgrАs" @@ -965,93 +965,93 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "kis/Nagy" -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "KeresИs%s%s" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (cserИre)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "KeresИs megszakМtva" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" nem talАlhatС" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "" -#: search.c:421 +#: search.c:426 #, fuzzy, c-format msgid "Replaced %d occurrences" msgstr "%d alkalommal fordult elУ, kicserИltem azokat" -#: search.c:423 +#: search.c:428 #, fuzzy msgid "Replaced 1 occurrence" msgstr "Egyszer fordult elУ, kicserИltem" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "A csere megszakМtva" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "Hiba a cserИnИl: ismeretlen alkifejezИs!" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "CserИlИs erre [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "Erre lesz cserИlve" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "KИrem a sor szАmАt" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "MegszakМtva" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "GyerЭnk, adj meg egy hihetУbb ИrtИket :-)" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "" -#: utils.c:160 +#: utils.c:173 msgid "nano: calloc: out of memory!" msgstr "" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr "" diff --git a/po/id.po b/po/id.po index 0a003670..e330bfb8 100644 --- a/po/id.po +++ b/po/id.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.2\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2001-06-22 14:38GMT+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -23,133 +23,133 @@ msgstr "add_to_cutbuffer dipanggil dgn inptr->data = %s\n" msgid "Blew away cutbuffer =)\n" msgstr "Hapus cutbuffer =)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: tidak di baris pertama dan sebelumnya adalah NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "Membaca %d baris" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" tidak ditemukan" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "File Baru" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "File \"%s\" adalah sebuah direktori" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "File \"%s\" adalah sebuah file device" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "Membaca File" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "File untuk disisipkan [dari ./] " -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "Namafile adalah %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Dibatalkan" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Tidak dapat membuka file untuk menulis: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "Tulis >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Tidak dapat menutup %s: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Tidak dapat membuka %s untuk menulis: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Tidak dapat menset permisi %o pada %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "Menulis %d baris" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 #, fuzzy msgid "Append" msgstr "Tunda" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "Tulis" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "Nama file untuk ditulis" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "File ada, DITIMPA ?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(lagi)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "Tidak dapat memindahkan direktori" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "Tidak dapat membuka \"%s\": %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 #, fuzzy msgid "Goto Directory" msgstr "Ke baris" -#: files.c:1954 +#: files.c:1965 #, fuzzy msgid "Goto Cancelled" msgstr "Dibatalkan" @@ -211,300 +211,300 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Panggil menu bantuan" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Tulis file sekarang ke disk" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "Keluar dari nano" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "Ke nomor baris tertentu" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Justifikasi paragraf saat ini" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "Unjustifikasi setelah justifikasi" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "Ganti teks dalam editor" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Sertakan file lain ke file saat ini" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "Cari teks dalam editor" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "Pindah ke layar sebelumnya" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "Pindah ke layar berikutnya" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Hapus baris saat ini dan taruh dalam cutbuffer" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Kembalikan dari cutbuffer ke baris saat ini" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "Tampilkan posisi kursor" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "Panggil spell checker (jika ada)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "Naik satu baris" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "Turun satu baris" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "Pindah satu karakter ke depan" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "Pindah satu karakter ke belakang" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "Pindah ke awal baris ini" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "Pindah ke akhir baris ini" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "Ke baris terawal file" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "Ke baris terakhir file" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Refresh layar saat ini" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Tandai teks pada lokasi kursor saat ini" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Hapus karakter pada kursor" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Hapus satu karakter di kiri kursor" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "Masukkan karakter tab" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "Sertakan carriage return di posisi kursor" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "Jadikan pencarian/penggantian saat ini case (in)sensitive" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "Ke browser file" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Batalkan fungsi ini" -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "Pindah ke akhir baris ini" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "Pencarian dibatalkan" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "Regular expressions" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "Bantuan" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Keluar" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Tulis" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Justifikasi" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "Baca File" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "Ganti" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Di mana" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "Hlm sebelumnya" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "Hlm berikutnya" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "Ptng Teks" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "UnJustifikasi" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "UnCut Teks" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Pos Kursor" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Mengeja" -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Naik" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Turun" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "Depan" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "Belakang" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Awal" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "Akhir" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "Refresh" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "Tandai Teks" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Hapus" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "Backspace" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Tab" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Enter" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "Ke baris" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "Baris pertama" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "Baris terakhir" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Batal" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "Case Sens" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "Belakang" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Batal" + +#: global.c:438 msgid "No Replace" msgstr "No Replace" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "Ke File" -#: global.c:522 +#: global.c:525 #, fuzzy msgid "Goto" msgstr "Ke baris" @@ -963,92 +963,92 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "Case Sens" -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "Pencarian%s%s" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (ganti)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "Pencarian dibatalkan" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" tidak ditemukan" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "Pancarian diulangi dari awal" -#: search.c:421 +#: search.c:426 #, c-format msgid "Replaced %d occurrences" msgstr "%d tempat terganti" -#: search.c:423 +#: search.c:428 msgid "Replaced 1 occurrence" msgstr "Terganti 1 tempat" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "Penggantian dibatalkan" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "Ganti kata ini?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "Replace gagal: subekspresi tidak dikenal!" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "Ganti dengan [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "Ganti dengan" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Masukkan nomor baris" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "Dibatalkan" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Ayo, yang masuk akal" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "" -#: utils.c:160 +#: utils.c:173 msgid "nano: calloc: out of memory!" msgstr "" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr "" diff --git a/po/it.po b/po/it.po index 06934845..2842b29d 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.7\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2001-05-13 17:17GMT\n" "Last-Translator: Marco Colombo \n" "Language-Team: Italiano\n" @@ -25,133 +25,133 @@ msgstr "add_to_cutbuffer chiamato con inptr->data = %s\n" msgid "Blew away cutbuffer =)\n" msgstr "Svuota cutbuffer =)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: non Х la prima linea e la precedente Х NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "Leggi %d linee" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" non trovato" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "Nuovo file" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "Il file \"%s\" Х una directory" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "Il file \"%s\" Х un file di device" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "Lettura file" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "File da inserire [da ./] " -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "Il nome file Х %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Annullato" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Impossibile aprire il file in scrittura: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "Scrivi >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Impossibile chiudere %s: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Impossibile aprire %s in scrittura: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Impossibile configurare i permessi di %o su %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "Scritte %d linee" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 #, fuzzy msgid "Append" msgstr "Sospendi" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "Salva" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "Salva con nome" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "File esistente, SOVRASCRIVERE?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(ancora)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "Non posso risalire la directory" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "Impossibile aprire \"%s\": %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 #, fuzzy msgid "Goto Directory" msgstr "Vai a..." -#: files.c:1954 +#: files.c:1965 #, fuzzy msgid "Goto Cancelled" msgstr "Annullato" @@ -213,300 +213,300 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Invoca Aiuto" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Salva il file corrente sul disco" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "Esci da nano" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "Vai ad un numero linea specifico" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Giustifica il paragrafo corrente" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "Annulla la giustificazione" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "Sostituisci testo all'interno dell'editor" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Inserisci un file dentro il corrente" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "Cerca testo all'interno dell'editor" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "Vai alla pagina precedente" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "Vai alla pagina successiva" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Taglia la linea corrente e memorizzala nel cutbuffer" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Incolla dal cutbuffer dentro la linea corrente" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "Mostra la posizione del cursore" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "Invoca il correttore ortografico (se disponibile)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "Vai alla riga superiore" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "Vai alla riga inferiore" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "Avanza di un carattere" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "Arretra di un carattere" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "Vai all'inizio della linea corrente" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "Vai alla fine delle linea corrente" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "Vai alla prima linea del file" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "Vai all'ultima linea del file" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Aggiorna la schermata corrente" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Marca testo nella posizione corrente del cursore" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Elimina i caratteri sotto il cursore" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Elimina i caratteri a sinistra del cursore" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "Inserisci una tabulazione" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "Inserisci un ritorno a capo alla posizione del cursore" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "Ricerca/Sostituisci con case (in)sensitive" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "Sfoglia..." -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Annulla la funzione corrente" -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "Vai alla fine delle linea corrente" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "Ricerca annullata" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "Espressioni regolari" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "Aiuto" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Esci" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Salva" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Giustifica" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "Inserisci" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "Sostituisci" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Cerca" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "Pag Prec" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "Pag Seg" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "Taglia" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "Giustifica" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "Incolla" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Posizione" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Ortografia" -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Alza" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Abbassa" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "Avanti" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "Indietro" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Inizio" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "Fine" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "Aggiorna" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "Marca testo" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Elimina" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "Backspace" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Tab" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Invio" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "Vai a..." -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "Prima riga" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "Ultima riga" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Annulla" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "Case sens" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "Indietro" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Annulla" + +#: global.c:438 msgid "No Replace" msgstr "Non sostituire" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "Nuovo file" -#: global.c:522 +#: global.c:525 #, fuzzy msgid "Goto" msgstr "Vai a..." @@ -973,92 +973,92 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "Case sens" -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "Cerca%s%s" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (sostituisci)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "Ricerca annullata" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" non trovato" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "Ricerca interrotta" -#: search.c:421 +#: search.c:426 #, c-format msgid "Replaced %d occurrences" msgstr "Sostituite %d occorrenze" -#: search.c:423 +#: search.c:428 msgid "Replaced 1 occurrence" msgstr "Sostituita 1 occorrenza" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "Sostituzione annullata" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "Sostituisci questa occorrenza?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "Sostituzione fallita: espressione sconosciuta!" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "Sostituisci con [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "Sostituisci con" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Inserisci numero linea" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "Operazione annullata" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Avanti, sii ragionevole" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "" -#: utils.c:160 +#: utils.c:173 msgid "nano: calloc: out of memory!" msgstr "" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr "" diff --git a/po/no.po b/po/no.po index b90c55aa..91609ce3 100644 --- a/po/no.po +++ b/po/no.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0.3\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Eivind KjЬrstad \n" "Language-Team: Norwegian \n" @@ -22,131 +22,131 @@ msgstr "add_to_cutbuffer vart kalla med inptr->data = %s\n" msgid "Blew away cutbuffer =)\n" msgstr "Frigjorde cut-bufferet\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: ikkje pЕ fЬrste linje, og prev er NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "Leste %d linjer" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" ikke funnet" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "Ny fil" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "Fila er en katalog" # "enhet" = "device", kanskje, men det er litt forvirrande #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "Fila er ikke ei vanlig fil" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "Leser fil" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "Fil som skal settast inn [frЕ ./] " -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "filnavnet er %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Avbrutt" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Kunne ikkje Еpne fila for skriving: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "Skreiv >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Kunne ikke lukke %s: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Kunne ikke Еpne %s for skriving: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Kunne ikke sette rettighetebe %o pЕ %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "Skreiv %d linjer" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "%s omrЕde til fil" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 msgid "Append" msgstr "Legg til" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 msgid "Write" msgstr "Skriv" -#: files.c:1078 +#: files.c:1089 #, c-format msgid "File Name to %s" msgstr "Filnamn som skal" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "Fila eksisterar, OVERSKRIVE ?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(meir)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "Kan ikke skifte katalog" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "Kan ikke Еpne \"%s\": %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 msgid "Goto Directory" msgstr "GЕ til katalog" -#: files.c:1954 +#: files.c:1965 msgid "Goto Cancelled" msgstr "GЕtil avbrutt" @@ -206,296 +206,296 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Vis hjelp-menyen" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Lagre gjeldande fil" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "Avslutt nano" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "Hopp til eit linjenummer" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Juster avsnittet" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "Fjern justering etter ei justering" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "Erstatt tekst" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Sett inn ei anna fil i denne" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "SЬk etter tekst" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "GЕ til forrige skjerm" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "GЕ til neste skjerm" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Klipp denne linja og lagre den i klippebufferet" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Sett inn klippebufferet her" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "Vis kursorposisjonen" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "Start stavesjekk (viss tilgjengelig)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "Flytt opp ei linje" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "Flytt ned ei linje" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "Flytt fram ein bokstav" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "Flytt tilbake ein bokstav" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "Flytt til starten av linja" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "Flytt til enden av linja" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "GЕ til fЬrste linje" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "GЕ til siste linje" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Tegn skjermen pЕ nytt" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Marker teksten ved kursor" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Slett bokstaven under kursor" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Slett bokstaven til venstre for kursor" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "Sett inn et tab-tegn" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "Sett inn et linjeskift" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "Gjer gjeldande sЬk utan hensyn til store/smЕ bokstavar" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "GЕ til fil-lesar" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Avbryt gjeldande funksjon" -#: global.c:279 +#: global.c:277 msgid "Append to the current file" msgstr "Legg til noverande fil" -#: global.c:280 +#: global.c:278 msgid "Search Backwards" msgstr "SЬk bakover" -#: global.c:281 +#: global.c:279 msgid "Use Regular Expressions" msgstr "Bruk regulФre uttrykk" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "Hjelp" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Avslutt" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Lagre" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Juster" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "Les fil" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "Erstatt" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Finn" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "Forrige side" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "Neste side" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "Klipp" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "Avjuster" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "Lim inn" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Posisjon" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Staving" -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Opp" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Ned" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "Framover" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "Bakover" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Hjem" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "Bunn" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "Oppfrisk" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "Marker tekst" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Slett" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "Visketast" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Tab" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Enter" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "GЕ til linje" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "FЬrste linje" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "Siste linje" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Avbryt" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "FЬlsomt for store/smЕ bokstavar" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 msgid "Backward" msgstr "Bakover" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "RegulФrt uttrykk" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Avbryt" + +#: global.c:438 msgid "No Replace" msgstr "Ingen erstatting" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "Til filer" -#: global.c:522 +#: global.c:525 msgid "Goto" msgstr "GЕ til" @@ -959,90 +959,90 @@ msgstr "Feil funnet i .nanorc fila" msgid "Unable to open ~/.nanorc file, %s" msgstr "Kan ikkje Еpne ~/.nanorc, %s" -#: search.c:126 +#: search.c:129 msgid "Case Sensitive " msgstr "Ta hensyn til store/smЕ bokstaver " -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "RegulФrt uttrykk" -#: search.c:128 +#: search.c:131 msgid "Search" msgstr "SЬk" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr " Bakover" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (Е erstatte)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "SЬk avbrutt" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" ikke funnet" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "SЬket gikk rundt" -#: search.c:421 +#: search.c:426 #, c-format msgid "Replaced %d occurrences" msgstr "Erstattet %d tilfeller" -#: search.c:423 +#: search.c:428 msgid "Replaced 1 occurrence" msgstr "Erstattet 1 tilfelle" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "Erstatt avbrutt" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "Erstatt dette tilfellet?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "Erstatt feila: ukjent underuttrykk!" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "Erstatt med [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "Erstatt med" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Skriv linjenummer" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "Avbrutt" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Kom igjen, samarbeid litt" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "nano: malloc: tom for minne!" -#: utils.c:160 +#: utils.c:173 msgid "nano: calloc: out of memory!" msgstr "nano: calloc: tom for minne!" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr "nano: realloc: tom for minne!" diff --git a/po/ru.po b/po/ru.po index 05236587..7dab1748 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.1\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2001-05-16 10:10+0200\n" "Last-Translator: Sergey A. Ribalchenko \n" "Language-Team: Russian \n" @@ -22,133 +22,133 @@ msgstr "add_to_cutbuffer msgid "Blew away cutbuffer =)\n" msgstr "cutbuffer сдуло ветром =)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: не на первой строке и предыдущая NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "Прочитано %d строк" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" не найден" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "Новый Файл" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "Файл \"%s\" - это директория" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "Файл \"%s\" является файлом устройства" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "Читаем Файл" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "Файл для вставки [от ./]" -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "имя файла %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Отменено" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Не могу открыть файл на запись: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "Записано >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Не могу закрыть %s: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Не могу открыть %s на запись: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Не могу установить права %o на %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "Записано %d строк" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 #, fuzzy msgid "Append" msgstr "Приостановить" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "Записать" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "Имя Файла на запись" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "Файл существует, ПЕРЕПИШЕМ ?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(еще)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "Не могу переместить директорию" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "Не могу открыть \"%s\": %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 #, fuzzy msgid "Goto Directory" msgstr "К строке" -#: files.c:1954 +#: files.c:1965 #, fuzzy msgid "Goto Cancelled" msgstr "Отменено" @@ -210,301 +210,301 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Выполнить меню помощи" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Записать текущий файл на диск" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "Выход из nano" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "Перейти на указанный номер строки" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Выровнять текущий абзац" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "Отменить последнее выравнивание" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "Заменить текст в пределах редактора" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Вставить другой файл в текущий" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "Искать текст в пределах редактора" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "Переместиться на предыдущий экран" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "Переместиться на следущий экран" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Вырезать текущую строку и сохранить ее в cutbuffer'е" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Вставить содержимое cutbuffer'а в текущую строку" -#: global.c:257 +#: global.c:255 #, fuzzy msgid "Show the position of the cursor" msgstr "Показать положение курсора" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "Выполнить проверку орфографии (если есть)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "Подняться на одну строку" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "Опуститься на одну строку" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "Вперед на один символ" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "Назад на один символ" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "Переместиться на начало текущей строки" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "Переместиться в конец текущей строки" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "Переместиться на первую строку файла" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "Переместиться на последнюю строку файла" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Перерисовать текущий экран" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Отметить текст с текущей позиции курсора" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Удалить символ под курсором" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Удалить символ слева от курсора" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "Вставить символ табуляции" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "Вставить CR (перевод строки) в позиции курсора" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "Сделать текущий поиск или замену регистро(не)зависимой" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "Пойти в просмотрщик файлов" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Отменить текущую функцию" -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "Переместиться в конец текущей строки" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "Поиск отменен" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "Формальные выражения (regexp)" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "Помощь" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Выход" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Записать" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Выровнять" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "ЧитатьФайл" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "Замена" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Поиск" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "Пред Cтр" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "След Cтр" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "Вырезать" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "Отм Выравн" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "Отм Вырез" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "ТекПозиция" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Орфография" -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Вверх" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Вниз" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "Вперед" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "Назад" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Начало" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "Конец" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "Перерисовать" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "Отметить" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Удалить" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "Забой (BS)" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Табуляция" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Enter" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "К строке" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "ПервСтрока" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "ПослСтрока" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Отменить" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "РегЗависим" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "Назад" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Отменить" + +#: global.c:438 msgid "No Replace" msgstr "НеЗамещать" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "К Файлам" -#: global.c:522 +#: global.c:525 #, fuzzy msgid "Goto" msgstr "К строке" @@ -959,92 +959,92 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "РегЗависим" -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "Поиск%s%s" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (что менять)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "Поиск отменен" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" не найдено" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "Поиск завернут" -#: search.c:421 +#: search.c:426 #, c-format msgid "Replaced %d occurrences" msgstr "Заменено %d вхождений" -#: search.c:423 +#: search.c:428 msgid "Replaced 1 occurrence" msgstr "Заменено 1 вхождение" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "Замена отменена" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "Заменить это вхождение?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "Замена не получилась: неизвестное подвыражение!" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "Заменить на [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "Заменить на" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Введите номер строки" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "Прервано" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Эта, а можно чуть более адекватно?" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "" -#: utils.c:160 +#: utils.c:173 msgid "nano: calloc: out of memory!" msgstr "" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr "" diff --git a/po/sv.po b/po/sv.po index 859abe65..0e867af0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.3\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2001-07-06 22:27+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -22,133 +22,133 @@ msgstr "add_to_cutbuffer anropades med inptr->data = %s\n" msgid "Blew away cutbuffer =)\n" msgstr "SprДngde urklippsbufferten =)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: inte pЕ fЖrsta raden och prev Дr NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "LДste %d rader" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" kunde inte hittas" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "Ny fil" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "\"%s\" Дr en katalog" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "Filen \"%s\" Дr en enhetsfil" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "LДser filen" -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "Fil att infoga [frЕn ./] " -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "filnamnet Дr %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Avbruten" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Kunde inte Жppna filen fЖr skrivning: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "Skrev >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Kunde inte stДnga %s: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Kunde inte Жppna %s fЖr skrivning: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Kunde inte sДtta rДttigheterna %o pЕ %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "Skrev %d rader" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 #, fuzzy msgid "Append" msgstr "Skjut upp" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "Spara" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "Filnamn att skriva" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "Filen existerar, SKRIVA жVER?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(mer)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "Kan inte gЕ upp en katalog" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "Kan inte Жppna \"%s\": %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 #, fuzzy msgid "Goto Directory" msgstr "GЕ till rad" -#: files.c:1954 +#: files.c:1965 #, fuzzy msgid "Goto Cancelled" msgstr "Avbruten" @@ -210,301 +210,301 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Starta hjДlpmenyn" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Skriv den aktuella filen till disk" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "Avsluta nano" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "GЕ till ett specifikt radnummer" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Justera det aktuella stycket" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "еterstДll en justering" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "ErsДtt text inuti textredigeraren" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Infoga ytterligare en fil i den nuvarande" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "SЖk efter text inuti textredigeraren" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "GЕ till fЖregЕende skДrm" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "GЕ till nДsta skДrm" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Klipper ut den aktuella raden och lagrar den i urklippsbufferten" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "Klistra in frЕn urklippsbufferten i aktuell rad" -#: global.c:257 +#: global.c:255 msgid "Show the position of the cursor" msgstr "Visa markЖrens position" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "Starta stavningskontrollen (om tillgДnglig)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "GЕ upp en rad" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "GЕ ner en rad" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "GЕ framЕt ett tecken" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "GЕ bakЕt ett tecken" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "GЕ till bЖrjan pЕ aktuell rad" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "GЕ till slutet pЕ aktuell rad" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "GЕ till filens fЖrsta rad" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "GЕ till filens sista rad" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Uppdatera (rita om) den aktuella skДrmen" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Markera text vid aktuell markЖrposition" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Ta bort tecknet under markЖren" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Ta bort tecknet till vДnster om markЖren" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "Infoga ett tabulatorsteg" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "Infoga en vagnretur vid markЖrpositionen" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "GЖr den aktuella sЖkningen eller ersДttningen skiftlДgesokДnslig" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "GЕ til filblДddrare" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Avbryt den aktuella funktionen" -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "GЕ till slutet pЕ aktuell rad" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "SЖkningen avbruten" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "ReguljДra uttryck" # kontrollera att den finns -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "FЕ hjДlp" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Avsluta" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Spara" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Justera" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "LДs fil" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "ErsДtt" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Var finns" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "FЖreg sid" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "NДsta sid" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "Klipp ut" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "Ojustera" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "Klist. in" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Akt. pos" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Stavkontr." -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Upp" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Ner" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "FramЕt" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "BakЕt" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Hem" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "Slut" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "Uppdatera" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "Markera text" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Ta bort" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "Backsteg" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Tabulator" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Enter" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "GЕ till rad" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "FЖrsta raden" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "Sista raden" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Avbryt" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "SkiftkДnsl" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "BakЕt" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Avbryt" + +#: global.c:438 msgid "No Replace" msgstr "Ingen ersДttning" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "Till filer" -#: global.c:522 +#: global.c:525 #, fuzzy msgid "Goto" msgstr "GЕ till rad" @@ -962,92 +962,92 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "SkiftkДnsl" -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "SЖk%s%s" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (att ersДtta)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "SЖkningen avbruten" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" kunde inte hittas" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "SЖkningen bЖrjade om frЕn bЖrjan" -#: search.c:421 +#: search.c:426 #, c-format msgid "Replaced %d occurrences" msgstr "Ersatte %d fЖrekomster" -#: search.c:423 +#: search.c:428 msgid "Replaced 1 occurrence" msgstr "Ersatte 1 fЖrekomst" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "ErsДttningen avbrЖts" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "ErsДtt denna fЖrekomst?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "ErsДttningen misslyckades: okДnt deluttryck!" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "ErsДtt med [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "ErsДtt med" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Ange radnummer" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "Avbruten" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Kom igen, var nu fЖrstЕndig" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "" -#: utils.c:160 +#: utils.c:173 msgid "nano: calloc: out of memory!" msgstr "" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr "" diff --git a/po/uk.po b/po/uk.po index ac90787a..537c5c55 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.1\n" -"POT-Creation-Date: 2001-07-14 18:56-0400\n" +"POT-Creation-Date: 2001-07-18 21:49-0400\n" "PO-Revision-Date: 2001-04-10 18:40+0300\n" "Last-Translator: Sergey A. Ribalchenko \n" "Language-Team: Ukrainian \n" @@ -22,133 +22,133 @@ msgstr "add_to_cutbuffer msgid "Blew away cutbuffer =)\n" msgstr "cutbuffer здуто в╕тром =)\n" -#: files.c:134 +#: files.c:145 msgid "read_line: not on first line and prev is NULL" msgstr "read_line: не на першому рядку, та ще й попередн╕й ╓ NULL" -#: files.c:196 files.c:214 +#: files.c:207 files.c:225 #, c-format msgid "Read %d lines" msgstr "Прочитано %d рядк╕в" -#: files.c:232 search.c:210 +#: files.c:243 search.c:215 #, c-format msgid "\"%s\" not found" msgstr "\"%s\" не знайдено" #. We have a new file -#: files.c:236 +#: files.c:247 msgid "New File" msgstr "Новий файл" -#: files.c:249 +#: files.c:260 #, c-format msgid "File \"%s\" is a directory" msgstr "Файл \"%s\" ╓ директор╕╓ю" #. Don't open character or block files. Sorry, /dev/sndstat! -#: files.c:252 +#: files.c:263 #, c-format msgid "File \"%s\" is a device file" msgstr "Файл \"%s\" ╓ файлом пристрою" -#: files.c:259 +#: files.c:270 msgid "Reading File" msgstr "Чита╓мо файл.." -#: files.c:279 +#: files.c:290 msgid "File to insert [from ./] " msgstr "Файл до вставки [в╕д ./] " -#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705 -#: files.c:716 files.c:1102 +#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716 +#: files.c:727 files.c:1113 #, c-format msgid "filename is %s" msgstr "╕м'я файлу ╓ %s" -#: files.c:368 files.c:872 files.c:1187 nano.c:1629 +#: files.c:379 files.c:883 files.c:1198 nano.c:1629 msgid "Cancelled" msgstr "Скасовано" -#: files.c:642 files.c:697 +#: files.c:653 files.c:708 msgid "No more open files" msgstr "" -#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974 +#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985 #, c-format msgid "Could not open file for writing: %s" msgstr "Не можу в╕дкрити файл для запису: %s" -#: files.c:955 +#: files.c:966 #, c-format msgid "Wrote >%s\n" msgstr "Записано >%s\n" -#: files.c:983 +#: files.c:994 #, c-format msgid "Could not close %s: %s" msgstr "Не можу зачинити %s: %s" #. Try a rename?? -#: files.c:1006 files.c:1015 files.c:1020 +#: files.c:1017 files.c:1026 files.c:1031 #, c-format msgid "Could not open %s for writing: %s" msgstr "Не можу в╕дкрити %s для запису: %s" -#: files.c:1027 +#: files.c:1038 #, c-format msgid "Could not set permissions %o on %s: %s" msgstr "Не можу встановити права %o на %s: %s" -#: files.c:1034 +#: files.c:1045 #, c-format msgid "Wrote %d lines" msgstr "Записано %d рядк╕в" -#: files.c:1074 +#: files.c:1085 #, c-format msgid "%s Selection to File" msgstr "" -#: files.c:1074 files.c:1078 global.c:496 +#: files.c:1085 files.c:1089 global.c:499 #, fuzzy msgid "Append" msgstr "Призупинити" -#: files.c:1074 files.c:1078 +#: files.c:1085 files.c:1089 #, fuzzy msgid "Write" msgstr "Записати" -#: files.c:1078 +#: files.c:1089 #, fuzzy, c-format msgid "File Name to %s" msgstr "╤м'я файлу до запису" -#: files.c:1116 +#: files.c:1127 msgid "File exists, OVERWRITE ?" msgstr "Файл ╕сну╓, ПЕРЕПИСУ╢МО ?" -#: files.c:1598 +#: files.c:1609 msgid "(more)" msgstr "(дал╕)" -#: files.c:1911 +#: files.c:1922 msgid "Can't move up a directory" msgstr "Не можу перем╕стити директор╕ю" #. We can't open this dir for some reason. Complain -#: files.c:1921 files.c:1969 +#: files.c:1932 files.c:1980 #, c-format msgid "Can't open \"%s\": %s" msgstr "Не можу в╕дкрити \"%s\": %s" -#: files.c:1949 global.c:277 +#: files.c:1960 global.c:275 #, fuzzy msgid "Goto Directory" msgstr "До Рядка" -#: files.c:1954 +#: files.c:1965 #, fuzzy msgid "Goto Cancelled" msgstr "Скасовано" @@ -210,303 +210,303 @@ msgstr "" msgid "Open next loaded file" msgstr "" -#: global.c:238 +#: global.c:236 msgid "Invoke the help menu" msgstr "Викликати меню допомоги" -#: global.c:239 +#: global.c:237 msgid "Write the current file to disk" msgstr "Записати поточний файл на диск" -#: global.c:242 +#: global.c:240 msgid "Close currently loaded file/Exit from nano" msgstr "" -#: global.c:244 +#: global.c:242 msgid "Exit from nano" msgstr "Вих╕д з nano" -#: global.c:247 +#: global.c:245 msgid "Goto a specific line number" msgstr "Перейти до вказаного рядка" -#: global.c:248 +#: global.c:246 msgid "Justify the current paragraph" msgstr "Вир╕вняти поточний абзац" -#: global.c:249 +#: global.c:247 msgid "Unjustify after a justify" msgstr "Скасувати останн╓ вир╕внювання" -#: global.c:250 +#: global.c:248 msgid "Replace text within the editor" msgstr "Зам╕нити текст у межах редактора" -#: global.c:251 +#: global.c:249 msgid "Insert another file into the current one" msgstr "Вставити ╕нший файл до поточного" -#: global.c:252 +#: global.c:250 msgid "Search for text within the editor" msgstr "Шукати текст в межах редактору" -#: global.c:253 +#: global.c:251 msgid "Move to the previous screen" msgstr "Перейти до попередього екрану" -#: global.c:254 +#: global.c:252 msgid "Move to the next screen" msgstr "Перейти до наступного екрану" -#: global.c:255 +#: global.c:253 msgid "Cut the current line and store it in the cutbuffer" msgstr "Вир╕зати поточний рядок та пом╕стити його до cutbuffer'у" -#: global.c:256 +#: global.c:254 msgid "Uncut from the cutbuffer into the current line" msgstr "" "Скасувати вир╕зання та вставити зм╕ст cutbuffer'у\n" "\t\t\t до поточного рядка" -#: global.c:257 +#: global.c:255 #, fuzzy msgid "Show the position of the cursor" msgstr "Показати позиц╕ю курсора" -#: global.c:258 +#: global.c:256 msgid "Invoke the spell checker (if available)" msgstr "Викликати програму пошуку друкарських помилок (якщо ╓)" -#: global.c:259 +#: global.c:257 msgid "Move up one line" msgstr "П╕днятися вгору на один рядок" -#: global.c:260 +#: global.c:258 msgid "Move down one line" msgstr "Перем╕ститися на рядок нижче" -#: global.c:261 +#: global.c:259 msgid "Move forward one character" msgstr "Вперед на одну лiтеру" -#: global.c:262 +#: global.c:260 msgid "Move back one character" msgstr "Назад на одну лiтеру" -#: global.c:263 +#: global.c:261 msgid "Move to the beginning of the current line" msgstr "Перемiститися до початку поточного рядка" -#: global.c:264 +#: global.c:262 msgid "Move to the end of the current line" msgstr "Перемiститися на кiнець поточного рядка" -#: global.c:265 +#: global.c:263 msgid "Go to the first line of the file" msgstr "Перемiститися до першого рядка файлу" -#: global.c:266 +#: global.c:264 msgid "Go to the last line of the file" msgstr "Перемiститися до останього рядка файлу" -#: global.c:267 +#: global.c:265 msgid "Refresh (redraw) the current screen" msgstr "Перемалювати поточний екран" -#: global.c:268 +#: global.c:266 msgid "Mark text at the current cursor location" msgstr "Пом╕тити текст п╕д поточною позиц╕╓ю курсора" -#: global.c:269 +#: global.c:267 msgid "Delete the character under the cursor" msgstr "Видалити л╕теру п╕д курсором" -#: global.c:271 +#: global.c:269 msgid "Delete the character to the left of the cursor" msgstr "Видалити л╕теру зл╕ва в╕д курсора" -#: global.c:272 +#: global.c:270 msgid "Insert a tab character" msgstr "Вставити симбол табуляцi╖" -#: global.c:273 +#: global.c:271 msgid "Insert a carriage return at the cursor position" msgstr "Вставити симбол CR (повернення гол╕вки) в поз. курсора" -#: global.c:275 +#: global.c:273 msgid "Make the current search or replace case (in)sensitive" msgstr "Зробити поточний пошук або зам╕ну (не)залежним в╕д регистру л╕тер" -#: global.c:276 +#: global.c:274 msgid "Go to file browser" msgstr "До переглядача файл╕в" -#: global.c:278 +#: global.c:276 msgid "Cancel the current function" msgstr "Скасувати поточну функцiю" -#: global.c:279 +#: global.c:277 #, fuzzy msgid "Append to the current file" msgstr "Перемiститися на кiнець поточного рядка" -#: global.c:280 +#: global.c:278 #, fuzzy msgid "Search Backwards" msgstr "Пошук скасовано" -#: global.c:281 +#: global.c:279 #, fuzzy msgid "Use Regular Expressions" msgstr "Формальн╕ вирази (regexp)" -#: global.c:284 +#: global.c:282 msgid "Get Help" msgstr "Допомога" -#: global.c:289 +#: global.c:287 msgid "Close" msgstr "" -#: global.c:293 global.c:487 global.c:525 +#: global.c:291 global.c:490 global.c:528 msgid "Exit" msgstr "Вихiд" -#: global.c:296 +#: global.c:294 msgid "WriteOut" msgstr "Записати" -#: global.c:301 global.c:390 +#: global.c:299 global.c:388 msgid "Justify" msgstr "Вир╕внювання" -#: global.c:305 global.c:311 +#: global.c:303 global.c:309 msgid "Read File" msgstr "Чит. Файл" -#: global.c:315 global.c:386 global.c:410 +#: global.c:313 global.c:384 global.c:408 msgid "Replace" msgstr "Зам╕на" -#: global.c:319 +#: global.c:317 msgid "Where Is" msgstr "Пошук" -#: global.c:323 global.c:479 global.c:514 +#: global.c:321 global.c:482 global.c:517 msgid "Prev Page" msgstr "Попередня" -#: global.c:327 global.c:483 global.c:518 +#: global.c:325 global.c:486 global.c:521 msgid "Next Page" msgstr "Наступна" -#: global.c:331 +#: global.c:329 msgid "Cut Text" msgstr "Вир╕зати" -#: global.c:335 +#: global.c:333 msgid "UnJustify" msgstr "СкасВир╕вн" -#: global.c:338 +#: global.c:336 msgid "UnCut Txt" msgstr "СкасВир╕з" -#: global.c:342 +#: global.c:340 msgid "Cur Pos" msgstr "Позиц╕я" -#: global.c:346 +#: global.c:344 msgid "To Spell" msgstr "Правопис" -#: global.c:350 +#: global.c:348 msgid "Up" msgstr "Вгору" -#: global.c:353 +#: global.c:351 msgid "Down" msgstr "Вниз" -#: global.c:356 +#: global.c:354 msgid "Forward" msgstr "Вперед" -#: global.c:359 +#: global.c:357 msgid "Back" msgstr "Назад" -#: global.c:362 +#: global.c:360 msgid "Home" msgstr "Початок" -#: global.c:365 +#: global.c:363 msgid "End" msgstr "К╕нець" -#: global.c:368 +#: global.c:366 msgid "Refresh" msgstr "Перемалювати" -#: global.c:371 +#: global.c:369 msgid "Mark Text" msgstr "Пом╕тити" -#: global.c:374 +#: global.c:372 msgid "Delete" msgstr "Видалити" -#: global.c:378 +#: global.c:376 msgid "Backspace" msgstr "Заб╕й" -#: global.c:382 +#: global.c:380 msgid "Tab" msgstr "Табуляц╕я" -#: global.c:394 +#: global.c:392 msgid "Enter" msgstr "Ввод" -#: global.c:398 global.c:414 global.c:441 +#: global.c:396 global.c:412 global.c:442 msgid "Goto Line" msgstr "До Рядка" -#: global.c:404 global.c:431 global.c:459 global.c:469 +#: global.c:402 global.c:432 global.c:462 global.c:472 msgid "First Line" msgstr "Перший Рядок" -#: global.c:407 global.c:434 global.c:462 global.c:472 +#: global.c:405 global.c:435 global.c:465 global.c:475 msgid "Last Line" msgstr "Останн╕й Рядок" -#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499 -#: global.c:507 global.c:510 global.c:528 winio.c:1239 -msgid "Cancel" -msgstr "Скасувати" - -#: global.c:420 global.c:447 +#: global.c:416 global.c:446 msgid "Case Sens" msgstr "РегЗалеж" -#: global.c:423 global.c:450 +#: global.c:419 global.c:449 #, fuzzy msgid "Backward" msgstr "Назад" -#: global.c:427 global.c:454 +#: global.c:424 global.c:454 msgid "Regexp" msgstr "" -#: global.c:437 +#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502 +#: global.c:510 global.c:513 global.c:531 winio.c:1239 +msgid "Cancel" +msgstr "Скасувати" + +#: global.c:438 msgid "No Replace" msgstr "Не Зам╕щати" -#: global.c:492 global.c:503 +#: global.c:495 global.c:506 msgid "To Files" msgstr "До Файл╕в" -#: global.c:522 +#: global.c:525 #, fuzzy msgid "Goto" msgstr "До Рядка" @@ -962,92 +962,92 @@ msgstr "" msgid "Unable to open ~/.nanorc file, %s" msgstr "" -#: search.c:126 +#: search.c:129 #, fuzzy msgid "Case Sensitive " msgstr "РегЗалеж" -#: search.c:127 +#: search.c:130 msgid "Regexp " msgstr "" -#: search.c:128 +#: search.c:131 #, fuzzy msgid "Search" msgstr "Пошук%s%s" -#: search.c:129 +#: search.c:132 msgid " Backwards" msgstr "" -#: search.c:130 +#: search.c:133 msgid " (to replace)" msgstr " (до зам╕ни)" -#: search.c:135 search.c:399 +#: search.c:138 search.c:404 msgid "Search Cancelled" msgstr "Пошук скасовано" -#: search.c:216 +#: search.c:221 #, c-format msgid "\"%s...\" not found" msgstr "\"%s...\" не знайдено" -#: search.c:265 search.c:321 +#: search.c:270 search.c:326 msgid "Search Wrapped" msgstr "Пошук Загорнуто" -#: search.c:421 +#: search.c:426 #, c-format msgid "Replaced %d occurrences" msgstr "Зам╕нено %d входжень" -#: search.c:423 +#: search.c:428 msgid "Replaced 1 occurrence" msgstr "Зам╕нено 1 входження" -#: search.c:561 search.c:671 search.c:687 +#: search.c:566 search.c:676 search.c:692 msgid "Replace Cancelled" msgstr "Зам╕ну скасовано" -#: search.c:611 +#: search.c:616 msgid "Replace this instance?" msgstr "Зам╕нити цей прим╕рник?" -#: search.c:623 +#: search.c:628 msgid "Replace failed: unknown subexpression!" msgstr "Зам╕на невдала: незнайомий п╕двираз!" -#: search.c:712 +#: search.c:717 #, c-format msgid "Replace with [%s]" msgstr "Зам╕нити на [%s]" -#: search.c:716 search.c:720 +#: search.c:721 search.c:725 msgid "Replace with" msgstr "Зам╕нити на" -#: search.c:754 +#: search.c:759 msgid "Enter line number" msgstr "Введ╕ть номер рядка" -#: search.c:756 +#: search.c:761 msgid "Aborted" msgstr "Прервано" -#: search.c:765 +#: search.c:770 msgid "Come on, be reasonable" msgstr "Гей, будьте автотентичн╕" -#: utils.c:146 +#: utils.c:159 msgid "nano: malloc: out of memory!" msgstr "" -#: utils.c:160 +#: utils.c:173 msgid "nano: calloc: out of memory!" msgstr "" -#: utils.c:170 +#: utils.c:183 msgid "nano: realloc: out of memory!" msgstr ""