[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: 59-gary-gnulib-xalloc-import.patch
|
From: |
Gary V. Vaughan |
|
Subject: |
FYI: 59-gary-gnulib-xalloc-import.patch |
|
Date: |
Wed, 10 Sep 2003 18:17:38 +0100 |
|
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5b) Gecko/20030903 Thunderbird/0.2 |
Applied to HEAD.
--
())_. Gary V. Vaughan gary@(lilith.warpmail.net|gnu.org)
( '/ Research Scientist http://www.oranda.demon.co.uk ,_())____
/ )= GNU Hacker http://www.gnu.org/software/libtool \' `&
`(_~)_ Tech' Author http://sources.redhat.com/autobook =`---d__/
Index: ChangeLog
from Gary V. Vaughan <address@hidden>
Import the xalloc module from CVS gnulib, along with its
dependencies: exitfail, malloc and realloc. We had different
semantics for our XFREE and a function xfree() not supplied by
gnulib, so also a bit of work to keep everything running
smoothly:
* configure.ac (AC_REPLACE_FUNCS): Removed xmalloc and xstrdup.
(gl_XALLOC): Use gnulib equivalents.
* gnulib/config/exitfail.m4, gnulib/m4/exitfail.h,
gnulib/m4/exitfail.c: Import exitfail module from CVS gnulib.
* gnulib/config/malloc.m4, gnulib/m4/malloc.c: Ditto wrt malloc.
* gnulib/config/realloc.m4, gnulib/m4/realloc.c: Ditto wrt
realloc.
* gnulib/config/xalloc.m4, gnulib/m4/xalloc.h,
gnulib/m4/xmalloc.c, gnulib/m4/xstrdup.c: Ditto wrt xalloc.
* gnulib/m4/Makefile.am: Add fragment from gnulib for newly
imported modules.
(pkgincdir): Removed. Use pkgincludedir instead.
* m4/m4private.h (XFREE): xfree already checks for NULL.
* m4/system_.h: Use xalloc module, and remove macros already
supplied by xalloc.h.
* m4/utility.c (xfree): xalloc does not yet implement xfree, so
moved the old definition from m4/xmalloc.c to here for now.
Index: configure.ac
===================================================================
RCS file: /cvsroot/m4/m4/configure.ac,v
retrieving revision 1.18
diff -u -p -u -r1.18 configure.ac
--- configure.ac 9 Sep 2003 17:15:35 -0000 1.18
+++ configure.ac 10 Sep 2003 17:10:40 -0000
@@ -178,12 +178,13 @@ AC_SUBST([INCLUDE_STDBOOL_H])
## Library functions required by M4. ##
## --------------------------------- ##
AC_CHECK_FUNCS(bzero calloc mkstemp mktemp strerror tmpfile)
-AC_REPLACE_FUNCS(strtol xmalloc xstrdup xstrzdup)
+AC_REPLACE_FUNCS(strtol xstrzdup)
AC_FUNC_ALLOCA
AC_FUNC_VPRINTF
AM_WITH_DMALLOC
+gl_XALLOC
m4_ERROR
m4_OBSTACK
m4_SYS_STACKOVF
Index: gnulib/config/exitfail.m4
===================================================================
RCS file: gnulib/config/exitfail.m4
diff -N gnulib/config/exitfail.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/config/exitfail.m4 10 Sep 2003 17:10:42 -0000
@@ -0,0 +1,13 @@
+# exitfail.m4 serial 1
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_DEFUN([gl_EXITFAIL],
+[
+ dnl Prerequisites of lib/exitfail.c.
+ AC_CHECK_HEADERS_ONCE(stdlib.h)
+])
Index: gnulib/config/malloc.m4
===================================================================
RCS file: gnulib/config/malloc.m4
diff -N gnulib/config/malloc.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/config/malloc.m4 10 Sep 2003 17:10:43 -0000
@@ -0,0 +1,25 @@
+# malloc.m4 serial 7
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Jim Meyering.
+dnl Determine whether malloc accepts 0 as its argument.
+dnl If it doesn't, arrange to use the replacement function.
+
+AC_DEFUN([jm_FUNC_MALLOC],
+[
+ AC_REQUIRE([AC_FUNC_MALLOC])
+ dnl autoconf < 2.57 used the symbol ac_cv_func_malloc_works.
+ if test X"$ac_cv_func_malloc_0_nonnull" = Xno || test
X"$ac_cv_func_malloc_works" = Xno; then
+ gl_PREREQ_MALLOC
+ fi
+])
+
+# Prerequisites of lib/malloc.c.
+AC_DEFUN([gl_PREREQ_MALLOC], [
+ :
+])
Index: gnulib/config/realloc.m4
===================================================================
RCS file: gnulib/config/realloc.m4
diff -N gnulib/config/realloc.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/config/realloc.m4 10 Sep 2003 17:10:43 -0000
@@ -0,0 +1,25 @@
+# realloc.m4 serial 7
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Jim Meyering.
+dnl Determine whether realloc works when both arguments are 0.
+dnl If it doesn't, arrange to use the replacement function.
+
+AC_DEFUN([jm_FUNC_REALLOC],
+[
+ AC_REQUIRE([AC_FUNC_REALLOC])
+ dnl autoconf < 2.57 used the symbol ac_cv_func_realloc_works.
+ if test X"$ac_cv_func_realloc_0_nonnull" = Xno || test
X"$ac_cv_func_realloc_works" = Xno; then
+ gl_PREREQ_REALLOC
+ fi
+])
+
+# Prerequisites of lib/realloc.c.
+AC_DEFUN([gl_PREREQ_REALLOC], [
+ :
+])
Index: gnulib/config/xalloc.m4
===================================================================
RCS file: gnulib/config/xalloc.m4
diff -N gnulib/config/xalloc.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/config/xalloc.m4 10 Sep 2003 17:10:43 -0000
@@ -0,0 +1,25 @@
+# xalloc.m4 serial 2
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_DEFUN([gl_XALLOC],
+[
+ gl_PREREQ_XMALLOC
+ gl_PREREQ_XSTRDUP
+])
+
+# Prerequisites of lib/xmalloc.c.
+AC_DEFUN([gl_PREREQ_XMALLOC], [
+ AC_REQUIRE([AC_HEADER_STDC])
+ AC_REQUIRE([jm_FUNC_MALLOC])
+ AC_REQUIRE([jm_FUNC_REALLOC])
+])
+
+# Prerequisites of lib/xstrdup.c.
+AC_DEFUN([gl_PREREQ_XSTRDUP], [
+ :
+])
Index: gnulib/m4/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/gnulib/m4/Makefile.am,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile.am
--- gnulib/m4/Makefile.am 9 Sep 2003 17:15:35 -0000 1.4
+++ gnulib/m4/Makefile.am 10 Sep 2003 17:10:43 -0000
@@ -25,8 +25,7 @@ noinst_LTLIBRARIES = libgnu.la
libgnu_la_SOURCES =
libgnu_la_LIBADD = $(LTLIBOBJS) $(LTLIBINTL)
-pkgincdir = $(includedir)/@PACKAGE@
-pkginc_HEADERS = $(GETTEXT_H) $(OBSTACK_H) $(STDBOOL_H)
+pkginclude_HEADERS = $(GETTEXT_H) $(OBSTACK_H) $(STDBOOL_H)
EXTRA_HEADERS = gettext.h obstack.h stdbool.h
EXTRA_DIST =
@@ -49,6 +48,10 @@ error.h: error_.h
MOSTLYCLEANFILES += error.h
+## exitfail:
+libgnu_la_SOURCES += exitfail.c exitfail.h
+
+
## gettext: (not yet in gnulib)
BUILT_SOURCES += $(GETTEXT_H)
EXTRA_DIST += gettext_.h
@@ -60,6 +63,10 @@ gettext.h: gettext_.h
MOSTLYCLEANFILES += gettext.h
+## malloc: (not yet in gnulib)
+EXTRA_DIST += malloc.c
+
+
## obstack: (not yet in gnulib)
BUILT_SOURCES += $(OBSTACK_H)
EXTRA_DIST += obstack_.h
@@ -75,6 +82,10 @@ MOSTLYCLEANFILES += obstack.h
libgnu_la_SOURCES += progname.c progname.h
+## realloc: (not yet in gnulib)
+EXTRA_DIST += realloc.c
+
+
## stdbool:
BUILT_SOURCES += $(STDBOOL_H)
EXTRA_DIST += stdbool_.h
@@ -91,3 +102,8 @@ MOSTLYCLEANFILES += stdbool.h stdbool.h-
## unlocked-io:
libgnu_la_SOURCES += unlocked-io.h
+
+
+## xalloc (not from gnulib):
+libgnu_la_SOURCES += xmalloc.c xstrdup.c
+pkginclude_HEADERS += xalloc.h
Index: gnulib/m4/exitfail.c
===================================================================
RCS file: gnulib/m4/exitfail.c
diff -N gnulib/m4/exitfail.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/m4/exitfail.c 10 Sep 2003 17:10:43 -0000
@@ -0,0 +1,29 @@
+/* Failure exit status
+
+ Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING.
+ If not, write to the Free Software Foundation,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
+int volatile exit_failure = EXIT_FAILURE;
Index: gnulib/m4/exitfail.h
===================================================================
RCS file: gnulib/m4/exitfail.h
diff -N gnulib/m4/exitfail.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/m4/exitfail.h 10 Sep 2003 17:10:43 -0000
@@ -0,0 +1,20 @@
+/* Failure exit status
+
+ Copyright (C) 2002 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING.
+ If not, write to the Free Software Foundation,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+extern int volatile exit_failure;
Index: gnulib/m4/malloc.c
===================================================================
RCS file: gnulib/m4/malloc.c
diff -N gnulib/m4/malloc.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/m4/malloc.c 10 Sep 2003 17:10:43 -0000
@@ -0,0 +1,38 @@
+/* Work around bug on some systems where malloc (0) fails.
+ Copyright (C) 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
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+/* written by Jim Meyering */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#undef malloc
+
+#include <stddef.h>
+
+char *malloc ();
+
+/* Allocate an N-byte block of memory from the heap.
+ If N is zero, allocate a 1-byte block. */
+
+char *
+rpl_malloc (size_t n)
+{
+ if (n == 0)
+ n = 1;
+ return malloc (n);
+}
Index: gnulib/m4/realloc.c
===================================================================
RCS file: gnulib/m4/realloc.c
diff -N gnulib/m4/realloc.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/m4/realloc.c 10 Sep 2003 17:10:44 -0000
@@ -0,0 +1,44 @@
+/* Work around bug on some systems where realloc (NULL, 0) fails.
+ Copyright (C) 1997, 2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+/* written by Jim Meyering */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#undef realloc
+
+#include <stddef.h>
+
+char *malloc ();
+char *realloc ();
+
+/* Change the size of an allocated block of memory P to N bytes,
+ with error checking. If N is zero, change it to 1. If P is NULL,
+ use malloc. */
+
+char *
+rpl_realloc (p, n)
+ char *p;
+ size_t n;
+{
+ if (n == 0)
+ n = 1;
+ if (p == 0)
+ return malloc (n);
+ return realloc (p, n);
+}
Index: gnulib/m4/xalloc.h
===================================================================
RCS file: gnulib/m4/xalloc.h
diff -N gnulib/m4/xalloc.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/m4/xalloc.h 10 Sep 2003 17:10:44 -0000
@@ -0,0 +1,78 @@
+/* xalloc.h -- malloc with out-of-memory checking
+
+ Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+ 1999, 2000, 2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#ifndef XALLOC_H_
+# define XALLOC_H_
+
+# include <stddef.h>
+
+# ifndef __attribute__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
+# define __attribute__(x)
+# endif
+# endif
+
+# ifndef ATTRIBUTE_NORETURN
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+# endif
+
+/* If this pointer is non-zero, run the specified function upon each
+ allocation failure. It is initialized to zero. */
+extern void (*xalloc_fail_func) (void);
+
+/* If XALLOC_FAIL_FUNC is undefined or a function that returns, this
+ message is output. It is translated via gettext.
+ Its value is "memory exhausted". */
+extern char const xalloc_msg_memory_exhausted[];
+
+/* This function is always triggered when memory is exhausted. It is
+ in charge of honoring the two previous items. It exits with status
+ exit_failure (defined in exitfail.h). This is the
+ function to call when one wants the program to die because of a
+ memory allocation failure. */
+extern void xalloc_die (void) ATTRIBUTE_NORETURN;
+
+void *xmalloc (size_t n);
+void *xcalloc (size_t n, size_t s);
+void *xrealloc (void *p, size_t n);
+char *xstrdup (const char *str);
+
+# define XMALLOC(Type, N_items) xmalloc (sizeof (Type) * (N_items))
+# define XCALLOC(Type, N_items) xcalloc (sizeof (Type), N_items)
+# define XREALLOC(Ptr, Type, N_items) xrealloc (Ptr, sizeof (Type) * (N_items))
+
+/* Declare and alloc memory for VAR of type TYPE. */
+# define NEW(Type, Var) Type *(Var) = XMALLOC (Type, 1)
+
+/* Free VAR only if non NULL. */
+# define XFREE(Var) \
+ do { \
+ if (Var) \
+ free (Var); \
+ } while (0)
+
+/* Return a pointer to a malloc'ed copy of the array SRC of NUM elements. */
+# define CCLONE(Src, Num) \
+ (memcpy (xmalloc (sizeof *(Src) * (Num)), Src, sizeof *(Src) * (Num)))
+
+/* Return a malloc'ed copy of SRC. */
+# define CLONE(Src) CCLONE (Src, 1)
+
+
+#endif /* !XALLOC_H_ */
Index: gnulib/m4/xmalloc.c
===================================================================
RCS file: /cvsroot/m4/m4/gnulib/m4/xmalloc.c,v
retrieving revision 1.1
diff -u -p -u -r1.1 xmalloc.c
--- gnulib/m4/xmalloc.c 5 Sep 2003 18:32:26 -0000 1.1
+++ gnulib/m4/xmalloc.c 10 Sep 2003 17:10:44 -0000
@@ -1,6 +1,7 @@
/* xmalloc.c -- malloc with out of memory checking
- Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 2000
- Free Software Foundation, Inc.
+
+ Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+ 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,116 +25,88 @@
#if STDC_HEADERS
# include <stdlib.h>
-#endif
-
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
#else
-# define textdomain(Domain)
-# define _(Text) Text
+void *calloc ();
+void *malloc ();
+void *realloc ();
+void free ();
#endif
-/* If this file fails to compile because your machine has no memset()
- function, you should ensure that either HAVE_CALLOC or HAVE_BZERO
- are defined in config.h */
-#if !HAVE_BZERO
-# define bzero(p, s) memset (s, 0, n)
-#endif
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
-#ifndef STDC_HEADERS
-void *calloc ();
-void *malloc ();
-void *realloc ();
-void free ();
+#include "error.h"
+#include "exitfail.h"
+#include "xalloc.h"
+
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
#endif
-/* Prototypes for functions defined here. */
-static void *fixup_null_alloc (size_t n);
+/* The following tests require AC_PREREQ(2.54). */
+#ifndef HAVE_MALLOC
+"you must run the autoconf test for a GNU libc compatible malloc"
+#endif
-/* Exit value when the requested amount of memory is not available.
- The caller may set it to some other value. */
-int xmalloc_exit_failure = EXIT_FAILURE;
+#ifndef HAVE_REALLOC
+"you must run the autoconf test for a GNU libc compatible realloc"
+#endif
+/* If non NULL, call this function when memory is exhausted. */
+void (*xalloc_fail_func) (void) = 0;
-/* Your program must provide these functions in order for
- xmalloc() to work. */
-#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
-extern void error (int, int, const char *, ...);
-#else
-extern void error ();
-#endif
+/* If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+ before exiting when memory is exhausted. Goes through gettext. */
+char const xalloc_msg_memory_exhausted[] = N_("memory exhausted");
-static void *
-fixup_null_alloc (n)
- size_t n;
+void
+xalloc_die (void)
{
- void *p;
-
- p = 0;
- if (n == 0)
- p = malloc ((size_t) 1);
- if (p == 0)
- error (xmalloc_exit_failure, 0, _("Memory exhausted"));
- return p;
+ if (xalloc_fail_func)
+ (*xalloc_fail_func) ();
+ error (exit_failure, 0, "%s", _(xalloc_msg_memory_exhausted));
+ /* The `noreturn' cannot be given to error, since it may return if
+ its first argument is 0. To help compilers understand the
+ xalloc_die does terminate, call exit. */
+ exit (EXIT_FAILURE);
}
/* Allocate N bytes of memory dynamically, with error checking. */
void *
-xmalloc (n)
- size_t n;
+xmalloc (size_t n)
{
void *p;
p = malloc (n);
if (p == 0)
- p = fixup_null_alloc (n);
+ xalloc_die ();
return p;
}
-/* Allocate memory for N elements of S bytes, with error checking. */
+/* Change the size of an allocated block of memory P to N bytes,
+ with error checking. */
void *
-xcalloc (n, s)
- size_t n, s;
+xrealloc (void *p, size_t n)
{
- void *p;
-#if HAVE_CALLOC
- p = calloc (n, s);
+ p = realloc (p, n);
if (p == 0)
- p = fixup_null_alloc (n);
-#else
- p = xmalloc (n * s);
- bzero (p, n * s);
-#endif
+ xalloc_die ();
return p;
}
-/* Change the size of an allocated block of memory P to N bytes,
- with error checking.
- If P is NULL, run xmalloc. */
+/* Allocate memory for N elements of S bytes, with error checking. */
void *
-xrealloc (p, n)
- void *p;
- size_t n;
+xcalloc (size_t n, size_t s)
{
+ void *p;
+
+ p = calloc (n, s);
if (p == 0)
- return xmalloc (n);
- p = realloc (p, n);
- if (p == 0)
- p = fixup_null_alloc (n);
+ xalloc_die ();
return p;
-}
-
-/* Don't free NULL pointers. */
-void *
-xfree (stale)
- void *stale;
-{
- if (stale)
- free (stale);
- return 0;
}
Index: gnulib/m4/xstrdup.c
===================================================================
RCS file: /cvsroot/m4/m4/gnulib/m4/xstrdup.c,v
retrieving revision 1.1
diff -u -p -u -r1.1 xstrdup.c
--- gnulib/m4/xstrdup.c 5 Sep 2003 18:32:26 -0000 1.1
+++ gnulib/m4/xstrdup.c 10 Sep 2003 17:10:44 -0000
@@ -1,5 +1,5 @@
/* xstrdup.c -- copy a string with out of memory checking
- Copyright (C) 1990, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1990, 1996, 1998, 2001, 2003 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,30 +19,15 @@
# include <config.h>
#endif
-#ifndef WITH_DMALLOC
+/* Specification. */
+#include "xalloc.h"
-#include <sys/types.h>
-
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#if defined (__STDC__) && __STDC__
-char *xmalloc (size_t);
-char *xstrdup (char *string);
-#else
-char *xmalloc ();
-#endif
+#include <string.h>
/* Return a newly allocated copy of STRING. */
char *
-xstrdup (string)
- char *string;
+xstrdup (const char *string)
{
return strcpy (xmalloc (strlen (string) + 1), string);
}
-
-#endif /* !WITH_DMALLOC */
Index: m4/ltdl.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/ltdl.c,v
retrieving revision 1.15
diff -u -p -u -r1.15 ltdl.c
--- m4/ltdl.c 15 Aug 2003 15:53:04 -0000 1.15
+++ m4/ltdl.c 10 Sep 2003 17:10:45 -0000
@@ -29,6 +29,11 @@ Foundation, Inc., 59 Temple Place, Suite
# include <config.h>
#endif
+#if WITH_DMALLOC
+# undef malloc
+# undef realloc
+#endif
+
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
@@ -131,7 +136,6 @@ Foundation, Inc., 59 Temple Place, Suite
#endif
-
/* --- WINDOWS SUPPORT --- */
@@ -211,14 +215,11 @@ static char *lt_estrdup LT_PARAMS((con
static lt_ptr lt_emalloc LT_PARAMS((size_t size));
static lt_ptr lt_erealloc LT_PARAMS((lt_ptr addr, size_t size));
-/* static lt_ptr rpl_realloc LT_PARAMS((lt_ptr ptr, size_t size)); */
-#define rpl_realloc realloc
-
/* These are the pointers that can be changed by the caller: */
LT_GLOBAL_DATA lt_ptr (*lt_dlmalloc) LT_PARAMS((size_t size))
= (lt_ptr (*) LT_PARAMS((size_t))) malloc;
LT_GLOBAL_DATA lt_ptr (*lt_dlrealloc) LT_PARAMS((lt_ptr ptr, size_t size))
- = (lt_ptr (*) LT_PARAMS((lt_ptr, size_t))) rpl_realloc;
+ = (lt_ptr (*) LT_PARAMS((lt_ptr, size_t))) realloc;
LT_GLOBAL_DATA void (*lt_dlfree) LT_PARAMS((lt_ptr ptr))
= (void (*) LT_PARAMS((lt_ptr))) free;
@@ -237,7 +238,7 @@ LT_GLOBAL_DATA void (*lt_dlfree) LT_PA
#else
#define LT_DLMALLOC(tp, n) ((tp *) lt_dlmalloc ((n) * sizeof(tp)))
-#define LT_DLREALLOC(tp, p, n) ((tp *) rpl_realloc ((p), (n) * sizeof(tp)))
+#define LT_DLREALLOC(tp, p, n) ((tp *) lt_dlrealloc ((p), (n) * sizeof(tp)))
#define LT_DLFREE(p) \
LT_STMT_START { if (p) (p) = (lt_dlfree (p), (lt_ptr) 0); } LT_STMT_END
Index: m4/m4private.h
===================================================================
RCS file: /cvsroot/m4/m4/m4/m4private.h,v
retrieving revision 1.36
diff -u -p -u -r1.36 m4private.h
--- m4/m4private.h 27 Aug 2003 17:10:12 -0000 1.36
+++ m4/m4private.h 10 Sep 2003 17:10:45 -0000
@@ -287,7 +287,7 @@ struct m4__search_path_info {
/* Dmalloc expects us to use a void returning xfree. */
# undef XFREE
-# define XFREE(p) if (p) xfree (p)
+# define XFREE(p) (xfree (p))
#endif /* WITH_DMALLOC */
Index: m4/module.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/module.c,v
retrieving revision 1.29
diff -u -p -u -r1.29 module.c
--- m4/module.c 5 Sep 2003 18:32:26 -0000 1.29
+++ m4/module.c 10 Sep 2003 17:10:46 -0000
@@ -293,7 +293,7 @@ m4__module_init (m4 *context)
#if !WITH_DMALLOC
/* initialise libltdl's memory management. */
lt_dlmalloc = xmalloc;
- lt_dlfree = (void (*)(void*)) xfree;
+ lt_dlfree = (void (*) (void *)) xfree;
#endif
errors = lt_dlinit ();
Index: m4/system_.h
===================================================================
RCS file: /cvsroot/m4/m4/m4/system_.h,v
retrieving revision 1.2
diff -u -p -u -r1.2 system_.h
--- m4/system_.h 9 Sep 2003 17:15:35 -0000 1.2
+++ m4/system_.h 10 Sep 2003 17:10:49 -0000
@@ -27,12 +27,13 @@
#ifndef M4_SYSTEM_H
#define M4_SYSTEM_H 1
-/* I have yet to see a system that doesn't have these... */
+#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
@INCLUDE_ERROR_H@
@INCLUDE_OBSTACK_H@
@INCLUDE_STDBOOL_H@
+#include <m4/xalloc.h>
/* This is okay in an installed file, because it will not change the
behaviour of the including program whether ENABLE_NLS is defined
@@ -151,20 +152,12 @@ BEGIN_C_DECLS
# define EXIT_FAILURE 1
#endif
-
-/* Memory allocation. */
-#define XCALLOC(type, num) ((type *) xcalloc ((num), sizeof(type)))
-#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
-#define XREALLOC(type, p, num) ((type *) xrealloc ((p), (num) * sizeof(type)))
-#define XFREE(p) ((p) = xfree (p))
-
-extern void *xcalloc (size_t n, size_t s);
-extern void *xmalloc (size_t n);
-extern void *xrealloc (void *p, size_t n);
-extern void *xfree (void *stale);
+/* FIXME: macros to ease transition to gnulib xalloc.h API */
+#undef XFREE
+#define XFREE(Var) ((Var) = xfree (Var))
-extern char *xstrdup (const char *string);
+extern void *xfree (void *stale);
extern char *xstrzdup (const char *string, size_t len);
END_C_DECLS
Index: m4/utility.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/utility.c,v
retrieving revision 1.38
diff -u -p -u -r1.38 utility.c
--- m4/utility.c 5 Sep 2003 18:32:26 -0000 1.38
+++ m4/utility.c 10 Sep 2003 17:10:49 -0000
@@ -103,3 +103,13 @@ m4_dump_args (m4 *context, m4_obstack *o
m4_shipout_string (context, obs, M4ARG (i), 0, quoted);
}
}
+
+/* FIXME: merge xfree into gnulib. */
+/* Don't free NULL pointers. */
+void *
+xfree (void *stale)
+{
+ if (stale)
+ free (stale);
+ return 0;
+}
Index: po/cs.po
===================================================================
RCS file: /cvsroot/m4/m4/po/cs.po,v
retrieving revision 1.31
diff -u -p -u -r1.31 cs.po
--- po/cs.po 5 Sep 2003 18:32:27 -0000 1.31
+++ po/cs.po 10 Sep 2003 17:10:50 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-05 19:04+0100\n"
+"POT-Creation-Date: 2003-09-10 11:06+0100\n"
"PO-Revision-Date: 1998-12-07 22:02+01:00\n"
"Last-Translator: Jiøí Pavlovský <address@hidden>\n"
"Language-Team: Czech <address@hidden>\n"
@@ -14,14 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490
+#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: gnulib/m4/xmalloc.c:78 m4/regex.c:1057
-msgid "Memory exhausted"
-msgstr ""
-
#: m4/regex.c:1021
msgid "Success"
msgstr ""
@@ -72,6 +68,10 @@ msgstr ""
msgid "Invalid range end"
msgstr ""
+#: m4/regex.c:1057
+msgid "Memory exhausted"
+msgstr ""
+
# , c-format
#: m4/regex.c:1060
#, fuzzy
@@ -445,24 +445,24 @@ msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: src/main.c:83
+#: src/main.c:74
#, fuzzy
msgid "Stack overflow. (Infinite define recursion?)"
msgstr "CHYBA: Pøeteèení zásobníku. (nekoneèná rekurze makra define?)"
# , c-format
-#: src/main.c:95
+#: src/main.c:86
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Více informací získáte pøíkazem `%s --help'.\n"
# , c-format
-#: src/main.c:99
+#: src/main.c:90
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "Pou¾ití: %s [PØEPÍNAÈ]... [SOUBOR]...\n"
-#: src/main.c:100
+#: src/main.c:91
#, fuzzy
msgid ""
"Mandatory or optional arguments to long options are mandatory or optional\n"
@@ -488,10 +488,9 @@ msgstr ""
" -E, --fatal-warnings skonèí po prvním varování\n"
" -Q, --quiet, --silent potlaèí nìkterá varování týkající se\n"
" vestavìných maker\n"
-" -P, --prefix-builtins v¹echna vestavìná makra budou mít prefix "
-"`m4_'\n"
+" -P, --prefix-builtins v¹echna vestavìná makra budou mít prefix
`m4_'\n"
-#: src/main.c:114
+#: src/main.c:105
#, c-format
msgid ""
"\n"
@@ -500,7 +499,7 @@ msgid ""
" -m, --load-module=MODULE load dynamic MODULE from %s\n"
msgstr ""
-#: src/main.c:120
+#: src/main.c:111
msgid ""
"\n"
"Preprocessor features:\n"
@@ -518,7 +517,7 @@ msgstr ""
" -U, --undefine=MAKRO sma¾e vestavìné MAKRO\n"
" -s, --synclines vlo¾í øádky tvaru `#line ÈÍSLO \"SOUBOR\"'\n"
-#: src/main.c:128
+#: src/main.c:119
#, fuzzy
msgid ""
"\n"
@@ -529,11 +528,10 @@ msgstr ""
"\n"
"Nastavení limitù:\n"
" -G, --traditional vypne roz¹íøení GNU\n"
-" -H, --hashsize=PRVOÈÍSLO velikost hash tabulky pro vyhledávání "
-"symbolù\n"
+" -H, --hashsize=PRVOÈÍSLO velikost hash tabulky pro vyhledávání
symbolù\n"
" -L, --nesting-limit=ÈÍSLO nastaví limit pro vnoøená volání maker\n"
-#: src/main.c:134
+#: src/main.c:125
msgid ""
"\n"
"Frozen state files:\n"
@@ -545,7 +543,7 @@ msgstr ""
" -F, --freeze-state=SOUBOR pøi ukonèení ulo¾í zmrazený stav do SOUBORU\n"
" -R, --reload-state=SOUBOR pøi startu naète zmrazený stav ze SOUBORU\n"
-#: src/main.c:140
+#: src/main.c:131
msgid ""
"\n"
"Debugging:\n"
@@ -561,10 +559,9 @@ msgstr ""
" -t, --trace=MAKRO sleduje MAKRO, kdy¾ je definováno\n"
" -l, --arglength=POÈET reguluje poèet výstupních informací\n"
" ze sledování maker\n"
-" -o, --error-output=SOUBOR pøesmìruje výstup ladìní a sledování do "
-"SOUBORU\n"
+" -o, --error-output=SOUBOR pøesmìruje výstup ladìní a sledování do
SOUBORU\n"
-#: src/main.c:148
+#: src/main.c:139
msgid ""
"\n"
"FLAGS is any of:\n"
@@ -594,16 +591,15 @@ msgstr ""
" i vypí¹e informace o ka¾dé zmìnì vstupního souboru\n"
" V zkratka pro v¹echny vý¹e uvedené volby\n"
-#: src/main.c:163
+#: src/main.c:154
msgid ""
"\n"
"If no FILE or if FILE is `-', standard input is read.\n"
msgstr ""
"\n"
-"Jestli¾e SOUBOR není zadán, nebo je SOUBOR `-', pak je èten standardní "
-"vstup.\n"
+"Jestli¾e SOUBOR není zadán, nebo je SOUBOR `-', pak je èten standardní
vstup.\n"
-#: src/main.c:168
+#: src/main.c:159
msgid ""
"\n"
"Report bugs to <address@hidden>.\n"
@@ -612,31 +608,31 @@ msgstr ""
"Chyby v programu oznamujte na adrese <address@hidden> (anglicky).\n"
"Pøipomínky k pøekladu zasílejte na adresu <address@hidden> (èesky).\n"
-#: src/main.c:319
+#: src/main.c:310
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:323
+#: src/main.c:314
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
# , c-format
-#: src/main.c:352
+#: src/main.c:343
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "©patné ladící volby: `%s'"
-#: src/main.c:380
+#: src/main.c:371
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:383
+#: src/main.c:374
msgid "Copyright (C) 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:386
+#: src/main.c:377
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -651,8 +647,7 @@ msgid ""
"Memory bounds violation detected (SIGSEGV). Either a stack overflow\n"
"occurred, or there is a bug in "
msgstr ""
-"Neoprávnìný pøístup do pamìti (SIGSEGV). Jedná se buï o pøeteèení "
-"zásobníku,\n"
+"Neoprávnìný pøístup do pamìti (SIGSEGV). Jedná se buï o pøeteèení
zásobníku,\n"
"nebo o chybu "
#: src/stackovf.c:204
@@ -748,8 +743,7 @@ msgstr ". Provìøte, zda se nejedná o ne
#~ msgstr "VNITØNÍ CHYBA: ¹patný chybový kód v evaluate ()"
#~ msgid "INTERNAL ERROR: Builtin not found in builtin table!"
-#~ msgstr ""
-#~ "VNITØNÍ CHYBA: Vestavìné makro nenalezeno v tabulce vestavìných maker!"
+#~ msgstr "VNITØNÍ CHYBA: Vestavìné makro nenalezeno v tabulce vestavìných
maker!"
#, fuzzy
#~ msgid "INTERNAL ERROR: Bad token data type in produce_symbol_dump ()"
@@ -780,9 +774,7 @@ msgstr ". Provìøte, zda se nejedná o ne
#~ msgstr "VNITØNÍ CHYBA: ¹patný typ symbolu v m4_defn ()"
#~ msgid " -W, --word-regexp=REGEXP use REGEXP for macro name syntax\n"
-#~ msgstr ""
-#~ " -W, --word-regexp=REGVÝR syntaxe jmen maker bude urèena pomocí "
-#~ "REGVÝR\n"
+#~ msgstr " -W, --word-regexp=REGVÝR syntaxe jmen maker bude urèena pomocí
REGVÝR\n"
# , c-format
#~ msgid "Non-numeric argument to %s"
@@ -824,8 +816,7 @@ msgstr ". Provìøte, zda se nejedná o ne
#~ msgstr "CHYBA: modul `%s' nelze nalézt"
#~ msgid "INTERNAL ERROR: Built-in not found in builtin table!"
-#~ msgstr ""
-#~ "VNITØNÍ CHYBA: Vestavìné makro nenalezeno v tabulce vestavìných maker!"
+#~ msgstr "VNITØNÍ CHYBA: Vestavìné makro nenalezeno v tabulce vestavìných
maker!"
# , c-format
#, fuzzy
@@ -843,9 +834,7 @@ msgstr ". Provìøte, zda se nejedná o ne
# , c-format
#~ msgid "Warning: Excess arguments to built-in `%s' ignored"
-#~ msgstr ""
-#~ "Varování: pøíli¹ mnoho argumentù pro vestavìné makro `%s' - budou "
-#~ "ignorovány"
+#~ msgstr "Varování: pøíli¹ mnoho argumentù pro vestavìné makro `%s' - budou
ignorovány"
# , c-format
#~ msgid "Non-numeric argument to built-in `%s'"
Index: po/de.po
===================================================================
RCS file: /cvsroot/m4/m4/po/de.po,v
retrieving revision 1.31
diff -u -p -u -r1.31 de.po
--- po/de.po 5 Sep 2003 18:32:27 -0000 1.31
+++ po/de.po 10 Sep 2003 17:10:50 -0000
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4ppre2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-05 19:04+0100\n"
+"POT-Creation-Date: 2003-09-10 11:06+0100\n"
"PO-Revision-Date: 1999-03-20 00:46+01:00\n"
"Last-Translator: Martin von Löwis <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -16,14 +16,10 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490
+#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: gnulib/m4/xmalloc.c:78 m4/regex.c:1057
-msgid "Memory exhausted"
-msgstr ""
-
#: m4/regex.c:1021
msgid "Success"
msgstr ""
@@ -73,6 +69,10 @@ msgstr ""
msgid "Invalid range end"
msgstr ""
+#: m4/regex.c:1057
+msgid "Memory exhausted"
+msgstr ""
+
#: m4/regex.c:1060
#, fuzzy
msgid "Invalid preceding regular expression"
@@ -126,8 +126,7 @@ msgstr "FEHLER: Dateiende in Argumentlis
#: m4/macro.c:230
#, c-format
msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
-msgstr ""
-"FEHLER: Grenze der Rekursion von %d überschritten, benutze -L<N> zur Änderung"
+msgstr "FEHLER: Grenze der Rekursion von %d überschritten, benutze -L<N> zur
Änderung"
#: m4/macro.c:425
#, c-format
@@ -355,9 +354,7 @@ msgstr "Fehlerhafte eingefrorene Datei"
#: src/freeze.c:484
#, c-format
msgid "`%s' from frozen file not found in builtin table!"
-msgstr ""
-"»%s« aus eingefrorener Datei nicht in Tabelle der eingebauten Funktionen "
-"gefunden!"
+msgstr "»%s« aus eingefrorener Datei nicht in Tabelle der eingebauten
Funktionen gefunden!"
#: src/getopt.c:677
#, c-format
@@ -414,22 +411,22 @@ msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: src/main.c:83
+#: src/main.c:74
#, fuzzy
msgid "Stack overflow. (Infinite define recursion?)"
msgstr "FEHLER: Keller voll. (Unendliche `define' Rekursion?)"
-#: src/main.c:95
+#: src/main.c:86
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "»%s --help« zeigt weitere Informationen.\n"
-#: src/main.c:99
+#: src/main.c:90
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "Aufruf: %s [OPTION]... [DATEI]...\n"
-#: src/main.c:100
+#: src/main.c:91
#, fuzzy
msgid ""
"Mandatory or optional arguments to long options are mandatory or optional\n"
@@ -453,12 +450,10 @@ msgstr ""
" --version zeige Versionsinformation an und beende\n"
" -e, --interactive keine Ausgabepufferung, ignoriere Interrupts\n"
" -E, --fatal-warnings beende Ausführung nach erster Warnung\n"
-" -Q, --quiet, --silent unterdrücke Warnungen bei eingebauten "
-"Funktionen\n"
-" -P, --prefix-builtins erzwinge `m4_' Präfix für eingebaute "
-"Funktionen\n"
+" -Q, --quiet, --silent unterdrücke Warnungen bei eingebauten
Funktionen\n"
+" -P, --prefix-builtins erzwinge `m4_' Präfix für eingebaute
Funktionen\n"
-#: src/main.c:114
+#: src/main.c:105
#, fuzzy, c-format
msgid ""
"\n"
@@ -472,7 +467,7 @@ msgstr ""
"hinzu\n"
" -M, --load-module=MODULE lade dynamisches MODULE aus M4MODPATH\n"
-#: src/main.c:120
+#: src/main.c:111
msgid ""
"\n"
"Preprocessor features:\n"
@@ -489,7 +484,7 @@ msgstr ""
" -U, --undefine=NAME lösche eingebaute Funktion NAME\n"
" -s, --synclines erzeuge `#line NR \"DATEI\"' Zeilen\n"
-#: src/main.c:128
+#: src/main.c:119
#, fuzzy
msgid ""
"\n"
@@ -501,10 +496,9 @@ msgstr ""
"Setze Grenzen:\n"
" -G, --traditional schalte alle GNU Erweiterungen aus\n"
" -H, --hashsize=PRIMZAHL setze Größe der Symbol-Hashtabelle\n"
-" -L, --nesting-limit=NUMMER setze künstliche Grenze für "
-"Schachtelungstiefe\n"
+" -L, --nesting-limit=NUMMER setze künstliche Grenze für
Schachtelungstiefe\n"
-#: src/main.c:134
+#: src/main.c:125
msgid ""
"\n"
"Frozen state files:\n"
@@ -518,7 +512,7 @@ msgstr ""
" -R, --reload-state=DATEI lade zu Beginn Zustand von eingefrorener "
"DATEI\n"
-#: src/main.c:140
+#: src/main.c:131
msgid ""
"\n"
"Debugging:\n"
@@ -536,7 +530,7 @@ msgstr ""
" -o, --error-output=DATEI leite Debug- und Verfolgungsausgaben nach "
"DATEI\n"
-#: src/main.c:148
+#: src/main.c:139
msgid ""
"\n"
"FLAGS is any of:\n"
@@ -566,7 +560,7 @@ msgstr ""
" i gebe Veränderungen der Eingabedatei aus\n"
" V Kurzform für alle Flags oben zusammen\n"
-#: src/main.c:163
+#: src/main.c:154
msgid ""
"\n"
"If no FILE or if FILE is `-', standard input is read.\n"
@@ -574,7 +568,7 @@ msgstr ""
"\n"
"Ohne DATEI oder wenn DATEI `-' ist, wird die Standardeingabe gelesen\n"
-#: src/main.c:168
+#: src/main.c:159
msgid ""
"\n"
"Report bugs to <address@hidden>.\n"
@@ -582,30 +576,30 @@ msgstr ""
"\n"
"Probleme und Fehler an <address@hidden>.\n"
-#: src/main.c:319
+#: src/main.c:310
#, fuzzy, c-format
msgid "failed to add search directory `%s'"
msgstr "FEHLER: konnte Suchpfad `%s' nicht hinzufügen"
-#: src/main.c:323
+#: src/main.c:314
#, fuzzy, c-format
msgid "failed to add search directory `%s': %s"
msgstr "FEHLER: konnte Suchpfad `%s' nicht hinzufügen: %s"
-#: src/main.c:352
+#: src/main.c:343
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "Falsche Debug Flags: »%s«"
-#: src/main.c:380
+#: src/main.c:371
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:383
+#: src/main.c:374
msgid "Copyright (C) 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:386
+#: src/main.c:377
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -740,8 +734,7 @@ msgstr ". Untersuche auf mögliche unend
#~ msgstr "INTERNER FEHLER: Falscher Symboltyp in m4_defn ()"
#~ msgid " -W, --word-regexp=REGEXP use REGEXP for macro name syntax\n"
-#~ msgstr ""
-#~ " -W, --word-regexp=REGEXP benutze REGEXP für Makronamensyntax\n"
+#~ msgstr " -W, --word-regexp=REGEXP benutze REGEXP für
Makronamensyntax\n"
#~ msgid "Non-numeric argument to %s"
#~ msgstr "Nicht-numerisches Argument in %s"
@@ -789,8 +782,7 @@ msgstr ". Untersuche auf mögliche unend
#~ msgstr "Warnung: Zu wenig Argumente für eingebaute Funktion »%s«"
#~ msgid "Warning: Excess arguments to built-in `%s' ignored"
-#~ msgstr ""
-#~ "Warnung: Überschüssige Argumente für eingebaute Funktion »%s« ignoriert"
+#~ msgstr "Warnung: Überschüssige Argumente für eingebaute Funktion »%s«
ignoriert"
#~ msgid "Non-numeric argument to built-in `%s'"
#~ msgstr "Nicht-numerisches Argument in eingebauter Funktion »%s«"
Index: po/el.po
===================================================================
RCS file: /cvsroot/m4/m4/po/el.po,v
retrieving revision 1.31
diff -u -p -u -r1.31 el.po
--- po/el.po 5 Sep 2003 18:32:27 -0000 1.31
+++ po/el.po 10 Sep 2003 17:10:50 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU m4 1.4n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-05 19:04+0100\n"
+"POT-Creation-Date: 2003-09-10 11:06+0100\n"
"PO-Revision-Date: 1999-06-24 00:25+0000\n"
"Last-Translator: Simos Xenitellis <address@hidden>\n"
"Language-Team: Greek <address@hidden>\n"
@@ -14,14 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-7\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490
+#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: gnulib/m4/xmalloc.c:78 m4/regex.c:1057
-msgid "Memory exhausted"
-msgstr ""
-
#: m4/regex.c:1021
msgid "Success"
msgstr ""
@@ -71,6 +67,10 @@ msgstr ""
msgid "Invalid range end"
msgstr ""
+#: m4/regex.c:1057
+msgid "Memory exhausted"
+msgstr ""
+
#: m4/regex.c:1060
#, fuzzy
msgid "Invalid preceding regular expression"
@@ -122,9 +122,7 @@ msgstr "ÓÖÁËÌÁ: EOF óôç ëßóôá ïñéóìÜôùí"
#: m4/macro.c:230
#, c-format
msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
-msgstr ""
-"ÓÖÁËÌÁ: Ôï üñéï áíáäñïìÞò %d îåðåñÜóôçêå, êÜíôå ÷ñÞóç ôïõ -L<N> ãéá íá ôï "
-"áëëÜîåôå"
+msgstr "ÓÖÁËÌÁ: Ôï üñéï áíáäñïìÞò %d îåðåñÜóôçêå, êÜíôå ÷ñÞóç ôïõ -L<N> ãéá íá
ôï áëëÜîåôå"
#: m4/macro.c:425
#, c-format
@@ -303,9 +301,7 @@ msgstr "Áäõíáìßá áíïßãìáôïò óùëÞíùóçò óô
#: modules/gnu.c:598
msgid "WARNING: \\0 will disappear, use \\& instead in replacements"
-msgstr ""
-"ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Ôï \\0 èá åîáöáíéóôåß, êÜíåôå ÷ñÞóç ôïõ \\& áíôßèåôá óôéò "
-"áíôéêáôáóôÜóåéò"
+msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Ôï \\0 èá åîáöáíéóôåß, êÜíåôå ÷ñÞóç ôïõ \\& áíôßèåôá
óôéò áíôéêáôáóôÜóåéò"
#: modules/load.c:78 modules/m4.c:145
#, fuzzy, c-format
@@ -411,22 +407,22 @@ msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: src/main.c:83
+#: src/main.c:74
#, fuzzy
msgid "Stack overflow. (Infinite define recursion?)"
msgstr "ÓÖÁËÌÁ: Õðåñ÷åßëçóç óôïßâáò. (ÁíáäñïìÞ áðåßñïõ âÜèïõò;)"
-#: src/main.c:95
+#: src/main.c:86
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñç âïÞèåéá.\n"
-#: src/main.c:99
+#: src/main.c:90
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... [ÁÑ×ÅÉÏ]...\n"
-#: src/main.c:100
+#: src/main.c:91
#, fuzzy
msgid ""
"Mandatory or optional arguments to long options are mandatory or optional\n"
@@ -442,22 +438,18 @@ msgid ""
" -Q, --quiet, --silent suppress some warnings for builtins\n"
" -P, --prefix-builtins force a `m4_' prefix to all builtins\n"
msgstr ""
-"Õðï÷ñåùôéêÜ Þ ðñïáéñåôéêÜ ïñßóìáôá óå ìáêñÝò åðéëïãÝò åßíáé õðï÷ñåùôéêÜ Þ "
-"ðñïáéñåôéêÜ\n"
+"Õðï÷ñåùôéêÜ Þ ðñïáéñåôéêÜ ïñßóìáôá óå ìáêñÝò åðéëïãÝò åßíáé õðï÷ñåùôéêÜ Þ
ðñïáéñåôéêÜ\n"
"êáé ãéá ôçò óýíôïìåò åðéëïãÝò åðßóåéò.\n"
"\n"
"ÊáôáóôÜóåéò ëåéôïõñãßáò:\n"
" --help åìöÜíéóç áõôÞò ôçò âïÞèåéáò êáé Ýîïäïò\n"
" --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
" -e, --interactive Ýîïäïò ÷ùñßò åíôáìéåõôÞ, áãíüçóç äéáêïðþí\n"
-" -E, --fatal-warnings äéáêïðÞ åêôÝëåóçò ìåôÜ áðü ôç ðñþôç "
-"ðñïåéäïðïßçóç\n"
-" -Q, --quiet, --silent áðüêñõøç ìåñéêþí ðñïåéäïðïéÞóåùí óôá "
-"åóùäïìçìÝíá\n"
-" -P, --prefix-builtins åðéâïëÞ ðñïèÝìáôïò `m4_' óå üëá ôá "
-"åóùäïìçìÝíá\n"
+" -E, --fatal-warnings äéáêïðÞ åêôÝëåóçò ìåôÜ áðü ôç ðñþôç
ðñïåéäïðïßçóç\n"
+" -Q, --quiet, --silent áðüêñõøç ìåñéêþí ðñïåéäïðïéÞóåùí óôá
åóùäïìçìÝíá\n"
+" -P, --prefix-builtins åðéâïëÞ ðñïèÝìáôïò `m4_' óå üëá ôá
åóùäïìçìÝíá\n"
-#: src/main.c:114
+#: src/main.c:105
#, c-format
msgid ""
"\n"
@@ -466,7 +458,7 @@ msgid ""
" -m, --load-module=MODULE load dynamic MODULE from %s\n"
msgstr ""
-#: src/main.c:120
+#: src/main.c:111
msgid ""
"\n"
"Preprocessor features:\n"
@@ -477,14 +469,12 @@ msgid ""
msgstr ""
"\n"
"×áñáêôçñéóôéêÜ ðñïåðåîåñãáóôÞ:\n"
-" -I, --include=ÊÁÔÁËÏÃÏÓ øÜîéìï ìåôÜ êáé óôï êáôÜëïãï áõôü ãéá "
-"ðåñéëáìâáíüìåíá\n"
+" -I, --include=ÊÁÔÁËÏÃÏÓ øÜîéìï ìåôÜ êáé óôï êáôÜëïãï áõôü ãéá
ðåñéëáìâáíüìåíá\n"
" -D, --define=ÏÍÏÌÁ[=ÔÉÌÇ] åéóáãùãÞ Ïͼìáôïò ìå ÔÉÌÇ, Þ êåíü\n"
" -U, --undefine=ÏÍÏÌÁ äéáãñáöÞ åóùäïìçìÝíïõ ÏͼÌÁôïò\n"
-" -s, --synclines äçìéïõñãßá ãñáììþí `#line ÁÑÉÈÌÏÓ \"ÁÑ×ÅÉÏ"
-"\"'\n"
+" -s, --synclines äçìéïõñãßá ãñáììþí `#line ÁÑÉÈÌÏÓ
\"ÁÑ×ÅÉÏ\"'\n"
-#: src/main.c:128
+#: src/main.c:119
#, fuzzy
msgid ""
"\n"
@@ -498,7 +488,7 @@ msgstr ""
" -H, --hashsize=ÐÑÙÔÏÓ ïñéóìüò ìåãÝèïõò ðßíáêá áíáæÞôçóçò óõìâüëïõ\n"
" -L, --nesting-limit=ÁÑÉÈÌÏÓ áëëáãÞ ôå÷íçôïý ïñßïõ öùëéáóìþí\n"
-#: src/main.c:134
+#: src/main.c:125
msgid ""
"\n"
"Frozen state files:\n"
@@ -507,12 +497,10 @@ msgid ""
msgstr ""
"\n"
"Áñ÷åßá ðáãùìÝíçò êáôÜóôáóçò:\n"
-" -F, --freeze-state=ARXEIO äçìéïõñãßá ðáãùìÝíçò êáôÜóôáóçò óôï ÁÑ×ÅÉÏ "
-"óôï ôÝëïò\n"
-" -R, --reload-state=ARXEIO öüñôùìá îáíÜ ðáãùìÝíçò êáôÜóôáóçò áðü ÁÑ×ÅÉÏ "
-"óôçí åêêßíçóç\n"
+" -F, --freeze-state=ARXEIO äçìéïõñãßá ðáãùìÝíçò êáôÜóôáóçò óôï ÁÑ×ÅÉÏ óôï
ôÝëïò\n"
+" -R, --reload-state=ARXEIO öüñôùìá îáíÜ ðáãùìÝíçò êáôÜóôáóçò áðü ÁÑ×ÅÉÏ
óôçí åêêßíçóç\n"
-#: src/main.c:140
+#: src/main.c:131
msgid ""
"\n"
"Debugging:\n"
@@ -523,14 +511,12 @@ msgid ""
msgstr ""
"\n"
"ÅêóöáëìÜôùóç:\n"
-" -d, --debug=[ÓÇÌÁÉÅÓ] ïñéóìüò åðéðÝäïõ åêóöáëìÜôùóçò (÷ùñßò ÓÇÌÁÉÅÓ "
-"õðïíïåß `aeq')\n"
+" -d, --debug=[ÓÇÌÁÉÅÓ] ïñéóìüò åðéðÝäïõ åêóöáëìÜôùóçò (÷ùñßò ÓÇÌÁÉÅÓ
õðïíïåß `aeq')\n"
" -t, --trace=ONOMA áíß÷íåõóç ÏͼÌÁôïò üôáí áõôü èá ïñéóôåß\n"
" -l, --arglength=ÁÑÉÈÌ ðåñéïñéóìüò ìåãÝèïõò áíß÷íåõóçò ìáêñïåíôïëÞò\n"
-" -o, --error-output=ÁÑ×ÅÉÏ åðáíáêáôåýèõíóç åîüäïõ åêóöáëìÜôùóçò êáé "
-"áíß÷íåõóçò\n"
+" -o, --error-output=ÁÑ×ÅÉÏ åðáíáêáôåýèõíóç åîüäïõ åêóöáëìÜôùóçò êáé
áíß÷íåõóçò\n"
-#: src/main.c:148
+#: src/main.c:139
msgid ""
"\n"
"FLAGS is any of:\n"
@@ -548,30 +534,27 @@ msgid ""
msgstr ""
"\n"
"ÓÇÌÁÉÅÓ ìðïñåß íá åßíáé ïðïéäÞðïôå áðü:\n"
-" t áíß÷íåõóç üëùí ôùí êëÞóåùí ôùí ìáêñïåíôïëþí, ü÷é ìüíï áõôÝò ðïõ Ý÷ïõí "
-"ïñéóôåß\n"
+" t áíß÷íåõóç üëùí ôùí êëÞóåùí ôùí ìáêñïåíôïëþí, ü÷é ìüíï áõôÝò ðïõ Ý÷ïõí
ïñéóôåß\n"
" a åìöÜíéóç ðñáãìáôéêþí ïñéóìÜôùí\n"
" e åìöÜíéóç áíÜðôõîçò\n"
" q ðáñÜèåóå ôéìÝò üðùò ÷ñåéÜæåôáé, ìå ôéò óçìáßåò a Þ e\n"
" c åìöÜíéóç ðñéí ôç óõëëïãÞ, ìåôÜ ôç óõëëïãÞ êáé ìåôÜ ôç êëÞóç\n"
-" x ðñüóèåóç ìïíáäéêÞò ôáõôüôçôáò êëÞóçò ìáêñïåíôïëÞò, ÷ñÞóéìï ìå ôç "
-"óçìáßá c\n"
+" x ðñüóèåóç ìïíáäéêÞò ôáõôüôçôáò êëÞóçò ìáêñïåíôïëÞò, ÷ñÞóéìï ìå ôç óçìáßá
c\n"
" f åìöÜíéóç ôñÝ÷ïíôïò ïíüìáôïò áñ÷åßïõ åéóüäïõ\n"
" l åìöÜíéóç áñéèìü ôñå÷ïýóçò ãñáììÞò åéóüäïõ\n"
" p åìöÜíéóç áðïôåëåóìÜôùí áðü Ýñåõíåò óôï ìïíïðÜôé\n"
" i åìöÜíéóç áëëáãþí óôá áñ÷åßá åéóüäïõ\n"
" V óõíôïìïãñáößá ãéá üëåò ôéò ðáñáðÜíù óçìáßåò\n"
-#: src/main.c:163
+#: src/main.c:154
msgid ""
"\n"
"If no FILE or if FILE is `-', standard input is read.\n"
msgstr ""
"\n"
-"×ùñßò ÁÑ×ÅÉÏ, Þ üôáí ôï áñ÷åßï åßíáé ôï -, áíÜãíùóç áðü ôçí êáíïíéêÞ "
-"åßóïäï.\n"
+"×ùñßò ÁÑ×ÅÉÏ, Þ üôáí ôï áñ÷åßï åßíáé ôï -, áíÜãíùóç áðü ôçí êáíïíéêÞ
åßóïäï.\n"
-#: src/main.c:168
+#: src/main.c:159
msgid ""
"\n"
"Report bugs to <address@hidden>.\n"
@@ -579,30 +562,30 @@ msgstr ""
"\n"
"ÁíáöÝñáôå óöÜëìáôá óôï <address@hidden>.\n"
-#: src/main.c:319
+#: src/main.c:310
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:323
+#: src/main.c:314
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:352
+#: src/main.c:343
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "ËÜèïò óçìáßåò åêóöáëìÜôùóçò: `%s'"
-#: src/main.c:380
+#: src/main.c:371
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:383
+#: src/main.c:374
msgid "Copyright (C) 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:386
+#: src/main.c:377
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -617,8 +600,7 @@ msgid ""
"Memory bounds violation detected (SIGSEGV). Either a stack overflow\n"
"occurred, or there is a bug in "
msgstr ""
-"Åíôïðßóôçêå ðáñÜâáóç ôùí ïñßùí ìíÞìçò (SIGSEGV). Åßôå Ýãéíå õðÝñâáóç "
-"óôïßâáò\n"
+"Åíôïðßóôçêå ðáñÜâáóç ôùí ïñßùí ìíÞìçò (SIGSEGV). Åßôå Ýãéíå õðÝñâáóç
óôïßâáò\n"
"åßôå õðÜñ÷åé óöÜëìá ðñïãñÜììáôïò óôï "
#: src/stackovf.c:204
@@ -639,9 +621,7 @@ msgstr ". ÅëÝãîáôå ãéá ðéèáíÞ åð'Üðåéñï
#, fuzzy
#~ msgid ""
#~ "INTERNAL ERROR: Builtin not found in builtin table! (m4_trace_pre ())"
-#~ msgstr ""
-#~ "ÅÓÙÔÅÑÉÊÏ ÓÖÁËÌÁ: ÅóùäïìçìÝíï äåí âñÝèçêå óôï ðßíáêá åóùäïìçìÝíùí! "
-#~ "(trace_pre ())"
+#~ msgstr "ÅÓÙÔÅÑÉÊÏ ÓÖÁËÌÁ: ÅóùäïìçìÝíï äåí âñÝèçêå óôï ðßíáêá åóùäïìçìÝíùí!
(trace_pre ())"
#, fuzzy
#~ msgid "INTERNAL ERROR: Bad token data type (m4_trace_pre ())"
@@ -709,9 +689,7 @@ msgstr ". ÅëÝãîáôå ãéá ðéèáíÞ åð'Üðåéñï
#, fuzzy
#~ msgid "INTERNAL ERROR: Bad token data type in produce_symbol_dump ()"
-#~ msgstr ""
-#~ "ÅÓÙÔÅÑÉÊÏ ÓÖÁËÌÁ: ËÜèïò ôýðïò äåäïìÝíïõ áíôéêåéìÝíïõ óôï "
-#~ "freeze_one_symbol ()"
+#~ msgstr "ÅÓÙÔÅÑÉÊÏ ÓÖÁËÌÁ: ËÜèïò ôýðïò äåäïìÝíïõ áíôéêåéìÝíïõ óôï
freeze_one_symbol ()"
#~ msgid "INTERNAL ERROR: Bad code in deferred arguments"
#~ msgstr "ÅÓÙÔÅÑÉÊÏ ÓÖÁËÌÁ: ËÜèïò êùäéêüò óôá áíáöåñüìåíá ïñßóìáôá"
@@ -721,8 +699,7 @@ msgstr ". ÅëÝãîáôå ãéá ðéèáíÞ åð'Üðåéñï
#, fuzzy
#~ msgid "INTERNAL ERROR: Bad token data type in install_macro ()"
-#~ msgstr ""
-#~ "ÅÓÙÔÅÑÉÊÏ ÓÖÁËÌÁ: ËÜèïò ôýðïò äåäïìÝíïõ áíôéêåéìÝíïõ óôï define_macro ()"
+#~ msgstr "ÅÓÙÔÅÑÉÊÏ ÓÖÁËÌÁ: ËÜèïò ôýðïò äåäïìÝíïõ áíôéêåéìÝíïõ óôï
define_macro ()"
#~ msgid " (options:"
#~ msgstr " (åðéëïãÝò:"
@@ -732,16 +709,13 @@ msgstr ". ÅëÝãîáôå ãéá ðéèáíÞ åð'Üðåéñï
#~ msgstr "ÅÓÙÔÅÑÉÊÏ ÓÖÁËÌÁ: ÁíôéêáíïíéêÞ êáôÜóôáóç óôï symbol_lookup ()"
#~ msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()"
-#~ msgstr ""
-#~ "ÅÓÙÔÅÑÉÊÏ ÓÖÁËÌÁ: ËÜèïò ôýðïò äåäïìÝíïõ áíôéêåéìÝíïõ óôï m4_dumpdef ()"
+#~ msgstr "ÅÓÙÔÅÑÉÊÏ ÓÖÁËÌÁ: ËÜèïò ôýðïò äåäïìÝíïõ áíôéêåéìÝíïõ óôï m4_dumpdef
()"
#~ msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()"
#~ msgstr "ÅÓÙÔÅÑÉÊÏ ÓÖÁËÌÁ: ËÜèïò ôýðïò óõìâüëïõ óôï m4_defn ()"
#~ msgid " -W, --word-regexp=REGEXP use REGEXP for macro name syntax\n"
-#~ msgstr ""
-#~ " -W --word-regexp=ÊÁÍÅÊÖ ÷ñÞóç ÊÁÍïíéêÞò ¸ÊÖñáóçò óôï óõíôáêôéêü "
-#~ "ôçò ìáêñïåíôïëÞò\n"
+#~ msgstr " -W --word-regexp=ÊÁÍÅÊÖ ÷ñÞóç ÊÁÍïíéêÞò ¸ÊÖñáóçò óôï
óõíôáêôéêü ôçò ìáêñïåíôïëÞò\n"
#~ msgid "Non-numeric argument to %s"
#~ msgstr "Ìç áñéèìçôéêü üñéóìá óôï %s"
Index: po/fr.po
===================================================================
RCS file: /cvsroot/m4/m4/po/fr.po,v
retrieving revision 1.31
diff -u -p -u -r1.31 fr.po
--- po/fr.po 5 Sep 2003 18:32:27 -0000 1.31
+++ po/fr.po 10 Sep 2003 17:10:50 -0000
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4d\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-05 19:04+0100\n"
+"POT-Creation-Date: 2003-09-10 11:06+0100\n"
"PO-Revision-Date: 1998-05-23 11:53+02:00\n"
"Last-Translator: Erick Branderhorst <address@hidden>\n"
"Language-Team: dutch <address@hidden>\n"
@@ -16,14 +16,10 @@ msgstr ""
"Content-Type: text/plain; charset=\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490
+#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: gnulib/m4/xmalloc.c:78 m4/regex.c:1057
-msgid "Memory exhausted"
-msgstr ""
-
#: m4/regex.c:1021
msgid "Success"
msgstr ""
@@ -73,6 +69,10 @@ msgstr ""
msgid "Invalid range end"
msgstr ""
+#: m4/regex.c:1057
+msgid "Memory exhausted"
+msgstr ""
+
#: m4/regex.c:1060
#, fuzzy
msgid "Invalid preceding regular expression"
@@ -409,22 +409,22 @@ msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: src/main.c:83
+#: src/main.c:74
#, fuzzy
msgid "Stack overflow. (Infinite define recursion?)"
msgstr "ERREUR INTERNE: Mauvais type de lexème dans expand_token ()"
-#: src/main.c:95
+#: src/main.c:86
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pour plus d'information, essayez «%s --help».\\n\n"
-#: src/main.c:99
+#: src/main.c:90
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "Usage: %s [OPTION]... [FICHIER]...\\n\n"
-#: src/main.c:100
+#: src/main.c:91
#, fuzzy
msgid ""
"Mandatory or optional arguments to long options are mandatory or optional\n"
@@ -452,7 +452,7 @@ msgstr ""
" -Q, --quiet, --silent inhiber certains diagnostics prédéfinis\n"
" -P, --prefix-builtins préfixer tous les prédéfinis par «m4_»\n"
-#: src/main.c:114
+#: src/main.c:105
#, c-format
msgid ""
"\n"
@@ -461,7 +461,7 @@ msgid ""
" -m, --load-module=MODULE load dynamic MODULE from %s\n"
msgstr ""
-#: src/main.c:120
+#: src/main.c:111
#, fuzzy
msgid ""
"\n"
@@ -478,7 +478,7 @@ msgstr ""
" -U, --undefine=NOM éliminer le NOM prédéfini\n"
" -s, --synclines engendrer des lignes «#line NNN
\\\"FICHIER\\\"»\n"
-#: src/main.c:128
+#: src/main.c:119
#, fuzzy
msgid ""
"\n"
@@ -493,7 +493,7 @@ msgstr ""
" -L, --nesting-limit=NOMBRE modifier la limite artificielle "
"d'imbrication\n"
-#: src/main.c:134
+#: src/main.c:125
msgid ""
"\n"
"Frozen state files:\n"
@@ -505,7 +505,7 @@ msgstr ""
" -F, --freeze-state=FICHIER produire un FICHIER figé à la fin\n"
" -R, --reload-state=FICHIER recharger un FICHIER figé au départ\n"
-#: src/main.c:140
+#: src/main.c:131
msgid ""
"\n"
"Debugging:\n"
@@ -522,7 +522,7 @@ msgstr ""
" -o, --error-output=FICHIER rediriger la sortie de trace et mise-au-"
"point\n"
-#: src/main.c:148
+#: src/main.c:139
msgid ""
"\n"
"FLAGS is any of:\n"
@@ -552,7 +552,7 @@ msgstr ""
" i afficher les modifications dans les fichiers d'entrée\n"
" V abbréviation commode pour toutes les options précédentes à la fois\n"
-#: src/main.c:163
+#: src/main.c:154
msgid ""
"\n"
"If no FILE or if FILE is `-', standard input is read.\n"
@@ -560,36 +560,36 @@ msgstr ""
"\n"
"Si aucun FICHIER ou si FICHIER vaut «-», lit l'entrée standard.\n"
-#: src/main.c:168
+#: src/main.c:159
msgid ""
"\n"
"Report bugs to <address@hidden>.\n"
msgstr ""
-#: src/main.c:319
+#: src/main.c:310
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:323
+#: src/main.c:314
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:352
+#: src/main.c:343
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "Mauvais indicateurs de mise-au-point: «%s»"
-#: src/main.c:380
+#: src/main.c:371
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:383
+#: src/main.c:374
msgid "Copyright (C) 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:386
+#: src/main.c:377
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/it.po
===================================================================
RCS file: /cvsroot/m4/m4/po/it.po,v
retrieving revision 1.32
diff -u -p -u -r1.32 it.po
--- po/it.po 5 Sep 2003 18:32:27 -0000 1.32
+++ po/it.po 10 Sep 2003 17:10:50 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU M4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-05 19:04+0100\n"
+"POT-Creation-Date: 2003-09-10 11:06+0100\n"
"PO-Revision-Date: 2002-11-04 13:19+0100\n"
"Last-Translator: full name <address@hidden>\n"
"Language-Team: Italian <address@hidden>\n"
@@ -14,14 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490
+#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: gnulib/m4/xmalloc.c:78 m4/regex.c:1057
-msgid "Memory exhausted"
-msgstr ""
-
#: m4/regex.c:1021
msgid "Success"
msgstr ""
@@ -71,6 +67,10 @@ msgstr ""
msgid "Invalid range end"
msgstr ""
+#: m4/regex.c:1057
+msgid "Memory exhausted"
+msgstr ""
+
#: m4/regex.c:1060
#, fuzzy
msgid "Invalid preceding regular expression"
@@ -407,22 +407,22 @@ msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: src/main.c:83
+#: src/main.c:74
#, fuzzy
msgid "Stack overflow. (Infinite define recursion?)"
msgstr "ERRORE: Stack overflow. (Ricorsione infinita in `define'?)"
-#: src/main.c:95
+#: src/main.c:86
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Per ulteriori informazioni provare `%s --help'.\n"
-#: src/main.c:99
+#: src/main.c:90
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "Usage: %s [OPZIONE]... [ARCHIVIO]...\n"
-#: src/main.c:100
+#: src/main.c:91
msgid ""
"Mandatory or optional arguments to long options are mandatory or optional\n"
"for short options too.\n"
@@ -438,7 +438,7 @@ msgid ""
" -P, --prefix-builtins force a `m4_' prefix to all builtins\n"
msgstr ""
-#: src/main.c:114
+#: src/main.c:105
#, c-format
msgid ""
"\n"
@@ -447,7 +447,7 @@ msgid ""
" -m, --load-module=MODULE load dynamic MODULE from %s\n"
msgstr ""
-#: src/main.c:120
+#: src/main.c:111
msgid ""
"\n"
"Preprocessor features:\n"
@@ -457,7 +457,7 @@ msgid ""
" -s, --synclines generate `#line NO \"FILE\"' lines\n"
msgstr ""
-#: src/main.c:128
+#: src/main.c:119
msgid ""
"\n"
"Limits control:\n"
@@ -465,7 +465,7 @@ msgid ""
" -L, --nesting-limit=NUMBER change artificial nesting limit\n"
msgstr ""
-#: src/main.c:134
+#: src/main.c:125
msgid ""
"\n"
"Frozen state files:\n"
@@ -473,7 +473,7 @@ msgid ""
" -R, --reload-state=FILE reload a frozen state from FILE at start\n"
msgstr ""
-#: src/main.c:140
+#: src/main.c:131
msgid ""
"\n"
"Debugging:\n"
@@ -483,7 +483,7 @@ msgid ""
" -o, --error-output=FILE redirect debug and trace output\n"
msgstr ""
-#: src/main.c:148
+#: src/main.c:139
msgid ""
"\n"
"FLAGS is any of:\n"
@@ -500,42 +500,42 @@ msgid ""
" V shorthand for all of the above flags\n"
msgstr ""
-#: src/main.c:163
+#: src/main.c:154
msgid ""
"\n"
"If no FILE or if FILE is `-', standard input is read.\n"
msgstr ""
-#: src/main.c:168
+#: src/main.c:159
msgid ""
"\n"
"Report bugs to <address@hidden>.\n"
msgstr ""
-#: src/main.c:319
+#: src/main.c:310
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:323
+#: src/main.c:314
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:352
+#: src/main.c:343
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "Indicatori di debug errati: `%s'"
-#: src/main.c:380
+#: src/main.c:371
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:383
+#: src/main.c:374
msgid "Copyright (C) 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:386
+#: src/main.c:377
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/ja.po
===================================================================
RCS file: /cvsroot/m4/m4/po/ja.po,v
retrieving revision 1.31
diff -u -p -u -r1.31 ja.po
--- po/ja.po 5 Sep 2003 18:32:27 -0000 1.31
+++ po/ja.po 10 Sep 2003 17:10:50 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU m4 1.4.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-05 19:04+0100\n"
+"POT-Creation-Date: 2003-09-10 11:06+0100\n"
"PO-Revision-Date: 1996-03-28 11:52 EST\n"
"Last-Translator: Akiko Matsushita <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -14,15 +14,11 @@ msgstr ""
"Content-Type: text/plain; charset=EUC\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490
+#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
#, fuzzy
msgid "memory exhausted"
msgstr "¥á¥â¥ê¤¬»Ä¤Ã¤Æ¤¤¤Þ¤»¤ó¡£"
-#: gnulib/m4/xmalloc.c:78 m4/regex.c:1057
-msgid "Memory exhausted"
-msgstr "¥á¥â¥ê¤¬»Ä¤Ã¤Æ¤¤¤Þ¤»¤ó¡£"
-
#: m4/regex.c:1021
msgid "Success"
msgstr ""
@@ -72,6 +68,10 @@ msgstr ""
msgid "Invalid range end"
msgstr ""
+#: m4/regex.c:1057
+msgid "Memory exhausted"
+msgstr "¥á¥â¥ê¤¬»Ä¤Ã¤Æ¤¤¤Þ¤»¤ó¡£"
+
#: m4/regex.c:1060
#, fuzzy
msgid "Invalid preceding regular expression"
@@ -411,24 +411,24 @@ msgstr "%s: `%s' ¤ÏÉÔÌÀÎƤʥª¥×¥·¥ç¥ó̾¤
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤ò¼è¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£\n"
-#: src/main.c:83
+#: src/main.c:74
#, fuzzy
msgid "Stack overflow. (Infinite define recursion?)"
msgstr ""
"¥¨¥é¡¼: ¥¹¥¿¥Ã¥¯¤¬¥ª¡¼¥Ð¡¼¥Õ¥í¡¼¤òµ¯¤³¤·¤Æ¤¤¤Þ¤¹¡£\n"
" (̵¸Â¤ËºÆµ¢ÅªÄêµÁ¤ò¤·¤Æ¤¤¤Þ¤»¤ó¤«¡©)"
-#: src/main.c:95
+#: src/main.c:86
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "¾Ü¤·¤¯¤Ï `%s --help' ¤Î½ÐÎϤò¸æÍ÷²¼¤µ¤¤¡£\n"
-#: src/main.c:99
+#: src/main.c:90
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "»ÈÍÑÊýË¡: %s [¥ª¥×¥·¥ç¥ó]...[¥Õ¥¡¥¤¥ë̾]\n"
-#: src/main.c:100
+#: src/main.c:91
#, fuzzy
msgid ""
"Mandatory or optional arguments to long options are mandatory or optional\n"
@@ -454,7 +454,7 @@ msgstr ""
" -Q, --quiet, --silent
¤¤¤¯¤Ä¤«¤Î¥Ó¥ë¥È¥¤¥ó¥³¥Þ¥ó¥É¤Î·Ù¹ð¤òÍÞÀ©¤·¤Þ¤¹¡£\n"
" -P, --prefix-builtins Á´¤Æ¤Î¥Ó¥ë¥È¥¤¥ó¥Þ¥¯¥í¤Ë `m4_' ¤È¤¤¤¦ÀÜƬ¼¤ò
¶¯À©Åª¤ËÄɲä·¤Þ¤¹¡£\n"
-#: src/main.c:114
+#: src/main.c:105
#, c-format
msgid ""
"\n"
@@ -463,7 +463,7 @@ msgid ""
" -m, --load-module=MODULE load dynamic MODULE from %s\n"
msgstr ""
-#: src/main.c:120
+#: src/main.c:111
#, fuzzy
msgid ""
"\n"
@@ -482,7 +482,7 @@ msgstr ""
" -U, --undefine=NAME NAME ¤ÎÄêµÁ¤ò¼è¤ê¾Ã¤·¤Þ¤¹¡£\n"
" -s, --synclines ¹ÔÈÖ¹æ¤È¥Õ¥¡¥¤¥ë̾¤Î¹Ô¤òÀ¸À®¤·¤Þ¤¹¡£\n"
-#: src/main.c:128
+#: src/main.c:119
#, fuzzy
msgid ""
"\n"
@@ -497,7 +497,7 @@ msgstr ""
" ¥»¥Ã¥È¤·¤Þ¤¹¡£\n"
" -L, --nesting-limit=NUNBER
¥Þ¥¯¥í¤Î¥Í¥¹¥È²ó¿ô¤Î¾å¸ÂÃͤò¿Í°ÙŪ¤ËÊѹ¹¤·¤Þ¤¹¡£\n"
-#: src/main.c:134
+#: src/main.c:125
msgid ""
"\n"
"Frozen state files:\n"
@@ -509,7 +509,7 @@ msgstr ""
" -R, --reload-state=FILE ºÇ½é¤Ë»ØÄꤵ¤ì¤¿ FILE ¤«¤é\n"
" Åà·ë¤µ¤ì¤¿ÄêµÁ¤ò¥í¡¼¥É¤·¤Þ¤¹\n"
-#: src/main.c:140
+#: src/main.c:131
msgid ""
"\n"
"Debugging:\n"
@@ -527,7 +527,7 @@ msgstr ""
" -o, --error-output=FILE ¥Ç¥Ð¥Ã¥°¤È¥È¥ì¡¼¥¹¤Î½ÐÎϤò FILE ¤Ë\n"
" ¥ê¥À¥¤¥ì¥¯¥È¤·¤Þ¤¹¡£\n"
-#: src/main.c:148
+#: src/main.c:139
msgid ""
"\n"
"FLAGS is any of:\n"
@@ -559,7 +559,7 @@ msgstr ""
" i ÆþÎÏ¥Õ¥¡¥¤¥ë¤ËÀ¸¤¸¤¿ÊѲ½¤òɽ¼¨¤·¤Þ¤¹¡£\n"
" V ¾åµ¤ÎÁ´¤Æ¤Î FLAG ¤ò»ØÄꤹ¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£\n"
-#: src/main.c:163
+#: src/main.c:154
msgid ""
"\n"
"If no FILE or if FILE is `-', standard input is read.\n"
@@ -568,36 +568,36 @@ msgstr ""
"FILE ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤ª¤è¤Ó»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬ `-' ¤Î¾ì¹ç¤Ï\n"
" ɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹¡£\n"
-#: src/main.c:168
+#: src/main.c:159
msgid ""
"\n"
"Report bugs to <address@hidden>.\n"
msgstr ""
-#: src/main.c:319
+#: src/main.c:310
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:323
+#: src/main.c:314
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:352
+#: src/main.c:343
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "`%s' ¤ÏÉÔÀµ¤Ê¥Ç¥Ð¥Ã¥°¥ª¥×¥·¥ç¥ó°ú¿ô¤Ç¤¹¡£"
-#: src/main.c:380
+#: src/main.c:371
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:383
+#: src/main.c:374
msgid "Copyright (C) 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:386
+#: src/main.c:377
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/nl.po
===================================================================
RCS file: /cvsroot/m4/m4/po/nl.po,v
retrieving revision 1.31
diff -u -p -u -r1.31 nl.po
--- po/nl.po 5 Sep 2003 18:32:27 -0000 1.31
+++ po/nl.po 10 Sep 2003 17:10:51 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4d\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-05 19:04+0100\n"
+"POT-Creation-Date: 2003-09-10 11:06+0100\n"
"PO-Revision-Date: 1998-05-23 09:27+02:00\n"
"Last-Translator: Erick Branderhorst <address@hidden>\n"
"Language-Team: dutch <address@hidden>\n"
@@ -14,14 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490
+#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: gnulib/m4/xmalloc.c:78 m4/regex.c:1057
-msgid "Memory exhausted"
-msgstr ""
-
#: m4/regex.c:1021
msgid "Success"
msgstr ""
@@ -71,6 +67,10 @@ msgstr ""
msgid "Invalid range end"
msgstr ""
+#: m4/regex.c:1057
+msgid "Memory exhausted"
+msgstr ""
+
#: m4/regex.c:1060
#, fuzzy
msgid "Invalid preceding regular expression"
@@ -408,22 +408,22 @@ msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: src/main.c:83
+#: src/main.c:74
#, fuzzy
msgid "Stack overflow. (Infinite define recursion?)"
msgstr "FOUT: Stapel overflow. (Infinite define recursion?)"
-#: src/main.c:95
+#: src/main.c:86
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer `%s --help' voor meer informatie.\n"
-#: src/main.c:99
+#: src/main.c:90
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "Gebruik: %s [OPTIE]... [BESTAND]...\n"
-#: src/main.c:100
+#: src/main.c:91
#, fuzzy
msgid ""
"Mandatory or optional arguments to long options are mandatory or optional\n"
@@ -452,7 +452,7 @@ msgstr ""
" -P, --prefix-builtins forceer een `m4_' voorvoegsel voor alle \n"
" ingebouwde functies\n"
-#: src/main.c:114
+#: src/main.c:105
#, c-format
msgid ""
"\n"
@@ -461,7 +461,7 @@ msgid ""
" -m, --load-module=MODULE load dynamic MODULE from %s\n"
msgstr ""
-#: src/main.c:120
+#: src/main.c:111
#, fuzzy
msgid ""
"\n"
@@ -480,7 +480,7 @@ msgstr ""
" -U, --undefine=NAME verwijder ingebouwde functie NAME\n"
" -s, --synclines genereer `#line NO \"FILE\"' regel\n"
-#: src/main.c:128
+#: src/main.c:119
#, fuzzy
msgid ""
"\n"
@@ -494,7 +494,7 @@ msgstr ""
" -H, --hashsize=PRIME stel symbolen opzoek hash tabel grootte\n"
" -L, --nesting-limit=NUMBER verander kunstmatige nesting limiet\n"
-#: src/main.c:134
+#: src/main.c:125
msgid ""
"\n"
"Frozen state files:\n"
@@ -508,7 +508,7 @@ msgstr ""
" -R, --reload-state=FILE herlaad een gefixeerde staat van BESTAND\n"
" aan het begin\n"
-#: src/main.c:140
+#: src/main.c:131
msgid ""
"\n"
"Debugging:\n"
@@ -525,7 +525,7 @@ msgstr ""
" -l, --arglength=NUM restrict macro traceer grootte\n"
" -o, --error-output=FILE redirect debug en traceer uitvoer\n"
-#: src/main.c:148
+#: src/main.c:139
msgid ""
"\n"
"FLAGS is any of:\n"
@@ -555,7 +555,7 @@ msgstr ""
" i show changes in input files\n"
" V shorthand for all of the above flags\n"
-#: src/main.c:163
+#: src/main.c:154
msgid ""
"\n"
"If no FILE or if FILE is `-', standard input is read.\n"
@@ -563,7 +563,7 @@ msgstr ""
"\n"
"Als geen BESTAND of als BESTAND `-' is, standaard invoer wordt gelezen.\n"
-#: src/main.c:168
+#: src/main.c:159
#, fuzzy
msgid ""
"\n"
@@ -572,30 +572,30 @@ msgstr ""
"\n"
"Meld fouten via <address@hidden>.\n"
-#: src/main.c:319
+#: src/main.c:310
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:323
+#: src/main.c:314
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:352
+#: src/main.c:343
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "Onjuiste debug vlaggen: `%s'"
-#: src/main.c:380
+#: src/main.c:371
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:383
+#: src/main.c:374
msgid "Copyright (C) 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:386
+#: src/main.c:377
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/pl.po
===================================================================
RCS file: /cvsroot/m4/m4/po/pl.po,v
retrieving revision 1.31
diff -u -p -u -r1.31 pl.po
--- po/pl.po 5 Sep 2003 18:32:27 -0000 1.31
+++ po/pl.po 10 Sep 2003 17:10:51 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-05 19:04+0100\n"
+"POT-Creation-Date: 2003-09-10 11:06+0100\n"
"PO-Revision-Date: 1999-05-03 19:47+0200\n"
"Last-Translator: Rafa³ Maszkowski <address@hidden>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -14,14 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490
+#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: gnulib/m4/xmalloc.c:78 m4/regex.c:1057
-msgid "Memory exhausted"
-msgstr ""
-
#: m4/regex.c:1021
msgid "Success"
msgstr ""
@@ -71,6 +67,10 @@ msgstr ""
msgid "Invalid range end"
msgstr ""
+#: m4/regex.c:1057
+msgid "Memory exhausted"
+msgstr ""
+
#: m4/regex.c:1060
#, fuzzy
msgid "Invalid preceding regular expression"
@@ -408,22 +408,22 @@ msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: src/main.c:83
+#: src/main.c:74
#, fuzzy
msgid "Stack overflow. (Infinite define recursion?)"
msgstr "B£¡D: Przepe³nienie stosu. (Nieskoñczona rekursja definicji?)"
-#: src/main.c:95
+#: src/main.c:86
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Spróbuj `%s --help' ¿eby dowiedzieæ siê wiêcej.\n"
-#: src/main.c:99
+#: src/main.c:90
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "Sk³adnia: %s [OPCJA]... [PLIK]...\n"
-#: src/main.c:100
+#: src/main.c:91
#, fuzzy
msgid ""
"Mandatory or optional arguments to long options are mandatory or optional\n"
@@ -447,12 +447,11 @@ msgstr ""
" --version wy¶wietl informacjê o wersji i zakoñcz\n"
" -e, --intercative nie buforuj wyj¶cia, ignoruj przerwania\n"
" -E, --fatal-warnings zatrzymaj siê po pierwszym ostrz¿eniu\n"
-" -Q, --quiet, --silent nie pokazuj niektórych ostrze¿eñ dla "
-"wbudowanych\n"
+" -Q, --quiet, --silent nie pokazuj niektórych ostrze¿eñ dla
wbudowanych\n"
" -P, --prefix-builtins dodaj zawsze `m4_' przez wszystkimi "
"wbudowanymi\n"
-#: src/main.c:114
+#: src/main.c:105
#, c-format
msgid ""
"\n"
@@ -461,7 +460,7 @@ msgid ""
" -m, --load-module=MODULE load dynamic MODULE from %s\n"
msgstr ""
-#: src/main.c:120
+#: src/main.c:111
msgid ""
"\n"
"Preprocessor features:\n"
@@ -477,7 +476,7 @@ msgstr ""
" -U, --undefine=NAZWA skasuj wbudowan± NAZWÊ\n"
" -s, --synclines generuj linie `#line NR \"PLIK\"\n"
-#: src/main.c:128
+#: src/main.c:119
#, fuzzy
msgid ""
"\n"
@@ -488,11 +487,10 @@ msgstr ""
"\n"
"Sterowanie ograniczeniami:\n"
" -G, --traditional wy³±cz wszystkie rozszrzenia GNU\n"
-" -H, --hashzize=PIERWSZA ustaw rozmiar tablicy mieszaj±cej dla "
-"symboli\n"
+" -H, --hashzize=PIERWSZA ustaw rozmiar tablicy mieszaj±cej dla
symboli\n"
" -L, --nesting-limit=LICZBA zmieñ sztuczny limit zag³ebieñ\n"
-#: src/main.c:134
+#: src/main.c:125
msgid ""
"\n"
"Frozen state files:\n"
@@ -504,7 +502,7 @@ msgstr ""
" -F, --freeze-state=PLIK zapisz zamro¿ony PLIK stanu na koñcu\n"
" -R, --reload-state=PLIK za³aduj zamro¿ony PLIK stanu na pocz±tku\n"
-#: src/main.c:140
+#: src/main.c:131
msgid ""
"\n"
"Debugging:\n"
@@ -520,7 +518,7 @@ msgstr ""
" -l, --arglength=ILE ogranicz rozmiar ¶ledzenia makr\n"
" -o, --error-output=PLIK przekieruj wyniki debugowania i ¶ledzenia\n"
-#: src/main.c:148
+#: src/main.c:139
msgid ""
"\n"
"FLAGS is any of:\n"
@@ -550,7 +548,7 @@ msgstr ""
" i poka¿ zmiany plików wej¶ciowych\n"
" V skrót do wszystkich powy¿szych flag\n"
-#: src/main.c:163
+#: src/main.c:154
msgid ""
"\n"
"If no FILE or if FILE is `-', standard input is read.\n"
@@ -558,7 +556,7 @@ msgstr ""
"\n"
"Je¿eli brak PLIKu lub PLIK to `-', czytane jest std. wej¶cie.\n"
-#: src/main.c:168
+#: src/main.c:159
msgid ""
"\n"
"Report bugs to <address@hidden>.\n"
@@ -566,30 +564,30 @@ msgstr ""
"\n"
"Raporty o b³êdach wysy³aj do address@hidden"
-#: src/main.c:319
+#: src/main.c:310
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:323
+#: src/main.c:314
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:352
+#: src/main.c:343
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "B³êdne flagi debugowania: `%s'"
-#: src/main.c:380
+#: src/main.c:371
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:383
+#: src/main.c:374
msgid "Copyright (C) 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:386
+#: src/main.c:377
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -625,9 +623,7 @@ msgstr ". Sprawd¼ czy nie dosz³o do nie
#, fuzzy
#~ msgid ""
#~ "INTERNAL ERROR: Builtin not found in builtin table! (m4_trace_pre ())"
-#~ msgstr ""
-#~ "B£¡D WEWNÊTRZNY: Wbudowane nie znalezione w tablicy wbudowanych! "
-#~ "(trace_pre ())"
+#~ msgstr "B£¡D WEWNÊTRZNY: Wbudowane nie znalezione w tablicy wbudowanych!
(trace_pre ())"
#, fuzzy
#~ msgid "INTERNAL ERROR: Bad token data type (m4_trace_pre ())"
Index: po/ru.po
===================================================================
RCS file: /cvsroot/m4/m4/po/ru.po,v
retrieving revision 1.31
diff -u -p -u -r1.31 ru.po
--- po/ru.po 5 Sep 2003 18:32:27 -0000 1.31
+++ po/ru.po 10 Sep 2003 17:10:51 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-05 19:04+0100\n"
+"POT-Creation-Date: 2003-09-10 11:06+0100\n"
"PO-Revision-Date: 1999-04-17 20:58\n"
"Last-Translator: Denis Y. Pershin <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -14,15 +14,11 @@ msgstr ""
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490
+#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
#, fuzzy
msgid "memory exhausted"
msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-#: gnulib/m4/xmalloc.c:78 m4/regex.c:1057
-msgid "Memory exhausted"
-msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-
#: m4/regex.c:1021
msgid "Success"
msgstr ""
@@ -72,6 +68,10 @@ msgstr ""
msgid "Invalid range end"
msgstr ""
+#: m4/regex.c:1057
+msgid "Memory exhausted"
+msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
+
#: m4/regex.c:1060
#, fuzzy
msgid "Invalid preceding regular expression"
@@ -122,8 +122,7 @@ msgstr "ïûéâëá: ëÏÎÅà ÆÁÊÌÁ × ÓÐÉÓËÅ ÁÒÇ
#: m4/macro.c:230
#, c-format
msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it"
-msgstr ""
-"ïûéâëá: ìÉÍÉÔ ÒÅËÕÒÓÉÉ %d ÉÓÞÅÒÐÁÎ, ÉÓÐÏÌØÚÕÊÔÅ -L<N> ÞÔÏÂÙ ÉÚÍÅÎÉÔØ ÅÇÏ"
+msgstr "ïûéâëá: ìÉÍÉÔ ÒÅËÕÒÓÉÉ %d ÉÓÞÅÒÐÁÎ, ÉÓÐÏÌØÚÕÊÔÅ -L<N> ÞÔÏÂÙ ÉÚÍÅÎÉÔØ
ÅÇÏ"
#: m4/macro.c:425
#, c-format
@@ -189,8 +188,7 @@ msgstr "ïûéâëá: ÍÏÄÕÌØ `%s' ÎÅ ÎÁÊÄÅÎ"
#: m4/output.c:287
#, fuzzy
msgid "cannot create temporary file for diversion"
-msgstr ""
-"ïûéâëá: ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ ÄÌÑ ÒÁÚ×ÅÔ×ÌÅÎÉÑ ÍÁËÒÏÏÂÒÁÂÏÔËÉ"
+msgstr "ïûéâëá: ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ ÄÌÑ ÒÁÚ×ÅÔ×ÌÅÎÉÑ
ÍÁËÒÏÏÂÒÁÂÏÔËÉ"
#: m4/output.c:297
#, fuzzy
@@ -409,22 +407,22 @@ msgstr "%s: ÏÐÃÉÑ `%s' ÎÅÏÄÎÏÚÎÁÞÎÁ\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: Õ ÏÐÃÉÉ `--%s' ÎÅ ÄÏÌÖÎÏ ÂÙÔØ ÁÒÇÕÍÅÎÔÏ×\n"
-#: src/main.c:83
+#: src/main.c:74
#, fuzzy
msgid "Stack overflow. (Infinite define recursion?)"
msgstr "ïûéâëá: ðÅÒÅÐÏÌÎÅÎÉÅ ÓÔÅËÁ. (âÅÓËÏÎÅÞÎÏÅ ÒÅËÕÒÓÉ×ÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ?)"
-#: src/main.c:95
+#: src/main.c:86
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ðÏÐÒÏÂÕÊÔÅ '%s --help' ÄÌÑ ÉÎÆÏÒÍÁÃÉÉ.\n"
-#: src/main.c:99
+#: src/main.c:90
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [OPTION]... [FILE]...\n"
-#: src/main.c:100
+#: src/main.c:91
#, fuzzy
msgid ""
"Mandatory or optional arguments to long options are mandatory or optional\n"
@@ -440,21 +438,17 @@ msgid ""
" -Q, --quiet, --silent suppress some warnings for builtins\n"
" -P, --prefix-builtins force a `m4_' prefix to all builtins\n"
msgstr ""
-"ïÂÑÚÁÔÅÌØÎÙÅ ÉÌÉ ÎÅÏÂÑÚÁÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ÄÌÉÎÎÙÈ ÏÐÃÉÉ ÔÁËÏ×Ù É ÄÌÑ "
-"ËÏÒÏÔËÉÈ\n"
+"ïÂÑÚÁÔÅÌØÎÙÅ ÉÌÉ ÎÅÏÂÑÚÁÔÅÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ÄÌÉÎÎÙÈ ÏÐÃÉÉ ÔÁËÏ×Ù É ÄÌÑ
ËÏÒÏÔËÉÈ\n"
"\n"
"òÅÖÉÍÙ ÒÁÂÏÔÙ:\n"
" --help ÐÏËÁÚÁÔØ ÐÏÍÏÝØ É ×ÙÊÔÉ\n"
" --version ×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
-" -e, --interactive ÎÅÂÕÆÅÒÉÚÏ×ÁÎÎÙÊ ×Ù×ÏÄ, ÉÇÎÏÒÉÒÏ×ÁÔØ "
-"ÐÒÅÒÙ×ÁÎÉÑ\n"
+" -e, --interactive ÎÅÂÕÆÅÒÉÚÏ×ÁÎÎÙÊ ×Ù×ÏÄ, ÉÇÎÏÒÉÒÏ×ÁÔØ
ÐÒÅÒÙ×ÁÎÉÑ\n"
" -E, --fatal-warnings ÏÓÔÁÎÏ×ÉÔØÓÑ ÐÏÓÌÅ ÐÅÒ×ÏÇÏ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ\n"
-" -Q, --quiet, --silent ÐÏÄÁ×ÌÑÔØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ ÄÌÑ ×ÓÔÒÏÅÎÎÙÈ "
-"ÆÕÎËÃÉÊ\n"
-" -P, --prefix-builtins ÄÏÂÁ×ÌÑÔØ ÐÒÅÆÉËÓ `m4_' ÄÌÑ ×ÓÅÈ ×ÓÔÒÏÅÎÎÙÈ "
-"ÆÕÎËÃÉÊ\n"
+" -Q, --quiet, --silent ÐÏÄÁ×ÌÑÔØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ ÄÌÑ ×ÓÔÒÏÅÎÎÙÈ
ÆÕÎËÃÉÊ\n"
+" -P, --prefix-builtins ÄÏÂÁ×ÌÑÔØ ÐÒÅÆÉËÓ `m4_' ÄÌÑ ×ÓÅÈ ×ÓÔÒÏÅÎÎÙÈ
ÆÕÎËÃÉÊ\n"
-#: src/main.c:114
+#: src/main.c:105
#, c-format
msgid ""
"\n"
@@ -463,7 +457,7 @@ msgid ""
" -m, --load-module=MODULE load dynamic MODULE from %s\n"
msgstr ""
-#: src/main.c:120
+#: src/main.c:111
msgid ""
"\n"
"Preprocessor features:\n"
@@ -479,7 +473,7 @@ msgstr ""
" -U, --undefine=NAME ÕÄÁÌÉÔØ ×ÓÔÒÏÅÎÎÕÀ ÆÕÎËÃÉÀ NAME\n"
" -s, --synclines ÇÅÎÅÒÉÒÏ×ÁÔØ ÓÔÒÏËÉ `#line NO \"FILE\"'\n"
-#: src/main.c:128
+#: src/main.c:119
#, fuzzy
msgid ""
"\n"
@@ -490,12 +484,10 @@ msgstr ""
"\n"
"ïÇÒÁÎÉÞÅÎÉÑ:\n"
" -G, --traditional ÐÏÄÁ×ÌÑÔØ ×ÓÅ GNU ÒÁÓÛÉÒÅÎÉÑ\n"
-" -H, --hashsize=PRIME ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÈÜÛ-ÔÁÂÌÉÃÙ ÄÌÑ ÐÏÉÓËÁ "
-"ÓÉÍ×ÏÌÏ×\n"
-" -L, --nesting-limit=NUMBER ÉÚÍÅÎÉÔØ ÐÒÅÄÅÌ ÇÌÕÂÉÎÙ ÉÎÔÅÌÅËÔÕÁÌØÎÏÇÏ "
-"ÐÏÉÓËÁ\n"
+" -H, --hashsize=PRIME ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÈÜÛ-ÔÁÂÌÉÃÙ ÄÌÑ ÐÏÉÓËÁ
ÓÉÍ×ÏÌÏ×\n"
+" -L, --nesting-limit=NUMBER ÉÚÍÅÎÉÔØ ÐÒÅÄÅÌ ÇÌÕÂÉÎÙ ÉÎÔÅÌÅËÔÕÁÌØÎÏÇÏ
ÐÏÉÓËÁ\n"
-#: src/main.c:134
+#: src/main.c:125
msgid ""
"\n"
"Frozen state files:\n"
@@ -507,7 +499,7 @@ msgstr ""
" -F, --freeze-state=FILE × ËÏÎÃÅ ÓÏÚÄÁÔØ ÏÂÒÁÚ ÐÁÍÑÔÉ ÄÌÑ FILE\n"
" -R, --reload-state=FILE × ÎÁÞÁÌÅ ÚÁÇÒÕÖÁÔØ ÏÂÒÁÚ ÐÁÍÑÔÉ ÄÌÑ FILE\n"
-#: src/main.c:140
+#: src/main.c:131
msgid ""
"\n"
"Debugging:\n"
@@ -518,14 +510,12 @@ msgid ""
msgstr ""
"\n"
"ïÔÌÁÄËÁ:\n"
-" -d, --debug=[FLAGS] ÕÓÔÁÎÏ×ÉÔØ ÕÒÏ×ÅÎØ ÏÔÌÁÄËÉ (ÐÏ ÕÍÏÌÞÁÎÉÀ "
-"FLAGS=`aeq')\n"
+" -d, --debug=[FLAGS] ÕÓÔÁÎÏ×ÉÔØ ÕÒÏ×ÅÎØ ÏÔÌÁÄËÉ (ÐÏ ÕÍÏÌÞÁÎÉÀ
FLAGS=`aeq')\n"
" -t, --trace=NAME ÔÒÁÓÓÉÒÏ×ÁÔØ NAME ËÏÇÄÁ ÏÎÏ ÂÕÄÅÔ ÏÐÒÅÄÅÌÅÎÏ\n"
" -l, --arglength=NUM ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÔÒÁÓÓÉÒÏ×ËÉ ÄÌÑ ÍÁËÒÏÓÁ\n"
-" -o, --error-output=FILE ÐÅÒÅÎÁÐÒÁ×ÉÔØ ÏÔÌÁÄÏÞÎÙÊ É ÔÒÁÓÓÉÒÏ×ÏÞÎÙÊ "
-"×Ù×ÏÄ × ÆÁÊÌ FILE\n"
+" -o, --error-output=FILE ÐÅÒÅÎÁÐÒÁ×ÉÔØ ÏÔÌÁÄÏÞÎÙÊ É ÔÒÁÓÓÉÒÏ×ÏÞÎÙÊ
×Ù×ÏÄ × ÆÁÊÌ FILE\n"
-#: src/main.c:148
+#: src/main.c:139
msgid ""
"\n"
"FLAGS is any of:\n"
@@ -548,15 +538,14 @@ msgstr ""
" e ÐÏËÁÚÙ×ÁÔØ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÅ\n"
" q ÚÁËÌÀÞÁÔØ ÚÎÁÞÅÎÉÑ × ËÁ×ÙÞËÉ ÐÏ ÎÅÏÂÈÏÄÉÍÏÓÔÉ, Ó a ÉÌÉ e ÆÌÁÇÁÍÉ\n"
" c ÐÏËÁÚÙ×ÁÔØ ÐÅÒÅÄ ÓÂÏÒÏÍ , ÐÏÓÌÅ ÓÂÏÒÁ É ÐÏÓÌÅ ×ÙÚÏ×Á\n"
-" x ÄÏÂÁ×ÌÑÔØ ÕÎÉËÁÌØÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ×ÙÚÏ×Á ÍÁËÒÏÓÁ, ÉÓÐÏÌØÚÕÅÔÓÑ ×ÍÅÓÔÅ "
-"Ó ÆÌÁÇÏÍ c\n"
+" x ÄÏÂÁ×ÌÑÔØ ÕÎÉËÁÌØÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ×ÙÚÏ×Á ÍÁËÒÏÓÁ, ÉÓÐÏÌØÚÕÅÔÓÑ ×ÍÅÓÔÅ
Ó ÆÌÁÇÏÍ c\n"
" f ×Ù×ÏÄÉÔØ ÔÅËÕÝÅÅ ÉÍÑ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ\n"
" l ×Ù×ÏÄÉÔØ ÎÏÍÅÒ ÔÅËÕÝÅÊ ÓÔÒÏÞËÉ\n"
" p ÐÏËÁÚÙ×ÁÔØ ÒÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ ÐÏ ÐÕÔÑÍ\n"
" i ÐÏËÁÚÙ×ÁÔØ ÉÚÍÅÎÅÎÉÑ ×Ï ×ÈÏÄÎÙÈ ÆÁÊÌÁÈ\n"
" V ÓÏËÒÁÝÅÎÉÅ ÄÌÑ ×ÓÅÈ ÆÌÁÇÏ× ×ÍÅÓÔÅ\n"
-#: src/main.c:163
+#: src/main.c:154
msgid ""
"\n"
"If no FILE or if FILE is `-', standard input is read.\n"
@@ -564,7 +553,7 @@ msgstr ""
"\n"
"åÓÌÉ FILE ÎÅ ÓÕÝÅÓÔ×ÕÅÔ ÉÌÉ FILE ÜÔÏ `-', ÉÓÐÏÌØÚÕÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ×ÈÏÄ.\n"
-#: src/main.c:168
+#: src/main.c:159
msgid ""
"\n"
"Report bugs to <address@hidden>.\n"
@@ -572,30 +561,30 @@ msgstr ""
"\n"
"ðÏÓÙÌÁÊÔÅ ÏÔÞÅÔÙ Ï ÏÛÉÂËÁÈ ÎÁ <address@hidden>.\n"
-#: src/main.c:319
+#: src/main.c:310
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:323
+#: src/main.c:314
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:352
+#: src/main.c:343
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "îÅ×ÅÒÎÙÊ ÆÌÁÇ ÏÔÌÁÄËÉ: '%s'"
-#: src/main.c:380
+#: src/main.c:371
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:383
+#: src/main.c:374
msgid "Copyright (C) 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:386
+#: src/main.c:377
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -725,9 +714,7 @@ msgstr ". ðÒÏ×ÅÒËÁ ÎÁ ×ÏÚÍÏÖÎÕÀ ÂÅÓËÏÎÅÞ
#~ msgstr "÷îõôòåîîññ ïûéâëá: îÅ×ÅÒÎÙÊ ÔÉÐ ÓÉÍ×ÏÌÁ × m4_defn ()"
#~ msgid " -W, --word-regexp=REGEXP use REGEXP for macro name syntax\n"
-#~ msgstr ""
-#~ " -W, --word-regexp=REGEXP ÉÓÐÏÌØÚÏ×ÁÔØ REGEXP ÄÌÑ ÓÉÎÔÁËÓÉÓÁ ÉÍÅÎ "
-#~ "ÍÁËÒÏÓÏ×\n"
+#~ msgstr " -W, --word-regexp=REGEXP ÉÓÐÏÌØÚÏ×ÁÔØ REGEXP ÄÌÑ ÓÉÎÔÁËÓÉÓÁ
ÉÍÅÎ ÍÁËÒÏÓÏ×\n"
#~ msgid "Non-numeric argument to %s"
#~ msgstr "îÅÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %s"
@@ -775,9 +762,7 @@ msgstr ". ðÒÏ×ÅÒËÁ ÎÁ ×ÏÚÍÏÖÎÕÀ ÂÅÓËÏÎÅÞ
#~ msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: óÌÉÛËÏÍ ÍÁÌÏ ÁÒÇÕÍÅÎÔÏ× ÄÌÑ ×ÓÔÒÏÅÎÎÏÊ ÌÅËÓÅÍÙ '%s'"
#~ msgid "Warning: Excess arguments to built-in `%s' ignored"
-#~ msgstr ""
-#~ "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: éÚÂÙÔÏÞÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÓÔÒÏÅÎÎÏÊ ÌÅËÓÅÍÙ '%s' "
-#~ "ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ"
+#~ msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: éÚÂÙÔÏÞÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÓÔÒÏÅÎÎÏÊ ÌÅËÓÅÍÙ '%s'
ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ"
#~ msgid "Non-numeric argument to built-in `%s'"
#~ msgstr "îÅ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ ×ÓÔÒÏÅÎÎÏÊ ÌÅËÓÅÍÙ '%s'"
Index: po/sv.po
===================================================================
RCS file: /cvsroot/m4/m4/po/sv.po,v
retrieving revision 1.32
diff -u -p -u -r1.32 sv.po
--- po/sv.po 5 Sep 2003 18:32:27 -0000 1.32
+++ po/sv.po 10 Sep 2003 17:10:51 -0000
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-05 19:04+0100\n"
+"POT-Creation-Date: 2003-09-10 11:06+0100\n"
"PO-Revision-Date: 1999-03-28 18:56 +02:00\n"
"Last-Translator: Jan Djärv <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -15,14 +15,10 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490
+#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: gnulib/m4/xmalloc.c:78 m4/regex.c:1057
-msgid "Memory exhausted"
-msgstr ""
-
#: m4/regex.c:1021
msgid "Success"
msgstr ""
@@ -72,6 +68,10 @@ msgstr ""
msgid "Invalid range end"
msgstr ""
+#: m4/regex.c:1057
+msgid "Memory exhausted"
+msgstr ""
+
#: m4/regex.c:1060
#, fuzzy
msgid "Invalid preceding regular expression"
@@ -408,22 +408,22 @@ msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: src/main.c:83
+#: src/main.c:74
#, fuzzy
msgid "Stack overflow. (Infinite define recursion?)"
msgstr "FEL: Stacken flödar över. (Oändlig definitionsrekursion?)"
-#: src/main.c:95
+#: src/main.c:86
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Försök med \"%s --help\" för mer information.\n"
-#: src/main.c:99
+#: src/main.c:90
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "Användning: %s [FLAGGA]... [FIL]...\n"
-#: src/main.c:100
+#: src/main.c:91
#, fuzzy
msgid ""
"Mandatory or optional arguments to long options are mandatory or optional\n"
@@ -451,7 +451,7 @@ msgstr ""
"makron\n"
" -P, --prefix-builtins alla inbyggda makron börjar med `m4_'\n"
-#: src/main.c:114
+#: src/main.c:105
#, c-format
msgid ""
"\n"
@@ -460,7 +460,7 @@ msgid ""
" -m, --load-module=MODULE load dynamic MODULE from %s\n"
msgstr ""
-#: src/main.c:120
+#: src/main.c:111
msgid ""
"\n"
"Preprocessor features:\n"
@@ -476,7 +476,7 @@ msgstr ""
" -U, --undefine=NAMN ta bort inbyggt makro\n"
" -s, --synclines generera `#line NNN \"FIL\"' rader\n"
-#: src/main.c:128
+#: src/main.c:119
#, fuzzy
msgid ""
"\n"
@@ -490,7 +490,7 @@ msgstr ""
" -H, --hashsize=PRIMTAL sätt storlek på symboltabellen\n"
" -L, --nesting-limit=ANTAL ändra artificiell nästningsnivå\n"
-#: src/main.c:134
+#: src/main.c:125
msgid ""
"\n"
"Frozen state files:\n"
@@ -502,7 +502,7 @@ msgstr ""
" -F, --freeze-state=FIL spara fryst tillstånd i FIL vid avslut\n"
" -R, --reload-state=FIL läs fryst tillstånd från FIL vid start\n"
-#: src/main.c:140
+#: src/main.c:131
msgid ""
"\n"
"Debugging:\n"
@@ -517,10 +517,9 @@ msgstr ""
" (inga FLAGGOR tolkas som \"aeq\")\n"
" -t, --trace=NAMN spåra NAMN när den blir definierad\n"
" -l, --arglength=ANTAL begränsa makrospårningsstorleken\n"
-" -o, --error-output=FIL avled felsöknings och spårutskrifter till "
-"FIL\n"
+" -o, --error-output=FIL avled felsöknings och spårutskrifter till
FIL\n"
-#: src/main.c:148
+#: src/main.c:139
msgid ""
"\n"
"FLAGS is any of:\n"
@@ -550,7 +549,7 @@ msgstr ""
" i visa byten av infil\n"
" V förkortning för alla ovanstående flaggor\n"
-#: src/main.c:163
+#: src/main.c:154
msgid ""
"\n"
"If no FILE or if FILE is `-', standard input is read.\n"
@@ -558,7 +557,7 @@ msgstr ""
"\n"
"Om ingen FIL anges eller om FIL är `-', så läses standard in.\n"
-#: src/main.c:168
+#: src/main.c:159
msgid ""
"\n"
"Report bugs to <address@hidden>.\n"
@@ -567,30 +566,30 @@ msgstr ""
"Rapportera fel till <address@hidden>.\n"
"Rapportera fel på översättningen till <address@hidden>.\n"
-#: src/main.c:319
+#: src/main.c:310
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:323
+#: src/main.c:314
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:352
+#: src/main.c:343
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "Okänd felsökningsflagga \"%s\""
-#: src/main.c:380
+#: src/main.c:371
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:383
+#: src/main.c:374
msgid "Copyright (C) 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:386
+#: src/main.c:377
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: 59-gary-gnulib-xalloc-import.patch,
Gary V. Vaughan <=