diff -rNC3 sed-4.0.5/ChangeLog sed-4.0.6/ChangeLog *** sed-4.0.5/ChangeLog Mon Dec 16 20:23:38 2002 --- sed-4.0.6/ChangeLog Sat Mar 15 07:42:21 2003 *************** *** 1,3 **** --- 1,58 ---- + 2003-03-15 Paolo Bonzini + + *** Version 4.0.6 released + + * basicdefs.h: undefine temporarily FALSE and TRUE + * lib/mkstemp.c: include sys/file.h if available for the + benefit of Ultrix + + 2003-03-13 Paolo Bonzini + + * sed/compile.c (compile_program): understand parameter + of `v'. + + 2003-02-15 Paolo Bonzini + + * sed/sed.h: fix prototype for match_regex, declare re_registers + if REG_PERL + * sed/execute.c (do_subst): use re_registers + * sed/regex.c (copy_regs): new function + [REG_PERL]: use re_registers + [!REG_PERL]: avoid using internal entry points, support pre-glibc + 2.3 regex for the sake of --without-included-regex. + + 2003-01-04 Paolo Bonzini + + * sed/sed.h: move some stuff from here... + * sed/basicdefs.h: ...to here + * lib/utils.c (ck_fopen): add FAIL parameter + * lib/utils.h: adjust parameter + * sed/compile.c, sed/execute.c, sed/sed.c: adjust callers + + * sed/basicdefs.h: add TRUE/FALSE + * sed/compile.c, sed/execute.c, sed/sed.c: use them + * sed/fmt.c: do not redefine them + + 2003-01-02 Paolo Bonzini + + * sed/sed.c: bump copyright year + + 2002-12-24 Paolo Bonzini + + * sed/sed.c: use bindtextdomain + * sed/basicdefs.h [__EMX__]: define initialize_main + * lib/getline.c [__EMX__]: strip trailing CR + + * sed/regex.c: don't use N_ on the lines that define + error messages, some compilers complain. + + 2002-12-18 Paolo Bonzini + + *** Version 4.0.5 released + + * sed/compile.c: don't use N_ on the lines that define + error messages, some compilers complain. + 2002-12-16 Paolo Bonzini * sed/compile.c: improvements to some error messages; *************** *** 16,38 **** 2002-12-12 Paolo Bonzini ! * Version 4.0.4 released 2002-11-21 Paolo Bonzini ! * Version 4.0.3 released 2002-11-19 Paolo Bonzini ! * Version 4.0.2 released 2002-11-05 Paolo Bonzini ! * Version 4.0.1 released 2002-10-23 Paolo Bonzini ! * Version 4.0 released 2002-10-28 Paolo Bonzini --- 71,93 ---- 2002-12-12 Paolo Bonzini ! *** Version 4.0.4 released 2002-11-21 Paolo Bonzini ! *** Version 4.0.3 released 2002-11-19 Paolo Bonzini ! *** Version 4.0.2 released 2002-11-05 Paolo Bonzini ! *** Version 4.0.1 released 2002-10-23 Paolo Bonzini ! *** Version 4.0 released 2002-10-28 Paolo Bonzini *************** *** 46,52 **** 2002-10-17 Paolo Bonzini ! * Version 3.96 released 2002-10-16 Isamu Hasegawa --- 101,107 ---- 2002-10-17 Paolo Bonzini ! *** Version 3.96 released 2002-10-16 Isamu Hasegawa *************** *** 56,62 **** 2002-10-08 Paolo Bonzini ! * Version 3.95 released 2002-07-15 Paolo Bonzini --- 111,117 ---- 2002-10-08 Paolo Bonzini ! *** Version 3.95 released 2002-07-15 Paolo Bonzini diff -rNC3 sed-4.0.5/Makefile.am sed-4.0.6/Makefile.am *** sed-4.0.5/Makefile.am Thu Nov 21 12:45:44 2002 --- sed-4.0.6/Makefile.am Fri Mar 14 14:42:33 2003 *************** *** 14,21 **** EXTRA_DIST = BUGS THANKS COPYING.DOC README.boot bootstrap.sh \ config/codeset.m4 config/gettext.m4 config/iconv.m4 \ config/getline.m4 config/glibc21.m4 config/isc-posix.m4 \ ! config/lcmessage.m4 config/progtest.m4 config/texi2dvi \ ! config/help2man html: cd doc && make html --- 14,21 ---- EXTRA_DIST = BUGS THANKS COPYING.DOC README.boot bootstrap.sh \ config/codeset.m4 config/gettext.m4 config/iconv.m4 \ config/getline.m4 config/glibc21.m4 config/isc-posix.m4 \ ! config/lcmessage.m4 config/progtest.m4 config/strverscmp.m4 \ ! config/texi2dvi config/help2man html: cd doc && make html diff -rNC3 sed-4.0.5/Makefile.in sed-4.0.6/Makefile.in *** sed-4.0.5/Makefile.in Sat Dec 14 11:43:45 2002 --- sed-4.0.6/Makefile.in Tue Mar 18 17:55:07 2003 *************** *** 98,103 **** --- 98,104 ---- POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ + SED_FEATURE_VERSION = @SED_FEATURE_VERSION@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ *************** *** 155,162 **** EXTRA_DIST = BUGS THANKS COPYING.DOC README.boot bootstrap.sh \ config/codeset.m4 config/gettext.m4 config/iconv.m4 \ config/getline.m4 config/glibc21.m4 config/isc-posix.m4 \ ! config/lcmessage.m4 config/progtest.m4 config/texi2dvi \ ! config/help2man subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --- 156,163 ---- EXTRA_DIST = BUGS THANKS COPYING.DOC README.boot bootstrap.sh \ config/codeset.m4 config/gettext.m4 config/iconv.m4 \ config/getline.m4 config/glibc21.m4 config/isc-posix.m4 \ ! config/lcmessage.m4 config/progtest.m4 config/strverscmp.m4 \ ! config/texi2dvi config/help2man subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 *************** *** 176,182 **** check-recursive installcheck-recursive DIST_COMMON = README $(noinst_HEADERS) ABOUT-NLS AUTHORS COPYING \ COPYING.DOC ChangeLog INSTALL Makefile.am Makefile.in NEWS \ ! THANKS TODO aclocal.m4 bootstrap.sh.in config/config.guess \ config/config.sub config/depcomp config/install-sh \ config/mdate-sh config/missing config/mkinstalldirs \ config/texinfo.tex config_h.in configure configure.ac --- 177,183 ---- check-recursive installcheck-recursive DIST_COMMON = README $(noinst_HEADERS) ABOUT-NLS AUTHORS COPYING \ COPYING.DOC ChangeLog INSTALL Makefile.am Makefile.in NEWS \ ! THANKS aclocal.m4 bootstrap.sh.in config/config.guess \ config/config.sub config/depcomp config/install-sh \ config/mdate-sh config/missing config/mkinstalldirs \ config/texinfo.tex config_h.in configure configure.ac *************** *** 199,205 **** $(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): configure.ac config/codeset.m4 config/getline.m4 config/gettext.m4 config/glibc21.m4 config/iconv.m4 config/isc-posix.m4 config/lcmessage.m4 config/progtest.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 --- 200,206 ---- $(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): configure.ac config/codeset.m4 config/getline.m4 config/gettext.m4 config/glibc21.m4 config/iconv.m4 config/isc-posix.m4 config/lcmessage.m4 config/progtest.m4 config/strverscmp.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 diff -rNC3 sed-4.0.5/NEWS sed-4.0.6/NEWS *** sed-4.0.5/NEWS Mon Dec 16 20:22:46 2002 --- sed-4.0.6/NEWS Thu Mar 13 19:37:57 2003 *************** *** 1,3 **** --- 1,12 ---- + Sed 4.0.6 + + * added parameter to `v' for the version of sed that is expected. + + * configure switch --without-included-regex to use the system regex matcher + + * fix for -i option under Cygwin + + ---------------------------------------------------------------------------- Sed 4.0.5 * portability fixes diff -rNC3 sed-4.0.5/TODO sed-4.0.6/TODO *** sed-4.0.5/TODO Mon Dec 17 18:28:03 2001 --- sed-4.0.6/TODO Thu Jan 1 01:00:00 1970 *************** *** 1,13 **** - Likely: - All likely tasks are done... - - Maybe (4.0): - {7} Make pcre/reg{perl,posix}.c handle [[=x=]] and [[.x.]] and MBCS - {6} Add DFA ability to reg{perl,posix}.c, maybe (or maybe not) - taking inspiration from the old rx code. - - Unlikely (3.5x): - {5} Add -N addressing (e.g., -3,/bar/ s/foo/bar/) (requires - lookahead). - {4} Generalize + (and possibly -) addressing (e.g., /foo/+3,/bar/-2 - s/foo/bar/). --- 0 ---- diff -rNC3 sed-4.0.5/aclocal.m4 sed-4.0.6/aclocal.m4 *** sed-4.0.5/aclocal.m4 Sat Dec 14 11:43:29 2002 --- sed-4.0.6/aclocal.m4 Tue Mar 18 17:54:44 2003 *************** *** 869,874 **** --- 869,899 ---- fi ]) + # strverscmp.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_FUNC_STRVERSCMP], + [ + dnl Persuade glibc to declare strverscmp(). + AC_REQUIRE([AC_GNU_SOURCE]) + + AC_REPLACE_FUNCS(strverscmp) + if test $ac_cv_func_strverscmp = no; then + gl_PREREQ_STRVERSCMP + fi + ]) + + # Prerequisites of lib/strverscmp.c. + AC_DEFUN([gl_PREREQ_STRVERSCMP], [ + : + ]) + + # Macro to add for using GNU gettext. # Ulrich Drepper , 1995. # diff -rNC3 sed-4.0.5/basicdefs.h sed-4.0.6/basicdefs.h *** sed-4.0.5/basicdefs.h Sat Dec 14 09:20:23 2002 --- sed-4.0.6/basicdefs.h Sat Mar 15 08:12:50 2003 *************** *** 1,5 **** /* GNU SED, a batch stream editor. ! Copyright (C) 1998, 1999 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 --- 1,5 ---- /* GNU SED, a batch stream editor. ! Copyright (C) 1998, 1999, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 20,25 **** --- 20,79 ---- #ifndef BASICDEFS_H #define BASICDEFS_H + #if ENABLE_NLS + # include + #else + # define gettext(msgid) (msgid) + # define ngettext(sing, plur, n) ((n) == 1 ? (sing) : (plur)) + #endif + #define _(String) gettext(String) + + #ifdef gettext_noop + # define N_(String) gettext_noop(String) + #else + # define N_(String) (String) + #endif + + /* type countT is used to keep track of line numbers, etc. */ + typedef unsigned long countT; + + /* type flagT is used for boolean values */ + #if defined FALSE && FALSE != 0 + #error Huh, FALSE is not false? + #endif + #if defined TRUE && TRUE != 1 + #error Huh, TRUE is not true? + #endif + #undef FALSE + #undef TRUE + + #if __STDC__ + /* Define an enum for debugging */ + typedef enum { FALSE, TRUE } flagT; + #else + typedef int flagT; + #endif + + #define FALSE 0 + #define TRUE 1 + + /* Oftentimes casts are used as an ugly hack to silence warnings + * from the compiler. However, sometimes those warnings really + * do point to something worth avoiding. I define this + * dummy marker to make searching for them with a text editor + * much easier, in case I want to verify that they are all + * legitimate. It is defined in the way it is so that it is + * easy to disable all casts so that the compiler (or lint) + * can tell me potentially interesting things about what would + * happen to the code without the explicit casts. + */ + #ifdef LOUD_LINT + # define CAST(x) + #else + # define CAST(x) (x) + #endif + + /* Can the compiler grok function prototypes? */ #if (defined __STDC__ && __STDC__-0) || defined __GNUC__ || defined __SUNPRO_C || __PROTOTYPES # define P_(s) s *************** *** 99,105 **** # define ISASCII(c) isascii(c) #endif ! #ifdef isblank # define ISBLANK(c) (ISASCII (c) && isblank (c)) #else # define ISBLANK(c) ((c) == ' ' || (c) == '\t') --- 153,159 ---- # define ISASCII(c) isascii(c) #endif ! #if defined isblank || defined HAVE_ISBLANK # define ISBLANK(c) (ISASCII (c) && isblank (c)) #else # define ISBLANK(c) ((c) == ' ' || (c) == '\t') *************** *** 117,121 **** --- 171,183 ---- #define ISUPPER(c) (ISASCII (c) && isupper (c)) #define ISXDIGIT(c) (ISASCII (c) && isxdigit (c)) + #ifndef initialize_main + # ifdef __EMX__ + # define initialize_main(argcp, argvp) \ + { _response(argcp, argvp); _wildcard(argcp, argvp); } + # else /* NOT __EMX__ */ + # define initialize_main(argcp, argvp) + # endif + #endif #endif /*!BASICDEFS_H*/ diff -rNC3 sed-4.0.5/bootstrap.sh sed-4.0.6/bootstrap.sh *** sed-4.0.5/bootstrap.sh Mon Dec 16 19:51:47 2002 --- sed-4.0.6/bootstrap.sh Tue Mar 18 17:57:01 2003 *************** *** 19,29 **** */ #define PACKAGE "sed" ! #define VERSION "4.0.5-boot" #define BOOTSTRAP 1 ! /* Undefine if your compiler/headers have a conflicting definition. */ ! #define const /* Undefine if or has conflicting definition. */ #define size_t unsigned --- 19,36 ---- */ #define PACKAGE "sed" ! #define VERSION "4.0.6-boot" ! #define SED_FEATURE_VERSION "4.0" #define BOOTSTRAP 1 ! /* Define if your compiler/headers don't support const. */ ! #undef const ! ! /* Toggle if you encounter errors in lib/mkstemp.c. */ ! #define HAVE_UNISTD_H ! #define HAVE_FCNTL_H ! #undef HAVE_SYS_FILE_H ! #undef HAVE_IO_H /* Undefine if or has conflicting definition. */ #define size_t unsigned *************** *** 32,37 **** --- 39,45 ---- /* If your antique compiler doesn't grok ``void *'', then #define VOID char */ #undef VOID + /* All other config.h.in options intentionally omitted. Report as a bug if you need extra "#define"s in here. */ END_OF_CONFIG_H *************** *** 44,52 **** rm -f lib/*.o sed/*.o sed/sed cd lib || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c \ alloca.c getline.c getopt.c getopt1.c memchr.c memcmp.c memmove.c \ ! mkstemp.c obstack.c regex.c snprintf.c strerror.c utils.c || exit 1 cd ../sed || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -c \ --- 52,62 ---- rm -f lib/*.o sed/*.o sed/sed cd lib || exit 1 + rm -f regex.h + cp regex_.h regex.h ${CC} -DHAVE_CONFIG_H -I.. -I. -c \ alloca.c getline.c getopt.c getopt1.c memchr.c memcmp.c memmove.c \ ! mkstemp.c strverscmp.c obstack.c regex.c strerror.c utils.c || exit 1 cd ../sed || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -c \ diff -rNC3 sed-4.0.5/bootstrap.sh.in sed-4.0.6/bootstrap.sh.in *** sed-4.0.5/bootstrap.sh.in Mon Dec 16 19:51:12 2002 --- sed-4.0.6/bootstrap.sh.in Sat Mar 15 08:18:21 2003 *************** *** 20,29 **** #define PACKAGE "sed" #define VERSION "@VERSION@-boot" #define BOOTSTRAP 1 ! /* Undefine if your compiler/headers have a conflicting definition. */ ! #define const /* Undefine if or has conflicting definition. */ #define size_t unsigned --- 20,36 ---- #define PACKAGE "sed" #define VERSION "@VERSION@-boot" + #define SED_FEATURE_VERSION "@SED_FEATURE_VERSION@" #define BOOTSTRAP 1 ! /* Define if your compiler/headers don't support const. */ ! #undef const ! ! /* Toggle if you encounter errors in lib/mkstemp.c. */ ! #define HAVE_UNISTD_H ! #define HAVE_FCNTL_H ! #undef HAVE_SYS_FILE_H ! #undef HAVE_IO_H /* Undefine if or has conflicting definition. */ #define size_t unsigned *************** *** 32,37 **** --- 39,45 ---- /* If your antique compiler doesn't grok ``void *'', then #define VOID char */ #undef VOID + /* All other config.h.in options intentionally omitted. Report as a bug if you need extra "#define"s in here. */ END_OF_CONFIG_H *************** *** 44,52 **** rm -f lib/*.o sed/*.o sed/sed cd lib || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c \ alloca.c getline.c getopt.c getopt1.c memchr.c memcmp.c memmove.c \ ! mkstemp.c obstack.c regex.c snprintf.c strerror.c utils.c || exit 1 cd ../sed || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -c \ --- 52,62 ---- rm -f lib/*.o sed/*.o sed/sed cd lib || exit 1 + rm -f regex.h + cp regex_.h regex.h ${CC} -DHAVE_CONFIG_H -I.. -I. -c \ alloca.c getline.c getopt.c getopt1.c memchr.c memcmp.c memmove.c \ ! mkstemp.c strverscmp.c obstack.c regex.c strerror.c utils.c || exit 1 cd ../sed || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -c \ diff -rNC3 sed-4.0.5/config/strverscmp.m4 sed-4.0.6/config/strverscmp.m4 *** sed-4.0.5/config/strverscmp.m4 Thu Jan 1 01:00:00 1970 --- sed-4.0.6/config/strverscmp.m4 Fri Mar 14 14:40:43 2003 *************** *** 0 **** --- 1,24 ---- + # strverscmp.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_FUNC_STRVERSCMP], + [ + dnl Persuade glibc to declare strverscmp(). + AC_REQUIRE([AC_GNU_SOURCE]) + + AC_REPLACE_FUNCS(strverscmp) + if test $ac_cv_func_strverscmp = no; then + gl_PREREQ_STRVERSCMP + fi + ]) + + # Prerequisites of lib/strverscmp.c. + AC_DEFUN([gl_PREREQ_STRVERSCMP], [ + : + ]) + diff -rNC3 sed-4.0.5/config_h.in sed-4.0.6/config_h.in *** sed-4.0.5/config_h.in Sat Dec 14 11:44:03 2002 --- sed-4.0.6/config_h.in Tue Mar 18 17:56:00 2003 *************** *** 73,84 **** --- 73,90 ---- /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H + /* Define to 1 if you have the header file. */ + #undef HAVE_IO_H + /* Define to 1 if you have the `isascii' function. */ #undef HAVE_ISASCII /* Define to 1 if you have the `isatty' function. */ #undef HAVE_ISATTY + /* Define to 1 if you have the `isblank' function. */ + #undef HAVE_ISBLANK + /* Define if you have and nl_langinfo(CODESET). */ #undef HAVE_LANGINFO_CODESET *************** *** 88,93 **** --- 94,102 ---- /* Define to 1 if you have the `cposix' library (-lcposix). */ #undef HAVE_LIBCPOSIX + /* Define to 1 if you have the `regex' library (-lregex). */ + #undef HAVE_LIBREGEX + /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H *************** *** 142,156 **** /* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV /* Define to 1 if you have the `setenv' function. */ #undef HAVE_SETENV /* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE - /* Define to 1 if you have the `snprintf' function. */ - #undef HAVE_SNPRINTF - /* Define to 1 if you have the header file. */ #undef HAVE_STDARG_H --- 151,165 ---- /* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV + /* Define to 1 if you have the header file. */ + #undef HAVE_REGEX_H + /* Define to 1 if you have the `setenv' function. */ #undef HAVE_SETENV /* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE /* Define to 1 if you have the header file. */ #undef HAVE_STDARG_H *************** *** 187,192 **** --- 196,207 ---- /* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL + /* Define to 1 if you have the `strverscmp' function. */ + #undef HAVE_STRVERSCMP + + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_FILE_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H *************** *** 211,216 **** --- 226,234 ---- /* Define to 1 if you have the `wcrtomb' function. */ #undef HAVE_WCRTOMB + /* Define to 1 if you have the `wcscoll' function. */ + #undef HAVE_WCSCOLL + /* Define to 1 if you have the header file. */ #undef HAVE_WCTYPE_H *************** *** 244,249 **** --- 262,271 ---- /* Define to the version of this package. */ #undef PACKAGE_VERSION + /* Define to the version of GNU sed whose features are supported by this sed. + */ + #undef SED_FEATURE_VERSION + /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. *************** *** 267,272 **** --- 289,299 ---- /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS + + /* Enable GNU extensions on systems that have them. */ + #ifndef _GNU_SOURCE + # undef _GNU_SOURCE + #endif /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES diff -rNC3 sed-4.0.5/configure sed-4.0.6/configure *** sed-4.0.5/configure Sat Dec 14 11:43:49 2002 --- sed-4.0.6/configure Tue Mar 18 17:55:11 2003 *************** *** 1,6 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.54 for sed 4.0.5. # # Report bugs to . # --- 1,6 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.54 for sed 4.0.6. # # Report bugs to . # *************** *** 265,272 **** # Identity of this package. PACKAGE_NAME='sed' PACKAGE_TARNAME='sed' ! PACKAGE_VERSION='4.0.5' ! PACKAGE_STRING='sed 4.0.5' PACKAGE_BUGREPORT='bonzini@gnu.org' ac_unique_file="sed/sed.c" --- 265,272 ---- # Identity of this package. PACKAGE_NAME='sed' PACKAGE_TARNAME='sed' ! PACKAGE_VERSION='4.0.6' ! PACKAGE_STRING='sed 4.0.6' PACKAGE_BUGREPORT='bonzini@gnu.org' ac_unique_file="sed/sed.c" *************** *** 307,313 **** # include #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP ALLOCA LIBOBJS BUILD_HTML_TRUE BUILD_HTML_FALSE TEXI2HTML MAKEINFO_HTML_TRUE MAKEINFO_HTML_FALSE TEXI2HTML_HTML_TRUE TEXI2HTML_HTML_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. --- 307,313 ---- # include #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE SED_FEATURE_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP ALLOCA LIBOBJS BUILD_HTML_TRUE BUILD_HTML_FALSE TEXI2HTML MAKEINFO_HTML_TRUE MAKEINFO_HTML_FALSE TEXI2HTML_HTML_TRUE TEXI2HTML_HTML_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. *************** *** 776,782 **** # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF ! \`configure' configures sed 4.0.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... --- 776,782 ---- # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF ! \`configure' configures sed 4.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... *************** *** 842,848 **** if test -n "$ac_init_help"; then case $ac_init_help in ! short | recursive ) echo "Configuration of sed 4.0.5:";; esac cat <<\_ACEOF --- 842,848 ---- if test -n "$ac_init_help"; then case $ac_init_help in ! short | recursive ) echo "Configuration of sed 4.0.6:";; esac cat <<\_ACEOF *************** *** 852,863 **** --disable-dependency-tracking Speeds up one-time builds --enable-dependency-tracking Do not reject slow dependency extractors --disable-largefile omit support for large files ! --enable-html build HTML documentation --disable-nls do not use Native Language Support Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib --with-included-gettext use the GNU gettext library included here --- 852,864 ---- --disable-dependency-tracking Speeds up one-time builds --enable-dependency-tracking Do not reject slow dependency extractors --disable-largefile omit support for large files ! --enable-html build HTML manual (default=no) --disable-nls do not use Native Language Support Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-included-regex use included regex matcher (default=yes) --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib --with-included-gettext use the GNU gettext library included here *************** *** 936,942 **** test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF ! sed configure 4.0.5 generated by GNU Autoconf 2.54 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --- 937,943 ---- test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF ! sed configure 4.0.6 generated by GNU Autoconf 2.54 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 *************** *** 951,957 **** This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. ! It was created by sed $as_me 4.0.5, which was generated by GNU Autoconf 2.54. Invocation command line was $ $0 $@ --- 952,958 ---- This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. ! It was created by sed $as_me 4.0.6, which was generated by GNU Autoconf 2.54. Invocation command line was $ $0 $@ *************** *** 1525,1531 **** # Define the identity of the package. PACKAGE=sed ! VERSION=4.0.5 cat >>confdefs.h <<_ACEOF --- 1526,1532 ---- # Define the identity of the package. PACKAGE=sed ! VERSION=4.0.6 cat >>confdefs.h <<_ACEOF *************** *** 1652,1657 **** --- 1653,1666 ---- + SED_FEATURE_VERSION=4.0 + + cat >>confdefs.h <<_ACEOF + #define SED_FEATURE_VERSION "$SED_FEATURE_VERSION" + _ACEOF + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' *************** *** 2700,2705 **** --- 2709,2720 ---- fi + cat >>confdefs.h <<\_ACEOF + #define _GNU_SOURCE 1 + _ACEOF + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' *************** *** 3664,3669 **** --- 3679,3735 ---- fi + echo "$as_me:$LINENO: checking whether -lcP is needed" >&5 + echo $ECHO_N "checking whether -lcP is needed... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + echo "$as_me:$LINENO: result: assuming no" >&5 + echo "${ECHO_T}assuming no" >&6 + + else + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + + #include + #include + + int main() + { + FILE *fp; + int result; + errno = 0; + fp = fopen ("conftest.c", "r"); + if (!fp) return 0; /* error, assume not needed */ + result = fflush (fp) == EOF && errno == 0; + fclose (fp); + return result; + } + _ACEOF + rm -f conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + else + echo "$as_me: program exited with status $ac_status" >&5 + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ( exit $ac_status ) + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + LIBS="-lcP $LIBS" + fi + rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then *************** *** 3817,3825 **** ! for ac_header in string.h stdlib.h limits.h unistd.h memory.h sys/types.h \ ! strings.h locale.h stdarg.h alloca.h stddef.h errno.h \ ! wctype.h wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then --- 3883,3891 ---- ! for ac_header in string.h strings.h stdlib.h unistd.h io.h \ ! limits.h locale.h stdarg.h alloca.h stddef.h errno.h \ ! wctype.h wchar.h sys/file.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then *************** *** 4735,4743 **** ! for ac_func in memchr memcmp memmove strerror snprintf mkstemp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 --- 4801,4890 ---- + for ac_func in strverscmp + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + /* 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. */ + #ifdef __cplusplus + extern "C" + #endif + /* 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 (*f) (); + + 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 + f = $ac_func; + #endif + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_var=no" + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + else + LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + fi + done + + + if test $ac_cv_func_strverscmp = no; then + + : + + fi + + ! ! ! for ac_func in memchr memcmp memmove strerror mkstemp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 *************** *** 4822,4829 **** for ac_func in isatty bcopy bzero isascii memcpy memset strchr strtoul popen \ ! fchmod setlocale mbrtowc wcrtomb do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 --- 4969,4978 ---- + + for ac_func in isatty bcopy bzero isascii memcpy memset strchr strtoul popen \ ! isblank fchmod setlocale mbrtowc wcrtomb wcscoll do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 *************** *** 4893,4898 **** --- 5042,5302 ---- done + + # Check whether --with-included-regex or --without-included-regex was given. + if test "${with_included_regex+set}" = set; then + withval="$with_included_regex" + + else + with_included_regex=yes + fi; + + if test "x$with_included_regex" = xno; then + + for ac_header in regex.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else + # Is the header compilable? + echo "$as_me:$LINENO: checking $ac_header usability" >&5 + echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_compiler=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? + echo "$as_me:$LINENO: checking $ac_header presence" >&5 + echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_preproc=no + fi + rm -f conftest.err conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 + echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 + echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + esac + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=$ac_header_preproc" + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi + + done + + + echo "$as_me:$LINENO: checking for re_search in -lregex" >&5 + echo $ECHO_N "checking for re_search in -lregex... $ECHO_C" >&6 + if test "${ac_cv_lib_regex_re_search+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lregex $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char re_search (); + int + main () + { + re_search (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_regex_re_search=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_lib_regex_re_search=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_regex_re_search" >&5 + echo "${ECHO_T}$ac_cv_lib_regex_re_search" >&6 + if test $ac_cv_lib_regex_re_search = yes; then + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBREGEX 1 + _ACEOF + + LIBS="-lregex $LIBS" + + fi + + echo "$as_me:$LINENO: checking for re_search" >&5 + echo $ECHO_N "checking for re_search... $ECHO_C" >&6 + if test "${ac_cv_func_re_search+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char re_search (); below. */ + #include + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char re_search (); + char (*f) (); + + 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_re_search) || defined (__stub___re_search) + choke me + #else + f = re_search; + #endif + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_re_search=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_func_re_search=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_re_search" >&5 + echo "${ECHO_T}$ac_cv_func_re_search" >&6 + + if test $ac_cv_header_regex_h = no || test $ac_cv_func_re_search = no; then + { echo "$as_me:$LINENO: WARNING: GNU regex not found, falling back to the included version" >&5 + echo "$as_me: WARNING: GNU regex not found, falling back to the included version" >&2;} + with_included_regex=yes + fi + fi + + if test "x$with_included_regex" != xno; then + ac_config_links="$ac_config_links lib/regex.h:lib/regex_.h" + + LIBOBJS="$LIBOBJS regex.$ac_objext" + fi + # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then enableval="$enable_html" *************** *** 7125,7131 **** } >&5 cat >&5 <<_CSEOF ! This file was extended by sed $as_me 4.0.5, which was generated by GNU Autoconf 2.54. Invocation command line was CONFIG_FILES = $CONFIG_FILES --- 7529,7535 ---- } >&5 cat >&5 <<_CSEOF ! This file was extended by sed $as_me 4.0.6, which was generated by GNU Autoconf 2.54. Invocation command line was CONFIG_FILES = $CONFIG_FILES *************** *** 7179,7184 **** --- 7583,7591 ---- Configuration headers: $config_headers + Configuration links: + $config_links + Configuration commands: $config_commands *************** *** 7187,7193 **** cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ ! sed config.status 4.0.5 configured by $0, generated by GNU Autoconf 2.54, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" --- 7594,7600 ---- cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ ! sed config.status 4.0.6 configured by $0, generated by GNU Autoconf 2.54, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" *************** *** 7293,7298 **** --- 7700,7706 ---- "testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;; + "lib/regex.h" ) CONFIG_LINKS="$CONFIG_LINKS lib/regex.h:lib/regex_.h" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;; *************** *** 7309,7314 **** --- 7717,7723 ---- if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi *************** *** 7396,7401 **** --- 7805,7811 ---- s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t + s,@SED_FEATURE_VERSION@,$SED_FEATURE_VERSION,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t *************** *** 7897,7902 **** --- 8307,8417 ---- /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'`/stamp-h$_am_stamp_count + done + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF + + # + # CONFIG_LINKS section. + # + + for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue + ac_dest=`echo "$ac_file" | sed 's,:.*,,'` + ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` + + { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5 + echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;} + + if test ! -r $srcdir/$ac_source; then + { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5 + echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;} + { (exit 1); exit 1; }; } + fi + rm -f $ac_dest + + # Make relative symlinks. + ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null || + $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$ac_dest" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dest_dir" + else + as_dir="$ac_dest_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || + $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dest_dir\"" >&5 + echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + + if test "$ac_dest_dir" != .; then + ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` + else + ac_dir_suffix= ac_top_builddir= + fi + + case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; + esac + # Don't blindly perform a `cd "$ac_dest_dir"/$ac_foo && pwd` since $ac_foo can be + # absolute. + ac_abs_builddir=`cd "$ac_dest_dir" && cd $ac_builddir && pwd` + ac_abs_top_builddir=`cd "$ac_dest_dir" && cd ${ac_top_builddir}. && pwd` + ac_abs_srcdir=`cd "$ac_dest_dir" && cd $ac_srcdir && pwd` + ac_abs_top_srcdir=`cd "$ac_dest_dir" && cd $ac_top_srcdir && pwd` + + + case $srcdir in + [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;; + *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;; + esac + + # Try a symlink, then a hard link, then a copy. + ln -s $ac_rel_source $ac_dest 2>/dev/null || + ln $srcdir/$ac_source $ac_dest 2>/dev/null || + cp -p $srcdir/$ac_source $ac_dest || + { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&5 + echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;} + { (exit 1); exit 1; }; } done _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF diff -rNC3 sed-4.0.5/configure.ac sed-4.0.6/configure.ac *** sed-4.0.5/configure.ac Sat Dec 14 11:43:24 2002 --- sed-4.0.6/configure.ac Tue Mar 18 17:54:37 2003 *************** *** 1,23 **** dnl Process this file with -*- autoconf -*- to produce a configure script. ! AC_INIT(sed, 4.0.5, bonzini@gnu.org, sed) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sed/sed.c]) AM_CONFIG_HEADER(config.h:config_h.in) AC_PREREQ(2.53) AM_INIT_AUTOMAKE AC_PROG_CC AC_PROG_RANLIB AC_AIX AC_MINIX AC_ISC_POSIX AC_SYS_LARGEFILE AC_CHECK_LIB(cposix,strerror) AC_HEADER_STDC ! AC_CHECK_HEADERS(string.h stdlib.h limits.h unistd.h memory.h sys/types.h \ ! strings.h locale.h stdarg.h alloca.h stddef.h errno.h \ ! wctype.h wchar.h) AC_C_CONST AC_TYPE_SIZE_T AC_CHECK_TYPE(ssize_t, int) --- 1,50 ---- dnl Process this file with -*- autoconf -*- to produce a configure script. ! AC_INIT(sed, 4.0.6, bonzini@gnu.org, sed) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sed/sed.c]) AM_CONFIG_HEADER(config.h:config_h.in) AC_PREREQ(2.53) AM_INIT_AUTOMAKE + SED_FEATURE_VERSION=4.0 + AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION", + [Define to the version of GNU sed whose features are supported by this sed.]) + AC_SUBST(SED_FEATURE_VERSION) + AC_PROG_CC AC_PROG_RANLIB + AC_GNU_SOURCE AC_AIX AC_MINIX AC_ISC_POSIX AC_SYS_LARGEFILE AC_CHECK_LIB(cposix,strerror) + AC_MSG_CHECKING([whether -lcP is needed]) + AC_TRY_RUN([ + #include + #include + + int main() + { + FILE *fp; + int result; + errno = 0; + fp = fopen ("conftest.c", "r"); + if (!fp) return 0; /* error, assume not needed */ + result = fflush (fp) == EOF && errno == 0; + fclose (fp); + return result; + }], [AC_MSG_RESULT(no)], + [AC_MSG_RESULT(yes) + LIBS="-lcP $LIBS"], + [AC_MSG_RESULT([assuming no]) + ]) + AC_HEADER_STDC ! AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h io.h \ ! limits.h locale.h stdarg.h alloca.h stddef.h errno.h \ ! wctype.h wchar.h sys/file.h) AC_C_CONST AC_TYPE_SIZE_T AC_CHECK_TYPE(ssize_t, int) *************** *** 26,37 **** AC_FUNC_VPRINTF AM_FUNC_GETLINE AC_FUNC_OBSTACK ! AC_REPLACE_FUNCS(memchr memcmp memmove strerror snprintf mkstemp) AC_CHECK_FUNCS(isatty bcopy bzero isascii memcpy memset strchr strtoul popen \ ! fchmod setlocale mbrtowc wcrtomb) AC_ARG_ENABLE(html, ! [ --enable-html build HTML documentation], , enable_html=no) AM_CONDITIONAL(BUILD_HTML, test "x$enable_html" != xno) --- 53,84 ---- AC_FUNC_VPRINTF AM_FUNC_GETLINE AC_FUNC_OBSTACK ! gl_FUNC_STRVERSCMP ! AC_REPLACE_FUNCS(memchr memcmp memmove strerror mkstemp) AC_CHECK_FUNCS(isatty bcopy bzero isascii memcpy memset strchr strtoul popen \ ! isblank fchmod setlocale mbrtowc wcrtomb wcscoll) ! ! AC_ARG_WITH(included-regex, ! [ --with-included-regex use included regex matcher (default=yes)], , ! with_included_regex=yes) ! ! if test "x$with_included_regex" = xno; then ! AC_CHECK_HEADERS(regex.h) ! AC_CHECK_LIB(regex, re_search) ! AC_CHECK_FUNC(re_search) ! if test $ac_cv_header_regex_h = no || test $ac_cv_func_re_search = no; then ! AC_MSG_WARN([GNU regex not found, falling back to the included version]) ! with_included_regex=yes ! fi ! fi ! ! if test "x$with_included_regex" != xno; then ! AC_CONFIG_LINKS(lib/regex.h:lib/regex_.h) ! AC_LIBOBJ(regex) ! fi AC_ARG_ENABLE(html, ! [ --enable-html build HTML manual (default=no)], , enable_html=no) AM_CONDITIONAL(BUILD_HTML, test "x$enable_html" != xno) diff -rNC3 sed-4.0.5/doc/Makefile.am sed-4.0.6/doc/Makefile.am *** sed-4.0.5/doc/Makefile.am Fri Dec 6 17:44:30 2002 --- sed-4.0.6/doc/Makefile.am Sun Mar 16 21:06:57 2003 *************** *** 16,22 **** sed.texi: sed-in.texi groupify.sed sed -nf groupify.sed < $(srcdir)/sed-in.texi > $(srcdir)/sed.texi ! sed.1: $(top_srcdir)/sed/sed.c sed.x $(HELP2MAN) -p sed --include sed.x $(SED) > $(srcdir)/sed.1 dist-hook: --- 16,22 ---- sed.texi: sed-in.texi groupify.sed sed -nf groupify.sed < $(srcdir)/sed-in.texi > $(srcdir)/sed.texi ! sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac sed.x $(HELP2MAN) -p sed --include sed.x $(SED) > $(srcdir)/sed.1 dist-hook: diff -rNC3 sed-4.0.5/doc/Makefile.in sed-4.0.6/doc/Makefile.in *** sed-4.0.5/doc/Makefile.in Sat Dec 14 11:44:57 2002 --- sed-4.0.6/doc/Makefile.in Tue Mar 18 17:56:54 2003 *************** *** 97,102 **** --- 97,103 ---- POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ + SED_FEATURE_VERSION = @SED_FEATURE_VERSION@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ *************** *** 468,474 **** sed.texi: sed-in.texi groupify.sed sed -nf groupify.sed < $(srcdir)/sed-in.texi > $(srcdir)/sed.texi ! sed.1: $(top_srcdir)/sed/sed.c sed.x $(HELP2MAN) -p sed --include sed.x $(SED) > $(srcdir)/sed.1 dist-hook: --- 469,475 ---- sed.texi: sed-in.texi groupify.sed sed -nf groupify.sed < $(srcdir)/sed-in.texi > $(srcdir)/sed.texi ! sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac sed.x $(HELP2MAN) -p sed --include sed.x $(SED) > $(srcdir)/sed.1 dist-hook: diff -rNC3 sed-4.0.5/doc/sed-in.texi sed-4.0.6/doc/sed-in.texi *** sed-4.0.5/doc/sed-in.texi Mon Dec 16 20:29:30 2002 --- sed-4.0.6/doc/sed-in.texi Sat Mar 15 08:23:52 2003 *************** *** 446,461 **** and the empty string before a new-line. There are special character sequences @ifset PERL ! (@code{\A} and @code{\Z} in Perl mode, ! @code{\`} and @code{\'} @end ifset @ifclear PERL ! (@code{\`} and @code{\'} @end ifclear ! in basic or extended regular expression modes) ! which always match ! the beginning or the end of the buffer. @code{M} stands for ! @cite{multi-line}. @ifset PERL @item /@var{regexp}/S --- 446,459 ---- and the empty string before a new-line. There are special character sequences @ifset PERL ! (@code{\A} and @code{\Z} in Perl mode, @code{\`} and @code{\'} ! in basic or extended regular expression modes) @end ifset @ifclear PERL ! (@code{\`} and @code{\'}) @end ifclear ! which always match the beginning or the end of the buffer. ! @code{M} stands for @cite{multi-line}. @ifset PERL @item /@var{regexp}/S *************** *** 807,813 **** double-print lines when auto-print is not disabled and the @code{p} command is given. Other implementations will only print the line once. ! @c CHECK CURRENT STANDARD. I THINK NOT DOUBLE-PRINTING IS HOW IT WORKS. ADR. Both ways conform with the @sc{posix} standard, and so neither way can be considered to be in error. --- 805,811 ---- double-print lines when auto-print is not disabled and the @code{p} command is given. Other implementations will only print the line once. ! @c *** CHECK CURRENT STANDARD. I THINK NOT DOUBLE-PRINTING IS HOW IT WORKS. ADR. Both ways conform with the @sc{posix} standard, and so neither way can be considered to be in error. *************** *** 985,997 **** sequences @ifset PERL (@code{\A} and @code{\Z} in Perl mode, @code{\`} and @code{\'} @end ifset @ifclear PERL ! (@code{\`} and @code{\'} @end ifclear ! in basic or extended regular expression modes) which always match ! the beginning or the end of the buffer. @code{M} stands for ! @cite{multi-line}. @ifset PERL @item S --- 983,995 ---- sequences @ifset PERL (@code{\A} and @code{\Z} in Perl mode, @code{\`} and @code{\'} + in basic or extended regular expression modes) @end ifset @ifclear PERL ! (@code{\`} and @code{\'}) @end ifclear ! which always match the beginning or the end of the buffer. ! @code{M} stands for @cite{multi-line}. @ifset PERL @item S *************** *** 1357,1369 **** conditional branch was taken. The @var{label} may be omitted, in which case the next cycle is started. ! @item v @findex v (version) command @cindex @value{SSEDEXT}, checking for their presence @cindex Requiring @value{SSED} This command does nothing, but makes @command{sed} fail if @value{SSED} extensions are not supported, simply because other ! versions of @command{sed} do not implement it. @item W @var{filename} @findex W (write first line) command --- 1355,1373 ---- conditional branch was taken. The @var{label} may be omitted, in which case the next cycle is started. ! @item v @var{version} @findex v (version) command @cindex @value{SSEDEXT}, checking for their presence @cindex Requiring @value{SSED} This command does nothing, but makes @command{sed} fail if @value{SSED} extensions are not supported, simply because other ! versions of @command{sed} do not implement it. In addition, you ! can specify the version of @command{sed} that your script ! requires, such as @code{4.0.5}. The default is @code{4.0} ! because that is the first version that implemented this command. ! ! This commands also enables @value{SSEDEXT} unconditionally, even ! if @env{POSIXLY_CORRECT} is set in the environment. @item W @var{filename} @findex W (write first line) command *************** *** 1447,1453 **** @samp{\b} (backspace) was omitted because of the conflict with the existing ``word boundary'' meaning. - @c \b AND \B ARE NOT INTRODUCED, NOR ARE \` and \'. ADR Other escapes match particular character class and are only valid in regular expressions: --- 1451,1456 ---- *************** *** 1465,1470 **** --- 1468,1492 ---- @item \W Matches any ``non-word'' character. + + @item \b + Matches a word boundary; that is it matches if the character + to the left is a ``word'' character and the character to the + right is a ``non-word'' character, or vice-versa. + + @item \B + Matches everywhere but on a word boundary; that is it matches + if the character to the left and the character to the right + are either both ``word'' characters or both ``non-word'' + characters. + + @item \` + Matches only at the start of pattern space. This is different + from @code{^} in multi-line mode. + + @item \' + Matches only at the end of pattern space. This is different + from @code{$} in multi-line mode. @end table @node Examples *************** *** 2501,2507 **** Some versions of @command{sed} ignore the @code{p} (print) option of an @code{s} command unless the @option{-n} command-line option has been specified. Other versions always honor the @code{p} option. ! @c CHECK THE CURRENT STANDARD. ADR. Both approaches are allowed by @sc{posix} and @acronym{GNU} @command{sed} @ifset PERL --- 2523,2529 ---- Some versions of @command{sed} ignore the @code{p} (print) option of an @code{s} command unless the @option{-n} command-line option has been specified. Other versions always honor the @code{p} option. ! @c *** CHECK THE CURRENT STANDARD. ADR. Both approaches are allowed by @sc{posix} and @acronym{GNU} @command{sed} @ifset PERL diff -rNC3 sed-4.0.5/doc/sed.1 sed-4.0.6/doc/sed.1 *** sed-4.0.5/doc/sed.1 Mon Dec 16 20:32:43 2002 --- sed-4.0.6/doc/sed.1 Tue Mar 18 17:57:12 2003 *************** *** 1,7 **** .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28. ! .TH SED "1" "November 2002" "sed version 4.0.3" "User Commands" .SH NAME ! sed \- manual page for sed version 4.0.3 .SH SYNOPSIS .B sed [\fIOPTION\fR]... \fI{script-only-if-no-other-script} \fR[\fIinput-file\fR]... --- 1,7 ---- .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28. ! .TH SED "1" "March 2003" "sed version 4.0.6" "User Commands" .SH NAME ! sed \- manual page for sed version 4.0.6 .SH SYNOPSIS .B sed [\fIOPTION\fR]... \fI{script-only-if-no-other-script} \fR[\fIinput-file\fR]... *************** *** 340,346 **** Also, please include the output of ``sed --version'' in the body of your report if at all possible. .SH COPYRIGHT ! Copyright \(co 2002 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, --- 340,346 ---- Also, please include the output of ``sed --version'' in the body of your report if at all possible. .SH COPYRIGHT ! Copyright \(co 2003 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, diff -rNC3 sed-4.0.5/doc/sed.info sed-4.0.6/doc/sed.info *** sed-4.0.5/doc/sed.info Mon Dec 16 20:30:13 2002 --- sed-4.0.6/doc/sed.info Sat Mar 15 08:24:29 2003 *************** *** 9,15 ****  Indirect: sed.info-1: 204 ! sed.info-2: 48875  Tag Table: (Indirect) --- 9,15 ----  Indirect: sed.info-1: 204 ! sed.info-2: 49712  Tag Table: (Indirect) *************** *** 20,63 **** Ref: Invoking sed-Footnote-28332 Node: sed Programs8439 Node: Addresses9595 ! Node: Regular Expressions14238 ! Node: Data Spaces19530 ! Node: Common Commands20061 ! Node: The "s" Command22597 ! Ref: The "s" Command-Footnote-126987 ! Node: Other Commands27059 ! Ref: Other Commands-Footnote-132164 ! Node: Programming Commands32236 ! Node: Extended Commands33144 ! Node: Escapes36909 ! Ref: Escapes-Footnote-139411 ! Node: Examples39575 ! Node: Centering lines40670 ! Node: Increment a number41584 ! Ref: Increment a number-Footnote-143164 ! Node: Rename files to lower case43284 ! Node: Print bash environment46072 ! Node: Reverse chars of lines46852 ! Ref: Reverse chars of lines-Footnote-147871 ! Node: tac48093 ! Node: cat -n48875 ! Node: cat -b50733 ! Node: wc -c51485 ! Ref: wc -c-Footnote-153427 ! Node: wc -w53496 ! Node: wc -l54968 ! Node: head55205 ! Node: tail55529 ! Node: uniq56968 ! Node: uniq -d57764 ! Node: uniq -u58488 ! Node: cat -s59212 ! Node: Limitations61125 ! Node: Other Resources61965 ! Node: Reporting Bugs62891 ! Ref: Reporting Bugs-Footnote-167643 ! Node: Extended regexps67714 ! Node: Concept Index68881 ! Node: Command and Option Index78924  End Tag Table --- 20,63 ---- Ref: Invoking sed-Footnote-28332 Node: sed Programs8439 Node: Addresses9595 ! Node: Regular Expressions14187 ! Node: Data Spaces19479 ! Node: Common Commands20010 ! Node: The "s" Command22546 ! Ref: The "s" Command-Footnote-126885 ! Node: Other Commands26957 ! Ref: Other Commands-Footnote-132062 ! Node: Programming Commands32134 ! Node: Extended Commands33042 ! Node: Escapes37135 ! Ref: Escapes-Footnote-140248 ! Node: Examples40412 ! Node: Centering lines41507 ! Node: Increment a number42421 ! Ref: Increment a number-Footnote-144001 ! Node: Rename files to lower case44121 ! Node: Print bash environment46909 ! Node: Reverse chars of lines47689 ! Ref: Reverse chars of lines-Footnote-148708 ! Node: tac48930 ! Node: cat -n49712 ! Node: cat -b51570 ! Node: wc -c52322 ! Ref: wc -c-Footnote-154264 ! Node: wc -w54333 ! Node: wc -l55805 ! Node: head56042 ! Node: tail56366 ! Node: uniq57805 ! Node: uniq -d58601 ! Node: uniq -u59325 ! Node: cat -s60049 ! Node: Limitations61962 ! Node: Other Resources62802 ! Node: Reporting Bugs63728 ! Ref: Reporting Bugs-Footnote-168480 ! Node: Extended regexps68551 ! Node: Concept Index69718 ! Node: Command and Option Index79761  End Tag Table diff -rNC3 sed-4.0.5/doc/sed.info-1 sed-4.0.6/doc/sed.info-1 *** sed-4.0.5/doc/sed.info-1 Mon Dec 16 20:30:13 2002 --- sed-4.0.6/doc/sed.info-1 Sat Mar 15 08:24:29 2003 *************** *** 6,12 **** END-INFO-DIR-ENTRY ! This file documents version 4.0.5 of GNU `sed', a stream editor. Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. --- 6,12 ---- END-INFO-DIR-ENTRY ! This file documents version 4.0.6 of GNU `sed', a stream editor. Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. *************** *** 26,32 **** ! This file documents version 4.0.5 of GNU `sed', a stream editor. Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. --- 26,32 ---- ! This file documents version 4.0.6 of GNU `sed', a stream editor. Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. *************** *** 300,308 **** extension which causes `^' and `$' to match respectively (in addition to the normal behavior) the empty string after a new-line, and the empty string before a new-line. There are special ! character sequences (`\`' and `\'' in basic or extended regular ! expression modes) which always match the beginning or the end of ! the buffer. `M' stands for `multi-line'. If no addresses are given, then all lines are matched; if one address is given, then only lines matching that address are matched. --- 300,307 ---- extension which causes `^' and `$' to match respectively (in addition to the normal behavior) the empty string after a new-line, and the empty string before a new-line. There are special ! character sequences (`\`' and `\'') which always match the ! beginning or the end of the buffer. `M' stands for `multi-line'. If no addresses are given, then all lines are matched; if one address is given, then only lines matching that address are matched. *************** *** 677,685 **** extension which causes `^' and `$' to match respectively (in addition to the normal behavior) the empty string after a new-line, and the empty string before a new-line. There are special ! character sequences (`\`' and `\'' in basic or extended regular ! expression modes) which always match the beginning or the end of ! the buffer. `M' stands for `multi-line'. ---------- Footnotes ---------- --- 676,683 ---- extension which causes `^' and `$' to match respectively (in addition to the normal behavior) the empty string after a new-line, and the empty string before a new-line. There are special ! character sequences (`\`' and `\'') which always match the ! beginning or the end of the buffer. `M' stands for `multi-line'. ---------- Footnotes ---------- *************** *** 928,937 **** branch was taken. The LABEL may be omitted, in which case the next cycle is started. ! `v' This command does nothing, but makes `sed' fail if GNU `sed' extensions are not supported, simply because other versions of ! `sed' do not implement it. `W FILENAME' Write to the given filename the portion of the pattern space up to --- 926,941 ---- branch was taken. The LABEL may be omitted, in which case the next cycle is started. ! `v VERSION' This command does nothing, but makes `sed' fail if GNU `sed' extensions are not supported, simply because other versions of ! `sed' do not implement it. In addition, you can specify the ! version of `sed' that your script requires, such as `4.0.5'. The ! default is `4.0' because that is the first version that ! implemented this command. ! ! This commands also enables GNU extensions unconditionally, even if ! `POSIXLY_CORRECT' is set in the environment. `W FILENAME' Write to the given filename the portion of the pattern space up to *************** *** 1014,1019 **** --- 1018,1041 ---- `\W' Matches any "non-word" character. + + `\b' + Matches a word boundary; that is it matches if the character to + the left is a "word" character and the character to the right is a + "non-word" character, or vice-versa. + + `\B' + Matches everywhere but on a word boundary; that is it matches if + the character to the left and the character to the right are + either both "word" characters or both "non-word" characters. + + `\`' + Matches only at the start of pattern space. This is different + from `^' in multi-line mode. + + `\'' + Matches only at the end of pattern space. This is different from + `$' in multi-line mode. ---------- Footnotes ---------- diff -rNC3 sed-4.0.5/doc/sed.texi sed-4.0.6/doc/sed.texi *** sed-4.0.5/doc/sed.texi Mon Dec 16 20:30:12 2002 --- sed-4.0.6/doc/sed.texi Sat Mar 15 08:24:29 2003 *************** *** 447,462 **** and the empty string before a new-line. There are special character sequences @ifset PERL ! (@code{\A} and @code{\Z} in Perl mode, ! @code{\`} and @code{\'} @end ifset @ifclear PERL ! (@code{\`} and @code{\'} @end ifclear ! in basic or extended regular expression modes) ! which always match ! the beginning or the end of the buffer. @code{M} stands for ! @cite{multi-line}. @ifset PERL @item /@var{regexp}/S --- 447,460 ---- and the empty string before a new-line. There are special character sequences @ifset PERL ! (@code{\A} and @code{\Z} in Perl mode, @code{\`} and @code{\'} ! in basic or extended regular expression modes) @end ifset @ifclear PERL ! (@code{\`} and @code{\'}) @end ifclear ! which always match the beginning or the end of the buffer. ! @code{M} stands for @cite{multi-line}. @ifset PERL @item /@var{regexp}/S *************** *** 808,814 **** double-print lines when auto-print is not disabled and the @code{p} command is given. Other implementations will only print the line once. ! @c CHECK CURRENT STANDARD. I THINK NOT DOUBLE-PRINTING IS HOW IT WORKS. ADR. Both ways conform with the @sc{posix} standard, and so neither way can be considered to be in error. --- 806,812 ---- double-print lines when auto-print is not disabled and the @code{p} command is given. Other implementations will only print the line once. ! @c *** CHECK CURRENT STANDARD. I THINK NOT DOUBLE-PRINTING IS HOW IT WORKS. ADR. Both ways conform with the @sc{posix} standard, and so neither way can be considered to be in error. *************** *** 986,998 **** sequences @ifset PERL (@code{\A} and @code{\Z} in Perl mode, @code{\`} and @code{\'} @end ifset @ifclear PERL ! (@code{\`} and @code{\'} @end ifclear ! in basic or extended regular expression modes) which always match ! the beginning or the end of the buffer. @code{M} stands for ! @cite{multi-line}. @ifset PERL @item S --- 984,996 ---- sequences @ifset PERL (@code{\A} and @code{\Z} in Perl mode, @code{\`} and @code{\'} + in basic or extended regular expression modes) @end ifset @ifclear PERL ! (@code{\`} and @code{\'}) @end ifclear ! which always match the beginning or the end of the buffer. ! @code{M} stands for @cite{multi-line}. @ifset PERL @item S *************** *** 1358,1370 **** conditional branch was taken. The @var{label} may be omitted, in which case the next cycle is started. ! @item v @findex v (version) command @cindex @value{SSEDEXT}, checking for their presence @cindex Requiring @value{SSED} This command does nothing, but makes @command{sed} fail if @value{SSED} extensions are not supported, simply because other ! versions of @command{sed} do not implement it. @item W @var{filename} @findex W (write first line) command --- 1356,1374 ---- conditional branch was taken. The @var{label} may be omitted, in which case the next cycle is started. ! @item v @var{version} @findex v (version) command @cindex @value{SSEDEXT}, checking for their presence @cindex Requiring @value{SSED} This command does nothing, but makes @command{sed} fail if @value{SSED} extensions are not supported, simply because other ! versions of @command{sed} do not implement it. In addition, you ! can specify the version of @command{sed} that your script ! requires, such as @code{4.0.5}. The default is @code{4.0} ! because that is the first version that implemented this command. ! ! This commands also enables @value{SSEDEXT} unconditionally, even ! if @env{POSIXLY_CORRECT} is set in the environment. @item W @var{filename} @findex W (write first line) command *************** *** 1448,1454 **** @samp{\b} (backspace) was omitted because of the conflict with the existing ``word boundary'' meaning. - @c \b AND \B ARE NOT INTRODUCED, NOR ARE \` and \'. ADR Other escapes match particular character class and are only valid in regular expressions: --- 1452,1457 ---- *************** *** 1466,1471 **** --- 1469,1493 ---- @item \W Matches any ``non-word'' character. + + @item \b + Matches a word boundary; that is it matches if the character + to the left is a ``word'' character and the character to the + right is a ``non-word'' character, or vice-versa. + + @item \B + Matches everywhere but on a word boundary; that is it matches + if the character to the left and the character to the right + are either both ``word'' characters or both ``non-word'' + characters. + + @item \` + Matches only at the start of pattern space. This is different + from @code{^} in multi-line mode. + + @item \' + Matches only at the end of pattern space. This is different + from @code{$} in multi-line mode. @end table @node Examples *************** *** 2668,2674 **** Some versions of @command{sed} ignore the @code{p} (print) option of an @code{s} command unless the @option{-n} command-line option has been specified. Other versions always honor the @code{p} option. ! @c CHECK THE CURRENT STANDARD. ADR. Both approaches are allowed by @sc{posix} and @acronym{GNU} @command{sed} @ifset PERL --- 2690,2696 ---- Some versions of @command{sed} ignore the @code{p} (print) option of an @code{s} command unless the @option{-n} command-line option has been specified. Other versions always honor the @code{p} option. ! @c *** CHECK THE CURRENT STANDARD. ADR. Both approaches are allowed by @sc{posix} and @acronym{GNU} @command{sed} @ifset PERL diff -rNC3 sed-4.0.5/doc/stamp-vti sed-4.0.6/doc/stamp-vti *** sed-4.0.5/doc/stamp-vti Mon Dec 16 20:30:12 2002 --- sed-4.0.6/doc/stamp-vti Tue Mar 18 17:56:55 2003 *************** *** 1,4 **** ! @set UPDATED 16 December 2002 ! @set UPDATED-MONTH December 2002 ! @set EDITION 4.0.5 ! @set VERSION 4.0.5 --- 1,4 ---- ! @set UPDATED 15 March 2003 ! @set UPDATED-MONTH March 2003 ! @set EDITION 4.0.6 ! @set VERSION 4.0.6 diff -rNC3 sed-4.0.5/doc/version.texi sed-4.0.6/doc/version.texi *** sed-4.0.5/doc/version.texi Mon Dec 16 20:18:28 2002 --- sed-4.0.6/doc/version.texi Sat Mar 15 08:24:29 2003 *************** *** 1,4 **** ! @set UPDATED 16 December 2002 ! @set UPDATED-MONTH December 2002 ! @set EDITION 4.0.5 ! @set VERSION 4.0.5 --- 1,4 ---- ! @set UPDATED 15 March 2003 ! @set UPDATED-MONTH March 2003 ! @set EDITION 4.0.6 ! @set VERSION 4.0.6 diff -rNC3 sed-4.0.5/lib/Makefile.am sed-4.0.6/lib/Makefile.am *** sed-4.0.5/lib/Makefile.am Mon Oct 28 08:34:26 2002 --- sed-4.0.6/lib/Makefile.am Fri Mar 14 14:44:20 2003 *************** *** 1,8 **** ## Process this file with automake to produce Makefile.in noinst_LIBRARIES = libsed.a ! noinst_HEADERS = getopt.h utils.h obstack.h regex.h regex_internal.h ! libsed_a_SOURCES = getopt1.c getopt.c utils.c regex.c EXTRA_DIST = memmove.c strerror.c regcomp.c regexec.c regex_internal.c --- 1,9 ---- ## Process this file with automake to produce Makefile.in noinst_LIBRARIES = libsed.a ! noinst_HEADERS = getopt.h utils.h obstack.h regex_.h regex_internal.h \ ! strverscmp.h ! libsed_a_SOURCES = getopt1.c getopt.c utils.c EXTRA_DIST = memmove.c strerror.c regcomp.c regexec.c regex_internal.c *************** *** 10,12 **** --- 11,15 ---- libsed_a_LIBADD = @LIBOBJS@ @ALLOCA@ libsed_a_DEPENDENCIES = $(libsed_a_LIBADD) + + DISTCLEANFILES = regex.h diff -rNC3 sed-4.0.5/lib/Makefile.in sed-4.0.6/lib/Makefile.in *** sed-4.0.5/lib/Makefile.in Sat Dec 14 11:44:09 2002 --- sed-4.0.6/lib/Makefile.in Tue Mar 18 17:56:06 2003 *************** *** 97,102 **** --- 97,103 ---- POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ + SED_FEATURE_VERSION = @SED_FEATURE_VERSION@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ *************** *** 142,150 **** sysconfdir = @sysconfdir@ target_alias = @target_alias@ noinst_LIBRARIES = libsed.a ! noinst_HEADERS = getopt.h utils.h obstack.h regex.h regex_internal.h ! libsed_a_SOURCES = getopt1.c getopt.c utils.c regex.c EXTRA_DIST = memmove.c strerror.c regcomp.c regexec.c regex_internal.c --- 143,153 ---- sysconfdir = @sysconfdir@ target_alias = @target_alias@ noinst_LIBRARIES = libsed.a ! noinst_HEADERS = getopt.h utils.h obstack.h regex_.h regex_internal.h \ ! strverscmp.h ! ! libsed_a_SOURCES = getopt1.c getopt.c utils.c EXTRA_DIST = memmove.c strerror.c regcomp.c regexec.c regex_internal.c *************** *** 152,157 **** --- 155,162 ---- libsed_a_LIBADD = @LIBOBJS@ @ALLOCA@ libsed_a_DEPENDENCIES = $(libsed_a_LIBADD) + + DISTCLEANFILES = regex.h subdir = lib mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h *************** *** 159,166 **** LIBRARIES = $(noinst_LIBRARIES) libsed_a_AR = $(AR) cru ! am_libsed_a_OBJECTS = getopt1.$(OBJEXT) getopt.$(OBJEXT) utils.$(OBJEXT) \ ! regex.$(OBJEXT) libsed_a_OBJECTS = $(am_libsed_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --- 164,170 ---- LIBRARIES = $(noinst_LIBRARIES) libsed_a_AR = $(AR) cru ! am_libsed_a_OBJECTS = getopt1.$(OBJEXT) getopt.$(OBJEXT) utils.$(OBJEXT) libsed_a_OBJECTS = $(am_libsed_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) *************** *** 169,177 **** @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/alloca.Po $(DEPDIR)/getline.Po \ @AMDEP_TRUE@ $(DEPDIR)/memchr.Po $(DEPDIR)/memcmp.Po \ @AMDEP_TRUE@ $(DEPDIR)/memmove.Po $(DEPDIR)/mkstemp.Po \ ! @AMDEP_TRUE@ $(DEPDIR)/obstack.Po $(DEPDIR)/snprintf.Po \ ! @AMDEP_TRUE@ $(DEPDIR)/strerror.Po ./$(DEPDIR)/getopt.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/regex.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/utils.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --- 173,181 ---- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/alloca.Po $(DEPDIR)/getline.Po \ @AMDEP_TRUE@ $(DEPDIR)/memchr.Po $(DEPDIR)/memcmp.Po \ @AMDEP_TRUE@ $(DEPDIR)/memmove.Po $(DEPDIR)/mkstemp.Po \ ! @AMDEP_TRUE@ $(DEPDIR)/obstack.Po $(DEPDIR)/regex.Po \ ! @AMDEP_TRUE@ $(DEPDIR)/strerror.Po $(DEPDIR)/strverscmp.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/utils.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) *************** *** 182,188 **** DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in alloca.c \ getline.c memchr.c memcmp.c memmove.c mkstemp.c obstack.c \ ! obstack.h snprintf.c strerror.c SOURCES = $(libsed_a_SOURCES) all: all-am --- 186,192 ---- DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in alloca.c \ getline.c memchr.c memcmp.c memmove.c mkstemp.c obstack.c \ ! obstack.h regex.c strerror.c strverscmp.c SOURCES = $(libsed_a_SOURCES) all: all-am *************** *** 217,227 **** @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkstemp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/obstack.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/snprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ distclean-depend: --- 221,231 ---- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkstemp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/obstack.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strverscmp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ distclean-depend: *************** *** 359,364 **** --- 363,369 ---- distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff -rNC3 sed-4.0.5/lib/getline.c sed-4.0.6/lib/getline.c *** sed-4.0.5/lib/getline.c Sat Dec 14 09:17:53 2002 --- sed-4.0.6/lib/getline.c Tue Dec 24 10:49:18 2002 *************** *** 91,97 **** /* Return a partial line since we got an error in the middle. */ win: ! #if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) if (p - 2 >= *lineptr && p[-2] == '\r') p[-2] = p[-1], --p; #endif --- 91,97 ---- /* Return a partial line since we got an error in the middle. */ win: ! #if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) || defined(__EMX__) if (p - 2 >= *lineptr && p[-2] == '\r') p[-2] = p[-1], --p; #endif diff -rNC3 sed-4.0.5/lib/mkstemp.c sed-4.0.6/lib/mkstemp.c *** sed-4.0.5/lib/mkstemp.c Mon Dec 16 19:50:28 2002 --- sed-4.0.6/lib/mkstemp.c Sat Mar 15 07:38:42 2003 *************** *** 12,21 **** --- 12,32 ---- # include #endif /* HAVE_STDLIB_H */ + #ifdef HAVE_SYS_FILE_H + # include + #endif /* HAVE_SYS_FILE_H */ + + #ifdef HAVE_IO_H + # include + #endif /* HAVE_IO_H */ + #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ + + #ifdef HAVE_FCNTL_H #include + #endif /* HAVE_FCNTL_H */ #include #include diff -rNC3 sed-4.0.5/lib/obstack.h sed-4.0.6/lib/obstack.h *** sed-4.0.5/lib/obstack.h Thu Dec 27 11:49:26 2001 --- sed-4.0.6/lib/obstack.h Thu Mar 13 20:04:22 2003 *************** *** 106,115 **** #ifndef _OBSTACK_H #define _OBSTACK_H 1 ! ! #ifdef HAVE_CONFIG_H ! #include "config.h" ! #endif #ifdef __cplusplus extern "C" { --- 106,115 ---- #ifndef _OBSTACK_H #define _OBSTACK_H 1 ! ! #ifdef HAVE_CONFIG_H ! #include "config.h" ! #endif #ifdef __cplusplus extern "C" { *************** *** 145,155 **** #endif #if defined _LIBC || defined HAVE_STRING_H || defined HAVE_STRINGS_H ! # ifdef HAVE_STRINGS_H ! # include # else ! # include ! # endif # define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N)) #else # ifdef memcpy --- 145,155 ---- #endif #if defined _LIBC || defined HAVE_STRING_H || defined HAVE_STRINGS_H ! # ifdef HAVE_STRINGS_H ! # include # else ! # include ! # endif # define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N)) #else # ifdef memcpy diff -rNC3 sed-4.0.5/lib/regcomp.c sed-4.0.6/lib/regcomp.c *** sed-4.0.5/lib/regcomp.c Fri Nov 22 12:04:08 2002 --- sed-4.0.6/lib/regcomp.c Mon Feb 17 10:19:33 2003 *************** *** 18,73 **** Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ - #include - #include - #include - #include - #include - #include - #include - - #if defined HAVE_WCHAR_H || defined _LIBC - # include - #endif /* HAVE_WCHAR_H || _LIBC */ - #if defined HAVE_WCTYPE_H || defined _LIBC - # include - #endif /* HAVE_WCTYPE_H || _LIBC */ - - /* In case that the system doesn't have isblank(). */ - #if !defined _LIBC && !defined HAVE_ISBLANK && !defined isblank - # define isblank(ch) ((ch) == ' ' || (ch) == '\t') - #endif - - #ifdef _LIBC - # ifndef _RE_DEFINE_LOCALE_FUNCTIONS - # define _RE_DEFINE_LOCALE_FUNCTIONS 1 - # include - # include - # include - # endif - #endif - - /* This is for other GNU distributions with internationalized messages. */ - #if HAVE_LIBINTL_H || defined _LIBC - # include - # ifdef _LIBC - # undef gettext - # define gettext(msgid) \ - INTUSE(__dcgettext) (INTUSE(_libc_intl_domainname), msgid, LC_MESSAGES) - # endif - #else - # define gettext(msgid) (msgid) - #endif - - #ifndef gettext_noop - /* This define is so xgettext can find the internationalizable - strings. */ - # define gettext_noop(String) String - #endif - - #include - #include "regex_internal.h" - static void re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, char *fastmap); --- 18,23 ---- *************** *** 1951,1957 **** mbc_remain = create_tree (NULL, NULL, 0, new_idx); tree = create_tree (tree, mbc_remain, CONCAT, 0); if (BE (new_idx == -1 || mbc_remain == NULL || tree == NULL, 0)) ! return *err = REG_ESPACE, NULL; } } #endif --- 1901,1910 ---- mbc_remain = create_tree (NULL, NULL, 0, new_idx); tree = create_tree (tree, mbc_remain, CONCAT, 0); if (BE (new_idx == -1 || mbc_remain == NULL || tree == NULL, 0)) ! { ! *err = REG_ESPACE; ! return NULL; ! } } } #endif *************** *** 2052,2058 **** new_idx = re_dfa_add_node (dfa, *token, 0); tree = create_tree (NULL, NULL, 0, new_idx); if (BE (new_idx == -1 || tree == NULL, 0)) ! return *err = REG_ESPACE, NULL; } /* We must return here, since ANCHORs can't be followed by repetition operators. --- 2005,2014 ---- new_idx = re_dfa_add_node (dfa, *token, 0); tree = create_tree (NULL, NULL, 0, new_idx); if (BE (new_idx == -1 || tree == NULL, 0)) ! { ! *err = REG_ESPACE; ! return NULL; ! } } /* We must return here, since ANCHORs can't be followed by repetition operators. diff -rNC3 sed-4.0.5/lib/regex.c sed-4.0.6/lib/regex.c *** sed-4.0.5/lib/regex.c Sat Dec 14 09:30:02 2002 --- sed-4.0.6/lib/regex.c Mon Feb 17 10:27:50 2003 *************** *** 41,64 **** # define re_compile_fastmap(bufp) __re_compile_fastmap (bufp) #endif ! #ifdef HAVE_CONFIG_H ! #include "config.h" ! #endif ! ! #if (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_WCRTOMB && HAVE_MBRTOWC) || _LIBC ! #define RE_ENABLE_I18N ! #endif ! ! #if _LIBC || __GNUC__ >= 3 ! # define BE(expr, val) __builtin_expect (expr, val) ! #else ! # define BE(expr, val) (expr) ! # define inline ! #endif #include "regcomp.c" #include "regexec.c" - #include "regex_internal.c" /* Binary backward compatibility. */ #if _LIBC --- 41,55 ---- # define re_compile_fastmap(bufp) __re_compile_fastmap (bufp) #endif ! /* POSIX says that must be included (by the caller) before ! . */ ! #include ! #include ! #include "regex_internal.h" + #include "regex_internal.c" #include "regcomp.c" #include "regexec.c" /* Binary backward compatibility. */ #if _LIBC diff -rNC3 sed-4.0.5/lib/regex.h sed-4.0.6/lib/regex.h *** sed-4.0.5/lib/regex.h Fri Nov 22 12:01:59 2002 --- sed-4.0.6/lib/regex.h Thu Jan 1 01:00:00 1970 *************** *** 1,583 **** - /* Definitions for data structures and routines for the regular - expression library. - Copyright (C) 1985,1989-93,1995-98,2000,2001,2002 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - - #ifndef _REGEX_H - #define _REGEX_H 1 - - /* Allow the use in C++ code. */ - #ifdef __cplusplus - extern "C" { - #endif - - /* POSIX says that must be included (by the caller) before - . */ - - #if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS - /* VMS doesn't have `size_t' in , even though POSIX says it - should be there. */ - # include - #endif - - /* The following two types have to be signed and unsigned integer type - wide enough to hold a value of a pointer. For most ANSI compilers - ptrdiff_t and size_t should be likely OK. Still size of these two - types is 2 for Microsoft C. Ugh... */ - typedef long int s_reg_t; - typedef unsigned long int active_reg_t; - - /* The following bits are used to determine the regexp syntax we - recognize. The set/not-set meanings are chosen so that Emacs syntax - remains the value 0. The bits are given in alphabetical order, and - the definitions shifted by one from the previous bit; thus, when we - add or remove a bit, only one other definition need change. */ - typedef unsigned long int reg_syntax_t; - - /* If this bit is not set, then \ inside a bracket expression is literal. - If set, then such a \ quotes the following character. */ - #define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1) - - /* If this bit is not set, then + and ? are operators, and \+ and \? are - literals. - If set, then \+ and \? are operators and + and ? are literals. */ - #define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) - - /* If this bit is set, then character classes are supported. They are: - [:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:], - [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:]. - If not set, then character classes are not supported. */ - #define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1) - - /* If this bit is set, then ^ and $ are always anchors (outside bracket - expressions, of course). - If this bit is not set, then it depends: - ^ is an anchor if it is at the beginning of a regular - expression or after an open-group or an alternation operator; - $ is an anchor if it is at the end of a regular expression, or - before a close-group or an alternation operator. - - This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because - POSIX draft 11.2 says that * etc. in leading positions is undefined. - We already implemented a previous draft which made those constructs - invalid, though, so we haven't changed the code back. */ - #define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1) - - /* If this bit is set, then special characters are always special - regardless of where they are in the pattern. - If this bit is not set, then special characters are special only in - some contexts; otherwise they are ordinary. Specifically, - * + ? and intervals are only special when not after the beginning, - open-group, or alternation operator. */ - #define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) - - /* If this bit is set, then *, +, ?, and { cannot be first in an re or - immediately after an alternation or begin-group operator. */ - #define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1) - - /* If this bit is set, then . matches newline. - If not set, then it doesn't. */ - #define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1) - - /* If this bit is set, then . doesn't match NUL. - If not set, then it does. */ - #define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1) - - /* If this bit is set, nonmatching lists [^...] do not match newline. - If not set, they do. */ - #define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) - - /* If this bit is set, either \{...\} or {...} defines an - interval, depending on RE_NO_BK_BRACES. - If not set, \{, \}, {, and } are literals. */ - #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) - - /* If this bit is set, +, ? and | aren't recognized as operators. - If not set, they are. */ - #define RE_LIMITED_OPS (RE_INTERVALS << 1) - - /* If this bit is set, newline is an alternation operator. - If not set, newline is literal. */ - #define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1) - - /* If this bit is set, then `{...}' defines an interval, and \{ and \} - are literals. - If not set, then `\{...\}' defines an interval. */ - #define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1) - - /* If this bit is set, (...) defines a group, and \( and \) are literals. - If not set, \(...\) defines a group, and ( and ) are literals. */ - #define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1) - - /* If this bit is set, then \ matches . - If not set, then \ is a back-reference. */ - #define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) - - /* If this bit is set, then | is an alternation operator, and \| is literal. - If not set, then \| is an alternation operator, and | is literal. */ - #define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) - - /* If this bit is set, then an ending range point collating higher - than the starting range point, as in [z-a], is invalid. - If not set, then when ending range point collates higher than the - starting range point, the range is ignored. */ - #define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1) - - /* If this bit is set, then an unmatched ) is ordinary. - If not set, then an unmatched ) is invalid. */ - #define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1) - - /* If this bit is set, succeed as soon as we match the whole pattern, - without further backtracking. */ - #define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1) - - /* If this bit is set, do not process the GNU regex operators. - If not set, then the GNU regex operators are recognized. */ - #define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1) - - /* If this bit is set, turn on internal regex debugging. - If not set, and debugging was on, turn it off. - This only works if regex.c is compiled -DDEBUG. - We define this bit always, so that all that's needed to turn on - debugging is to recompile regex.c; the calling code can always have - this bit set, and it won't affect anything in the normal case. */ - #define RE_DEBUG (RE_NO_GNU_OPS << 1) - - /* If this bit is set, a syntactically invalid interval is treated as - a string of ordinary characters. For example, the ERE 'a{1' is - treated as 'a\{1'. */ - #define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1) - - /* If this bit is set, then ignore case when matching. - If not set, then case is significant. */ - #define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1) - - /* This global variable defines the particular regexp syntax to use (for - some interfaces). When a regexp is compiled, the syntax used is - stored in the pattern buffer, so changing this does not affect - already-compiled regexps. */ - extern reg_syntax_t re_syntax_options; - - /* Define combinations of the above bits for the standard possibilities. - (The [[[ comments delimit what gets put into the Texinfo file, so - don't delete them!) */ - /* [[[begin syntaxes]]] */ - #define RE_SYNTAX_EMACS 0 - - #define RE_SYNTAX_AWK \ - (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \ - | RE_NO_BK_PARENS | RE_NO_BK_REFS \ - | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \ - | RE_DOT_NEWLINE | RE_CONTEXT_INDEP_ANCHORS \ - | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS) - - #define RE_SYNTAX_GNU_AWK \ - ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG) \ - & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS \ - | RE_CONTEXT_INVALID_OPS )) - - #define RE_SYNTAX_POSIX_AWK \ - (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \ - | RE_INTERVALS | RE_NO_GNU_OPS) - - #define RE_SYNTAX_GREP \ - (RE_BK_PLUS_QM | RE_CHAR_CLASSES \ - | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \ - | RE_NEWLINE_ALT) - - #define RE_SYNTAX_EGREP \ - (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \ - | RE_NEWLINE_ALT | RE_NO_BK_PARENS \ - | RE_NO_BK_VBAR) - - #define RE_SYNTAX_POSIX_EGREP \ - (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES \ - | RE_INVALID_INTERVAL_ORD) - - /* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */ - #define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC - - #define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC - - /* Syntax bits common to both basic and extended POSIX regex syntax. */ - #define _RE_SYNTAX_POSIX_COMMON \ - (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ - | RE_INTERVALS | RE_NO_EMPTY_RANGES) - - #define RE_SYNTAX_POSIX_BASIC \ - (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM) - - /* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes - RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this - isn't minimal, since other operators, such as \`, aren't disabled. */ - #define RE_SYNTAX_POSIX_MINIMAL_BASIC \ - (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS) - - #define RE_SYNTAX_POSIX_EXTENDED \ - (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \ - | RE_NO_BK_PARENS | RE_NO_BK_VBAR \ - | RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD) - - /* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is - removed and RE_NO_BK_REFS is added. */ - #define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \ - (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \ - | RE_NO_BK_PARENS | RE_NO_BK_REFS \ - | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) - /* [[[end syntaxes]]] */ - - /* Maximum number of duplicates an interval can allow. Some systems - (erroneously) define this in other header files, but we want our - value, so remove any previous define. */ - #ifdef RE_DUP_MAX - # undef RE_DUP_MAX - #endif - /* If sizeof(int) == 2, then ((1 << 15) - 1) overflows. */ - #define RE_DUP_MAX (0x7fff) - - - /* POSIX `cflags' bits (i.e., information for `regcomp'). */ - - /* If this bit is set, then use extended regular expression syntax. - If not set, then use basic regular expression syntax. */ - #define REG_EXTENDED 1 - - /* If this bit is set, then ignore case when matching. - If not set, then case is significant. */ - #define REG_ICASE (REG_EXTENDED << 1) - - /* If this bit is set, then anchors do not match at newline - characters in the string. - If not set, then anchors do match at newlines. */ - #define REG_NEWLINE (REG_ICASE << 1) - - /* If this bit is set, then report only success or fail in regexec. - If not set, then returns differ between not matching and errors. */ - #define REG_NOSUB (REG_NEWLINE << 1) - - - /* POSIX `eflags' bits (i.e., information for regexec). */ - - /* If this bit is set, then the beginning-of-line operator doesn't match - the beginning of the string (presumably because it's not the - beginning of a line). - If not set, then the beginning-of-line operator does match the - beginning of the string. */ - #define REG_NOTBOL 1 - - /* Like REG_NOTBOL, except for the end-of-line. */ - #define REG_NOTEOL (1 << 1) - - - /* If any error codes are removed, changed, or added, update the - `re_error_msg' table in regex.c. */ - typedef enum - { - #ifdef _XOPEN_SOURCE - REG_ENOSYS = -1, /* This will never happen for this implementation. */ - #endif - - REG_NOERROR = 0, /* Success. */ - REG_NOMATCH, /* Didn't find a match (for regexec). */ - - /* POSIX regcomp return error codes. (In the order listed in the - standard.) */ - REG_BADPAT, /* Invalid pattern. */ - REG_ECOLLATE, /* Not implemented. */ - REG_ECTYPE, /* Invalid character class name. */ - REG_EESCAPE, /* Trailing backslash. */ - REG_ESUBREG, /* Invalid back reference. */ - REG_EBRACK, /* Unmatched left bracket. */ - REG_EPAREN, /* Parenthesis imbalance. */ - REG_EBRACE, /* Unmatched \{. */ - REG_BADBR, /* Invalid contents of \{\}. */ - REG_ERANGE, /* Invalid range end. */ - REG_ESPACE, /* Ran out of memory. */ - REG_BADRPT, /* No preceding re for repetition op. */ - - /* Error codes we've added. */ - REG_EEND, /* Premature end. */ - REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ - REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ - } reg_errcode_t; - - /* This data structure represents a compiled pattern. Before calling - the pattern compiler, the fields `buffer', `allocated', `fastmap', - `translate', and `no_sub' can be set. After the pattern has been - compiled, the `re_nsub' field is available. All other fields are - private to the regex routines. */ - - #ifndef RE_TRANSLATE_TYPE - # define RE_TRANSLATE_TYPE char * - #endif - - struct re_pattern_buffer - { - /* [[[begin pattern_buffer]]] */ - /* Space that holds the compiled pattern. It is declared as - `unsigned char *' because its elements are - sometimes used as array indexes. */ - unsigned char *buffer; - - /* Number of bytes to which `buffer' points. */ - unsigned long int allocated; - - /* Number of bytes actually used in `buffer'. */ - unsigned long int used; - - /* Syntax setting with which the pattern was compiled. */ - reg_syntax_t syntax; - - /* Pointer to a fastmap, if any, otherwise zero. re_search uses - the fastmap, if there is one, to skip over impossible - starting points for matches. */ - char *fastmap; - - /* Either a translate table to apply to all characters before - comparing them, or zero for no translation. The translation - is applied to a pattern when it is compiled and to a string - when it is matched. */ - RE_TRANSLATE_TYPE translate; - - /* Number of subexpressions found by the compiler. */ - size_t re_nsub; - - /* Zero if this pattern cannot match the empty string, one else. - Well, in truth it's used only in `re_search_2', to see - whether or not we should use the fastmap, so we don't set - this absolutely perfectly; see `re_compile_fastmap' (the - `duplicate' case). */ - unsigned can_be_null : 1; - - /* If REGS_UNALLOCATED, allocate space in the `regs' structure - for `max (RE_NREGS, re_nsub + 1)' groups. - If REGS_REALLOCATE, reallocate space if necessary. - If REGS_FIXED, use what's there. */ - #define REGS_UNALLOCATED 0 - #define REGS_REALLOCATE 1 - #define REGS_FIXED 2 - unsigned regs_allocated : 2; - - /* Set to zero when `regex_compile' compiles a pattern; set to one - by `re_compile_fastmap' if it updates the fastmap. */ - unsigned fastmap_accurate : 1; - - /* If set, `re_match_2' does not return information about - subexpressions. */ - unsigned no_sub : 1; - - /* If set, a beginning-of-line anchor doesn't match at the - beginning of the string. */ - unsigned not_bol : 1; - - /* Similarly for an end-of-line anchor. */ - unsigned not_eol : 1; - - /* If true, an anchor at a newline matches. */ - unsigned newline_anchor : 1; - - /* [[[end pattern_buffer]]] */ - }; - - typedef struct re_pattern_buffer regex_t; - - /* Type for byte offsets within the string. POSIX mandates this. */ - typedef int regoff_t; - - - /* This is the structure we store register match data in. See - regex.texinfo for a full description of what registers match. */ - struct re_registers - { - unsigned num_regs; - regoff_t *start; - regoff_t *end; - }; - - - /* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer, - `re_match_2' returns information about at least this many registers - the first time a `regs' structure is passed. */ - #ifndef RE_NREGS - # define RE_NREGS 30 - #endif - - - /* POSIX specification for registers. Aside from the different names than - `re_registers', POSIX uses an array of structures, instead of a - structure of arrays. */ - typedef struct - { - regoff_t rm_so; /* Byte offset from string's start to substring's start. */ - regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ - } regmatch_t; - - /* Declarations for routines. */ - - /* To avoid duplicating every routine declaration -- once with a - prototype (if we are ANSI), and once without (if we aren't) -- we - use the following macro to declare argument types. This - unfortunately clutters up the declarations a bit, but I think it's - worth it. */ - - #if __STDC__ - - # define _RE_ARGS(args) args - - #else /* not __STDC__ */ - - # define _RE_ARGS(args) () - - #endif /* not __STDC__ */ - - /* Sets the current default syntax to SYNTAX, and return the old syntax. - You can also simply assign to the `re_syntax_options' variable. */ - extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax)); - - /* Compile the regular expression PATTERN, with length LENGTH - and syntax given by the global `re_syntax_options', into the buffer - BUFFER. Return NULL if successful, and an error string if not. */ - extern const char *re_compile_pattern - _RE_ARGS ((const char *pattern, size_t length, - struct re_pattern_buffer *buffer)); - - - /* Compile a fastmap for the compiled pattern in BUFFER; used to - accelerate searches. Return 0 if successful and -2 if was an - internal error. */ - extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer)); - - - /* Search in the string STRING (with length LENGTH) for the pattern - compiled into BUFFER. Start searching at position START, for RANGE - characters. Return the starting position of the match, -1 for no - match, or -2 for an internal error. Also return register - information in REGS (if REGS and BUFFER->no_sub are nonzero). */ - extern int re_search - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, - int length, int start, int range, struct re_registers *regs)); - - - /* Like `re_search', but search in the concatenation of STRING1 and - STRING2. Also, stop searching at index START + STOP. */ - extern int re_search_2 - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, - int length1, const char *string2, int length2, - int start, int range, struct re_registers *regs, int stop)); - - - /* Like `re_search', but return how many characters in STRING the regexp - in BUFFER matched, starting at position START. */ - extern int re_match - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, - int length, int start, struct re_registers *regs)); - - - /* Relates to `re_match' as `re_search_2' relates to `re_search'. */ - extern int re_match_2 - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, - int length1, const char *string2, int length2, - int start, struct re_registers *regs, int stop)); - - - /* Set REGS to hold NUM_REGS registers, storing them in STARTS and - ENDS. Subsequent matches using BUFFER and REGS will use this memory - for recording register information. STARTS and ENDS must be - allocated with malloc, and must each be at least `NUM_REGS * sizeof - (regoff_t)' bytes long. - - If NUM_REGS == 0, then subsequent matches should allocate their own - register data. - - Unless this function is called, the first search or match using - PATTERN_BUFFER will allocate its own register data, without - freeing the old data. */ - extern void re_set_registers - _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs, - unsigned num_regs, regoff_t *starts, regoff_t *ends)); - - #if defined _REGEX_RE_COMP || defined _LIBC - # ifndef _CRAY - /* 4.2 bsd compatibility. */ - extern char *re_comp _RE_ARGS ((const char *)); - extern int re_exec _RE_ARGS ((const char *)); - # endif - #endif - - /* GCC 2.95 and later have "__restrict"; C99 compilers have - "restrict", and "configure" may have defined "restrict". */ - #ifndef __restrict - # if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__)) - # if defined restrict || 199901L <= __STDC_VERSION__ - # define __restrict restrict - # else - # define __restrict - # endif - # endif - #endif - /* gcc 3.1 and up support the [restrict] syntax. */ - #ifndef __restrict_arr - # if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) - # define __restrict_arr __restrict - # else - # define __restrict_arr - # endif - #endif - - /* POSIX compatibility. */ - extern int regcomp _RE_ARGS ((regex_t *__restrict __preg, - const char *__restrict __pattern, - int __cflags)); - - extern int regexec _RE_ARGS ((const regex_t *__restrict __preg, - const char *__restrict __string, size_t __nmatch, - regmatch_t __pmatch[__restrict_arr], - int __eflags)); - - extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg, - char *__errbuf, size_t __errbuf_size)); - - extern void regfree _RE_ARGS ((regex_t *__preg)); - - /* Internal entry points */ - extern reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern, - int length, reg_syntax_t syntax); - extern reg_errcode_t re_search_internal (const regex_t *preg, - const char *string, int length, - int start, int range, int stop, - size_t nmatch, regmatch_t pmatch[], - int eflags); - - - #ifdef __cplusplus - } - #endif /* C++ */ - - #endif /* regex.h */ - - /* - Local variables: - make-backup-files: t - version-control: t - trim-versions-without-asking: nil - End: - */ --- 0 ---- diff -rNC3 sed-4.0.5/lib/regex_.h sed-4.0.6/lib/regex_.h *** sed-4.0.5/lib/regex_.h Thu Jan 1 01:00:00 1970 --- sed-4.0.6/lib/regex_.h Fri Nov 22 12:01:59 2002 *************** *** 0 **** --- 1,583 ---- + /* Definitions for data structures and routines for the regular + expression library. + Copyright (C) 1985,1989-93,1995-98,2000,2001,2002 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + + #ifndef _REGEX_H + #define _REGEX_H 1 + + /* Allow the use in C++ code. */ + #ifdef __cplusplus + extern "C" { + #endif + + /* POSIX says that must be included (by the caller) before + . */ + + #if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS + /* VMS doesn't have `size_t' in , even though POSIX says it + should be there. */ + # include + #endif + + /* The following two types have to be signed and unsigned integer type + wide enough to hold a value of a pointer. For most ANSI compilers + ptrdiff_t and size_t should be likely OK. Still size of these two + types is 2 for Microsoft C. Ugh... */ + typedef long int s_reg_t; + typedef unsigned long int active_reg_t; + + /* The following bits are used to determine the regexp syntax we + recognize. The set/not-set meanings are chosen so that Emacs syntax + remains the value 0. The bits are given in alphabetical order, and + the definitions shifted by one from the previous bit; thus, when we + add or remove a bit, only one other definition need change. */ + typedef unsigned long int reg_syntax_t; + + /* If this bit is not set, then \ inside a bracket expression is literal. + If set, then such a \ quotes the following character. */ + #define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1) + + /* If this bit is not set, then + and ? are operators, and \+ and \? are + literals. + If set, then \+ and \? are operators and + and ? are literals. */ + #define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) + + /* If this bit is set, then character classes are supported. They are: + [:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:], + [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:]. + If not set, then character classes are not supported. */ + #define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1) + + /* If this bit is set, then ^ and $ are always anchors (outside bracket + expressions, of course). + If this bit is not set, then it depends: + ^ is an anchor if it is at the beginning of a regular + expression or after an open-group or an alternation operator; + $ is an anchor if it is at the end of a regular expression, or + before a close-group or an alternation operator. + + This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because + POSIX draft 11.2 says that * etc. in leading positions is undefined. + We already implemented a previous draft which made those constructs + invalid, though, so we haven't changed the code back. */ + #define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1) + + /* If this bit is set, then special characters are always special + regardless of where they are in the pattern. + If this bit is not set, then special characters are special only in + some contexts; otherwise they are ordinary. Specifically, + * + ? and intervals are only special when not after the beginning, + open-group, or alternation operator. */ + #define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) + + /* If this bit is set, then *, +, ?, and { cannot be first in an re or + immediately after an alternation or begin-group operator. */ + #define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1) + + /* If this bit is set, then . matches newline. + If not set, then it doesn't. */ + #define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1) + + /* If this bit is set, then . doesn't match NUL. + If not set, then it does. */ + #define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1) + + /* If this bit is set, nonmatching lists [^...] do not match newline. + If not set, they do. */ + #define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) + + /* If this bit is set, either \{...\} or {...} defines an + interval, depending on RE_NO_BK_BRACES. + If not set, \{, \}, {, and } are literals. */ + #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) + + /* If this bit is set, +, ? and | aren't recognized as operators. + If not set, they are. */ + #define RE_LIMITED_OPS (RE_INTERVALS << 1) + + /* If this bit is set, newline is an alternation operator. + If not set, newline is literal. */ + #define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1) + + /* If this bit is set, then `{...}' defines an interval, and \{ and \} + are literals. + If not set, then `\{...\}' defines an interval. */ + #define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1) + + /* If this bit is set, (...) defines a group, and \( and \) are literals. + If not set, \(...\) defines a group, and ( and ) are literals. */ + #define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1) + + /* If this bit is set, then \ matches . + If not set, then \ is a back-reference. */ + #define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) + + /* If this bit is set, then | is an alternation operator, and \| is literal. + If not set, then \| is an alternation operator, and | is literal. */ + #define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) + + /* If this bit is set, then an ending range point collating higher + than the starting range point, as in [z-a], is invalid. + If not set, then when ending range point collates higher than the + starting range point, the range is ignored. */ + #define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1) + + /* If this bit is set, then an unmatched ) is ordinary. + If not set, then an unmatched ) is invalid. */ + #define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1) + + /* If this bit is set, succeed as soon as we match the whole pattern, + without further backtracking. */ + #define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1) + + /* If this bit is set, do not process the GNU regex operators. + If not set, then the GNU regex operators are recognized. */ + #define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1) + + /* If this bit is set, turn on internal regex debugging. + If not set, and debugging was on, turn it off. + This only works if regex.c is compiled -DDEBUG. + We define this bit always, so that all that's needed to turn on + debugging is to recompile regex.c; the calling code can always have + this bit set, and it won't affect anything in the normal case. */ + #define RE_DEBUG (RE_NO_GNU_OPS << 1) + + /* If this bit is set, a syntactically invalid interval is treated as + a string of ordinary characters. For example, the ERE 'a{1' is + treated as 'a\{1'. */ + #define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1) + + /* If this bit is set, then ignore case when matching. + If not set, then case is significant. */ + #define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1) + + /* This global variable defines the particular regexp syntax to use (for + some interfaces). When a regexp is compiled, the syntax used is + stored in the pattern buffer, so changing this does not affect + already-compiled regexps. */ + extern reg_syntax_t re_syntax_options; + + /* Define combinations of the above bits for the standard possibilities. + (The [[[ comments delimit what gets put into the Texinfo file, so + don't delete them!) */ + /* [[[begin syntaxes]]] */ + #define RE_SYNTAX_EMACS 0 + + #define RE_SYNTAX_AWK \ + (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \ + | RE_NO_BK_PARENS | RE_NO_BK_REFS \ + | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \ + | RE_DOT_NEWLINE | RE_CONTEXT_INDEP_ANCHORS \ + | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS) + + #define RE_SYNTAX_GNU_AWK \ + ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG) \ + & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS \ + | RE_CONTEXT_INVALID_OPS )) + + #define RE_SYNTAX_POSIX_AWK \ + (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \ + | RE_INTERVALS | RE_NO_GNU_OPS) + + #define RE_SYNTAX_GREP \ + (RE_BK_PLUS_QM | RE_CHAR_CLASSES \ + | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \ + | RE_NEWLINE_ALT) + + #define RE_SYNTAX_EGREP \ + (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \ + | RE_NEWLINE_ALT | RE_NO_BK_PARENS \ + | RE_NO_BK_VBAR) + + #define RE_SYNTAX_POSIX_EGREP \ + (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES \ + | RE_INVALID_INTERVAL_ORD) + + /* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */ + #define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC + + #define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC + + /* Syntax bits common to both basic and extended POSIX regex syntax. */ + #define _RE_SYNTAX_POSIX_COMMON \ + (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ + | RE_INTERVALS | RE_NO_EMPTY_RANGES) + + #define RE_SYNTAX_POSIX_BASIC \ + (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM) + + /* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes + RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this + isn't minimal, since other operators, such as \`, aren't disabled. */ + #define RE_SYNTAX_POSIX_MINIMAL_BASIC \ + (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS) + + #define RE_SYNTAX_POSIX_EXTENDED \ + (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \ + | RE_NO_BK_PARENS | RE_NO_BK_VBAR \ + | RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD) + + /* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is + removed and RE_NO_BK_REFS is added. */ + #define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \ + (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \ + | RE_NO_BK_PARENS | RE_NO_BK_REFS \ + | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) + /* [[[end syntaxes]]] */ + + /* Maximum number of duplicates an interval can allow. Some systems + (erroneously) define this in other header files, but we want our + value, so remove any previous define. */ + #ifdef RE_DUP_MAX + # undef RE_DUP_MAX + #endif + /* If sizeof(int) == 2, then ((1 << 15) - 1) overflows. */ + #define RE_DUP_MAX (0x7fff) + + + /* POSIX `cflags' bits (i.e., information for `regcomp'). */ + + /* If this bit is set, then use extended regular expression syntax. + If not set, then use basic regular expression syntax. */ + #define REG_EXTENDED 1 + + /* If this bit is set, then ignore case when matching. + If not set, then case is significant. */ + #define REG_ICASE (REG_EXTENDED << 1) + + /* If this bit is set, then anchors do not match at newline + characters in the string. + If not set, then anchors do match at newlines. */ + #define REG_NEWLINE (REG_ICASE << 1) + + /* If this bit is set, then report only success or fail in regexec. + If not set, then returns differ between not matching and errors. */ + #define REG_NOSUB (REG_NEWLINE << 1) + + + /* POSIX `eflags' bits (i.e., information for regexec). */ + + /* If this bit is set, then the beginning-of-line operator doesn't match + the beginning of the string (presumably because it's not the + beginning of a line). + If not set, then the beginning-of-line operator does match the + beginning of the string. */ + #define REG_NOTBOL 1 + + /* Like REG_NOTBOL, except for the end-of-line. */ + #define REG_NOTEOL (1 << 1) + + + /* If any error codes are removed, changed, or added, update the + `re_error_msg' table in regex.c. */ + typedef enum + { + #ifdef _XOPEN_SOURCE + REG_ENOSYS = -1, /* This will never happen for this implementation. */ + #endif + + REG_NOERROR = 0, /* Success. */ + REG_NOMATCH, /* Didn't find a match (for regexec). */ + + /* POSIX regcomp return error codes. (In the order listed in the + standard.) */ + REG_BADPAT, /* Invalid pattern. */ + REG_ECOLLATE, /* Not implemented. */ + REG_ECTYPE, /* Invalid character class name. */ + REG_EESCAPE, /* Trailing backslash. */ + REG_ESUBREG, /* Invalid back reference. */ + REG_EBRACK, /* Unmatched left bracket. */ + REG_EPAREN, /* Parenthesis imbalance. */ + REG_EBRACE, /* Unmatched \{. */ + REG_BADBR, /* Invalid contents of \{\}. */ + REG_ERANGE, /* Invalid range end. */ + REG_ESPACE, /* Ran out of memory. */ + REG_BADRPT, /* No preceding re for repetition op. */ + + /* Error codes we've added. */ + REG_EEND, /* Premature end. */ + REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ + REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ + } reg_errcode_t; + + /* This data structure represents a compiled pattern. Before calling + the pattern compiler, the fields `buffer', `allocated', `fastmap', + `translate', and `no_sub' can be set. After the pattern has been + compiled, the `re_nsub' field is available. All other fields are + private to the regex routines. */ + + #ifndef RE_TRANSLATE_TYPE + # define RE_TRANSLATE_TYPE char * + #endif + + struct re_pattern_buffer + { + /* [[[begin pattern_buffer]]] */ + /* Space that holds the compiled pattern. It is declared as + `unsigned char *' because its elements are + sometimes used as array indexes. */ + unsigned char *buffer; + + /* Number of bytes to which `buffer' points. */ + unsigned long int allocated; + + /* Number of bytes actually used in `buffer'. */ + unsigned long int used; + + /* Syntax setting with which the pattern was compiled. */ + reg_syntax_t syntax; + + /* Pointer to a fastmap, if any, otherwise zero. re_search uses + the fastmap, if there is one, to skip over impossible + starting points for matches. */ + char *fastmap; + + /* Either a translate table to apply to all characters before + comparing them, or zero for no translation. The translation + is applied to a pattern when it is compiled and to a string + when it is matched. */ + RE_TRANSLATE_TYPE translate; + + /* Number of subexpressions found by the compiler. */ + size_t re_nsub; + + /* Zero if this pattern cannot match the empty string, one else. + Well, in truth it's used only in `re_search_2', to see + whether or not we should use the fastmap, so we don't set + this absolutely perfectly; see `re_compile_fastmap' (the + `duplicate' case). */ + unsigned can_be_null : 1; + + /* If REGS_UNALLOCATED, allocate space in the `regs' structure + for `max (RE_NREGS, re_nsub + 1)' groups. + If REGS_REALLOCATE, reallocate space if necessary. + If REGS_FIXED, use what's there. */ + #define REGS_UNALLOCATED 0 + #define REGS_REALLOCATE 1 + #define REGS_FIXED 2 + unsigned regs_allocated : 2; + + /* Set to zero when `regex_compile' compiles a pattern; set to one + by `re_compile_fastmap' if it updates the fastmap. */ + unsigned fastmap_accurate : 1; + + /* If set, `re_match_2' does not return information about + subexpressions. */ + unsigned no_sub : 1; + + /* If set, a beginning-of-line anchor doesn't match at the + beginning of the string. */ + unsigned not_bol : 1; + + /* Similarly for an end-of-line anchor. */ + unsigned not_eol : 1; + + /* If true, an anchor at a newline matches. */ + unsigned newline_anchor : 1; + + /* [[[end pattern_buffer]]] */ + }; + + typedef struct re_pattern_buffer regex_t; + + /* Type for byte offsets within the string. POSIX mandates this. */ + typedef int regoff_t; + + + /* This is the structure we store register match data in. See + regex.texinfo for a full description of what registers match. */ + struct re_registers + { + unsigned num_regs; + regoff_t *start; + regoff_t *end; + }; + + + /* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer, + `re_match_2' returns information about at least this many registers + the first time a `regs' structure is passed. */ + #ifndef RE_NREGS + # define RE_NREGS 30 + #endif + + + /* POSIX specification for registers. Aside from the different names than + `re_registers', POSIX uses an array of structures, instead of a + structure of arrays. */ + typedef struct + { + regoff_t rm_so; /* Byte offset from string's start to substring's start. */ + regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ + } regmatch_t; + + /* Declarations for routines. */ + + /* To avoid duplicating every routine declaration -- once with a + prototype (if we are ANSI), and once without (if we aren't) -- we + use the following macro to declare argument types. This + unfortunately clutters up the declarations a bit, but I think it's + worth it. */ + + #if __STDC__ + + # define _RE_ARGS(args) args + + #else /* not __STDC__ */ + + # define _RE_ARGS(args) () + + #endif /* not __STDC__ */ + + /* Sets the current default syntax to SYNTAX, and return the old syntax. + You can also simply assign to the `re_syntax_options' variable. */ + extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax)); + + /* Compile the regular expression PATTERN, with length LENGTH + and syntax given by the global `re_syntax_options', into the buffer + BUFFER. Return NULL if successful, and an error string if not. */ + extern const char *re_compile_pattern + _RE_ARGS ((const char *pattern, size_t length, + struct re_pattern_buffer *buffer)); + + + /* Compile a fastmap for the compiled pattern in BUFFER; used to + accelerate searches. Return 0 if successful and -2 if was an + internal error. */ + extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer)); + + + /* Search in the string STRING (with length LENGTH) for the pattern + compiled into BUFFER. Start searching at position START, for RANGE + characters. Return the starting position of the match, -1 for no + match, or -2 for an internal error. Also return register + information in REGS (if REGS and BUFFER->no_sub are nonzero). */ + extern int re_search + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, + int length, int start, int range, struct re_registers *regs)); + + + /* Like `re_search', but search in the concatenation of STRING1 and + STRING2. Also, stop searching at index START + STOP. */ + extern int re_search_2 + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, + int length1, const char *string2, int length2, + int start, int range, struct re_registers *regs, int stop)); + + + /* Like `re_search', but return how many characters in STRING the regexp + in BUFFER matched, starting at position START. */ + extern int re_match + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, + int length, int start, struct re_registers *regs)); + + + /* Relates to `re_match' as `re_search_2' relates to `re_search'. */ + extern int re_match_2 + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, + int length1, const char *string2, int length2, + int start, struct re_registers *regs, int stop)); + + + /* Set REGS to hold NUM_REGS registers, storing them in STARTS and + ENDS. Subsequent matches using BUFFER and REGS will use this memory + for recording register information. STARTS and ENDS must be + allocated with malloc, and must each be at least `NUM_REGS * sizeof + (regoff_t)' bytes long. + + If NUM_REGS == 0, then subsequent matches should allocate their own + register data. + + Unless this function is called, the first search or match using + PATTERN_BUFFER will allocate its own register data, without + freeing the old data. */ + extern void re_set_registers + _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs, + unsigned num_regs, regoff_t *starts, regoff_t *ends)); + + #if defined _REGEX_RE_COMP || defined _LIBC + # ifndef _CRAY + /* 4.2 bsd compatibility. */ + extern char *re_comp _RE_ARGS ((const char *)); + extern int re_exec _RE_ARGS ((const char *)); + # endif + #endif + + /* GCC 2.95 and later have "__restrict"; C99 compilers have + "restrict", and "configure" may have defined "restrict". */ + #ifndef __restrict + # if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__)) + # if defined restrict || 199901L <= __STDC_VERSION__ + # define __restrict restrict + # else + # define __restrict + # endif + # endif + #endif + /* gcc 3.1 and up support the [restrict] syntax. */ + #ifndef __restrict_arr + # if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) + # define __restrict_arr __restrict + # else + # define __restrict_arr + # endif + #endif + + /* POSIX compatibility. */ + extern int regcomp _RE_ARGS ((regex_t *__restrict __preg, + const char *__restrict __pattern, + int __cflags)); + + extern int regexec _RE_ARGS ((const regex_t *__restrict __preg, + const char *__restrict __string, size_t __nmatch, + regmatch_t __pmatch[__restrict_arr], + int __eflags)); + + extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg, + char *__errbuf, size_t __errbuf_size)); + + extern void regfree _RE_ARGS ((regex_t *__preg)); + + /* Internal entry points */ + extern reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern, + int length, reg_syntax_t syntax); + extern reg_errcode_t re_search_internal (const regex_t *preg, + const char *string, int length, + int start, int range, int stop, + size_t nmatch, regmatch_t pmatch[], + int eflags); + + + #ifdef __cplusplus + } + #endif /* C++ */ + + #endif /* regex.h */ + + /* + Local variables: + make-backup-files: t + version-control: t + trim-versions-without-asking: nil + End: + */ diff -rNC3 sed-4.0.5/lib/regex_internal.c sed-4.0.6/lib/regex_internal.c *** sed-4.0.5/lib/regex_internal.c Sat Dec 14 09:23:46 2002 --- sed-4.0.6/lib/regex_internal.c Mon Feb 17 10:20:14 2003 *************** *** 18,67 **** Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ - #include - #include - #include - #include - #include - #include - - #if defined HAVE_WCHAR_H || defined _LIBC - # include - #endif /* HAVE_WCHAR_H || _LIBC */ - #if defined HAVE_WCTYPE_H || defined _LIBC - # include - #endif /* HAVE_WCTYPE_H || _LIBC */ - - #ifdef _LIBC - # ifndef _RE_DEFINE_LOCALE_FUNCTIONS - # define _RE_DEFINE_LOCALE_FUNCTIONS 1 - # include - # include - # include - # endif - #endif - - /* This is for other GNU distributions with internationalized messages. */ - #if HAVE_LIBINTL_H || defined _LIBC - # include - # ifdef _LIBC - # undef gettext - # define gettext(msgid) \ - INTUSE(__dcgettext) (_libc_intl_domainname_internal, msgid, LC_MESSAGES) - # endif - #else - # define gettext(msgid) (msgid) - #endif - - #ifndef gettext_noop - /* This define is so xgettext can find the internationalizable - strings. */ - # define gettext_noop(String) String - #endif - - #include "regex.h" - #include "regex_internal.h" - static void re_string_construct_common (const char *str, int len, re_string_t *pstr, RE_TRANSLATE_TYPE trans, int icase); --- 18,23 ---- diff -rNC3 sed-4.0.5/lib/regex_internal.h sed-4.0.6/lib/regex_internal.h *** sed-4.0.5/lib/regex_internal.h Fri Nov 22 12:18:11 2002 --- sed-4.0.6/lib/regex_internal.h Wed Feb 19 00:32:16 2003 *************** *** 21,26 **** --- 21,90 ---- #ifndef _REGEX_INTERNAL_H #define _REGEX_INTERNAL_H 1 + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + + #include + #include + #include + #include + #include + #include + + #if defined HAVE_LOCALE_H || defined _LIBC + #include + #endif + #if defined HAVE_WCHAR_H || defined _LIBC + # include + #endif /* HAVE_WCHAR_H || _LIBC */ + #if defined HAVE_WCTYPE_H || defined _LIBC + # include + #endif /* HAVE_WCTYPE_H || _LIBC */ + + /* In case that the system doesn't have isblank(). */ + #if !defined _LIBC && !defined HAVE_ISBLANK && !defined isblank + # define isblank(ch) ((ch) == ' ' || (ch) == '\t') + #endif + + #ifdef _LIBC + # ifndef _RE_DEFINE_LOCALE_FUNCTIONS + # define _RE_DEFINE_LOCALE_FUNCTIONS 1 + # include + # include + # include + # endif + #endif + + /* This is for other GNU distributions with internationalized messages. */ + #if HAVE_LIBINTL_H || defined _LIBC + # include + # ifdef _LIBC + # undef gettext + # define gettext(msgid) \ + INTUSE(__dcgettext) (INTUSE(_libc_intl_domainname), msgid, LC_MESSAGES) + # endif + #else + # define gettext(msgid) (msgid) + #endif + + #ifndef gettext_noop + /* This define is so xgettext can find the internationalizable + strings. */ + # define gettext_noop(String) String + #endif + + #if (defined (MB_CUR_MAX) && HAVE_WCSCOLL && HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_WCRTOMB && HAVE_MBRTOWC) || _LIBC + #define RE_ENABLE_I18N + #endif + + #if _LIBC || __GNUC__ >= 3 + # define BE(expr, val) __builtin_expect (expr, val) + #else + # define BE(expr, val) (expr) + # define inline + #endif + /* Number of bits in a byte. */ #define BYTE_BITS 8 /* Number of single byte character. */ diff -rNC3 sed-4.0.5/lib/regexec.c sed-4.0.6/lib/regexec.c *** sed-4.0.5/lib/regexec.c Fri Nov 22 12:19:43 2002 --- sed-4.0.6/lib/regexec.c Mon Feb 17 10:19:54 2003 *************** *** 18,48 **** Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ - #include - #include - #include - #include - #include - - #if defined HAVE_WCHAR_H || defined _LIBC - # include - #endif /* HAVE_WCHAR_H || _LIBC */ - #if defined HAVE_WCTYPE_H || defined _LIBC - # include - #endif /* HAVE_WCTYPE_H || _LIBC */ - - #ifdef _LIBC - # ifndef _RE_DEFINE_LOCALE_FUNCTIONS - # define _RE_DEFINE_LOCALE_FUNCTIONS 1 - # include - # include - # include - # endif - #endif - - #include "regex.h" - #include "regex_internal.h" - static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, re_string_t *input, int n); static void match_ctx_free (re_match_context_t *cache); --- 18,23 ---- diff -rNC3 sed-4.0.5/lib/snprintf.c sed-4.0.6/lib/snprintf.c *** sed-4.0.5/lib/snprintf.c Sat Dec 14 11:51:06 2002 --- sed-4.0.6/lib/snprintf.c Thu Jan 1 01:00:00 1970 *************** *** 1,338 **** - /* A simplified snprintf, without floating point support */ - - /* AIX requires this to be the first thing in the file. */ - #ifdef _AIX - #pragma alloca - #endif - - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif - - #ifndef __GNUC__ - # if HAVE_ALLOCA_H - # include - # else - # ifndef alloca /* predefined by HP cc +Olibcalls */ - char *alloca (); - # endif - # endif - #endif - - #ifndef BOOTSTRAP - #include - #endif - #ifdef HAVE_STDARG_H - #include - #else - #include - #endif - #ifdef HAVE_STDLIB_H - #include - #endif - #ifdef HAVE_STRING_H - #include - #endif - #include - - #include "basicdefs.h" - - #define MINUS_FLAG 1 - #define PLUS_FLAG 2 - #define SPACE_FLAG 4 - #define ALTERNATE_FLAG 8 - #define ZERO_FLAG 16 - - static int - compute_number_length (num, base, width, prec, flags, minusp) - unsigned long num; - unsigned base; - int width; - int prec; - int flags; - int minusp; - { - int len = 0; - int i; - - /* length of the number itself */ - do - { - len++; - num /= base; - } - while (num); - - /* ...padded to prec characters */ - if (prec > len) len = prec; - - /* ...with alternate prefix */ - if (flags & ALTERNATE_FLAG && (base == 16 || base == 8)) - len += base / 8; - - /* ...with the sign before it */ - if (minusp || (flags & SPACE_FLAG) || (flags & PLUS_FLAG)) - len++; - - /* ...and padded with spaces or zeroes (zeroes go - before the sign, actually. This routine does - not consider that but vsprintf will). */ - - return (width > len) ? width : len; - } - - /* These can't be made into a function... */ - - #define PARSE_INT_FORMAT(res, args) \ - if (long_flag) \ - res = va_arg(args, long); \ - else if (short_flag) \ - res = va_arg(args, int); \ - else \ - res = va_arg(args, int) - - #define PARSE_UINT_FORMAT(res, args) \ - if (long_flag) \ - res = va_arg(args, unsigned long); \ - else if (short_flag) \ - res = va_arg(args, unsigned int); \ - else \ - res = va_arg(args, unsigned int) - - static int - compute_length (fmt, args) - const char *fmt; - va_list args; - { - char c; - const char *format; - size_t sz; - - /* Go through the string and find the correct length. */ - sz = 0; - format = fmt; - while (c = *format++) - { - if (c == '%') - { - int flags = 0; - int width = 0; - int prec = -1; - int long_flag = 0; - int short_flag = 0; - - /* flags */ - while ((c = *format++)) - { - if (c == '-') - flags |= MINUS_FLAG; - else if (c == '+') - flags |= PLUS_FLAG; - else if (c == ' ') - flags |= SPACE_FLAG; - else if (c == '#') - flags |= ALTERNATE_FLAG; - else if (c == '0') - flags |= ZERO_FLAG; - else - break; - } - - if (flags & PLUS_FLAG) - flags &= ~SPACE_FLAG; - if (flags & MINUS_FLAG) - flags &= ~ZERO_FLAG; - - /* width */ - if (isdigit (c)) - do - { - width = width * 10 + c - '0'; - c = *format++; - } - while (isdigit (c)); - else if (c == '*') - { - width = va_arg (args, int); - c = *format++; - } - - /* precision */ - if (c == '.') - { - prec = 0; - c = *format++; - if (isdigit (c)) - do - { - prec = prec * 10 + c - '0'; - c = *format++; - } - while (isdigit (c)); - else if (c == '*') - { - prec = va_arg (args, int); - c = *format++; - } - } - - /* size */ - - if (c == 'h') - { - short_flag = 1; - c = *format++; - } - else if (c == 'l') - { - long_flag = 1; - c = *format++; - } - - switch (c) - { - case 'c': - sz += width + 1; - break; - case 's': - { - int len; - char *arg; - - arg = va_arg (args, char *); - len = strlen (arg); - - if (prec != -1 || len > prec) - len = prec; - - sz += (width > len) ? width : len; - break; - } - - case 'd': - case 'i': - { - long arg; - unsigned long num; - int minusp = 0; - - PARSE_INT_FORMAT (arg, args); - - if (arg < 0) - { - minusp = 1; - num = -arg; - } - else - num = arg; - - sz += compute_number_length(num, 10, width, - prec, flags, minusp); - break; - } - case 'u': - { - unsigned long arg; - - PARSE_UINT_FORMAT (arg, args); - - sz += compute_number_length(arg, 10, width, - prec, flags, 0); - break; - } - case 'o': - { - unsigned long arg; - - PARSE_UINT_FORMAT (arg, args); - - sz += compute_number_length(arg, 8, width, - prec, flags, 0); - break; - } - - case 'p': - flags |= ALTERNATE_FLAG; - /* fall through */ - - case 'x': - case 'X': - { - unsigned long arg; - - PARSE_UINT_FORMAT (arg, args); - - sz += compute_number_length(arg, 16, width, - prec, flags, 0); - break; - } - - case 'n': - break; - - case '%': - sz++; - break; - - default: - sz += 2; - break; - } - } - else - sz++; - } - - return sz; - } - - static int - my_vsnprintf (str, sz, fmt, args) - char *str; - size_t sz; - const char *fmt; - va_list args; - { - char *buf; - size_t realsz = compute_length(fmt, args); - - /* Here, we have to count the null character at the end! */ - if (realsz + 1 < sz) - buf = alloca (realsz + 1); - else - buf = str; - - realsz = vsprintf(buf, fmt, args); - if (buf != str) - memcpy(str, buf, sz); - - return realsz; - } - - int - #ifdef HAVE_STDARG_H - snprintf (char *str, size_t sz, const char *format,...) - #else - snprintf (va_alist) - va_dcl - #endif - { - va_list args; - int ret; - #ifdef HAVE_STDARG_H - va_start (args, format); - #else - char *str; - size_t sz; - char *format; - - va_start (args); - str = va_arg(args, char *); - sz = va_arg(args, size_t); - format = va_arg(args, char *); - #endif - - ret = my_vsnprintf (str, sz, format, args); - va_end (args); - return ret; - } --- 0 ---- diff -rNC3 sed-4.0.5/lib/strverscmp.c sed-4.0.6/lib/strverscmp.c *** sed-4.0.5/lib/strverscmp.c Thu Jan 1 01:00:00 1970 --- sed-4.0.6/lib/strverscmp.c Fri Mar 14 14:40:58 2003 *************** *** 0 **** --- 1,132 ---- + /* Compare strings while treating digits characters numerically. + Copyright (C) 1997, 2000, 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jean-Fran鏾is Bignolles , 1997. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with 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. */ + + #if HAVE_CONFIG_H + # include + #endif + + #include + #include + + /* states: S_N: normal, S_I: comparing integral part, S_F: comparing + fractional parts, S_Z: idem but with leading Zeroes only */ + #define S_N 0x0 + #define S_I 0x4 + #define S_F 0x8 + #define S_Z 0xC + + /* result_type: CMP: return diff; LEN: compare using len_diff/diff */ + #define CMP 2 + #define LEN 3 + + + /* ISDIGIT differs from isdigit, as follows: + - Its arg may be any int or unsigned int; it need not be an unsigned char. + - It's guaranteed to evaluate its argument exactly once. + - It's typically faster. + POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to + ISDIGIT_LOCALE unless it's important to use the locale's definition + of `digit' even when the host does not conform to POSIX. */ + #define ISDIGIT(c) ((unsigned) (c) - '0' <= 9) + + #undef __strverscmp + #undef strverscmp + + #ifndef weak_alias + # define __strverscmp strverscmp + #endif + + /* Compare S1 and S2 as strings holding indices/version numbers, + returning less than, equal to or greater than zero if S1 is less than, + equal to or greater than S2 (for more info, see the texinfo doc). + */ + + int + __strverscmp (const char *s1, const char *s2) + { + const unsigned char *p1 = (const unsigned char *) s1; + const unsigned char *p2 = (const unsigned char *) s2; + unsigned char c1, c2; + int state; + int diff; + + /* Symbol(s) 0 [1-9] others (padding) + Transition (10) 0 (01) d (00) x (11) - */ + static const unsigned int next_state[] = + { + /* state x d 0 - */ + /* S_N */ S_N, S_I, S_Z, S_N, + /* S_I */ S_N, S_I, S_I, S_I, + /* S_F */ S_N, S_F, S_F, S_F, + /* S_Z */ S_N, S_F, S_Z, S_Z + }; + + static const int result_type[] = + { + /* state x/x x/d x/0 x/- d/x d/d d/0 d/- + 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */ + + /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, + CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, + /* S_I */ CMP, -1, -1, CMP, 1, LEN, LEN, CMP, + 1, LEN, LEN, CMP, CMP, CMP, CMP, CMP, + /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, + CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, + /* S_Z */ CMP, 1, 1, CMP, -1, CMP, CMP, CMP, + -1, CMP, CMP, CMP + }; + + if (p1 == p2) + return 0; + + c1 = *p1++; + c2 = *p2++; + /* Hint: '0' is a digit too. */ + state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0)); + + while ((diff = c1 - c2) == 0 && c1 != '\0') + { + state = next_state[state]; + c1 = *p1++; + c2 = *p2++; + state |= (c1 == '0') + (ISDIGIT (c1) != 0); + } + + state = result_type[state << 2 | ((c2 == '0') + (ISDIGIT (c2) != 0))]; + + switch (state) + { + case CMP: + return diff; + + case LEN: + while (ISDIGIT (*p1++)) + if (!ISDIGIT (*p2++)) + return 1; + + return ISDIGIT (*p2) ? -1 : diff; + + default: + return state; + } + } + #ifdef weak_alias + weak_alias (__strverscmp, strverscmp) + #endif diff -rNC3 sed-4.0.5/lib/strverscmp.h sed-4.0.6/lib/strverscmp.h *** sed-4.0.5/lib/strverscmp.h Thu Jan 1 01:00:00 1970 --- sed-4.0.6/lib/strverscmp.h Fri Mar 14 14:40:46 2003 *************** *** 0 **** --- 1,20 ---- + /* strverscmp.h -- compare strings holding indices/version numbers */ + + #ifndef STRVERSCMP_H_ + # define STRVERSCMP_H_ + + # if HAVE_CONFIG_H + # include + # endif + + # ifndef PARAMS + # if defined PROTOTYPES || (defined __STDC__ && __STDC__) + # define PARAMS(Args) Args + # else + # define PARAMS(Args) () + # endif + # endif + + int strverscmp PARAMS ((const char*, const char*)); + + #endif /* not STRVERSCMP_H_ */ diff -rNC3 sed-4.0.5/lib/utils.c sed-4.0.6/lib/utils.c *** sed-4.0.5/lib/utils.c Mon Oct 28 07:51:07 2002 --- sed-4.0.6/lib/utils.c Sat Mar 15 08:12:16 2003 *************** *** 1,5 **** /* Functions from hack's utils library. ! Copyright (C) 1989, 1990, 1991, 1998, 1999 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* Functions from hack's utils library. ! Copyright (C) 1989, 1990, 1991, 1998, 1999, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 20,33 **** #include - #if ENABLE_NLS - # include - #else - # define gettext(msgid) (msgid) - # define ngettext(sing,plur,n) ((n)==1 ? (sing) : (plur)) - #endif - #define _(String) gettext(String) - #include #ifndef errno extern int errno; --- 20,25 ---- *************** *** 120,134 **** /* Panic on failing fopen */ FILE * ! ck_fopen(name, mode) const char *name; const char *mode; { FILE *fp; struct id *p; ! if ( ! (fp = fopen(name, mode)) ) ! panic(_("Couldn't open file %s: %s"), name, strerror(errno)); for (p=utils_id_s; p; p=p->link) { if (fp == p->fp) --- 112,134 ---- /* Panic on failing fopen */ FILE * ! ck_fopen(name, mode, fail) const char *name; const char *mode; + flagT fail; { FILE *fp; struct id *p; ! fp = fopen (name, mode); ! if (!fp) ! { ! if (fail) ! panic(_("Couldn't open file %s: %s"), name, strerror(errno)); ! ! return NULL; ! } ! for (p=utils_id_s; p; p=p->link) { if (fp == p->fp) diff -rNC3 sed-4.0.5/lib/utils.h sed-4.0.6/lib/utils.h *** sed-4.0.5/lib/utils.h Sat Jun 8 09:06:55 2002 --- sed-4.0.6/lib/utils.h Sat Jan 4 02:29:47 2003 *************** *** 1,8 **** #include void panic P_((const char *str, ...)); ! FILE *ck_fopen P_((const char *name, const char *mode)); void ck_fwrite P_((const VOID *ptr, size_t size, size_t nmemb, FILE *stream)); size_t ck_fread P_((VOID *ptr, size_t size, size_t nmemb, FILE *stream)); void ck_fflush P_((FILE *stream)); --- 1,26 ---- + /* Functions from hack's utils library. + Copyright (C) 1989, 1990, 1991, 1998, 1999, 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #include void panic P_((const char *str, ...)); ! FILE *ck_fopen P_((const char *name, const char *mode, flagT fail)); void ck_fwrite P_((const VOID *ptr, size_t size, size_t nmemb, FILE *stream)); size_t ck_fread P_((VOID *ptr, size_t size, size_t nmemb, FILE *stream)); void ck_fflush P_((FILE *stream)); Binary files sed-4.0.5/po/ca.gmo and sed-4.0.6/po/ca.gmo differ diff -rNC3 sed-4.0.5/po/ca.po sed-4.0.6/po/ca.po *** sed-4.0.5/po/ca.po Mon Dec 16 20:32:34 2002 --- sed-4.0.6/po/ca.po Sat Mar 15 08:24:55 2003 *************** *** 1,174 **** # Catalan translation of sed. ! # Copyright (C) 2002 Free Software Foundation, Inc. ! # Jordi Mallach , 2002. # msgid "" msgstr "" ! "Project-Id-Version: sed 3.02.80\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" ! "PO-Revision-Date: 2002-06-20 17:12+0200\n" ! "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "M鷏tiples !" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr ", inesperada" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "No es pot utilitzar +N o ~N com a primera adre鏰" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "珄 no emparellat" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "珆 inesperat" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Car郼ters extra despr閟 de l'ordre" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" ! msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "珆 no accepta cap adre鏰" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": no accepta cap adre鏰" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Els comentaris no accepten cap adre鏰" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Fa falta una ordre" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "L'ordre utilitza nom閟 una adre鏰" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "La expressi regular d'addre鏰 no est terminada" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Ordre 玸 no terminada" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Ordre 珁 no terminada" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Opci desconeguda per a 玸" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "m鷏tiples opcions 玴 per a l'ordre 玸" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "m鷏tiples opcions 玤 per a l'ordre 玸" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "m鷏tiples opcions num鑢iques per a l'ordre 玸" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "l'opci num鑢ica per a l'ordre 玸 no pot ser zero" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "les cadenes per a l'ordre y s髇 de longituds diferents" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "S'ha cridat a savchar() amb una espenta inesperada (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Ordre desconeguda:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fitxer %s l韓ia %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expressi #%lu, car郼ter %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "No es troba la etiqueta per al bot a %s" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: no es pot llegir %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "ERROR INTERN: tipus d'adre鏰 err騨ia" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" ! msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" ! msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" ! msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "ERROR INTERN: Ordre err騨ia %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" ! msgstr "" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" ! msgstr "" #: sed/regex.c:145 #, c-format msgid "Invalid reference \\%d on `s' command's RHS" ! msgstr "" #: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" msgstr "" #: sed/sed.c:103 ! #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" --- 1,181 ---- # Catalan translation of sed. ! # Copyright (C) 2002, 2003 Free Software Foundation, Inc. ! # Jordi Mallach , 2002, 2003. # msgid "" msgstr "" ! "Project-Id-Version: sed 4.0.4\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" ! "PO-Revision-Date: 2003-02-14 19:47+0100\n" ! "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=n!=1;\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "M鷏tiples !" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr ", inesperada" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "No es pot utilitzar +N o ~N com a primera adre鏰" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "珄 no emparellat" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "珆 inesperat" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Car郼ters extra despr閟 de l'ordre" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" ! msgstr "S'espera \\ despr閟 de 玜, 玞 i 玦" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "珆 no accepta cap adre鏰" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": no accepta cap adre鏰" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Els comentaris no accepten cap adre鏰" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Fa falta una ordre" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "L'ordre utilitza nom閟 una adre鏰" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "La expressi regular d'addre鏰 no est terminada" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Ordre 玸 no terminada" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Ordre 珁 no terminada" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Opci desconeguda per a 玸" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "m鷏tiples opcions 玴 per a l'ordre 玸" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "m鷏tiples opcions 玤 per a l'ordre 玸" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "m鷏tiples opcions num鑢iques per a l'ordre 玸" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "l'opci num鑢ica per a l'ordre 玸 no pot ser zero" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "les cadenes per a l'ordre y s髇 de longituds diferents" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "S'ha cridat a savchar() amb una espenta inesperada (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Ordre desconeguda:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fitxer %s l韓ia %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expressi #%lu, car郼ter %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "No es troba la etiqueta per al bot a %s" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: no es pot llegir %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "ERROR INTERN: tipus d'adre鏰 err騨ia" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" ! msgstr "error en subproc閟" ! #: sed/execute.c:1008 msgid "option `e' not supported" ! msgstr "l'opci 玡 no est suportada" ! #: sed/execute.c:1188 msgid "`e' command not supported" ! msgstr "l'ordre 玡 no est suportada" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "ERROR INTERN: Ordre err騨ia %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" ! msgstr "No hi ha una expressi regular pr鑦ia" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" ! msgstr "No es poden especificar modificadors en expregs buides" #: sed/regex.c:145 #, c-format msgid "Invalid reference \\%d on `s' command's RHS" ! msgstr "Refer鑞cia \\%d no v鄉ida en el costat dret de l'ordre 玸" #: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" msgstr "" + " -R, --regexp-perl\n" + " usa la sintaxi d'expressions regulars de Perl 5 en aquesta\n" + " sequ鑞cia.\n" #: sed/sed.c:103 ! #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" *************** *** 205,225 **** "趕: %s [OPCI覿... {script-nom閟-si-no-hi-ha-altres-scripts} [fitxer-" "entrada]...\n" " -n, --quiet, --silent\n" ! " suprimeix la impressi autom鄑ica de l'espai de patrons\n" " -e script, --expression=script\n" ! " afegeix el script a les ordres a executar\n" " -f fitxer-script, --file=fitxer-script\n" " afegeix els continguts de fitxer-script a les ordres a " "executar\n" " -l N, --line-length=N\n" ! " especifica la longitud desitjada per a l'ajust de final de " ! "l韓ia\n" ! " per a l'ordre 玪籠n" " -u, --unbuffered\n" "\n" " --help mostra aquest missatge d'ajuda i surt\n" - "\n" " -V, --version mostra la informaci de la versi i surt\n" #: sed/sed.c:132 #, c-format --- 212,247 ---- "趕: %s [OPCI覿... {script-nom閟-si-no-hi-ha-altres-scripts} [fitxer-" "entrada]...\n" " -n, --quiet, --silent\n" ! " suprimeix la impressi autom鄑ica de l'espai de patrons\n" " -e script, --expression=script\n" ! " afegeix el script a les ordres a executar\n" " -f fitxer-script, --file=fitxer-script\n" " afegeix els continguts de fitxer-script a les ordres a " "executar\n" + " -i[sufix], --in-place[=sufix]\n" + " edita els mateixos fitxers (fa c騪ia de seguretat si es\n" + " proveeix una extensi)\n" " -l N, --line-length=N\n" ! " especifica la longitud desitjada per a l'ajust de final de\n" ! " l韓ia per a l'ordre 玪籠n" ! " -r, --regexp-extended\n" ! " usa expressions regulars exteses en el script.\n" ! "%s -s, --separate\n" ! " considera els fitxers com independents, en compte d'un " ! "llarg\n" ! " flux continu.\n" " -u, --unbuffered\n" "\n" " --help mostra aquest missatge d'ajuda i surt\n" " -V, --version mostra la informaci de la versi i surt\n" + "\n" + "Si no es donen cap de les opcions -e, --expression, -f o --file, el primer\n" + "argument no-opci es pren com el script sed a interpretar. Tots els " + "arguments\n" + "restants s髇 noms de fitxers d'entrada; si no s'especifiquen fitxers " + "d'entrada,\n" + "es llig la entrada est鄋dard.\n" + "\n" #: sed/sed.c:132 #, c-format *************** *** 227,253 **** "E-mail bug reports to: %s .\n" "Be sure to include the word ``%s'' somewhere in the ``Subject:'' field.\n" msgstr "" ! "Envieu informes d'errors a %s: .\n" "Assegureu-vos d'incloure la paraula %s en alguna part del camp " "獳ssumpte:.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" ! msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" ! msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 249,277 ---- "E-mail bug reports to: %s .\n" "Be sure to include the word ``%s'' somewhere in the ``Subject:'' field.\n" msgstr "" ! "Envieu informes d'error a: %s.\n" "Assegureu-vos d'incloure la paraula %s en alguna part del camp " "獳ssumpte:.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" ! msgstr "super-sed versi %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" + "basat en GNU sed versi 3.02.80\n" + "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" ! msgstr "GNU sed versi %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 260,352 **** "de c騪ia. No hi ha CAP garantia; ni tan sols de COMERCIABILITAT o\n" "ADEQUACI A UN PROP襍IT PARTICULAR, fins on ho permeta la llei.\n" ! #: lib/utils.c:131 ! #, fuzzy, c-format msgid "Couldn't open file %s: %s" ! msgstr "No s'ha pogut obrir el fitxer %s" #: lib/utils.c:161 ! #, fuzzy, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" ! msgstr[0] "no s'han pogut escriure %d elements a %s: %s" #: lib/utils.c:176 #, c-format msgid "read error on %s: %s" msgstr "error de lectura en %s: %s" ! #: lib/regcomp.c:179 msgid "Success" ! msgstr "" ! #: lib/regcomp.c:182 msgid "No match" ! msgstr "" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" ! msgstr "" ! #: lib/regcomp.c:188 msgid "Invalid collation character" ! msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" ! msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" ! msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" ! msgstr "" ! #: lib/regcomp.c:200 ! #, fuzzy msgid "Unmatched [ or [^" ! msgstr "珄 no emparellat" ! #: lib/regcomp.c:203 ! #, fuzzy msgid "Unmatched ( or \\(" ! msgstr "珄 no emparellat" ! #: lib/regcomp.c:206 ! #, fuzzy msgid "Unmatched \\{" ! msgstr "珄 no emparellat" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" ! msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" ! msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" ! msgstr "" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" ! msgstr "" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" ! msgstr "" ! #: lib/regcomp.c:224 msgid "Regular expression too big" ! msgstr "" ! #: lib/regcomp.c:227 ! #, fuzzy msgid "Unmatched ) or \\)" ! msgstr "珄 no emparellat" #~ msgid "Invalid use of address modifier" #~ msgstr "趕 del modificador d'adre鏰 inv鄉id" --- 284,373 ---- "de c騪ia. No hi ha CAP garantia; ni tan sols de COMERCIABILITAT o\n" "ADEQUACI A UN PROP襍IT PARTICULAR, fins on ho permeta la llei.\n" ! #: lib/utils.c:127 ! #, c-format msgid "Couldn't open file %s: %s" ! msgstr "No s'ha pogut obrir el fitxer %s: %s" #: lib/utils.c:161 ! #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" ! msgstr[0] "no s'ha pogut escriure %d element a %s: %s" ! msgstr[1] "no s'han pogut escriure %d elements a %s: %s" #: lib/utils.c:176 #, c-format msgid "read error on %s: %s" msgstr "error de lectura en %s: %s" ! #: lib/regcomp.c:129 msgid "Success" ! msgstr "葂it" ! #: lib/regcomp.c:132 msgid "No match" ! msgstr "Sense parella" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" ! msgstr "Expressi regular no v鄉ida" ! #: lib/regcomp.c:138 msgid "Invalid collation character" ! msgstr "El car郼ter de comparaci no 閟 v鄉id" ! #: lib/regcomp.c:141 msgid "Invalid character class name" ! msgstr "Nom de clase de car郼ter no v鄉id" ! #: lib/regcomp.c:144 msgid "Trailing backslash" ! msgstr "Barra invertida al final" ! #: lib/regcomp.c:147 msgid "Invalid back reference" ! msgstr "La refer鑞cia cap enrere no 閟 v鄉ida" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" ! msgstr "[ o [^ no emparellat" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" ! msgstr "( o \\( no emparellat" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" ! msgstr "\\{ no emparellat" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" ! msgstr "El contingut de \\{\\} no 閟 v鄉id" ! #: lib/regcomp.c:162 msgid "Invalid range end" ! msgstr "El rang final no 閟 v鄉id" ! #: lib/regcomp.c:165 msgid "Memory exhausted" ! msgstr "Mem騬ia exhaurida" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" ! msgstr "La expressi regular precedent no v鄉ida" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" ! msgstr "Fi prematur de la expressi regular" ! #: lib/regcomp.c:174 msgid "Regular expression too big" ! msgstr "La expressi regular 閟 massa gran" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" ! msgstr ") o \\) no emparellat" #~ msgid "Invalid use of address modifier" #~ msgstr "趕 del modificador d'adre鏰 inv鄉id" Binary files sed-4.0.5/po/cs.gmo and sed-4.0.6/po/cs.gmo differ diff -rNC3 sed-4.0.5/po/cs.po sed-4.0.6/po/cs.po *** sed-4.0.5/po/cs.po Mon Dec 16 20:32:34 2002 --- sed-4.0.6/po/cs.po Sat Mar 15 08:24:55 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2001-08-05 19:52+02:00\n" "Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2001-08-05 19:52+02:00\n" "Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" *************** *** 13,158 **** "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "V韈en醩obn `!'" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Neo鑕k醰醤 `,'" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "+N nebo ~N nelze pou卷t jako prvn adresu" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Neodpov韉aj韈 `{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Neo鑕k醰an `}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Nadbyte鑞 znaky po pkazu" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' nevy綼duje jakoukoliv adresu" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": nechce jakoukoliv adresu" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "V koment狲i nen ppustn jak醟oliv adresa" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Chyb靔韈 pkaz" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Pkaz pou卷v pouze jedinou adresu" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Neukon鑕n adresa regul醨n韍o v齬azu" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Neukon鑕n pkaz `s'" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Neukon鑕n pkaz `y'" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Nezn醡 p鴈p韓a pro `s'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "v韈en醩obn pou緄t p鴈p韓a鑕 `p' s pkazem `s'" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "v韈en醩obn pou緄t p鴈p韓a鑕 `g' s pkazem `s'" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "pkaz `s' me m韙 maxim醠n jednu 桧selnou volbu" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "桧seln volba pkazu `s' neme b齮 nula" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "鴈t靭ce pro pkaz `y' mus b齮 stejn dlouh" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Vol醤o savchar() s ne鑕kan齧 pushback (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Nezn醡 pkaz:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: soubor %s, dek %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e v齬az #%lu, znak %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "N醰旃t pro skok na `%s' nelze naj韙" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s nelze 桧st: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "INTERN CHYBA: 筽atn typ adresy" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERN CHYBA: 筽atn pkaz %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" --- 13,161 ---- "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "V韈en醩obn `!'" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Neo鑕k醰醤 `,'" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "+N nebo ~N nelze pou卷t jako prvn adresu" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Neodpov韉aj韈 `{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Neo鑕k醰an `}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Nadbyte鑞 znaky po pkazu" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' nevy綼duje jakoukoliv adresu" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": nechce jakoukoliv adresu" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "V koment狲i nen ppustn jak醟oliv adresa" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Chyb靔韈 pkaz" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Pkaz pou卷v pouze jedinou adresu" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Neukon鑕n adresa regul醨n韍o v齬azu" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Neukon鑕n pkaz `s'" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Neukon鑕n pkaz `y'" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Nezn醡 p鴈p韓a pro `s'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "v韈en醩obn pou緄t p鴈p韓a鑕 `p' s pkazem `s'" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "v韈en醩obn pou緄t p鴈p韓a鑕 `g' s pkazem `s'" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "pkaz `s' me m韙 maxim醠n jednu 桧selnou volbu" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "桧seln volba pkazu `s' neme b齮 nula" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "鴈t靭ce pro pkaz `y' mus b齮 stejn dlouh" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Vol醤o savchar() s ne鑕kan齧 pushback (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Nezn醡 pkaz:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: soubor %s, dek %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e v齬az #%lu, znak %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "N醰旃t pro skok na `%s' nelze naj韙" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s nelze 桧st: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "INTERN CHYBA: 筽atn typ adresy" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERN CHYBA: 筽atn pkaz %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" *************** *** 240,262 **** "Kamkoliv do polo緆y ``Subject:'' vlo総e ``%s''.\n" "P鴌pom韓ky k p鴈kladu zas韑ejte na adresu (鑕sky).\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 243,265 ---- "Kamkoliv do polo緆y ``Subject:'' vlo総e ``%s''.\n" "P鴌pom韓ky k p鴈kladu zas韑ejte na adresu (鑕sky).\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 270,276 **** "Z罵UKY,\n" "a to i bez z醨uky PRODEJNOSTI nebo VHODNOSTI PRO N蘆AK KONKR蒚N 谌EL.\n" ! #: lib/utils.c:131 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "Soubor %s nelze otevt" --- 273,279 ---- "Z罵UKY,\n" "a to i bez z醨uky PRODEJNOSTI nebo VHODNOSTI PRO N蘆AK KONKR蒚N 谌EL.\n" ! #: lib/utils.c:127 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "Soubor %s nelze otevt" *************** *** 287,360 **** msgid "read error on %s: %s" msgstr "chyba p鴌 鑤en z %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "" ! #: lib/regcomp.c:182 msgid "No match" msgstr "" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 #, fuzzy msgid "Unmatched [ or [^" msgstr "Neodpov韉aj韈 `{'" ! #: lib/regcomp.c:203 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Neodpov韉aj韈 `{'" ! #: lib/regcomp.c:206 #, fuzzy msgid "Unmatched \\{" msgstr "Neodpov韉aj韈 `{'" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:227 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Neodpov韉aj韈 `{'" --- 290,363 ---- msgid "read error on %s: %s" msgstr "chyba p鴌 鑤en z %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "" ! #: lib/regcomp.c:132 msgid "No match" msgstr "" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 #, fuzzy msgid "Unmatched [ or [^" msgstr "Neodpov韉aj韈 `{'" ! #: lib/regcomp.c:153 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Neodpov韉aj韈 `{'" ! #: lib/regcomp.c:156 #, fuzzy msgid "Unmatched \\{" msgstr "Neodpov韉aj韈 `{'" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:177 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Neodpov韉aj韈 `{'" Binary files sed-4.0.5/po/da.gmo and sed-4.0.6/po/da.gmo differ diff -rNC3 sed-4.0.5/po/da.po sed-4.0.6/po/da.po *** sed-4.0.5/po/da.po Mon Dec 16 20:32:35 2002 --- sed-4.0.6/po/da.po Sat Mar 15 08:24:55 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-10-25 22:28+0200\n" "Last-Translator: Byrial Ole Jensen \n" "Language-Team: Danish \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-10-25 22:28+0200\n" "Last-Translator: Byrial Ole Jensen \n" "Language-Team: Danish \n" *************** *** 14,159 **** "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Flere '!'" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Uventet ','" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "Kan ikke bruge +N eller ~N som f鴕ste adresse" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Uparret '{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Uventet '}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Ekstra tegn efter kommando" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "Forventede \\ efter 'a', 'c' eller 'i'" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "'}' vil ikke have adresser" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": vil ikke have adresser" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Kommentarer vil ikke have adresser" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Der mangler en kommando" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Kommandoen bruger kun 閚 adresse" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Uafsluttet regul鎟t udtryk for adresse" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Uafsluttet 's'-kommando" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Uafsluttet 'y'-kommando" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Ukendt tilvalg til 's'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "Flere 'p'-flag til 's'-kommando" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "Flere 'g'-flag til 's'-kommando" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "Flere tal-flag til 's'-kommando" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "s-kommandoens tal-flag m ikke v鎟e nul" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "y-kommandoens strenge har forskellige l鎛gder" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "savchar() kaldt med uventet tilbageskub (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Ukendt kommando:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fil %s, linje %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e udtryk nr. %lu, tegn %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Kan ikke finde etiket for hop til '%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kan ikke l鎠e %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "INTERN FEJL: forkert adressetype" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "fejl i underproces" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "tilvalg 'e' er ikke underst鴗tet" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "'e'-kommando er ikke underst鴗tet" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERN FEJL: Forkert v鎟di af cmd %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Intet forudg錯nde regul鎟t udtryk" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "Der kan ikke angives 鎛drere til tomt regul鎟t udtryk" --- 14,162 ---- "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Flere '!'" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Uventet ','" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "Kan ikke bruge +N eller ~N som f鴕ste adresse" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Uparret '{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Uventet '}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Ekstra tegn efter kommando" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "Forventede \\ efter 'a', 'c' eller 'i'" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "'}' vil ikke have adresser" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": vil ikke have adresser" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Kommentarer vil ikke have adresser" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Der mangler en kommando" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Kommandoen bruger kun 閚 adresse" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Uafsluttet regul鎟t udtryk for adresse" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Uafsluttet 's'-kommando" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Uafsluttet 'y'-kommando" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Ukendt tilvalg til 's'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "Flere 'p'-flag til 's'-kommando" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "Flere 'g'-flag til 's'-kommando" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "Flere tal-flag til 's'-kommando" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "s-kommandoens tal-flag m ikke v鎟e nul" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "y-kommandoens strenge har forskellige l鎛gder" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "savchar() kaldt med uventet tilbageskub (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Ukendt kommando:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fil %s, linje %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e udtryk nr. %lu, tegn %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Kan ikke finde etiket for hop til '%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kan ikke l鎠e %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "INTERN FEJL: forkert adressetype" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "fejl i underproces" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "tilvalg 'e' er ikke underst鴗tet" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "'e'-kommando er ikke underst鴗tet" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERN FEJL: Forkert v鎟di af cmd %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Intet forudg錯nde regul鎟t udtryk" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "Der kan ikke angives 鎛drere til tomt regul鎟t udtryk" *************** *** 245,256 **** "Send fejlrapporter p engelsk pr. e-post til %s.\n" "S鴕g venligst for at skrive ordet \"%s\" et sted i \"Subject:\"-feltet.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed version %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 248,259 ---- "Send fejlrapporter p engelsk pr. e-post til %s.\n" "S鴕g venligst for at skrive ordet \"%s\" et sted i \"Subject:\"-feltet.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed version %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 258,269 **** "baseret p GNU sed version 3.02.80\n" "\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed version %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 261,272 ---- "baseret p GNU sed version 3.02.80\n" "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed version %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 276,282 **** "Der er INGEN garanti; end ikke for SALGBARHED eller EGNETHED TIL NOGET\n" "BESTEMT FORM臠, i det omfang som loven tillader.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "kunne ikke 錬ne filen %s: %s" --- 279,285 ---- "Der er INGEN garanti; end ikke for SALGBARHED eller EGNETHED TIL NOGET\n" "BESTEMT FORM臠, i det omfang som loven tillader.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "kunne ikke 錬ne filen %s: %s" *************** *** 293,363 **** msgid "read error on %s: %s" msgstr "l鎠efejl p %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "Godt resultat" ! #: lib/regcomp.c:182 msgid "No match" msgstr "Intet resultat" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Ugyldigt regul鎟t udtryk" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Ugyldigt sorteringstegn" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Ugyldigt navn p tegnklasse" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Afsluttende omvendt skr錽treg" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Ugyldig reference bagud" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "Uparret [ eller [^" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "Uparret ( eller \\(" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "Uparret \\{" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Ugyldigt indhold af \\{\\}" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Ugyldig slutning p omr錮e" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "Hukommelsen opbrugt" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Ugyldigt forudg錯nde regul鎟t udtryk" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Ufuldst鎛digt regul鎟t udtryk" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Regul鎟t udtryk for stort" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr "Uparret ) eller \\)" --- 296,366 ---- msgid "read error on %s: %s" msgstr "l鎠efejl p %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "Godt resultat" ! #: lib/regcomp.c:132 msgid "No match" msgstr "Intet resultat" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Ugyldigt regul鎟t udtryk" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Ugyldigt sorteringstegn" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Ugyldigt navn p tegnklasse" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Afsluttende omvendt skr錽treg" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Ugyldig reference bagud" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "Uparret [ eller [^" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "Uparret ( eller \\(" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "Uparret \\{" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Ugyldigt indhold af \\{\\}" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Ugyldig slutning p omr錮e" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "Hukommelsen opbrugt" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Ugyldigt forudg錯nde regul鎟t udtryk" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Ufuldst鎛digt regul鎟t udtryk" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Regul鎟t udtryk for stort" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr "Uparret ) eller \\)" Binary files sed-4.0.5/po/de.gmo and sed-4.0.6/po/de.gmo differ diff -rNC3 sed-4.0.5/po/de.po sed-4.0.6/po/de.po *** sed-4.0.5/po/de.po Mon Dec 16 20:32:35 2002 --- sed-4.0.6/po/de.po Sat Mar 15 08:24:55 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 4.0.1\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-11-07 16:03:41+0100\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 4.0.1\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-11-07 16:03:41+0100\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" *************** *** 14,159 **** "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Mehrfache `!'" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Unerwartetes `,'" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "+N oder ~N k鰊nen nicht als erste Adresse benutzt werden" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Nicht paarweises `{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Unerwartetes `}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Zus鋞zliche Zeichen nach dem Befehl" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "Nach `a', `c' oder `i' wird \\ erwartet" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' erwartet keine Adressen" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr "`:' erwartet keine Adressen" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Kommentare erlauben keine Adressen" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Fehlender Befehl" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Befehl verwendet nur eine Adresse" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Nicht beendeter regul鋜er Adressausdruck" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Nicht beendeter `s'-Befehl" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Nicht beendeter `y'-Befehl" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Unbekannte Option betreffs `s'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "Mehrere 'p'-Optionen am `s'-Befehl" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "Mehrere 'g'-Optionen am `s'-Befehl" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "Mehrere numerische Optionen am `s'-Befehl" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "Numerisch Option am `s'-Befehl darf nicht Null sein" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "Unterschiedliche L鋘ge der Zeichenketten am `y'-Befehl" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Aufruf von savchar() mit unerwartetem \"pushback\" (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Unbekannter Befehl:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: Datei %s Zeile %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e Ausdruck #%lu, Zeichen %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Kann das Ziel f黵 den Sprung nach `%s' nicht finden" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kann %s nicht lesen: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNER FEHLER: Falsche Adressenart" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "Fehler im Subprozess" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "Option `e' wird nicht unterst黷zt" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "`e'-Kommando wird nicht unterst黷zt" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNER FEHLER: Falscher Befehl %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Kein vorheriger regul鋜er Ausdruck" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "Auf leere regul鋜e Ausdr點ke k鰊nen keine `modifier' angewandt werden" --- 14,162 ---- "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Mehrfache `!'" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Unerwartetes `,'" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "+N oder ~N k鰊nen nicht als erste Adresse benutzt werden" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Nicht paarweises `{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Unerwartetes `}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Zus鋞zliche Zeichen nach dem Befehl" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "Nach `a', `c' oder `i' wird \\ erwartet" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' erwartet keine Adressen" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr "`:' erwartet keine Adressen" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Kommentare erlauben keine Adressen" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Fehlender Befehl" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Befehl verwendet nur eine Adresse" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Nicht beendeter regul鋜er Adressausdruck" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Nicht beendeter `s'-Befehl" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Nicht beendeter `y'-Befehl" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Unbekannte Option betreffs `s'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "Mehrere 'p'-Optionen am `s'-Befehl" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "Mehrere 'g'-Optionen am `s'-Befehl" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "Mehrere numerische Optionen am `s'-Befehl" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "Numerisch Option am `s'-Befehl darf nicht Null sein" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "Unterschiedliche L鋘ge der Zeichenketten am `y'-Befehl" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Aufruf von savchar() mit unerwartetem \"pushback\" (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Unbekannter Befehl:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: Datei %s Zeile %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e Ausdruck #%lu, Zeichen %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Kann das Ziel f黵 den Sprung nach `%s' nicht finden" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kann %s nicht lesen: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNER FEHLER: Falsche Adressenart" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "Fehler im Subprozess" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "Option `e' wird nicht unterst黷zt" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "`e'-Kommando wird nicht unterst黷zt" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNER FEHLER: Falscher Befehl %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Kein vorheriger regul鋜er Ausdruck" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "Auf leere regul鋜e Ausdr點ke k鰊nen keine `modifier' angewandt werden" *************** *** 249,260 **** "Fehlerberichte (in Englisch!) per E-Mail an: %s .\n" "Verwenden Sie dabei den Begriff ``%s'' irgendwo in der ``Betreff:''-Zeile.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "Super-sed version %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 252,263 ---- "Fehlerberichte (in Englisch!) per E-Mail an: %s .\n" "Verwenden Sie dabei den Begriff ``%s'' irgendwo in der ``Betreff:''-Zeile.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "Super-sed version %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 262,273 **** "basiert auf GNU sed Version 3.02.80\n" "\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed Version %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 265,276 ---- "basiert auf GNU sed Version 3.02.80\n" "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed Version %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 285,291 **** "Es gibt KEINE GARANTIE; nicht einmal die implizite Garantie der\n" "MARKTF腍IGKEIT oder der ERF躄LUNG EINES BESTIMMTEN ZWECKES.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "Datei %s kann nicht ge鰂fnet werden: %s" --- 288,294 ---- "Es gibt KEINE GARANTIE; nicht einmal die implizite Garantie der\n" "MARKTF腍IGKEIT oder der ERF躄LUNG EINES BESTIMMTEN ZWECKES.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "Datei %s kann nicht ge鰂fnet werden: %s" *************** *** 302,372 **** msgid "read error on %s: %s" msgstr "Lesefehler in %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "Erfolgreich" ! #: lib/regcomp.c:182 msgid "No match" msgstr "Keine 躡ereinstimmung" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Ung黮tiger regul鋜er Ausdruck" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Ung黮tiger Vergleichszeichen" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Ung黮tige Zeichenklassenname" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Abschliessender Backslash" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Ung黮tiger R點kw鋜tsverweis" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "Nicht paarweises [ bzw. [^" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "Nicht paarweises ( bzw. \\(" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "Nicht paarweises \\{" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Ung黮tiger Inhalt in \\{\\}" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Ung黮tiges Bereichende" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "Speicher ersch鰌ft" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Vorheriger regul鋜er Ausdruck ist ung黮tig" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Regul鋜er Ausdruck endet zu fr黨" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Regul鋜er Ausdruck ist zu gro" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr "Nicht paarweises ) bzw. \\)" --- 305,375 ---- msgid "read error on %s: %s" msgstr "Lesefehler in %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "Erfolgreich" ! #: lib/regcomp.c:132 msgid "No match" msgstr "Keine 躡ereinstimmung" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Ung黮tiger regul鋜er Ausdruck" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Ung黮tiger Vergleichszeichen" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Ung黮tige Zeichenklassenname" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Abschliessender Backslash" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Ung黮tiger R點kw鋜tsverweis" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "Nicht paarweises [ bzw. [^" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "Nicht paarweises ( bzw. \\(" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "Nicht paarweises \\{" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Ung黮tiger Inhalt in \\{\\}" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Ung黮tiges Bereichende" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "Speicher ersch鰌ft" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Vorheriger regul鋜er Ausdruck ist ung黮tig" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Regul鋜er Ausdruck endet zu fr黨" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Regul鋜er Ausdruck ist zu gro" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr "Nicht paarweises ) bzw. \\)" Binary files sed-4.0.5/po/el.gmo and sed-4.0.6/po/el.gmo differ diff -rNC3 sed-4.0.5/po/el.po sed-4.0.6/po/el.po *** sed-4.0.5/po/el.po Mon Dec 16 20:32:35 2002 --- sed-4.0.6/po/el.po Sat Mar 15 08:24:56 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-03-08 12:57+0000\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-03-08 12:57+0000\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" *************** *** 13,158 **** "Content-Type: text/plain; charset=iso-8859-7\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "酗腚狃胲 `!'s" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "另狃茼翦黠 `,'" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "腻 暹磲 漉磲艮 黢摅 豉 +N ~N 汩 瘃 溟妪桴眢" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "留徇耖狍麸 `{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "留徇耖狍麸 `}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "硼轲胼镯 麽襻牯揆弪 戾糗 翮 屙麸朕" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "琉衢翦唪衢 \\ 戾糗 糸 屙麸胼 `a', `c' `i'" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "麸 `}' 溴 黢彘苕弭衢 溟艴椠眢彘" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": 溴 黢彘苕弭衢 溟艴椠眢彘" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "葬 篦獒 溴 漭黠眙衢 溟艴椠眢彘" ! #: sed/compile.c:199 msgid "Missing command" msgstr "隋唣彘 屙麸朕" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr " 屙麸朕 黢珞殪镳镩暹 禳盹 扉 溟妪桴眢" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "嚏 翦耢狒轶燧礴 溟妪桴眢 赆盹黹贽 蓐鲴狍珧" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "嚏 翦耢狒轶燧礴 屙麸朕 `s'" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "嚏 翦耢狒轶燧礴 屙麸朕 `y'" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "躲睐篝 屦殡镢 汩 麸 `s'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "痫腚狃胼 屦殡镢蒡 `p' 篝珥 屙麸朕 `s'" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "痫腚狃胼 屦殡镢蒡 `g' 篝珥 屙麸朕 `s'" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "痫腚狃朦 屦殡镢蒡 狁殍祜 篝珥 屙麸朕 `s'" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr " 屦殡镢 狁殍祜 篝珥 屙麸朕 `s' 溴 祓锺暹 磲 暹磲 扃漭" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "翎 犭鲠耖桁玺殛 汩 翮 屙麸朕 `y' 暹磲 溟狯锺弭殛稞 戾爿栾躜" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "孰摅 翮 savchar() 戾 扃 犴犰屙屙 pushback (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "躲睐篝 屙麸朕:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: 狁麇唢 %s 泷犰燹 %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e 蓐鲴狍 #%lu, 麽襻牯揆狎 %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "腻 摁犴 漉磲艮 妪皴箸 弭殛蒴翎 汩 戾糗忉箸 篝 `%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: 徜蹴犰哚 篝珥 犴茔睐箸 %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "庞僭叛墒 又了塘: 赆贽 祜聆 溟妪桴眢珧" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "篥茈灬 篝 躔镤獒溟赆筮" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "溴 躔矬翮襁驽翎 屦殡镢 `e'" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "溴 躔矬翮襁驽翎 屙麸朕 `e'" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "庞僭叛墒 又了塘: 梳贽 屙麸朕 %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "腻 怦蓁珀 瘃镧泔屙 赆盹黹贽 蓐鲴狍" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "溴 屦轸褫疱翎 锺轶禳 溟犰锺鳄酤 箦 赍磙 赆盹黹贽 蓐鲴狍" --- 13,161 ---- "Content-Type: text/plain; charset=iso-8859-7\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "酗腚狃胲 `!'s" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "另狃茼翦黠 `,'" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "腻 暹磲 漉磲艮 黢摅 豉 +N ~N 汩 瘃 溟妪桴眢" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "留徇耖狍麸 `{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "留徇耖狍麸 `}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "硼轲胼镯 麽襻牯揆弪 戾糗 翮 屙麸朕" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "琉衢翦唪衢 \\ 戾糗 糸 屙麸胼 `a', `c' `i'" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "麸 `}' 溴 黢彘苕弭衢 溟艴椠眢彘" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": 溴 黢彘苕弭衢 溟艴椠眢彘" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "葬 篦獒 溴 漭黠眙衢 溟艴椠眢彘" ! #: sed/compile.c:191 msgid "Missing command" msgstr "隋唣彘 屙麸朕" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr " 屙麸朕 黢珞殪镳镩暹 禳盹 扉 溟妪桴眢" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "嚏 翦耢狒轶燧礴 溟妪桴眢 赆盹黹贽 蓐鲴狍珧" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "嚏 翦耢狒轶燧礴 屙麸朕 `s'" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "嚏 翦耢狒轶燧礴 屙麸朕 `y'" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "躲睐篝 屦殡镢 汩 麸 `s'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "痫腚狃胼 屦殡镢蒡 `p' 篝珥 屙麸朕 `s'" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "痫腚狃胼 屦殡镢蒡 `g' 篝珥 屙麸朕 `s'" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "痫腚狃朦 屦殡镢蒡 狁殍祜 篝珥 屙麸朕 `s'" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr " 屦殡镢 狁殍祜 篝珥 屙麸朕 `s' 溴 祓锺暹 磲 暹磲 扃漭" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "翎 犭鲠耖桁玺殛 汩 翮 屙麸朕 `y' 暹磲 溟狯锺弭殛稞 戾爿栾躜" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "孰摅 翮 savchar() 戾 扃 犴犰屙屙 pushback (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "躲睐篝 屙麸朕:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: 狁麇唢 %s 泷犰燹 %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e 蓐鲴狍 #%lu, 麽襻牯揆狎 %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "腻 摁犴 漉磲艮 妪皴箸 弭殛蒴翎 汩 戾糗忉箸 篝 `%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: 徜蹴犰哚 篝珥 犴茔睐箸 %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "庞僭叛墒 又了塘: 赆贽 祜聆 溟妪桴眢珧" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "篥茈灬 篝 躔镤獒溟赆筮" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "溴 躔矬翮襁驽翎 屦殡镢 `e'" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "溴 躔矬翮襁驽翎 屙麸朕 `e'" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "庞僭叛墒 又了塘: 梳贽 屙麸朕 %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "腻 怦蓁珀 瘃镧泔屙 赆盹黹贽 蓐鲴狍" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "溴 屦轸褫疱翎 锺轶禳 溟犰锺鳄酤 箦 赍磙 赆盹黹贽 蓐鲴狍" *************** *** 236,258 **** "另狯锺蒡 篥犭燔豉 燧簌 珉尻赳镯殛稞 翎黪漶镬暹秕 篝: %s .\n" "旭矬蓊翦 磲 篚祓羼殡茆弭 翮 胼铉 ``%s'' 贶痫 篝 疱溥 ``Subject:''.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 239,261 ---- "另狯锺蒡 篥犭燔豉 燧簌 珉尻赳镯殛稞 翎黪漶镬暹秕 篝: %s .\n" "旭矬蓊翦 磲 篚祓羼殡茆弭 翮 胼铉 ``%s'' 贶痫 篝 疱溥 ``Subject:''.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 267,273 **** "伺稍险衙墒显窃 柿粤怂撬显窃 蒙 磐 诱檬攀焉膛拖 邮闲, 燧黢 麸 箸戾唢\n" "痫 屦轸褫疱 睃祜.\n" ! #: lib/utils.c:131 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "腻 祓弩 磲 犴镞铢 麸 狁麇唢 %s" --- 270,276 ---- "伺稍险衙墒显窃 柿粤怂撬显窃 蒙 磐 诱檬攀焉膛拖 邮闲, 燧黢 麸 箸戾唢\n" "痫 屦轸褫疱 睃祜.\n" ! #: lib/utils.c:127 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "腻 祓弩 磲 犴镞铢 麸 狁麇唢 %s" *************** *** 284,364 **** msgid "read error on %s: %s" msgstr "篥茈灬 犴茔睐箸 篝 %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "" ! #: lib/regcomp.c:182 msgid "No match" msgstr "" ! #: lib/regcomp.c:185 #, fuzzy msgid "Invalid regular expression" msgstr "腻 怦蓁珀 瘃镧泔屙 赆盹黹贽 蓐鲴狍" ! #: lib/regcomp.c:188 #, fuzzy msgid "Invalid collation character" msgstr "扃 葶牾耧 彡镫秕柽 溟狯蹉掾 箦 觌荏 麽襻牯揆" ! #: lib/regcomp.c:191 #, fuzzy msgid "Invalid character class name" msgstr "扃 葶牾耧 彡镫秕柽 溟狯蹉掾 箦 觌荏 麽襻牯揆" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 #, fuzzy msgid "Unmatched [ or [^" msgstr "留徇耖狍麸 `{'" ! #: lib/regcomp.c:203 #, fuzzy msgid "Unmatched ( or \\(" msgstr "留徇耖狍麸 `{'" ! #: lib/regcomp.c:206 #, fuzzy msgid "Unmatched \\{" msgstr "留徇耖狍麸 `{'" ! #: lib/regcomp.c:209 #, fuzzy msgid "Invalid content of \\{\\}" msgstr "扃 葶牾耧 疱耖鬻屙 溴殛酤 屦犴茈瑛珧 {}" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:218 #, fuzzy msgid "Invalid preceding regular expression" msgstr "腻 怦蓁珀 瘃镧泔屙 赆盹黹贽 蓐鲴狍" ! #: lib/regcomp.c:221 #, fuzzy msgid "Premature end of regular expression" msgstr "腻 怦蓁珀 瘃镧泔屙 赆盹黹贽 蓐鲴狍" ! #: lib/regcomp.c:224 #, fuzzy msgid "Regular expression too big" msgstr "痫臊 戾丬腌 赆盹黹贽 蓐鲴狍" ! #: lib/regcomp.c:227 #, fuzzy msgid "Unmatched ) or \\)" msgstr "留徇耖狍麸 `{'" --- 287,367 ---- msgid "read error on %s: %s" msgstr "篥茈灬 犴茔睐箸 篝 %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "" ! #: lib/regcomp.c:132 msgid "No match" msgstr "" ! #: lib/regcomp.c:135 #, fuzzy msgid "Invalid regular expression" msgstr "腻 怦蓁珀 瘃镧泔屙 赆盹黹贽 蓐鲴狍" ! #: lib/regcomp.c:138 #, fuzzy msgid "Invalid collation character" msgstr "扃 葶牾耧 彡镫秕柽 溟狯蹉掾 箦 觌荏 麽襻牯揆" ! #: lib/regcomp.c:141 #, fuzzy msgid "Invalid character class name" msgstr "扃 葶牾耧 彡镫秕柽 溟狯蹉掾 箦 觌荏 麽襻牯揆" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 #, fuzzy msgid "Unmatched [ or [^" msgstr "留徇耖狍麸 `{'" ! #: lib/regcomp.c:153 #, fuzzy msgid "Unmatched ( or \\(" msgstr "留徇耖狍麸 `{'" ! #: lib/regcomp.c:156 #, fuzzy msgid "Unmatched \\{" msgstr "留徇耖狍麸 `{'" ! #: lib/regcomp.c:159 #, fuzzy msgid "Invalid content of \\{\\}" msgstr "扃 葶牾耧 疱耖鬻屙 溴殛酤 屦犴茈瑛珧 {}" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:168 #, fuzzy msgid "Invalid preceding regular expression" msgstr "腻 怦蓁珀 瘃镧泔屙 赆盹黹贽 蓐鲴狍" ! #: lib/regcomp.c:171 #, fuzzy msgid "Premature end of regular expression" msgstr "腻 怦蓁珀 瘃镧泔屙 赆盹黹贽 蓐鲴狍" ! #: lib/regcomp.c:174 #, fuzzy msgid "Regular expression too big" msgstr "痫臊 戾丬腌 赆盹黹贽 蓐鲴狍" ! #: lib/regcomp.c:177 #, fuzzy msgid "Unmatched ) or \\)" msgstr "留徇耖狍麸 `{'" Binary files sed-4.0.5/po/eo.gmo and sed-4.0.6/po/eo.gmo differ diff -rNC3 sed-4.0.5/po/eo.po sed-4.0.6/po/eo.po *** sed-4.0.5/po/eo.po Mon Dec 16 20:32:35 2002 --- sed-4.0.6/po/eo.po Sat Mar 15 08:24:56 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-10-27 18:00+0000\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-10-27 18:00+0000\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" *************** *** 14,159 **** "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Pluraj '!'oj" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Neatendita ','" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "Ne eblas uzi +N a怒 ~N kiel unuan adreson" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Neparigita '{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Neatendita '}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Kromaj signoj post komando" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "Atendita \\ post 'a', 'c' a怒 'i'" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "'}' ne deziras adresojn" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": ne deziras adresojn" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Komentoj ne akceptas adresojn" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Mankas komando" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Komando uzas nur unu adreson" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Nefinita adresa regesp" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Nefinita komando 's'" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Nefinita komando 'y'" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Nekonata opcio por 's'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "pluraj 'p'-opcioj por komando 's'" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "pluraj 'g'-opcioj por komando 's'" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "pluraj nombro-opcioj por komando 's'" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "nombro-opcio por komando 's' ne povas esti nul" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "膲enoj por komando 'y' havas malsamajn longojn" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Vokis savchar() kun neatendita pushback (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Nekonata komando:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: dosiero %s linio %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e esprimo #%lu, signo %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Ne povas trovi etikedon por salto al '%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ne povas legi %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNA ERARO: malbona adresspeco" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "eraro en subprocezo" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "opcio 'e' ne realigita" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "komando 'e' ne realigita" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNA ERARO: Malbona komando %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Mankas anta怒a regula esprimo" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "Ne eblas specifi modifilojn 膲e malplena regula esprimo" --- 14,162 ---- "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Pluraj '!'oj" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Neatendita ','" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "Ne eblas uzi +N a怒 ~N kiel unuan adreson" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Neparigita '{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Neatendita '}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Kromaj signoj post komando" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "Atendita \\ post 'a', 'c' a怒 'i'" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "'}' ne deziras adresojn" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": ne deziras adresojn" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Komentoj ne akceptas adresojn" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Mankas komando" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Komando uzas nur unu adreson" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Nefinita adresa regesp" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Nefinita komando 's'" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Nefinita komando 'y'" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Nekonata opcio por 's'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "pluraj 'p'-opcioj por komando 's'" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "pluraj 'g'-opcioj por komando 's'" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "pluraj nombro-opcioj por komando 's'" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "nombro-opcio por komando 's' ne povas esti nul" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "膲enoj por komando 'y' havas malsamajn longojn" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Vokis savchar() kun neatendita pushback (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Nekonata komando:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: dosiero %s linio %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e esprimo #%lu, signo %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Ne povas trovi etikedon por salto al '%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ne povas legi %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNA ERARO: malbona adresspeco" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "eraro en subprocezo" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "opcio 'e' ne realigita" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "komando 'e' ne realigita" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNA ERARO: Malbona komando %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Mankas anta怒a regula esprimo" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "Ne eblas specifi modifilojn 膲e malplena regula esprimo" *************** *** 246,257 **** "Retpo艥tu cimo-raportojn al: %s .\n" "Nepre menciu la vorton '%s' ie en la temlinio.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versio %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 249,260 ---- "Retpo艥tu cimo-raportojn al: %s .\n" "Nepre menciu la vorton '%s' ie en la temlinio.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versio %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 259,270 **** "bazita sur \"GNU sed\" versio 3.02.80\n" "\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versio %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 262,273 ---- "bazita sur \"GNU sed\" versio 3.02.80\n" "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versio %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 277,283 **** "NENIA GARANTIO; e膲 ne por KOMERCA KVALITO a怒 ADEKVATECO POR DIFINITA CELO,\n" "la怒 la grado permesita de juro.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "Ne povis malfermi dosieron %s: %s" --- 280,286 ---- "NENIA GARANTIO; e膲 ne por KOMERCA KVALITO a怒 ADEKVATECO POR DIFINITA CELO,\n" "la怒 la grado permesita de juro.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "Ne povis malfermi dosieron %s: %s" *************** *** 294,364 **** msgid "read error on %s: %s" msgstr "legeraro 膲e %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "Sukceso" ! #: lib/regcomp.c:182 msgid "No match" msgstr "Maltrafo" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Nevalida regula esprimo" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Nevalida kunfanda signo" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Nevalida nomo de signoklaso" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Malsuprenstreko 膲e fino" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Nevalida retroreferenco" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "Neparigita [ a怒 [^" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "Neparigita ( a怒 \\(" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "Neparigita \\{" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Nevalida enhavo de \\{\\}" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Nevalida fino de gamo" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "Mankas memoro" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Nevalida anta怒a regula esprimo" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Neatendita fino de regula esprimo" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Regula esprimo tro granda" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr "Neparigita ) a怒 \\)" --- 297,367 ---- msgid "read error on %s: %s" msgstr "legeraro 膲e %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "Sukceso" ! #: lib/regcomp.c:132 msgid "No match" msgstr "Maltrafo" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Nevalida regula esprimo" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Nevalida kunfanda signo" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Nevalida nomo de signoklaso" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Malsuprenstreko 膲e fino" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Nevalida retroreferenco" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "Neparigita [ a怒 [^" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "Neparigita ( a怒 \\(" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "Neparigita \\{" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Nevalida enhavo de \\{\\}" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Nevalida fino de gamo" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "Mankas memoro" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Nevalida anta怒a regula esprimo" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Neatendita fino de regula esprimo" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Regula esprimo tro granda" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr "Neparigita ) a怒 \\)" Binary files sed-4.0.5/po/es.gmo and sed-4.0.6/po/es.gmo differ diff -rNC3 sed-4.0.5/po/es.po sed-4.0.6/po/es.po *** sed-4.0.5/po/es.po Mon Dec 16 20:32:35 2002 --- sed-4.0.6/po/es.po Sat Mar 15 08:24:56 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 4.0.2\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-11-22 17:13-0600\n" "Last-Translator: Cristian Oth髇 Mart韓ez Vera \n" "Language-Team: Spanish \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 4.0.2\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-11-22 17:13-0600\n" "Last-Translator: Cristian Oth髇 Mart韓ez Vera \n" "Language-Team: Spanish \n" *************** *** 14,160 **** "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "'!'s m鷏tiples" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "`,' inesperada" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "No se pueden usar +N o ~N como primera direcci髇" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "`{' sin pareja" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "`}' inesperado" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Caracteres extra despu閟 de la orden" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "Se esperaba \\ despu閟 de `a', `c' `i'" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' no acepta ninguna direcci髇" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": no acepta ninguna direcci髇" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Los comentarios no aceptan ninguna direcci髇" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Orden faltante" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "La orden solamente usa una direcci髇" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "La direcci髇 de expresi髇 regular no est completa" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Orden `s' sin terminar" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Orden `y' sin terminar" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Opci髇 desconocida para `s'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "m鷏tiples opciones `p' para la orden `s'" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "m鷏tiples opciones `g' para la orden `s'" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "m鷏tiples opciones num閞icas para la orden `s'" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "una opci髇 num閞ica para la orden `s' no puede ser cero" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "las cadenas para la orden y son de longitudes diferentes" # FUZZY: pushback -> empuje? cfuga ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "savchar() llamado con empuje inesperado (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Orden desconocida:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fichero %s l韓ea %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expresi髇 #%lu, car醕ter %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "No se puede encontra la etiqueta para saltar a `%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: no se puede leer %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "ERROR INTERNO: tipo de direcci髇 err髇eo" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "error en el subproceso" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "no hay soporte para la opci髇 `e'" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "no hay soporte para el comando `e'" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "ERROR INTERNO: cmd %c err髇eo" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "No hay una expresi髇 regular previa" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "No se pueden especificar modificadores en expresiones regulares vac韆s" --- 14,163 ---- "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "'!'s m鷏tiples" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "`,' inesperada" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "No se pueden usar +N o ~N como primera direcci髇" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "`{' sin pareja" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "`}' inesperado" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Caracteres extra despu閟 de la orden" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "Se esperaba \\ despu閟 de `a', `c' `i'" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' no acepta ninguna direcci髇" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": no acepta ninguna direcci髇" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Los comentarios no aceptan ninguna direcci髇" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Orden faltante" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "La orden solamente usa una direcci髇" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "La direcci髇 de expresi髇 regular no est completa" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Orden `s' sin terminar" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Orden `y' sin terminar" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Opci髇 desconocida para `s'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "m鷏tiples opciones `p' para la orden `s'" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "m鷏tiples opciones `g' para la orden `s'" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "m鷏tiples opciones num閞icas para la orden `s'" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "una opci髇 num閞ica para la orden `s' no puede ser cero" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "las cadenas para la orden y son de longitudes diferentes" + #: sed/compile.c:202 + msgid "expected newer version of sed" + msgstr "" + # FUZZY: pushback -> empuje? cfuga ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "savchar() llamado con empuje inesperado (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Orden desconocida:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fichero %s l韓ea %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expresi髇 #%lu, car醕ter %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "No se puede encontra la etiqueta para saltar a `%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: no se puede leer %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "ERROR INTERNO: tipo de direcci髇 err髇eo" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "error en el subproceso" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "no hay soporte para la opci髇 `e'" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "no hay soporte para el comando `e'" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "ERROR INTERNO: cmd %c err髇eo" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "No hay una expresi髇 regular previa" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "No se pueden especificar modificadores en expresiones regulares vac韆s" *************** *** 257,268 **** "Aseg鷕ese de incluir la palabra ``%s'' en alg鷑 lugar en el campo " "``Subject:''.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versi髇 %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 260,271 ---- "Aseg鷕ese de incluir la palabra ``%s'' en alg鷑 lugar en el campo " "``Subject:''.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versi髇 %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 270,281 **** "basado en GNU sed versi髇 3.02.80\n" "\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versi髇 %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 273,284 ---- "basado en GNU sed versi髇 3.02.80\n" "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versi髇 %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 288,294 **** "No hay NINGUNA garant韆; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n" "FIN DETERMINADO, en la extensi髇 permitida por ley.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "No se puede abrir el fichero %s: %s" --- 291,297 ---- "No hay NINGUNA garant韆; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n" "FIN DETERMINADO, en la extensi髇 permitida por ley.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "No se puede abrir el fichero %s: %s" *************** *** 305,375 **** msgid "read error on %s: %s" msgstr "error al leer de %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "蓌ito" ! #: lib/regcomp.c:182 msgid "No match" msgstr "No hay coincidencia" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Expresion regular inv醠ida" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Car醕ter de ordenamiento inv醠ido" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Car醕ter de nombre de clase inv醠ido" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Diagonal invertida al final" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Referencia hacia atr醩 inv醠ida" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "[ [^ sin pareja" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "( \\( sin pareja" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "\\{ sin pareja" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Contenido inv醠ido de \\{\\}" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Final de rango inv醠ido" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "Memoria agotada" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Expresi髇 regular precedente inv醠ida" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Final prematuro de la expresi髇 regular" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Expresi髇 regular demasiado grande" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr ") \\) sin pareja" --- 308,378 ---- msgid "read error on %s: %s" msgstr "error al leer de %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "蓌ito" ! #: lib/regcomp.c:132 msgid "No match" msgstr "No hay coincidencia" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Expresion regular inv醠ida" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Car醕ter de ordenamiento inv醠ido" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Car醕ter de nombre de clase inv醠ido" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Diagonal invertida al final" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Referencia hacia atr醩 inv醠ida" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "[ [^ sin pareja" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "( \\( sin pareja" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "\\{ sin pareja" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Contenido inv醠ido de \\{\\}" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Final de rango inv醠ido" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "Memoria agotada" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Expresi髇 regular precedente inv醠ida" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Final prematuro de la expresi髇 regular" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Expresi髇 regular demasiado grande" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr ") \\) sin pareja" Binary files sed-4.0.5/po/et.gmo and sed-4.0.6/po/et.gmo differ diff -rNC3 sed-4.0.5/po/et.po sed-4.0.6/po/et.po *** sed-4.0.5/po/et.po Mon Dec 16 20:32:35 2002 --- sed-4.0.6/po/et.po Sat Mar 15 08:24:56 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-10-25 11:00+03:00\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-10-25 11:00+03:00\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" *************** *** 14,159 **** "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Korduv `!'" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Ootamatu `,'" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "+N v鮥 ~N ei v鮥 kasutada esimese aadressina" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Liigne `{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Ootamatu `}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Lisas黰bolid peale k鋝ku" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "Peale `a', `c' v鮥 `i' peab olema \\" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' ei vaja aadresse" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": ei vaja aadresse" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Kommentaarid ei vaja aadresse" ! #: sed/compile.c:199 msgid "Missing command" msgstr "K鋝k puudub" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "K鋝k kasutab vaid 黨t aadressi" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "L鮬etamata aadressi avaldis" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "L鮬etamata `s' k鋝k" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "L鮬etamata `y' k鋝k" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Tundmatu v鮰i `s' k鋝ule" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "korduv `p' v鮰i `s' k鋝us" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "korduv `g' v鮰i `s' k鋝us" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "korduvad numbriv鮰med `s' k鋝us" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "numbriv鮰i `s' k鋝us ei v鮥 olla null" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "s鮪ed y k鋝us on erineva pikkusega" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "kutsuti savchar() ootamatu pushback (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Tundmatu k鋝k:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fail %s rida %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e avaldis #%lu, s黰bol %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Ei leia m鋜gendit, et h黳ata kohale `%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ei saa lugeda %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "SISEMINE VIGA: vigane aadressi tp" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "viga alamprotsessis" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "v鮰it `e' ei toetata" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "k鋝ku `e' ei toetata" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "SISEMINE VIGA: Halb k鋝k %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Eelmist regulaaravaldist pole" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "Muudatusi t黨jale regulaaravaldisele ei saa m滗rata" --- 14,162 ---- "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Korduv `!'" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Ootamatu `,'" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "+N v鮥 ~N ei v鮥 kasutada esimese aadressina" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Liigne `{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Ootamatu `}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Lisas黰bolid peale k鋝ku" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "Peale `a', `c' v鮥 `i' peab olema \\" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' ei vaja aadresse" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": ei vaja aadresse" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Kommentaarid ei vaja aadresse" ! #: sed/compile.c:191 msgid "Missing command" msgstr "K鋝k puudub" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "K鋝k kasutab vaid 黨t aadressi" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "L鮬etamata aadressi avaldis" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "L鮬etamata `s' k鋝k" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "L鮬etamata `y' k鋝k" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Tundmatu v鮰i `s' k鋝ule" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "korduv `p' v鮰i `s' k鋝us" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "korduv `g' v鮰i `s' k鋝us" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "korduvad numbriv鮰med `s' k鋝us" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "numbriv鮰i `s' k鋝us ei v鮥 olla null" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "s鮪ed y k鋝us on erineva pikkusega" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "kutsuti savchar() ootamatu pushback (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Tundmatu k鋝k:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fail %s rida %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e avaldis #%lu, s黰bol %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Ei leia m鋜gendit, et h黳ata kohale `%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ei saa lugeda %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "SISEMINE VIGA: vigane aadressi tp" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "viga alamprotsessis" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "v鮰it `e' ei toetata" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "k鋝ku `e' ei toetata" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "SISEMINE VIGA: Halb k鋝k %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Eelmist regulaaravaldist pole" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "Muudatusi t黨jale regulaaravaldisele ei saa m滗rata" *************** *** 241,252 **** "Postitage teated vigadest: %s .\n" "Lisage kindlasti s鮪a ``%s'' ``Subject:'' reale.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versioon %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 244,255 ---- "Postitage teated vigadest: %s .\n" "Lisage kindlasti s鮪a ``%s'' ``Subject:'' reale.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versioon %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 254,265 **** "p鮤ineb GNU sed versioonil 3.02.80\n" "\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versioon %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 257,268 ---- "p鮤ineb GNU sed versioonil 3.02.80\n" "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versioon %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 272,278 **** "PUUDUB; ka mgiks v鮥 mingil eesm鋜gil kasutamiseks, vastavalt seadustega\n" "lubatud piiridele.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "Faili %s ei saa avada: %s" --- 275,281 ---- "PUUDUB; ka mgiks v鮥 mingil eesm鋜gil kasutamiseks, vastavalt seadustega\n" "lubatud piiridele.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "Faili %s ei saa avada: %s" *************** *** 289,359 **** msgid "read error on %s: %s" msgstr "lugemisviga %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "Edukas" ! #: lib/regcomp.c:182 msgid "No match" msgstr "Ei leia" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Vigane regulaaravaldis" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Vigane sortimise s黰bol" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Vigane s黰bolite klassi nimi" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "L鮬etav langkriips" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Vigane tagasi viide" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "Puudub [ v鮥 [^" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "Puudub ( v鮥 \\(" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "Puudub \\{" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Vigane \\{\\} sisu" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Vigane vahemiku l鮬p" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "M鋖u on otsas" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Vigane eelnev regulaaravaldis" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Ootamatu regulaaravaldise l鮬p" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Regulaaravaldis on liiga suur" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr "Puudub ) v鮥 \\)" --- 292,362 ---- msgid "read error on %s: %s" msgstr "lugemisviga %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "Edukas" ! #: lib/regcomp.c:132 msgid "No match" msgstr "Ei leia" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Vigane regulaaravaldis" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Vigane sortimise s黰bol" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Vigane s黰bolite klassi nimi" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "L鮬etav langkriips" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Vigane tagasi viide" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "Puudub [ v鮥 [^" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "Puudub ( v鮥 \\(" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "Puudub \\{" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Vigane \\{\\} sisu" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Vigane vahemiku l鮬p" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "M鋖u on otsas" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Vigane eelnev regulaaravaldis" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Ootamatu regulaaravaldise l鮬p" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Regulaaravaldis on liiga suur" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr "Puudub ) v鮥 \\)" Binary files sed-4.0.5/po/fi.gmo and sed-4.0.6/po/fi.gmo differ diff -rNC3 sed-4.0.5/po/fi.po sed-4.0.6/po/fi.po *** sed-4.0.5/po/fi.po Mon Dec 16 20:32:36 2002 --- sed-4.0.6/po/fi.po Sat Mar 15 08:24:56 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed-3.02.80\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-07-09 13:02+0200\n" "Last-Translator: Sami J. Laine \n" "Language-Team: Finnish \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed-3.02.80\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-07-09 13:02+0200\n" "Last-Translator: Sami J. Laine \n" "Language-Team: Finnish \n" *************** *** 13,158 **** "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Useita \"!\"-merkkej" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Odottamaton \",\"" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "Ensimm鋓sen osoitteena ei voi olla +N tai ~N" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Pariton \"{\"" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Pariton \"}\"" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Ylim滗r鋓si merkkej komennon j鋖keen" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "\"}\" ei tarvitse osoitteita" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": ei tarvitse osoitteita" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Kommentit eiv鋞 hyv鋕sy osoitteita" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Puuttuva komento" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Komento k鋣tt滗 vain yht osoitetta" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "P滗ttym鋞鰊 osoite vakiolauseessa" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "P滗ttym鋞鰊 \"s\"-komento" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "P滗ttym鋞鰊 \"y\"-komento" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Tuntematon valitsin \"s\":lle" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "useita \"p\"-valitsimia \"s\"-komennolle" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "useita \"g\"-valitsimia \"s\"-komennolle" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "useita valitsimia \"s\"-komennolle" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "numeerinen valitsin \"s\"-komennolle ei voi olla nolla" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "merkkijonot \"y\"-komennolle ovat pituudeltaan vaihtelevia" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Kutsuttiin funktiota savchar() odottamattomalla taaksepainannalla (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Tuntematon komento:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: tiedosto %s rivi %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e lauseke #%lu, merkki %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Nimikett hypylle kohteeseen \"%s\" ei l鰕dy" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ei voida lukea sy鰐ett %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "SIS腎NEN VIRHE: virheellinen osoitetyyppi" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "SIS腎NEN VIRHE: Virheellinen komento %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" --- 13,161 ---- "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Useita \"!\"-merkkej" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Odottamaton \",\"" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "Ensimm鋓sen osoitteena ei voi olla +N tai ~N" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Pariton \"{\"" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Pariton \"}\"" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Ylim滗r鋓si merkkej komennon j鋖keen" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "\"}\" ei tarvitse osoitteita" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": ei tarvitse osoitteita" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Kommentit eiv鋞 hyv鋕sy osoitteita" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Puuttuva komento" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Komento k鋣tt滗 vain yht osoitetta" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "P滗ttym鋞鰊 osoite vakiolauseessa" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "P滗ttym鋞鰊 \"s\"-komento" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "P滗ttym鋞鰊 \"y\"-komento" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Tuntematon valitsin \"s\":lle" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "useita \"p\"-valitsimia \"s\"-komennolle" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "useita \"g\"-valitsimia \"s\"-komennolle" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "useita valitsimia \"s\"-komennolle" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "numeerinen valitsin \"s\"-komennolle ei voi olla nolla" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "merkkijonot \"y\"-komennolle ovat pituudeltaan vaihtelevia" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Kutsuttiin funktiota savchar() odottamattomalla taaksepainannalla (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Tuntematon komento:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: tiedosto %s rivi %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e lauseke #%lu, merkki %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Nimikett hypylle kohteeseen \"%s\" ei l鰕dy" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ei voida lukea sy鰐ett %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "SIS腎NEN VIRHE: virheellinen osoitetyyppi" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "SIS腎NEN VIRHE: Virheellinen komento %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" *************** *** 233,255 **** "L鋒et virheraportit osoitteeseen %s .\n" "Sis鋖lyt sana \"%s\" viestin aihekentt滗n (\"Subject\"-kentt滗n).\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 236,258 ---- "L鋒et virheraportit osoitteeseen %s .\n" "Sis鋖lyt sana \"%s\" viestin aihekentt滗n (\"Subject\"-kentt滗n).\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 263,269 **** "kaupallisesti hyv鋕sytt鋠鋝t laadusta tai soveltuvuudesta tiettyyn\n" "tarkoitukseen.\n" ! #: lib/utils.c:131 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "Tiedostoa %s ei voitu avata" --- 266,272 ---- "kaupallisesti hyv鋕sytt鋠鋝t laadusta tai soveltuvuudesta tiettyyn\n" "tarkoitukseen.\n" ! #: lib/utils.c:127 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "Tiedostoa %s ei voitu avata" *************** *** 280,353 **** msgid "read error on %s: %s" msgstr "lukuvirhe sy鰐teess %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "" ! #: lib/regcomp.c:182 msgid "No match" msgstr "" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 #, fuzzy msgid "Unmatched [ or [^" msgstr "Pariton \"{\"" ! #: lib/regcomp.c:203 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Pariton \"{\"" ! #: lib/regcomp.c:206 #, fuzzy msgid "Unmatched \\{" msgstr "Pariton \"{\"" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:227 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Pariton \"{\"" --- 283,356 ---- msgid "read error on %s: %s" msgstr "lukuvirhe sy鰐teess %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "" ! #: lib/regcomp.c:132 msgid "No match" msgstr "" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 #, fuzzy msgid "Unmatched [ or [^" msgstr "Pariton \"{\"" ! #: lib/regcomp.c:153 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Pariton \"{\"" ! #: lib/regcomp.c:156 #, fuzzy msgid "Unmatched \\{" msgstr "Pariton \"{\"" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:177 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Pariton \"{\"" Binary files sed-4.0.5/po/fr.gmo and sed-4.0.6/po/fr.gmo differ diff -rNC3 sed-4.0.5/po/fr.po sed-4.0.6/po/fr.po *** sed-4.0.5/po/fr.po Mon Dec 16 20:32:36 2002 --- sed-4.0.6/po/fr.po Sat Mar 15 08:24:56 2003 *************** *** 9,15 **** msgid "" msgstr "" "Project-Id-Version: sed 4.0.1\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-11-12 11:28+0100\n" "Last-Translator: Ga雔 Qu閞i \n" "Language-Team: French \n" --- 9,15 ---- msgid "" msgstr "" "Project-Id-Version: sed 4.0.1\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-11-12 11:28+0100\n" "Last-Translator: Ga雔 Qu閞i \n" "Language-Team: French \n" *************** *** 18,165 **** "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "`!' multiples" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "`,' inattendue" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "Impossible d'utiliser +N ou ~N comme premi鑢e adresse" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "`{' non referm閑" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "`}' inattendu" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Caract鑢es inutiles apr鑣 la commande" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "\\ attendu apr鑣 `a', `c' ou `i'" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' n'a besoin d'aucune adresse" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": n'a besoin d'aucune adresse" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Les commentaires n'acceptent aucune adresse" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Commande manquante" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "La commande n'utilise qu'une adresse" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Expression r間uli鑢e d'adresse inachev閑" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Commande `s' inachev閑" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Commande `y' inachev閑" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Option inconnue pour `s'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "plusieurs options `p' la commande `s'" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "plusieurs options `g' la commande `s'" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "plusieurs options num閞iques la commande `s'" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "l'option num閞ique de la comande `s' ne peut 阾re nulle" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "les cha頽es destin閑s la commande y ont des longueurs diff閞entes" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "" "La fonction savchar() a 閠 appel閑 avec un caract鑢e de rebroussement\n" "inattendu (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Commande inconnue:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fichier %s ligne %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expression n%lu, caract鑢e %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Impossible de trouver l'閠iquette pour aller `%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: impossible de lire %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "ERREUR INTERNE: mauvais type d'adresse" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "erreur dans le sous-processus" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "l'option `e' n'est pas support閑" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "la commande `e' n'est pas support閑" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "ERREUR INTERNE: mauvaise commande %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Pas d'expression r間uli鑢e pr閏閐ente" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" "Impossible de sp閏ifier des modifieurs sur une expression\n" --- 18,168 ---- "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "`!' multiples" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "`,' inattendue" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "Impossible d'utiliser +N ou ~N comme premi鑢e adresse" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "`{' non referm閑" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "`}' inattendu" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Caract鑢es inutiles apr鑣 la commande" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "\\ attendu apr鑣 `a', `c' ou `i'" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' n'a besoin d'aucune adresse" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": n'a besoin d'aucune adresse" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Les commentaires n'acceptent aucune adresse" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Commande manquante" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "La commande n'utilise qu'une adresse" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Expression r間uli鑢e d'adresse inachev閑" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Commande `s' inachev閑" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Commande `y' inachev閑" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Option inconnue pour `s'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "plusieurs options `p' la commande `s'" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "plusieurs options `g' la commande `s'" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "plusieurs options num閞iques la commande `s'" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "l'option num閞ique de la comande `s' ne peut 阾re nulle" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "les cha頽es destin閑s la commande y ont des longueurs diff閞entes" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "" "La fonction savchar() a 閠 appel閑 avec un caract鑢e de rebroussement\n" "inattendu (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Commande inconnue:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fichier %s ligne %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expression n%lu, caract鑢e %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Impossible de trouver l'閠iquette pour aller `%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: impossible de lire %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "ERREUR INTERNE: mauvais type d'adresse" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "erreur dans le sous-processus" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "l'option `e' n'est pas support閑" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "la commande `e' n'est pas support閑" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "ERREUR INTERNE: mauvaise commande %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Pas d'expression r間uli鑢e pr閏閐ente" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" "Impossible de sp閏ifier des modifieurs sur une expression\n" *************** *** 260,282 **** "N'oubliez pas d'inclure le mot ``%s'' quelque-part dans la zone " "``Subject:''\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed version %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "fond sur GNU sed version 3.02.80\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed version %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 263,285 ---- "N'oubliez pas d'inclure le mot ``%s'' quelque-part dans la zone " "``Subject:''\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed version %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "fond sur GNU sed version 3.02.80\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed version %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 290,296 **** "AUCUNE garantie n'est donn閑; y compris pour des RAISONS COMMERCIALES ou\n" "pour R蒔ONDRE A UN BESOIN PARTICULIER, l'閠endue permise par la loi.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "Impossible d'ouvrir le fichier %s: %s" --- 293,299 ---- "AUCUNE garantie n'est donn閑; y compris pour des RAISONS COMMERCIALES ou\n" "pour R蒔ONDRE A UN BESOIN PARTICULIER, l'閠endue permise par la loi.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "Impossible d'ouvrir le fichier %s: %s" *************** *** 307,377 **** msgid "read error on %s: %s" msgstr "erreur de lecture sur %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "Succ鑣" ! #: lib/regcomp.c:182 msgid "No match" msgstr "Pas de concordance" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Expression r間uli鑢e invalide" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Caract鑢e de collation invalide" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Nom de classe de caract鑢es invalide" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Antislash de protection" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "R閒閞ence arri鑢e invalide" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "[ ou [^ non referm" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "( ou \\( non referm" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "\\{ non referm" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Contenu de \\{\\} invalide" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Fin d'intervalle invalide" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "M閙oire 閜uis閑" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "L'expression r間uli鑢e pr閏閐ente est invalide" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Fin pr閙atur閑 d'une expression r間uli鑢e" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Expression r間uli鑢e trop grande" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr ") ou \\) non referm" --- 310,380 ---- msgid "read error on %s: %s" msgstr "erreur de lecture sur %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "Succ鑣" ! #: lib/regcomp.c:132 msgid "No match" msgstr "Pas de concordance" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Expression r間uli鑢e invalide" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Caract鑢e de collation invalide" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Nom de classe de caract鑢es invalide" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Antislash de protection" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "R閒閞ence arri鑢e invalide" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "[ ou [^ non referm" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "( ou \\( non referm" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "\\{ non referm" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Contenu de \\{\\} invalide" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Fin d'intervalle invalide" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "M閙oire 閜uis閑" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "L'expression r間uli鑢e pr閏閐ente est invalide" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Fin pr閙atur閑 d'une expression r間uli鑢e" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Expression r間uli鑢e trop grande" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr ") ou \\) non referm" Binary files sed-4.0.5/po/gl.gmo and sed-4.0.6/po/gl.gmo differ diff -rNC3 sed-4.0.5/po/gl.po sed-4.0.6/po/gl.po *** sed-4.0.5/po/gl.po Mon Dec 16 20:32:36 2002 --- sed-4.0.6/po/gl.po Sat Mar 15 08:24:56 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-10-25 15:57+0200\n" "Last-Translator: Jacobo Tarr韔 Barreiro \n" "Language-Team: Galician \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-10-25 15:57+0200\n" "Last-Translator: Jacobo Tarr韔 Barreiro \n" "Language-Team: Galician \n" *************** *** 14,159 **** "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "M鷏tiples `!'s" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "`,' inesperada" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "Non se pode usar +N ou ~N como primeira direcci髇" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "`{' sen parella" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "`}' inesperado" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Caracteres extra despois da instrucci髇" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "Esper醔ase \\ despois de `a', `c' ou `i'" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' non acepta un enderezo" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": non acepta un enderezo" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Os comentarios non aceptan enderezos" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Falta unha instrucci髇" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "A instrucci髇 s usa un enderezo" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Expresi髇 regular de enderezo non rematada" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Instrucci髇 `s' non rematada" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Instrucci髇 `y' non rematada" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Opci髇 de `s' desco馿cida" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "m鷏tiples opci髇s `p' para a instrucci髇 `s'" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "m鷏tiples opci髇s `g' para a instrucci髇 `s'" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "m鷏tiples opci髇s num閞icas para a instrucci髇 `s'" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "unha opci髇 num閞ica para a instrucci髇 `s' non pode ser cero" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "as cadeas para a instrucci髇 y te馿n lonxitudes diferentes" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Chamouse a savchar() cun pushback inesperado (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Instrucci髇 desco馿cida:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: ficheiro %s li馻 %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expresi髇 #%lu, car醕ter %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Non se puido atopa-la etiqueta para saltar a `%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: non se puido ler %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "ERRO INTERNO: tipo de enderezo incorrecto" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "erro no subproceso" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "a opci髇 `e' non est soportada" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "o comando `e' non est soportado" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "ERRO INTERNO: instrucci髇 %c incorrecta" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Non hai unha expresi髇 regular anterior" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "Non se poden especificar modificadores nunha expresi髇 regular baleira" --- 14,162 ---- "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "M鷏tiples `!'s" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "`,' inesperada" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "Non se pode usar +N ou ~N como primeira direcci髇" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "`{' sen parella" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "`}' inesperado" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Caracteres extra despois da instrucci髇" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "Esper醔ase \\ despois de `a', `c' ou `i'" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' non acepta un enderezo" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": non acepta un enderezo" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Os comentarios non aceptan enderezos" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Falta unha instrucci髇" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "A instrucci髇 s usa un enderezo" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Expresi髇 regular de enderezo non rematada" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Instrucci髇 `s' non rematada" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Instrucci髇 `y' non rematada" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Opci髇 de `s' desco馿cida" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "m鷏tiples opci髇s `p' para a instrucci髇 `s'" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "m鷏tiples opci髇s `g' para a instrucci髇 `s'" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "m鷏tiples opci髇s num閞icas para a instrucci髇 `s'" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "unha opci髇 num閞ica para a instrucci髇 `s' non pode ser cero" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "as cadeas para a instrucci髇 y te馿n lonxitudes diferentes" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Chamouse a savchar() cun pushback inesperado (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Instrucci髇 desco馿cida:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: ficheiro %s li馻 %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expresi髇 #%lu, car醕ter %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Non se puido atopa-la etiqueta para saltar a `%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: non se puido ler %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "ERRO INTERNO: tipo de enderezo incorrecto" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "erro no subproceso" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "a opci髇 `e' non est soportada" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "o comando `e' non est soportado" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "ERRO INTERNO: instrucci髇 %c incorrecta" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Non hai unha expresi髇 regular anterior" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "Non se poden especificar modificadores nunha expresi髇 regular baleira" *************** *** 249,271 **** "Informe dos erros na traducci髇 a gpul-traduccion@ceu.fi.udc.es .\n" "Aseg鷕ese de inclu-la palabra ``%s'' nalgunha parte do campo ``Subject:''.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versi髇 %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "baseado en GNU sed versi髇 3.02.80\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versi髇 %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 252,274 ---- "Informe dos erros na traducci髇 a gpul-traduccion@ceu.fi.udc.es .\n" "Aseg鷕ese de inclu-la palabra ``%s'' nalgunha parte do campo ``Subject:''.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versi髇 %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "baseado en GNU sed versi髇 3.02.80\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versi髇 %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 280,286 **** "DETERMINADO,\n" "ata o que permite a lei.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "Non se puido abri-lo ficheiro %s: %s" --- 283,289 ---- "DETERMINADO,\n" "ata o que permite a lei.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "Non se puido abri-lo ficheiro %s: %s" *************** *** 297,367 **** msgid "read error on %s: %s" msgstr "erro de lectura en %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "蓌ito" ! #: lib/regcomp.c:182 msgid "No match" msgstr "Non se atopou" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Expresi髇 regular non v醠ida" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Car醕ter de ordeamento non v醠ido" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Nome de clase de caracteres non v醠ido" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Barra invertida fin de li馻" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Referencia cara a atr醩 non v醠ida" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "[ ou [^ sen parella" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "( ou \\( sen parella" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "\\{ sen parella" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Contido de \\{\\} non v醠ido" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Fin de rango non v醠ida" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "Memoria esgotada" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Expresi髇 regular anterior non v醠ida" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Fin prematura da expresi髇 regular" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Expresi髇 regular grande de m醝s" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr ") ou \\) sen parella" --- 300,370 ---- msgid "read error on %s: %s" msgstr "erro de lectura en %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "蓌ito" ! #: lib/regcomp.c:132 msgid "No match" msgstr "Non se atopou" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Expresi髇 regular non v醠ida" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Car醕ter de ordeamento non v醠ido" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Nome de clase de caracteres non v醠ido" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Barra invertida fin de li馻" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Referencia cara a atr醩 non v醠ida" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "[ ou [^ sen parella" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "( ou \\( sen parella" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "\\{ sen parella" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Contido de \\{\\} non v醠ido" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Fin de rango non v醠ida" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "Memoria esgotada" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Expresi髇 regular anterior non v醠ida" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Fin prematura da expresi髇 regular" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Expresi髇 regular grande de m醝s" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr ") ou \\) sen parella" Binary files sed-4.0.5/po/he.gmo and sed-4.0.6/po/he.gmo differ diff -rNC3 sed-4.0.5/po/he.po sed-4.0.6/po/he.po *** sed-4.0.5/po/he.po Mon Dec 16 20:32:36 2002 --- sed-4.0.6/po/he.po Sat Mar 15 08:24:57 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2001-08-04 20:37+0300\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Hebrew \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2001-08-04 20:37+0300\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Hebrew \n" *************** *** 13,158 **** "Content-Type: text/plain; charset=ISO-8859-8\n" "Content-Transfer-Encoding: 8-bit\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "`!' 殄衢" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "殄赧-辁灬 `,'" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "漯妁帏 妃腚 ~N 遴 +N- 潇 嵇轲 囔" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "忮-镝 屐 镩帙 `{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "殄赧-辁灬 `}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "溷鬻翡 轼玎 黹彘 黹妃" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "徨 灬黝 屦猷 `}'" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr "徨 灬黝 屦猷 :" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "徨 灬黝 镳猷 " ! #: sed/compile.c:199 msgid "Missing command" msgstr "澍耒 溷鬻" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "汜灬  妃 狩 彐 溷鬻" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "礤轳 囔 妃 禊 轼戾怿 殄栝" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "礤轳 囔 `s' 鬻" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "礤轳 囔 `y' 鬻" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "`s' 禊 孱-辁灬 镩轸囝" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "`s' 溷鬻綮 黹徨 `p' 轲殚羿" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "`s' 溷鬻綮 黹徨 `g' 轲殚羿" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "`s' 溷鬻綮 黹徨 耦 轲殚羿" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "耵 殇 戾腴 屦猷 `s' 溷鬻綮 轼赳 镩轸囝" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "漯妁 犋遴 镳殇 `y' 溷鬻綮 驽" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "(%x) 殄赧-辁灬 pushback 眚 溧 savchar() 溟鲼疱" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "脲-辁灬 溷鬻 漯殇" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s 痣 (%s 踽鬻 禊 %lu 澍妁) %s 溧殁鵟n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s 痣 (%lu '耦 -e 殄栝 禊 %lu '耦 妃) %s 溧殁鵟n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "溧鲱 囔 `%s' 漩轸 邋" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s 痣 %s 轼麽 (%s) 溧殁鵟n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "蝈汩-辁灬 妃 忮 :澍孱 漯膪 鼹" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "%c 徨 溷鬻 :澍孱 漯膪 鼹" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" --- 13,161 ---- "Content-Type: text/plain; charset=ISO-8859-8\n" "Content-Transfer-Encoding: 8-bit\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "`!' 殄衢" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "殄赧-辁灬 `,'" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "漯妁帏 妃腚 ~N 遴 +N- 潇 嵇轲 囔" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "忮-镝 屐 镩帙 `{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "殄赧-辁灬 `}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "溷鬻翡 轼玎 黹彘 黹妃" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "徨 灬黝 屦猷 `}'" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr "徨 灬黝 屦猷 :" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "徨 灬黝 镳猷 " ! #: sed/compile.c:191 msgid "Missing command" msgstr "澍耒 溷鬻" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "汜灬  妃 狩 彐 溷鬻" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "礤轳 囔 妃 禊 轼戾怿 殄栝" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "礤轳 囔 `s' 鬻" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "礤轳 囔 `y' 鬻" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "`s' 禊 孱-辁灬 镩轸囝" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "`s' 溷鬻綮 黹徨 `p' 轲殚羿" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "`s' 溷鬻綮 黹徨 `g' 轲殚羿" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "`s' 溷鬻綮 黹徨 耦 轲殚羿" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "耵 殇 戾腴 屦猷 `s' 溷鬻綮 轼赳 镩轸囝" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "漯妁 犋遴 镳殇 `y' 溷鬻綮 驽" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "(%x) 殄赧-辁灬 pushback 眚 溧 savchar() 溟鲼疱" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "脲-辁灬 溷鬻 漯殇" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s 痣 (%s 踽鬻 禊 %lu 澍妁) %s 溧殁鵟n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s 痣 (%lu '耦 -e 殄栝 禊 %lu '耦 妃) %s 溧殁鵟n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "溧鲱 囔 `%s' 漩轸 邋" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s 痣 %s 轼麽 (%s) 溧殁鵟n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "蝈汩-辁灬 妃 忮 :澍孱 漯膪 鼹" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "%c 徨 溷鬻 :澍孱 漯膪 鼹" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" *************** *** 231,253 **** " .%s 妃腱 (bugs) 潇鼹 殓邋殂 珏禊 囵\n" " .(``Subject'') ``镥沭'' 妁 ``%s'' 潇轭 戾祀 邈轸麂 囵郳n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 234,256 ---- " .%s 妃腱 (bugs) 潇鼹 殓邋殂 珏禊 囵\n" " .(``Subject'') ``镥沭'' 妁 ``%s'' 潇轭 戾祀 邈轸麂 囵郳n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 260,266 **** " 溷轭 驽 ,嚅澌 祀 彐猷 漕帔 遴 珩 睐 囔 屐轸 ;轼玎 狷脶\n" " . 羿 麇玟鵟n" ! #: lib/utils.c:131 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "%s 踽鬻 辁翎 潇鼹" --- 263,269 ---- " 溷轭 驽 ,嚅澌 祀 彐猷 漕帔 遴 珩 睐 囔 屐轸 ;轼玎 狷脶\n" " . 羿 麇玟鵟n" ! #: lib/utils.c:127 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "%s 踽鬻 辁翎 潇鼹" *************** *** 277,350 **** msgid "read error on %s: %s" msgstr "%s 轼麽 (%s) 潇鼹" ! #: lib/regcomp.c:179 msgid "Success" msgstr "" ! #: lib/regcomp.c:182 msgid "No match" msgstr "" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 #, fuzzy msgid "Unmatched [ or [^" msgstr "忮-镝 屐 镩帙 `{'" ! #: lib/regcomp.c:203 #, fuzzy msgid "Unmatched ( or \\(" msgstr "忮-镝 屐 镩帙 `{'" ! #: lib/regcomp.c:206 #, fuzzy msgid "Unmatched \\{" msgstr "忮-镝 屐 镩帙 `{'" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:227 #, fuzzy msgid "Unmatched ) or \\)" msgstr "忮-镝 屐 镩帙 `{'" --- 280,353 ---- msgid "read error on %s: %s" msgstr "%s 轼麽 (%s) 潇鼹" ! #: lib/regcomp.c:129 msgid "Success" msgstr "" ! #: lib/regcomp.c:132 msgid "No match" msgstr "" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 #, fuzzy msgid "Unmatched [ or [^" msgstr "忮-镝 屐 镩帙 `{'" ! #: lib/regcomp.c:153 #, fuzzy msgid "Unmatched ( or \\(" msgstr "忮-镝 屐 镩帙 `{'" ! #: lib/regcomp.c:156 #, fuzzy msgid "Unmatched \\{" msgstr "忮-镝 屐 镩帙 `{'" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:177 #, fuzzy msgid "Unmatched ) or \\)" msgstr "忮-镝 屐 镩帙 `{'" Binary files sed-4.0.5/po/hr.gmo and sed-4.0.6/po/hr.gmo differ diff -rNC3 sed-4.0.5/po/hr.po sed-4.0.6/po/hr.po *** sed-4.0.5/po/hr.po Mon Dec 16 20:32:36 2002 --- sed-4.0.6/po/hr.po Sat Mar 15 08:24:57 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 3.02a\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-06-14 15:17-01\n" "Last-Translator: Denis Lackovic \n" "Language-Team: Croatian \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 3.02a\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-06-14 15:17-01\n" "Last-Translator: Denis Lackovic \n" "Language-Team: Croatian \n" *************** *** 15,160 **** "Plural-Forms: nplurals=2; plural=(n==1?0:1);\n" "X-Generator: TransDict server\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Vi拧estruki `!'" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Neo膷ekivani `,'" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "Ne mogu koristiti +N ili ~N kao prvu adresu" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Neuparena `{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Neo膷ekivana `}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Vi拧ak znakova nakon komande" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' ne 啪eli nikakve adrese" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": ne 啪eli nikakve adrese" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Komentari ne primaju adrese" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Nedostaje naredba" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Naredba koristi samo jednu adresu" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Nezavr拧eni regularni izraz adrese" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Nezavr拧ena `s' naredba" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Nezavr拧ena `y' naredba" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Nepoznata opcija za `s'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "vi拧estruke `p' opcije za `s' naredbu" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "vi拧estruke `g' opcije za `s' naredbu" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "vi拧ak opcija za za `s' naredbu" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "broj opcija za naredbu `s' ne smije biti nula" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "znakovni nizovi za naredbu y su razli膷itih duljina" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Pozvao savchar() sa neo膷ekivanim rezultatom (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Nepoznata naredba:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: datoteka %s redak %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e izraz #%lu, znak %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Ne mogu na膰i labelu na koju bi trebalo sko膷iti `%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ne mogu 膷itati %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNA GRE艩KA: neispravan tip adrese" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNA GRE艩KA: Neispravna naredba %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Nedostaje prethodni regularni izraz" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" --- 15,163 ---- "Plural-Forms: nplurals=2; plural=(n==1?0:1);\n" "X-Generator: TransDict server\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Vi拧estruki `!'" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Neo膷ekivani `,'" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "Ne mogu koristiti +N ili ~N kao prvu adresu" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Neuparena `{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Neo膷ekivana `}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Vi拧ak znakova nakon komande" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' ne 啪eli nikakve adrese" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": ne 啪eli nikakve adrese" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Komentari ne primaju adrese" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Nedostaje naredba" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Naredba koristi samo jednu adresu" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Nezavr拧eni regularni izraz adrese" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Nezavr拧ena `s' naredba" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Nezavr拧ena `y' naredba" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Nepoznata opcija za `s'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "vi拧estruke `p' opcije za `s' naredbu" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "vi拧estruke `g' opcije za `s' naredbu" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "vi拧ak opcija za za `s' naredbu" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "broj opcija za naredbu `s' ne smije biti nula" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "znakovni nizovi za naredbu y su razli膷itih duljina" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Pozvao savchar() sa neo膷ekivanim rezultatom (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Nepoznata naredba:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: datoteka %s redak %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e izraz #%lu, znak %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Ne mogu na膰i labelu na koju bi trebalo sko膷iti `%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ne mogu 膷itati %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNA GRE艩KA: neispravan tip adrese" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNA GRE艩KA: Neispravna naredba %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Nedostaje prethodni regularni izraz" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" *************** *** 232,254 **** "E-mail bug prijave (na engleskom) po拧aljite na: %s .\n" "Uklju膷ite rije膷 ``%s'' u polju ``Subject:''.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 235,257 ---- "E-mail bug prijave (na engleskom) po拧aljite na: %s .\n" "Uklju膷ite rije膷 ``%s'' u polju ``Subject:''.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 262,268 **** " NEMA garancije;\n" "膷ak ni tvrdnje o ISPLATIVOSTI ili POGODNOSTI ZA NEKU SVRHU.\n" ! #: lib/utils.c:131 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "Ne mogu otvoriti datoteku %s" --- 265,271 ---- " NEMA garancije;\n" "膷ak ni tvrdnje o ISPLATIVOSTI ili POGODNOSTI ZA NEKU SVRHU.\n" ! #: lib/utils.c:127 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "Ne mogu otvoriti datoteku %s" *************** *** 279,356 **** msgid "read error on %s: %s" msgstr "Gre拧ka u 膷itanju na %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "" ! #: lib/regcomp.c:182 msgid "No match" msgstr "" ! #: lib/regcomp.c:185 #, fuzzy msgid "Invalid regular expression" msgstr "Nedostaje prethodni regularni izraz" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 #, fuzzy msgid "Unmatched [ or [^" msgstr "Neuparena `{'" ! #: lib/regcomp.c:203 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Neuparena `{'" ! #: lib/regcomp.c:206 #, fuzzy msgid "Unmatched \\{" msgstr "Neuparena `{'" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:218 #, fuzzy msgid "Invalid preceding regular expression" msgstr "Nedostaje prethodni regularni izraz" ! #: lib/regcomp.c:221 #, fuzzy msgid "Premature end of regular expression" msgstr "Nedostaje prethodni regularni izraz" ! #: lib/regcomp.c:224 #, fuzzy msgid "Regular expression too big" msgstr "Nedostaje prethodni regularni izraz" ! #: lib/regcomp.c:227 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Neuparena `{'" --- 282,359 ---- msgid "read error on %s: %s" msgstr "Gre拧ka u 膷itanju na %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "" ! #: lib/regcomp.c:132 msgid "No match" msgstr "" ! #: lib/regcomp.c:135 #, fuzzy msgid "Invalid regular expression" msgstr "Nedostaje prethodni regularni izraz" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 #, fuzzy msgid "Unmatched [ or [^" msgstr "Neuparena `{'" ! #: lib/regcomp.c:153 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Neuparena `{'" ! #: lib/regcomp.c:156 #, fuzzy msgid "Unmatched \\{" msgstr "Neuparena `{'" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:168 #, fuzzy msgid "Invalid preceding regular expression" msgstr "Nedostaje prethodni regularni izraz" ! #: lib/regcomp.c:171 #, fuzzy msgid "Premature end of regular expression" msgstr "Nedostaje prethodni regularni izraz" ! #: lib/regcomp.c:174 #, fuzzy msgid "Regular expression too big" msgstr "Nedostaje prethodni regularni izraz" ! #: lib/regcomp.c:177 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Neuparena `{'" Binary files sed-4.0.5/po/hu.gmo and sed-4.0.6/po/hu.gmo differ diff -rNC3 sed-4.0.5/po/hu.po sed-4.0.6/po/hu.po *** sed-4.0.5/po/hu.po Mon Dec 16 20:32:36 2002 --- sed-4.0.6/po/hu.po Sat Mar 15 08:24:57 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed-3.02.80\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-09-18 14:43GMT\n" "Last-Translator: G醔or Istv醤 \n" "Language-Team: Hungarian \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed-3.02.80\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-09-18 14:43GMT\n" "Last-Translator: G醔or Istv醤 \n" "Language-Team: Hungarian \n" *************** *** 14,159 **** "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.5\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "T鯾b '!'" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "V醨atlan ','" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "Nem lehez haszn醠ni a +N-t vagy ~N-t mint els c韒" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Nincs p醨ban '{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Nincs p醨ban '}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Extra karakterek a parancs ut醤 " ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "'}' nem akar t鯾b c韒z閟t" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr " nem akar t鯾b c韒z閟t" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "A megjegyz閟 nem ismeri az 鰏szes c韒z閟t" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Hib醩 parancs" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "A parancs csak egy c韒z閟t haszn醠hat" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Befejezetlen c韒 a regexben" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Befejezetlen 's' parancs" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Befejezetlen 'y' parancsi" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Ismeretlen opci a 's'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "t鯾b 'p' opci egy 's' parancs mellet" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "t鯾b 'g' opci egy 's' parancs mellet" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "t鯾b sz醡 egy 's' parancs mellett" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "az 's' parancs sz醡 opci骾 nem lehetnek null醟" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "az 'y' parancs sz鰒egeinek hossza k黮鰊b鰖ik" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "A megh韛ott savchar() egy v醨atlant 閞t閗kel t閞t vissza (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Ismeretlen parancs:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: f醞l %s sor %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e kifejez閟 #%lu, karakter %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Az ugr醩hoz nem tal醠om a '%s' c韒k閠" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: nem lehet olvasni %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "BELS HIBA: rossz c韒 t韕us" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "BELS HIBA: Rossz parancs %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" --- 14,162 ---- "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.5\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "T鯾b '!'" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "V醨atlan ','" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "Nem lehez haszn醠ni a +N-t vagy ~N-t mint els c韒" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Nincs p醨ban '{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Nincs p醨ban '}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Extra karakterek a parancs ut醤 " ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "'}' nem akar t鯾b c韒z閟t" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr " nem akar t鯾b c韒z閟t" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "A megjegyz閟 nem ismeri az 鰏szes c韒z閟t" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Hib醩 parancs" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "A parancs csak egy c韒z閟t haszn醠hat" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Befejezetlen c韒 a regexben" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Befejezetlen 's' parancs" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Befejezetlen 'y' parancsi" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Ismeretlen opci a 's'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "t鯾b 'p' opci egy 's' parancs mellet" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "t鯾b 'g' opci egy 's' parancs mellet" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "t鯾b sz醡 egy 's' parancs mellett" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "az 's' parancs sz醡 opci骾 nem lehetnek null醟" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "az 'y' parancs sz鰒egeinek hossza k黮鰊b鰖ik" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "A megh韛ott savchar() egy v醨atlant 閞t閗kel t閞t vissza (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Ismeretlen parancs:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: f醞l %s sor %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e kifejez閟 #%lu, karakter %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Az ugr醩hoz nem tal醠om a '%s' c韒k閠" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: nem lehet olvasni %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "BELS HIBA: rossz c韒 t韕us" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "BELS HIBA: Rossz parancs %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" *************** *** 235,257 **** "k黮deni .\n" "A biztons醙 kedv閞t a lev閘 T醨gy mezej閎e 韗ja a ``%s'' sz髏.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 238,260 ---- "k黮deni .\n" "A biztons醙 kedv閞t a lev閘 T醨gy mezej閎e 韗ja a ``%s'' sz髏.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 265,271 **** "SEMMILYEN garanci醫 nem v醠lalunk, m間 azt sem 醠l韙juk, hogy ez a program\n" "KERESKEDELMI C蒐OKRA ALKALMAS vagy HASZN罫HAT EGY ADOTT FELADATRA.\n" ! #: lib/utils.c:131 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "Nem lehet megnyitni a %s f醞lt" --- 268,274 ---- "SEMMILYEN garanci醫 nem v醠lalunk, m間 azt sem 醠l韙juk, hogy ez a program\n" "KERESKEDELMI C蒐OKRA ALKALMAS vagy HASZN罫HAT EGY ADOTT FELADATRA.\n" ! #: lib/utils.c:127 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "Nem lehet megnyitni a %s f醞lt" *************** *** 282,355 **** msgid "read error on %s: %s" msgstr "olvas醩i hiba %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "" ! #: lib/regcomp.c:182 msgid "No match" msgstr "" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 #, fuzzy msgid "Unmatched [ or [^" msgstr "Nincs p醨ban '{'" ! #: lib/regcomp.c:203 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Nincs p醨ban '{'" ! #: lib/regcomp.c:206 #, fuzzy msgid "Unmatched \\{" msgstr "Nincs p醨ban '{'" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:227 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Nincs p醨ban '{'" --- 285,358 ---- msgid "read error on %s: %s" msgstr "olvas醩i hiba %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "" ! #: lib/regcomp.c:132 msgid "No match" msgstr "" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 #, fuzzy msgid "Unmatched [ or [^" msgstr "Nincs p醨ban '{'" ! #: lib/regcomp.c:153 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Nincs p醨ban '{'" ! #: lib/regcomp.c:156 #, fuzzy msgid "Unmatched \\{" msgstr "Nincs p醨ban '{'" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:177 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Nincs p醨ban '{'" Binary files sed-4.0.5/po/id.gmo and sed-4.0.6/po/id.gmo differ diff -rNC3 sed-4.0.5/po/id.po sed-4.0.6/po/id.po *** sed-4.0.5/po/id.po Mon Dec 16 20:32:36 2002 --- sed-4.0.6/po/id.po Sat Mar 15 08:24:57 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 4.0.2\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-11-22 12:24GMT+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 4.0.2\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-11-22 12:24GMT+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" *************** *** 15,160 **** "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: KBabel 0.9.5\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "`!' ganda" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "`,' tidak diharapkan" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "Tidak dapat menggunakan +N atau ~N sebagai alamat pertama" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "`{' tidak sesuai" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "`}' tidak diharapkan" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Karakter tambahan setelah perintah" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "Diharapkan \\ setelah `a', `c' atau `i'" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' tidak menginginkan alamat" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": tidak menginginkan alamat" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Komentar tidak menerima alamat" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Perintah hilang" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Perintah hanya menggunakan satu alamat" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Alamat regex yang tidak selesai" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Perintah `s' tidak selesai" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Perintah `y' tidak selesai" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Opsion tidak dikenal bagi `s'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "opsion `p' ganda bagi perintah `s'" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "opsion `g' ganda bagi perintah `s'" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "opsion beragam untuk perintah `s'" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "opsion angka untuk perintah `s' tidak boleh nol" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "string untuk perintah y dalam panjang yang berbeda" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Dipanggil savchar() dengan pushback (%x) yang tidak diharapkan" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Perintah tidak dikenal:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: file %s baris %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e ekspresi #%lu, char %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Tidak dapat menemukan label untuk melompat ke `%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: tidak dapat membaca %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "KESALAHAN INTERNAL: tipe alamat buruk" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "kesalahan dalam subproses" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "option `e' tidak didukung" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "perintah `e' tidak didukung" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "KESALAHAN INTERNAL: Perintah %c buruk" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Tidak ada reguler ekspresi sebelumnya" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "Tidak dapat menspesifikasikan modified pada regexp kosong" --- 15,163 ---- "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: KBabel 0.9.5\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "`!' ganda" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "`,' tidak diharapkan" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "Tidak dapat menggunakan +N atau ~N sebagai alamat pertama" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "`{' tidak sesuai" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "`}' tidak diharapkan" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Karakter tambahan setelah perintah" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "Diharapkan \\ setelah `a', `c' atau `i'" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' tidak menginginkan alamat" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": tidak menginginkan alamat" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Komentar tidak menerima alamat" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Perintah hilang" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Perintah hanya menggunakan satu alamat" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Alamat regex yang tidak selesai" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Perintah `s' tidak selesai" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Perintah `y' tidak selesai" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Opsion tidak dikenal bagi `s'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "opsion `p' ganda bagi perintah `s'" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "opsion `g' ganda bagi perintah `s'" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "opsion beragam untuk perintah `s'" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "opsion angka untuk perintah `s' tidak boleh nol" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "string untuk perintah y dalam panjang yang berbeda" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Dipanggil savchar() dengan pushback (%x) yang tidak diharapkan" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Perintah tidak dikenal:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: file %s baris %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e ekspresi #%lu, char %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Tidak dapat menemukan label untuk melompat ke `%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: tidak dapat membaca %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "KESALAHAN INTERNAL: tipe alamat buruk" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "kesalahan dalam subproses" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "option `e' tidak didukung" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "perintah `e' tidak didukung" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "KESALAHAN INTERNAL: Perintah %c buruk" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Tidak ada reguler ekspresi sebelumnya" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "Tidak dapat menspesifikasikan modified pada regexp kosong" *************** *** 245,256 **** "Email laporan kesalahan ke: %s \n" "Pastikan untuk menyertakan kata \"%s\" di field \"Subject:\".\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versi %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 248,259 ---- "Email laporan kesalahan ke: %s \n" "Pastikan untuk menyertakan kata \"%s\" di field \"Subject:\".\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versi %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 258,269 **** "berdasarkan pada GNU sed versi 3.02.80\n" "\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versi %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 261,272 ---- "berdasarkan pada GNU sed versi 3.02.80\n" "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versi %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 276,282 **** "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n" "to the extent permitted by law.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "Tidak dapat membuka file %s %s" --- 279,285 ---- "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n" "to the extent permitted by law.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "Tidak dapat membuka file %s %s" *************** *** 293,363 **** msgid "read error on %s: %s" msgstr "kesalahan pembacaan pada %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "Sukses" ! #: lib/regcomp.c:182 msgid "No match" msgstr "Tidak cocok" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Reguler ekspresi tidak valid" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Karakter kolasi tidak valid" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Nama kelas karakter tidak valid" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Trailing backslash" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Referensi balik tidak valid" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "[ atau [^ tidak sesuai" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "( atau \\( tidak sesuai" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "\\{ tidak sesuai" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Isi \\{\\} tidak valid" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Akhir batas tidak valid" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "Memori habis" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Reguler ekspresi sebelumnya tidak valid" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Akhir reguler ekspresi prematur" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Reguler ekspresi terlalu besar" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr ") atau \\) tidak sesuai" --- 296,366 ---- msgid "read error on %s: %s" msgstr "kesalahan pembacaan pada %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "Sukses" ! #: lib/regcomp.c:132 msgid "No match" msgstr "Tidak cocok" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Reguler ekspresi tidak valid" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Karakter kolasi tidak valid" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Nama kelas karakter tidak valid" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Trailing backslash" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Referensi balik tidak valid" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "[ atau [^ tidak sesuai" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "( atau \\( tidak sesuai" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "\\{ tidak sesuai" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Isi \\{\\} tidak valid" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Akhir batas tidak valid" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "Memori habis" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Reguler ekspresi sebelumnya tidak valid" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Akhir reguler ekspresi prematur" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Reguler ekspresi terlalu besar" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr ") atau \\) tidak sesuai" Binary files sed-4.0.5/po/it.gmo and sed-4.0.6/po/it.gmo differ diff -rNC3 sed-4.0.5/po/it.po sed-4.0.6/po/it.po *** sed-4.0.5/po/it.po Mon Dec 16 20:32:37 2002 --- sed-4.0.6/po/it.po Sat Mar 15 08:24:57 2003 *************** *** 1,11 **** ! # traduzione di sed ! # Copyright (C) 1999 Free Software Foundation, Inc. ! # Paolo Bonzini , 2001 ! # msgid "" msgstr "" "Project-Id-Version: sed 4.0.3\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-11-26 12:44+0100\n" "Last-Translator: Paolo Bonzini \n" "Language-Team: Italian \n" --- 1,11 ---- ! # traduzione di sed ! # Copyright (C) 1999 Free Software Foundation, Inc. ! # Paolo Bonzini , 2001 ! # msgid "" msgstr "" "Project-Id-Version: sed 4.0.3\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-11-26 12:44+0100\n" "Last-Translator: Paolo Bonzini \n" "Language-Team: Italian \n" *************** *** 14,203 **** "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" ! # sed/compile.c:166 ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "`!' multipli" ! # sed/compile.c:167 ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "`,' inattesa" ! # sed/compile.c:169 ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "Impossibile usare +N o ~N come primo indirizzo" ! # sed/compile.c:170 ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "`{' non bilanciata" ! # sed/compile.c:171 ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "`}' inattesa" ! # sed/compile.c:172 ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Ci sono altri caratteri dopo il comando" ! # sed/compile.c:173 ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "Atteso \\ dopo `a', `c' o `i'" ! # sed/compile.c:174 ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' non accetta indirizzi" ! # sed/compile.c:175 ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": non accetta indirizzi" ! # sed/compile.c:176 ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "I commenti non accettano indirizzi" ! # sed/compile.c:177 ! #: sed/compile.c:199 msgid "Missing command" msgstr "Manca il comando" ! # sed/compile.c:178 ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Il comando usa solo un indirizzo" ! # sed/compile.c:179 ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Indirizzo della regex non terminato" ! # sed/compile.c:180 ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Comando `s' non terminato" ! # sed/compile.c:181 ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Comando `y' non terminato" ! # sed/compile.c:182 ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Opzione di `s' sconosciuta" ! # sed/compile.c:183 ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "opzioni `p' multiple al comando `s'" ! # sed/compile.c:184 ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "opzioni `g' multiple al comando `s'" ! # sed/compile.c:186 ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "opzioni numeriche multiple al comando `s'" ! # sed/compile.c:188 ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "l'opzione numerica del comando `s' non pu essere zero" ! # sed/compile.c:190 ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "le stringhe per i comandi y hanno lunghezze diverse" ! # sed/compile.c:233 ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Chiamata savchar() con un pushback inatteso (%x)" ! # sed/compile.c:1319 ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Comando sconosciuto:" ! # sed/compile.c:1340 ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: file %s riga %lu: %s\n" ! # sed/compile.c:1343 ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: espressione -e #%lu, carattere %lu: %s\n" ! # sed/compile.c:1543 ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Impossibile trovare un'etichetta per il salto a `%s'" ! # sed/execute.c:516 ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: impossibile leggere %s: %s\n" ! # sed/execute.c:722 ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNAL ERROR: bad address type" ! # sed/execute.c:1003 sed/execute.c:1183 ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "errore in un sottoprocesso" ! # sed/execute.c:1005 ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "opzione `e' non supportata" ! # sed/execute.c:1185 ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "comando `e' non supportato" ! # sed/execute.c:1415 ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNAL ERROR: Bad cmd %c" ! # lib/regcomp.c:658 sed/regex.c:47 ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Occorre un'espressione regolare precedente" ! # sed/regex.c:48 ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "Non e' possibile specificare dei modificatori per l'espressione vuota" ! # sed/regex.c:146 #: sed/regex.c:145 #, c-format msgid "Invalid reference \\%d on `s' command's RHS" msgstr "Riferimento non valido \\%d nel secondo membro del comando `s'" ! # sed/sed.c:98 #: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" --- 14,206 ---- "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" ! # sed/compile.c:166 ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "`!' multipli" ! # sed/compile.c:167 ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "`,' inattesa" ! # sed/compile.c:169 ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "Impossibile usare +N o ~N come primo indirizzo" ! # sed/compile.c:170 ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "`{' non bilanciata" ! # sed/compile.c:171 ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "`}' inattesa" ! # sed/compile.c:172 ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Ci sono altri caratteri dopo il comando" ! # sed/compile.c:173 ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "Atteso \\ dopo `a', `c' o `i'" ! # sed/compile.c:174 ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' non accetta indirizzi" ! # sed/compile.c:175 ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": non accetta indirizzi" ! # sed/compile.c:176 ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "I commenti non accettano indirizzi" ! # sed/compile.c:177 ! #: sed/compile.c:191 msgid "Missing command" msgstr "Manca il comando" ! # sed/compile.c:178 ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Il comando usa solo un indirizzo" ! # sed/compile.c:179 ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Indirizzo della regex non terminato" ! # sed/compile.c:180 ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Comando `s' non terminato" ! # sed/compile.c:181 ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Comando `y' non terminato" ! # sed/compile.c:182 ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Opzione di `s' sconosciuta" ! # sed/compile.c:183 ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "opzioni `p' multiple al comando `s'" ! # sed/compile.c:184 ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "opzioni `g' multiple al comando `s'" ! # sed/compile.c:186 ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "opzioni numeriche multiple al comando `s'" ! # sed/compile.c:188 ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "l'opzione numerica del comando `s' non pu essere zero" ! # sed/compile.c:190 ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "le stringhe per i comandi y hanno lunghezze diverse" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "attesa una versione piu' recente di sed" ! ! # sed/compile.c:233 ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Chiamata savchar() con un pushback inatteso (%x)" ! # sed/compile.c:1319 ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Comando sconosciuto:" ! # sed/compile.c:1340 ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: file %s riga %lu: %s\n" ! # sed/compile.c:1343 ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: espressione -e #%lu, carattere %lu: %s\n" ! # sed/compile.c:1543 ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Impossibile trovare un'etichetta per il salto a `%s'" ! # sed/execute.c:516 ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: impossibile leggere %s: %s\n" ! # sed/execute.c:722 ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNAL ERROR: bad address type" ! # sed/execute.c:1003 sed/execute.c:1183 ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "errore in un sottoprocesso" ! # sed/execute.c:1005 ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "opzione `e' non supportata" ! # sed/execute.c:1185 ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "comando `e' non supportato" ! # sed/execute.c:1415 ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNAL ERROR: Bad cmd %c" ! # lib/regcomp.c:658 sed/regex.c:47 ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Occorre un'espressione regolare precedente" ! # sed/regex.c:48 ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "Non e' possibile specificare dei modificatori per l'espressione vuota" ! # sed/regex.c:146 #: sed/regex.c:145 #, c-format msgid "Invalid reference \\%d on `s' command's RHS" msgstr "Riferimento non valido \\%d nel secondo membro del comando `s'" ! # sed/sed.c:98 #: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" *************** *** 206,212 **** " -R, --regexp-perl\n" " usa la sintassi Perl 5 per le espressioni regolari\n" ! # sed/sed.c:103 #: sed/sed.c:103 #, c-format msgid "" --- 209,215 ---- " -R, --regexp-perl\n" " usa la sintassi Perl 5 per le espressioni regolari\n" ! # sed/sed.c:103 #: sed/sed.c:103 #, c-format msgid "" *************** *** 275,281 **** "sono specificati file di input sar letto lo standard input.\n" "\n" ! # sed/sed.c:132 #: sed/sed.c:132 #, c-format msgid "" --- 278,284 ---- "sono specificati file di input sar letto lo standard input.\n" "\n" ! # sed/sed.c:132 #: sed/sed.c:132 #, c-format msgid "" *************** *** 285,298 **** "Segnalare eventuali bug a: %s .\n" "Assicurarsi di includere la parola ``%s'' nell'oggetto del messaggio.\n" ! # sed/sed.c:255 ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versione %s\n" ! # sed/sed.c:256 ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 288,301 ---- "Segnalare eventuali bug a: %s .\n" "Assicurarsi di includere la parola ``%s'' nell'oggetto del messaggio.\n" ! # sed/sed.c:255 ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versione %s\n" ! # sed/sed.c:256 ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 300,313 **** "basato su GNU sed 3.02.80\n" "\n" ! # sed/sed.c:258 ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versione %s\n" ! # sed/sed.c:260 ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 303,316 ---- "basato su GNU sed 3.02.80\n" "\n" ! # sed/sed.c:258 ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versione %s\n" ! # sed/sed.c:260 ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 321,333 **** "NON c' garanzia; neppure di COMMERCIABILITA' o IDONEITA' AD UN PARTICOLARE\n" "SCOPO, nei limiti permessi dalla legge.\n" ! # lib/utils.c:131 ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "Impossibile aprire il file %s: %s" ! # lib/utils.c:161 #: lib/utils.c:161 #, c-format msgid "couldn't write %d item to %s: %s" --- 324,336 ---- "NON c' garanzia; neppure di COMMERCIABILITA' o IDONEITA' AD UN PARTICOLARE\n" "SCOPO, nei limiti permessi dalla legge.\n" ! # lib/utils.c:131 ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "Impossibile aprire il file %s: %s" ! # lib/utils.c:161 #: lib/utils.c:161 #, c-format msgid "couldn't write %d item to %s: %s" *************** *** 335,435 **** msgstr[0] "Impossibile scrivere %d elemento su %s: %s" msgstr[1] "Impossibile scrivere %d elementi su %s: %s" ! # lib/utils.c:176 #: lib/utils.c:176 #, c-format msgid "read error on %s: %s" msgstr "errore di lettura su %s: %s" ! # lib/regcomp.c:179 ! #: lib/regcomp.c:179 msgid "Success" msgstr "Successo" ! # lib/regcomp.c:182 ! #: lib/regcomp.c:182 msgid "No match" msgstr "Nessuna corrispondenza trovata" ! # lib/regcomp.c:185 ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Espressione regolare non valida" ! # lib/regcomp.c:188 ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Carattere di ordinamento non valido" ! # lib/regcomp.c:191 ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Nome non valido per una classe di caratteri" ! # lib/regcomp.c:194 ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Barra rovesciata alla fine dell'espressione regolare" ! # lib/regcomp.c:197 ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Riferimento non valido" ! # lib/regcomp.c:200 ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "`[' non bilanciata" ! # lib/regcomp.c:203 ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "`(' o `\\(' non bilanciata" ! # lib/regcomp.c:206 ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "`\\{' non bilanciata" ! # lib/regcomp.c:209 ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "numero di ripetizioni specificato tra graffe non valido" ! # lib/regcomp.c:212 ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Fine dell'intervallo non valida" ! # lib/regcomp.c:215 ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "Memoria esaurita" ! # lib/regcomp.c:218 ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Espressione regolare precedente non valida" ! # lib/regcomp.c:221 ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Fine prematura dell'espressione regolare" ! # lib/regcomp.c:224 ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Espressione regolare troppo grande" ! # lib/regcomp.c:227 ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr "`)' o `\\)' non bilanciata" - - # sed/compile.c:165 - #~ msgid "Invalid use of address modifier" - #~ msgstr "Uso non valido del modificatore dell'indirizzo" - - # sed/compile.c:168 - #~ msgid "Unexpected End-of-file" - #~ msgstr "fine del file inattesa" --- 338,430 ---- msgstr[0] "Impossibile scrivere %d elemento su %s: %s" msgstr[1] "Impossibile scrivere %d elementi su %s: %s" ! # lib/utils.c:176 #: lib/utils.c:176 #, c-format msgid "read error on %s: %s" msgstr "errore di lettura su %s: %s" ! # lib/regcomp.c:179 ! #: lib/regcomp.c:129 msgid "Success" msgstr "Successo" ! # lib/regcomp.c:182 ! #: lib/regcomp.c:132 msgid "No match" msgstr "Nessuna corrispondenza trovata" ! # lib/regcomp.c:185 ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Espressione regolare non valida" ! # lib/regcomp.c:188 ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Carattere di ordinamento non valido" ! # lib/regcomp.c:191 ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Nome non valido per una classe di caratteri" ! # lib/regcomp.c:194 ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Barra rovesciata alla fine dell'espressione regolare" ! # lib/regcomp.c:197 ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Riferimento non valido" ! # lib/regcomp.c:200 ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "`[' non bilanciata" ! # lib/regcomp.c:203 ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "`(' o `\\(' non bilanciata" ! # lib/regcomp.c:206 ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "`\\{' non bilanciata" ! # lib/regcomp.c:209 ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "numero di ripetizioni specificato tra graffe non valido" ! # lib/regcomp.c:212 ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Fine dell'intervallo non valida" ! # lib/regcomp.c:215 ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "Memoria esaurita" ! # lib/regcomp.c:218 ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Espressione regolare precedente non valida" ! # lib/regcomp.c:221 ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Fine prematura dell'espressione regolare" ! # lib/regcomp.c:224 ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Espressione regolare troppo grande" ! # lib/regcomp.c:227 ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr "`)' o `\\)' non bilanciata" Binary files sed-4.0.5/po/ja.gmo and sed-4.0.6/po/ja.gmo differ diff -rNC3 sed-4.0.5/po/ja.po sed-4.0.6/po/ja.po *** sed-4.0.5/po/ja.po Mon Dec 16 20:32:37 2002 --- sed-4.0.6/po/ja.po Sat Mar 15 08:24:57 2003 *************** *** 1,6 **** # Japanese messages for GNU sed # Copyright (C) 1999, 2002 Free Software Foundation, Inc. ! # IIDA Yosiaki , 1999, 2002. # This file is distributed under the same license as the GNU sed package. # Contributed by # Yasuyuki Furukawa , 1999. --- 1,6 ---- # Japanese messages for GNU sed # Copyright (C) 1999, 2002 Free Software Foundation, Inc. ! # IIDA Yosiaki , 1999, 2002, 2003. # This file is distributed under the same license as the GNU sed package. # Contributed by # Yasuyuki Furukawa , 1999. *************** *** 8,16 **** # msgid "" msgstr "" ! "Project-Id-Version: GNU sed 4.0\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" ! "PO-Revision-Date: 2002-10-24 23:18+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" --- 8,16 ---- # msgid "" msgstr "" ! "Project-Id-Version: GNU sed 4.0.4\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" ! "PO-Revision-Date: 2003-01-18 17:02+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" *************** *** 18,163 **** "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "剩眶の`!'があります" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "徒袋されない`,'です" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "+Nや~Nを呵介のアドレスに回年することはできません" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "`{'が办米しません" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "`}'が办米しません" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "コマンドの稿ろに途纷な矢机があります" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "\\が≈a∽≈c∽≈i∽の稿に徒袋されます" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}'にアドレスはいりません" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ":にアドレスはいりません" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "コメントはアドレス减け烧けません" ! #: sed/compile.c:199 msgid "Missing command" msgstr "コマンドが颅りません" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "コマンドはひとつのアドレスだけを蝗います" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "アドレスregexが姜位していません" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "`s'コマンドが姜位していません" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "`y'コマンドが姜位していません" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "`s'へのオプションが稍汤です" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "`s'コマンドに滦して剩眶の`p'オプションがあります" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "`s'コマンドに滦して剩眶の`g'オプションがあります" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "`s'コマンドに滦して剩眶の眶猛オプションがあります" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "`s'コマンドへの眶猛オプションは雾ではいけません" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "yコマンドへの矢机误の墓さが般います" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "病提しを徒袋せずにsavchar()が钙ばれました (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "稍汤なコマンドです:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: ファイル %s %lu乖: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e 山附 #%lu, 矢机眶 %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "`%s'へのジャンプのラベルが斧つかりません" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %sを粕み哈めません: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "柒婶エラ〖: 稍赖アドレス房" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "灰プロセスのエラ〖" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "eオプションは、サポ〖トされていません" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "eコマンドは、サポ〖トされていません" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "柒婶エラ〖: 稍赖コマンド %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "木涟の赖惮山附が、ありません" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "饯峻灰は、鄂の赖惮山附に回年できません" --- 18,166 ---- "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "剩眶の`!'があります" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "徒袋されない`,'です" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "+Nや~Nを呵介のアドレスに回年することはできません" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "`{'が办米しません" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "`}'が办米しません" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "コマンドの稿ろに途纷な矢机があります" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "\\が≈a∽≈c∽≈i∽の稿に徒袋されます" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}'にアドレスはいりません" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ":にアドレスはいりません" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "コメントはアドレス减け烧けません" ! #: sed/compile.c:191 msgid "Missing command" msgstr "コマンドが颅りません" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "コマンドはひとつのアドレスだけを蝗います" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "アドレスregexが姜位していません" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "`s'コマンドが姜位していません" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "`y'コマンドが姜位していません" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "`s'へのオプションが稍汤です" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "`s'コマンドに滦して剩眶の`p'オプションがあります" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "`s'コマンドに滦して剩眶の`g'オプションがあります" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "`s'コマンドに滦して剩眶の眶猛オプションがあります" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "`s'コマンドへの眶猛オプションは雾ではいけません" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "yコマンドへの矢机误の墓さが般います" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "病提しを徒袋せずにsavchar()が钙ばれました (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "稍汤なコマンドです:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: ファイル %s %lu乖: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e 山附 #%lu, 矢机眶 %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "`%s'へのジャンプのラベルが斧つかりません" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %sを粕み哈めません: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "柒婶エラ〖: 稍赖アドレス房" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "灰プロセスのエラ〖" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "eオプションは、サポ〖トされていません" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "eコマンドは、サポ〖トされていません" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "柒婶エラ〖: 稍赖コマンド %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "木涟の赖惮山附が、ありません" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "饯峻灰は、鄂の赖惮山附に回年できません" *************** *** 212,225 **** "蝗脱恕: %s [オプション]... {スクリプト(戮になければ)} [掐蜗ファイル]...\n" "\n" " -n, --quiet, --silent\n" - " suppress automatic printing of pattern space\n" " パタ〖ンスペ〖スの极瓢叫蜗を娃扩\n" " -e スクリプト, --expression=スクリプト\n" " 悸乖するコマンドとしてスクリプトを纳裁\n" " -f script-file, --file=script-file\n" " -f スクリプトˇファイル, --file=スクリプトˇファイル\n" - " add the contents of script-file to the commands to be " - "executed\n" " 悸乖するコマンドとしてスクリプトˇファイルの柒推を纳裁\n" " -i[儡萨辑], --in-place[=儡萨辑]\n" " ファイルをその眷で试礁 (橙磨灰があれば、バックアップを侯" --- 215,225 ---- *************** *** 249,260 **** "排灰メ〖ルによるバグ鼠桂の案黎: %s\n" "鼠桂する狠には``Subject:''フィ〖ルドのどこかに``%s''を掐れてください。\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed %s惹\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 249,260 ---- "排灰メ〖ルによるバグ鼠桂の案黎: %s\n" "鼠桂する狠には``Subject:''フィ〖ルドのどこかに``%s''を掐れてください。\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed %s惹\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 262,275 **** "付侯GNU sed 3.02.80惹\n" "\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" "GNU sed %s惹\n" "\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 262,275 ---- "付侯GNU sed 3.02.80惹\n" "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" "GNU sed %s惹\n" "\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 290,296 **** "拉\n" "もありません。\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "ファイル%sを倡けませんでした: %s" --- 290,296 ---- "拉\n" "もありません。\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "ファイル%sを倡けませんでした: %s" *************** *** 307,377 **** msgid "read error on %s: %s" msgstr "%sの粕哈みエラ〖: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "喇根" ! #: lib/regcomp.c:182 msgid "No match" msgstr "救圭しません" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "痰跟な赖惮山附" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "痰跟な够圭矢机" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "痰跟な矢机クラス叹" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "稿鲁の嫡スラッシュ" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "痰跟な嫡徊救" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "[や[^が泥圭いません" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "(や\\(が泥圭いません" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "\\{が泥圭いません" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "痰跟な\\{\\}の柒推\"" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "痰跟な认跋の姜眉" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "メモリ〖が颅りません" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "痰跟な黎乖赖惮山附" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "徒袋せぬ赖惮山附の姜眉" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "络き册ぎる赖惮山附" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr ")や\\)が办米しません" --- 307,377 ---- msgid "read error on %s: %s" msgstr "%sの粕哈みエラ〖: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "喇根" ! #: lib/regcomp.c:132 msgid "No match" msgstr "救圭しません" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "痰跟な赖惮山附" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "痰跟な够圭矢机" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "痰跟な矢机クラス叹" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "稿鲁の嫡スラッシュ" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "痰跟な嫡徊救" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "[や[^が泥圭いません" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "(や\\(が泥圭いません" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "\\{が泥圭いません" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "痰跟な\\{\\}の柒推\"" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "痰跟な认跋の姜眉" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "メモリ〖が颅りません" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "痰跟な黎乖赖惮山附" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "徒袋せぬ赖惮山附の姜眉" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "络き册ぎる赖惮山附" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr ")や\\)が办米しません" Binary files sed-4.0.5/po/ko.gmo and sed-4.0.6/po/ko.gmo differ diff -rNC3 sed-4.0.5/po/ko.po sed-4.0.6/po/ko.po *** sed-4.0.5/po/ko.po Mon Dec 16 20:32:37 2002 --- sed-4.0.6/po/ko.po Sat Mar 15 08:24:57 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2001-10-12 17:26+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: Korean \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2001-10-12 17:26+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: Korean \n" *************** *** 13,158 **** "Content-Type: text/plain; charset=EUC-KR\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "`!' 啊 吝汗登菌嚼聪促" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "阂鞘夸茄 `,' 啊 荤侩登绊 乐嚼聪促" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "霉锅掳 林家肺 '+N' 肚绰 '~N' 阑 荤侩且 荐 绝嚼聪促" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "`{' 啊 老摹窍瘤 臼嚼聪促" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "阂鞘夸茄 `}' 啊 荤侩登绊 乐嚼聪促" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "疙飞第俊 鞘夸绝绰 巩磊甸捞 乐嚼聪促" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' 俊 绢栋茄 林家档 鞘夸摹 臼嚼聪促" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": 俊 绢栋茄 林家档 鞘夸摹 臼嚼聪促" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "内膏飘俊 绢栋茄 林家档 荤侩且 荐 绝嚼聪促" ! #: sed/compile.c:199 msgid "Missing command" msgstr "疙飞捞 瘤沥登瘤 臼疽嚼聪促" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "疙飞俊 窍唱狼 林家父 荤侩且 荐 乐嚼聪促" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "林家 沥痹钎泅侥 辆丰登瘤 臼疽嚼聪促" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "`s' 疙飞捞 辆丰登瘤 臼疽嚼聪促" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "`y' 疙飞捞 辆丰登瘤 臼疽嚼聪促" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "`s' 俊 舅 荐 绝绰 可记捞 乐嚼聪促" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "`s' 疙飞俊 `p' 可记捞 吝汗登绢 乐嚼聪促" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "`s' 疙飞俊 `g' 可记捞 吝汗登绢 乐嚼聪促" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "`s' 疙飞俊 箭磊 可记捞 吝汗登绢 乐嚼聪促" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "`s' 疙飞狼 箭磊 可记俊 '0' 阑 瘤沥且 荐 绝嚼聪促" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "`y' 疙飞狼 巩磊凯捞 辨捞啊 促辅聪促" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "抗惑摹 给茄 pushback (%x) 苞 窃膊 savchar() 啊 龋免登菌嚼聪促" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "舅 荐 绝绰 疙飞:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: %s 颇老狼 %lu 锅掳 临: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expression #%lu, char %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "`%s' (栏)肺 痢橇且 饭捞喉阑 茫阑 荐 绝嚼聪促" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s (阑)甫 佬阑 荐 绝澜: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "郴何 坷幅: 肋给等 林家 蜡屈涝聪促" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "郴何 坷幅: %c (篮)绰 肋给等 疙飞涝聪促" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" --- 13,161 ---- "Content-Type: text/plain; charset=EUC-KR\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "`!' 啊 吝汗登菌嚼聪促" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "阂鞘夸茄 `,' 啊 荤侩登绊 乐嚼聪促" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "霉锅掳 林家肺 '+N' 肚绰 '~N' 阑 荤侩且 荐 绝嚼聪促" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "`{' 啊 老摹窍瘤 臼嚼聪促" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "阂鞘夸茄 `}' 啊 荤侩登绊 乐嚼聪促" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "疙飞第俊 鞘夸绝绰 巩磊甸捞 乐嚼聪促" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' 俊 绢栋茄 林家档 鞘夸摹 臼嚼聪促" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": 俊 绢栋茄 林家档 鞘夸摹 臼嚼聪促" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "内膏飘俊 绢栋茄 林家档 荤侩且 荐 绝嚼聪促" ! #: sed/compile.c:191 msgid "Missing command" msgstr "疙飞捞 瘤沥登瘤 臼疽嚼聪促" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "疙飞俊 窍唱狼 林家父 荤侩且 荐 乐嚼聪促" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "林家 沥痹钎泅侥 辆丰登瘤 臼疽嚼聪促" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "`s' 疙飞捞 辆丰登瘤 臼疽嚼聪促" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "`y' 疙飞捞 辆丰登瘤 臼疽嚼聪促" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "`s' 俊 舅 荐 绝绰 可记捞 乐嚼聪促" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "`s' 疙飞俊 `p' 可记捞 吝汗登绢 乐嚼聪促" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "`s' 疙飞俊 `g' 可记捞 吝汗登绢 乐嚼聪促" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "`s' 疙飞俊 箭磊 可记捞 吝汗登绢 乐嚼聪促" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "`s' 疙飞狼 箭磊 可记俊 '0' 阑 瘤沥且 荐 绝嚼聪促" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "`y' 疙飞狼 巩磊凯捞 辨捞啊 促辅聪促" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "抗惑摹 给茄 pushback (%x) 苞 窃膊 savchar() 啊 龋免登菌嚼聪促" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "舅 荐 绝绰 疙飞:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: %s 颇老狼 %lu 锅掳 临: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expression #%lu, char %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "`%s' (栏)肺 痢橇且 饭捞喉阑 茫阑 荐 绝嚼聪促" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s (阑)甫 佬阑 荐 绝澜: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "郴何 坷幅: 肋给等 林家 蜡屈涝聪促" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "郴何 坷幅: %c (篮)绰 肋给等 疙飞涝聪促" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" *************** *** 232,254 **** "滚弊甫 焊绊且 E-mail 林家: %s .\n" "``Subject:'' 亲格俊 馆靛矫 ``%s'' 窜绢甫 器窃秦 林矫扁 官而聪促.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 235,257 ---- "滚弊甫 焊绊且 E-mail 林家: %s .\n" "``Subject:'' 亲格俊 馆靛矫 ``%s'' 窜绢甫 器窃秦 林矫扁 官而聪促.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 261,267 **** "曼绊窍矫扁 官而聪促. 捞 橇肺弊伐篮 过俊 历盟登瘤 臼绰 裹困俊辑 惑诀利捞唱\n" "漂荐 格利栏肺 荤侩瞪 版快甫 器窃茄 绢栋茄 版快俊档 焊刘窍瘤 臼嚼聪促.\n" ! #: lib/utils.c:131 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "%s 颇老阑 凯 荐 绝嚼聪促" --- 264,270 ---- "曼绊窍矫扁 官而聪促. 捞 橇肺弊伐篮 过俊 历盟登瘤 臼绰 裹困俊辑 惑诀利捞唱\n" "漂荐 格利栏肺 荤侩瞪 版快甫 器窃茄 绢栋茄 版快俊档 焊刘窍瘤 臼嚼聪促.\n" ! #: lib/utils.c:127 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "%s 颇老阑 凯 荐 绝嚼聪促" *************** *** 278,351 **** msgid "read error on %s: %s" msgstr "%s 狼 郴侩 佬扁 坷幅: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "" ! #: lib/regcomp.c:182 msgid "No match" msgstr "" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 #, fuzzy msgid "Unmatched [ or [^" msgstr "`{' 啊 老摹窍瘤 臼嚼聪促" ! #: lib/regcomp.c:203 #, fuzzy msgid "Unmatched ( or \\(" msgstr "`{' 啊 老摹窍瘤 臼嚼聪促" ! #: lib/regcomp.c:206 #, fuzzy msgid "Unmatched \\{" msgstr "`{' 啊 老摹窍瘤 臼嚼聪促" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:227 #, fuzzy msgid "Unmatched ) or \\)" msgstr "`{' 啊 老摹窍瘤 臼嚼聪促" --- 281,354 ---- msgid "read error on %s: %s" msgstr "%s 狼 郴侩 佬扁 坷幅: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "" ! #: lib/regcomp.c:132 msgid "No match" msgstr "" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 #, fuzzy msgid "Unmatched [ or [^" msgstr "`{' 啊 老摹窍瘤 臼嚼聪促" ! #: lib/regcomp.c:153 #, fuzzy msgid "Unmatched ( or \\(" msgstr "`{' 啊 老摹窍瘤 臼嚼聪促" ! #: lib/regcomp.c:156 #, fuzzy msgid "Unmatched \\{" msgstr "`{' 啊 老摹窍瘤 臼嚼聪促" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:177 #, fuzzy msgid "Unmatched ) or \\)" msgstr "`{' 啊 老摹窍瘤 臼嚼聪促" Binary files sed-4.0.5/po/nl.gmo and sed-4.0.6/po/nl.gmo differ diff -rNC3 sed-4.0.5/po/nl.po sed-4.0.6/po/nl.po *** sed-4.0.5/po/nl.po Mon Dec 16 20:32:37 2002 --- sed-4.0.6/po/nl.po Sat Mar 15 08:24:57 2003 *************** *** 6,12 **** msgid "" msgstr "" "Project-Id-Version: sed 3.02a\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-10-25 01:08-04:00\n" "Last-Translator: Ivo Timmermans \n" "Language-Team: Dutch \n" --- 6,12 ---- msgid "" msgstr "" "Project-Id-Version: sed 3.02a\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-10-25 01:08-04:00\n" "Last-Translator: Ivo Timmermans \n" "Language-Team: Dutch \n" *************** *** 14,160 **** "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Meerdere `!'s" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Onverwachte `,'" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "U kunt +N of ~N niet als eerste adres gebruiken" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Onvergezelde `{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Onverwachte `}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Extra tekens na opdracht" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' wil geen adressen" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": wil geen adressen" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Commentaren accepteren geen adressen" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Ontbrekend commando" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Commando gebruikt slechts een adres" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Onbe雐ndigde reguliere expressie met adres" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "`s' commando zonder einde" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "`y' commando zonder einde" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Onbekende optie voor `s'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "meerdere `p' opties bij een `s' commando" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "meerdere `g' opties bij een `s' commando" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "meerdere nummer opties voor `s' commando" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "nummer optie voor `s' commando mag geen nul zijn" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "tekenreeksen voor y commando zijn van verschillende lengte" # pushback? ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "savchar() aangeroepen met onverwachte pushback (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Onbekende opdracht:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: bestand %s regel %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expressie #%lu, teken %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Kan geen label vinden voor sprong naar `%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kan %s niet lezen: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNE FOUT: onjuist adres type" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNE FOUT: Onjuist cmd %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Geen voorgaande reguliere expressie" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" --- 14,163 ---- "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Meerdere `!'s" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Onverwachte `,'" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "U kunt +N of ~N niet als eerste adres gebruiken" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Onvergezelde `{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Onverwachte `}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Extra tekens na opdracht" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' wil geen adressen" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": wil geen adressen" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Commentaren accepteren geen adressen" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Ontbrekend commando" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Commando gebruikt slechts een adres" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Onbe雐ndigde reguliere expressie met adres" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "`s' commando zonder einde" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "`y' commando zonder einde" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Onbekende optie voor `s'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "meerdere `p' opties bij een `s' commando" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "meerdere `g' opties bij een `s' commando" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "meerdere nummer opties voor `s' commando" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "nummer optie voor `s' commando mag geen nul zijn" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "tekenreeksen voor y commando zijn van verschillende lengte" + #: sed/compile.c:202 + msgid "expected newer version of sed" + msgstr "" + # pushback? ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "savchar() aangeroepen met onverwachte pushback (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Onbekende opdracht:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: bestand %s regel %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expressie #%lu, teken %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Kan geen label vinden voor sprong naar `%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kan %s niet lezen: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNE FOUT: onjuist adres type" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNE FOUT: Onjuist cmd %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Geen voorgaande reguliere expressie" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" *************** *** 233,255 **** "E-mail foutrapportages naar: %s .\n" "Vermeld het woord ``%s'' ergens in het ``Subject:'' veld.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 236,258 ---- "E-mail foutrapportages naar: %s .\n" "Vermeld het woord ``%s'' ergens in het ``Subject:'' veld.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 262,268 **** "voorwaarden. Er is GEEN garantie; zelfs niet voor VERKOOPBAARHEID of\n" "GESCHIKTHEID VOOR EEN BEPAALD DOEL, zo ver als wettelijk mogelijk is.\n" ! #: lib/utils.c:131 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "Kan bestand %s niet openen" --- 265,271 ---- "voorwaarden. Er is GEEN garantie; zelfs niet voor VERKOOPBAARHEID of\n" "GESCHIKTHEID VOOR EEN BEPAALD DOEL, zo ver als wettelijk mogelijk is.\n" ! #: lib/utils.c:127 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "Kan bestand %s niet openen" *************** *** 279,356 **** msgid "read error on %s: %s" msgstr "lees fout bij %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "" ! #: lib/regcomp.c:182 msgid "No match" msgstr "" ! #: lib/regcomp.c:185 #, fuzzy msgid "Invalid regular expression" msgstr "Geen voorgaande reguliere expressie" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 #, fuzzy msgid "Unmatched [ or [^" msgstr "Onvergezelde `{'" ! #: lib/regcomp.c:203 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Onvergezelde `{'" ! #: lib/regcomp.c:206 #, fuzzy msgid "Unmatched \\{" msgstr "Onvergezelde `{'" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:218 #, fuzzy msgid "Invalid preceding regular expression" msgstr "Geen voorgaande reguliere expressie" ! #: lib/regcomp.c:221 #, fuzzy msgid "Premature end of regular expression" msgstr "Geen voorgaande reguliere expressie" ! #: lib/regcomp.c:224 #, fuzzy msgid "Regular expression too big" msgstr "Geen voorgaande reguliere expressie" ! #: lib/regcomp.c:227 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Onvergezelde `{'" --- 282,359 ---- msgid "read error on %s: %s" msgstr "lees fout bij %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "" ! #: lib/regcomp.c:132 msgid "No match" msgstr "" ! #: lib/regcomp.c:135 #, fuzzy msgid "Invalid regular expression" msgstr "Geen voorgaande reguliere expressie" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 #, fuzzy msgid "Unmatched [ or [^" msgstr "Onvergezelde `{'" ! #: lib/regcomp.c:153 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Onvergezelde `{'" ! #: lib/regcomp.c:156 #, fuzzy msgid "Unmatched \\{" msgstr "Onvergezelde `{'" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:168 #, fuzzy msgid "Invalid preceding regular expression" msgstr "Geen voorgaande reguliere expressie" ! #: lib/regcomp.c:171 #, fuzzy msgid "Premature end of regular expression" msgstr "Geen voorgaande reguliere expressie" ! #: lib/regcomp.c:174 #, fuzzy msgid "Regular expression too big" msgstr "Geen voorgaande reguliere expressie" ! #: lib/regcomp.c:177 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Onvergezelde `{'" Binary files sed-4.0.5/po/pt_BR.gmo and sed-4.0.6/po/pt_BR.gmo differ diff -rNC3 sed-4.0.5/po/pt_BR.po sed-4.0.6/po/pt_BR.po *** sed-4.0.5/po/pt_BR.po Mon Dec 16 20:32:37 2002 --- sed-4.0.6/po/pt_BR.po Sat Mar 15 08:24:58 2003 *************** *** 8,14 **** msgid "" msgstr "" "Project-Id-Version: sed 4.0.1\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-11-08 17:44-0300\n" "Last-Translator: Aur閘io Marinho Jargas \n" "Language-Team: Brazilian Portuguese \n" --- 8,14 ---- msgid "" msgstr "" "Project-Id-Version: sed 4.0.1\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-11-08 17:44-0300\n" "Last-Translator: Aur閘io Marinho Jargas \n" "Language-Team: Brazilian Portuguese \n" *************** *** 17,162 **** "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Exclama珲es `!' m鷏tiplas" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "V韗gula `,' inesperada" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "N鉶 use +N ou ~N como o primeiro endere鏾" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "`{' n鉶 terminada" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "`}' inesperada" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "H caracteres sobrando ap髎 o comando" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "Deve haver um escape \\ depois dos comandos `a', `c' e `i'" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' n鉶 recebe endere鏾s" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr "`:' n鉶 recebe endere鏾s" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Coment醨ios n鉶 aceitam endere鏾s" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Falta especificar um comando ao endere鏾" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Este comando usa apenas um endere鏾" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "A express鉶 regular do endere鏾 est inacabada (falta a /)" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Comando `s' inacabado (s/// - faltou delimitador)" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Comando `y' inacabado (y/// - faltou delimitador)" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Op玢o desconhecida para o comando `s' (s///?)" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "op珲es `p' m鷏tiplas para o comando `s'" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "op珲es `g' m鷏tiplas para o comando `s'" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "op珲es num閞icas m鷏tiplas para o comando `s' (s///n)" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "A op玢o num閞ica para o comando `s' n鉶 pode ser zero (s///0)" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "Os textos para o comando `y' t阭 tamanhos diferentes (y/abc/z/)" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Foi chamado savchar() com um retorno (%x) n鉶 esperado" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Comando desconhecido:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: arquivo %s linha %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e express鉶 #%lu, caractere %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "N鉶 foi poss韛el encontrar a marca玢o `%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: n鉶 foi poss韛el ler %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "ERRO INTERNO: tipo inv醠ido de endere鏾" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "erro no subprocesso" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "op玢o `e' n鉶 suportada" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "comando `e' n鉶 suportado" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "ERRO INTERNO: Comando inv醠ido %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "N鉶 h express鉶 regular anterior" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "N鉶 permitido especificar modificadores numa express鉶 regular vazia" --- 17,165 ---- "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Exclama珲es `!' m鷏tiplas" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "V韗gula `,' inesperada" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "N鉶 use +N ou ~N como o primeiro endere鏾" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "`{' n鉶 terminada" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "`}' inesperada" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "H caracteres sobrando ap髎 o comando" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "Deve haver um escape \\ depois dos comandos `a', `c' e `i'" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' n鉶 recebe endere鏾s" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr "`:' n鉶 recebe endere鏾s" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Coment醨ios n鉶 aceitam endere鏾s" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Falta especificar um comando ao endere鏾" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Este comando usa apenas um endere鏾" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "A express鉶 regular do endere鏾 est inacabada (falta a /)" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Comando `s' inacabado (s/// - faltou delimitador)" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Comando `y' inacabado (y/// - faltou delimitador)" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Op玢o desconhecida para o comando `s' (s///?)" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "op珲es `p' m鷏tiplas para o comando `s'" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "op珲es `g' m鷏tiplas para o comando `s'" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "op珲es num閞icas m鷏tiplas para o comando `s' (s///n)" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "A op玢o num閞ica para o comando `s' n鉶 pode ser zero (s///0)" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "Os textos para o comando `y' t阭 tamanhos diferentes (y/abc/z/)" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Foi chamado savchar() com um retorno (%x) n鉶 esperado" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Comando desconhecido:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: arquivo %s linha %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e express鉶 #%lu, caractere %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "N鉶 foi poss韛el encontrar a marca玢o `%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: n鉶 foi poss韛el ler %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "ERRO INTERNO: tipo inv醠ido de endere鏾" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "erro no subprocesso" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "op玢o `e' n鉶 suportada" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "comando `e' n鉶 suportado" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "ERRO INTERNO: Comando inv醠ido %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "N鉶 h express鉶 regular anterior" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "N鉶 permitido especificar modificadores numa express鉶 regular vazia" *************** *** 250,261 **** "Envie relat髍ios de erros (em ingl阺) para: %s .\n" "Inclua a palavra ``%s'' no campo ``Assunto:'' ou ``Subject:''.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed vers鉶 %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 253,264 ---- "Envie relat髍ios de erros (em ingl阺) para: %s .\n" "Inclua a palavra ``%s'' no campo ``Assunto:'' ou ``Subject:''.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed vers鉶 %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 263,274 **** "baseado no GNU sed vers鉶 3.02.80\n" "\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed vers鉶 %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 266,277 ---- "baseado no GNU sed vers鉶 3.02.80\n" "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed vers鉶 %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 281,287 **** "de c髉ia. N肙 h garantias, nem mesmo para os aspectos mercantis ou de\n" "atendimento a finalidades espec韋icas, tanto quanto a lei permita.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "N鉶 foi poss韛el abrir o arquivo %s: %s" --- 284,290 ---- "de c髉ia. N肙 h garantias, nem mesmo para os aspectos mercantis ou de\n" "atendimento a finalidades espec韋icas, tanto quanto a lei permita.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "N鉶 foi poss韛el abrir o arquivo %s: %s" *************** *** 298,368 **** msgid "read error on %s: %s" msgstr "erro de leitura em %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "Sucesso" ! #: lib/regcomp.c:182 msgid "No match" msgstr "Nada encontrado" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Express鉶 regular inv醠ida" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Caractere de ordena玢o inv醠ido" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Nome inv醠ido de classe de caracteres" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Escape \\ no final" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Retrovisor \\n inv醠ido" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "[ ou [^ n鉶 terminado" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "( ou \\( n鉶 terminado" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "\\{ n鉶 terminado" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Conte鷇o inv醠ido no \\{\\} (permitidos n鷐eros e v韗gula)" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Fim de intervalo (range) inv醠ido" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "Falta de mem髍ia" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Express鉶 regular anterior inv醠ida" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Fim prematuro da express鉶 regular" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Express鉶 regular grande demais" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr ") or \\) inesperado" --- 301,371 ---- msgid "read error on %s: %s" msgstr "erro de leitura em %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "Sucesso" ! #: lib/regcomp.c:132 msgid "No match" msgstr "Nada encontrado" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Express鉶 regular inv醠ida" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Caractere de ordena玢o inv醠ido" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Nome inv醠ido de classe de caracteres" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Escape \\ no final" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Retrovisor \\n inv醠ido" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "[ ou [^ n鉶 terminado" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "( ou \\( n鉶 terminado" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "\\{ n鉶 terminado" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Conte鷇o inv醠ido no \\{\\} (permitidos n鷐eros e v韗gula)" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Fim de intervalo (range) inv醠ido" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "Falta de mem髍ia" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Express鉶 regular anterior inv醠ida" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Fim prematuro da express鉶 regular" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Express鉶 regular grande demais" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr ") or \\) inesperado" Binary files sed-4.0.5/po/ru.gmo and sed-4.0.6/po/ru.gmo differ diff -rNC3 sed-4.0.5/po/ru.po sed-4.0.6/po/ru.po *** sed-4.0.5/po/ru.po Mon Dec 16 20:32:37 2002 --- sed-4.0.6/po/ru.po Sat Mar 15 08:24:58 2003 *************** *** 1,160 **** # Russian messages for sed. # Copyright (C) 1998 Free Software Foundation, Inc. # Const Kaplinsky , 1998. # msgid "" msgstr "" ! "Project-Id-Version: sed 3.02a\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" ! "PO-Revision-Date: 1998-11-23 17:30+07:00\n" ! "Last-Translator: Const Kaplinsky \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "钆铀咸厮 由妥咸献 `!'" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "钆幸拍咨呐挝偈 由妥咸 `,'" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "橛邢特谙琢紊 +N 商 ~N 肆夼釉着 信易锨 聊遗恿 闻南姓釉赏" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "钆辛椅偈 由妥咸 `{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "焐畚墒 由妥咸 `}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "橼躺畚膳 由妥咸 邢犹 讼土文" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" ! msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' 闻 南姓铀僚 账邻廖裳 肆松-躺孪 聊遗酉" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr "`:' 闻 南姓铀僚 账邻廖裳 肆松-躺孪 聊遗酉" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "胂屯盼粤疑 闻 南姓铀晾 账邻廖裳 肆松-躺孪 聊遗酉" ! #: sed/compile.c:199 msgid "Missing command" msgstr "镌诱杂宰张 讼土文" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "胂土文 捎邢特谡旁 韵特讼 夏晌 聊遗" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "钆诹着役盼蜗 聊遗游吓 遗钦萄椅吓 踪伊峙紊" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "钆诹着役盼瘟 讼土文 `s'" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "钆诹着役盼瘟 讼土文 `y'" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "钆哨着釉钨 拖纳粕肆韵 `s'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "闻铀咸厮 拖纳粕肆韵蚁 `p' 讼土文鲜 `s'" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "闻铀咸厮 拖纳粕肆韵蚁 `g' 讼土文鲜 `s'" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "闻铀咸厮 奚犹献偃 拖纳粕肆韵蚁 讼土文鲜 `s'" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "奚犹献鲜 拖纳粕肆韵 奶 讼土文 `s' 闻 拖峙 沦载 握膛踪" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "奶晌 釉蚁 奶 讼土文 `y' 闻 酉仔聊晾" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "嬲嗡蒙 savchar() 闻 漳撂嫌 紫谧伊陨载 由妥咸 (%x) 紫 兹夏蜗 邢韵" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "钆哨着釉瘟 讼土文:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: 屏侍 %s 釉蚁肆 %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e 踪伊峙紊 #%lu, 由妥咸 %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "钆 瘟誓盼 团运 奶 信遗认牧 `%s'" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: 羡陕肆 拊盼裳 %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "黝豸蝈铑耨 稃殁脶: 闻南姓釉赏偈 陨 聊遗恿" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" ! msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" ! msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" ! msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "黝豸蝈铑耨 稃殁脶: 闻南姓釉赏裂 讼土文 `%c'" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "钆 幸拍倌蛰徘 遗钦萄椅锨 踪伊峙紊" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" ! msgstr "" #: sed/regex.c:145 #, c-format --- 1,166 ---- # Russian messages for sed. # Copyright (C) 1998 Free Software Foundation, Inc. # Const Kaplinsky , 1998. + # Andrew W. Nosenko , 2002-2003 # msgid "" msgstr "" ! "Project-Id-Version: sed-4.0.5\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" ! "PO-Revision-Date: 2003-01-15 18:51+0200\n" ! "Last-Translator: Andrew W. Nosenko \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" + "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "钆铀咸厮 由妥咸献 `!'" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "钆幸拍咨呐挝偈 由妥咸 `,'" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "橛邢特谙琢紊 +N 商 ~N 肆夼釉着 信易锨 聊遗恿 闻南姓釉赏" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "钆辛椅偈 由妥咸 `{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "焐畚墒 由妥咸 `}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "橼躺畚膳 由妥咸 邢犹 讼土文" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" ! msgstr "鹣犹 `a', `c' 商 `i' 现赡僚杂 `\\'" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' 闻 南姓铀僚 账邻廖裳 肆松-躺孪 聊遗酉" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr "`:' 闻 南姓铀僚 账邻廖裳 肆松-躺孪 聊遗酉" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "胂屯盼粤疑 闻 南姓铀晾 账邻廖裳 肆松-躺孪 聊遗酉" ! #: sed/compile.c:191 msgid "Missing command" msgstr "镌诱杂宰张 讼土文" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "胂土文 捎邢特谡旁 韵特讼 夏晌 聊遗" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "钆诹着役盼蜗 聊遗游吓 遗钦萄椅吓 踪伊峙紊" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "钆诹着役盼瘟 讼土文 `s'" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "钆诹着役盼瘟 讼土文 `y'" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "钆哨着釉钨 拖纳粕肆韵 `s'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "闻铀咸厮 拖纳粕肆韵蚁 `p' 讼土文鲜 `s'" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "闻铀咸厮 拖纳粕肆韵蚁 `g' 讼土文鲜 `s'" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "闻铀咸厮 奚犹献偃 拖纳粕肆韵蚁 讼土文鲜 `s'" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "奚犹献鲜 拖纳粕肆韵 奶 讼土文 `s' 闻 拖峙 沦载 握膛踪" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "奶晌 釉蚁 奶 讼土文 `y' 闻 酉仔聊晾" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "嬲嗡蒙 savchar() 闻 漳撂嫌 紫谧伊陨载 由妥咸 (%x) 紫 兹夏蜗 邢韵" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "钆哨着釉瘟 讼土文:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: 屏侍 %s 釉蚁肆 %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e 踪伊峙紊 #%lu, 由妥咸 %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "钆 瘟誓盼 团运 奶 信遗认牧 `%s'" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: 羡陕肆 拊盼裳 %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "黝豸蝈铑耨 稃殁脶: 闻南姓釉赏偈 陨 聊遗恿" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" ! msgstr "羡陕肆 南夼椅磐 幸厦庞优" ! #: sed/execute.c:1008 msgid "option `e' not supported" ! msgstr "辛伊团砸 `e' 闻 邢哪乓稚琢旁友" ! #: sed/execute.c:1188 msgid "`e' command not supported" ! msgstr "讼土文 `e' 闻 邢哪乓稚琢旁友" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "黝豸蝈铑耨 稃殁脶: 闻南姓釉赏裂 讼土文 `%c'" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "钆 幸拍倌蛰徘 遗钦萄椅锨 踪伊峙紊" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" ! msgstr "钆紫谕现蜗 账邻猎 拖纳粕肆韵 奶 姓釉锨 遗钦萄椅锨 踪伊峙紊" #: sed/regex.c:145 #, c-format *************** *** 168,174 **** msgstr "" #: sed/sed.c:103 ! #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" --- 174,180 ---- msgstr "" #: sed/sed.c:103 ! #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" *************** *** 202,223 **** "specified, then the standard input is read.\n" "\n" msgstr "" ! "橛邢特谙琢紊: %s [腱帼閉... {用盼烈墒} [兹夏蜗-屏侍]...\n" "\n" " -n, --quiet, --silent\n" ! " 邢牧滋言 磷韵土陨夼铀墒 踪紫 幸嫌砸廖釉琢 哿绿衔献\n" " -e 用盼烈墒, --expression=用盼烈墒\n" ! " 南铝咨载 用盼烈墒 捎邢涛雅唾 讼土文镣\n" " -f 屏侍-用盼烈裳, --file=屏侍-用盼烈裳\n" ! " 南铝咨载 酉呐抑赏吓 屏侍 用盼烈裳 捎邢涛雅唾 讼土文镣\n" " --help 显下伊谏载 茉 邢挠肆谒 踪试蒤n" " -V, --version 踪着釉 晌葡彝撩衫 着矣缮 踪试蒤n" "\n" ! "逵躺 闻 账邻廖 紊 夏晌 哨 颂擂攀 -e, --expression, -f, 商 --file,\n" ! "韵 信易偈 烈钦团卧, 闻 炎萄垒墒友 颂擂磐, 抡呐 宗言 肆夼釉着 sed-" ! "用盼烈裳.\n" ! "饔 嫌粤综膳友 烈钦团卧 愚稍晾杂 赏盼镣 兹夏钨 屏侍献; 庞躺 粤松 赏盼羂n" ! "闻 账邻廖, 幸仙谧夏稍友 拊盼膳 邢韵肆 釉廖牧以蜗窍 鬃夏.\n" "\n" #: sed/sed.c:132 --- 208,245 ---- "specified, then the standard input is read.\n" "\n" msgstr "" ! "橛邢特谙琢紊: %s [疳蜥礤趄鵠... {用盼烈墒-韵特讼-庞躺-闻-囊涨锨-用盼烈裳} " ! "[兹夏蜗-屏侍]...\n" "\n" " -n, --quiet, --silent\n" ! " 邢牧滋言 磷韵土陨夼铀墒 踪紫 幸嫌砸廖釉琢 哿绿衔献.\n" " -e 用盼烈墒, --expression=用盼烈墒\n" ! " 南铝咨载 用盼烈墒 讼土文镣 奶 捎邢涛盼裳\n" " -f 屏侍-用盼烈裳, --file=屏侍-用盼烈裳\n" ! " 南铝咨载 酉呐抑赏吓 屏侍 用盼烈裳 讼土文镣 奶 " ! "捎邢涛盼裳.\n" ! " -i[诱破伤覿, --in-place[=诱破伤覿\n" ! " 遗牧嗽梢献猎 屏侍 \"瘟 团釉臷" (酉谀僚 遗谂易握繺n" ! " 讼猩, 庞躺 诹牧 诱破伤)\n" ! " -l N, --line-length=N\n" ! " 沼粤蜗咨载 峙塘磐绽 奶晌 釉蚁松 幸 信遗蜗优 釉蚁薥n" ! " (line-wrap) 奶 讼土文 `l'\n" ! " -r, --regexp-extended\n" ! " 捎邢特谙琢载 伊盂梢盼钨 遗钦萄椅倥 踪伊峙紊 \n" ! "%s -s, --separate\n" ! " 伊佑土砸勺猎 兹夏钨 屏侍 伊谀盘匚, 闻 肆 夏晌\n" ! " 幸夏咸至垒墒友 邢韵薥n" ! " -u, --unbuffered\n" ! " 诹且罩猎 肆 拖治 团呜叟 牧挝偃 瘟 兹夏 勇伊淤琢载\n" ! " 肆 拖治 蘖菖 抡婆伊 瘟 踪认呐\n" " --help 显下伊谏载 茉 邢挠肆谒 踪试蒤n" " -V, --version 踪着釉 晌葡彝撩衫 着矣缮 踪试蒤n" "\n" ! "逵躺 闻 账邻廖 紊 夏晌 哨 辛伊团砸献 -e, --expression, -f, 商 --file,\n" ! "韵 信易偈 烈钦团卧, 闻 炎萄垒墒友 辛伊团砸贤, 抡呐 宗言 肆夼釉着\n" ! "sed-用盼烈裳 捎邢涛盼. 饔 嫌粤综膳友 烈钦团卧 愚稍晾杂 赏盼镣蒤n" ! "兹夏钨 屏侍献; 庞躺 粤讼踪 赏盼 闻, 韵 兹夏钨 牧挝倥 奚粤涝友 哨\n" ! "邢韵肆 釉廖牧以蜗窍 鬃夏.\n" "\n" #: sed/sed.c:132 *************** *** 229,251 **** "鹣淤塘试 酉下菖紊 下 羡陕肆 邢 聊遗诱: %s .\n" "鹨 茉贤 章拍稍庞, 拊 姿汤奚躺 邢膛 耘唾 犹献 ``%s''.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 251,273 ---- "鹣淤塘试 酉下菖紊 下 羡陕肆 邢 聊遗诱: %s .\n" "鹨 茉贤 章拍稍庞, 拊 姿汤奚躺 邢膛 耘唾 犹献 ``%s''.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 259,365 **** "邢囊邻胀抛僚唾 橇伊卧墒 痫戾矬糸 商 痱殓镤铒篝 潇 腼铍蝈纛镪 沐扉,\n" " 韵 团遗, 讼韵蚁 茉 拖峙 沦载 南姓菖蜗 诹讼蜗牧耘特釉紫.\n" ! #: lib/utils.c:131 ! #, fuzzy, c-format msgid "Couldn't open file %s: %s" ! msgstr "钆 漳撂嫌 显艘僭 屏侍 %s" #: lib/utils.c:161 ! #, fuzzy, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" ! msgstr[0] "闻 漳撂嫌 诹猩恿载 %d 芴磐盼韵%.0s %s: %s" ! msgstr[1] "闻 漳撂嫌 诹猩恿载 %d 芴磐盼韵%.0s %s: %s" #: lib/utils.c:176 #, c-format msgid "read error on %s: %s" msgstr "羡陕肆 拊盼裳 %s: %s" ! #: lib/regcomp.c:179 msgid "Success" ! msgstr "" ! #: lib/regcomp.c:182 msgid "No match" ! msgstr "" ! #: lib/regcomp.c:185 ! #, fuzzy msgid "Invalid regular expression" ! msgstr "钆 幸拍倌蛰徘 遗钦萄椅锨 踪伊峙紊" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 ! #, fuzzy msgid "Unmatched [ or [^" ! msgstr "钆辛椅偈 由妥咸 `{'" ! #: lib/regcomp.c:203 ! #, fuzzy msgid "Unmatched ( or \\(" ! msgstr "钆辛椅偈 由妥咸 `{'" ! #: lib/regcomp.c:206 ! #, fuzzy msgid "Unmatched \\{" ! msgstr "钆辛椅偈 由妥咸 `{'" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" ! msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" ! msgstr "" ! #: lib/regcomp.c:218 ! #, fuzzy msgid "Invalid preceding regular expression" ! msgstr "钆 幸拍倌蛰徘 遗钦萄椅锨 踪伊峙紊" ! #: lib/regcomp.c:221 ! #, fuzzy msgid "Premature end of regular expression" ! msgstr "钆 幸拍倌蛰徘 遗钦萄椅锨 踪伊峙紊" ! #: lib/regcomp.c:224 ! #, fuzzy msgid "Regular expression too big" ! msgstr "钆 幸拍倌蛰徘 遗钦萄椅锨 踪伊峙紊" ! #: lib/regcomp.c:227 ! #, fuzzy msgid "Unmatched ) or \\)" ! msgstr "钆辛椅偈 由妥咸 `{'" ! ! #~ msgid "Invalid use of address modifier" ! #~ msgstr "钆南姓釉赏吓 捎邢特谙琢紊 聊遗游锨 拖纳粕肆韵伊" ! ! #~ msgid "Unexpected End-of-file" ! #~ msgstr "钆幸拍咨呐挝偈 讼闻 屏侍" ! ! #~ msgid "bad regexp: %s\n" ! #~ msgstr "闻着椅吓 遗钦萄椅吓 踪伊峙紊: %s\n" ! ! #~ msgid "input read error: %s" ! #~ msgstr "羡陕肆 拊盼裳 兹夏钨 牧挝偃: %s" --- 281,368 ---- "邢囊邻胀抛僚唾 橇伊卧墒 痫戾矬糸 商 痱殓镤铒篝 潇 腼铍蝈纛镪 沐扉,\n" " 韵 团遗, 讼韵蚁 茉 拖峙 沦载 南姓菖蜗 诹讼蜗牧耘特釉紫.\n" ! #: lib/utils.c:127 ! #, c-format msgid "Couldn't open file %s: %s" ! msgstr "钆 漳撂嫌 显艘僭 屏侍 %s: %s" #: lib/utils.c:161 ! #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" ! msgstr[0] "闻 漳撂嫌 诹猩恿载 %d 芴磐盼 %s: %s" ! msgstr[1] "闻 漳撂嫌 诹猩恿载 %d 芴磐盼粤 %s: %s" ! msgstr[2] "闻 漳撂嫌 诹猩恿载 %d 芴磐盼韵 %s: %s" #: lib/utils.c:176 #, c-format msgid "read error on %s: %s" msgstr "羡陕肆 拊盼裳 %s: %s" ! #: lib/regcomp.c:129 msgid "Success" ! msgstr "跤信" ! #: lib/regcomp.c:132 msgid "No match" ! msgstr "笙仔聊盼墒 闻 瘟誓盼" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" ! msgstr "钆着椅吓 遗钦萄椅吓 踪伊峙紊" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" ! msgstr "钆辛椅偈 由妥咸 `[' 商 `[^'" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" ! msgstr "钆辛椅偈 由妥咸 `(' 商 `\\('" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" ! msgstr "钆辛椅偈 由妥咸 `\\{'" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:162 msgid "Invalid range end" ! msgstr "钆着椅偈 讼闻 纳列邻衔" ! #: lib/regcomp.c:165 msgid "Memory exhausted" ! msgstr "湎釉招瘟 辛脱载 捎夼倚廖" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" ! msgstr "钆着椅吓 幸拍叟釉渍垒排 遗钦萄椅吓 踪伊峙紊" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" ! msgstr "鹨胖呐滓磐盼钨 讼闻 遗钦萄椅锨 踪伊峙紊" ! #: lib/regcomp.c:174 msgid "Regular expression too big" ! msgstr "蚺钦萄椅吓 踪伊峙紊 犹邵讼 着躺讼" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" ! msgstr "钆辛椅偈 由妥咸 `)' 商 `\\)'" diff -rNC3 sed-4.0.5/po/sed.pot sed-4.0.6/po/sed.pot *** sed-4.0.5/po/sed.pot Mon Dec 16 20:32:34 2002 --- sed-4.0.6/po/sed.pot Sat Mar 15 08:24:55 2003 *************** *** 6,12 **** msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" --- 6,12 ---- msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" *************** *** 14,159 **** "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr "" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "" ! #: sed/compile.c:199 msgid "Missing command" msgstr "" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" --- 14,162 ---- "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr "" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "" ! #: sed/compile.c:191 msgid "Missing command" msgstr "" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" *************** *** 211,233 **** "Be sure to include the word ``%s'' somewhere in the ``Subject:'' field.\n" msgstr "" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 214,236 ---- "Be sure to include the word ``%s'' somewhere in the ``Subject:'' field.\n" msgstr "" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 236,242 **** "to the extent permitted by law.\n" msgstr "" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "" --- 239,245 ---- "to the extent permitted by law.\n" msgstr "" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "" *************** *** 253,322 **** msgid "read error on %s: %s" msgstr "" ! #: lib/regcomp.c:179 msgid "Success" msgstr "" ! #: lib/regcomp.c:182 msgid "No match" msgstr "" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr "" --- 256,325 ---- msgid "read error on %s: %s" msgstr "" ! #: lib/regcomp.c:129 msgid "Success" msgstr "" ! #: lib/regcomp.c:132 msgid "No match" msgstr "" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr "" Binary files sed-4.0.5/po/sk.gmo and sed-4.0.6/po/sk.gmo differ diff -rNC3 sed-4.0.5/po/sk.po sed-4.0.6/po/sk.po *** sed-4.0.5/po/sk.po Mon Dec 16 20:32:38 2002 --- sed-4.0.6/po/sk.po Sat Mar 15 08:24:58 2003 *************** *** 6,12 **** msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-10-25 08:37+0200\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" --- 6,12 ---- msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-10-25 08:37+0200\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" *************** *** 15,160 **** "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Viacn锟絪obn锟 `!'" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Neo锟絜k锟絭an锟 `,'" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "+N alebo ~N sa ned锟 pou锟絠锟 ako prv锟 adresa" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Nezodpovedaj锟絚a `{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Neo锟絘k锟絭an锟 `}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Nadbyto锟絥锟 znaky po pr锟絢aze" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "O锟絘k锟絭an锟 \\ po `a', `c' alebo `i'" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "`}' nevy锟絘duje ak锟絢o锟絭ek adresu" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": nechce ak锟絢o锟絭ek adresu" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "V koment锟絩i nie je pr锟絧ustn锟 ak锟絢o锟絭ek adresa" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Ch锟絙aj锟絚i pr锟絢az" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Pr锟絢az pou锟斤拷va iba jednu adresu" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Neukon锟絜n锟 regul锟絩ny v锟絩az adresy" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Neukon锟絜n锟 pr锟絢az `s'" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Neukon锟絜n锟 pr锟絢az `y'" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Nezn锟絤a vo锟絙a pre `s'" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "viacn锟絪obn锟 pou锟絠tie vo锟絙y `p' s pr锟絢azom `s'" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "viacn锟絪obn锟 pou锟絠tie vo锟絙y `g' s pr锟絢azom `s'" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "pr锟絢az `s' m锟斤拷e ma锟 maxim锟絣ne jednu 锟斤拷seln锟 vo锟絙u" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "锟斤拷seln锟 vo锟絙a pr锟絢azu `s' nem锟斤拷e by锟 nula" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "re锟絘zce pre pr锟絢az `y' maj锟 r锟絲ne d锟斤拷ky" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Bolo volan锟 savchar() s ne锟絘kan锟絤 pushback (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Nezn锟絤y pr锟絢az:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: s锟絙or %s, riadok %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e v锟絩az #%lu, znak %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "N锟絭estie pre skok na `%s' nie je mo锟絥锟 n锟絡s?" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s nie je mo锟絥锟 锟斤拷ta锟: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "INTERN锟 CHYBA: zl锟 typ adresy" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "chyba v podprocese" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "vo锟絙a `e' nie je podporovan锟" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "pr锟絢az `e' nie je podporovan锟" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERN锟 CHYBA: zl锟 pr锟絢az %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Bez predch锟絛zaj锟絚eho regul锟絩neho v锟絩azu" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" "Nie je mo锟絥锟 zada锟 modifik锟絫ory pre pr锟絲dny regul锟絩ny v锟絩az" --- 15,163 ---- "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Viacn锟絪obn锟 `!'" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Neo锟絜k锟絭an锟 `,'" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "+N alebo ~N sa ned锟 pou锟絠锟 ako prv锟 adresa" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Nezodpovedaj锟絚a `{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Neo锟絘k锟絭an锟 `}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Nadbyto锟絥锟 znaky po pr锟絢aze" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "O锟絘k锟絭an锟 \\ po `a', `c' alebo `i'" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "`}' nevy锟絘duje ak锟絢o锟絭ek adresu" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": nechce ak锟絢o锟絭ek adresu" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "V koment锟絩i nie je pr锟絧ustn锟 ak锟絢o锟絭ek adresa" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Ch锟絙aj锟絚i pr锟絢az" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Pr锟絢az pou锟斤拷va iba jednu adresu" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Neukon锟絜n锟 regul锟絩ny v锟絩az adresy" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Neukon锟絜n锟 pr锟絢az `s'" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Neukon锟絜n锟 pr锟絢az `y'" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Nezn锟絤a vo锟絙a pre `s'" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "viacn锟絪obn锟 pou锟絠tie vo锟絙y `p' s pr锟絢azom `s'" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "viacn锟絪obn锟 pou锟絠tie vo锟絙y `g' s pr锟絢azom `s'" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "pr锟絢az `s' m锟斤拷e ma锟 maxim锟絣ne jednu 锟斤拷seln锟 vo锟絙u" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "锟斤拷seln锟 vo锟絙a pr锟絢azu `s' nem锟斤拷e by锟 nula" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "re锟絘zce pre pr锟絢az `y' maj锟 r锟絲ne d锟斤拷ky" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Bolo volan锟 savchar() s ne锟絘kan锟絤 pushback (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Nezn锟絤y pr锟絢az:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: s锟絙or %s, riadok %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e v锟絩az #%lu, znak %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "N锟絭estie pre skok na `%s' nie je mo锟絥锟 n锟絡s?" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s nie je mo锟絥锟 锟斤拷ta锟: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "INTERN锟 CHYBA: zl锟 typ adresy" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "chyba v podprocese" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "vo锟絙a `e' nie je podporovan锟" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "pr锟絢az `e' nie je podporovan锟" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERN锟 CHYBA: zl锟 pr锟絢az %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Bez predch锟絛zaj锟絚eho regul锟絩neho v锟絩azu" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" "Nie je mo锟絥锟 zada锟 modifik锟絫ory pre pr锟絲dny regul锟絩ny v锟絩az" *************** *** 257,268 **** "Koment锟絩e k slovensk锟絤u prekladu zasielajte na adresu .\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed verzia %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 260,271 ---- "Koment锟絩e k slovensk锟絤u prekladu zasielajte na adresu .\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed verzia %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 270,281 **** "zalo锟絜n锟 na GNU sed verzia 3.02.80\n" "\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed verzia %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 273,284 ---- "zalo锟絜n锟 na GNU sed verzia 3.02.80\n" "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed verzia %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 291,297 **** "a to aj bez z锟絩uky PREDAJNOSTI alebo VHODNOSTI PRE NEJAK锟 KONKR锟絋NY " "锟斤拷EL.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "Nebolo mo锟絥锟 otvori锟 s锟絙or %s: %s" --- 294,300 ---- "a to aj bez z锟絩uky PREDAJNOSTI alebo VHODNOSTI PRE NEJAK锟 KONKR锟絋NY " "锟斤拷EL.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "Nebolo mo锟絥锟 otvori锟 s锟絙or %s: %s" *************** *** 309,379 **** msgid "read error on %s: %s" msgstr "chyba pri 锟斤拷tan锟 z %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "锟絪pech" ! #: lib/regcomp.c:182 msgid "No match" msgstr "Nezodpoved锟" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Neplatn锟 regul锟絩ny v锟絩az" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Neplatn锟 znak pre porovn锟絭anie" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Neplatn锟 n锟絲ov triedy znakov" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Ukon锟給vacie opa锟絥锟 lom锟絫ko" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Neplatn锟 sp锟絫n锟 odkaz" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "Nezodpovedaj锟絚a [ alebo [^" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "Nezodpovedaj锟絚a ( alebo \\(" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "Nezodpovedaj锟絚a \\{" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Neplatn锟 obsah \\{\\}" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Neplatn锟 koniec rozsahu" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "Vy锟絜rpan锟 pam锟斤拷" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Neplatn锟 predch锟絛zaj锟絚i regul锟絩ny v锟絩az" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Neo锟絘k锟絭an锟 koniec regul锟絩neho v锟絩azu" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Regul锟絩ny v锟絩az je pr锟絣i锟 ve锟絢锟" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr "Nezodpovedaj锟絚a ) alebo \\)" --- 312,382 ---- msgid "read error on %s: %s" msgstr "chyba pri 锟斤拷tan锟 z %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "锟絪pech" ! #: lib/regcomp.c:132 msgid "No match" msgstr "Nezodpoved锟" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Neplatn锟 regul锟絩ny v锟絩az" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Neplatn锟 znak pre porovn锟絭anie" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Neplatn锟 n锟絲ov triedy znakov" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Ukon锟給vacie opa锟絥锟 lom锟絫ko" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Neplatn锟 sp锟絫n锟 odkaz" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "Nezodpovedaj锟絚a [ alebo [^" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "Nezodpovedaj锟絚a ( alebo \\(" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "Nezodpovedaj锟絚a \\{" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Neplatn锟 obsah \\{\\}" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Neplatn锟 koniec rozsahu" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "Vy锟絜rpan锟 pam锟斤拷" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Neplatn锟 predch锟絛zaj锟絚i regul锟絩ny v锟絩az" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Neo锟絘k锟絭an锟 koniec regul锟絩neho v锟絩azu" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Regul锟絩ny v锟絩az je pr锟絣i锟 ve锟絢锟" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr "Nezodpovedaj锟絚a ) alebo \\)" Binary files sed-4.0.5/po/sl.gmo and sed-4.0.6/po/sl.gmo differ diff -rNC3 sed-4.0.5/po/sl.po sed-4.0.6/po/sl.po *** sed-4.0.5/po/sl.po Mon Dec 16 20:32:38 2002 --- sed-4.0.6/po/sl.po Sat Mar 15 08:24:58 2003 *************** *** 6,12 **** msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-10-25 15:17+0200\n" "Last-Translator: Primo Peterlin \n" "Language-Team: Slovenian \n" --- 6,12 ---- msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-10-25 15:17+0200\n" "Last-Translator: Primo Peterlin \n" "Language-Team: Slovenian \n" *************** *** 16,161 **** "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Ve鑤erni klicaji \"!\"" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Nepri鑑kovana vejica \",\"" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "Obliki +N in ~N nista dovoljeni kot za鑕tna naslova" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Oklepaj { brez zaklepaja" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Nepri鑑kovan zaklepaj }" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Ukazu sledijo dodatni znaki" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "Za ,a`, ,c` ali ,i` se pri鑑kuje \\" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "Zaklepaj } ne zahteva naslova" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": ne zahteva naslova" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Komentarji ne sprejemajo naslovov" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Ukaz manjka" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Ukaz uporablja le en naslov" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Regularni izraz z nezaklju鑕nim naslovom" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Nezaklju鑕n ukaz \"s\"" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Nezaklju鑕n ukaz \"y\"" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Neznane izbire pri ukazu \"s\"" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "ve鑤erne izbire \"p\" pri ukazu \"s\"" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "ve鑤erne izbire \"g\" pri ukazu \"s\"" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "ve鑤erne 箃evil鑞e izbire pri ukazu \"s\"" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "箃evil鑞a izbira pri ukazu \"s\" mora biti neni鑕lna" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "niza pri ukazu \"y\" sta razli鑞o dolga" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Klic savchar() z nepri鑑kovanim pushback (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Neznan ukaz:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: datoteka %s vrstica %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e izraz #%lu, znak %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Oznake za skok na \"%s\" ni mo緉o najti" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s ni mo緉o prebrati: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNA NAPAKA: pokvarjen tip naslova" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "Napaka v podprocesu" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "Izbira ,e` ni podprta" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "Ukaz ,e` ni podprt" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNA NAPAKA: Pokvarjen ukaz %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Prej筺ji regularni izraz manjka" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "Dolo鑑nje modifikatorjev pri praznem regularnem izrazu ni mogo鑕" --- 16,164 ---- "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Ve鑤erni klicaji \"!\"" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Nepri鑑kovana vejica \",\"" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "Obliki +N in ~N nista dovoljeni kot za鑕tna naslova" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Oklepaj { brez zaklepaja" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Nepri鑑kovan zaklepaj }" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Ukazu sledijo dodatni znaki" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "Za ,a`, ,c` ali ,i` se pri鑑kuje \\" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "Zaklepaj } ne zahteva naslova" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": ne zahteva naslova" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Komentarji ne sprejemajo naslovov" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Ukaz manjka" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Ukaz uporablja le en naslov" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Regularni izraz z nezaklju鑕nim naslovom" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Nezaklju鑕n ukaz \"s\"" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Nezaklju鑕n ukaz \"y\"" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Neznane izbire pri ukazu \"s\"" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "ve鑤erne izbire \"p\" pri ukazu \"s\"" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "ve鑤erne izbire \"g\" pri ukazu \"s\"" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "ve鑤erne 箃evil鑞e izbire pri ukazu \"s\"" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "箃evil鑞a izbira pri ukazu \"s\" mora biti neni鑕lna" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "niza pri ukazu \"y\" sta razli鑞o dolga" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Klic savchar() z nepri鑑kovanim pushback (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Neznan ukaz:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: datoteka %s vrstica %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e izraz #%lu, znak %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Oznake za skok na \"%s\" ni mo緉o najti" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s ni mo緉o prebrati: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNA NAPAKA: pokvarjen tip naslova" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "Napaka v podprocesu" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "Izbira ,e` ni podprta" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "Ukaz ,e` ni podprt" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNA NAPAKA: Pokvarjen ukaz %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Prej筺ji regularni izraz manjka" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "Dolo鑑nje modifikatorjev pri praznem regularnem izrazu ni mogo鑕" *************** *** 246,257 **** "Sporo鑙la o napakah po筶jite na %s .\n" "Poskrbite, da bo nekje v polju ,,Subject`` nastopal izraz ,,%s``.\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed, razli鑙ca %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 249,260 ---- "Sporo鑙la o napakah po筶jite na %s .\n" "Poskrbite, da bo nekje v polju ,,Subject`` nastopal izraz ,,%s``.\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed, razli鑙ca %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 259,270 **** "na osnovi GNU sed, razli鑙ca 3.02.80\n" "\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed, razli鑙ca %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 262,273 ---- "na osnovi GNU sed, razli鑙ca 3.02.80\n" "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed, razli鑙ca %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 278,284 **** "in raz筰rjate so navedeni v izvorni kodi. Za program ni NOBENEGA JAMSTVA,\n" "niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA UPORABO.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "Datoteke %s ni mogo鑕 odpreti: %s" --- 281,287 ---- "in raz筰rjate so navedeni v izvorni kodi. Za program ni NOBENEGA JAMSTVA,\n" "niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA UPORABO.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "Datoteke %s ni mogo鑕 odpreti: %s" *************** *** 297,367 **** msgid "read error on %s: %s" msgstr "napaka pri branju z %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "Uspe筺o" ! #: lib/regcomp.c:182 msgid "No match" msgstr "Ni ujemanja" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Neveljavni regularni izraz" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Znaka izven abecede" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Neveljavno ime razreda znakov" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Zaklju鑞a obrnjena po筫vnica" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Neveljavni povratni sklic" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "Oklepaj [ ali [^ brez zaklepaja" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "Oklepaj ( ali \\( brez zaklepaja" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "Oklepaj \\{ brez zaklepaja" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Neveljavna vsebina \\{\\}" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Neveljavna zgornja meja intervala" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "Zmanjkalo pomnilnika" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Neveljaven prej筺ji regularni izraz" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "Pred鑑sni zaklju鑕k regularnega izraza" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Regularni izraz prevelik" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr "Oklepaj ) ali \\) brez zaklepaja" --- 300,370 ---- msgid "read error on %s: %s" msgstr "napaka pri branju z %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "Uspe筺o" ! #: lib/regcomp.c:132 msgid "No match" msgstr "Ni ujemanja" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Neveljavni regularni izraz" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Znaka izven abecede" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Neveljavno ime razreda znakov" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Zaklju鑞a obrnjena po筫vnica" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Neveljavni povratni sklic" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "Oklepaj [ ali [^ brez zaklepaja" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "Oklepaj ( ali \\( brez zaklepaja" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "Oklepaj \\{ brez zaklepaja" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Neveljavna vsebina \\{\\}" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Neveljavna zgornja meja intervala" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "Zmanjkalo pomnilnika" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Neveljaven prej筺ji regularni izraz" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "Pred鑑sni zaklju鑕k regularnega izraza" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Regularni izraz prevelik" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr "Oklepaj ) ali \\) brez zaklepaja" Binary files sed-4.0.5/po/sv.gmo and sed-4.0.6/po/sv.gmo differ diff -rNC3 sed-4.0.5/po/sv.po sed-4.0.6/po/sv.po *** sed-4.0.5/po/sv.po Mon Dec 16 20:32:38 2002 --- sed-4.0.6/po/sv.po Sat Mar 15 08:24:58 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-10-25 19:18+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-10-25 19:18+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" *************** *** 14,159 **** "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Flera \"!\"" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Ov鋘tat \",\"" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "+N eller ~N kan inte anv鋘das som f鰎sta adress" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Ensamt \"{\"" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Ov鋘tat \"}\"" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Extra tecken efter kommandot" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "\\ f鰎v鋘tades efter \"a\", \"c\" eller \"i\"" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "\"}\" vill inte ha n錱ra adresser" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": vill inte ha n錱ra adresser" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "Kommentarer accepterar inga adresser" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Kommando saknas" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Kommandot anv鋘der endast en adress" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Oavslutat regulj鋜t uttryck f鰎 adress" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Oavslutat \"s\"-kommando" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Oavslutat \"y\"-kommando" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "Flaggan ok鋘d f鰎 \"s\"" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "flera \"p\"-flaggor till \"s\"-kommandot" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "flera \"g\"-flaggor till \"s\"-kommandot" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "flera sifferflaggor till \"s\"-kommandot" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "sifferflagga till kommandot \"s\" f錼 inte vara noll" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "str鋘garna f鰎 kommandot \"y\" 鋜 olika l錸ga" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Anropade savchar() med ov鋘tat returtecken (%x)" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Ok鋘t kommando:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fil %s rad %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e uttryck #%lu, tecken %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Kan inte hitta etiketten f鰎 hopp till \"%s\"" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kan inte l鋝a %s: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNT FEL: felaktig addresstyp" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "fel i underprocess" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "flaggan \"e\" st鰀s inte" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "kommandot \"e\" st鰀s inte" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNT FEL: Felaktigt kommando %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Inget tidigare regulj鋜t uttryck" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "Kan inte ange modifierare p tomt regulj鋜t uttryck" --- 14,162 ---- "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Flera \"!\"" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Ov鋘tat \",\"" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "+N eller ~N kan inte anv鋘das som f鰎sta adress" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Ensamt \"{\"" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Ov鋘tat \"}\"" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Extra tecken efter kommandot" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "\\ f鰎v鋘tades efter \"a\", \"c\" eller \"i\"" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "\"}\" vill inte ha n錱ra adresser" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": vill inte ha n錱ra adresser" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "Kommentarer accepterar inga adresser" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Kommando saknas" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Kommandot anv鋘der endast en adress" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Oavslutat regulj鋜t uttryck f鰎 adress" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Oavslutat \"s\"-kommando" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Oavslutat \"y\"-kommando" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "Flaggan ok鋘d f鰎 \"s\"" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "flera \"p\"-flaggor till \"s\"-kommandot" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "flera \"g\"-flaggor till \"s\"-kommandot" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "flera sifferflaggor till \"s\"-kommandot" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "sifferflagga till kommandot \"s\" f錼 inte vara noll" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "str鋘garna f鰎 kommandot \"y\" 鋜 olika l錸ga" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "Anropade savchar() med ov鋘tat returtecken (%x)" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Ok鋘t kommando:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: fil %s rad %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e uttryck #%lu, tecken %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "Kan inte hitta etiketten f鰎 hopp till \"%s\"" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kan inte l鋝a %s: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "INTERNT FEL: felaktig addresstyp" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "fel i underprocess" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "flaggan \"e\" st鰀s inte" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "kommandot \"e\" st鰀s inte" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "INTERNT FEL: Felaktigt kommando %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Inget tidigare regulj鋜t uttryck" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "Kan inte ange modifierare p tomt regulj鋜t uttryck" *************** *** 246,257 **** "Ange ordet \"%s\" p n錱ot st鋖le i \"膔ende:\"-f鋖tet.\n" "Skicka anm鋜kningar p 鰒ers鋞tningen till .\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "super-sed version %s\n" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" --- 249,260 ---- "Ange ordet \"%s\" p n錱ot st鋖le i \"膔ende:\"-f鋖tet.\n" "Skicka anm鋜kningar p 鰒ers鋞tningen till .\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "super-sed version %s\n" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" *************** *** 259,270 **** "baserad p GNU sed version 3.02.80\n" "\n" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed version %s\n" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 262,273 ---- "baserad p GNU sed version 3.02.80\n" "\n" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed version %s\n" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 280,286 **** "Det finns INGEN garanti; inte ens f鰎 S腖JBARHET eller L腗PLIGHET F諶 N臛OT\n" "SPECIELLT 腘DAM臠, i den omfattning som medges av g鋖lande lag.\n" ! #: lib/utils.c:131 #, c-format msgid "Couldn't open file %s: %s" msgstr "Kunde inte 鰌pna filen %s: %s" --- 283,289 ---- "Det finns INGEN garanti; inte ens f鰎 S腖JBARHET eller L腗PLIGHET F諶 N臛OT\n" "SPECIELLT 腘DAM臠, i den omfattning som medges av g鋖lande lag.\n" ! #: lib/utils.c:127 #, c-format msgid "Couldn't open file %s: %s" msgstr "Kunde inte 鰌pna filen %s: %s" *************** *** 297,367 **** msgid "read error on %s: %s" msgstr "l鋝fel vid %s: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "Lyckades" ! #: lib/regcomp.c:182 msgid "No match" msgstr "Ingen tr鋐f" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "Ogiltigt regulj鋜t uttryck" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "Ogiltigt sorteringstecken" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "Ogiltigt teckenklassnamn" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "Eftersl鋚ande omv鋘t snedstreck" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "Ogiltig bak錿referens" ! #: lib/regcomp.c:200 msgid "Unmatched [ or [^" msgstr "Ensamt [ eller [^" ! #: lib/regcomp.c:203 msgid "Unmatched ( or \\(" msgstr "Ensamt ( eller \\(" ! #: lib/regcomp.c:206 msgid "Unmatched \\{" msgstr "Ensamt \\{" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "Ogiltigt inneh錶l i \\{\\}" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "Ogiltigt intervallslut" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "Minnet slut" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "Ogiltigt f鰎eg錯nde regulj鋜t uttryck" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "F鰎 tidigt slut p regulj鋜t uttryck" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "Regulj鋜t uttryck f鰎 stort" ! #: lib/regcomp.c:227 msgid "Unmatched ) or \\)" msgstr "Ensamt ) eller \\)" --- 300,370 ---- msgid "read error on %s: %s" msgstr "l鋝fel vid %s: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "Lyckades" ! #: lib/regcomp.c:132 msgid "No match" msgstr "Ingen tr鋐f" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "Ogiltigt regulj鋜t uttryck" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "Ogiltigt sorteringstecken" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "Ogiltigt teckenklassnamn" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "Eftersl鋚ande omv鋘t snedstreck" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "Ogiltig bak錿referens" ! #: lib/regcomp.c:150 msgid "Unmatched [ or [^" msgstr "Ensamt [ eller [^" ! #: lib/regcomp.c:153 msgid "Unmatched ( or \\(" msgstr "Ensamt ( eller \\(" ! #: lib/regcomp.c:156 msgid "Unmatched \\{" msgstr "Ensamt \\{" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "Ogiltigt inneh錶l i \\{\\}" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "Ogiltigt intervallslut" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "Minnet slut" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "Ogiltigt f鰎eg錯nde regulj鋜t uttryck" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "F鰎 tidigt slut p regulj鋜t uttryck" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "Regulj鋜t uttryck f鰎 stort" ! #: lib/regcomp.c:177 msgid "Unmatched ) or \\)" msgstr "Ensamt ) eller \\)" Binary files sed-4.0.5/po/tr.gmo and sed-4.0.6/po/tr.gmo differ diff -rNC3 sed-4.0.5/po/tr.po sed-4.0.6/po/tr.po *** sed-4.0.5/po/tr.po Mon Dec 16 20:32:38 2002 --- sed-4.0.6/po/tr.po Sat Mar 15 08:24:58 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 3.02a\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2001-07-05 22:41EEST\n" "Last-Translator: Deniz Akkus Kanca \n" "Language-Team: Turkish \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 3.02a\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2001-07-05 22:41EEST\n" "Last-Translator: Deniz Akkus Kanca \n" "Language-Team: Turkish \n" *************** *** 14,159 **** "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.1\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "Birden fazla '!'" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "Beklenmeyen ','" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "輑k adres olarak +N veya ~N kullan齦amaz" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "Eeeyen '{'" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "Beklenmeyen '}'" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "Komuttan sonra fazla karakterler var" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "'}' i鏸n adres istenmez" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": i鏸n hi adres istenmez" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "A琮klamalarda adres kabul edilmez" ! #: sed/compile.c:199 msgid "Missing command" msgstr "Komut eksik" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "Komutta yaln齴ca tek adres kullan齦齬" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "Sonland齬齦mam adres d鼁enli ifadesi" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "Sonland齬齦mam 's' komutu" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "Sonland齬齦mam 'y' komutu" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "`s' komutuna bilinmeyen se鏴nek verilmi" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "`s' komutuna birden fazla `p' se鏴ne餴 verilmi" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "`s' komutuna birden fazla `g' se鏴ne餴 verilmi" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "`s' komutuna birden fazla say se鏴ne餴 verilmi" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "`s' komutuna verilen say se鏴ne餴 s齠齬 olamaz" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "y komutu i鏸n dizgeler de餴㱮k uzunluklarda" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "savchar() beklenmeyen geri itme (%x) ile 鏰餽齦m" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "Bilinmeyen komut:" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: dosya %s sat齬 %lu: %s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e ifade #%lu, harf %lu: %s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "`%s'e atlamak i鏸n etiket bulunam齳or" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s okunam齳or: %s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "萸 HATA: Hatal adres t黵" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "萸 HATA: Hatal komut %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "Daha 鰊ce d鼁enli ifade yok" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" --- 14,162 ---- "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.1\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "Birden fazla '!'" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "Beklenmeyen ','" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "輑k adres olarak +N veya ~N kullan齦amaz" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "Eeeyen '{'" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "Beklenmeyen '}'" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "Komuttan sonra fazla karakterler var" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "'}' i鏸n adres istenmez" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": i鏸n hi adres istenmez" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "A琮klamalarda adres kabul edilmez" ! #: sed/compile.c:191 msgid "Missing command" msgstr "Komut eksik" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "Komutta yaln齴ca tek adres kullan齦齬" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "Sonland齬齦mam adres d鼁enli ifadesi" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "Sonland齬齦mam 's' komutu" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "Sonland齬齦mam 'y' komutu" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "`s' komutuna bilinmeyen se鏴nek verilmi" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "`s' komutuna birden fazla `p' se鏴ne餴 verilmi" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "`s' komutuna birden fazla `g' se鏴ne餴 verilmi" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "`s' komutuna birden fazla say se鏴ne餴 verilmi" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "`s' komutuna verilen say se鏴ne餴 s齠齬 olamaz" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "y komutu i鏸n dizgeler de餴㱮k uzunluklarda" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "savchar() beklenmeyen geri itme (%x) ile 鏰餽齦m" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "Bilinmeyen komut:" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s: dosya %s sat齬 %lu: %s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e ifade #%lu, harf %lu: %s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "`%s'e atlamak i鏸n etiket bulunam齳or" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s okunam齳or: %s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "萸 HATA: Hatal adres t黵" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "萸 HATA: Hatal komut %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "Daha 鰊ce d鼁enli ifade yok" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" *************** *** 232,254 **** "bildirin. \n" "``%s'' s鰖c黱黱 Konu ba齨da yer almas齨a dikkat edin. \n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 235,257 ---- "bildirin. \n" "``%s'' s鰖c黱黱 Konu ba齨da yer almas齨a dikkat edin. \n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 261,267 **** "Hi鏱ir garantisi yoktur; hatta SATILAB軱軷L菪 veya HERHANG B軷 AMACA\n" "UYGUNLU蠻 i鏸n bile garanti verilmez.\n" ! #: lib/utils.c:131 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "%s dosyas a琮lamad" --- 264,270 ---- "Hi鏱ir garantisi yoktur; hatta SATILAB軱軷L菪 veya HERHANG B軷 AMACA\n" "UYGUNLU蠻 i鏸n bile garanti verilmez.\n" ! #: lib/utils.c:127 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "%s dosyas a琮lamad" *************** *** 278,355 **** msgid "read error on %s: %s" msgstr "%s'de okuma hatas: %s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "" ! #: lib/regcomp.c:182 msgid "No match" msgstr "" ! #: lib/regcomp.c:185 #, fuzzy msgid "Invalid regular expression" msgstr "Daha 鰊ce d鼁enli ifade yok" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 #, fuzzy msgid "Unmatched [ or [^" msgstr "Eeeyen '{'" ! #: lib/regcomp.c:203 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Eeeyen '{'" ! #: lib/regcomp.c:206 #, fuzzy msgid "Unmatched \\{" msgstr "Eeeyen '{'" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:218 #, fuzzy msgid "Invalid preceding regular expression" msgstr "Daha 鰊ce d鼁enli ifade yok" ! #: lib/regcomp.c:221 #, fuzzy msgid "Premature end of regular expression" msgstr "Daha 鰊ce d鼁enli ifade yok" ! #: lib/regcomp.c:224 #, fuzzy msgid "Regular expression too big" msgstr "Daha 鰊ce d鼁enli ifade yok" ! #: lib/regcomp.c:227 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Eeeyen '{'" --- 281,358 ---- msgid "read error on %s: %s" msgstr "%s'de okuma hatas: %s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "" ! #: lib/regcomp.c:132 msgid "No match" msgstr "" ! #: lib/regcomp.c:135 #, fuzzy msgid "Invalid regular expression" msgstr "Daha 鰊ce d鼁enli ifade yok" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 #, fuzzy msgid "Unmatched [ or [^" msgstr "Eeeyen '{'" ! #: lib/regcomp.c:153 #, fuzzy msgid "Unmatched ( or \\(" msgstr "Eeeyen '{'" ! #: lib/regcomp.c:156 #, fuzzy msgid "Unmatched \\{" msgstr "Eeeyen '{'" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:168 #, fuzzy msgid "Invalid preceding regular expression" msgstr "Daha 鰊ce d鼁enli ifade yok" ! #: lib/regcomp.c:171 #, fuzzy msgid "Premature end of regular expression" msgstr "Daha 鰊ce d鼁enli ifade yok" ! #: lib/regcomp.c:174 #, fuzzy msgid "Regular expression too big" msgstr "Daha 鰊ce d鼁enli ifade yok" ! #: lib/regcomp.c:177 #, fuzzy msgid "Unmatched ) or \\)" msgstr "Eeeyen '{'" Binary files sed-4.0.5/po/zh_CN.gmo and sed-4.0.6/po/zh_CN.gmo differ diff -rNC3 sed-4.0.5/po/zh_CN.po sed-4.0.6/po/zh_CN.po *** sed-4.0.5/po/zh_CN.po Mon Dec 16 20:32:38 2002 --- sed-4.0.6/po/zh_CN.po Sat Mar 15 08:24:58 2003 *************** *** 5,11 **** msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" ! "POT-Creation-Date: 2002-12-16 20:32+0100\n" "PO-Revision-Date: 2002-08-18 11:11+0800\n" "Last-Translator: Wang Li \n" "Language-Team: Chinese (simplified) \n" --- 5,11 ---- msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" ! "POT-Creation-Date: 2003-03-15 08:24+0100\n" "PO-Revision-Date: 2002-08-18 11:11+0800\n" "Last-Translator: Wang Li \n" "Language-Team: Chinese (simplified) \n" *************** *** 13,158 **** "Content-Type: text/plain; charset=gb2312\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:189 msgid "Multiple `!'s" msgstr "多个“!”" ! #: sed/compile.c:190 msgid "Unexpected `,'" msgstr "意外的“,”" ! #: sed/compile.c:191 msgid "Cannot use +N or ~N as first address" msgstr "无法将 +N 或 ~N 作为第一个地址" ! #: sed/compile.c:192 msgid "Unmatched `{'" msgstr "未匹配的“{”" ! #: sed/compile.c:193 msgid "Unexpected `}'" msgstr "未匹配的“}”" ! #: sed/compile.c:194 msgid "Extra characters after command" msgstr "命令后含有多余的字符" ! #: sed/compile.c:195 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:196 msgid "`}' doesn't want any addresses" msgstr "“}”不需要任何地址" ! #: sed/compile.c:197 msgid ": doesn't want any addresses" msgstr ": 不需要任何地址" ! #: sed/compile.c:198 msgid "Comments don't accept any addresses" msgstr "注释不接受任何地址" ! #: sed/compile.c:199 msgid "Missing command" msgstr "遗漏命令" ! #: sed/compile.c:200 msgid "Command only uses one address" msgstr "命令只使用一个地址" ! #: sed/compile.c:201 msgid "Unterminated address regex" msgstr "未终止的地址常规表达式" ! #: sed/compile.c:202 msgid "Unterminated `s' command" msgstr "未终止的“s”命令" ! #: sed/compile.c:203 msgid "Unterminated `y' command" msgstr "未终止的“y”命令" ! #: sed/compile.c:204 msgid "Unknown option to `s'" msgstr "“s”的未知选项" ! #: sed/compile.c:205 msgid "multiple `p' options to `s' command" msgstr "多个“s”命令的选项“p”" ! #: sed/compile.c:206 msgid "multiple `g' options to `s' command" msgstr "多个“s”命令的选项“g”" ! #: sed/compile.c:207 msgid "multiple number options to `s' command" msgstr "多个“s”命令的数值选项" ! #: sed/compile.c:208 msgid "number option to `s' command may not be zero" msgstr "“s”命令的数值选项不能为零" ! #: sed/compile.c:209 msgid "strings for y command are different lengths" msgstr "y 命令的字符串长度不同" ! #: sed/compile.c:252 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "" ! #: sed/compile.c:1343 msgid "Unknown command:" msgstr "未知的命令：" ! #: sed/compile.c:1364 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s：文件 %s 行号：%lu：%s\n" ! #: sed/compile.c:1367 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s：-e 表达式 #%lu，字符 %lu：%s\n" ! #: sed/compile.c:1567 #, c-format msgid "Can't find label for jump to `%s'" msgstr "无法为目的为“%s”的跳转找到标签" ! #: sed/execute.c:516 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s：无法读取 %s：%s\n" ! #: sed/execute.c:722 msgid "INTERNAL ERROR: bad address type" msgstr "内部错误：错误的地址类型" ! #: sed/execute.c:1003 sed/execute.c:1183 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1005 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1185 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1415 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "内部错误：错误的命令 %c" ! #. XXX shouldn't this be (UCHAR_MAX+1)? ! #: lib/regcomp.c:661 sed/regex.c:46 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:47 msgid "Cannot specify modifiers on empty regexp" msgstr "" --- 13,161 ---- "Content-Type: text/plain; charset=gb2312\n" "Content-Transfer-Encoding: 8bit\n" ! #: sed/compile.c:181 msgid "Multiple `!'s" msgstr "多个“!”" ! #: sed/compile.c:182 msgid "Unexpected `,'" msgstr "意外的“,”" ! #: sed/compile.c:183 msgid "Cannot use +N or ~N as first address" msgstr "无法将 +N 或 ~N 作为第一个地址" ! #: sed/compile.c:184 msgid "Unmatched `{'" msgstr "未匹配的“{”" ! #: sed/compile.c:185 msgid "Unexpected `}'" msgstr "未匹配的“}”" ! #: sed/compile.c:186 msgid "Extra characters after command" msgstr "命令后含有多余的字符" ! #: sed/compile.c:187 msgid "Expected \\ after `a', `c' or `i'" msgstr "" ! #: sed/compile.c:188 msgid "`}' doesn't want any addresses" msgstr "“}”不需要任何地址" ! #: sed/compile.c:189 msgid ": doesn't want any addresses" msgstr ": 不需要任何地址" ! #: sed/compile.c:190 msgid "Comments don't accept any addresses" msgstr "注释不接受任何地址" ! #: sed/compile.c:191 msgid "Missing command" msgstr "遗漏命令" ! #: sed/compile.c:192 msgid "Command only uses one address" msgstr "命令只使用一个地址" ! #: sed/compile.c:193 msgid "Unterminated address regex" msgstr "未终止的地址常规表达式" ! #: sed/compile.c:194 msgid "Unterminated `s' command" msgstr "未终止的“s”命令" ! #: sed/compile.c:195 msgid "Unterminated `y' command" msgstr "未终止的“y”命令" ! #: sed/compile.c:196 msgid "Unknown option to `s'" msgstr "“s”的未知选项" ! #: sed/compile.c:197 msgid "multiple `p' options to `s' command" msgstr "多个“s”命令的选项“p”" ! #: sed/compile.c:198 msgid "multiple `g' options to `s' command" msgstr "多个“s”命令的选项“g”" ! #: sed/compile.c:199 msgid "multiple number options to `s' command" msgstr "多个“s”命令的数值选项" ! #: sed/compile.c:200 msgid "number option to `s' command may not be zero" msgstr "“s”命令的数值选项不能为零" ! #: sed/compile.c:201 msgid "strings for y command are different lengths" msgstr "y 命令的字符串长度不同" ! #: sed/compile.c:202 ! msgid "expected newer version of sed" ! msgstr "" ! ! #: sed/compile.c:245 #, c-format msgid "Called savchar() with unexpected pushback (%x)" msgstr "" ! #: sed/compile.c:1340 msgid "Unknown command:" msgstr "未知的命令：" ! #: sed/compile.c:1361 #, c-format msgid "%s: file %s line %lu: %s\n" msgstr "%s：文件 %s 行号：%lu：%s\n" ! #: sed/compile.c:1364 #, c-format msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s：-e 表达式 #%lu，字符 %lu：%s\n" ! #: sed/compile.c:1564 #, c-format msgid "Can't find label for jump to `%s'" msgstr "无法为目的为“%s”的跳转找到标签" ! #: sed/execute.c:517 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s：无法读取 %s：%s\n" ! #: sed/execute.c:726 msgid "INTERNAL ERROR: bad address type" msgstr "内部错误：错误的地址类型" ! #: sed/execute.c:1006 sed/execute.c:1186 msgid "error in subprocess" msgstr "" ! #: sed/execute.c:1008 msgid "option `e' not supported" msgstr "" ! #: sed/execute.c:1188 msgid "`e' command not supported" msgstr "" ! #: sed/execute.c:1418 #, c-format msgid "INTERNAL ERROR: Bad cmd %c" msgstr "内部错误：错误的命令 %c" ! #: lib/regcomp.c:611 sed/regex.c:49 msgid "No previous regular expression" msgstr "" ! #: sed/regex.c:50 msgid "Cannot specify modifiers on empty regexp" msgstr "" *************** *** 232,254 **** "将错误报告通过电子邮件发送到：%s .\n" "请务必将单词“%s”放在“Subject:”域的某处。\n" ! #: sed/sed.c:255 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:256 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:258 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:260 #, c-format msgid "" "%s\n" --- 235,257 ---- "将错误报告通过电子邮件发送到：%s .\n" "请务必将单词“%s”放在“Subject:”域的某处。\n" ! #: sed/sed.c:256 #, c-format msgid "super-sed version %s\n" msgstr "" ! #: sed/sed.c:257 msgid "" "based on GNU sed version 3.02.80\n" "\n" msgstr "" ! #: sed/sed.c:259 #, c-format msgid "GNU sed version %s\n" msgstr "" ! #: sed/sed.c:261 #, c-format msgid "" "%s\n" *************** *** 257,263 **** "to the extent permitted by law.\n" msgstr "" ! #: lib/utils.c:131 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "无法打开文件 %s" --- 260,266 ---- "to the extent permitted by law.\n" msgstr "" ! #: lib/utils.c:127 #, fuzzy, c-format msgid "Couldn't open file %s: %s" msgstr "无法打开文件 %s" *************** *** 274,347 **** msgid "read error on %s: %s" msgstr "读取 %s 出错：%s" ! #: lib/regcomp.c:179 msgid "Success" msgstr "" ! #: lib/regcomp.c:182 msgid "No match" msgstr "" ! #: lib/regcomp.c:185 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:188 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:191 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:194 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:197 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:200 #, fuzzy msgid "Unmatched [ or [^" msgstr "未匹配的“{”" ! #: lib/regcomp.c:203 #, fuzzy msgid "Unmatched ( or \\(" msgstr "未匹配的“{”" ! #: lib/regcomp.c:206 #, fuzzy msgid "Unmatched \\{" msgstr "未匹配的“{”" ! #: lib/regcomp.c:209 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:212 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:215 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:218 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:221 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:224 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:227 #, fuzzy msgid "Unmatched ) or \\)" msgstr "未匹配的“{”" --- 277,350 ---- msgid "read error on %s: %s" msgstr "读取 %s 出错：%s" ! #: lib/regcomp.c:129 msgid "Success" msgstr "" ! #: lib/regcomp.c:132 msgid "No match" msgstr "" ! #: lib/regcomp.c:135 msgid "Invalid regular expression" msgstr "" ! #: lib/regcomp.c:138 msgid "Invalid collation character" msgstr "" ! #: lib/regcomp.c:141 msgid "Invalid character class name" msgstr "" ! #: lib/regcomp.c:144 msgid "Trailing backslash" msgstr "" ! #: lib/regcomp.c:147 msgid "Invalid back reference" msgstr "" ! #: lib/regcomp.c:150 #, fuzzy msgid "Unmatched [ or [^" msgstr "未匹配的“{”" ! #: lib/regcomp.c:153 #, fuzzy msgid "Unmatched ( or \\(" msgstr "未匹配的“{”" ! #: lib/regcomp.c:156 #, fuzzy msgid "Unmatched \\{" msgstr "未匹配的“{”" ! #: lib/regcomp.c:159 msgid "Invalid content of \\{\\}" msgstr "" ! #: lib/regcomp.c:162 msgid "Invalid range end" msgstr "" ! #: lib/regcomp.c:165 msgid "Memory exhausted" msgstr "" ! #: lib/regcomp.c:168 msgid "Invalid preceding regular expression" msgstr "" ! #: lib/regcomp.c:171 msgid "Premature end of regular expression" msgstr "" ! #: lib/regcomp.c:174 msgid "Regular expression too big" msgstr "" ! #: lib/regcomp.c:177 #, fuzzy msgid "Unmatched ) or \\)" msgstr "未匹配的“{”" diff -rNC3 sed-4.0.5/sed/Makefile.am sed-4.0.6/sed/Makefile.am *** sed-4.0.5/sed/Makefile.am Mon Sep 30 09:53:33 2002 --- sed-4.0.6/sed/Makefile.am Tue Dec 24 10:50:34 2002 *************** *** 1,11 **** --- 1,15 ---- ## Process this file with automake to produce Makefile.in bin_PROGRAMS = sed + localedir = $(datadir)/locale + sed_SOURCES = sed.c compile.c execute.c regex.c fmt.c noinst_HEADERS = sed.h INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/intl \ -I$(top_srcdir) + + AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" sed_LDADD = ../lib/libsed.a @INTLLIBS@ sed_DEPENDENCIES = ../lib/libsed.a diff -rNC3 sed-4.0.5/sed/Makefile.in sed-4.0.6/sed/Makefile.in *** sed-4.0.5/sed/Makefile.in Sat Dec 14 11:44:41 2002 --- sed-4.0.6/sed/Makefile.in Tue Mar 18 17:56:38 2003 *************** *** 97,102 **** --- 97,103 ---- POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ + SED_FEATURE_VERSION = @SED_FEATURE_VERSION@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ *************** *** 143,154 **** --- 144,159 ---- target_alias = @target_alias@ bin_PROGRAMS = sed + localedir = $(datadir)/locale + sed_SOURCES = sed.c compile.c execute.c regex.c fmt.c noinst_HEADERS = sed.h INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/intl \ -I$(top_srcdir) + + AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" sed_LDADD = ../lib/libsed.a @INTLLIBS@ sed_DEPENDENCIES = ../lib/libsed.a diff -rNC3 sed-4.0.5/sed/compile.c sed-4.0.6/sed/compile.c *** sed-4.0.5/sed/compile.c Mon Dec 16 20:31:57 2002 --- sed-4.0.6/sed/compile.c Sat Mar 15 08:22:21 2003 *************** *** 1,5 **** /* GNU SED, a batch stream editor. ! Copyright (C) 1989,90,91,92,93,94,95,98,99,2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* GNU SED, a batch stream editor. ! Copyright (C) 1989,90,91,92,93,94,95,98,99,2002,2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 19,29 **** /* compile.c: translate sed source into internal form */ #include "config.h" #include - - #ifndef __STRICT_ANSI__ - # define _GNU_SOURCE - #endif #include #ifdef HAVE_STRINGS_H --- 19,26 ---- /* compile.c: translate sed source into internal form */ #include "config.h" + #include "strverscmp.h" #include #include #ifdef HAVE_STRINGS_H *************** *** 57,68 **** #include "utils.h" #include "sed.h" - #ifdef gettext_noop - # define N_(String) gettext_noop (String) - #else - # define N_(String) (String) - #endif - extern flagT no_default_output; extern flagT POSIXLY_CORRECT; --- 54,59 ---- *************** *** 148,154 **** /* We wish to detect #n magic only in the first input argument; this flag tracks when we have consumed the first file of input. */ ! static flagT first_script = 1; /* Allow for scripts like "sed -e 'i\' -e foo": */ static struct buffer *pending_text = NULL; --- 139,145 ---- /* We wish to detect #n magic only in the first input argument; this flag tracks when we have consumed the first file of input. */ ! static flagT first_script = TRUE; /* Allow for scripts like "sed -e 'i\' -e foo": */ static struct buffer *pending_text = NULL; *************** *** 183,189 **** "multiple `g' options to `s' command\0" "multiple number options to `s' command\0" "number option to `s' command may not be zero\0" ! "strings for y command are different lengths"; #define BAD_BANG (errors) #define BAD_COMMA (BAD_BANG + sizeof(N_("Multiple `!'s"))) --- 174,181 ---- "multiple `g' options to `s' command\0" "multiple number options to `s' command\0" "number option to `s' command may not be zero\0" ! "strings for y command are different lengths\0" ! "expected newer version of sed"; #define BAD_BANG (errors) #define BAD_COMMA (BAD_BANG + sizeof(N_("Multiple `!'s"))) *************** *** 206,212 **** #define EXCESS_N_OPT (EXCESS_G_OPT + sizeof(N_("multiple `g' options to `s' command"))) #define ZERO_N_OPT (EXCESS_N_OPT + sizeof(N_("multiple number options to `s' command"))) #define Y_CMD_LEN (ZERO_N_OPT + sizeof(N_("number option to `s' command may not be zero"))) ! #define END_ERRORS (Y_CMD_LEN + sizeof(N_("strings for y command are different lengths"))) static struct fp_list *file_read = NULL; static struct fp_list *file_write = NULL; --- 198,205 ---- #define EXCESS_N_OPT (EXCESS_G_OPT + sizeof(N_("multiple `g' options to `s' command"))) #define ZERO_N_OPT (EXCESS_N_OPT + sizeof(N_("multiple number options to `s' command"))) #define Y_CMD_LEN (ZERO_N_OPT + sizeof(N_("number option to `s' command may not be zero"))) ! #define ANCIENT_VERSION (Y_CMD_LEN + sizeof(N_("strings for y command are different lengths"))) ! #define END_ERRORS (ANCIENT_VERSION + sizeof(N_("expected newer version of sed"))) static struct fp_list *file_read = NULL; static struct fp_list *file_write = NULL; *************** *** 410,416 **** p->name = ck_strdup(file_name); p->special = fp != NULL; if (!fp) ! fp = fail ? ck_fopen(p->name, mode) : fopen(p->name, mode); p->fp = fp; p->link = *file_ptrs; *file_ptrs = p; --- 403,409 ---- p->name = ck_strdup(file_name); p->special = fp != NULL; if (!fp) ! fp = ck_fopen(p->name, mode, fail); p->fp = fp; p->link = *file_ptrs; *file_ptrs = p; *************** *** 438,445 **** cmd = v->v + v->v_length; cmd->a1 = NULL; cmd->a2 = NULL; ! cmd->a1_matched = 0; ! cmd->addr_bang = 0; cmd->cmd = '\0'; /* something invalid, to catch bugs early */ *vectorp = v; --- 431,438 ---- cmd = v->v + v->v_length; cmd->a1 = NULL; cmd->a2 = NULL; ! cmd->a1_matched = FALSE; ! cmd->addr_bang = FALSE; cmd->cmd = '\0'; /* something invalid, to catch bugs early */ *vectorp = v; *************** *** 546,555 **** int flags = 0; int ch; ! cmd->global = 0; ! cmd->print = 0; ! cmd->eval = 0; ! cmd->numb = 0; cmd->fp = NULL; for (;;) --- 539,548 ---- int flags = 0; int ch; ! cmd->global = FALSE; ! cmd->print = FALSE; ! cmd->eval = FALSE; ! cmd->numb = FALSE; cmd->fp = NULL; for (;;) *************** *** 580,602 **** break; case 'e': ! cmd->eval = 1; break; case 'p': if (cmd->print) bad_prog(_(EXCESS_P_OPT)); ! cmd->print |= (1 << cmd->eval); /* 1=before eval, 2=after */ break; case 'g': if (cmd->global) bad_prog(_(EXCESS_G_OPT)); ! cmd->global = 1; break; case 'w': ! cmd->fp = get_openfile(&file_write, "w", 1); return flags; case '0': case '1': case '2': case '3': case '4': --- 573,595 ---- break; case 'e': ! cmd->eval = TRUE; break; case 'p': if (cmd->print) bad_prog(_(EXCESS_P_OPT)); ! cmd->print |= (TRUE << cmd->eval); /* 1=before eval, 2=after */ break; case 'g': if (cmd->global) bad_prog(_(EXCESS_G_OPT)); ! cmd->global = TRUE; break; case 'w': ! cmd->fp = get_openfile(&file_write, "w", TRUE); return flags; case '0': case '1': case '2': case '3': case '4': *************** *** 896,902 **** addr->addr_type = addr_is_regex; if (ch == '\\') ch = inchar(); ! if ( !(b = match_slash(ch, 1, 1)) ) bad_prog(_(UNTERM_ADDR_RE)); for(;;) --- 889,895 ---- addr->addr_type = addr_is_regex; if (ch == '\\') ch = inchar(); ! if ( !(b = match_slash(ch, TRUE, TRUE)) ) bad_prog(_(UNTERM_ADDR_RE)); for(;;) *************** *** 928,934 **** savchar (ch); addr->addr_regex = compile_regex (b, flags, 0); free_buffer(b); ! return 1; } } } --- 921,927 ---- savchar (ch); addr->addr_regex = compile_regex (b, flags, 0); free_buffer(b); ! return TRUE; } } } *************** *** 966,974 **** addr->addr_type = addr_is_last; } else ! return 0; ! return 1; } /* Read a program (or a subprogram within `{' `}' pairs) in and store --- 959,967 ---- addr->addr_type = addr_is_last; } else ! return FALSE; ! return TRUE; } /* Read a program (or a subprogram within `{' `}' pairs) in and store *************** *** 1023,1034 **** if ((cur_cmd->a1->addr_type == addr_is_num || cur_cmd->a1->addr_type == addr_is_num_mod) && cur_cmd->a1->addr_number == 0) ! cur_cmd->a1_matched = 1; } } if (ch == '!') { ! cur_cmd->addr_bang = 1; ch = in_nonblank(); if (ch == '!') bad_prog(_(BAD_BANG)); --- 1016,1027 ---- if ((cur_cmd->a1->addr_type == addr_is_num || cur_cmd->a1->addr_type == addr_is_num_mod) && cur_cmd->a1->addr_number == 0) ! cur_cmd->a1_matched = TRUE; } } if (ch == '!') { ! cur_cmd->addr_bang = TRUE; ch = in_nonblank(); if (ch == '!') bad_prog(_(BAD_BANG)); *************** *** 1044,1065 **** if (ch=='n' && first_script && cur_input.line < 2) if ( (prog.base && prog.cur==2+prog.base) || (prog.file && !prog.base && 2==ftell(prog.file))) ! no_default_output = 1; while (ch != EOF && ch != '\n') ch = inchar(); continue; /* restart the for (;;) loop */ case 'v': ! /* This is an extension. Programs needing GNU sed might start ! * with a `v' command so that other seds will stop (`v' is for ! * version -- maybe later we can add support for a number ! * specifying which version is needed). We just ignore it. ! */ ! ch = in_nonblank(); ! if (ch == CLOSE_BRACE || ch == '#') ! savchar(ch); ! else if (ch != EOF && ch != '\n' && ch != ';') ! bad_prog(_(EXCESS_JUNK)); continue; case '{': --- 1037,1062 ---- if (ch=='n' && first_script && cur_input.line < 2) if ( (prog.base && prog.cur==2+prog.base) || (prog.file && !prog.base && 2==ftell(prog.file))) ! no_default_output = TRUE; while (ch != EOF && ch != '\n') ch = inchar(); continue; /* restart the for (;;) loop */ case 'v': ! /* This is an extension. Programs needing GNU sed might start ! * with a `v' command so that other seds will stop. ! * We compare the version ignore it. ! */ ! { ! char *version = read_label (); ! char *compared_version; ! compared_version = (*version == '\0') ? "4.0" : version; ! if (strverscmp (compared_version, SED_FEATURE_VERSION) > 0) ! bad_prog(_(ANCIENT_VERSION)); ! ! free (version); ! POSIXLY_CORRECT = 0; ! } continue; case '{': *************** *** 1186,1197 **** break; case 'R': ! cur_cmd->x.fp = get_openfile(&file_read, "r", 0); break; case 'w': case 'W': ! cur_cmd->x.fp = get_openfile(&file_write, "w", 1); break; case 's': --- 1183,1194 ---- break; case 'R': ! cur_cmd->x.fp = get_openfile(&file_read, "r", FALSE); break; case 'w': case 'W': ! cur_cmd->x.fp = get_openfile(&file_write, "w", TRUE); break; case 's': *************** *** 1201,1209 **** int slash; slash = inchar(); ! if ( !(b = match_slash(slash, 1, 1)) ) bad_prog(_(UNTERM_S_CMD)); ! if ( !(b2 = match_slash(slash, 0, 1)) ) bad_prog(_(UNTERM_S_CMD)); cur_cmd->x.cmd_subst = OB_MALLOC(&obs, 1, struct subst); --- 1198,1206 ---- int slash; slash = inchar(); ! if ( !(b = match_slash(slash, TRUE, TRUE)) ) bad_prog(_(UNTERM_S_CMD)); ! if ( !(b2 = match_slash(slash, FALSE, TRUE)) ) bad_prog(_(UNTERM_S_CMD)); cur_cmd->x.cmd_subst = OB_MALLOC(&obs, 1, struct subst); *************** *** 1235,1241 **** } slash = inchar(); ! if ( !(b = match_slash(slash, 0, 0)) ) bad_prog(_(UNTERM_Y_CMD)); #if defined MBS_SUPPORT && !defined (REG_PERL) --- 1232,1238 ---- } slash = inchar(); ! if ( !(b = match_slash(slash, FALSE, FALSE)) ) bad_prog(_(UNTERM_Y_CMD)); #if defined MBS_SUPPORT && !defined (REG_PERL) *************** *** 1265,1271 **** src_char_num = j; memset(&cur_stat, 0, sizeof(mbstate_t)); ! if ( !(b2 = match_slash(slash, 0, 0)) ) bad_prog(_(UNTERM_Y_CMD)); dest_buf = get_buffer(b2); idx = 0; --- 1262,1268 ---- src_char_num = j; memset(&cur_stat, 0, sizeof(mbstate_t)); ! if ( !(b2 = match_slash(slash, FALSE, FALSE)) ) bad_prog(_(UNTERM_Y_CMD)); dest_buf = get_buffer(b2); idx = 0; *************** *** 1492,1498 **** prog.cur = NULL; prog.end = NULL; ! first_script = 0; return ret; } --- 1489,1495 ---- prog.cur = NULL; prog.end = NULL; ! first_script = FALSE; return ret; } *************** *** 1509,1515 **** prog.file = stdin; if (cmdfile[0] != '-' || cmdfile[1] != '\0') ! prog.file = ck_fopen(cmdfile, "rt"); cur_input.line = 1; cur_input.name = cmdfile; --- 1506,1512 ---- prog.file = stdin; if (cmdfile[0] != '-' || cmdfile[1] != '\0') ! prog.file = ck_fopen(cmdfile, "rt", TRUE); cur_input.line = 1; cur_input.name = cmdfile; *************** *** 1520,1526 **** ck_fclose(prog.file); prog.file = NULL; ! first_script = 0; return ret; } --- 1517,1523 ---- ck_fclose(prog.file); prog.file = NULL; ! first_script = FALSE; return ret; } diff -rNC3 sed-4.0.5/sed/execute.c sed-4.0.6/sed/execute.c *** sed-4.0.5/sed/execute.c Fri Nov 22 11:50:44 2002 --- sed-4.0.6/sed/execute.c Sat Feb 15 13:08:15 2003 *************** *** 1,6 **** /* GNU SED, a batch stream editor. ! Copyright (C) 1989,90,91,92,93,94,95,98,99,2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,6 ---- /* GNU SED, a batch stream editor. ! Copyright (C) 1989,90,91,92,93,94,95,98,99,2002,2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 126,132 **** /* Have we done any replacements lately? This is used by the `t' command. */ ! static flagT replaced = 0; /* The current output file (stdout if -i is not being used. */ static FILE *output_file; --- 126,132 ---- /* Have we done any replacements lately? This is used by the `t' command. */ ! static flagT replaced = FALSE; /* The current output file (stdout if -i is not being used. */ static FILE *output_file; *************** *** 282,288 **** buf->active = buf->text; buf->alloc = initial_size; buf->length = 0; ! buf->chomped = 1; } /* Copy the contents of the line `from' into the line `to'. --- 282,288 ---- buf->active = buf->text; buf->alloc = initial_size; buf->length = 0; ! buf->chomped = TRUE; } /* Copy the contents of the line `from' into the line `to'. *************** *** 348,354 **** read_always_fail(input) struct input *input UNUSED; { ! return 0; } static flagT read_file_line P_((struct input *)); --- 348,354 ---- read_always_fail(input) struct input *input UNUSED; { ! return FALSE; } static flagT read_file_line P_((struct input *)); *************** *** 368,381 **** { /* No trailing new line found. */ if (!*input->file_list && !POSIXLY_CORRECT) ! line.chomped = 0; if (result <= 0) ! return 0; } str_append(&line, b, result); ! return 1; } --- 368,381 ---- { /* No trailing new line found. */ if (!*input->file_list && !POSIXLY_CORRECT) ! line.chomped = FALSE; if (result <= 0) ! return FALSE; } str_append(&line, b, result); ! return TRUE; } *************** *** 405,411 **** n->text = NULL; n->textlen = 0; n->next = NULL; ! n->free = 0; if (append_tail) append_tail->next = n; --- 405,411 ---- n->text = NULL; n->textlen = 0; n->next = NULL; ! n->free = FALSE; if (append_tail) append_tail->next = n; *************** *** 440,461 **** for (p=append_head; p; p=p->next) { if (p->text) ! output_line(p->text, p->textlen, 0, output_file); if (p->fname) { char buf[FREAD_BUFFER_SIZE]; size_t cnt; FILE *fp; ! fp = fopen(p->fname, "r"); ! /* Not ck_fopen() because: "If _fname_ does not exist or cannot be ! read, it shall be treated as if it were an empty file, causing ! no error condition." IEEE Std 1003.2-1992 */ if (fp) { while ((cnt = ck_fread(buf, 1, sizeof buf, fp)) > 0) ck_fwrite(buf, 1, cnt, output_file); ! fclose(fp); } } } --- 440,462 ---- for (p=append_head; p; p=p->next) { if (p->text) ! output_line(p->text, p->textlen, FALSE, output_file); if (p->fname) { char buf[FREAD_BUFFER_SIZE]; size_t cnt; FILE *fp; ! /* "If _fname_ does not exist or cannot be read, it shall ! be treated as if it were an empty file, causing no error ! condition." IEEE Std 1003.2-1992 ! So, don't fail. */ ! fp = ck_fopen(p->fname, "r", FALSE); if (fp) { while ((cnt = ck_fread(buf, 1, sizeof buf, fp)) > 0) ck_fwrite(buf, 1, cnt, output_file); ! ck_fclose(fp); } } } *************** *** 510,516 **** clearerr(stdin); /* clear any stale EOF indication */ input->fp = stdin; } ! else if ( ! (input->fp = fopen(name, "r")) ) { const char *ptr = strerror(errno); fprintf(stderr, _("%s: can't read %s: %s\n"), myname, name, ptr); --- 511,517 ---- clearerr(stdin); /* clear any stale EOF indication */ input->fp = stdin; } ! else if ( ! (input->fp = ck_fopen(name, "r", FALSE)) ) { const char *ptr = strerror(errno); fprintf(stderr, _("%s: can't read %s: %s\n"), myname, name, ptr); *************** *** 524,530 **** if (in_place_extension) { int output_fd; - struct stat st; char *tmpdir = ck_strdup(name), *p; /* get the base name */ --- 525,530 ---- *************** *** 538,547 **** output_fd = mkstemp (input->out_file_name); free (tmpdir); - fstat (fileno (input->fp), &st); #ifdef HAVE_FCHMOD ! fchmod (output_fd, st.st_mode); #endif output_file = fdopen (output_fd, "w"); } else --- 538,551 ---- output_fd = mkstemp (input->out_file_name); free (tmpdir); #ifdef HAVE_FCHMOD ! { ! struct stat st; ! fstat (fileno (input->fp), &st); ! fchmod (output_fd, st.st_mode); ! } #endif + output_file = fdopen (output_fd, "w"); } else *************** *** 591,597 **** int n; for (cur_cmd = vec->v, n = vec->v_length; n--; cur_cmd++) ! cur_cmd->a1_matched = 0; } /* Read in the next line of input, and store it in the pattern space. --- 595,601 ---- int n; for (cur_cmd = vec->v, n = vec->v_length; n--; cur_cmd++) ! cur_cmd->a1_matched = FALSE; } /* Read in the next line of input, and store it in the pattern space. *************** *** 605,614 **** { if (append_head) /* redundant test to optimize for common case */ dump_append_queue(); ! replaced = 0; if (!append) line.length = 0; ! line.chomped = 1; /* default, until proved otherwise */ while ( ! (*input->read_fn)(input) ) { --- 609,618 ---- { if (append_head) /* redundant test to optimize for common case */ dump_append_queue(); ! replaced = FALSE; if (!append) line.length = 0; ! line.chomped = TRUE; /* default, until proved otherwise */ while ( ! (*input->read_fn)(input) ) { *************** *** 616,623 **** if (!*input->file_list) { ! line.chomped = 0; ! return 0; } if (separate_files) --- 620,627 ---- if (!*input->file_list) { ! line.chomped = FALSE; ! return FALSE; } if (separate_files) *************** *** 630,636 **** } ++input->line_number; ! return 1; } --- 634,640 ---- } ++input->line_number; ! return TRUE; } *************** *** 645,658 **** closedown(input); if (!*input->file_list) ! return 1; open_next_file(*input->file_list++, input); if (input->fp) { if ((ch = getc(input->fp)) != EOF) { ungetc(ch, input->fp); ! return 0; } } } --- 649,662 ---- closedown(input); if (!*input->file_list) ! return TRUE; open_next_file(*input->file_list++, input); if (input->fp) { if ((ch = getc(input->fp)) != EOF) { ungetc(ch, input->fp); ! return FALSE; } } } *************** *** 667,673 **** int ch; if (buffer.length) ! return 0; if (!input->fp) return separate_files || last_file_with_data_p(input); if (feof(input->fp)) --- 671,677 ---- int ch; if (buffer.length) ! return FALSE; if (!input->fp) return separate_files || last_file_with_data_p(input); if (feof(input->fp)) *************** *** 675,681 **** if ((ch = getc(input->fp)) == EOF) return separate_files || last_file_with_data_p(input); ungetc(ch, input->fp); ! return 0; } /* Return non-zero if the current line matches the address --- 679,685 ---- if ((ch = getc(input->fp)) == EOF) return separate_files || last_file_with_data_p(input); ungetc(ch, input->fp); ! return FALSE; } /* Return non-zero if the current line matches the address *************** *** 689,695 **** switch (addr->addr_type) { case addr_is_null: ! return 1; case addr_is_regex: return match_regex(addr->addr_regex, line.active, line.length, 0, NULL, 0); --- 693,699 ---- switch (addr->addr_type) { case addr_is_null: ! return TRUE; case addr_is_regex: return match_regex(addr->addr_regex, line.active, line.length, 0, NULL, 0); *************** *** 702,708 **** return (addr->addr_number == input->line_number%addr->addr_step); /* addr_number >= step implies we have an extra initial skip */ if (input->line_number < addr->addr_number) ! return 0; /* normalize */ addr->addr_number %= addr->addr_step; return (addr->addr_number == 0); --- 706,712 ---- return (addr->addr_number == input->line_number%addr->addr_step); /* addr_number >= step implies we have an extra initial skip */ if (input->line_number < addr->addr_number) ! return FALSE; /* normalize */ addr->addr_number %= addr->addr_step; return (addr->addr_number == 0); *************** *** 722,728 **** panic(_("INTERNAL ERROR: bad address type")); } /*NOTREACHED*/ ! return 0; } /* return non-zero if current address is valid for cmd */ --- 726,732 ---- panic(_("INTERNAL ERROR: bad address type")); } /*NOTREACHED*/ ! return FALSE; } /* return non-zero if current address is valid for cmd */ *************** *** 737,750 **** if (addr_matched) { if (match_an_address_p(cmd->a2, input)) ! cmd->a1_matched = 0; } else if (!cmd->a1 || match_an_address_p(cmd->a1, input)) { ! addr_matched = 1; if (cmd->a2) { ! cmd->a1_matched = 1; switch (cmd->a2->addr_type) { case addr_is_regex: --- 741,754 ---- if (addr_matched) { if (match_an_address_p(cmd->a2, input)) ! cmd->a1_matched = FALSE; } else if (!cmd->a1 || match_an_address_p(cmd->a1, input)) { ! addr_matched = TRUE; if (cmd->a2) { ! cmd->a1_matched = TRUE; switch (cmd->a2->addr_type) { case addr_is_regex: *************** *** 758,764 **** break; default: if (match_an_address_p(cmd->a2, input)) ! cmd->a1_matched = 0; break; } } --- 762,768 ---- break; default: if (match_an_address_p(cmd->a2, input)) ! cmd->a1_matched = FALSE; break; } } *************** *** 836,842 **** countT count = 0; /* number of matches found */ #define MAX_BACKREFERENCES 10 ! regmatch_t regs[MAX_BACKREFERENCES+1]; if (s_accum.alloc == 0) line_init(&s_accum, INITIAL_BUFFER_SIZE); --- 840,846 ---- countT count = 0; /* number of matches found */ #define MAX_BACKREFERENCES 10 ! static struct re_registers regs; if (s_accum.alloc == 0) line_init(&s_accum, INITIAL_BUFFER_SIZE); *************** *** 845,870 **** /* The first part of the loop optimizes s/xxx// when xxx is at the start, and s/xxx$// */ if (!match_regex(sub->regx, line.active, line.length, start, ! regs, MAX_BACKREFERENCES)) return; if (!sub->replacement && sub->numb <= 1) ! if (regs[0].rm_so == 0 && !sub->global) { /* We found a match, set the `replaced' flag. */ ! replaced = 1; ! line.active += regs[0].rm_eo; ! line.length -= regs[0].rm_eo; ! line.alloc -= regs[0].rm_eo; goto did_subst; } ! else if (regs[0].rm_eo == line.length) { /* We found a match, set the `replaced' flag. */ ! replaced = 1; ! line.length = regs[0].rm_so; goto did_subst; } --- 849,874 ---- /* The first part of the loop optimizes s/xxx// when xxx is at the start, and s/xxx$// */ if (!match_regex(sub->regx, line.active, line.length, start, ! ®s, MAX_BACKREFERENCES)) return; if (!sub->replacement && sub->numb <= 1) ! if (regs.start[0] == 0 && !sub->global) { /* We found a match, set the `replaced' flag. */ ! replaced = TRUE; ! line.active += regs.end[0]; ! line.length -= regs.end[0]; ! line.alloc -= regs.end[0]; goto did_subst; } ! else if (regs.end[0] == line.length) { /* We found a match, set the `replaced' flag. */ ! replaced = TRUE; ! line.length = regs.start[0]; goto did_subst; } *************** *** 873,880 **** struct replacement *p; enum replacement_types repl_mod = 0; ! size_t offset = regs[0].rm_so; ! size_t matched = regs[0].rm_eo - regs[0].rm_so; /* Copy stuff to the left of this match into the output string. */ if (start < offset) --- 877,884 ---- struct replacement *p; enum replacement_types repl_mod = 0; ! size_t offset = regs.start[0]; ! size_t matched = regs.end[0] - regs.start[0]; /* Copy stuff to the left of this match into the output string. */ if (start < offset) *************** *** 904,918 **** } /* We found a match, set the `replaced' flag. */ ! replaced = 1; ! last_end = regs[0].rm_eo; /* Now expand the replacement string into the output string. */ for (p=sub->replacement; p; p=p->next) { int i = p->subst_id; - regmatch_t *preg = ®s[i]; enum replacement_types curr_type; /* Apply a \[lu] modifier that was given earlier, but which we --- 908,921 ---- } /* We found a match, set the `replaced' flag. */ ! replaced = TRUE; ! last_end = regs.end[0]; /* Now expand the replacement string into the output string. */ for (p=sub->replacement; p; p=p->next) { int i = p->subst_id; enum replacement_types curr_type; /* Apply a \[lu] modifier that was given earlier, but which we *************** *** 931,963 **** } if (0 <= i) ! if (preg->rm_eo == preg->rm_so && p->repl_type & repl_modifiers) /* Save this modifier, we shall apply it later. e.g. in s/()([a-z])/\u\1\2/ the \u modifier is applied to \2, not \1 */ repl_mod = curr_type & repl_modifiers; else ! str_append_modified(&s_accum, line.active + preg->rm_so, ! CAST(size_t)(preg->rm_eo-preg->rm_so), curr_type); } ! start = regs[0].rm_eo; if (!sub->global || start == line.length) break; /* If the match was vacuous, skip over one character * and add that character to the output. */ ! if (regs[0].rm_so == regs[0].rm_eo) { str_append(&s_accum, line.active + offset, 1); ++start; } } while (match_regex(sub->regx, line.active, line.length, start, ! regs, MAX_BACKREFERENCES)); /* Copy stuff to the right of the last match into the output string. */ if (start < line.length) --- 934,966 ---- } if (0 <= i) ! if (regs.end[i] == regs.start[i] && p->repl_type & repl_modifiers) /* Save this modifier, we shall apply it later. e.g. in s/()([a-z])/\u\1\2/ the \u modifier is applied to \2, not \1 */ repl_mod = curr_type & repl_modifiers; else ! str_append_modified(&s_accum, line.active + regs.start[i], ! CAST(size_t)(regs.end[i] - regs.start[i]), curr_type); } ! start = regs.end[0]; if (!sub->global || start == line.length) break; /* If the match was vacuous, skip over one character * and add that character to the output. */ ! if (regs.start[0] == regs.end[0]) { str_append(&s_accum, line.active + offset, 1); ++start; } } while (match_regex(sub->regx, line.active, line.length, start, ! ®s, MAX_BACKREFERENCES)); /* Copy stuff to the right of the last match into the output string. */ if (start < line.length) *************** *** 1105,1117 **** case 'c': if (!cur_cmd->a1_matched) output_line(cur_cmd->x.cmd_txt.text, ! cur_cmd->x.cmd_txt.text_length, 0, output_file); /* POSIX.2 is silent about c starting a new cycle, but it seems to be expected (and make sense). */ /* Fall Through */ case 'd': line.length = 0; ! line.chomped = 0; return -1; case 'D': --- 1108,1120 ---- case 'c': if (!cur_cmd->a1_matched) output_line(cur_cmd->x.cmd_txt.text, ! cur_cmd->x.cmd_txt.text_length, FALSE, output_file); /* POSIX.2 is silent about c starting a new cycle, but it seems to be expected (and make sense). */ /* Fall Through */ case 'd': line.length = 0; ! line.chomped = FALSE; return -1; case 'D': *************** *** 1120,1126 **** if (!p) { line.length = 0; ! line.chomped = 0; return -1; } ++p; --- 1123,1129 ---- if (!p) { line.length = 0; ! line.chomped = FALSE; return -1; } ++p; *************** *** 1162,1168 **** if (!cmd_length) str_append(&s_accum, buf, n); else ! output_line(buf, n, 0, output_file); } pclose (pipe); --- 1165,1171 ---- if (!cmd_length) str_append(&s_accum, buf, n); else ! output_line(buf, n, FALSE, output_file); } pclose (pipe); *************** *** 1205,1211 **** case 'i': output_line(cur_cmd->x.cmd_txt.text, ! cur_cmd->x.cmd_txt.text_length, 0, output_file); break; case 'l': --- 1208,1214 ---- case 'i': output_line(cur_cmd->x.cmd_txt.text, ! cur_cmd->x.cmd_txt.text_length, FALSE, output_file); break; case 'l': *************** *** 1225,1237 **** case 'n': if (!no_default_output) output_line(line.active, line.length, line.chomped, output_file); ! if (test_eof(input) || !read_pattern_space(input, vec, 0)) return -1; break; case 'N': str_append(&line, "\n", 1); ! if (test_eof(input) || !read_pattern_space(input, vec, 1)) return -1; break; --- 1228,1240 ---- case 'n': if (!no_default_output) output_line(line.active, line.length, line.chomped, output_file); ! if (test_eof(input) || !read_pattern_space(input, vec, FALSE)) return -1; break; case 'N': str_append(&line, "\n", 1); ! if (test_eof(input) || !read_pattern_space(input, vec, TRUE)) return -1; break; *************** *** 1249,1255 **** case 'Q': line.length = 0; ! line.chomped = 0; /* Fall through */ case 'q': --- 1252,1258 ---- case 'Q': line.length = 0; ! line.chomped = FALSE; /* Fall through */ case 'q': *************** *** 1276,1282 **** if (result != EOF) { aq = next_append_slot(); ! aq->free = 1; aq->text = text; aq->textlen = result; } --- 1279,1285 ---- if (result != EOF) { aq = next_append_slot(); ! aq->free = TRUE; aq->text = text; aq->textlen = result; } *************** *** 1290,1296 **** case 't': if (replaced) { ! replaced = 0; cur_cmd = vec->v + cur_cmd->x.jump_index; continue; } --- 1293,1299 ---- case 't': if (replaced) { ! replaced = FALSE; cur_cmd = vec->v + cur_cmd->x.jump_index; continue; } *************** *** 1303,1309 **** continue; } else ! replaced = 0; break; case 'w': --- 1306,1312 ---- continue; } else ! replaced = FALSE; break; case 'w': *************** *** 1353,1359 **** if (strncmp(line.active + idx, trans[2*i], mbclen) == 0) { ! int move_remain_buffer = 0; int trans_len = strlen(trans[2*i+1]); if (mbclen < trans_len) --- 1356,1362 ---- if (strncmp(line.active + idx, trans[2*i], mbclen) == 0) { ! flagT move_remain_buffer = FALSE; int trans_len = strlen(trans[2*i+1]); if (mbclen < trans_len) *************** *** 1366,1377 **** /* And we must resize the buffer. */ resize_line(&line, new_len); } ! move_remain_buffer = 1; } else if (mbclen > trans_len) { /* We must truncate the line buffer. */ ! move_remain_buffer = 1; } prev_idx = idx; if (move_remain_buffer) --- 1369,1380 ---- /* And we must resize the buffer. */ resize_line(&line, new_len); } ! move_remain_buffer = TRUE; } else if (mbclen > trans_len) { /* We must truncate the line buffer. */ ! move_remain_buffer = TRUE; } prev_idx = idx; if (move_remain_buffer) *************** *** 1439,1445 **** { /* skip all this next time */ cur_cmd->a1->addr_type = addr_is_null; ! cur_cmd->addr_bang = 1; /* can we make an optimization? */ if (cur_cmd->cmd == 'b' || cur_cmd->cmd == 't' --- 1442,1448 ---- { /* skip all this next time */ cur_cmd->a1->addr_type = addr_is_null; ! cur_cmd->addr_bang = TRUE; /* can we make an optimization? */ if (cur_cmd->cmd == 'b' || cur_cmd->cmd == 't' *************** *** 1496,1502 **** input.fp = NULL; status = EXIT_SUCCESS; ! while (read_pattern_space(&input, the_program, 0)) { status = execute_program(the_program, &input); if (!no_default_output) --- 1499,1505 ---- input.fp = NULL; status = EXIT_SUCCESS; ! while (read_pattern_space(&input, the_program, FALSE)) { status = execute_program(the_program, &input); if (!no_default_output) diff -rNC3 sed-4.0.5/sed/fmt.c sed-4.0.6/sed/fmt.c *** sed-4.0.5/sed/fmt.c Fri Nov 22 11:50:51 2002 --- sed-4.0.6/sed/fmt.c Sat Jan 4 02:29:21 2003 *************** *** 1,5 **** /* `L' command implementation for GNU sed, based on GNU fmt 1.22. ! Copyright (C) 1994, 1995, 1996, 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 --- 1,5 ---- /* `L' command implementation for GNU sed, based on GNU fmt 1.22. ! Copyright (C) 1994, 1995, 1996, 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 *************** *** 109,122 **** output. */ #define TABWIDTH 8 - /* Miscellaneous definitions. */ - - typedef unsigned int bool; - #undef TRUE - #define TRUE 1 - #undef FALSE - #define FALSE 0 - /* Word descriptor structure. */ typedef struct Word WORD; --- 109,114 ---- *************** *** 129,138 **** const char *text; /* the text of the word */ short length; /* length of this word */ short space; /* the size of the following space */ ! bool paren:1; /* starts with open paren */ ! bool period:1; /* ends in [.?!])* */ ! bool punct:1; /* ends in punctuation */ ! bool final:1; /* end of sentence */ /* The remaining fields are computed during the optimization. */ --- 121,130 ---- const char *text; /* the text of the word */ short length; /* length of this word */ short space; /* the size of the following space */ ! flagT paren:1; /* starts with open paren */ ! flagT period:1; /* ends in [.?!])* */ ! flagT punct:1; /* ends in punctuation */ ! flagT final:1; /* end of sentence */ /* The remaining fields are computed during the optimization. */ *************** *** 144,154 **** /* Forward declarations. */ extern void fmt P_ ((char *line, char *line_end, int max_length, FILE *output_file)); ! static bool get_paragraph P_ ((void)); static int get_line P_ ((int c)); static int get_space P_ ((int c)); static int copy_rest P_ ((int c)); ! static bool same_para P_ ((int c)); static void flush_paragraph P_ ((void)); static void fmt_paragraph P_ ((void)); static void check_punctuation P_ ((WORD *w)); --- 136,146 ---- /* Forward declarations. */ extern void fmt P_ ((char *line, char *line_end, int max_length, FILE *output_file)); ! static flagT get_paragraph P_ ((void)); static int get_line P_ ((int c)); static int get_space P_ ((int c)); static int copy_rest P_ ((int c)); ! static flagT same_para P_ ((int c)); static void flush_paragraph P_ ((void)); static void fmt_paragraph P_ ((void)); static void check_punctuation P_ ((WORD *w)); *************** *** 240,246 **** Return FALSE if end-of-file was encountered before the start of a paragraph, else TRUE. */ ! static bool get_paragraph () { register int c; --- 232,238 ---- Return FALSE if end-of-file was encountered before the start of a paragraph, else TRUE. */ ! static flagT get_paragraph () { register int c; *************** *** 298,304 **** prefix (if any) is C could belong to the current paragraph, otherwise FALSE. */ ! static bool same_para (register int c) { return (c != '\n' && c != EOF); --- 290,296 ---- prefix (if any) is C could belong to the current paragraph, otherwise FALSE. */ ! static flagT same_para (register int c) { return (c != '\n' && c != EOF); diff -rNC3 sed-4.0.5/sed/regex.c sed-4.0.6/sed/regex.c *** sed-4.0.5/sed/regex.c Fri Nov 22 11:51:04 2002 --- sed-4.0.6/sed/regex.c Sat Feb 15 13:30:58 2003 *************** *** 1,5 **** /* GNU SED, a batch stream editor. ! Copyright (C) 1999, 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 --- 1,5 ---- /* GNU SED, a batch stream editor. ! Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 41,50 **** extern flagT use_extended_syntax_p; ! #define TRANSLATE_LENGTH 256 /*XXX shouldn't this be (UCHAR_MAX+1)?*/ ! ! static const char NO_REGEX[] = N_("No previous regular expression"); ! static const char BAD_MODIF[] = N_("Cannot specify modifiers on empty regexp"); --- 41,53 ---- extern flagT use_extended_syntax_p; ! static const char errors[] = ! "No previous regular expression\0" ! "Cannot specify modifiers on empty regexp"; ! ! #define NO_REGEX (errors) ! #define BAD_MODIF (NO_REGEX + sizeof(N_("No previous regular expression"))) ! #define END_ERRORS (BAD_MODIF + sizeof(N_("Cannot specify modifiers on empty regexp"))) *************** *** 55,62 **** int needed_sub; { regex_t *new_regex; - char error[200]; - int errcode; char *last_re = NULL; size_t last_re_len; --- 58,63 ---- *************** *** 77,143 **** new_regex = MALLOC(1, regex_t); #ifdef REG_PERL ! errcode = regncomp(new_regex, last_re, last_re_len, ! (needed_sub ? 0 : REG_NOSUB) ! | flags ! | extended_regexp_flags); #else { int syntax = ((extended_regexp_flags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC) & ~RE_UNMATCHED_RIGHT_PAREN_ORD; ! /* Try to allocate space for the fastmap. */ ! new_regex->fastmap = ck_malloc (1 << (8 * sizeof(char))); ! if (new_regex->fastmap == NULL) ! { ! errcode = REG_ESPACE; ! goto error; ! } ! syntax |= (flags & REG_ICASE) ? RE_ICASE : 0; /* If REG_NEWLINE is set, newlines are treated differently. */ if (flags & REG_NEWLINE) { /* REG_NEWLINE implies neither . nor [^...] match newline. */ syntax &= ~RE_DOT_NEWLINE; syntax |= RE_HAT_LISTS_NOT_NEWLINE; - /* It also changes the matching behavior. */ - new_regex->newline_anchor = 1; } - else - new_regex->newline_anchor = 0; - - new_regex->translate = NULL; /* Only PCRE processes \t & co. */ last_re_len = normalize_text(last_re, last_re_len); ! errcode = re_compile_internal (new_regex, last_re, last_re_len, syntax); ! if (errcode == REG_NOERROR) { ! if (re_compile_fastmap (new_regex) == -2) ! { ! /* Some error occurred while computing the fastmap, just forget ! about it. */ ! ck_free (new_regex->fastmap); ! new_regex->fastmap = NULL; ! } } } #endif FREE(last_re); - if (errcode) - { - error: - regerror(errcode, NULL, error, 200); - bad_prog(gettext(error)); - } - /* Just to be sure, I mark this as not POSIXLY_CORRECT behavior */ if (new_regex->re_nsub < needed_sub && !POSIXLY_CORRECT) { --- 78,143 ---- new_regex = MALLOC(1, regex_t); #ifdef REG_PERL ! { ! int errcode; ! errcode = regncomp(new_regex, last_re, last_re_len, ! (needed_sub ? 0 : REG_NOSUB) ! | flags ! | extended_regexp_flags); + if (errcode) + { + char errorbuf[200]; + regerror(errcode, NULL, errorbuf, 200); + bad_prog(gettext(errorbuf)); + } + } #else { + const char *error; int syntax = ((extended_regexp_flags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC) & ~RE_UNMATCHED_RIGHT_PAREN_ORD; ! syntax |= RE_NO_POSIX_BACKTRACKING; ! #ifdef RE_ICASE syntax |= (flags & REG_ICASE) ? RE_ICASE : 0; + #endif /* If REG_NEWLINE is set, newlines are treated differently. */ if (flags & REG_NEWLINE) { /* REG_NEWLINE implies neither . nor [^...] match newline. */ syntax &= ~RE_DOT_NEWLINE; syntax |= RE_HAT_LISTS_NOT_NEWLINE; } /* Only PCRE processes \t & co. */ last_re_len = normalize_text(last_re, last_re_len); ! re_set_syntax (syntax); ! error = re_compile_pattern (last_re, last_re_len, new_regex); ! new_regex->newline_anchor = (flags & REG_NEWLINE) != 0; ! new_regex->translate = NULL; ! #ifndef RE_ICASE ! if (flags & REG_ICASE) { ! static char translate[1 << (sizeof(char) * 8)]; ! int i; ! for (i = 0; i < sizeof(translate) / sizeof(char); i++) ! translate[i] = tolower (i); ! ! new_regex->translate = translate; } + #endif + + if (error) + bad_prog(error); } #endif FREE(last_re); /* Just to be sure, I mark this as not POSIXLY_CORRECT behavior */ if (new_regex->re_nsub < needed_sub && !POSIXLY_CORRECT) { *************** *** 150,155 **** --- 150,192 ---- return new_regex; } + #ifdef REG_PERL + static void + copy_regs (regs, pmatch, nregs) + struct re_registers *regs; + regmatch_t *pmatch; + int nregs; + { + int i; + int need_regs = nregs + 1; + /* We need one extra element beyond `num_regs' for the `-1' marker GNU code + uses. */ + + /* Have the register data arrays been allocated? */ + if (!regs->start) + { /* No. So allocate them with malloc. */ + regs->start = MALLOC (need_regs, regoff_t); + regs->end = MALLOC (need_regs, regoff_t); + regs->num_regs = need_regs; + } + else if (need_regs > regs->num_regs) + { /* Yes. We also need more elements than were already + allocated, so reallocate them. */ + regs->start = REALLOC (regs->start, need_regs, regoff_t); + regs->end = REALLOC (regs->end, need_regs, regoff_t); + regs->num_regs = need_regs; + } + + /* Copy the regs. */ + for (i = 0; i < nregs; ++i) + { + regs->start[i] = pmatch[i].rm_so; + regs->end[i] = pmatch[i].rm_eo; + } + for ( ; i < regs->num_regs; ++i) + regs->start[i] = regs->end[i] = -1; + } + #endif int match_regex(regex, buf, buflen, buf_start_offset, regarray, regsize) *************** *** 157,166 **** char *buf; size_t buflen; size_t buf_start_offset; ! regmatch_t *regarray; int regsize; { static regex_t *regex_last; int ret; /* Keep track of the last regexp matched. */ --- 194,211 ---- char *buf; size_t buflen; size_t buf_start_offset; ! struct re_registers *regarray; int regsize; { static regex_t *regex_last; + #ifdef REG_PERL + regmatch_t *regmatch; + if (regsize) + regmatch = (regmatch_t *) alloca (sizeof (regmatch_t) * regsize); + else + regmatch = NULL; + #endif + int ret; /* Keep track of the last regexp matched. */ *************** *** 176,191 **** #ifdef REG_PERL ret = regexec2(regex, buf, CAST(int)buflen, CAST(int)buf_start_offset, ! regsize, regarray, 0); #else ! ret = re_search_internal(regex, buf, buflen, buf_start_offset, ! buflen - buf_start_offset, buflen, ! regsize, regarray, ! RE_NO_POSIX_BACKTRACKING); #endif - return (ret == 0); } --- 221,239 ---- #ifdef REG_PERL ret = regexec2(regex, buf, CAST(int)buflen, CAST(int)buf_start_offset, ! regsize, regmatch, 0); ! ! if (regsize) ! copy_regs (regarray, regmatch, regsize); + return (ret == 0); #else ! ret = re_search(regex, buf, buflen, buf_start_offset, ! buflen - buf_start_offset, ! regsize ? regarray : NULL); + return (ret > -1); #endif } diff -rNC3 sed-4.0.5/sed/sed.c sed-4.0.6/sed/sed.c *** sed-4.0.5/sed/sed.c Fri Nov 22 11:51:09 2002 --- sed-4.0.6/sed/sed.c Sat Mar 15 08:18:03 2003 *************** *** 1,8 **** ! #define COPYRIGHT_NOTICE "Copyright (C) 2002 Free Software Foundation, Inc." #define BUG_ADDRESS "bonzini@gnu.org" /* GNU SED, a batch stream editor. ! Copyright (C) 1989,90,91,92,93,94,95,98,99,2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,8 ---- ! #define COPYRIGHT_NOTICE "Copyright (C) 2003 Free Software Foundation, Inc." #define BUG_ADDRESS "bonzini@gnu.org" /* GNU SED, a batch stream editor. ! Copyright (C) 1989,90,91,92,93,94,95,98,99,2002,2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 67,79 **** int extended_regexp_flags = 0; /* If set, fflush(stdout) on every line output. */ ! flagT unbuffered_output = 0; /* If set, don't write out the line unless explicitly told to */ ! flagT no_default_output = 0; /* If set, reset line counts on every new file. */ ! flagT separate_files = 0; /* How do we edit files in-place? (we don't if NULL) */ char *in_place_extension = NULL; --- 67,79 ---- int extended_regexp_flags = 0; /* If set, fflush(stdout) on every line output. */ ! flagT unbuffered_output = FALSE; /* If set, don't write out the line unless explicitly told to */ ! flagT no_default_output = FALSE; /* If set, reset line counts on every new file. */ ! flagT separate_files = FALSE; /* How do we edit files in-place? (we don't if NULL) */ char *in_place_extension = NULL; *************** *** 169,183 **** int opt; int return_code; #if HAVE_SETLOCALE /* Set locale according to user's wishes. */ setlocale (LC_ALL, ""); #endif - #if ENABLE_NLS /* Tell program which translations to use and where to find. */ ! /* bindtextdomain (PACKAGE, LOCALEDIR); */ ! textdomain (PACKAGE); #endif POSIXLY_CORRECT = (getenv("POSIXLY_CORRECT") != NULL); --- 169,184 ---- int opt; int return_code; + initialize_main(&argc, &argv); + + #if ENABLE_NLS #if HAVE_SETLOCALE /* Set locale according to user's wishes. */ setlocale (LC_ALL, ""); #endif /* Tell program which translations to use and where to find. */ ! bindtextdomain (PACKAGE, LOCALEDIR); #endif POSIXLY_CORRECT = (getenv("POSIXLY_CORRECT") != NULL); *************** *** 202,208 **** switch (opt) { case 'n': ! no_default_output = 1; break; case 'e': the_program = compile_string(the_program, optarg, strlen(optarg)); --- 203,209 ---- switch (opt) { case 'n': ! no_default_output = TRUE; break; case 'e': the_program = compile_string(the_program, optarg, strlen(optarg)); *************** *** 212,218 **** break; case 'i': ! separate_files = 1; if (optarg == NULL) in_place_extension = "*"; else if (strchr(optarg, '*') == NULL) --- 213,219 ---- break; case 'i': ! separate_files = TRUE; if (optarg == NULL) in_place_extension = "*"; else if (strchr(optarg, '*') == NULL) *************** *** 243,253 **** #endif case 's': ! separate_files = 1; break; case 'u': ! unbuffered_output = 1; break; case 'V': --- 244,254 ---- #endif case 's': ! separate_files = TRUE; break; case 'u': ! unbuffered_output = TRUE; break; case 'V': *************** *** 263,271 **** to the extent permitted by law.\n\ "), COPYRIGHT_NOTICE); ck_fclose (NULL); ! exit (EXIT_SUCCESS); case 'h': ! usage(EXIT_SUCCESS); default: usage(4); } --- 264,272 ---- to the extent permitted by law.\n\ "), COPYRIGHT_NOTICE); ck_fclose (NULL); ! exit (0); case 'h': ! usage(0); default: usage(4); } diff -rNC3 sed-4.0.5/sed/sed.h sed-4.0.6/sed/sed.h *** sed-4.0.5/sed/sed.h Thu Dec 12 19:48:04 2002 --- sed-4.0.6/sed/sed.h Sat Feb 15 13:05:25 2003 *************** *** 1,5 **** /* GNU SED, a batch stream editor. ! Copyright (C) 1989,90,91,92,93,94,95,98,99,2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* GNU SED, a batch stream editor. ! Copyright (C) 1989,90,91,92,93,94,95,98,99,2002,2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 21,56 **** #endif #include "regex.h" - #if ENABLE_NLS - # include - #else - # define gettext(msgid) (msgid) - #endif - #define _(String) gettext(String) - - /* type countT is used to keep track of line numbers, etc. */ - typedef unsigned long countT; - - /* type flagT is used for boolean values */ - typedef int flagT; - - /* Oftentimes casts are used as an ugly hack to silence warnings - * from the compiler. However, sometimes those warnings really - * do point to something worth avoiding. I define this - * dummy marker to make searching for them with a text editor - * much easier, in case I want to verify that they are all - * legitimate. It is defined in the way it is so that it is - * easy to disable all casts so that the compiler (or lint) - * can tell me potentially interesting things about what would - * happen to the code without the explicit casts. - */ - #ifdef LOUD_LINT - # define CAST(x) - #else - # define CAST(x) (x) - #endif - - /* Struct vector is used to describe a compiled sed program. */ struct vector { struct sed_cmd *v; /* a dynamically allocated array */ --- 21,26 ---- *************** *** 117,122 **** --- 87,104 ---- unsigned max_id : 4; /* maximum backreference on the RHS */ }; + #ifdef REG_PERL + /* This is the structure we store register match data in. See + regex.texinfo for a full description of what registers match. */ + struct re_registers + { + unsigned num_regs; + regoff_t *start; + regoff_t *end; + }; + #endif + + struct sed_cmd { struct addr *a1; /* save space: usually is NULL */ *************** *** 167,176 **** void rewind_read_files P_((void)); void finish_program P_((struct vector *)); ! regex_t *compile_regex P_((struct buffer *b, flagT icase, int needed_sub)); int match_regex P_((regex_t *regex, char *buf, size_t buflen, size_t buf_start_offset, ! regmatch_t *regarray, int regsize)); #ifdef DEBUG_LEAKS void release_regex P_((regex_t *)); #endif --- 149,158 ---- void rewind_read_files P_((void)); void finish_program P_((struct vector *)); ! regex_t *compile_regex P_((struct buffer *b, int flags, int needed_sub)); int match_regex P_((regex_t *regex, char *buf, size_t buflen, size_t buf_start_offset, ! struct re_registers *regarray, int regsize)); #ifdef DEBUG_LEAKS void release_regex P_((regex_t *)); #endif diff -rNC3 sed-4.0.5/testsuite/Makefile.am sed-4.0.6/testsuite/Makefile.am *** sed-4.0.5/testsuite/Makefile.am Tue Nov 5 14:14:59 2002 --- sed-4.0.6/testsuite/Makefile.am Wed Mar 12 19:38:36 2003 *************** *** 5,11 **** SEDTESTS = enable sep inclib 8bit newjis xabcx dollar noeol \ numsub head madding mac-mf empty xbxcx recall xemacs \ fasts uniq manis khadafy linecnt eval distrib 8to7 \ ! allsub cv-vars middle spencer stdin flipcase \ subwrite writeout readin \ help version file quiet \ factor binary3 binary2 binary dc --- 5,11 ---- SEDTESTS = enable sep inclib 8bit newjis xabcx dollar noeol \ numsub head madding mac-mf empty xbxcx recall xemacs \ fasts uniq manis khadafy linecnt eval distrib 8to7 \ ! allsub cv-vars classes middle spencer stdin flipcase \ subwrite writeout readin \ help version file quiet \ factor binary3 binary2 binary dc *************** *** 19,24 **** --- 19,25 ---- allsub.good allsub.inp allsub.sed \ binary.good binary.inp binary.sed binary2.sed binary3.sed \ cv-vars.good cv-vars.inp cv-vars.sed \ + classes.good classes.inp classes.sed \ dc.good dc.inp dc.sed \ distrib.good distrib.inp distrib.sed distrib.sh \ dollar.good dollar.inp dollar.sed \ diff -rNC3 sed-4.0.5/testsuite/Makefile.in sed-4.0.6/testsuite/Makefile.in *** sed-4.0.5/testsuite/Makefile.in Sat Dec 14 11:45:02 2002 --- sed-4.0.6/testsuite/Makefile.in Tue Mar 18 17:57:00 2003 *************** *** 97,102 **** --- 97,103 ---- POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ + SED_FEATURE_VERSION = @SED_FEATURE_VERSION@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ *************** *** 148,154 **** SEDTESTS = enable sep inclib 8bit newjis xabcx dollar noeol \ numsub head madding mac-mf empty xbxcx recall xemacs \ fasts uniq manis khadafy linecnt eval distrib 8to7 \ ! allsub cv-vars middle spencer stdin flipcase \ subwrite writeout readin \ help version file quiet \ factor binary3 binary2 binary dc --- 149,155 ---- SEDTESTS = enable sep inclib 8bit newjis xabcx dollar noeol \ numsub head madding mac-mf empty xbxcx recall xemacs \ fasts uniq manis khadafy linecnt eval distrib 8to7 \ ! allsub cv-vars classes middle spencer stdin flipcase \ subwrite writeout readin \ help version file quiet \ factor binary3 binary2 binary dc *************** *** 163,168 **** --- 164,170 ---- allsub.good allsub.inp allsub.sed \ binary.good binary.inp binary.sed binary2.sed binary3.sed \ cv-vars.good cv-vars.inp cv-vars.sed \ + classes.good classes.inp classes.sed \ dc.good dc.inp dc.sed \ distrib.good distrib.inp distrib.sed distrib.sh \ dollar.good dollar.inp dollar.sed \ diff -rNC3 sed-4.0.5/testsuite/Makefile.tests sed-4.0.6/testsuite/Makefile.tests *** sed-4.0.5/testsuite/Makefile.tests Tue Nov 19 20:28:39 2002 --- sed-4.0.6/testsuite/Makefile.tests Wed Mar 12 19:40:24 2003 *************** *** 1,5 **** --- 1,7 ---- # Testsuite makefile for GNU sed + SHELL = /bin/sh + # These are only fallback values. They are usually overridden by runtest. srcdir = . SED = LC_ALL=C ../sed/sed *************** *** 23,29 **** $(CMP) $@.1out $@.2out @$(RM) $@.1out $@.2out ! cv-vars middle dc distrib factor:: $(TIME) $(SED) -n -f $(srcdir)/$@.sed < $(srcdir)/$@.inp > $@.out $(CMP) $(srcdir)/$@.good $@.out @$(RM) $@.out --- 25,31 ---- $(CMP) $@.1out $@.2out @$(RM) $@.1out $@.2out ! cv-vars classes middle dc distrib factor:: $(TIME) $(SED) -n -f $(srcdir)/$@.sed < $(srcdir)/$@.inp > $@.out $(CMP) $(srcdir)/$@.good $@.out @$(RM) $@.out diff -rNC3 sed-4.0.5/testsuite/classes.good sed-4.0.6/testsuite/classes.good *** sed-4.0.5/testsuite/classes.good Thu Jan 1 01:00:00 1970 --- sed-4.0.6/testsuite/classes.good Wed Mar 12 19:38:18 2003 *************** *** 0 **** --- 1,4 ---- + : ${_cv_='emptyvar'} + : ${ac_cv_prog/RANLIB='/usr/bin/ranlib'} + : ${ac_cv_prog/CC='/usr/unsupported/\ \ /lib/_cv_/cc'} + : ${a/c_cv_prog/CPP='/usr/bin/cpp'} diff -rNC3 sed-4.0.5/testsuite/classes.inp sed-4.0.6/testsuite/classes.inp *** sed-4.0.5/testsuite/classes.inp Thu Jan 1 01:00:00 1970 --- sed-4.0.6/testsuite/classes.inp Wed Mar 12 19:38:18 2003 *************** *** 0 **** --- 1,6 ---- + _cv_=emptyvar + ac_cv_prog/RANLIB=/usr/bin/ranlib + ac_cv_prog/CC=/usr/unsupported/\ \ /lib/_cv_/cc + a/c_cv_prog/CPP=/usr/bin/cpp + SHELL=bash + GNU=GNU!UNIX diff -rNC3 sed-4.0.5/testsuite/classes.sed sed-4.0.6/testsuite/classes.sed *** sed-4.0.5/testsuite/classes.sed Thu Jan 1 01:00:00 1970 --- sed-4.0.6/testsuite/classes.sed Wed Mar 12 19:38:18 2003 *************** *** 0 **** --- 1,2 ---- + # inspired by an autoconf generated configure script. + s/^\([/[:lower:]A-Z0-9]*_cv_[[:lower:][:upper:]/[:digit:]]*\)=\(.*\)/: \${\1='\2'}/p diff -rNC3 sed-4.0.5/testsuite/version.gin sed-4.0.6/testsuite/version.gin *** sed-4.0.5/testsuite/version.gin Fri Nov 22 12:06:35 2002 --- sed-4.0.6/testsuite/version.gin Sat Jan 4 02:31:13 2003 *************** *** 1,5 **** GNU sed version @VERSION@ ! Copyright (C) 2002 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, to the extent permitted by law. --- 1,5 ---- GNU sed version @VERSION@ ! Copyright (C) 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, to the extent permitted by law.