diff -ru sed-4.1/ChangeLog sed-4.1.1/ChangeLog --- sed-4.1/ChangeLog 2004-03-25 16:07:05.000000000 +0100 +++ sed-4.1.1/ChangeLog 2004-06-29 19:59:53.000000000 +0200 @@ -1,3 +1,17 @@ +2004-06-30 Paolo Bonzini + + *** Version 4.1.1 released. + +2004-06-29 Paolo Bonzini + + * sed/compile.c (mark_subst_opts): Return int. + * sed/execute.c (open_next_file): Fix uninitialized + variable. + +2004-06-10 Paolo Bonzini + + *** Version 4.1 released. + 2004-03-25 Paolo Bonzini * lib/obstack.h: Get current version. diff -ru sed-4.1/Makefile.in sed-4.1.1/Makefile.in --- sed-4.1/Makefile.in 2004-06-13 08:31:31.000000000 +0200 +++ sed-4.1.1/Makefile.in 2004-07-06 09:19:45.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -43,8 +43,7 @@ ABOUT-NLS AUTHORS COPYING COPYING.DOC ChangeLog INSTALL NEWS \ THANKS config/config.guess config/config.rpath \ config/config.sub config/depcomp config/install-sh \ - config/mdate-sh config/missing config/texinfo.tex configure \ - configure.ac + config/mdate-sh config/missing config/texinfo.tex subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/codeset.m4 \ @@ -59,7 +58,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno + configure.lineno configure.status.lineno mkinstalldirs = $(mkdir_p) CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = bootstrap.sh intl/Makefile @@ -119,6 +118,7 @@ GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE__BOOL = @HAVE__BOOL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -342,14 +342,16 @@ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -359,9 +361,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config_h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -470,7 +474,7 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -494,7 +498,7 @@ distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ - (cd ../.. && $(mkdir_p) "$$dc_destdir") \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ diff -ru sed-4.1/NEWS sed-4.1.1/NEWS --- sed-4.1/NEWS 2004-03-26 19:48:57.000000000 +0100 +++ sed-4.1.1/NEWS 2004-07-01 18:31:49.000000000 +0200 @@ -1,4 +1,15 @@ -Sed 4.0f (first release candidate for Sed 4.1) +Sed 4.1.1 + +* preserve permissions of in-place edited files + +* yield an error when running -i on terminals or other non regular files + +* do not interpret - as stdin when running in in-place editing mode + +* fix bug that prevented 's' command modifiers from working + +---------------------------------------------------------------------------- +Sed 4.1 * // matches the last regular expression even in POSIXLY_CORRECT mode. diff -ru sed-4.1/aclocal.m4 sed-4.1.1/aclocal.m4 --- sed-4.1/aclocal.m4 2004-06-13 08:31:19.000000000 +0200 +++ sed-4.1.1/aclocal.m4 2004-07-06 09:19:18.000000000 +0200 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.8 -*- Autoconf -*- +# generated automatically by aclocal 1.8.5 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -40,7 +40,7 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8])]) + [AM_AUTOMAKE_VERSION([1.8.5])]) # AM_AUX_DIR_EXPAND @@ -149,9 +149,10 @@ Usually this means the macro was only invoked conditionally.]) fi])]) -# serial 5 -*- Autoconf -*- +# serial 7 -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# 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 @@ -235,7 +236,9 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -263,9 +266,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break fi @@ -299,8 +307,8 @@ # ------------ AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors]) +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -311,7 +319,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 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 @@ -350,14 +358,14 @@ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` + U=`sed -n 's/^U = //p' < "$mf"` test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" # We invoke sed twice because it is the simplest approach to # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' + for file in `sed -n ' /^DEP_FILES = .*\\\\$/ { s/^DEP_FILES = // :loop @@ -713,7 +721,7 @@ # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004 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 @@ -730,23 +738,47 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -m 0755 -p -- . 2>/dev/null; then - mkdir_p='mkdir -m 0755 -p --' +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # Keeping the `.' argument allows $(mkdir_p) to be used without + # argument. Indeed, we sometimes output rules like + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. + # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more + # expensive solution, as it forces Make to start a sub-shell.) + mkdir_p='mkdir -p -- .' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. - for d in ./-m ./0755 ./-p ./--; + for d in ./-p ./--version; do test -d $d && rmdir $d done # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs) -m 0755' + mkdir_p='$(mkinstalldirs)' else - mkdir_p='$(install_sh) -m 0755 -d' + mkdir_p='$(install_sh) -d' fi fi AC_SUBST([mkdir_p])]) diff -ru sed-4.1/bootstrap.sh sed-4.1.1/bootstrap.sh --- sed-4.1/bootstrap.sh 2004-06-13 08:32:31.000000000 +0200 +++ sed-4.1.1/bootstrap.sh 2004-07-06 09:22:16.000000000 +0200 @@ -19,7 +19,7 @@ */ #define PACKAGE "sed" -#define VERSION "4.1-boot" +#define VERSION "4.1.1-boot" #define SED_FEATURE_VERSION "4.1" #define BOOTSTRAP 1 diff -ru sed-4.1/configure sed-4.1.1/configure --- sed-4.1/configure 2004-06-13 08:31:38.000000000 +0200 +++ sed-4.1.1/configure 2004-07-06 09:19:36.000000000 +0200 @@ -1,10 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for sed 4.1. +# Generated by GNU Autoconf 2.59a for sed 4.1.1. # # Report bugs to . # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -23,6 +24,28 @@ fi DUALCASE=1; export DUALCASE # for MKS sh + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset @@ -31,6 +54,30 @@ fi +# Find who we are. Look in the path if we contain no path at all +# relative or not. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } +fi + # Work around bugs in pre-3.0 UWIN ksh. $as_unset ENV MAIL MAILPATH PS1='$ ' @@ -77,101 +124,277 @@ s/.*/./; q'` -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no fi + if test $as_have_required = yes && (eval ": +(func_return () { + (exit \$1) +} +func_success () { + func_return 0 +} +func_failure () { + func_return 1 +} +func_ret_success () { + return 0 +} +func_ret_failure () { + return 1 +} - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +exitcode=0 +if func_success; then + : +else + exitcode=1 + echo func_failure succeeded. +fi - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +if func_failure; then + exitcode=1 + echo func_success failed. +fi + +if func_ret_success; then + : +else + exitcode=1 + echo func_ret_success failed. +fi + +if func_ret_failure; then + exitcode=1 + echo func_ret_failure succeeded. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + as_lineno_3=\`(expr \$as_lineno_1 + 1) 2>/dev/null\` + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\$as_lineno_3\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells="$SHELL" as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done + esac +done + + + for as_shell in $as_candidate_shells; do + if { $as_shell 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi +DUALCASE=1; export DUALCASE # for MKS sh + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { $as_shell 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi +DUALCASE=1; export DUALCASE # for MKS sh + +: +(func_return () { + (exit $1) +} +func_success () { + func_return 0 +} +func_failure () { + func_return 1 +} +func_ret_success () { + return 0 +} +func_ret_failure () { + return 1 +} + +exitcode=0 +if func_success; then + : +else + exitcode=1 + echo func_failure succeeded. +fi + +if func_failure; then + exitcode=1 + echo func_success failed. +fi + +if func_ret_success; then + : +else + exitcode=1 + echo func_ret_success failed. +fi + +if func_ret_failure; then + exitcode=1 + echo func_ret_failure succeeded. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x$as_lineno_3" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "func_return () { + (exit \$1) +} +func_success () { + func_return 0 +} +func_failure () { + func_return 1 +} +func_ret_success () { + return 0 +} +func_ret_failure () { + return 1 +} + +exitcode=0 +if func_success; then + : +else + exitcode=1 + echo func_failure succeeded. +fi + +if func_failure; then + exitcode=1 + echo func_success failed. +fi + +if func_ret_success; then + : +else + exitcode=1 + echo func_ret_success failed. +fi + +if func_ret_failure; then + exitcode=1 + echo func_ret_failure succeeded. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s,[$]LINENO.*,&-, + t lineno + b + : lineno N - s,$,-, : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + s,[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\),\2\1\2, t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s,-\n.*,, ' >$as_me.lineno && chmod +x $as_me.lineno || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 @@ -269,8 +492,8 @@ # Identity of this package. PACKAGE_NAME='sed' PACKAGE_TARNAME='sed' -PACKAGE_VERSION='4.1' -PACKAGE_STRING='sed 4.1' +PACKAGE_VERSION='4.1.1' +PACKAGE_STRING='sed 4.1.1' PACKAGE_BUGREPORT='bonzini@gnu.org' ac_unique_file="sed/sed.c" @@ -302,16 +525,15 @@ #endif #if HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif +#endif +#if HAVE_STDINT_H +# include #endif #if HAVE_UNISTD_H # 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 mkdir_p AWK SET_MAKE am__leading_dot 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 HAVE__BOOL ALLOCA LIBOBJS TEST_REGEX_TRUE TEST_REGEX_FALSE 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_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 mkdir_p AWK SET_MAKE am__leading_dot 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 GREP EGREP HAVE__BOOL ALLOCA LIBOBJS TEST_REGEX_TRUE TEST_REGEX_FALSE 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. @@ -780,7 +1002,7 @@ # 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.1 to adapt to many kinds of systems. +\`configure' configures sed 4.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -846,15 +1068,15 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sed 4.1:";; + short | recursive ) echo "Configuration of sed 4.1.1:";; esac cat <<\_ACEOF Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --disable-largefile omit support for large files --enable-regex-tests enable regex matcher regression tests (default=no) --enable-html build HTML manual (default=no) @@ -913,6 +1135,9 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. case `pwd` in .) ac_abs_builddir="$ac_dir";; *) @@ -972,10 +1197,11 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -sed configure 4.1 -generated by GNU Autoconf 2.59 +sed configure 4.1.1 +generated by GNU Autoconf 2.59a -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, +2003, 2004 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -986,8 +1212,8 @@ 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.1, which was -generated by GNU Autoconf 2.59. Invocation command line was +It was created by sed $as_me 4.1.1, which was +generated by GNU Autoconf 2.59a. Invocation command line was $ $0 $@ @@ -1164,7 +1390,7 @@ echo "$as_me: exit $exit_status" } >&5 rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -1173,9 +1399,11 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h +rm -f -r conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +# NextStep 3.3 (patch 3) loses unless the first echo outputs at least 14 bytes. +ac_space=' ' +echo "$ac_space$ac_space$ac_space$ac_space$ac_space$ac_space$ac_space$ac_space$ac_space$ac_space$ac_space$ac_space$ac_space" >confdefs.h # Predefined preprocessor variables. @@ -1487,7 +1715,7 @@ s/[\\$]/&&/g;s/;s,x,x,$// _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +rm -f conftest.sed # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1502,22 +1730,28 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -m 0755 -p -- . 2>/dev/null; then - mkdir_p='mkdir -m 0755 -p --' +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # Keeping the `.' argument allows $(mkdir_p) to be used without + # argument. Indeed, we sometimes output rules like + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. + # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more + # expensive solution, as it forces Make to start a sub-shell.) + mkdir_p='mkdir -p -- .' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. - for d in ./-m ./0755 ./-p ./--; + for d in ./-p ./--version; do test -d $d && rmdir $d done # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs) -m 0755' + mkdir_p='$(mkinstalldirs)' else - mkdir_p='$(install_sh) -m 0755 -d' + mkdir_p='$(install_sh) -d' fi fi @@ -1619,7 +1853,7 @@ # Define the identity of the package. PACKAGE='sed' - VERSION='4.1' + VERSION='4.1.1' cat >>confdefs.h <<_ACEOF @@ -2459,10 +2693,10 @@ /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; int test (int i, double x); @@ -2482,11 +2716,11 @@ # Don't try gcc -ansi; that turns off useful extensions and # breaks some systems' header files. # AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 +# Ultrix, OSF/1, Tru64 -std # HP-UX 10.20 and later -Ae # HP-UX older versions -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in "" -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext @@ -2790,7 +3024,9 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -2818,9 +3054,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -3173,19 +3414,202 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +echo "$as_me:$LINENO: checking for grep that handles long lines" >&5 +echo $ECHO_N "checking for grep that handles long lines... $ECHO_C" >&6 +if test "${oc_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -f -r $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/GREPXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/GREP$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + test -f "$ac_path_GREP" || continue + if $as_executable_p "$ac_path_GREP"; then + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +if "$ac_path_GREP" --version 2>&1 < /dev/null | grep 'GNU' >/dev/null; then + ac_cv_path_GREP="$ac_path_GREP" + break 2 + +fi + + + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"$tmp/conftest.in" + while : + do + cat "$tmp/conftest.in" "$tmp/conftest.in" >"$tmp/conftest.tmp" + mv "$tmp/conftest.tmp" "$tmp/conftest.in" + cp "$tmp/conftest.in" "$tmp/conftest.nl" + echo 'GREP' >> "$tmp/conftest.nl" + "$ac_path_GREP" 'GREP$' < "$tmp/conftest.nl" >"$tmp/conftest.out" || break + diff "$tmp/conftest.out" "$tmp/conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done +fi + + done +done +done + +rm -rf "$tmp" + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +fi + +fi + + +fi +echo "$as_me:$LINENO: result: $oc_cv_path_GREP" >&5 +echo "${ECHO_T}$oc_cv_path_GREP" >&6 + GREP="$ac_cv_path_GREP" + + echo "$as_me:$LINENO: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | ($GREP -E '(a|b)') >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + # Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -f -r $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/EGREPXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/EGREP$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + test -f "$ac_path_EGREP" || continue + if $as_executable_p "$ac_path_EGREP"; then + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +if "$ac_path_EGREP" --version 2>&1 < /dev/null | grep 'GNU' >/dev/null; then + ac_cv_path_EGREP="$ac_path_EGREP" + break 2 + +fi + + + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"$tmp/conftest.in" + while : + do + cat "$tmp/conftest.in" "$tmp/conftest.in" >"$tmp/conftest.tmp" + mv "$tmp/conftest.tmp" "$tmp/conftest.in" + cp "$tmp/conftest.in" "$tmp/conftest.nl" + echo 'EGREP' >> "$tmp/conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "$tmp/conftest.nl" >"$tmp/conftest.out" || break + diff "$tmp/conftest.out" "$tmp/conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep + + done +done +done + +rm -rf "$tmp" + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +fi + +fi + + + fi +fi +echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6 + EGREP="$ac_cv_path_EGREP" @@ -4140,10 +4564,10 @@ ac_val=`cat $ac_tf1 2>/dev/null` if test ! -f $ac_tf1 || test "$ac_val" != 1; then ac_cv_sys_long_file_names=no - rm -rf $ac_xdir 2>/dev/null + rm -f -r $ac_xdir 2>/dev/null break fi - rm -rf $ac_xdir 2>/dev/null + rm -f -r $ac_xdir 2>/dev/null done fi echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5 @@ -8944,8 +9368,8 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' @@ -9033,6 +9457,28 @@ fi DUALCASE=1; export DUALCASE # for MKS sh + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset @@ -9041,6 +9487,31 @@ fi +# Find who we are. Look in the path if we contain no path at all +# relative or not. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } +fi + # Work around bugs in pre-3.0 UWIN ksh. $as_unset ENV MAIL MAILPATH PS1='$ ' @@ -9087,102 +9558,38 @@ s/.*/./; q'` -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' as_lineno_1=$LINENO as_lineno_2=$LINENO as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x$as_lineno_3" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s,[$]LINENO.*,&-, + t lineno + b + : lineno N - s,$,-, : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + s,[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\),\2\1\2, t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s,-\n.*,, ' >$as_me.lineno && chmod +x $as_me.lineno || { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 @@ -9268,8 +9675,8 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by sed $as_me 4.1, which was -generated by GNU Autoconf 2.59. Invocation command line was +This file was extended by sed $as_me 4.1.1, which was +generated by GNU Autoconf 2.59a. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9334,11 +9741,11 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -sed config.status 4.1 -configured by $0, generated by GNU Autoconf 2.59, +sed config.status 4.1.1 +configured by $0, generated by GNU Autoconf 2.59a, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2004 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir @@ -9481,7 +9888,7 @@ # Create a temporary directory, and hook for its removal unless debugging. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap 'exit_status=$?; rm -f -r $tmp && exit $exit_status' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } @@ -9584,6 +9991,7 @@ s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@CPP@,$CPP,;t t +s,@GREP@,$GREP,;t t s,@EGREP@,$EGREP,;t t s,@HAVE__BOOL@,$HAVE__BOOL,;t t s,@ALLOCA@,$ALLOCA,;t t @@ -9698,7 +10106,7 @@ /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` { if $as_mkdir_p; then - mkdir -p "$ac_dir" + test -d "$ac_dir" || mkdir -p "$ac_dir" else as_dir="$ac_dir" as_dirs= @@ -9747,6 +10155,9 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. case `pwd` in .) ac_abs_builddir="$ac_dir";; *) @@ -10056,7 +10467,7 @@ /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` { if $as_mkdir_p; then - mkdir -p "$ac_dir" + test -d "$ac_dir" || mkdir -p "$ac_dir" else as_dir="$ac_dir" as_dirs= @@ -10145,7 +10556,7 @@ /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` { if $as_mkdir_p; then - mkdir -p "$ac_dest_dir" + test -d "$ac_dest_dir" || mkdir -p "$ac_dest_dir" else as_dir="$ac_dest_dir" as_dirs= @@ -10194,6 +10605,9 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. case `pwd` in .) ac_abs_builddir="$ac_dest_dir";; *) @@ -10267,7 +10681,7 @@ /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` { if $as_mkdir_p; then - mkdir -p "$ac_dir" + test -d "$ac_dir" || mkdir -p "$ac_dir" else as_dir="$ac_dir" as_dirs= @@ -10316,6 +10730,9 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. case `pwd` in .) ac_abs_builddir="$ac_dir";; *) @@ -10385,14 +10802,14 @@ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` + U=`sed -n 's/^U = //p' < "$mf"` test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" # We invoke sed twice because it is the simplest approach to # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' + for file in `sed -n ' /^DEP_FILES = .*\\\\$/ { s/^DEP_FILES = // :loop @@ -10419,7 +10836,7 @@ /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir + test -d $dirpart/$fdir || mkdir -p $dirpart/$fdir else as_dir=$dirpart/$fdir as_dirs= diff -ru sed-4.1/configure.ac sed-4.1.1/configure.ac --- sed-4.1/configure.ac 2004-06-13 08:30:57.000000000 +0200 +++ sed-4.1.1/configure.ac 2004-06-29 20:00:06.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with -*- autoconf -*- to produce a configure script. -AC_INIT(sed, 4.1, bonzini@gnu.org, sed) +AC_INIT(sed, 4.1.1, bonzini@gnu.org, sed) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sed/sed.c]) AM_CONFIG_HEADER(config.h:config_h.in) diff -ru sed-4.1/doc/Makefile.in sed-4.1.1/doc/Makefile.in --- sed-4.1/doc/Makefile.in 2004-06-13 08:31:32.000000000 +0200 +++ sed-4.1.1/doc/Makefile.in 2004-07-06 09:19:47.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -71,7 +71,7 @@ MAKEINFOHTML = $(MAKEINFO) --html AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) DVIPS = dvips -am__installdirs = $(DESTDIR)$(infodir) $(DESTDIR)$(man1dir) +am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man_MANS) @@ -109,6 +109,7 @@ GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE__BOOL = @HAVE__BOOL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -305,8 +306,8 @@ list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile"; \ - install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile; \ + echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \ + install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \ done; \ else :; fi @$(NORMAL_UNINSTALL) @@ -314,7 +315,7 @@ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ - (if cd $(DESTDIR)$(infodir); then \ + (if cd "$(DESTDIR)$(infodir)"; then \ echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \ rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ else :; fi); \ @@ -348,7 +349,7 @@ done install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(man1dir) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -367,8 +368,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ done uninstall-man1: @$(NORMAL_UNINSTALL) @@ -388,8 +389,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ done tags: TAGS TAGS: @@ -432,7 +433,9 @@ check: check-am all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(MANS) $(DATA) installdirs: - $(mkdir_p) $(DESTDIR)$(infodir) $(DESTDIR)$(man1dir) + for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -486,7 +489,7 @@ install-info-am: $(INFO_DEPS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(infodir) + test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)" @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ list='$(INFO_DEPS)'; \ for file in $$list; do \ @@ -499,8 +502,8 @@ $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ if test -f $$ifile; then \ relfile=`echo "$$ifile" | sed 's|^.*/||'`; \ - echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \ - $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \ + echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \ + $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \ else : ; fi; \ done; \ done @@ -510,8 +513,8 @@ list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\ - install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\ + echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ + install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ done; \ else : ; fi install-man: install-man1 diff -ru sed-4.1/doc/sed.1 sed-4.1.1/doc/sed.1 --- sed-4.1/doc/sed.1 2004-06-13 09:44:19.000000000 +0200 +++ sed-4.1.1/doc/sed.1 2004-07-06 09:24:40.000000000 +0200 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28. -.TH SED "1" "June 2004" "sed version 4.1" "User Commands" +.TH SED "1" "June 2004" "sed version 4.1.1" "User Commands" .SH NAME -sed \- manual page for sed version 4.1 +sed \- manual page for sed version 4.1.1 .SH SYNOPSIS .B sed [\fIOPTION\fR]... \fI{script-only-if-no-other-script} \fR[\fIinput-file\fR]... diff -ru sed-4.1/doc/sed.info sed-4.1.1/doc/sed.info --- sed-4.1/doc/sed.info 2004-06-13 08:32:57.000000000 +0200 +++ sed-4.1.1/doc/sed.info 2004-06-29 20:03:06.000000000 +0200 @@ -6,7 +6,7 @@ END-INFO-DIR-ENTRY -This file documents version 4.1 of GNU `sed', a stream editor. +This file documents version 4.1.1 of GNU `sed', a stream editor. Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -24,57 +24,57 @@ with its equivalent in the printed manual, constitutes the Title Page.  Indirect: -sed.info-1: 913 -sed.info-2: 50373 +sed.info-1: 915 +sed.info-2: 50377  Tag Table: (Indirect) -Node: Top913 -Node: Introduction3792 -Node: Invoking sed4346 -Ref: Invoking sed-Footnote-19372 -Ref: Invoking sed-Footnote-29564 -Node: sed Programs9667 -Node: Execution Cycle10814 -Ref: Execution Cycle-Footnote-111987 -Node: Addresses12298 -Node: Regular Expressions17037 -Node: Common Commands24586 -Node: The "s" Command26584 -Ref: The "s" Command-Footnote-130916 -Node: Other Commands30988 -Ref: Other Commands-Footnote-136125 -Node: Programming Commands36197 -Node: Extended Commands37106 -Node: Escapes40681 -Ref: Escapes-Footnote-143687 -Node: Examples43878 -Node: Centering lines44973 -Node: Increment a number45885 -Ref: Increment a number-Footnote-147465 -Node: Rename files to lower case47585 -Node: Print bash environment50373 -Node: Reverse chars of lines51153 -Ref: Reverse chars of lines-Footnote-152170 -Node: tac52392 -Node: cat -n53174 -Node: cat -b55031 -Node: wc -c55783 -Ref: wc -c-Footnote-157724 -Node: wc -w57793 -Node: wc -l59265 -Node: head59502 -Node: tail59826 -Node: uniq61265 -Node: uniq -d62061 -Node: uniq -u62785 -Node: cat -s63509 -Node: Limitations65422 -Node: Other Resources66262 -Node: Reporting Bugs67188 -Ref: Reporting Bugs-Footnote-172085 -Node: Extended regexps72156 -Node: Concept Index73323 -Node: Command and Option Index83338 +Node: Top915 +Node: Introduction3796 +Node: Invoking sed4350 +Ref: Invoking sed-Footnote-19376 +Ref: Invoking sed-Footnote-29568 +Node: sed Programs9671 +Node: Execution Cycle10818 +Ref: Execution Cycle-Footnote-111991 +Node: Addresses12302 +Node: Regular Expressions17041 +Node: Common Commands24590 +Node: The "s" Command26588 +Ref: The "s" Command-Footnote-130920 +Node: Other Commands30992 +Ref: Other Commands-Footnote-136129 +Node: Programming Commands36201 +Node: Extended Commands37110 +Node: Escapes40685 +Ref: Escapes-Footnote-143691 +Node: Examples43882 +Node: Centering lines44977 +Node: Increment a number45889 +Ref: Increment a number-Footnote-147469 +Node: Rename files to lower case47589 +Node: Print bash environment50377 +Node: Reverse chars of lines51157 +Ref: Reverse chars of lines-Footnote-152174 +Node: tac52396 +Node: cat -n53178 +Node: cat -b55035 +Node: wc -c55787 +Ref: wc -c-Footnote-157728 +Node: wc -w57797 +Node: wc -l59269 +Node: head59506 +Node: tail59830 +Node: uniq61269 +Node: uniq -d62065 +Node: uniq -u62789 +Node: cat -s63513 +Node: Limitations65426 +Node: Other Resources66266 +Node: Reporting Bugs67192 +Ref: Reporting Bugs-Footnote-172089 +Node: Extended regexps72160 +Node: Concept Index73327 +Node: Command and Option Index83342  End Tag Table diff -ru sed-4.1/doc/sed.info-1 sed-4.1.1/doc/sed.info-1 --- sed-4.1/doc/sed.info-1 2004-06-13 08:32:57.000000000 +0200 +++ sed-4.1.1/doc/sed.info-1 2004-06-29 20:03:06.000000000 +0200 @@ -6,7 +6,7 @@ END-INFO-DIR-ENTRY -This file documents version 4.1 of GNU `sed', a stream editor. +This file documents version 4.1.1 of GNU `sed', a stream editor. Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -27,7 +27,7 @@ -This file documents version 4.1 of GNU `sed', a stream editor. +This file documents version 4.1.1 of GNU `sed', a stream editor. Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff -ru sed-4.1/doc/sed.info-2 sed-4.1.1/doc/sed.info-2 --- sed-4.1/doc/sed.info-2 2004-06-13 08:32:57.000000000 +0200 +++ sed-4.1.1/doc/sed.info-2 2004-06-29 20:03:06.000000000 +0200 @@ -6,7 +6,7 @@ END-INFO-DIR-ENTRY -This file documents version 4.1 of GNU `sed', a stream editor. +This file documents version 4.1.1 of GNU `sed', a stream editor. Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff -ru sed-4.1/doc/stamp-vti sed-4.1.1/doc/stamp-vti --- sed-4.1/doc/stamp-vti 2004-06-13 08:32:50.000000000 +0200 +++ sed-4.1.1/doc/stamp-vti 2004-07-06 09:23:22.000000000 +0200 @@ -1,4 +1,4 @@ @set UPDATED 29 February 2004 @set UPDATED-MONTH February 2004 -@set EDITION 4.1 -@set VERSION 4.1 +@set EDITION 4.1.1 +@set VERSION 4.1.1 diff -ru sed-4.1/doc/version.texi sed-4.1.1/doc/version.texi --- sed-4.1/doc/version.texi 2004-06-13 08:32:50.000000000 +0200 +++ sed-4.1.1/doc/version.texi 2004-06-29 20:02:03.000000000 +0200 @@ -1,4 +1,4 @@ @set UPDATED 29 February 2004 @set UPDATED-MONTH February 2004 -@set EDITION 4.1 -@set VERSION 4.1 +@set EDITION 4.1.1 +@set VERSION 4.1.1 diff -ru sed-4.1/lib/Makefile.in sed-4.1.1/lib/Makefile.in --- sed-4.1/lib/Makefile.in 2004-06-13 08:31:33.000000000 +0200 +++ sed-4.1.1/lib/Makefile.in 2004-07-06 09:19:49.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -58,9 +58,9 @@ mkinstalldirs = $(mkdir_p) CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = stdbool.h regex.h +LIBRARIES = $(noinst_LIBRARIES) AR = ar ARFLAGS = cru -LIBRARIES = $(noinst_LIBRARIES) libsed_a_AR = $(AR) $(ARFLAGS) am_libsed_a_OBJECTS = getopt1.$(OBJEXT) getopt.$(OBJEXT) \ utils.$(OBJEXT) @@ -117,6 +117,7 @@ GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE__BOOL = @HAVE__BOOL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -309,9 +310,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) diff -ru sed-4.1/lib/utils.c sed-4.1.1/lib/utils.c --- sed-4.1/lib/utils.c 2004-03-13 10:45:06.000000000 +0100 +++ sed-4.1.1/lib/utils.c 2004-06-29 20:04:33.000000000 +0200 @@ -140,7 +140,7 @@ if (!fp) { if (fail) - panic(_("Couldn't open file %s: %s"), name, strerror(errno)); + panic(_("couldn't open file %s: %s"), name, strerror(errno)); return NULL; } @@ -193,7 +193,7 @@ fd = mkstemp (template); if (fd == -1) - panic(_("Couldn't open temporary file %s: %s"), template, strerror(errno)); + panic(_("couldn't open temporary file %s: %s"), template, strerror(errno)); *p_filename = template; fp = fdopen (fd, "w"); @@ -260,7 +260,7 @@ { clearerr(stream); if (fflush(stream) == EOF && errno != EBADF) - panic("Couldn't flush %s: %s", utils_fp_name(stream), strerror(errno)); + panic("couldn't flush %s: %s", utils_fp_name(stream), strerror(errno)); } /* Panic on failing fclose */ @@ -311,7 +311,7 @@ /* We want to execute both arms, so use | not ||. */ if (fclose(fp) == EOF) - panic("Couldn't close %s: %s", utils_fp_name(fp), strerror(errno)); + panic("couldn't close %s: %s", utils_fp_name(fp), strerror(errno)); } @@ -351,7 +351,7 @@ { VOID *ret = calloc(1, size ? size : 1); if (!ret) - panic("Couldn't allocate memory"); + panic("couldn't allocate memory"); return ret; } @@ -380,7 +380,7 @@ return ck_malloc(size); ret = realloc(ptr, size); if (!ret) - panic("Couldn't re-allocate memory"); + panic("couldn't re-allocate memory"); return ret; } diff -ru sed-4.1/po/Makefile.in.in sed-4.1.1/po/Makefile.in.in --- sed-4.1/po/Makefile.in.in 2004-01-07 14:57:43.000000000 +0100 +++ sed-4.1.1/po/Makefile.in.in 2004-06-29 20:11:31.000000000 +0200 @@ -69,7 +69,7 @@ .po.gmo: file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< + && rm -f $$file && $(GMSGFMT) --check --statistics -o $$file $< all: all-@USE_NLS@ Binary files sed-4.1/po/af.gmo and sed-4.1.1/po/af.gmo differ diff -ru sed-4.1/po/af.po sed-4.1.1/po/af.po --- sed-4.1/po/af.po 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/af.po 2004-07-06 09:24:31.000000000 +0200 @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2004-01-11 21:06+0000\n" "Last-Translator: Ysbeer \n" "Language-Team: Afrikaans \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n!=1;\n" #: sed/compile.c:162 @@ -143,14 +143,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e uitdrukking #%lu, karakter %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Het savchar() met onverwagte agterstoot (%x) geroep" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Kan nie etiket vir sprong na `%s' kry nie" #: sed/execute.c:649 @@ -158,43 +153,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: Kan nie %s lees nie: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Kon nie die l棚er %s oopmaak nie: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Kon nie tydelike l棚er %s oopmaak nie: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "INTERNE FOUT: slegte adrestipe" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Kon nie tydelike l棚er %s oopmaak nie: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "fout in subproses" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "opsie `e' word nie ondersteun nie" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "`e' instruksie word nie ondersteun nie" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "INTERNE FOUT: Swak instruksie %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Geen vorige regex nie" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Kan nie veranderaars vir le谷 regex spesifiseer nie" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Ongeldige regterhandsverwysing \\%d vir `s' instruksie" #: sed/sed.c:96 @@ -341,8 +339,8 @@ msgstr "%s: Kan nie %s lees nie: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Kon nie die l棚er %s oopmaak nie: %s" #: lib/utils.c:220 @@ -430,6 +428,22 @@ msgid "Unmatched ) or \\)" msgstr "Ongepaarde ) of \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Geen vorige regex nie" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Kon nie tydelike l棚er %s oopmaak nie: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Het savchar() met onverwagte agterstoot (%x) geroep" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "INTERNE FOUT: slegte adrestipe" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "INTERNE FOUT: Swak instruksie %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/ca.gmo and sed-4.1.1/po/ca.gmo differ diff -ru sed-4.1/po/ca.po sed-4.1.1/po/ca.po --- sed-4.1/po/ca.po 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/ca.po 2004-07-06 09:24:31.000000000 +0200 @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-10-24 19:18+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" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n!=1;\n" #: sed/compile.c:162 @@ -143,14 +143,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expressi #%lu, carcter %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "S'ha cridat a savchar() amb una espenta inesperada (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "No es troba l'etiqueta per al bot a %s" #: sed/execute.c:649 @@ -158,43 +153,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: no es pot llegir %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "No s'ha pogut obrir el fitxer %s: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "No s'ha pogut obrir el fitxer temporal %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "ERROR INTERN: tipus d'adrea errnia" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "No s'ha pogut obrir el fitxer temporal %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "error en subprocs" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "l'opci e no est suportada" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "l'ordre e no est suportada" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "ERROR INTERN: Ordre errnia %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "No hi ha una expressi regular prvia" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "No es poden especificar modificadors en expregs buides" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Referncia \\%d no vlida en el costat dret de l'ordre s" #: sed/sed.c:96 @@ -342,8 +340,8 @@ msgstr "%s: no es pot llegir %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "No s'ha pogut obrir el fitxer %s: %s" #: lib/utils.c:220 @@ -431,6 +429,22 @@ msgid "Unmatched ) or \\)" msgstr ") o \\) no emparellat" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "No hi ha una expressi regular prvia" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "No s'ha pogut obrir el fitxer temporal %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "S'ha cridat a savchar() amb una espenta inesperada (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "ERROR INTERN: tipus d'adrea errnia" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "ERROR INTERN: Ordre errnia %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/cs.gmo and sed-4.1.1/po/cs.gmo differ diff -ru sed-4.1/po/cs.po sed-4.1.1/po/cs.po --- sed-4.1/po/cs.po 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/cs.po 2004-07-06 09:24:31.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2001-08-05 19:52+02:00\n" "Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #: sed/compile.c:162 #, fuzzy @@ -140,14 +140,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e vraz #%lu, znak %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Volno savchar() s neekanm pushback (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Nv豺t pro skok na `%s' nelze najt" #: sed/execute.c:649 @@ -155,43 +150,44 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: %s nelze 蓁st: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "Soubor %s nelze otevt" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "INTERN CHYBA: patn typ adresy" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Soubor %s nelze otevt" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "INTERN CHYBA: patn pkaz %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +msgid "no previous regular expression" msgstr "" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +msgid "cannot specify modifiers on empty regexp" msgstr "" #: sed/regexp.c:134 #, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +msgid "invalid reference \\%d on `s' command's RHS" msgstr "" #: sed/sed.c:96 @@ -332,7 +328,7 @@ #: lib/utils.c:143 #, fuzzy, c-format -msgid "Couldn't open file %s: %s" +msgid "couldn't open file %s: %s" msgstr "Soubor %s nelze otevt" #: lib/utils.c:220 @@ -424,6 +420,23 @@ msgid "Unmatched ) or \\)" msgstr "Neodpovdajc `{'" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Soubor %s nelze otevt" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Volno savchar() s neekanm pushback (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "INTERN CHYBA: patn typ adresy" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "INTERN CHYBA: patn pkaz %c" + #, fuzzy #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" Binary files sed-4.1/po/da.gmo and sed-4.1.1/po/da.gmo differ diff -ru sed-4.1/po/da.po sed-4.1.1/po/da.po --- sed-4.1/po/da.po 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/da.po 2004-07-06 09:24:31.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-10-25 08:00+0200\n" "Last-Translator: Byrial Ole Jensen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: sed/compile.c:162 @@ -142,14 +142,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e udtryk nr. %lu, tegn %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "savchar() kaldt med uventet tilbageskub (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Kan ikke finde etiket for hop til '%s'" #: sed/execute.c:649 @@ -157,43 +152,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: kan ikke lse %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "kunne ikke bne filen %s: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "kunne ikke bne midlertidig fil %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "INTERN FEJL: forkert adressetype" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "kunne ikke bne midlertidig fil %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "fejl i underproces" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "tilvalg 'e' er ikke understttet" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "'e'-kommando er ikke understttet" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "INTERN FEJL: Forkert vrdi af cmd %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Intet forudgende regulrt udtryk" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Der kan ikke angives ndrere til tomt regulrt udtryk" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Ugyldig reference \\%d p 's'-kommandos hjreside" #: sed/sed.c:96 @@ -338,8 +336,8 @@ msgstr "%s: kan ikke lse %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "kunne ikke bne filen %s: %s" #: lib/utils.c:220 @@ -427,6 +425,22 @@ msgid "Unmatched ) or \\)" msgstr "Uparret ) eller \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Intet forudgende regulrt udtryk" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "kunne ikke bne midlertidig fil %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "savchar() kaldt med uventet tilbageskub (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "INTERN FEJL: forkert adressetype" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "INTERN FEJL: Forkert vrdi af cmd %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/de.gmo and sed-4.1.1/po/de.gmo differ diff -ru sed-4.1/po/de.po sed-4.1.1/po/de.po --- sed-4.1/po/de.po 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/de.po 2004-07-06 09:24:32.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.6\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-03-21 22:03:41+0100\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -142,14 +142,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e Ausdruck #%lu, Zeichen %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Aufruf von savchar() mit unerwartetem \"pushback\" (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Kann das Ziel fr den Sprung nach `%s' nicht finden" #: sed/execute.c:649 @@ -157,43 +152,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: kann %s nicht lesen: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "Datei %s kann nicht geffnet werden: %s" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "INTERNER FEHLER: Falsche Adressenart" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Datei %s kann nicht geffnet werden: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "Fehler im Subprozess" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "Option `e' wird nicht untersttzt" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "`e'-Kommando wird nicht untersttzt" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "INTERNER FEHLER: Falscher Befehl %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Kein vorheriger regulrer Ausdruck" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Auf leere regulre Ausdrcke knnen keine `modifier' angewandt werden" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Ungltiger Verweis \\%d in den Haltepuffer des `s'-Befehls" #: sed/sed.c:96 @@ -343,8 +341,8 @@ msgstr "%s: kann %s nicht lesen: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Datei %s kann nicht geffnet werden: %s" #: lib/utils.c:220 @@ -432,6 +430,23 @@ msgid "Unmatched ) or \\)" msgstr "Nicht paarweises ) bzw. \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Kein vorheriger regulrer Ausdruck" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Datei %s kann nicht geffnet werden: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Aufruf von savchar() mit unerwartetem \"pushback\" (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "INTERNER FEHLER: Falsche Adressenart" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "INTERNER FEHLER: Falscher Befehl %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/el.gmo and sed-4.1.1/po/el.gmo differ diff -ru sed-4.1/po/el.po sed-4.1.1/po/el.po --- sed-4.1/po/el.po 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/el.po 2004-07-06 09:24:32.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2002-03-08 12:57+0000\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-7\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #: sed/compile.c:162 #, fuzzy @@ -141,14 +141,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e 汪驕鼇 #%lu, 瘻瘧滂癇 %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "暮潁 苒 savchar() 跂 趺 瘢瘡纃跂迴 pushback (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "偵 漑瘢 糒轣 缸驟鼇 續蜉沐癇 竕 跂樅癈 齡 `%s'" #: sed/execute.c:649 @@ -156,43 +151,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: 痲轣赧 齡芻 瘢榱逋鼇 %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "偵 跟驟黶 轣 瘢閙銷 瘻縷 %s" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "途捏菟品 嗽阻盟: 裃袰 跫髢 粡缸蔘逑苒" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "偵 跟驟黶 轣 瘢閙銷 瘻縷 %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "齧樣赱 齡 竟粡痲蜉癈焉" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "粤 竟齡苟煕續瘟 辮蜍閭 `e'" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "粤 竟齡苟煕續瘟 纃闍 `e'" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "途捏菟品 嗽阻盟: 捕袰 纃闍 %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "偵 碌汕芒 韵閾竢跂辯 裃迴迚袰 汪驕鼇" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "粤 辮蜚驂鞳瘟 闡蜩踰 粡瘡闡 黼 裙轗 裃迴迚袰 汪驕鼇" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "門 气褫驥 瘢癘闡 \\%d 齡 粤釼 贖赱 苒 纃闍溟 `s'" #: sed/sed.c:96 @@ -333,7 +331,7 @@ #: lib/utils.c:143 #, fuzzy, c-format -msgid "Couldn't open file %s: %s" +msgid "couldn't open file %s: %s" msgstr "偵 跟驟黶 轣 瘢閙銷 瘻縷 %s" #: lib/utils.c:220 @@ -432,6 +430,23 @@ msgid "Unmatched ) or \\)" msgstr "藻痿驩癈 `{'" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "偵 碌汕芒 韵閾竢跂辯 裃迴迚袰 汪驕鼇" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "偵 跟驟黶 轣 瘢閙銷 瘻縷 %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "暮潁 苒 savchar() 跂 趺 瘢瘡纃跂迴 pushback (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "途捏菟品 嗽阻盟: 裃袰 跫髢 粡缸蔘逑苒" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "途捏菟品 嗽阻盟: 捕袰 纃闍 %c" + #, fuzzy #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" Binary files sed-4.1/po/eo.gmo and sed-4.1.1/po/eo.gmo differ diff -ru sed-4.1/po/eo.po sed-4.1.1/po/eo.po --- sed-4.1/po/eo.po 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/eo.po 2004-07-06 09:24:32.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-10-26 20:57+0000\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8-bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -142,14 +142,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e esprimo #%lu, signo %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Vokis savchar() kun neatendita pushback (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Ne povas trovi etikedon por salto al '%s'" #: sed/execute.c:649 @@ -157,43 +152,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: ne povas legi %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Ne povis malfermi dosieron %s: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Ne povis malfermi dumtempan dosieron %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "INTERNA ERARO: malbona adresspeco" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Ne povis malfermi dumtempan dosieron %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "eraro en subprocezo" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "opcio 'e' ne realigita" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "komando 'e' ne realigita" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "INTERNA ERARO: Malbona komando %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Mankas anta鏑a regula esprimo" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Ne eblas specifi modifilojn e malplena regula esprimo" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Nevalida referenco \\%d e dekstra flanko de komando 's'" #: sed/sed.c:96 @@ -338,8 +336,8 @@ msgstr "%s: ne povas legi %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Ne povis malfermi dosieron %s: %s" #: lib/utils.c:220 @@ -427,6 +425,22 @@ msgid "Unmatched ) or \\)" msgstr "Neparigita ) a鏑 \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Mankas anta鏑a regula esprimo" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Ne povis malfermi dumtempan dosieron %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Vokis savchar() kun neatendita pushback (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "INTERNA ERARO: malbona adresspeco" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "INTERNA ERARO: Malbona komando %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/es.gmo and sed-4.1.1/po/es.gmo differ diff -ru sed-4.1/po/es.po sed-4.1.1/po/es.po --- sed-4.1/po/es.po 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/es.po 2004-07-06 09:24:32.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-10-24 12:38-0500\n" "Last-Translator: Cristian Othn Martnez Vera \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -142,15 +142,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expresin #%lu, carcter %lu: %s\n" -# FUZZY: pushback -> empuje? cfuga -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "savchar() llamado con empuje inesperado (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "No se puede encontrar la etiqueta para saltar a `%s'" #: sed/execute.c:649 @@ -158,43 +152,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: no se puede leer %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "No se puede abrir el fichero %s: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "No se puede abrir el fichero temporal %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "ERROR INTERNO: tipo de direccin errneo" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "No se puede abrir el fichero temporal %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "error en el subproceso" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "no hay soporte para la opcin `e'" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "no hay soporte para el comando `e'" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "ERROR INTERNO: cmd %c errneo" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "No hay una expresin regular previa" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "No se pueden especificar modificadores en expresiones regulares vacas" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Referencia \\%d invlida en el lado derecho del comando `s'" #: sed/sed.c:96 @@ -342,8 +339,8 @@ msgstr "%s: no se puede leer %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "No se puede abrir el fichero %s: %s" #: lib/utils.c:220 @@ -431,6 +428,23 @@ msgid "Unmatched ) or \\)" msgstr ") \\) sin pareja" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "No hay una expresin regular previa" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "No se puede abrir el fichero temporal %s: %s" + +# FUZZY: pushback -> empuje? cfuga +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "savchar() llamado con empuje inesperado (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "ERROR INTERNO: tipo de direccin errneo" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "ERROR INTERNO: cmd %c errneo" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/et.gmo and sed-4.1.1/po/et.gmo differ diff -ru sed-4.1/po/et.po sed-4.1.1/po/et.po --- sed-4.1/po/et.po 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/et.po 2004-07-06 09:24:32.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-10-24 19:39+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8-bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -142,14 +142,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e avaldis #%lu, smbol %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "kutsuti savchar() ootamatu pushback (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Ei leia mrgendit, et hpata kohale `%s'" #: sed/execute.c:649 @@ -157,43 +152,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: ei saa lugeda %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Faili %s ei saa avada: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Ajutist faili %s ei saa avada: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "SISEMINE VIGA: vigane aadressi tp" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Ajutist faili %s ei saa avada: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "viga alamprotsessis" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "vtit `e' ei toetata" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "ksku `e' ei toetata" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "SISEMINE VIGA: Halb ksk %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Eelmist regulaaravaldist pole" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Muudatusi thjale regulaaravaldisele ei saa m粐rata" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Vigane viide \\%d ksu `s' paremas pooles" #: sed/sed.c:96 @@ -338,8 +336,8 @@ msgstr "%s: ei saa lugeda %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Faili %s ei saa avada: %s" #: lib/utils.c:220 @@ -427,6 +425,22 @@ msgid "Unmatched ) or \\)" msgstr "Puudub ) vi \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Eelmist regulaaravaldist pole" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Ajutist faili %s ei saa avada: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "kutsuti savchar() ootamatu pushback (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "SISEMINE VIGA: vigane aadressi tp" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "SISEMINE VIGA: Halb ksk %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/fi.gmo and sed-4.1.1/po/fi.gmo differ diff -ru sed-4.1/po/fi.po sed-4.1.1/po/fi.po --- sed-4.1/po/fi.po 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/fi.po 2004-07-06 09:24:32.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed-4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-12-07 09:35+0200\n" "Last-Translator: Sami J. Laine \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: sed/compile.c:162 @@ -142,14 +142,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e lauseke #%lu, merkki %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Kutsuttiin funktiota savchar() odottamattomalla taaksepainannalla (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Nimikett hypylle kohteeseen \"%s\" ei lydy" #: sed/execute.c:649 @@ -157,43 +152,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: ei voida lukea sytett %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Tiedostoa %s ei voitu avata: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Vliaikaistiedostoa %s ei voitu avata: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "SISINEN VIRHE: virheellinen osoitetyyppi" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Vliaikaistiedostoa %s ei voitu avata: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "virhe lapsiprosessissa" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "valitsin `e' ei ole tuettu" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "komento `e' ei ole tuettu" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "SISINEN VIRHE: Virheellinen komento %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Ei aikaisempaa s粐nnllist lausetta" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Muuttajia ei voida m粐ritell tyhj粐n s粐nnliseen lausekkeeseen" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Virheellinen viittaus \\%d komennon `s' oikealla puolella" #: sed/sed.c:96 @@ -341,8 +339,8 @@ msgstr "%s: ei voida lukea sytett %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Tiedostoa %s ei voitu avata: %s" #: lib/utils.c:220 @@ -430,6 +428,23 @@ msgid "Unmatched ) or \\)" msgstr "Pariton \")\" tai \"\\)\"" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Ei aikaisempaa s粐nnllist lausetta" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Vliaikaistiedostoa %s ei voitu avata: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "" +#~ "Kutsuttiin funktiota savchar() odottamattomalla taaksepainannalla (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "SISINEN VIRHE: virheellinen osoitetyyppi" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "SISINEN VIRHE: Virheellinen komento %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/fr.gmo and sed-4.1.1/po/fr.gmo differ diff -ru sed-4.1/po/fr.po sed-4.1.1/po/fr.po --- sed-4.1/po/fr.po 2004-04-23 22:08:59.000000000 +0200 +++ sed-4.1.1/po/fr.po 2004-07-06 09:24:32.000000000 +0200 @@ -9,14 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2004-04-22 21:19+0200\n" "Last-Translator: Gal Quri \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: sed/compile.c:162 @@ -146,16 +146,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expression n%lu, caractre %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "" -"La fonction savchar() a t appele avec un caractre de rebroussement\n" -"inattendu (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Impossible de trouver l'tiquette pour aller `%s'" #: sed/execute.c:649 @@ -163,45 +156,48 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: impossible de lire %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Impossible d'ouvrir le fichier %s: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Impossible d'ouvrir le fichier temporaire %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "ERREUR INTERNE: mauvais type d'adresse" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Impossible d'ouvrir le fichier temporaire %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "erreur dans le sous-processus" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "l'option `e' n'est pas supporte" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "la commande `e' n'est pas supporte" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "ERREUR INTERNE: mauvaise commande %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Pas d'expression rgulire prcdente" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "" "Impossible de spcifier des modifieurs sur une expression\n" "rationnelle vide" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Rfrence \\%d invalide dans le ct droit de la commande `s'" #: sed/sed.c:96 @@ -348,8 +344,8 @@ msgstr "%s: impossible de lire %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Impossible d'ouvrir le fichier %s: %s" #: lib/utils.c:220 @@ -437,6 +433,24 @@ msgid "Unmatched ) or \\)" msgstr ") ou \\) non referm" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Pas d'expression rgulire prcdente" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Impossible d'ouvrir le fichier temporaire %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "" +#~ "La fonction savchar() a t appele avec un caractre de rebroussement\n" +#~ "inattendu (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "ERREUR INTERNE: mauvais type d'adresse" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "ERREUR INTERNE: mauvaise commande %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/ga.gmo and sed-4.1.1/po/ga.gmo differ diff -ru sed-4.1/po/ga.po sed-4.1.1/po/ga.po --- sed-4.1/po/ga.po 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/ga.po 2004-07-06 09:24:33.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-10-24 16:00-0600\n" "Last-Translator: Kevin Patrick Scannell \n" "Language-Team: Irish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=4; plural=n==1 ? 0 : (n>1 && n<7) ? 1 : (n>6 && n " "<11) ? 2 : 3;\n" @@ -143,15 +143,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e slonn #%lu, char %lu: %s\n" -# pushback is in FARF - KPS -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Glaodh savchar() le br siar (%x) gan choinne" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Nl aon fhil ar an lipad `%s' don lim" #: sed/execute.c:649 @@ -159,44 +153,47 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: n fidir %s a lamh: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Norbh fhidir an comhad %s a oscailt: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Norbh fhidir an comhad sealadach %s a oscailt: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "EARRID INMHENACH: drochsheoladh" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Norbh fhidir an comhad sealadach %s a oscailt: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "earrid i bhfo-phriseas" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "nl an rogha `e' ar fil" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "nl an t-ord `e' ar fil" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "EARRID INMHENACH: Drochord %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Nl aon slonn ionadaochta roimh seo" # bunathraitheoir is in FARF - KPS #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "N fidir bunathraitheoir a chur le slonn bn" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Tagairt neamhbhail \\%d ar dheis ord `s'" #: sed/sed.c:96 @@ -342,8 +339,8 @@ msgstr "%s: n fidir %s a lamh: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Norbh fhidir an comhad %s a oscailt: %s" # Irish is nice this way, no initial mutation on 'rud'! -- KPS @@ -436,6 +433,23 @@ msgid "Unmatched ) or \\)" msgstr ") n \\) corr" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Nl aon slonn ionadaochta roimh seo" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Norbh fhidir an comhad sealadach %s a oscailt: %s" + +# pushback is in FARF - KPS +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Glaodh savchar() le br siar (%x) gan choinne" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "EARRID INMHENACH: drochsheoladh" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "EARRID INMHENACH: Drochord %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/gl.gmo and sed-4.1.1/po/gl.gmo differ diff -ru sed-4.1/po/gl.po sed-4.1.1/po/gl.po --- sed-4.1/po/gl.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/gl.po 2004-07-06 09:24:33.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2002-10-25 15:57+0200\n" "Last-Translator: Jacobo Tarro Barreiro \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n!=1;\n" #: sed/compile.c:162 @@ -142,14 +142,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expresin #%lu, carcter %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Chamouse a savchar() cun pushback inesperado (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, 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:649 @@ -157,43 +152,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: non se puido ler %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "Non se puido abri-lo ficheiro %s: %s" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "ERRO INTERNO: tipo de enderezo incorrecto" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Non se puido abri-lo ficheiro %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "erro no subproceso" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "a opcin `e' non est soportada" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "o comando `e' non est soportado" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "ERRO INTERNO: instruccin %c incorrecta" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Non hai unha expresin regular anterior" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Non se poden especificar modificadores nunha expresin regular baleira" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Referencia \\%d non vlida no lado dereito do comando `s'" #: sed/sed.c:96 @@ -341,8 +339,8 @@ msgstr "%s: non se puido ler %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Non se puido abri-lo ficheiro %s: %s" #: lib/utils.c:220 @@ -430,6 +428,23 @@ msgid "Unmatched ) or \\)" msgstr ") ou \\) sen parella" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Non hai unha expresin regular anterior" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Non se puido abri-lo ficheiro %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Chamouse a savchar() cun pushback inesperado (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "ERRO INTERNO: tipo de enderezo incorrecto" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "ERRO INTERNO: instruccin %c incorrecta" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/he.gmo and sed-4.1.1/po/he.gmo differ diff -ru sed-4.1/po/he.po sed-4.1.1/po/he.po --- sed-4.1/po/he.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/he.po 2004-07-06 09:24:33.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2001-08-04 20:37+0300\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-8\n" "Content-Transfer-Encoding: 8-bit\n" -"Report-Msgid-Bugs-To: \n" #: sed/compile.c:162 #, fuzzy @@ -140,14 +140,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s 蜷證 (%lu '骼 -e 蜈蓍 踟 %lu '骼 纎) %s 籥蛯\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "(%x) 蜈-蝴赱 pushback 迺 籥 savchar() 粡鞳" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "籥鉋 瑕 `%s' 糜蜚 蜈纎" #: sed/execute.c:649 @@ -155,43 +150,44 @@ msgid "%s: can't read %s: %s\n" msgstr "%s 蜷證 %s 珸 (%s) 籥蛯\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "%s 痳 芍 粲" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "鱚竕-蝴赱 痳 矼 :鬻緕 粽證 踞" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "%s 痳 芍 粲" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "%c 痳 粃纓 :鬻緕 粽證 踞" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +msgid "no previous regular expression" msgstr "" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +msgid "cannot specify modifiers on empty regexp" msgstr "" #: sed/regexp.c:134 #, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +msgid "invalid reference \\%d on `s' command's RHS" msgstr "" #: sed/sed.c:96 @@ -330,7 +326,7 @@ #: lib/utils.c:143 #, fuzzy, c-format -msgid "Couldn't open file %s: %s" +msgid "couldn't open file %s: %s" msgstr "%s 痳 芍 粲" #: lib/utils.c:220 @@ -422,6 +418,23 @@ msgid "Unmatched ) or \\)" msgstr "矼-閨 繻 濶璞 `{'" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "%s 痳 芍 粲" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "(%x) 蜈-蝴赱 pushback 迺 籥 savchar() 粡鞳" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "鱚竕-蝴赱 痳 矼 :鬻緕 粽證 踞" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "%c 痳 粃纓 :鬻緕 粽證 踞" + #, fuzzy #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" Binary files sed-4.1/po/hr.gmo and sed-4.1.1/po/hr.gmo differ diff -ru sed-4.1/po/hr.po sed-4.1.1/po/hr.po --- sed-4.1/po/hr.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/hr.po 2004-07-06 09:24:33.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02a\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2002-06-14 15:17-01\n" "Last-Translator: Denis Lackovic \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n==1?0:1);\n" "X-Generator: TransDict server\n" @@ -142,14 +142,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e izraz #%lu, znak %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Pozvao savchar() sa neoekivanim rezultatom (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Ne mogu nai labelu na koju bi trebalo skoiti `%s'" #: sed/execute.c:649 @@ -157,43 +152,45 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: ne mogu itati %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "Ne mogu otvoriti datoteku %s" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "INTERNA GREKA: neispravan tip adrese" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Ne mogu otvoriti datoteku %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "INTERNA GREKA: Neispravna naredba %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Nedostaje prethodni regularni izraz" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +msgid "cannot specify modifiers on empty regexp" msgstr "" #: sed/regexp.c:134 #, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +msgid "invalid reference \\%d on `s' command's RHS" msgstr "" #: sed/sed.c:96 @@ -333,7 +330,7 @@ #: lib/utils.c:143 #, fuzzy, c-format -msgid "Couldn't open file %s: %s" +msgid "couldn't open file %s: %s" msgstr "Ne mogu otvoriti datoteku %s" #: lib/utils.c:220 @@ -429,6 +426,23 @@ msgid "Unmatched ) or \\)" msgstr "Neuparena `{'" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Nedostaje prethodni regularni izraz" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Ne mogu otvoriti datoteku %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Pozvao savchar() sa neoekivanim rezultatom (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "INTERNA GREKA: neispravan tip adrese" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "INTERNA GREKA: Neispravna naredba %c" + #, fuzzy #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" Binary files sed-4.1/po/hu.gmo and sed-4.1.1/po/hu.gmo differ diff -ru sed-4.1/po/hu.po sed-4.1.1/po/hu.po --- sed-4.1/po/hu.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/hu.po 2004-07-06 09:24:33.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-10-26 09:28+0100\n" "Last-Translator: Mihly Gyulai \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=1; plural=0;\n" #: sed/compile.c:162 @@ -142,14 +142,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e kifejezs #%lu, karakter %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "A meghvott savchar() egy vratlan rtkkel trt vissza (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Az ugrshoz (`%s') nem tallom a cmkt" #: sed/execute.c:649 @@ -157,43 +152,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: nem lehet olvasni %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Nem lehet megnyitni a(z) %s fjlt: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Nem lehet megnyitni az tmeneti fjlt: %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "BELS HIBA: rossz cm tpus" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Nem lehet megnyitni az tmeneti fjlt: %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "hiba az alfolyamatban" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "az `e' opci nincs tmogatva" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "az `e' parancs nincs tmogatva" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "BELS HIBA: Rossz parancs %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Nincsen elz regulris kifejezs" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Nem lehet mdostt megadni res regulris kifejezshez" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Hibs hivatkozs (\\%d) a(z) `s' parancs RHS-re" #: sed/sed.c:96 @@ -339,8 +337,8 @@ msgstr "%s: nem lehet olvasni %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Nem lehet megnyitni a(z) %s fjlt: %s" #: lib/utils.c:220 @@ -428,6 +426,22 @@ msgid "Unmatched ) or \\)" msgstr "Nincs prban ) vagy \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Nincsen elz regulris kifejezs" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Nem lehet megnyitni az tmeneti fjlt: %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "A meghvott savchar() egy vratlan rtkkel trt vissza (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "BELS HIBA: rossz cm tpus" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "BELS HIBA: Rossz parancs %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/id.gmo and sed-4.1.1/po/id.gmo differ diff -ru sed-4.1/po/id.po sed-4.1.1/po/id.po --- sed-4.1/po/id.po 2004-04-30 14:38:05.000000000 +0200 +++ sed-4.1.1/po/id.po 2004-07-01 18:32:12.000000000 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2004-04-27 14:56+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -143,14 +143,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e ekspresi #%lu, char %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Dipanggil savchar() dengan pushback (%x) yang tidak diharapkan" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Tidak dapat menemukan label untuk melompat ke `%s'" #: sed/execute.c:649 @@ -158,43 +153,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: tidak dapat membaca %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Tidak dapat membuka file %s %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Tidak dapat membuka file temporer %s %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "KESALAHAN INTERNAL: tipe alamat buruk" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Tidak dapat membuka file temporer %s %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "kesalahan dalam subproses" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "option `e' tidak didukung" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "perintah `e' tidak didukung" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "KESALAHAN INTERNAL: Perintah %c buruk" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Tidak ada reguler ekspresi sebelumnya" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Tidak dapat menspesifikasikan modified pada regexp kosong" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Referensi tidak valid \\%d pada perintah `s' RHS" #: sed/sed.c:96 @@ -339,8 +337,8 @@ msgstr "%s: tidak dapat membaca %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Tidak dapat membuka file %s %s" #: lib/utils.c:220 @@ -428,6 +426,22 @@ msgid "Unmatched ) or \\)" msgstr ") atau \\) tidak sesuai" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Tidak ada reguler ekspresi sebelumnya" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Tidak dapat membuka file temporer %s %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Dipanggil savchar() dengan pushback (%x) yang tidak diharapkan" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "KESALAHAN INTERNAL: tipe alamat buruk" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "KESALAHAN INTERNAL: Perintah %c buruk" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/it.gmo and sed-4.1.1/po/it.gmo differ diff -ru sed-4.1/po/it.po sed-4.1.1/po/it.po --- sed-4.1/po/it.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/it.po 2004-07-06 09:24:34.000000000 +0200 @@ -5,57 +5,50 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0a\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2002-11-26 12:44+0100\n" "Last-Translator: Paolo Bonzini \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" # sed/compile.c:166 #: sed/compile.c:162 -#, fuzzy msgid "multiple `!'s" msgstr "`!' multipli" # sed/compile.c:167 #: sed/compile.c:163 -#, fuzzy msgid "unexpected `,'" msgstr "`,' inattesa" # sed/compile.c:169 #: sed/compile.c:164 -#, fuzzy msgid "invalid usage of +N or ~N as first address" -msgstr "Impossibile usare +N o ~N come primo indirizzo" +msgstr "impossibile usare +N o ~N come primo indirizzo" # sed/compile.c:170 #: sed/compile.c:165 -#, fuzzy msgid "unmatched `{'" msgstr "`{' non bilanciata" # sed/compile.c:171 #: sed/compile.c:166 -#, fuzzy msgid "unexpected `}'" msgstr "`}' inattesa" # sed/compile.c:172 #: sed/compile.c:167 -#, fuzzy msgid "extra characters after command" -msgstr "Ci sono altri caratteri dopo il comando" +msgstr "ci sono altri caratteri dopo il comando" # sed/compile.c:173 #: sed/compile.c:168 -#, fuzzy msgid "expected \\ after `a', `c' or `i'" -msgstr "Atteso \\ dopo `a', `c' o `i'" +msgstr "atteso \\ dopo `a', `c' o `i'" # sed/compile.c:174 #: sed/compile.c:169 @@ -69,45 +62,38 @@ # sed/compile.c:176 #: sed/compile.c:171 -#, fuzzy msgid "comments don't accept any addresses" -msgstr "I commenti non accettano indirizzi" +msgstr "i commenti non accettano indirizzi" # sed/compile.c:177 #: sed/compile.c:172 -#, fuzzy msgid "missing command" -msgstr "Manca il comando" +msgstr "manca il comando" # sed/compile.c:178 #: sed/compile.c:173 -#, fuzzy msgid "command only uses one address" -msgstr "Il comando usa solo un indirizzo" +msgstr "il comando usa solo un indirizzo" # sed/compile.c:179 #: sed/compile.c:174 -#, fuzzy msgid "unterminated address regex" -msgstr "Indirizzo della regex non terminato" +msgstr "espressione regolare non terminata nell'indirizzo" # sed/compile.c:180 #: sed/compile.c:175 -#, fuzzy msgid "unterminated `s' command" -msgstr "Comando `s' non terminato" +msgstr "comando `s' non terminato" # sed/compile.c:181 #: sed/compile.c:176 -#, fuzzy msgid "unterminated `y' command" -msgstr "Comando `y' non terminato" +msgstr "comando `y' non terminato" # sed/compile.c:182 #: sed/compile.c:177 -#, fuzzy msgid "unknown option to `s'" -msgstr "Opzione di `s' sconosciuta" +msgstr "opzione di `s' sconosciuta" # sed/compile.c:183 #: sed/compile.c:178 @@ -165,17 +151,11 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: espressione -e #%lu, carattere %lu: %s\n" -# sed/compile.c:233 -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Chiamata savchar() con un pushback inatteso (%x)" - # sed/compile.c:1543 #: sed/compile.c:1644 #, c-format -msgid "Can't find label for jump to `%s'" -msgstr "Impossibile trovare un'etichetta per il salto a `%s'" +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:649 @@ -183,53 +163,53 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: impossibile leggere %s: %s\n" -# lib/utils.c:131 -#: sed/execute.c:685 lib/utils.c:196 +# sed/execute.c:675 +#: sed/execute.c:672 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Impossibile aprire il file temporaneo %s: %s" +msgid "couldn't edit %s: is a terminal" +msgstr "impossibile modificare %s: un terminale" -# sed/execute.c:722 -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "INTERNAL ERROR: bad address type" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "impossibile modificare %s: non un file normale" + +# lib/utils.c:131 +#: sed/execute.c:683 lib/utils.c:196 +#, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "impossibile aprire il file temporaneo %s: %s" # sed/execute.c:1003 sed/execute.c:1183 -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "errore in un sottoprocesso" # sed/execute.c:1005 -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "opzione `e' non supportata" # sed/execute.c:1185 -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "comando `e' non supportato" -# sed/execute.c:1415 -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "INTERNAL ERROR: Bad cmd %c" - # lib/regcomp.c:658 sed/regex.c:47 -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" -msgstr "Occorre un'espressione regolare precedente" +#: sed/regexp.c:39 +msgid "no previous regular expression" +msgstr "occorre un'espressione regolare precedente" # sed/regex.c:48 #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" -msgstr "Non e' possibile specificare dei modificatori per l'espressione vuota" +msgid "cannot specify modifiers on empty regexp" +msgstr "non possibile specificare dei modificatori per l'espressione vuota" # sed/regex.c:146 #: sed/regexp.c:134 #, c-format -msgid "Invalid reference \\%d on `s' command's RHS" -msgstr "Riferimento non valido \\%d nel secondo membro del comando `s'" +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:96 @@ -407,15 +387,15 @@ # sed/execute.c:516 #: lib/utils.c:98 lib/utils.c:336 -#, fuzzy, c-format +#, c-format msgid "cannot remove %s: %s" -msgstr "%s: impossibile leggere %s: %s\n" +msgstr "impossibile rimuovere %s: %s" # lib/utils.c:131 #: lib/utils.c:143 #, c-format -msgid "Couldn't open file %s: %s" -msgstr "Impossibile aprire il file %s: %s" +msgid "couldn't open file %s: %s" +msgstr "impossibile aprire il file %s: %s" # lib/utils.c:161 #: lib/utils.c:220 @@ -433,9 +413,9 @@ # sed/execute.c:516 #: lib/utils.c:341 -#, fuzzy, c-format +#, c-format msgid "cannot rename %s: %s" -msgstr "%s: impossibile leggere %s: %s\n" +msgstr "impossibile rinominare %s: %s" # lib/regcomp.c:179 #: lib/regcomp.c:150 @@ -521,3 +501,8 @@ #: lib/regcomp.c:198 msgid "Unmatched ) or \\)" msgstr "`)' o `\\)' non bilanciata" + +# lib/regcomp.c:658 sed/regex.c:47 +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Occorre un'espressione regolare precedente" Binary files sed-4.1/po/ja.gmo and sed-4.1.1/po/ja.gmo differ diff -ru sed-4.1/po/ja.po sed-4.1.1/po/ja.po --- sed-4.1/po/ja.po 2004-04-23 22:09:00.000000000 +0200 +++ sed-4.1.1/po/ja.po 2004-07-06 09:24:34.000000000 +0200 @@ -9,14 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0.6\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2004-04-21 23:53+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=1; plural=0;\n" #: sed/compile.c:162 @@ -146,14 +146,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e 表現 #%lu, 文字数 %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "押戻しを予期せずにsavchar()が呼ばれました (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "`%s'へのジャンプのラベルが見つかりません" #: sed/execute.c:649 @@ -161,43 +156,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: %sを読み込めません: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "ファイル%sを開けませんでした: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "一時ファイルを開けませんでした: %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "内部エラー: 不正アドレス型" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "一時ファイルを開けませんでした: %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "子プロセスのエラー" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "eオプションは、サポートされていません" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "eコマンドは、サポートされていません" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "内部エラー: 不正コマンド %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "直前の正規表現が、ありません" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "修飾子は、空の正規表現に指定できません" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "「s」コマンドの右側に無効な\\%dの参照" #: sed/sed.c:96 @@ -352,8 +350,8 @@ msgstr "%s: %sを読み込めません: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "ファイル%sを開けませんでした: %s" #: lib/utils.c:220 @@ -441,6 +439,22 @@ msgid "Unmatched ) or \\)" msgstr ")や\\)が一致しません" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "直前の正規表現が、ありません" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "一時ファイルを開けませんでした: %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "押戻しを予期せずにsavchar()が呼ばれました (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "内部エラー: 不正アドレス型" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "内部エラー: 不正コマンド %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/ko.gmo and sed-4.1.1/po/ko.gmo differ diff -ru sed-4.1/po/ko.po sed-4.1.1/po/ko.po --- sed-4.1/po/ko.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/ko.po 2004-07-06 09:24:34.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2001-10-12 17:26+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-KR\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #: sed/compile.c:162 #, fuzzy @@ -140,14 +140,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expression #%lu, char %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "森雌帖 公廃 pushback (%x) 引 敗臆 savchar() 亜 硲窒鞠醸柔艦陥" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "`%s' (生)稽 繊覗拝 傾戚鷺聖 達聖 呪 蒸柔艦陥" #: sed/execute.c:649 @@ -155,43 +150,44 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: %s (聖)研 石聖 呪 蒸製: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "%s 督析聖 伸 呪 蒸柔艦陥" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "鎧採 神嫌: 設公吉 爽社 政莫脊艦陥" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "%s 督析聖 伸 呪 蒸柔艦陥" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "鎧採 神嫌: %c (精)澗 設公吉 誤敬脊艦陥" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +msgid "no previous regular expression" msgstr "" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +msgid "cannot specify modifiers on empty regexp" msgstr "" #: sed/regexp.c:134 #, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +msgid "invalid reference \\%d on `s' command's RHS" msgstr "" #: sed/sed.c:96 @@ -330,7 +326,7 @@ #: lib/utils.c:143 #, fuzzy, c-format -msgid "Couldn't open file %s: %s" +msgid "couldn't open file %s: %s" msgstr "%s 督析聖 伸 呪 蒸柔艦陥" #: lib/utils.c:220 @@ -422,6 +418,23 @@ msgid "Unmatched ) or \\)" msgstr "`{' 亜 析帖馬走 省柔艦陥" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "%s 督析聖 伸 呪 蒸柔艦陥" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "森雌帖 公廃 pushback (%x) 引 敗臆 savchar() 亜 硲窒鞠醸柔艦陥" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "鎧採 神嫌: 設公吉 爽社 政莫脊艦陥" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "鎧採 神嫌: %c (精)澗 設公吉 誤敬脊艦陥" + #, fuzzy #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" Binary files sed-4.1/po/nl.gmo and sed-4.1.1/po/nl.gmo differ diff -ru sed-4.1/po/nl.po sed-4.1.1/po/nl.po --- sed-4.1/po/nl.po 2004-04-23 22:09:00.000000000 +0200 +++ sed-4.1.1/po/nl.po 2004-07-06 09:24:34.000000000 +0200 @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2004-04-09 21:39+0200\n" "Last-Translator: Elros Cyriatan \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: sed/compile.c:162 @@ -144,14 +144,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e uitdrukking #%lu, teken %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "savchar() aangeroepen met onverwachte pushback (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Kan label voor sprong naar `%s' niet vinden" #: sed/execute.c:649 @@ -159,43 +154,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: kan %s niet lezen: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Kon bestand %s niet openen: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Kon tijdelijk bestand %s niet openen: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "INTERNE FOUT: slechte adressoort" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Kon tijdelijk bestand %s niet openen: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "fout in deelproces" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "optie `e' niet ondersteund" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "`e'-opdracht niet ondersteund" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "INTERNE FOUT: Slechte opdracht %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Geen eerdere reguliere uitdrukking" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Kan geen veranderaars opgeven op lege reguliere uitdrukking" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Ongeldige verwijzing \\%d op rechterhandzijde van `s'-opdracht" #: sed/sed.c:96 @@ -343,8 +341,8 @@ msgstr "%s: kan %s niet lezen: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Kon bestand %s niet openen: %s" #: lib/utils.c:220 @@ -432,6 +430,22 @@ msgid "Unmatched ) or \\)" msgstr "Niet-overeenkomende ) of \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Geen eerdere reguliere uitdrukking" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Kon tijdelijk bestand %s niet openen: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "savchar() aangeroepen met onverwachte pushback (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "INTERNE FOUT: slechte adressoort" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "INTERNE FOUT: Slechte opdracht %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/pl.gmo and sed-4.1.1/po/pl.gmo differ diff -ru sed-4.1/po/pl.po sed-4.1.1/po/pl.po --- sed-4.1/po/pl.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/pl.po 2004-07-06 09:24:34.000000000 +0200 @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-10-25 01:24+0200\n" "Last-Translator: Wojciech Polak \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -144,14 +144,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e wyraenie #%lu, znak %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Wywoano funkcj savchar() z nieoczekiwanym zwrotem (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Nie mona znale惹 etykiety dla skoku do `%s'" #: sed/execute.c:649 @@ -159,43 +154,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: nie mona odczyta %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Nie mona otworzy pliku %s: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Nie mona otworzy tymczasowego pliku %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "WEWNTRZNY BD: nieprawidowy typ adresu" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Nie mona otworzy tymczasowego pliku %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "b咳d w podprocesie" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "opcja `e' nie jest wspierana" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "polecenie `e' nie jest wspierane" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "WEWNTRZNY BD: Nieprawidowe polecenie %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Brak poprzedniego wyraenia regularnego" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Nie mona wyszczeglni modyfikatorw w pustym wyraeniu regularnym" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Nieprawidowe odwoanie \\%d po prawej stronie polecenia `s'" #: sed/sed.c:96 @@ -343,8 +341,8 @@ msgstr "%s: nie mona odczyta %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Nie mona otworzy pliku %s: %s" #: lib/utils.c:220 @@ -433,6 +431,22 @@ msgid "Unmatched ) or \\)" msgstr "Niedopasowany znak ) lub \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Brak poprzedniego wyraenia regularnego" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Nie mona otworzy tymczasowego pliku %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Wywoano funkcj savchar() z nieoczekiwanym zwrotem (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "WEWNTRZNY BD: nieprawidowy typ adresu" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "WEWNTRZNY BD: Nieprawidowe polecenie %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/pt_BR.gmo and sed-4.1.1/po/pt_BR.gmo differ diff -ru sed-4.1/po/pt_BR.po sed-4.1.1/po/pt_BR.po --- sed-4.1/po/pt_BR.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/pt_BR.po 2004-07-06 09:24:34.000000000 +0200 @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.1\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2002-11-08 17:44-0300\n" "Last-Translator: Aurlio Marinho Jargas \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: sed/compile.c:162 @@ -145,14 +145,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expresso #%lu, caractere %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Foi chamado savchar() com um retorno (%x) no esperado" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "No foi possvel encontrar a marca艫o `%s'" #: sed/execute.c:649 @@ -160,43 +155,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: no foi possvel ler %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "No foi possvel abrir o arquivo %s: %s" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "ERRO INTERNO: tipo invlido de endereo" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "No foi possvel abrir o arquivo %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "erro no subprocesso" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "op艫o `e' no suportada" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "comando `e' no suportado" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "ERRO INTERNO: Comando invlido %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "No h expresso regular anterior" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "No permitido especificar modificadores numa expresso regular vazia" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Referncia invlida \\%d na segunda parte do comando `s'" #: sed/sed.c:96 @@ -341,8 +339,8 @@ msgstr "%s: no foi possvel ler %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "No foi possvel abrir o arquivo %s: %s" #: lib/utils.c:220 @@ -430,6 +428,23 @@ msgid "Unmatched ) or \\)" msgstr ") or \\) inesperado" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "No h expresso regular anterior" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "No foi possvel abrir o arquivo %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Foi chamado savchar() com um retorno (%x) no esperado" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "ERRO INTERNO: tipo invlido de endereo" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "ERRO INTERNO: Comando invlido %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/ro.gmo and sed-4.1.1/po/ro.gmo differ diff -ru sed-4.1/po/ro.po sed-4.1.1/po/ro.po --- sed-4.1/po/ro.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/ro.po 2004-07-06 09:24:35.000000000 +0200 @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-11-22 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -144,14 +144,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e expresia #%lu, caracterul %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "savchar() a fost chemat cu pushback (%x) neateptat" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Nu pot gsi eticheta pentru saltul la `%s'" #: sed/execute.c:649 @@ -159,43 +154,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: nu pot citi %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Nu am putut deschide fiierul %s: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Nu am putut deschide fiierul temporar %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "EROARE INTERN: tip de adres incorect" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Nu am putut deschide fiierul temporar %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "eroare n subproces" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "opiunea `e' nu e suportat" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "comanda `e' nu e suportat" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "EROARE INTERN: comand incorect %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Nici o expresie regular anterioar" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Nu se pot specifica modificatori pentru regexp vid" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Referin invalid \\%d pentru RHS-ul comanzii `s'" #: sed/sed.c:96 @@ -343,8 +341,8 @@ msgstr "%s: nu pot citi %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Nu am putut deschide fiierul %s: %s" #: lib/utils.c:220 @@ -432,6 +430,22 @@ msgid "Unmatched ) or \\)" msgstr ") sau \\) fr pereche" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Nici o expresie regular anterioar" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Nu am putut deschide fiierul temporar %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "savchar() a fost chemat cu pushback (%x) neateptat" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "EROARE INTERN: tip de adres incorect" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "EROARE INTERN: comand incorect %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/ru.gmo and sed-4.1.1/po/ru.gmo differ diff -ru sed-4.1/po/ru.po sed-4.1.1/po/ru.po --- sed-4.1/po/ru.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/ru.po 2004-07-06 09:24:35.000000000 +0200 @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: sed-4.0.5\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\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" -"Report-Msgid-Bugs-To: \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" @@ -144,14 +144,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e 忸卅崚良 #%lu, 喇要鰐 %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "耨遼檀 savchar() 療 嫩遡腕 從旌卅塢墮 喇要鰐 (%x) 從 徃歪力 佻塹" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "酖 料閉杜 妖塰 通 佚凖範珍 `%s'" #: sed/execute.c:649 @@ -159,43 +154,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: 柯陀 湟杜頻 %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "酖 嫩遡腕 塰燮墮 徳別 %s: %s" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "銛鱚銕髑 陋蛯諱: 療掴侖嘖浜拱 塢 祖凖啻" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "酖 嫩遡腕 塰燮墮 徳別 %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "柯陀 掴淌厠斗 侑話途單" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "仭卅妖墟 `e' 療 佻陳賭嵒彖都嗔" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "墨輿猟 `e' 療 佻陳賭嵒彖都嗔" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "銛鱚銕髑 陋蛯諱: 療掴侖嘖浜叢 墨輿猟 `%c'" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "酖 侑田拂斈吐 凖杯妄厠惑 忸卅崚良" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "酖從斃嵶 嬲惣壮 溶追読冒塹 通 侖嘖惑 凖杯妄厠惑 忸卅崚良" #: sed/regexp.c:134 #, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +msgid "invalid reference \\%d on `s' command's RHS" msgstr "" #: sed/sed.c:96 @@ -334,8 +332,8 @@ msgstr "%s: 柯陀 湟杜頻 %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "酖 嫩遡腕 塰燮墮 徳別 %s: %s" #: lib/utils.c:220 @@ -424,6 +422,24 @@ msgid "Unmatched ) or \\)" msgstr "酖仭厠拱 喇要鰐 `)' 斌 `\\)'" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "酖 侑田拂斈吐 凖杯妄厠惑 忸卅崚良" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "酖 嫩遡腕 塰燮墮 徳別 %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "" +#~ "耨遼檀 savchar() 療 嫩遡腕 從旌卅塢墮 喇要鰐 (%x) 從 徃歪力 佻塹" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "銛鱚銕髑 陋蛯諱: 療掴侖嘖浜拱 塢 祖凖啻" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "銛鱚銕髑 陋蛯諱: 療掴侖嘖浜叢 墨輿猟 `%c'" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" diff -ru sed-4.1/po/sed.pot sed-4.1.1/po/sed.pot --- sed-4.1/po/sed.pot 2004-03-26 19:48:59.000000000 +0100 +++ sed-4.1.1/po/sed.pot 2004-07-01 18:32:10.000000000 +0200 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -127,14 +127,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "" - #: sed/compile.c:1644 #, c-format -msgid "Can't find label for jump to `%s'" +msgid "can't find label for jump to `%s'" msgstr "" #: sed/execute.c:649 @@ -142,43 +137,44 @@ msgid "%s: can't read %s: %s\n" msgstr "" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, c-format +msgid "couldn't open temporary file %s: %s" msgstr "" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +msgid "no previous regular expression" msgstr "" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +msgid "cannot specify modifiers on empty regexp" msgstr "" #: sed/regexp.c:134 #, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +msgid "invalid reference \\%d on `s' command's RHS" msgstr "" #: sed/sed.c:96 @@ -311,7 +307,7 @@ #: lib/utils.c:143 #, c-format -msgid "Couldn't open file %s: %s" +msgid "couldn't open file %s: %s" msgstr "" #: lib/utils.c:220 @@ -398,3 +394,7 @@ #: lib/regcomp.c:198 msgid "Unmatched ) or \\)" msgstr "" + +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "" Binary files sed-4.1/po/sk.gmo and sed-4.1.1/po/sk.gmo differ diff -ru sed-4.1/po/sk.po sed-4.1.1/po/sk.po --- sed-4.1/po/sk.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/sk.po 2004-07-06 09:24:35.000000000 +0200 @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-10-25 17:22+0200\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" #: sed/compile.c:162 @@ -143,14 +143,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e v箪raz #%lu, znak %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Bolo volan辿 savchar() s neakan箪m pushback (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "N叩vestie pre skok na `%s' nie je mo転n辿 n叩js泥?" #: sed/execute.c:649 @@ -158,43 +153,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: %s nie je mo転n辿 鱈ta泥: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Nebolo mo転n辿 otvori泥 s炭bor %s: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Nebolo mo転n辿 otvori泥 doasn箪 s炭bor %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "INTERN CHYBA: zl箪 typ adresy" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Nebolo mo転n辿 otvori泥 doasn箪 s炭bor %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "chyba v podprocese" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "vo直ba `e' nie je podporovan叩" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "pr鱈kaz `e' nie je podporovan箪" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "INTERN CHYBA: zl箪 pr鱈kaz %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Bez predch叩dzaj炭ceho regul叩rneho v箪razu" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Nie je mo転n辿 zada泥 modifik叩tory pre pr叩zdny regul叩rny v箪raz" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Neplatn箪 odkaz \\%d na `s' pr鱈kazu RHS" #: sed/sed.c:96 @@ -342,8 +340,8 @@ msgstr "%s: %s nie je mo転n辿 鱈ta泥: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Nebolo mo転n辿 otvori泥 s炭bor %s: %s" #: lib/utils.c:220 @@ -432,6 +430,22 @@ msgid "Unmatched ) or \\)" msgstr "Nezodpovedaj炭ca ) alebo \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Bez predch叩dzaj炭ceho regul叩rneho v箪razu" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Nebolo mo転n辿 otvori泥 doasn箪 s炭bor %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Bolo volan辿 savchar() s neakan箪m pushback (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "INTERN CHYBA: zl箪 typ adresy" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "INTERN CHYBA: zl箪 pr鱈kaz %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/sl.gmo and sed-4.1.1/po/sl.gmo differ diff -ru sed-4.1/po/sl.po sed-4.1.1/po/sl.po --- sed-4.1/po/sl.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/sl.po 2004-07-06 09:24:35.000000000 +0200 @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.6\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-04-02 17:20+0200\n" "Last-Translator: Primo Peterlin \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" @@ -144,14 +144,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e izraz #%lu, znak %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Klic savchar() z nepriakovanim pushback (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Oznake za skok na \"%s\" ni mono najti" #: sed/execute.c:649 @@ -159,43 +154,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: %s ni mono prebrati: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "Datoteke %s ni mogoe odpreti: %s" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "INTERNA NAPAKA: pokvarjen tip naslova" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Datoteke %s ni mogoe odpreti: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "Napaka v podprocesu" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "Izbira ,e` ni podprta" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "Ukaz ,e` ni podprt" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "INTERNA NAPAKA: Pokvarjen ukaz %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Prejnji regularni izraz manjka" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Doloanje modifikatorjev pri praznem regularnem izrazu ni mogoe" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Neveljavni sklic \\%d na desni strani ukaza ,s`" #: sed/sed.c:96 @@ -341,8 +339,8 @@ msgstr "%s: %s ni mono prebrati: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Datoteke %s ni mogoe odpreti: %s" #: lib/utils.c:220 @@ -432,6 +430,23 @@ msgid "Unmatched ) or \\)" msgstr "Oklepaj ) ali \\) brez zaklepaja" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Prejnji regularni izraz manjka" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Datoteke %s ni mogoe odpreti: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Klic savchar() z nepriakovanim pushback (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "INTERNA NAPAKA: pokvarjen tip naslova" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "INTERNA NAPAKA: Pokvarjen ukaz %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/sr.gmo and sed-4.1.1/po/sr.gmo differ diff -ru sed-4.1/po/sr.po sed-4.1.1/po/sr.po --- sed-4.1/po/sr.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/sr.po 2004-07-06 09:24:35.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2004-01-13 22:51-0500\n" "Last-Translator: Aleksandar Jelenak \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \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" @@ -143,15 +143,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e 亳亰舒亰 #%lu, 亰仆舒从 %lu: %s\n" -# 丐舒亢亳 亠 弍仂亳 仗亠于仂亟 亰舒 pushback. -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "仂亰于舒仆 savchar() 舒 仆亠仂亠从亳于舒仆仂仄 于亠亟仆仂 舒亞仄亠仆舒 (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "亠 仄仂亞 亟舒 仆舒亠仄 仂亰仆舒从 亰舒 从仂从 仆舒 %s" #: sed/execute.c:649 @@ -159,43 +153,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: 仆亠 仄仂亢亠 亳舒亳 %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "亠 仄仂亢亠 亠 仂于仂亳亳 亟舒仂亠从舒 %s: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "亠 仄仂亞 仂于仂亳亳 仗亳于亠仄亠仆 亟舒仂亠从 %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "丕丕丐丿 丿: 仍仂舒 于舒 舒亟亠亠" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "亠 仄仂亞 仂于仂亳亳 仗亳于亠仄亠仆 亟舒仂亠从 %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "亞亠从舒 仗仂仗仂亠" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "仂仗亳舒 e 仆亳亠 仗仂亟亢舒仆舒" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "仆舒亠亟弍舒 e 仆亳亠 仗仂亟亢舒仆舒" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "丕丕丐丿 丿: 仂舒 仆舒亠亟弍舒 %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "亠亰 仗亠仂亟仆仂亞 亠亞仍舒仆仂亞 亳亰舒亰舒" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "亠 仄仂亢亠 亠 仆舒于亠亳 亳亰仄亠亳于舒 仗舒亰仆仂仄 亠亞. 亳亰舒亰" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "亠亳仗舒于仆舒 亠亠亠仆舒 \\%d 仆舒 亟亠仆仂 舒仆亳 仆舒亠亟弍亠 s" #: sed/sed.c:96 @@ -340,8 +337,8 @@ msgstr "%s: 仆亠 仄仂亢亠 亳舒亳 %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "亠 仄仂亢亠 亠 仂于仂亳亳 亟舒仂亠从舒 %s: %s" #: lib/utils.c:220 @@ -430,6 +427,23 @@ msgid "Unmatched ) or \\)" msgstr "亠仗舒亠仆仂 ) 亳仍亳 \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "亠亰 仗亠仂亟仆仂亞 亠亞仍舒仆仂亞 亳亰舒亰舒" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "亠 仄仂亞 仂于仂亳亳 仗亳于亠仄亠仆 亟舒仂亠从 %s: %s" + +# 丐舒亢亳 亠 弍仂亳 仗亠于仂亟 亰舒 pushback. +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "仂亰于舒仆 savchar() 舒 仆亠仂亠从亳于舒仆仂仄 于亠亟仆仂 舒亞仄亠仆舒 (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "丕丕丐丿 丿: 仍仂舒 于舒 舒亟亠亠" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "丕丕丐丿 丿: 仂舒 仆舒亠亟弍舒 %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/sv.gmo and sed-4.1.1/po/sv.gmo differ diff -ru sed-4.1/po/sv.po sed-4.1.1/po/sv.po --- sed-4.1/po/sv.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/sv.po 2004-07-06 09:24:35.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-10-24 19:21+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -142,14 +142,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e uttryck #%lu, tecken %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "Anropade savchar() med ovntat returtecken (%x)" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "Kan inte hitta etiketten fr hopp till \"%s\"" #: sed/execute.c:649 @@ -157,43 +152,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: kan inte lsa %s: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 +#, fuzzy, c-format +msgid "couldn't edit %s: is a terminal" +msgstr "Kunde inte ppna filen %s: %s" + +#: sed/execute.c:676 #, c-format -msgid "Couldn't open temporary file %s: %s" -msgstr "Kunde inte ppna temporra filen %s: %s" +msgid "couldn't edit %s: not a regular file" +msgstr "" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "INTERNT FEL: felaktig addresstyp" +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "Kunde inte ppna temporra filen %s: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "fel i underprocess" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "flaggan \"e\" stds inte" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "kommandot \"e\" stds inte" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "INTERNT FEL: Felaktigt kommando %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Inget tidigare reguljrt uttryck" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Kan inte ange modifierare p tomt reguljrt uttryck" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "Ogiltig referens \\%d p \"s\"-kommandots RHS" #: sed/sed.c:96 @@ -342,8 +340,8 @@ msgstr "%s: kan inte lsa %s: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "Kunde inte ppna filen %s: %s" #: lib/utils.c:220 @@ -431,6 +429,22 @@ msgid "Unmatched ) or \\)" msgstr "Ensamt ) eller \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Inget tidigare reguljrt uttryck" + +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "Kunde inte ppna temporra filen %s: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "Anropade savchar() med ovntat returtecken (%x)" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "INTERNT FEL: felaktig addresstyp" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "INTERNT FEL: Felaktigt kommando %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/tr.gmo and sed-4.1.1/po/tr.gmo differ diff -ru sed-4.1/po/tr.po sed-4.1.1/po/tr.po --- sed-4.1/po/tr.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/tr.po 2004-07-06 09:24:36.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.7\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2003-07-12 13:05+0300\n" "Last-Translator: Deniz Akkus Kanca \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 1.0\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -143,14 +143,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s: -e ifade #%lu, harf %lu: %s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "savchar() beklenmeyen geri itme (%x) ile 巽ar脹lm脹" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "`%s'e atlamak i巽in etiket bulunam脹yor" #: sed/execute.c:649 @@ -158,43 +153,46 @@ msgid "%s: can't read %s: %s\n" msgstr "%s: %s okunam脹yor: %s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "%s dosyas脹 a巽脹lamad脹: %s" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "聴 HATA: Hatal脹 adres t端r端" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "%s dosyas脹 a巽脹lamad脹: %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "alts端re巽te hata" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr " e' se巽enei desteklenmiyor" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "`e' komutu desteklenmiyor" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "聴 HATA: Hatal脹 komut %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +#, fuzzy +msgid "no previous regular expression" msgstr "Daha 旦nce d端zenli ifade yok" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +#, fuzzy +msgid "cannot specify modifiers on empty regexp" msgstr "Bo d端zenli ifadeye deitirici atanamaz" #: sed/regexp.c:134 -#, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +#, fuzzy, c-format +msgid "invalid reference \\%d on `s' command's RHS" msgstr "`s' komutunun RHS'sinde ge巽ersiz \\%d referans脹" #: sed/sed.c:96 @@ -340,8 +338,8 @@ msgstr "%s: %s okunam脹yor: %s\n" #: lib/utils.c:143 -#, c-format -msgid "Couldn't open file %s: %s" +#, fuzzy, c-format +msgid "couldn't open file %s: %s" msgstr "%s dosyas脹 a巽脹lamad脹: %s" #: lib/utils.c:220 @@ -437,6 +435,23 @@ msgid "Unmatched ) or \\)" msgstr "Elemeyen ) or \\)" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "Daha 旦nce d端zenli ifade yok" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "%s dosyas脹 a巽脹lamad脹: %s" + +#~ msgid "Called savchar() with unexpected pushback (%x)" +#~ msgstr "savchar() beklenmeyen geri itme (%x) ile 巽ar脹lm脹" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "聴 HATA: Hatal脹 adres t端r端" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "聴 HATA: Hatal脹 komut %c" + #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" #~ "\n" Binary files sed-4.1/po/zh_CN.gmo and sed-4.1.1/po/zh_CN.gmo differ diff -ru sed-4.1/po/zh_CN.po sed-4.1.1/po/zh_CN.po --- sed-4.1/po/zh_CN.po 2004-03-26 19:49:00.000000000 +0100 +++ sed-4.1.1/po/zh_CN.po 2004-07-06 09:24:36.000000000 +0200 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" -"POT-Creation-Date: 2004-03-26 19:48+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-01 18:32+0200\n" "PO-Revision-Date: 2002-08-18 11:11+0800\n" "Last-Translator: Wang Li \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=gb2312\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #: sed/compile.c:162 #, fuzzy @@ -140,14 +140,9 @@ msgid "%s: -e expression #%lu, char %lu: %s\n" msgstr "%s-e 燕器塀 #%lu忖憲 %lu%s\n" -#: sed/compile.c:258 -#, c-format -msgid "Called savchar() with unexpected pushback (%x)" -msgstr "" - #: sed/compile.c:1644 -#, c-format -msgid "Can't find label for jump to `%s'" +#, fuzzy, c-format +msgid "can't find label for jump to `%s'" msgstr "涙隈葎朕議葎＾%s￣議柳廬孀欺炎禰" #: sed/execute.c:649 @@ -155,43 +150,44 @@ msgid "%s: can't read %s: %s\n" msgstr "%s採涎╋組 %s%s\n" -#: sed/execute.c:685 lib/utils.c:196 +#: sed/execute.c:672 #, fuzzy, c-format -msgid "Couldn't open temporary file %s: %s" +msgid "couldn't edit %s: is a terminal" msgstr "涙隈嬉蝕猟周 %s" -#: sed/execute.c:863 -msgid "INTERNAL ERROR: bad address type" -msgstr "坪何危列佐輓鶺諜慟契猥" +#: sed/execute.c:676 +#, c-format +msgid "couldn't edit %s: not a regular file" +msgstr "" + +#: sed/execute.c:683 lib/utils.c:196 +#, fuzzy, c-format +msgid "couldn't open temporary file %s: %s" +msgstr "涙隈嬉蝕猟周 %s" -#: sed/execute.c:1200 sed/execute.c:1381 +#: sed/execute.c:1207 sed/execute.c:1388 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1202 +#: sed/execute.c:1209 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1383 +#: sed/execute.c:1390 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1622 -#, c-format -msgid "INTERNAL ERROR: Bad cmd %c" -msgstr "坪何危列佐輓鶺鎮綜 %c" - -#: sed/regexp.c:39 lib/regcomp.c:672 -msgid "No previous regular expression" +#: sed/regexp.c:39 +msgid "no previous regular expression" msgstr "" #: sed/regexp.c:40 -msgid "Cannot specify modifiers on empty regexp" +msgid "cannot specify modifiers on empty regexp" msgstr "" #: sed/regexp.c:134 #, c-format -msgid "Invalid reference \\%d on `s' command's RHS" +msgid "invalid reference \\%d on `s' command's RHS" msgstr "" #: sed/sed.c:96 @@ -326,7 +322,7 @@ #: lib/utils.c:143 #, fuzzy, c-format -msgid "Couldn't open file %s: %s" +msgid "couldn't open file %s: %s" msgstr "涙隈嬉蝕猟周 %s" #: lib/utils.c:220 @@ -418,6 +414,20 @@ msgid "Unmatched ) or \\)" msgstr "隆謄塘議＾{￣" +#: lib/regcomp.c:672 +msgid "No previous regular expression" +msgstr "" + +#, fuzzy +#~ msgid "Couldn't open temporary file %s: %s" +#~ msgstr "涙隈嬉蝕猟周 %s" + +#~ msgid "INTERNAL ERROR: bad address type" +#~ msgstr "坪何危列佐輓鶺諜慟契猥" + +#~ msgid "INTERNAL ERROR: Bad cmd %c" +#~ msgstr "坪何危列佐輓鶺鎮綜 %c" + #, fuzzy #~ msgid "" #~ "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" diff -ru sed-4.1/sed/Makefile.in sed-4.1.1/sed/Makefile.in --- sed-4.1/sed/Makefile.in 2004-06-13 08:31:34.000000000 +0200 +++ sed-4.1.1/sed/Makefile.in 2004-07-06 09:19:50.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ mkinstalldirs = $(mkdir_p) CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__installdirs = $(DESTDIR)$(bindir) +am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_sed_OBJECTS = sed.$(OBJEXT) compile.$(OBJEXT) execute.$(OBJEXT) \ @@ -111,6 +111,7 @@ GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE__BOOL = @HAVE__BOOL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -235,14 +236,14 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(bindir) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -250,8 +251,8 @@ @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ done clean-binPROGRAMS: @@ -310,9 +311,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -367,7 +370,9 @@ check: check-am all-am: Makefile $(PROGRAMS) $(HEADERS) installdirs: - $(mkdir_p) $(DESTDIR)$(bindir) + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am diff -ru sed-4.1/sed/compile.c sed-4.1.1/sed/compile.c --- sed-4.1/sed/compile.c 2004-01-21 00:16:16.000000000 +0100 +++ sed-4.1.1/sed/compile.c 2004-06-29 20:05:21.000000000 +0200 @@ -255,7 +255,7 @@ if (prog.cur) { if (prog.cur <= prog.base || *--prog.cur != ch) - panic(_("Called savchar() with unexpected pushback (%x)"), + panic("Called savchar() with unexpected pushback (%x)", CAST(unsigned char)ch); } else @@ -588,8 +588,8 @@ return NULL; } -static bool mark_subst_opts P_((struct subst *cmd)); -static bool +static int mark_subst_opts P_((struct subst *cmd)); +static int mark_subst_opts(cmd) struct subst *cmd; { @@ -1641,7 +1641,7 @@ else { if (*go->name) - panic(_("Can't find label for jump to `%s'"), go->name); + panic(_("can't find label for jump to `%s'"), go->name); program->v[go->v_index].x.jump_index = program->v_length; } } diff -ru sed-4.1/sed/execute.c sed-4.1.1/sed/execute.c --- sed-4.1/sed/execute.c 2004-03-13 10:30:39.000000000 +0100 +++ sed-4.1.1/sed/execute.c 2004-07-01 18:28:58.000000000 +0200 @@ -638,7 +638,7 @@ { buffer.length = 0; - if (name[0] == '-' && name[1] == '\0') + if (name[0] == '-' && name[1] == '\0' && !in_place_extension) { clearerr(stdin); /* clear any stale EOF indication */ input->fp = stdin; @@ -667,10 +667,22 @@ strcpy(tmpdir, "."); input->in_file_name = name; + + if (isatty (fileno (input->fp))) + panic(_("couldn't edit %s: is a terminal"), input->in_file_name); + + fstat (fileno (input->fp), &st); + if (!S_ISREG (st.st_mode)) + panic(_("couldn't edit %s: not a regular file"), input->in_file_name); + output_file.fp = ck_mkstemp (&input->out_file_name, tmpdir, "sed"); + output_file.missing_newline = false; free (tmpdir); - fstat (fileno (input->fp), &st); + if (!output_file.fp) + panic(_("couldn't open temporary file %s: %s"), input->out_file_name, strerror(errno)); + + output_fd = fileno (output_file.fp); #ifdef HAVE_FCHMOD fchmod (output_fd, st.st_mode); #endif @@ -678,11 +690,6 @@ if (fchown (output_fd, st.st_uid, st.st_gid) == -1) fchown (output_fd, -1, st.st_gid); #endif - - output_file.missing_newline = false; - - if (!output_file.fp) - panic(_("Couldn't open temporary file %s: %s"), input->out_file_name, strerror(errno)); } else output_file.fp = stdout; @@ -860,7 +867,7 @@ /* ADDR_IS_NUM is handled in match_address_p. */ case ADDR_IS_NUM: default: - panic(_("INTERNAL ERROR: bad address type")); + panic("INTERNAL ERROR: bad address type"); } /*NOTREACHED*/ return false; @@ -1619,7 +1626,7 @@ break; default: - panic(_("INTERNAL ERROR: Bad cmd %c"), cur_cmd->cmd); + panic("INTERNAL ERROR: Bad cmd %c", cur_cmd->cmd); } } diff -ru sed-4.1/sed/regexp.c sed-4.1.1/sed/regexp.c --- sed-4.1/sed/regexp.c 2004-03-05 20:18:21.000000000 +0100 +++ sed-4.1.1/sed/regexp.c 2004-06-29 20:06:52.000000000 +0200 @@ -32,12 +32,12 @@ extern bool use_extended_syntax_p; static const char errors[] = - "No previous regular expression\0" - "Cannot specify modifiers on empty regexp"; + "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"))) +#define BAD_MODIF (NO_REGEX + sizeof(N_("no previous regular expression"))) +#define END_ERRORS (BAD_MODIF + sizeof(N_("cannot specify modifiers on empty regexp"))) @@ -131,7 +131,7 @@ if (new_regex->re_nsub < needed_sub && posixicity == POSIXLY_EXTENDED) { char buf[200]; - sprintf(buf, _("Invalid reference \\%d on `s' command's RHS"), + sprintf(buf, _("invalid reference \\%d on `s' command's RHS"), needed_sub); bad_prog(buf); } diff -ru sed-4.1/testsuite/Makefile.in sed-4.1.1/testsuite/Makefile.in --- sed-4.1/testsuite/Makefile.in 2004-06-13 08:31:36.000000000 +0200 +++ sed-4.1.1/testsuite/Makefile.in 2004-07-06 09:19:53.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -194,6 +194,7 @@ GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE__BOOL = @HAVE__BOOL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -486,9 +487,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -567,20 +570,20 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$skipped"; \ fi; \ report=""; \ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ - test -n "$$skipped" && echo "$$skipped"; \ - test -n "$$report" && echo "$$report"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi diff -ru sed-4.1/testsuite/insens.sed sed-4.1.1/testsuite/insens.sed --- sed-4.1/testsuite/insens.sed 2003-12-18 14:50:23.000000000 +0100 +++ sed-4.1.1/testsuite/insens.sed 2004-06-29 20:00:53.000000000 +0200 @@ -1,6 +1,4 @@ -# Frank Kuester reported that this does not work but I -# could never reproduce it (Debian bug #224037) h s/Version: *//p g -s/Version: *//Ip +s/version: *//Ip