From a741f4405fbcf14e26e8226dedfea4bb9f2def28 Mon Sep 17 00:00:00 2001 From: Emilien Lemaire Date: Thu, 31 Aug 2023 15:30:47 +0200 Subject: [PATCH] Add libxlsxwriter handling --- ABOUT-NLS | 6 +- INSTALL | 6 +- build_aux/ar-lib | 2 +- build_aux/compile | 2 +- build_aux/config.guess | 56 +-- build_aux/config.rpath | 6 +- build_aux/config.sub | 47 +-- build_aux/depcomp | 6 +- build_aux/ltmain.sh | 862 +++++++++++++++++++++++++++-------------- build_aux/mdate-sh | 6 +- build_aux/missing | 6 +- build_aux/ylwrap | 6 +- cobc/cobc.h | 1 - cobc/codegen.c | 45 +-- cobc/flag.def | 3 + cobc/parser.y | 107 +++-- cobc/typeck.c | 2 +- configure.ac | 108 +++++- libcob/cobperf.c | 328 +++++++++++----- libcob/cobperf.h | 15 +- m4/libtool.m4 | 151 ++++---- m4/ltoptions.m4 | 4 +- m4/ltsugar.m4 | 2 +- m4/ltversion.m4 | 13 +- m4/lt~obsolete.m4 | 4 +- po/Makefile.in.in | 133 +++---- po/Rules-quot | 6 +- po/de.po | 219 ----------- po/es.po | 439 --------------------- po/insert-header.sin | 5 - po/remove-potcdate.sin | 8 +- 31 files changed, 1195 insertions(+), 1409 deletions(-) mode change 100644 => 100755 build_aux/ar-lib mode change 100755 => 100644 build_aux/ltmain.sh diff --git a/ABOUT-NLS b/ABOUT-NLS index 186a3c65c..3cc828658 100644 --- a/ABOUT-NLS +++ b/ABOUT-NLS @@ -110,7 +110,7 @@ people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of teams can be found at the Free Translation Project's homepage, -'https://translationproject.org/', in the "Teams" area. +'http://translationproject.org/', in the "Teams" area. If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. @@ -1357,7 +1357,7 @@ mere existence a PO file and its wide availability in a distribution. If Jun 2014 seems to be old, you may fetch a more recent copy of this 'ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at -'https://translationproject.org/extra/matrix.html'. +'http://translationproject.org/extra/matrix.html'. 1.5 Using 'gettext' in new packages =================================== @@ -1376,4 +1376,4 @@ Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact 'coordinator@translationproject.org' to make the '.pot' files available -to the translation teams. \ No newline at end of file +to the translation teams. diff --git a/INSTALL b/INSTALL index 8865734f8..e82fd21de 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* - Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software -Foundation, Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free +Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -225,7 +225,7 @@ order to use an ANSI C compiler: and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX 'make' updates targets which have the same time stamps as their + HP-UX 'make' updates targets which have the same timestamps as their prerequisites, which makes it generally unusable when shipped generated files such as 'configure' are involved. Use GNU 'make' instead. diff --git a/build_aux/ar-lib b/build_aux/ar-lib old mode 100644 new mode 100755 index be8806a2f..c349042c3 --- a/build_aux/ar-lib +++ b/build_aux/ar-lib @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2019-07-04.01; # UTC -# Copyright (C) 2010-2019 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify diff --git a/build_aux/compile b/build_aux/compile index 23fcba011..df363c8fb 100755 --- a/build_aux/compile +++ b/build_aux/compile @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff --git a/build_aux/config.guess b/build_aux/config.guess index 980b02083..e81d3ae7c 100755 --- a/build_aux/config.guess +++ b/build_aux/config.guess @@ -1,14 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-09-17' +timestamp='2021-06-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -437,7 +437,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # This test works for both compilers. if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 @@ -929,9 +929,6 @@ EOF i*:PW*:*) GUESS=$UNAME_MACHINE-pc-pw32 ;; - *:SerenityOS:*:*) - GUESS=$UNAME_MACHINE-pc-serenity - ;; *:Interix*:*) case $UNAME_MACHINE in x86) @@ -966,12 +963,6 @@ EOF GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; - x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) - GUESS="$UNAME_MACHINE-pc-managarm-mlibc" - ;; - *:[Mm]anagarm:*:*) - GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" - ;; *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix ;; @@ -1042,7 +1033,7 @@ EOF k1om:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:*) + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; m32r*:Linux:*:*) @@ -1157,27 +1148,16 @@ EOF ;; x86_64:Linux:*:*) set_cc_for_build - CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - ABI=64 - sed 's/^ //' << EOF > "$dummy.c" - #ifdef __i386__ - ABI=x86 - #else - #ifdef __ILP32__ - ABI=x32 - #endif - #endif -EOF - cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` - eval "$cc_set_abi" - case $ABI in - x86) CPU=i686 ;; - x32) LIBCABI=${LIBC}x32 ;; - esac + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + LIBCABI=${LIBC}x32 + fi fi - GUESS=$CPU-pc-linux-$LIBCABI + GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -1384,11 +1364,8 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. GUESS=i586-pc-haiku ;; - ppc:Haiku:*:*) # Haiku running on Apple PowerPC - GUESS=powerpc-apple-haiku - ;; - *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) - GUESS=$UNAME_MACHINE-unknown-haiku + x86_64:Haiku:*:*) + GUESS=x86_64-unknown-haiku ;; SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE @@ -1545,9 +1522,6 @@ EOF i*86:rdos:*:*) GUESS=$UNAME_MACHINE-pc-rdos ;; - i*86:Fiwix:*:*) - GUESS=$UNAME_MACHINE-pc-fiwix - ;; *:AROS:*:*) GUESS=$UNAME_MACHINE-unknown-aros ;; diff --git a/build_aux/config.rpath b/build_aux/config.rpath index 1e1ab6790..98183ff2f 100755 --- a/build_aux/config.rpath +++ b/build_aux/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2022 Free Software Foundation, Inc. +# Copyright 1996-2016 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # @@ -371,7 +371,7 @@ else hardcode_direct=yes hardcode_minus_L=yes ;; - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; @@ -547,7 +547,7 @@ case "$host_os" in freebsd[23].*) library_names_spec='$libname$shrext$versuffix' ;; - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) library_names_spec='$libname$shrext' ;; gnu*) diff --git a/build_aux/config.sub b/build_aux/config.sub index de4259e40..d74fb6dea 100755 --- a/build_aux/config.sub +++ b/build_aux/config.sub @@ -1,14 +1,14 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2023 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2023-01-21' +timestamp='2021-08-14' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -76,7 +76,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2023 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +145,7 @@ case $1 in nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*) + | storm-chaos* | os2-emx* | rtmk-nova*) basic_machine=$field1 basic_os=$maybe_os ;; @@ -1020,11 +1020,6 @@ case $cpu-$vendor in ;; # Here we normalize CPU types with a missing or matching vendor - armh-unknown | armh-alt) - cpu=armv7l - vendor=alt - basic_os=${basic_os:-linux-gnueabihf} - ;; dpx20-unknown | dpx20-bull) cpu=rs6000 vendor=bull @@ -1075,7 +1070,7 @@ case $cpu-$vendor in pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) + pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) cpu=i686 ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) @@ -1126,7 +1121,7 @@ case $cpu-$vendor in xscale-* | xscalee[bl]-*) cpu=`echo "$cpu" | sed 's/^xscale/arm/'` ;; - arm64-* | aarch64le-*) + arm64-*) cpu=aarch64 ;; @@ -1207,7 +1202,7 @@ case $cpu-$vendor in | k1om \ | le32 | le64 \ | lm32 \ - | loongarch32 | loongarch64 \ + | loongarch32 | loongarch64 | loongarchx32 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1309,7 +1304,7 @@ esac if test x$basic_os != x then -# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just +# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just # set os. case $basic_os in gnu/linux*) @@ -1341,10 +1336,6 @@ EOF kernel=linux os=`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; - managarm*) - kernel=managarm - os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'` - ;; *) kernel= os=$basic_os @@ -1757,8 +1748,7 @@ case $os in | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* | mlibc* ) + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1766,9 +1756,6 @@ case $os in ;; none) ;; - kernel* ) - # Restricted further below - ;; *) echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 exit 1 @@ -1779,26 +1766,16 @@ esac # (given a valid OS), if there is a kernel. case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) + | linux-musl* | linux-relibc* | linux-uclibc* ) ;; uclinux-uclibc* ) ;; - managarm-mlibc* | managarm-kernel* ) - ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 exit 1 ;; - -kernel* ) - echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2 - exit 1 - ;; - *-kernel* ) - echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2 - exit 1 - ;; kfreebsd*-gnu* | kopensolaris*-gnu*) ;; vxworks-simlinux | vxworks-simwindows | vxworks-spe) diff --git a/build_aux/depcomp b/build_aux/depcomp index 5ff3c6feb..715e34311 100755 --- a/build_aux/depcomp +++ b/build_aux/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2017-09-16.17; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 @@ -783,7 +783,7 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/build_aux/ltmain.sh b/build_aux/ltmain.sh old mode 100755 new mode 100644 index 9c3dc576e..550669344 --- a/build_aux/ltmain.sh +++ b/build_aux/ltmain.sh @@ -1,12 +1,12 @@ -#! /bin/sh +#! /usr/bin/env sh ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in -## by inline-source v2014-01-03.01 +## by inline-source v2019-02-19.15 -# libtool (GNU libtool) 2.4.6 +# libtool (GNU libtool) 2.4.7.4-1ec8f-dirty # Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996-2015, 2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -26,13 +26,13 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.6 -package_revision=2.4.6 +VERSION=2.4.7.4-1ec8f-dirty +package_revision=2.4.7.4 ## ------ ## @@ -64,34 +64,25 @@ package_revision=2.4.6 # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2015-01-20.17; # UTC +scriptversion=2019-02-19.15; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 -# Copyright (C) 2004-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. - -# As a special exception to the GNU General Public License, if you distribute -# this file as part of a program or library that is built using GNU Libtool, -# you may include this file under the same distribution terms that you use -# for the rest of that program. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2004-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# , and GPL version 2 or later +# . You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# Please report bugs or propose patches to gary@gnu.org. +# Please report bugs or propose patches to: +# ## ------ ## @@ -139,9 +130,12 @@ do _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# These NLS vars are set unconditionally (bootstrap issue #24). Unset those +# in case the environment reset is needed later and the $save_* variant is not +# defined (see the code above). +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL # Make sure IFS has a sensible default sp=' ' @@ -159,6 +153,26 @@ if test "${PATH_SEPARATOR+set}" != set; then fi +# func_unset VAR +# -------------- +# Portably unset VAR. +# In some shells, an 'unset VAR' statement leaves a non-zero return +# status if VAR is already unset, which might be problematic if the +# statement is used at the end of a function (thus poisoning its return +# value) or when 'set -e' is active (causing even a spurious abort of +# the script in this case). +func_unset () +{ + { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; } +} + + +# Make sure CDPATH doesn't cause `cd` commands to output the target dir. +func_unset CDPATH + +# Make sure ${,E,F}GREP behave sanely. +func_unset GREP_OPTIONS + ## ------------------------- ## ## Locate command utilities. ## @@ -259,7 +273,7 @@ test -z "$SED" && { rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" rm -f conftest.sed SED=$func_path_progs_result } @@ -295,7 +309,7 @@ test -z "$GREP" && { rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" GREP=$func_path_progs_result } @@ -360,6 +374,35 @@ sed_double_backslash="\ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g s/\n//g" +# require_check_ifs_backslash +# --------------------------- +# Check if we can use backslash as IFS='\' separator, and set +# $check_ifs_backshlash_broken to ':' or 'false'. +require_check_ifs_backslash=func_require_check_ifs_backslash +func_require_check_ifs_backslash () +{ + _G_save_IFS=$IFS + IFS='\' + _G_check_ifs_backshlash='a\\b' + for _G_i in $_G_check_ifs_backshlash + do + case $_G_i in + a) + check_ifs_backshlash_broken=false + ;; + '') + break + ;; + *) + check_ifs_backshlash_broken=: + break + ;; + esac + done + IFS=$_G_save_IFS + require_check_ifs_backslash=: +} + ## ----------------- ## ## Global variables. ## @@ -580,16 +623,16 @@ if test yes = "$_G_HAVE_PLUSEQ_OP"; then { $debug_cmd - func_quote_for_eval "$2" - eval "$1+=\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1+=\\ \$func_quote_arg_result" }' else func_append_quoted () { $debug_cmd - func_quote_for_eval "$2" - eval "$1=\$$1\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1=\$$1\\ \$func_quote_arg_result" } fi @@ -1091,85 +1134,203 @@ func_relative_path () } -# func_quote_for_eval ARG... -# -------------------------- -# Aesthetically quote ARGs to be evaled later. -# This function returns two values: -# i) func_quote_for_eval_result -# double-quoted, suitable for a subsequent eval -# ii) func_quote_for_eval_unquoted_result -# has all characters that are still active within double -# quotes backslashified. -func_quote_for_eval () +# func_quote_portable EVAL ARG +# ---------------------------- +# Internal function to portably implement func_quote_arg. Note that we still +# keep attention to performance here so we as much as possible try to avoid +# calling sed binary (so far O(N) complexity as long as func_append is O(1)). +func_quote_portable () { $debug_cmd - func_quote_for_eval_unquoted_result= - func_quote_for_eval_result= - while test 0 -lt $#; do - case $1 in - *[\\\`\"\$]*) - _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; - *) - _G_unquoted_arg=$1 ;; - esac - if test -n "$func_quote_for_eval_unquoted_result"; then - func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" - else - func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + $require_check_ifs_backslash + + func_quote_portable_result=$2 + + # one-time-loop (easy break) + while true + do + if $1; then + func_quote_portable_result=`$ECHO "$2" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` + break fi - case $_G_unquoted_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and variable expansion - # for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_quoted_arg=\"$_G_unquoted_arg\" + # Quote for eval. + case $func_quote_portable_result in + *[\\\`\"\$]*) + # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string + # contains the shell wildcard characters. + case $check_ifs_backshlash_broken$func_quote_portable_result in + :*|*[\[\*\?]*) + func_quote_portable_result=`$ECHO "$func_quote_portable_result" \ + | $SED "$sed_quote_subst"` + break + ;; + esac + + func_quote_portable_old_IFS=$IFS + for _G_char in '\' '`' '"' '$' + do + # STATE($1) PREV($2) SEPARATOR($3) + set start "" "" + func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy + IFS=$_G_char + for _G_part in $func_quote_portable_result + do + case $1 in + quote) + func_append func_quote_portable_result "$3$2" + set quote "$_G_part" "\\$_G_char" + ;; + start) + set first "" "" + func_quote_portable_result= + ;; + first) + set quote "$_G_part" "" + ;; + esac + done + done + IFS=$func_quote_portable_old_IFS ;; - *) - _G_quoted_arg=$_G_unquoted_arg - ;; + *) ;; esac - - if test -n "$func_quote_for_eval_result"; then - func_append func_quote_for_eval_result " $_G_quoted_arg" - else - func_append func_quote_for_eval_result "$_G_quoted_arg" - fi - shift + break done + + func_quote_portable_unquoted_result=$func_quote_portable_result + case $func_quote_portable_result in + # double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # many bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_portable_result=\"$func_quote_portable_result\" + ;; + esac } -# func_quote_for_expand ARG -# ------------------------- -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - $debug_cmd +# func_quotefast_eval ARG +# ----------------------- +# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG', +# but optimized for speed. Result is stored in $func_quotefast_eval. +if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then + printf -v _GL_test_printf_tilde %q '~' + if test '\~' = "$_GL_test_printf_tilde"; then + func_quotefast_eval () + { + printf -v func_quotefast_eval_result %q "$1" + } + else + # Broken older Bash implementations. Make those faster too if possible. + func_quotefast_eval () + { + case $1 in + '~'*) + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + ;; + *) + printf -v func_quotefast_eval_result %q "$1" + ;; + esac + } + fi +else + func_quotefast_eval () + { + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + } +fi - case $1 in - *[\\\`\"]*) - _G_arg=`$ECHO "$1" | $SED \ - -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; - *) - _G_arg=$1 ;; + +# func_quote_arg MODEs ARG +# ------------------------ +# Quote one ARG to be evaled later. MODEs argument may contain zero or more +# specifiers listed below separated by ',' character. This function returns two +# values: +# i) func_quote_arg_result +# double-quoted (when needed), suitable for a subsequent eval +# ii) func_quote_arg_unquoted_result +# has all characters that are still active within double +# quotes backslashified. Available only if 'unquoted' is specified. +# +# Available modes: +# ---------------- +# 'eval' (default) +# - escape shell special characters +# 'expand' +# - the same as 'eval'; but do not quote variable references +# 'pretty' +# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might +# be used later in func_quote to get output like: 'echo "a b"' instead +# of 'echo a\ b'. This is slower than default on some shells. +# 'unquoted' +# - produce also $func_quote_arg_unquoted_result which does not contain +# wrapping double-quotes. +# +# Examples for 'func_quote_arg pretty,unquoted string': +# +# string | *_result | *_unquoted_result +# ------------+-----------------------+------------------- +# " | \" | \" +# a b | "a b" | a b +# "a b" | "\"a b\"" | \"a b\" +# * | "*" | * +# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\" +# +# Examples for 'func_quote_arg pretty,unquoted,expand string': +# +# string | *_result | *_unquoted_result +# --------------+---------------------+-------------------- +# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\" +func_quote_arg () +{ + _G_quote_expand=false + case ,$1, in + *,expand,*) + _G_quote_expand=: + ;; esac - case $_G_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_arg=\"$_G_arg\" + case ,$1, in + *,pretty,*|*,expand,*|*,unquoted,*) + func_quote_portable $_G_quote_expand "$2" + func_quote_arg_result=$func_quote_portable_result + func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result + ;; + *) + # Faster quote-for-eval for some shells. + func_quotefast_eval "$2" + func_quote_arg_result=$func_quotefast_eval_result ;; esac +} + - func_quote_for_expand_result=$_G_arg +# func_quote MODEs ARGs... +# ------------------------ +# Quote all ARGs to be evaled later and join them into single command. See +# func_quote_arg's description for more info. +func_quote () +{ + $debug_cmd + _G_func_quote_mode=$1 ; shift + func_quote_result= + while test 0 -lt $#; do + func_quote_arg "$_G_func_quote_mode" "$1" + if test -n "$func_quote_result"; then + func_append func_quote_result " $func_quote_arg_result" + else + func_append func_quote_result "$func_quote_arg_result" + fi + shift + done } @@ -1215,8 +1376,8 @@ func_show_eval () _G_cmd=$1 _G_fail_exp=${2-':'} - func_quote_for_expand "$_G_cmd" - eval "func_notquiet $func_quote_for_expand_result" + func_quote_arg pretty,expand "$_G_cmd" + eval "func_notquiet $func_quote_arg_result" $opt_dry_run || { eval "$_G_cmd" @@ -1241,8 +1402,8 @@ func_show_eval_locale () _G_fail_exp=${2-':'} $opt_quiet || { - func_quote_for_expand "$_G_cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$_G_cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || { @@ -1369,30 +1530,26 @@ func_lt_ver () # End: #! /bin/sh -# Set a version string for this script. -scriptversion=2014-01-07.03; # UTC - # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 -# Copyright (C) 2010-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2010-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# , and GPL version 2 or later +# . You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Please report bugs or propose patches to: +# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Please report bugs or propose patches to gary@gnu.org. +# Set a version string for this script. +scriptversion=2019-02-19.15; # UTC ## ------ ## @@ -1415,7 +1572,7 @@ scriptversion=2014-01-07.03; # UTC # # In order for the '--version' option to work, you will need to have a # suitably formatted comment like the one at the top of this file -# starting with '# Written by ' and ending with '# warranty; '. +# starting with '# Written by ' and ending with '# Copyright'. # # For '-h' and '--help' to work, you will also need a one line # description of your script's purpose in a comment directly above the @@ -1427,7 +1584,7 @@ scriptversion=2014-01-07.03; # UTC # to display verbose messages only when your user has specified # '--verbose'. # -# After sourcing this file, you can plug processing for additional +# After sourcing this file, you can plug in processing for additional # options by amending the variables from the 'Configuration' section # below, and following the instructions in the 'Option parsing' # section further down. @@ -1476,8 +1633,8 @@ fatal_help="Try '\$progname --help' for more information." ## ------------------------- ## # This section contains functions for adding, removing, and running hooks -# to the main code. A hook is just a named list of of function, that can -# be run in order later on. +# in the main code. A hook is just a list of function names that can be +# run in order later on. # func_hookable FUNC_NAME # ----------------------- @@ -1510,7 +1667,8 @@ func_add_hook () # func_remove_hook FUNC_NAME HOOK_FUNC # ------------------------------------ -# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +# Remove HOOK_FUNC from the list of hook functions to be called by +# FUNC_NAME. func_remove_hook () { $debug_cmd @@ -1519,10 +1677,28 @@ func_remove_hook () } +# func_propagate_result FUNC_NAME_A FUNC_NAME_B +# --------------------------------------------- +# If the *_result variable of FUNC_NAME_A _is set_, assign its value to +# *_result variable of FUNC_NAME_B. +func_propagate_result () +{ + $debug_cmd + + func_propagate_result_result=: + if eval "test \"\${${1}_result+set}\" = set" + then + eval "${2}_result=\$${1}_result" + else + func_propagate_result_result=false + fi +} + + # func_run_hooks FUNC_NAME [ARG]... # --------------------------------- # Run all hook functions registered to FUNC_NAME. -# It is assumed that the list of hook functions contains nothing more +# It's assumed that the list of hook functions contains nothing more # than a whitespace-delimited list of legal shell function names, and # no effort is wasted trying to catch shell meta-characters or preserve # whitespace. @@ -1532,22 +1708,19 @@ func_run_hooks () case " $hookable_fns " in *" $1 "*) ;; - *) func_fatal_error "'$1' does not support hook funcions.n" ;; + *) func_fatal_error "'$1' does not support hook functions." ;; esac eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do - eval $_G_hook '"$@"' - - # store returned options list back into positional - # parameters for next 'cmd' execution. - eval _G_hook_result=\$${_G_hook}_result - eval set dummy "$_G_hook_result"; shift + func_unset "${_G_hook}_result" + eval $_G_hook '${1+"$@"}' + func_propagate_result $_G_hook func_run_hooks + if $func_propagate_result_result; then + eval set dummy "$func_run_hooks_result"; shift + fi done - - func_quote_for_eval ${1+"$@"} - func_run_hooks_result=$func_quote_for_eval_result } @@ -1557,10 +1730,18 @@ func_run_hooks () ## --------------- ## # In order to add your own option parsing hooks, you must accept the -# full positional parameter list in your hook function, remove any -# options that you action, and then pass back the remaining unprocessed -# options in '_result', escaped suitably for -# 'eval'. Like this: +# full positional parameter list from your hook function. You may remove +# or edit any options that you action, and then pass back the remaining +# unprocessed options in '_result', escaped +# suitably for 'eval'. +# +# The '_result' variable is automatically unset +# before your hook gets called; for best performance, only set the +# *_result variable when necessary (i.e. don't call the 'func_quote' +# function unnecessarily because it can be an expensive operation on some +# machines). +# +# Like this: # # my_options_prep () # { @@ -1570,9 +1751,8 @@ func_run_hooks () # usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' -# -# func_quote_for_eval ${1+"$@"} -# my_options_prep_result=$func_quote_for_eval_result +# # No change in '$@' (ignored completely by this hook). Leave +# # my_options_prep_result variable intact. # } # func_add_hook func_options_prep my_options_prep # @@ -1581,25 +1761,36 @@ func_run_hooks () # { # $debug_cmd # -# # Note that for efficiency, we parse as many options as we can +# args_changed=false +# +# # Note that, for efficiency, we parse as many options as we can # # recognise in a loop before passing the remainder back to the # # caller on the first unrecognised argument we encounter. # while test $# -gt 0; do # opt=$1; shift # case $opt in -# --silent|-s) opt_silent=: ;; +# --silent|-s) opt_silent=: +# args_changed=: +# ;; # # Separate non-argument short options: # -s*) func_split_short_opt "$_G_opt" # set dummy "$func_split_short_opt_name" \ # "-$func_split_short_opt_arg" ${1+"$@"} # shift +# args_changed=: # ;; -# *) set dummy "$_G_opt" "$*"; shift; break ;; +# *) # Make sure the first unrecognised option "$_G_opt" +# # is added back to "$@" in case we need it later, +# # if $args_changed was set to 'true'. +# set dummy "$_G_opt" ${1+"$@"}; shift; break ;; # esac # done # -# func_quote_for_eval ${1+"$@"} -# my_silent_option_result=$func_quote_for_eval_result +# # Only call 'func_quote' here if we processed at least one argument. +# if $args_changed; then +# func_quote eval ${1+"$@"} +# my_silent_option_result=$func_quote_result +# fi # } # func_add_hook func_parse_options my_silent_option # @@ -1610,17 +1801,26 @@ func_run_hooks () # # $opt_silent && $opt_verbose && func_fatal_help "\ # '--silent' and '--verbose' options are mutually exclusive." -# -# func_quote_for_eval ${1+"$@"} -# my_option_validation_result=$func_quote_for_eval_result # } # func_add_hook func_validate_options my_option_validation # -# You'll alse need to manually amend $usage_message to reflect the extra +# You'll also need to manually amend $usage_message to reflect the extra # options you parse. It's preferable to append if you can, so that # multiple option parsing hooks can be added safely. +# func_options_finish [ARG]... +# ---------------------------- +# Finishing the option parse loop (call 'func_options' hooks ATM). +func_options_finish () +{ + $debug_cmd + + func_run_hooks func_options ${1+"$@"} + func_propagate_result func_run_hooks func_options_finish +} + + # func_options [ARG]... # --------------------- # All the functions called inside func_options are hookable. See the @@ -1630,17 +1830,27 @@ func_options () { $debug_cmd - func_options_prep ${1+"$@"} - eval func_parse_options \ - ${func_options_prep_result+"$func_options_prep_result"} - eval func_validate_options \ - ${func_parse_options_result+"$func_parse_options_result"} + _G_options_quoted=false - eval func_run_hooks func_options \ - ${func_validate_options_result+"$func_validate_options_result"} + for my_func in options_prep parse_options validate_options options_finish + do + func_unset func_${my_func}_result + func_unset func_run_hooks_result + eval func_$my_func '${1+"$@"}' + func_propagate_result func_$my_func func_options + if $func_propagate_result_result; then + eval set dummy "$func_options_result"; shift + _G_options_quoted=: + fi + done - # save modified positional parameters for caller - func_options_result=$func_run_hooks_result + $_G_options_quoted || { + # As we (func_options) are top-level options-parser function and + # nobody quoted "$@" for us yet, we need to do it explicitly for + # caller. + func_quote eval ${1+"$@"} + func_options_result=$func_quote_result + } } @@ -1649,9 +1859,8 @@ func_options () # All initialisations required before starting the option parse loop. # Note that when calling hook functions, we pass through the list of # positional parameters. If a hook function modifies that list, and -# needs to propogate that back to rest of this script, then the complete -# modified list must be put in 'func_run_hooks_result' before -# returning. +# needs to propagate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before returning. func_hookable func_options_prep func_options_prep () { @@ -1662,9 +1871,7 @@ func_options_prep () opt_warning_types= func_run_hooks func_options_prep ${1+"$@"} - - # save modified positional parameters for caller - func_options_prep_result=$func_run_hooks_result + func_propagate_result func_run_hooks func_options_prep } @@ -1676,25 +1883,32 @@ func_parse_options () { $debug_cmd - func_parse_options_result= - + _G_parse_options_requote=false # this just eases exit handling while test $# -gt 0; do # Defer to hook functions for initial option parsing, so they # get priority in the event of reusing an option name. func_run_hooks func_parse_options ${1+"$@"} - - # Adjust func_parse_options positional parameters to match - eval set dummy "$func_run_hooks_result"; shift + func_propagate_result func_run_hooks func_parse_options + if $func_propagate_result_result; then + eval set dummy "$func_parse_options_result"; shift + # Even though we may have changed "$@", we passed the "$@" array + # down into the hook and it quoted it for us (because we are in + # this if-branch). No need to quote it again. + _G_parse_options_requote=false + fi # Break out of the loop if we already parsed every option. test $# -gt 0 || break + # We expect that one of the options parsed in this function matches + # and thus we remove _G_opt from "$@" and need to re-quote. + _G_match_parse_options=: _G_opt=$1 shift case $_G_opt in --debug|-x) debug_cmd='set -x' - func_echo "enabling shell trace mode" + func_echo "enabling shell trace mode" >&2 $debug_cmd ;; @@ -1704,7 +1918,10 @@ func_parse_options () ;; --warnings|--warning|-W) - test $# = 0 && func_missing_arg $_G_opt && break + if test $# = 0 && func_missing_arg $_G_opt; then + _G_parse_options_requote=: + break + fi case " $warning_categories $1" in *" $1 "*) # trailing space prevents matching last $1 above @@ -1757,15 +1974,24 @@ func_parse_options () shift ;; - --) break ;; + --) _G_parse_options_requote=: ; break ;; -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift + _G_match_parse_options=false + break + ;; esac + + if $_G_match_parse_options; then + _G_parse_options_requote=: + fi done - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - func_parse_options_result=$func_quote_for_eval_result + if $_G_parse_options_requote; then + # save modified positional parameters for caller + func_quote eval ${1+"$@"} + func_parse_options_result=$func_quote_result + fi } @@ -1782,12 +2008,10 @@ func_validate_options () test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" func_run_hooks func_validate_options ${1+"$@"} + func_propagate_result func_run_hooks func_validate_options # Bail if the options were screwed! $exit_cmd $EXIT_FAILURE - - # save modified positional parameters for caller - func_validate_options_result=$func_run_hooks_result } @@ -1843,8 +2067,8 @@ func_missing_arg () # func_split_equals STRING # ------------------------ -# Set func_split_equals_lhs and func_split_equals_rhs shell variables after -# splitting STRING at the '=' sign. +# Set func_split_equals_lhs and func_split_equals_rhs shell variables +# after splitting STRING at the '=' sign. test -z "$_G_HAVE_XSI_OPS" \ && (eval 'x=a/b/c; test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ @@ -1859,8 +2083,9 @@ then func_split_equals_lhs=${1%%=*} func_split_equals_rhs=${1#*=} - test "x$func_split_equals_lhs" = "x$1" \ - && func_split_equals_rhs= + if test "x$func_split_equals_lhs" = "x$1"; then + func_split_equals_rhs= + fi }' else # ...otherwise fall back to using expr, which is often a shell builtin. @@ -1870,7 +2095,7 @@ else func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` func_split_equals_rhs= - test "x$func_split_equals_lhs" = "x$1" \ + test "x$func_split_equals_lhs=" = "x$1" \ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` } fi #func_split_equals @@ -1896,7 +2121,7 @@ else { $debug_cmd - func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'` func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` } fi #func_split_short_opt @@ -1938,31 +2163,44 @@ func_usage_message () # func_version # ------------ # Echo version message to standard output and exit. +# The version message is extracted from the calling file's header +# comments, with leading '# ' stripped: +# 1. First display the progname and version +# 2. Followed by the header comment line matching /^# Written by / +# 3. Then a blank line followed by the first following line matching +# /^# Copyright / +# 4. Immediately followed by any lines between the previous matches, +# except lines preceding the intervening completely blank line. +# For example, see the header comments of this file. func_version () { $debug_cmd printf '%s\n' "$progname $scriptversion" $SED -n ' - /(C)/!b go - :more - /\./!{ - N - s|\n# | | - b more - } - :go - /^# Written by /,/# warranty; / { - s|^# || - s|^# *$|| - s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| - p + /^# Written by /!b + s|^# ||; p; n + + :fwd2blnk + /./ { + n + b fwd2blnk } - /^# Written by / { - s|^# || - p + p; n + + :holdwrnt + s|^# || + s|^# *$|| + /^Copyright /!{ + /./H + n + b holdwrnt } - /^warranty; /q' < "$progpath" + + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + G + s|\(\n\)\n*|\1|g + p; q' < "$progpath" exit $? } @@ -1972,12 +2210,12 @@ func_version () # mode: shell-script # sh-indentation: 2 # eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC" # time-stamp-time-zone: "UTC" # End: # Set a version string. -scriptversion='(GNU libtool) 2.4.6' +scriptversion='(GNU libtool) 2.4.7.4-1ec8f-dirty' # func_echo ARG... @@ -2068,12 +2306,12 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.6 + version: $progname (GNU libtool) 2.4.7.4-1ec8f-dirty automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to . -GNU libtool home page: . +GNU libtool home page: . General help using GNU software: ." exit 0 } @@ -2124,7 +2362,7 @@ fi # a configuration failure hint, and exit. func_fatal_configuration () { - func__fatal_error ${1+"$@"} \ + func_fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -2270,6 +2508,8 @@ libtool_options_prep () nonopt= preserve_args= + _G_rc_lt_options_prep=: + # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -2293,11 +2533,16 @@ libtool_options_prep () uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) shift; set dummy --mode uninstall ${1+"$@"}; shift ;; + *) + _G_rc_lt_options_prep=false + ;; esac - # Pass back the list of options. - func_quote_for_eval ${1+"$@"} - libtool_options_prep_result=$func_quote_for_eval_result + if $_G_rc_lt_options_prep; then + # Pass back the list of options. + func_quote eval ${1+"$@"} + libtool_options_prep_result=$func_quote_result + fi } func_add_hook func_options_prep libtool_options_prep @@ -2309,9 +2554,12 @@ libtool_parse_options () { $debug_cmd + _G_rc_lt_parse_options=false + # Perform our own loop to consume as many options as possible in # each iteration. while test $# -gt 0; do + _G_match_lt_parse_options=: _G_opt=$1 shift case $_G_opt in @@ -2386,15 +2634,20 @@ libtool_parse_options () func_append preserve_args " $_G_opt" ;; - # An option not handled by this hook function: - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"} ; shift + _G_match_lt_parse_options=false + break + ;; esac + $_G_match_lt_parse_options && _G_rc_lt_parse_options=: done - - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - libtool_parse_options_result=$func_quote_for_eval_result + if $_G_rc_lt_parse_options; then + # save modified positional parameters for caller + func_quote eval ${1+"$@"} + libtool_parse_options_result=$func_quote_result + fi } func_add_hook func_parse_options libtool_parse_options @@ -2451,8 +2704,8 @@ libtool_validate_options () } # Pass back the unparsed argument list - func_quote_for_eval ${1+"$@"} - libtool_validate_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_validate_options_result=$func_quote_result } func_add_hook func_validate_options libtool_validate_options @@ -3418,8 +3671,8 @@ func_mode_compile () esac done - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ + func_quote_arg pretty "$libobj" + test "X$libobj" != "X$func_quote_arg_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" @@ -3492,8 +3745,8 @@ compiler." func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result + func_quote_arg pretty "$srcfile" + qsrcfile=$func_quote_arg_result # Only build a PIC object if we are building libtool libraries. if test yes = "$build_libtool_libs"; then @@ -3648,7 +3901,8 @@ This mode accepts the following additional options: -prefer-non-pic try to build non-PIC objects only -shared do not build a '.o' file suitable for static linking -static only build a '.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler + -Wc,FLAG + -Xcompiler FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. @@ -3754,6 +4008,8 @@ The following components of LINK-COMMAND are treated specially: -weak LIBNAME declare that the target provides the LIBNAME interface -Wc,FLAG -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wa,FLAG + -Xassembler FLAG pass linker-specific FLAG directly to the assembler -Wl,FLAG -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) @@ -4096,8 +4352,8 @@ func_mode_install () case $nonopt in *shtool*) :;; *) false;; esac then # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " + func_quote_arg pretty "$nonopt" + install_prog="$func_quote_arg_result " arg=$1 shift else @@ -4107,8 +4363,8 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog "$func_quote_arg_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -4165,12 +4421,12 @@ func_mode_install () esac # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog " $func_quote_arg_result" if test -n "$arg2"; then - func_quote_for_eval "$arg2" + func_quote_arg pretty "$arg2" fi - func_append install_shared_prog " $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_arg_result" done test -z "$install_prog" && \ @@ -4181,8 +4437,8 @@ func_mode_install () if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" + func_quote_arg pretty "$install_override_mode" + func_append install_shared_prog " -m $func_quote_arg_result" fi fi @@ -4478,8 +4734,8 @@ func_mode_install () relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_quiet || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$relink_command" + eval "func_echo $func_quote_arg_result" } if eval "$relink_command"; then : else @@ -5258,7 +5514,8 @@ else if test \"\$libtool_execute_magic\" != \"$magic\"; then file=\"\$0\"" - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + func_quote_arg pretty "$ECHO" + qECHO=$func_quote_arg_result $ECHO "\ # A function that is used when there is no print builtin or printf. @@ -5268,7 +5525,7 @@ func_fallback_echo () \$1 _LTECHO_EOF' } - ECHO=\"$qECHO\" + ECHO=$qECHO fi # Very basic option parsing. These options are (a) specific to @@ -5530,7 +5787,7 @@ EOF #endif #include #include -#if defined (_WIN32) && !defined (__GNUC__) +#ifdef _MSC_VER # include # include # include @@ -6611,9 +6868,9 @@ func_mode_link () while test "$#" -gt 0; do arg=$1 shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" + func_quote_arg pretty,unquoted "$arg" + qarg=$func_quote_arg_unquoted_result + func_append libtool_args " $func_quote_arg_result" # If the previous option needs an argument, assign it. if test -n "$prev"; then @@ -6849,6 +7106,13 @@ func_mode_link () prev= continue ;; + xassembler) + func_append compiler_flags " -Xassembler $qarg" + prev= + func_append compile_command " -Xassembler $qarg" + func_append finalize_command " -Xassembler $qarg" + continue + ;; xcclinker) func_append linker_flags " $qarg" func_append compiler_flags " $qarg" @@ -7019,7 +7283,7 @@ func_mode_link () # These systems don't actually have a C library (as such) test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. test X-lc = "X$arg" && continue ;; @@ -7039,7 +7303,7 @@ func_mode_link () esac elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -7069,8 +7333,20 @@ func_mode_link () prev=xcompiler continue ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199. + -pthread) + case $host in + *solaris2*) ;; + *) + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + ;; + esac + continue + ;; + -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" @@ -7211,9 +7487,9 @@ func_mode_link () save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $func_quote_arg_result" + func_append compiler_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" @@ -7227,16 +7503,21 @@ func_mode_link () save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $wl$func_quote_arg_result" + func_append compiler_flags " $wl$func_quote_arg_result" + func_append linker_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; + -Xassembler) + prev=xassembler + continue + ;; + -Xcompiler) prev=xcompiler continue @@ -7254,8 +7535,8 @@ func_mode_link () # -msg_* for osf cc -msg_*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; # Flags to be passed through unchanged, with rationale: @@ -7272,12 +7553,18 @@ func_mode_link () # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer + # -fuse-ld=* Linker select flags for GCC + # -Wa,* Pass flags directly to the assembler + # -Werror, -Werror=* Report (specified) warnings as errors -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*|-Werror|-Werror=*) + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" @@ -7298,15 +7585,15 @@ func_mode_link () continue else # Otherwise treat like 'Some other compiler flag' below - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result fi ;; # Some other compiler flag. -* | +*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; *.$objext) @@ -7426,8 +7713,8 @@ func_mode_link () *) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; esac # arg @@ -8632,7 +8919,7 @@ func_mode_link () test CXX = "$tagname" && { case $host_os in linux*) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 func_suncc_cstd_abi @@ -8805,7 +9092,7 @@ func_mode_link () # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|freebsd-elf|linux|osf|windows|none) + darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age=$number_minor @@ -8896,7 +9183,7 @@ func_mode_link () versuffix=.$current.$revision ;; - freebsd-elf) + freebsd-elf | midnightbsd-elf) func_arith $current - $age major=.$func_arith_result versuffix=$major.$age.$revision @@ -9122,7 +9409,7 @@ func_mode_link () *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -9933,8 +10220,8 @@ EOF for cmd in $concat_cmds; do IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10027,8 +10314,8 @@ EOF eval cmd=\"$cmd\" IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10502,12 +10789,13 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty "$var_value" + relink_command="$var=$func_quote_arg_result; export $var; $relink_command" fi done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)" + relink_command=$func_quote_arg_unquoted_result fi # Only actually do things if not in dry run mode. @@ -10747,13 +11035,15 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty,unquoted "$var_value" + relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command" fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + func_quote_arg pretty,unquoted "$relink_command" + relink_command=$func_quote_arg_unquoted_result if test yes = "$hardcode_automatic"; then relink_command= fi diff --git a/build_aux/mdate-sh b/build_aux/mdate-sh index 34de97554..e6d572d4c 100755 --- a/build_aux/mdate-sh +++ b/build_aux/mdate-sh @@ -1,9 +1,9 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. -scriptversion=2017-09-22.02; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1995-2017 Free Software Foundation, Inc. +# Copyright (C) 1995-2021 Free Software Foundation, Inc. # written by Ulrich Drepper , June 1995 # # This program is free software; you can redistribute it and/or modify @@ -220,7 +220,7 @@ echo $day $month $year # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/build_aux/missing b/build_aux/missing index d3734ac94..1fe1611f1 100755 --- a/build_aux/missing +++ b/build_aux/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2017-12-05.17gnucobol; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -207,7 +207,7 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/build_aux/ylwrap b/build_aux/ylwrap index 5ca021feb..e8ec109fa 100755 --- a/build_aux/ylwrap +++ b/build_aux/ylwrap @@ -1,9 +1,9 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2017-09-16.17; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # Written by Tom Tromey . # @@ -239,7 +239,7 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/cobc/cobc.h b/cobc/cobc.h index 92e15925d..388f0f90f 100644 --- a/cobc/cobc.h +++ b/cobc/cobc.h @@ -623,7 +623,6 @@ extern int yyparse (void); #endif /* Data used for profiling */ -extern unsigned nb_paras; extern struct cb_any_list *paragraphs_l; /* The list of paragraphs in the currently parsed section */ extern struct cb_any_list *sections_l; /* The list of list of paragraphs (one by section) */ extern struct cb_any_list *sections_name; /* The list of sections names (should be same length as sections_l) */ diff --git a/cobc/codegen.c b/cobc/codegen.c index 835f4f57f..93c22fa40 100644 --- a/cobc/codegen.c +++ b/cobc/codegen.c @@ -7877,6 +7877,13 @@ output_goto_1 (cb_tree x) output_move (cb_space, cb_debug_contents); } + if (cb_flag_perf) { + if (!!lb->section) { + output_line("cob_perf_goto(\"%s\", \"%s\");", lb->section->name, lb->name); + } else { + output_line("cob_perf_goto(NULL, \"%s\");", lb->name); + } + } output_line ("goto %s%d;", CB_PREFIX_LABEL, lb->id); } @@ -8720,10 +8727,10 @@ output_label_as_c (const struct cb_label *lp) } else { output_line ("ENTRY_%s:\t%s;", ptr, "cob_nop ()"); } - output_line("cob_perf_init(called_paragraphs, start_times, total_times,\n" - " paragraphs, paragraphs_count,\n" - " sections, sections_count,\n" - " para_per_sections, max_paragraphs_count);"); + if (cb_flag_perf) + output_line("cob_perf_init (total_times, paragraphs, paragraphs_count,\n" + " sections, sections_count,\n" + " para_per_sections, max_paragraphs_count);"); } else { /* Paragraph label */ /* note: paragraphs need a suffix, both to not break some macro @@ -12281,7 +12288,7 @@ output_internal_function (struct cb_program *prog, cb_tree parameter_list) output_newline (); if (needs_exit_prog) { output_line ("exit_program:"); - output_line ("cob_perf_end();"); + if (cb_flag_perf) output_line ("cob_perf_end();"); output_newline (); } } @@ -13680,7 +13687,7 @@ output_cob_perf_data () output_local ("/* cob_perf data */\n\n"); output_local ("static size_t called_paragraphs[255];\n"); output_local ("static long start_times[255];\n"); - output_local ("static long total_times[%lu] = {0};\n", paragraphs_count); + output_local ("static long total_times[%lu][255] = {0};\n", paragraphs_count); output_local ("static const char *paragraphs[] = {\n"); { @@ -13778,30 +13785,6 @@ codegen (struct cb_program *prog, const char *translate_name) current_program = prog; cb_listing_xref = set_xref; - printf("nb_paras: %d\n", nb_paras); - - if (sections_l == NULL) { - printf ("No sections!!\n"); - } else if (cb_any_list_length (sections_l) != cb_any_list_length (sections_name)) { - printf ("Sections not all named: %ld (sec) vs %ld (names)\n", - cb_any_list_length (sections_l), - cb_any_list_length (sections_name)); - } else { - struct cb_any_list *sl_p = sections_l; - struct cb_any_list *sn_p = sections_name; - do { - printf ("%s:", (const char*)sn_p->data); - struct cb_any_list *p_p = (struct cb_any_list*)sl_p->data; - do { - printf (" %s", (const char*)p_p->data); - p_p = p_p->next; - } while (!!p_p); - printf ("\n"); - sn_p = sn_p->next; - sl_p = sl_p->next; - } while (!!sn_p && !!sl_p); - } - codegen_finalize (); } @@ -14041,7 +14024,7 @@ codegen_internal (struct cb_program *prog, const int subsequent_call) output_local_base_cache (); output_local_field_cache (prog); - output_cob_perf_data (); + if (cb_flag_perf) output_cob_perf_data (); /* Report data fields */ if (prog->report_storage) { comment_gen = 0; diff --git a/cobc/flag.def b/cobc/flag.def index 4850daa60..790f28a4e 100644 --- a/cobc/flag.def +++ b/cobc/flag.def @@ -254,3 +254,6 @@ CB_FLAG_ON (cb_diagnostics_show_caret, 1, "diagnostics-show-caret", CB_FLAG_ON (cb_diagnostics_show_line_numbers, 1, "diagnostics-show-line-numbers", _(" -fno-diagnostics-show-line-numbers\tsuppress display of line numbers in diagnostics")) + +CB_FLAG (cb_flag_perf, 1, "perf", + _(" -fperf enable profiling of the COBOL program")) diff --git a/cobc/parser.y b/cobc/parser.y index a7d9a1f00..ad6e338e7 100644 --- a/cobc/parser.y +++ b/cobc/parser.y @@ -276,7 +276,6 @@ static cb_tree eval_check[EVAL_DEPTH][EVAL_DEPTH]; static int last_source_line = 0; /* Data and functions used for profiling */ -unsigned nb_paras = 0; struct cb_any_list* paragraphs_l = NULL; struct cb_any_list* sections_l = NULL; struct cb_any_list* sections_name = NULL; @@ -10948,18 +10947,23 @@ procedure_division: if (current_paragraph->exit_label) { emit_statement (current_paragraph->exit_label); } - cb_tree str = cb_build_string (current_paragraph->name, strlen (current_paragraph->name)); - emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_exit_paragraph", str)); + if (cb_flag_perf) { + cb_tree para_str = cb_build_string (current_paragraph->name, strlen (current_paragraph->name)); + cb_tree sec_str = cb_build_string (current_section->name, strlen (current_section->name)); + emit_statement (CB_BUILD_FUNCALL_2 ("cob_perf_exit_paragraph", sec_str, para_str)); + } emit_statement (cb_build_perform_exit (current_paragraph)); } if (current_section) { if (current_section->exit_label) { emit_statement (current_section->exit_label); } - sections_l = cb_any_list_add (sections_l, paragraphs_l, 0); - paragraphs_l = NULL; - cb_tree str = cb_build_string (current_section->name, strlen (current_section->name)); - emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_exit_section", str)); + if (cb_flag_perf) { + sections_l = cb_any_list_add (sections_l, (void*)paragraphs_l, 0); + paragraphs_l = NULL; + cb_tree str = cb_build_string (current_section->name, strlen (current_section->name)); + emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_exit_section", str)); + } emit_statement (cb_build_perform_exit (current_section)); } } @@ -10978,8 +10982,6 @@ procedure_division: cobc_in_procedure = 1U; label = cb_build_reference ("MAIN SECTION"); current_section = CB_LABEL (cb_build_label (label, NULL)); - sections_name = cb_any_list_add (sections_name, "MAIN SECTION", 1); - nb_paras++; current_section->flag_section = 1; current_section->flag_dummy_section = 1; current_section->flag_skip_label = !!skip_statements; @@ -10988,8 +10990,10 @@ procedure_division: emit_statement (CB_TREE (current_section)); label = cb_build_reference ("MAIN PARAGRAPH"); current_paragraph = CB_LABEL (cb_build_label (label, NULL)); - paragraphs_l = cb_any_list_add (paragraphs_l, "MAIN PARAGRAPH", 1); - nb_paras++; + if (cb_flag_perf) { + sections_name = cb_any_list_add (sections_name, "MAIN SECTION", 1); + paragraphs_l = cb_any_list_add (paragraphs_l, "MAIN PARAGRAPH", 1); + } current_paragraph->flag_declaratives = !!in_declaratives; current_paragraph->flag_skip_label = !!skip_statements; current_paragraph->flag_dummy_paragraph = 1; @@ -11275,10 +11279,13 @@ _procedure_declaratives: if (current_paragraph->exit_label) { emit_statement (current_paragraph->exit_label); } - sections_l = cb_any_list_add (sections_l, paragraphs_l, 0); - paragraphs_l = NULL; - cb_tree str = cb_build_string (current_paragraph->name, strlen (current_paragraph->name)); - emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_exit_paragraph", str)); + if (cb_flag_perf) { + sections_l = cb_any_list_add (sections_l, paragraphs_l, 0); + paragraphs_l = NULL; + cb_tree para_str = cb_build_string (current_paragraph->name, strlen (current_paragraph->name)); + cb_tree sec_str = cb_build_string (current_section->name, strlen (current_section->name)); + emit_statement (CB_BUILD_FUNCALL_2 ("cob_perf_exit_paragraph", sec_str, para_str)); + } emit_statement (cb_build_perform_exit (current_paragraph)); current_paragraph = NULL; } @@ -11287,8 +11294,10 @@ _procedure_declaratives: emit_statement (current_section->exit_label); } current_section->flag_fatal_check = 1; - cb_tree str = cb_build_string (current_section->name, strlen (current_section->name)); - emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_exit_section", str)); + if (cb_flag_perf) { + cb_tree str = cb_build_string (current_section->name, strlen (current_section->name)); + emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_exit_section", str)); + } emit_statement (cb_build_perform_exit (current_section)); current_section = NULL; } @@ -11365,18 +11374,23 @@ section_header: if (current_paragraph->exit_label) { emit_statement (current_paragraph->exit_label); } - cb_tree str = cb_build_string (current_paragraph->name, strlen (current_paragraph->name)); - emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_exit_paragraph", str)); + if (cb_flag_perf) { + cb_tree para_str = cb_build_string (current_paragraph->name, strlen (current_paragraph->name)); + cb_tree sec_str = cb_build_string (current_section->name, strlen (current_section->name)); + emit_statement (CB_BUILD_FUNCALL_2 ("cob_perf_exit_paragraph", sec_str, para_str)); + } emit_statement (cb_build_perform_exit (current_paragraph)); } if (current_section) { if (current_section->exit_label) { emit_statement (current_section->exit_label); } - sections_l = cb_any_list_add (sections_l, paragraphs_l, 0); - paragraphs_l = NULL; - cb_tree str = cb_build_string (current_section->name, strlen (current_section->name)); - emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_exit_section", str)); + if (cb_flag_perf) { + sections_l = cb_any_list_add (sections_l, paragraphs_l, 0); + paragraphs_l = NULL; + cb_tree str = cb_build_string (current_section->name, strlen (current_section->name)); + emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_exit_section", str)); + } emit_statement (cb_build_perform_exit (current_section)); } if (current_program->flag_debugging && !in_debugging) { @@ -11390,8 +11404,8 @@ section_header: /* Begin a new section */ current_section = CB_LABEL (cb_build_label ($1, NULL)); - nb_paras++; - sections_name = cb_any_list_add (sections_name, current_section->name, 1); + if (cb_flag_perf) + sections_name = cb_any_list_add (sections_name, current_section->name, 1); current_section->flag_section = 1; /* Careful here, one negation */ current_section->flag_real_label = !in_debugging; @@ -11403,8 +11417,10 @@ section_header: _use_statement { emit_statement (CB_TREE (current_section)); - cb_tree str = cb_build_string (current_section->name, strlen(current_section->name)); - emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_enter_section", str)); + if (cb_flag_perf) { + cb_tree str = cb_build_string (current_section->name, strlen(current_section->name)); + emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_enter_section", str)); + } } ; @@ -11428,8 +11444,11 @@ paragraph_header: if (current_paragraph->exit_label) { emit_statement (current_paragraph->exit_label); } - cb_tree str = cb_build_string (current_paragraph->name, strlen (current_paragraph->name)); - emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_exit_paragraph", str)); + if (cb_flag_perf) { + cb_tree para_str = cb_build_string (current_paragraph->name, strlen (current_paragraph->name)); + cb_tree sec_str = cb_build_string (current_section->name, strlen (current_section->name)); + emit_statement (CB_BUILD_FUNCALL_2 ("cob_perf_exit_paragraph", sec_str, para_str)); + } emit_statement (cb_build_perform_exit (current_paragraph)); if (current_program->flag_debugging && !in_debugging) { emit_statement (cb_build_comment ( @@ -11443,25 +11462,30 @@ paragraph_header: if (!current_section) { label = cb_build_reference ("MAIN SECTION"); current_section = CB_LABEL (cb_build_label (label, NULL)); - sections_name = cb_any_list_add (sections_name, "MAIN SECTION", 1); - nb_paras++; current_section->flag_section = 1; current_section->flag_dummy_section = 1; current_section->flag_declaratives = !!in_declaratives; current_section->flag_skip_label = !!skip_statements; current_section->xref.skip = 1; emit_statement (CB_TREE (current_section)); + if (cb_flag_perf) { + sections_name = cb_any_list_add (sections_name, "MAIN SECTION", 1); + cb_tree sec_str = cb_build_string (current_section->name, strlen(current_section->name)); + emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_enter_section", sec_str)); + } } current_paragraph = CB_LABEL (cb_build_label ($1, current_section)); - paragraphs_l = cb_any_list_add (paragraphs_l, current_paragraph->name, 1); - nb_paras++; current_paragraph->flag_declaratives = !!in_declaratives; current_paragraph->flag_skip_label = !!skip_statements; current_paragraph->flag_real_label = !in_debugging; current_paragraph->segment = current_section->segment; emit_statement (CB_TREE (current_paragraph)); - cb_tree str = cb_build_string (current_paragraph->name, strlen(current_paragraph->name)); - emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_enter_paragraph", str)); + if (cb_flag_perf) { + paragraphs_l = cb_any_list_add (paragraphs_l, current_paragraph->name, 1); + cb_tree para_str = cb_build_string (current_paragraph->name, strlen(current_paragraph->name)); + cb_tree sec_str = cb_build_string (current_section->name, strlen(current_section->name)); + emit_statement (CB_BUILD_FUNCALL_2 ("cob_perf_enter_paragraph", sec_str, para_str)); + } } ; @@ -11559,19 +11583,20 @@ statements: cb_tree label = cb_build_reference ("MAIN SECTION"); current_section = CB_LABEL (cb_build_label (label, NULL)); sections_name = cb_any_list_add (sections_name, "MAIN SECTION", 1); - nb_paras++; current_section->flag_section = 1; current_section->flag_dummy_section = 1; current_section->flag_skip_label = !!skip_statements; current_section->flag_declaratives = !!in_declaratives; current_section->xref.skip = 1; emit_statement (CB_TREE (current_section)); + if (cb_flag_perf) { + cb_tree str = cb_build_string (current_section->name, strlen(current_section->name)); + emit_statement (CB_BUILD_FUNCALL_1 ("cob_perf_enter_section", str)); + } } if (!current_paragraph) { cb_tree label = cb_build_reference ("MAIN PARAGRAPH"); current_paragraph = CB_LABEL (cb_build_label (label, NULL)); - paragraphs_l = cb_any_list_add (paragraphs_l, "MAIN PARAGRAPH", 1); - nb_paras++; current_paragraph->common.source_file = current_section->common.source_file; current_paragraph->common.source_line @@ -11581,6 +11606,12 @@ statements: current_paragraph->flag_dummy_paragraph = 1; current_paragraph->xref.skip = 1; emit_statement (CB_TREE (current_paragraph)); + if (cb_flag_perf) { + paragraphs_l = cb_any_list_add (paragraphs_l, "MAIN PARAGRAPH", 1); + cb_tree para_str = cb_build_string (current_paragraph->name, strlen(current_paragraph->name)); + cb_tree sec_str = cb_build_string (current_section->name, strlen(current_section->name)); + emit_statement (CB_BUILD_FUNCALL_2 ("cob_perf_enter_paragraph", sec_str, para_str)); + } } if (check_headers_present (COBC_HD_PROCEDURE_DIVISION, 0, 0, 0) == 1) { if (current_program->prog_type == COB_MODULE_TYPE_PROGRAM) { diff --git a/cobc/typeck.c b/cobc/typeck.c index 5400aea74..96fe2d47a 100644 --- a/cobc/typeck.c +++ b/cobc/typeck.c @@ -14059,7 +14059,7 @@ cb_emit_start (cb_tree file, cb_tree op, cb_tree key, cb_tree keylen) void cb_emit_stop_run (cb_tree x) { - cb_emit (CB_BUILD_FUNCALL_0 ("cob_perf_end")); + if (cb_flag_perf) cb_emit (CB_BUILD_FUNCALL_0 ("cob_perf_end")); cb_emit (CB_BUILD_FUNCALL_1 ("cob_stop_run", cb_build_cast_int (x))); } diff --git a/configure.ac b/configure.ac index 477f877ce..0abbfd0b6 100644 --- a/configure.ac +++ b/configure.ac @@ -152,6 +152,8 @@ AH_TEMPLATE([WITH_XML2], [Use libxml2 as XML handler]) AH_TEMPLATE([WITH_JSON], [JSON handler]) AH_TEMPLATE([WITH_CJSON], [Use cJSON library/source as JSON handler]) AH_TEMPLATE([WITH_JSON_C], [Use JSON-C library as JSON handler]) +AH_TEMPLATE([WITH_XLSX], [XLSX writer handler]) +AH_TEMPLATE([WITH_XLSXWRITER], [Use libxlsxwriter for profiling results]) AH_TEMPLATE([COB_EXPORT_DYN], [Compile/link option for exporting symbols]) AH_TEMPLATE([COB_PIC_FLAGS], [Compile/link option for PIC code]) @@ -982,8 +984,6 @@ AS_IF([test "$with_xml2" = yes -o "$with_xml2" = check], [ LIBS="$curr_libs"; CPPFLAGS="$curr_cppflags" ]) - - # Checks for cjson/json-c. AC_MSG_NOTICE([Checks for JSON handler]) @@ -1080,7 +1080,8 @@ AS_IF([test "$USE_JSON" = "cjson" -o "$USE_JSON" = "local" -o "$USE_JSON" = chec #endif #if (CJSON_VERSION_MAJOR * 100 + CJSON_VERSION_MINOR) < 103 #error Needs at least cJSON 1.3.0 - #endif]], + #endif + ]], [[cJSON_CreateNull ();]])], [AC_MSG_RESULT([yes]) AC_DEFINE([WITH_CJSON], [1]) @@ -1168,6 +1169,92 @@ case "$USE_JSON" in ;; esac +AC_MSG_NOTICE([Check for XLSX handler]) + +AC_ARG_WITH([xlsx], + [AS_HELP_STRING([[--with-xlsx[=ARG]]], + [(GnuCOBOL) Use xlsx library/source as XLSX writer handler, where ARG may be: + check (default), libxlsxwriter, no])], + [case "$with_xlsx" in + libxlsxwriter | check | no ) + USE_XLSX="$with_xlsx" + ;; + yes) + USE_XSLX=check + ;; + *) + AC_MSG_ERROR([invalid value "$with_xlsx" for --with-xlsx, + must be one of the following: + libxlsxwirter (use only the specified library) + check (check if libxlsxwriter is available, disable if not) + no (disable xlsx usage)]) + ;; + esac], + [USE_XLSX=check]) + +curr_libs="$LIBS" +AS_IF([test "$USE_XLSX" = "libxlsxwriter" -o "$USE_XLSX" = check], [ + AC_MSG_NOTICE([Checks for libxlsxwriter ...]) + curr_libs="$LIBS"; curr_cppflags="$CPPFLAGS" + PKG_CHECK_MODULES([XLSX], [libxlsxwriter], [], [# + ]) + CPPFLAGS="$CPPFLAGS $XLSX_CFLAGS" + if test -z "${XLSX_LIBS+x}"; then + XLSX_LIBS="-lxlsxwriter" + fi + LIBS="$LIBS $LIBCOB_LIBS $XLSX_LIBS" + AC_CHECK_HEADERS([xlsxwriter.h xlsxwriter/xlsxwriter.h], [break], + [if test "$with_xlsx" = "libxlsxwriter"; then + AC_MSG_ERROR([header for lobxlsxwriter is required for --with-xlsx=libxlsxwriter, you may adjust XLSX_CFLAGS]) + else + AC_MSG_WARN([header for libxlsxwriter missing, you may adjust XLSX_CFLAGS]) + fi] + ) + AS_IF([test "x$ac_cv_header_xlsxwriter_h" = xyes -o "x$ac_cv_header_xlsxwriter_xlsxwriter_h" = xyes], [ + AC_MSG_CHECKING([whether linking against libxlsxwriter with "$XLSX_LIBS" works]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([ + [#if defined HAVE_XLSXWRITER_XLSXWRITER_H + #include + #elif defined HAVE_XLSXWRITER_H + #include + #endif + #if LXW_VERSION_ID < 114 + #error Needs at least libxlsxwriter 1.1.4 + #endif + ]], + [[lxw_version ();]])], + [AC_MSG_RESULT([yes]) + AC_DEFINE([WITH_XLSXWRITER], [1]) + USE_XLSX=libxlsxwriter + if test -n "$XLSX_CFLAGS"; then + LIBCOB_CPPFLAGS="$LIBCOB_CPPFLAGS $XLSX_CFLAGS" + fi + LIBCOB_LIBS="$LIBCOB_LIBS $XLSX_LIBS"], + [AC_MSG_RESULT([no]) + if test "$with_xlsx" = "libxlsxwriter"; then + AC_MSG_ERROR([[libxlsxwriter library is required for --with-xlsx=libxlsxwriter, you may adjust XLSX_LIBS]]) + else + AC_MSG_WARN([libxlsxwriter library not found, you may adjust XLSX_LIBS]) + fi]) + ]) + LIBS="$curr_libs"; CPPFLAGS="$curr_cppflags" +]) + +case "$USE_XLSX" in + check) + if test "$with_json" = yes; then + AC_MSG_FAILURE([[no applicable handler for XLSX found]]) + fi + USE_XLSX="not_found" + AC_DEFINE([WITH_XLSX], ["not found"]) + ;; + no) + AC_DEFINE([WITH_XLSX], ["disabled"]) + ;; + libxlsxwriter) + AC_DEFINE([WITH_XLSX], "libxlsxwriter") + ;; +esac AC_ARG_WITH([dl], [AS_HELP_STRING([--with-dl], @@ -2363,6 +2450,8 @@ else COB_HAS_JSON=$USE_JSON fi +COB_HAS_XLSX=$USE_XLSX + AM_CONDITIONAL([LOCAL_CJSON],[test "$USE_JSON" = "local"]) unset COB_USES_GCC @@ -2453,6 +2542,7 @@ AC_SUBST([COB_HAS_ISAM]) AC_SUBST([COB_HAS_CURSES]) AC_SUBST([COB_HAS_XML2]) AC_SUBST([COB_HAS_JSON]) +AC_SUBST([COB_HAS_XLSX]) AC_SUBST([COB_HAS_64_BIT_POINTER]) AC_SUBST([COB_PATCH_LEVEL], [$with_patch_level]) # needed for bin/cob-config @@ -2554,4 +2644,16 @@ case "$USE_JSON" in ;; esac +case "$USE_XLSX" in + not_found) + AC_MSG_NOTICE([ XLSX writer (no handler found): NO]) + ;; + no) + AC_MSG_NOTICE([ XLSX writer handler: NO]) + ;; + *) + AC_MSG_NOTICE([ Used for XLSX writer: ${USE_XLSX}]) + ;; +esac + unset DEFINE_DL diff --git a/libcob/cobperf.c b/libcob/cobperf.c index 37c41fb6c..33c05fbdd 100644 --- a/libcob/cobperf.c +++ b/libcob/cobperf.c @@ -18,7 +18,11 @@ along with GnuCOBOL. If not, see . */ +#include +#include #define COB_LIB_EXPIMP + +#include "config.h" #include "cobperf.h" #include @@ -28,33 +32,50 @@ #include #include +#if HAVE_XLSXWRITER_H +#include +#elif HAVE_XLSXWRITER_XLSXWRITER_H +#include +#endif + static bool is_init = false; -static size_t *called_paragraphs = NULL; -static long *start_times = NULL; +static size_t called_paragraphs[255][2]; +static long start_times[255]; static size_t current_idx = ULONG_MAX; -static const char **paragraphs = NULL; -static size_t paragraphs_count = 0; static const char **sections = NULL; static size_t sections_count = 0; static const char *(*para_per_sections)[255] = NULL; static size_t max_paragraphs_count = 0; -static long *total_times = NULL; +static long (*total_times)[255] = NULL; + +static size_t +get_str_index(const char *str, const char **arr, size_t arr_len) +{ + for (size_t i = 0; i < arr_len; i++) { + if (arr[i] == NULL) return ULONG_MAX; + if (!strcmp(str, arr[i])) return i; + } + + return ULONG_MAX; +} void -cob_perf_init(size_t *called_paragraphs_p, - long * start_times_p, - long *total_times_p, +cob_perf_init(long (*total_times_p)[255], const char **paragraphs_p, size_t paragraphs_count_p, const char **sections_p, size_t sections_count_p, const char *(*para_per_sections_p)[255], size_t max_paragraphs_count_p) { - called_paragraphs = called_paragraphs_p; - start_times = start_times_p; - paragraphs = paragraphs_p; - paragraphs_count = paragraphs_count_p; + if (max_paragraphs_count_p > 254) { + fprintf (stderr, + "[cob_perf] Unable to handle more than 254 paragraphs per section" + ", aborting profiling.\n"); + return; + + } + sections = sections_p; sections_count = sections_count_p; para_per_sections = para_per_sections_p; @@ -63,154 +84,265 @@ cob_perf_init(size_t *called_paragraphs_p, total_times = total_times_p; for (size_t i = 0; i < 255; i++) { - called_paragraphs[i] = ULONG_MAX; + called_paragraphs[i][0] = ULONG_MAX; + called_paragraphs[i][1] = ULONG_MAX; start_times[i] = ULONG_MAX; } is_init = true; } -static size_t -get_str_index (const char *str, const char* arr[], size_t arr_len) { - for (size_t i = 0; i < arr_len; i++) { - if (!arr[i]) return ULONG_MAX; - if (!strcmp(str, arr[i])) return i; - } - - return ULONG_MAX; -} - void -cob_perf_enter_paragraph(const char *name) { +cob_perf_enter_paragraph(const char *section, const char *paragraph) +{ if (!is_init) return; - size_t para_idx = get_str_index (name, paragraphs, paragraphs_count); + // We should always have a section when entering a paragraph. + if (!section) return; - current_idx++; - called_paragraphs[current_idx] = para_idx; + size_t sec_idx = get_str_index(section, sections, sections_count); + if (sec_idx == ULONG_MAX) { + fprintf (stderr, "[cob_perf] Could not find section %s, aborting profiling.\n", section); + is_init = false; + return; + } + + size_t para_idx = get_str_index(paragraph, para_per_sections[sec_idx], max_paragraphs_count); + if (para_idx == ULONG_MAX) { + fprintf (stderr, "[cob_perf] Could not find paragraph %s IN %s, aborting profiling.\n", + section, paragraph); + is_init = false; + return; + } + + // If the paragraph entered is in another section than the current one, then we want to + // enter it too. + if (called_paragraphs[current_idx][0] != sec_idx) cob_perf_enter_section(section); struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); + + current_idx++; + + called_paragraphs[current_idx][0] = sec_idx; + called_paragraphs[current_idx][1] = para_idx; start_times[current_idx] = ts.tv_nsec; } -void cob_perf_exit_paragraph(const char *name) { +void +cob_perf_enter_section(const char *section) +{ if (!is_init) return; - size_t para_idx = get_str_index (name, paragraphs, paragraphs_count); + size_t sec_idx = get_str_index(section, sections, sections_count); - if (called_paragraphs[current_idx] != para_idx) { - fprintf(stderr, "[cob_perf] Warning: out of order paragraph exiting\n"); + if (sec_idx == ULONG_MAX) { + fprintf (stderr, "[cob_perf] Could not find section %s, aborting profiling.\n", section); + is_init = false; + return; } struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); - while (current_idx != ULONG_MAX && called_paragraphs[current_idx] != para_idx) { - size_t idx = called_paragraphs[current_idx]; - if (idx != ULONG_MAX) { - total_times[idx] += ts.tv_nsec - start_times[current_idx]; - start_times[current_idx] = ULONG_MAX; - called_paragraphs[current_idx] = ULONG_MAX; - current_idx--; - } else return; /* TODO: check if this is fine */ - } + current_idx++; - total_times[para_idx] += ts.tv_nsec - start_times[current_idx]; - start_times[current_idx] = ULONG_MAX; - called_paragraphs[current_idx] = ULONG_MAX; - current_idx--; + called_paragraphs[current_idx][0] = sec_idx; + called_paragraphs[current_idx][1] = ULONG_MAX; + start_times[current_idx] = ts.tv_nsec; } -static bool -is_in_section (size_t sec_idx, size_t para_idx) { - const char *sec_name = paragraphs[sec_idx]; - const char *para_name = paragraphs[para_idx]; +void +cob_perf_exit_paragraph(const char *section, const char *paragraph) +{ + if (!is_init) return; - size_t sec_idx_ = get_str_index (sec_name, sections, sections_count); - size_t para_idx_ = get_str_index (para_name, para_per_sections[sec_idx_], max_paragraphs_count); + size_t sec_idx = get_str_index(section, sections, sections_count); - return para_idx_ != ULONG_MAX; + if (sec_idx == ULONG_MAX) { + fprintf(stderr, "[cob_perf] Could not find section %s, aborting profiling.\n", section); + is_init = false; + return; + } + + size_t para_idx = get_str_index(paragraph, para_per_sections[sec_idx], max_paragraphs_count); + + if (para_idx == ULONG_MAX) { + fprintf(stderr, "[cob_perf] Could not find paragraph %s IN %s, aborting profiling.\n", + section, paragraph); + is_init = false; + return; + } + + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + + while (current_idx != ULONG_MAX) { + size_t curr_sec = called_paragraphs[current_idx][0]; + size_t curr_para = called_paragraphs[current_idx][1]; + if (curr_para == ULONG_MAX) { + total_times[curr_sec][254] += ts.tv_nsec - start_times[current_idx]; + } else { + total_times[curr_sec][curr_para] += ts.tv_nsec - start_times[current_idx]; + } + current_idx--; + if (curr_sec == sec_idx && curr_para == para_idx) return; + } } void -cob_perf_enter_section(const char *name) { +cob_perf_exit_section(const char *section) +{ if (!is_init) return; - size_t sec_idx = get_str_index(name, paragraphs, paragraphs_count); - current_idx++; - called_paragraphs[current_idx] = sec_idx; + size_t sec_idx = get_str_index(section, sections, sections_count); + + if (sec_idx == ULONG_MAX) { + fprintf (stderr, "[cob_perf] Could not find section %s, aborting profiling.\n", section); + is_init = false; + return; + } struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); - start_times[current_idx] = ts.tv_nsec; + + while (current_idx != ULONG_MAX) { + size_t curr_sec = called_paragraphs[current_idx][0]; + size_t curr_para = called_paragraphs[current_idx][1]; + + if (curr_para == ULONG_MAX) { + total_times[curr_sec][254] += ts.tv_nsec - start_times[current_idx]; + } else { + total_times[curr_sec][curr_para] += ts.tv_nsec - start_times[current_idx]; + } + current_idx--; + if (curr_sec == sec_idx && curr_para == ULONG_MAX) return; + } } +/* GO TO are generated for both explicit COBOL GO TO statements and COBOL EXIT ... statements. + * We do not need to have a paragraph/section enter function since these will be executed when + * the c goto is executed. */ void -cob_perf_exit_section(const char *name) { +cob_perf_goto(const char *section, const char *paragraph) +{ if (!is_init) return; - size_t sec_idx = get_str_index(name, paragraphs, paragraphs_count); - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); + if (section == NULL) { + + // GO TO exit : section = NULL, paragraph = invalid section name + if (get_str_index(paragraph, sections, sections_count) == ULONG_MAX) { + return; + } - while (current_idx != ULONG_MAX && is_in_section(sec_idx, called_paragraphs[current_idx])) { - size_t idx = called_paragraphs[current_idx]; - if (idx != ULONG_MAX) { - total_times[idx] += ts.tv_nsec - start_times[current_idx]; - start_times[current_idx] = ULONG_MAX; - called_paragraphs[current_idx] = ULONG_MAX; - current_idx--; - } else return; + // GO TO section : section = NULL, paragraph = target section name + while (current_idx != ULONG_MAX) { + cob_perf_exit_section(sections[called_paragraphs[current_idx][0]]); + } + + return; } - if (called_paragraphs[current_idx] != sec_idx) { - fprintf(stderr, "[cob_perf] Warning: out of order section exiting\n"); + size_t sec_idx = get_str_index(section, sections, sections_count); + + if (sec_idx == ULONG_MAX) { + fprintf (stderr, "[cob_perf] Could not find section %s, aborting profiling.\n", section); + is_init = false; + return; } - while (current_idx != ULONG_MAX && called_paragraphs[current_idx] != sec_idx) { - size_t idx = called_paragraphs[current_idx]; - if (idx != ULONG_MAX) { - total_times[idx] += ts.tv_nsec - start_times[current_idx]; - start_times[current_idx] = ULONG_MAX; - called_paragraphs[current_idx] = ULONG_MAX; - current_idx--; - } else return; + size_t para_idx = get_str_index(paragraph, para_per_sections[sec_idx], max_paragraphs_count); + + if (para_idx == ULONG_MAX) { + fprintf (stderr, "[cob_perf] Could not find paragraph %s IN %s, aborting profiling\n", + section, paragraph); + is_init = false; + return; } - total_times[sec_idx] += ts.tv_nsec - start_times[current_idx]; - start_times[current_idx] = ULONG_MAX; - called_paragraphs[current_idx] = ULONG_MAX; - current_idx--; + if (sec_idx == called_paragraphs[current_idx][0]) { + size_t curr_para = called_paragraphs[current_idx][1]; + + while (curr_para != ULONG_MAX) { + cob_perf_exit_paragraph ( + section, + para_per_sections[sec_idx][called_paragraphs[current_idx][1]]); + curr_para = called_paragraphs[current_idx][1]; + } + } else { + while (current_idx != ULONG_MAX) { + cob_perf_exit_section(sections[called_paragraphs[current_idx][0]]); + } + } } void cob_perf_end() { - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - while (current_idx != ULONG_MAX) { - size_t idx = called_paragraphs[current_idx]; - if (idx != ULONG_MAX) { - total_times[idx] = ts.tv_nsec - start_times[current_idx]; - start_times[current_idx] = ULONG_MAX; - called_paragraphs[current_idx] = ULONG_MAX; + cob_perf_exit_section(sections[called_paragraphs[current_idx][0]]); + } + + +#if WITH_XLSXWRITER + lxw_workbook *workbook = workbook_new("perf.xlsx"); + lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL); + + worksheet_write_string(worksheet, 0, 0, "Section", NULL); + worksheet_write_string(worksheet, 0, 1, "Paragraph", NULL); + worksheet_write_string(worksheet, 0, 2, "Time (ns)", NULL); + + size_t row = 1; + for (size_t i = 0; i < sections_count; i++) { + + worksheet_write_string(worksheet, row, 0, sections[i], NULL); + worksheet_write_number(worksheet, row, 2, (double)total_times[i][254], NULL); + row++; + + for (size_t j = 0; j < max_paragraphs_count; j++) { + const char *para = para_per_sections[i][j]; + if (para == NULL) break; + + worksheet_write_string(worksheet, row, 0, sections[i], NULL); + worksheet_write_string(worksheet, row, 1, para, NULL); + worksheet_write_number(worksheet, row, 2, (double)total_times[i][j], NULL); + row++; } - current_idx--; } - for (size_t i = 0; i < paragraphs_count; i++) { - printf ("%s total time: %ld ns\n", paragraphs[i], total_times[i]); + workbook_close(workbook); + +#else + FILE *file = fopen("cob_perf.csv", "w"); + + if (!!file) { + fprintf (file, "section, time\n"); + for (size_t i = 0; i < sections_count; i++) { + fprintf (file, "%s, %lu ns\n", sections[i], total_times[i][254]); + + for (size_t j = 0; j < max_paragraphs_count; j++) { + const char *para = para_per_sections[i][j]; + if (para == NULL) break; + + fprintf (file, "%s, %lu ns\n", para, total_times[i][j]); + } + } + + fclose(file); } +#endif + + current_idx = ULONG_MAX; - is_init = false; - called_paragraphs = NULL; - start_times = NULL; - total_times = NULL; - paragraphs = NULL; sections = NULL; + sections_count = 0; para_per_sections = NULL; + max_paragraphs_count = 0; + + total_times = NULL; + + is_init = false; + } diff --git a/libcob/cobperf.h b/libcob/cobperf.h index 1a6157919..dd8031441 100644 --- a/libcob/cobperf.h +++ b/libcob/cobperf.h @@ -44,19 +44,20 @@ #endif #endif +#include #include #include -COB_EXPIMP void cob_perf_init(size_t*, /* called_paragraphs */ - long*, /* start_times */ - long*, /* total_times */ + +COB_EXPIMP void cob_perf_init(long(*)[255], /* total_times */ const char**, size_t, /* paragraphs */ const char**, size_t, /* sections */ const char *(*)[255], size_t /* para_per_sections */); -COB_EXPIMP void cob_perf_enter_paragraph(const char *name); -COB_EXPIMP void cob_perf_exit_paragraph(const char *name); -COB_EXPIMP void cob_perf_enter_section(const char *name); -COB_EXPIMP void cob_perf_exit_section(const char *name); +COB_EXPIMP void cob_perf_enter_paragraph(const char*, const char*); +COB_EXPIMP void cob_perf_exit_paragraph(const char*, const char*); +COB_EXPIMP void cob_perf_enter_section(const char*); +COB_EXPIMP void cob_perf_exit_section(const char*); +COB_EXPIMP void cob_perf_goto(const char*, const char*); COB_EXPIMP void cob_perf_end(void); diff --git a/m4/libtool.m4 b/m4/libtool.m4 index b6a7da5a8..717e76978 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,6 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2019 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -28,10 +29,10 @@ m4_define([_LT_COPYING], [dnl # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -181,6 +182,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -728,7 +730,6 @@ _LT_CONFIG_SAVE_COMMANDS([ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -778,7 +779,7 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1067,17 +1068,12 @@ _LT_EOF _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1126,12 +1122,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1245,7 +1241,8 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1262,7 +1259,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1292,7 +1289,7 @@ ia64-*-hpux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1309,7 +1306,7 @@ ia64-*-hpux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1321,7 +1318,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1343,7 +1340,7 @@ mips64*-*linux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1351,7 +1348,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1359,7 +1356,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1379,14 +1376,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1454,7 +1451,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1727,7 +1724,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1770,7 +1767,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2571,7 +2568,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2581,7 +2578,7 @@ m4_if([$1], [],[ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2607,7 +2604,7 @@ m4_if([$1], [],[ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2677,7 +2674,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -2909,18 +2906,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3488,7 +3473,7 @@ beos*) bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3522,14 +3507,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3543,7 +3528,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3580,7 +3565,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3590,7 +3575,7 @@ netbsd* | netbsdelf*-gnu) newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3717,13 +3702,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3749,7 +3734,7 @@ else # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3989,7 +3974,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -4007,20 +3992,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4062,9 +4047,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4351,7 +4336,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4434,7 +4419,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4458,7 +4443,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4770,7 +4755,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -5078,7 +5063,7 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5205,7 +5190,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5248,7 +5233,7 @@ _LT_EOF _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5260,7 +5245,7 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -5276,7 +5261,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5287,7 +5272,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5685,7 +5670,7 @@ _LT_EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5829,7 +5814,7 @@ _LT_EOF esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6797,7 +6782,7 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6934,7 +6919,7 @@ if test yes != "$_lt_caught_CXX_error"; then # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7074,13 +7059,13 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8226,6 +8211,14 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 94b082976..b0b5e9c21 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,7 +1,7 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 48bc9344a..902508bd9 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index fa04b52a3..0026c21cf 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -1,6 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4249 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7.4-1ec8f-dirty]) +m4_define([LT_PACKAGE_REVISION], [2.4.7.4]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7.4-1ec8f-dirty' +macro_revision='2.4.7.4' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index c6b26f88f..0f7a8759d 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,7 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives diff --git a/po/Makefile.in.in b/po/Makefile.in.in index baa8e707f..38c293d2e 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,14 +1,13 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-2000 Ulrich Drepper -# Copyright (C) 2000-2020 Free Software Foundation, Inc. +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. This file is offered as-is, # without any warranty. # -# Origin: gettext-0.20.2 -GETTEXT_MACRO_VERSION = 0.20 +# Origin: gettext-0.19.8 +GETTEXT_MACRO_VERSION = 0.19 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -53,13 +52,16 @@ GMSGFMT_ = @GMSGFMT@ GMSGFMT_no = @GMSGFMT@ GMSGFMT_yes = @GMSGFMT_015@ GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) +MSGFMT_ = @MSGFMT@ +MSGFMT_no = @MSGFMT@ +MSGFMT_yes = @MSGFMT_015@ +MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) XGETTEXT_ = @XGETTEXT@ XGETTEXT_no = @XGETTEXT@ XGETTEXT_yes = @XGETTEXT_015@ XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) -MSGMERGE = @MSGMERGE@ +MSGMERGE = msgmerge MSGMERGE_UPDATE = @MSGMERGE@ --update -MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@ MSGINIT = msginit MSGCONV = msgconv MSGFILTER = msgfilter @@ -90,44 +92,27 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) # Makevars gets inserted here. (Don't remove this line!) -all: all-@USE_NLS@ +.SUFFIXES: +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update +.po.mo: + @echo "$(MSGFMT) -c -o $@ $<"; \ + $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ -.SUFFIXES: -.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update - -# The .pot file, stamp-po, .po files, and .gmo files appear in release tarballs. -# The GNU Coding Standards say in -# : -# "GNU distributions usually contain some files which are not source files -# ... . Since these files normally appear in the source directory, they -# should always appear in the source directory, not in the build directory. -# So Makefile rules to update them should put the updated files in the -# source directory." -# Therefore we put these files in the source directory, not the build directory. - -# During .po -> .gmo conversion, take into account the most recent changes to -# the .pot file. This eliminates the need to update the .po files when the -# .pot file has changed, which would be troublesome if the .po files are put -# under version control. -$(GMOFILES): $(srcdir)/$(DOMAIN).pot .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \ - cd $(srcdir) && \ - rm -f $${lang}.gmo && \ - $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \ - $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \ - mv t-$${lang}.gmo $${lang}.gmo && \ - rm -f $${lang}.1po + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: sed -e '/^#/d' $< > t-$@ mv t-$@ $@ -all-yes: $(srcdir)/stamp-po +all: all-@USE_NLS@ + +all-yes: stamp-po all-no: # Ensure that the gettext macros and this Makefile.in.in are in sync. @@ -141,24 +126,24 @@ CHECK_MACRO_VERSION = \ # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because # we don't want to bother translators with empty POT files). We assume that # LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. -# In this case, $(srcdir)/stamp-po is a nop (i.e. a phony target). - -# $(srcdir)/stamp-po is a timestamp denoting the last time at which the CATALOGS -# have been loosely updated. Its purpose is that when a developer or translator -# checks out the package from a version control system, and the $(DOMAIN).pot -# file is not under version control, "make" will update the $(DOMAIN).pot and -# the $(CATALOGS), but subsequent invocations of "make" will do nothing. This -# timestamp would not be necessary if updating the $(CATALOGS) would always -# touch them; however, the rule for $(POFILES) has been designed to not touch -# files that don't need to be changed. -$(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot +# In this case, stamp-po is a nop (i.e. a phony target). + +# stamp-po is a timestamp denoting the last time at which the CATALOGS have +# been loosely updated. Its purpose is that when a developer or translator +# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent +# invocations of "make" will do nothing. This timestamp would not be necessary +# if updating the $(CATALOGS) would always touch them; however, the rule for +# $(POFILES) has been designed to not touch files that don't need to be +# changed. +stamp-po: $(srcdir)/$(DOMAIN).pot @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ - echo "touch $(srcdir)/stamp-po" && \ - echo timestamp > $(srcdir)/stamp-poT && \ - mv $(srcdir)/stamp-poT $(srcdir)/stamp-po; \ + echo "touch stamp-po" && \ + echo timestamp > stamp-poT && \ + mv stamp-poT stamp-po; \ } # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', @@ -174,9 +159,11 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ - LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep -i 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ + -size -10000000c -exec grep 'GNU @PACKAGE@' \ + /dev/null '{}' ';' 2>/dev/null; \ else \ - LC_ALL=C grep -i 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ fi; \ } | grep -v 'libtool:' >/dev/null; then \ package_gnu=yes; \ @@ -197,29 +184,26 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --msgid-bugs-address="$$msgid_bugs_address" \ - $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ ;; \ *) \ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --package-name="$${package_prefix}@PACKAGE@" \ --package-version='@VERSION@' \ --msgid-bugs-address="$$msgid_bugs_address" \ - $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ ;; \ esac test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot-header; then \ sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \ - cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po && \ - rm -f $(DOMAIN).1po \ - || exit 1; \ + cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \ + rm -f $(DOMAIN).1po; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ @@ -244,19 +228,17 @@ $(srcdir)/$(DOMAIN).pot: # This target rebuilds a PO file if $(DOMAIN).pot has changed. # Note that a PO file is not touched if it doesn't need to be changed. $(POFILES): $(POFILESDEPS) - @test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ + test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ - && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ - 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ esac; \ }; \ else \ @@ -391,41 +373,34 @@ check: all info dvi ps pdf html tags TAGS ctags CTAGS ID: -install-dvi install-ps install-pdf install-html: - mostlyclean: rm -f remove-potcdate.sed - rm -f $(srcdir)/stamp-poT + rm -f stamp-poT rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po rm -fr *.o clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES + rm -f Makefile Makefile.in POTFILES *.mo maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f $(srcdir)/$(DOMAIN).pot $(srcdir)/stamp-po $(GMOFILES) + rm -f stamp-po $(GMOFILES) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. -dist2: $(srcdir)/stamp-po $(DISTFILES) - @dists="$(DISTFILES)"; \ +dist2: stamp-po $(DISTFILES) + dists="$(DISTFILES)"; \ if test "$(PACKAGE)" = "gettext-tools"; then \ dists="$$dists Makevars.template"; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ dists="$$dists $(DOMAIN).pot stamp-po"; \ - else \ - case $(XGETTEXT) in \ - :) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because a suitable 'xgettext' program was not found in PATH." 1>&2;; \ - *) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because 'xgettext' found no strings to extract. Check the contents of the POTFILES.in file and the XGETTEXT_OPTIONS in the Makevars file." 1>&2;; \ - esac; \ fi; \ if test -f $(srcdir)/ChangeLog; then \ dists="$$dists ChangeLog"; \ @@ -464,15 +439,13 @@ update-po: Makefile tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ - 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ esac; \ }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ diff --git a/po/Rules-quot b/po/Rules-quot index 18c024bf4..baf652858 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -1,9 +1,5 @@ +# This file, Rules-quot, can be copied and used freely without restrictions. # Special Makefile rules for English message catalogs with quotation marks. -# -# Copyright (C) 2001-2017 Free Software Foundation, Inc. -# This file, Rules-quot, and its auxiliary files (listed under -# DISTFILES.common.extra1) are free software; the Free Software Foundation -# gives unlimited permission to use, copy, distribute, and modify them. DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot diff --git a/po/de.po b/po/de.po index 3192a2891..64f7a10b4 100644 --- a/po/de.po +++ b/po/de.po @@ -162,7 +162,6 @@ msgstr "Compilieren von %s wird in Zeile %d abgebrochen (%s:%s)" #: cobc/cobc.c:2243 #, fuzzy, c-format -#| msgid "aborting compile of %s at line %d (%s: %s)" msgid "aborting codegen for %s, last statement at line %d (%s: %s)" msgstr "Compilieren von %s wird in Zeile %d abgebrochen (%s:%s)" @@ -182,7 +181,6 @@ msgstr "Bitte melden Sie das!" #: cobc/cobc.c:2346 bin/cobcrun.c:100 #, fuzzy, c-format -#| msgid "License GPLv3+: GNU GPL version 3 or later " msgid "License GPLv3+: GNU GPL version 3 or later <%s>" msgstr "Lizenz GPLv3+: GNU GPL Version 3 oder neuer " @@ -196,7 +194,6 @@ msgstr "" #: cobc/cobc.c:2350 libcob/common.c:8743 bin/cobcrun.c:104 #, fuzzy, c-format -#| msgid "Written by %s\n" msgid "Written by %s" msgstr "Geschrieben von %s\n" @@ -303,7 +300,6 @@ msgstr "eingebaut" #: libcob/common.c:8866 libcob/common.c:8868 libcob/common.c:8870 #: libcob/common.c:8873 libcob/common.c:8875 libcob/common.c:8878 #, fuzzy -#| msgid "ISAM file handler" msgid "indexed file handler" msgstr "ISAM-Dateiverarbeitung" @@ -334,7 +330,6 @@ msgstr "Nur eine der Optionen »m«, »x« oder »b« kann angegeben werden" #: cobc/cobc.c:2652 #, fuzzy, c-format -#| msgid "-fdump= requires one of 'ALL', 'FD', 'WS', 'LS', 'RD', 'FD', 'SC' not '%s'" msgid "option requires one of 'ALL', 'FD', 'WS', 'LS', 'RD', 'FD', 'SC', 'LO' - not '%s'" msgstr "-fdump= benötigt eine von »ALL«, »FD«, »WS«, »LS«, »RD«, »FD«, »SC«, nicht jedoch »%s«" @@ -423,7 +418,6 @@ msgstr "Für -j gibt es nichts zu tun" #: cobc/cobc.c:4406 cobc/cobc.c:4420 #, fuzzy, c-format -#| msgid "... removed from environment" msgid "%s is resolved by environment as: %s" msgstr "… aus der Umgebung entfernt" @@ -683,7 +677,6 @@ msgstr "" #: cobc/config.def:67 #, fuzzy -#| msgid "invalid numeric literal: '%s'" msgid "maximum numeric literal size" msgstr "Ungültiges numerisches Literal: »%s«" @@ -735,7 +728,6 @@ msgstr "" #: cobc/config.def:112 #, fuzzy -#| msgid "'%s' cannot have OCCURS DEPENDING" msgid "allow complex OCCURS DEPENDING ON" msgstr "»%s« kann nicht mit OCCURS DEPENDING definiert werden" @@ -859,7 +851,6 @@ msgstr "" #: cobc/config.def:211 cobc/ppparse.y:101 cobc/ppparse.y:104 #, fuzzy -#| msgid "numeric boolean literal" msgid "partial replacing with literal" msgstr "Numerisches boolesches Literal" @@ -877,7 +868,6 @@ msgstr "" #: cobc/config.def:223 #, fuzzy -#| msgid "invalid VALUE clause" msgid "VALUE-OF clause" msgstr "Ungültige VALUE-Klausel" @@ -919,7 +909,6 @@ msgstr "" #: cobc/config.def:253 #, fuzzy -#| msgid "invalid SET statement" msgid "STOP-literal statement" msgstr "Ungültige SET-Anweisung" @@ -929,7 +918,6 @@ msgstr "" #: cobc/config.def:259 #, fuzzy -#| msgid "invalid SET statement" msgid "STOP ERROR statement" msgstr "Ungültige SET-Anweisung" @@ -955,7 +943,6 @@ msgstr "" #: cobc/config.def:280 #, fuzzy -#| msgid "invalid SET statement" msgid "ENTRY statement" msgstr "Ungültige SET-Anweisung" @@ -977,7 +964,6 @@ msgstr "" #: cobc/config.def:295 #, fuzzy -#| msgid "OCCURS DEPENDING ON '%s' out of bounds: %d" msgid "OCCURS DEPENDING ON without to" msgstr "OCCURS DEPENDING ON »%s« außerhalb des gültigen Bereichs: %d" @@ -987,7 +973,6 @@ msgstr "" #: cobc/config.def:301 #, fuzzy -#| msgid "invalid SET statement" msgid "ALTER statement" msgstr "Ungültige SET-Anweisung" @@ -997,7 +982,6 @@ msgstr "" #: cobc/config.def:307 #, fuzzy -#| msgid "numeric boolean literal" msgid "boolean literals (B'1010')" msgstr "Numerisches boolesches Literal" @@ -1034,7 +1018,6 @@ msgstr "" #: cobc/config.def:331 #, fuzzy -#| msgid "NOT EXCEPTION before EXCEPTION" msgid "NOT ON EXCEPTION before ON EXCEPTION" msgstr "NOT EXCEPTION vor EXCEPTION" @@ -1052,7 +1035,6 @@ msgstr "" #: cobc/config.def:344 #, fuzzy -#| msgid "'%s' is not defined in SPECIAL-NAMES" msgid "constants defined in SPECIAL-NAMES" msgstr "»%s« ist nicht unter SPECIAL-NAMES definiert" @@ -1098,7 +1080,6 @@ msgstr "" #: cobc/config.def:377 #, fuzzy -#| msgid "REDEFINES must follow the original definition" msgid "REDEFINES clause not following entry-name in definition" msgstr "REDEFINES muss der ursprünglichen Definition folgen" @@ -1182,7 +1163,6 @@ msgstr "Im Abschnitt »%s«:" #: cobc/error.c:94 #, fuzzy, c-format -#| msgid "in paragraph" msgid "in paragraph '%s':" msgstr "Im Absatz" @@ -1277,13 +1257,11 @@ msgstr "»%s« ist mehrdeutig; erfordert Eingrenzung" #: cobc/error.c:1090 #, fuzzy, c-format -#| msgid "'%s' is not an integer" msgid "'%s' is a special register" msgstr "»%s« ist keine Ganzzahl" #: cobc/error.c:1093 #, fuzzy, c-format -#| msgid "'%s' is not defined" msgid "'%s' internally defined" msgstr "»%s« ist nicht definiert" @@ -1400,13 +1378,11 @@ msgstr "Doppelte %s-Klausel" #: cobc/field.c:906 #, fuzzy, c-format -#| msgid "PICTURE clause not compatible with USAGE %s" msgid "%s clause not compatible with PIC %s" msgstr "PICTURE-Klausel nicht kompatibel mit USAGE-Angabe %s" #: cobc/field.c:917 cobc/field.c:953 #, fuzzy, c-format -#| msgid "PICTURE clause not compatible with USAGE %s" msgid "%s clause not compatible with USAGE %s" msgstr "PICTURE-Klausel nicht kompatibel mit USAGE-Angabe %s" @@ -1452,7 +1428,6 @@ msgstr "" #: cobc/field.c:1198 #, fuzzy, c-format -#| msgid "'%s' ANY LENGTH must be 01 level" msgid "'%s' ANY LENGTH must be PIC X, PIC N or PIC 1" msgstr "»%s« ANY LENGTH muss auf Level 01 sein" @@ -1498,13 +1473,11 @@ msgstr "»%s« BASED nur auf den Stufennumern 01 und 77 zulässig" #: cobc/field.c:1279 #, fuzzy, c-format -#| msgid "'%s' cannot have OCCURS DEPENDING" msgid "'%s' cannot have an OCCURS clause due to '%s'" msgstr "»%s« kann nicht mit OCCURS DEPENDING definiert werden" #: cobc/field.c:1298 #, fuzzy, c-format -#| msgid "the original definition '%s' should not have OCCURS clause" msgid "the original definition '%s' should not have an OCCURS clause" msgstr "Die ursprüngliche Definition »%s« sollte keine OCCURS-Klausel aufweisen" @@ -1524,7 +1497,6 @@ msgstr "Die ursprüngliche Definition '%s' kann keine variable Länge aufweisen" #: cobc/field.c:1335 #, fuzzy, c-format -#| msgid "'%s' cannot have JUSTIFIED RIGHT" msgid "'%s' cannot have JUSTIFIED RIGHT clause" msgstr "»%s« kann nicht das Attribut JUSTIFIED RIGHT haben" @@ -1540,7 +1512,6 @@ msgstr "" #: cobc/field.c:1436 #, fuzzy, c-format -#| msgid "PICTURE clause not compatible with USAGE %s" msgid "%s USAGE %s incompatible with %s USAGE %s" msgstr "PICTURE-Klausel nicht kompatibel mit USAGE-Angabe %s" @@ -1599,7 +1570,6 @@ msgstr "" #: cobc/field.c:1708 cobc/field.c:1712 #, fuzzy, c-format -#| msgid "%s clause is required for file '%s'" msgid "initial VALUE clause ignored for %s item '%s'" msgstr "%s-Klausel wird für Datei »%s« benötigt" @@ -1613,7 +1583,6 @@ msgstr "" #: cobc/field.c:1763 #, fuzzy -#| msgid "cannot specify both %s and %s" msgid "cannot specify both FULL and JUSTIFIED" msgstr "%s und %s können nicht gleichzeitig angegeben werden" @@ -1629,7 +1598,6 @@ msgstr "" #: cobc/field.c:1805 #, fuzzy -#| msgid "cannot specify both %s and %s" msgid "cannot specify both PIC and VALUE" msgstr "%s und %s können nicht gleichzeitig angegeben werden" @@ -1639,7 +1607,6 @@ msgstr "" #: cobc/field.c:1822 #, fuzzy -#| msgid "'%s' cannot have JUSTIFIED RIGHT" msgid "cannot have numeric VALUE without PIC" msgstr "»%s« kann nicht das Attribut JUSTIFIED RIGHT haben" @@ -1649,7 +1616,6 @@ msgstr "" #: cobc/field.c:1841 #, fuzzy -#| msgid "INITIALIZED TO item is not alphanumeric" msgid "VALUE item may not be numeric" msgstr "Element INITIALIZED TO ist nicht alphanumerisch" @@ -1691,7 +1657,6 @@ msgstr "'%s' kann nicht das Attribut BLANK WHEN ZERO haben" #: cobc/field.c:1963 #, fuzzy -#| msgid "'%s' cannot have JUSTIFIED RIGHT" msgid "cannot have JUSTIFIED without PIC" msgstr "»%s« kann nicht das Attribut JUSTIFIED RIGHT haben" @@ -1709,19 +1674,16 @@ msgstr "" #: cobc/field.c:1997 #, fuzzy -#| msgid "READ must be executed first" msgid "SECURE must be used with TO" msgstr "Zuerst muss ein READ erfolgen" #: cobc/field.c:2016 #, fuzzy, c-format -#| msgid "'%s' is not defined" msgid "'%s' does nothing" msgstr "»%s« ist nicht definiert" #: cobc/field.c:2235 #, fuzzy, c-format -#| msgid "'%s' 77 level not allowed here" msgid "'%s' 77 level is not allowed here" msgstr "»%s« Level 77 hier nicht erlaubt" @@ -1731,7 +1693,6 @@ msgstr "" #: cobc/field.c:2655 #, fuzzy, c-format -#| msgid "duplicate DEFINE '%s' - ignored" msgid "duplicate LINE %d ignored" msgstr "doppeltes DEFINE »%s« – ignoriert" @@ -1913,9 +1874,6 @@ msgstr "" #: cobc/flag.def:107 #, fuzzy -#| msgid "" -#| " -i, -info display compiler information (build/environment)\n" -#| " and exit" msgid "" " -fwinmain generate WinMain instead of main when compiling\n" " as executable" @@ -1953,9 +1911,6 @@ msgstr "" #: cobc/flag.def:132 #, fuzzy -#| msgid "" -#| " -Xref generate cross reference through 'cobxref'\n" -#| " (V. Coen's 'cobxref' must be in path)" msgid "" " -ftrace generate trace code\n" " * scope: executed SECTION/PARAGRAPH" @@ -1965,9 +1920,6 @@ msgstr "" #: cobc/flag.def:136 #, fuzzy -#| msgid "" -#| " -Xref generate cross reference through 'cobxref'\n" -#| " (V. Coen's 'cobxref' must be in path)" msgid "" " -ftraceall generate trace code\n" " * scope: executed SECTION/PARAGRAPH/STATEMENTS" @@ -2081,7 +2033,6 @@ msgstr "" #: cobc/flag.def:218 #, fuzzy -#| msgid " -F, -free use free source format" msgid " -fno-tsource suppress source from listing" msgstr " -F, -free verwendet freies Quellformat" @@ -2131,27 +2082,21 @@ msgstr "Optionen:" #: cobc/help.c:59 #, fuzzy -#| msgid " -h, -help display this help and exit" msgid " -h, --help display this help and exit" msgstr " -h, -help zeigt diese Hilfe an und beendet das Programm" #: cobc/help.c:60 #, fuzzy -#| msgid " -V, -version display compiler version and exit" msgid " -V, --version display compiler version information and exit" msgstr " -V, -version zeigt die Version des Compilers an" #: cobc/help.c:61 #, fuzzy -#| msgid " -V, -version display compiler version and exit" msgid " -dumpversion display compiler version and exit" msgstr " -V, -version zeigt die Version des Compilers an" #: cobc/help.c:62 #, fuzzy -#| msgid "" -#| " -i, -info display compiler information (build/environment)\n" -#| " and exit" msgid "" " -i, --info display compiler information (build/environment)\n" " and exit" @@ -2172,7 +2117,6 @@ msgstr "" #: cobc/help.c:71 #, fuzzy -#| msgid " -q, -brief reduced displays, commands invoked not shown" msgid " -q, --brief reduced displays, commands invoked not shown" msgstr "" " -v zeigt aufgerufene Befehle nicht an,\n" @@ -2192,7 +2136,6 @@ msgstr " -m erstellt ein dynamisch ladbares Modul (Standard) #: cobc/help.c:75 #, fuzzy -#| msgid " -j [], -job[=]\trun program after build, passing " msgid " -j [], --job[=]\trun program after build, passing " msgstr "" " -j [], -job[=]\tNach dem Bauen das Programm ausführen\n" @@ -2200,14 +2143,6 @@ msgstr "" #: cobc/help.c:76 #, fuzzy -#| msgid "" -#| " -std= warnings/features for a specific dialect\n" -#| " can be one of:\n" -#| " default, cobol2014, cobol2002, cobol85, xopen,\n" -#| " ibm-strict, ibm, mvs-strict, mvs,\n" -#| " mf-strict, mf, bs2000-strict, bs2000,\n" -#| " acu-strict, acu, rm-strict, rm;\n" -#| " see configuration files in directory config" msgid "" " -std= warnings/features for a specific dialect\n" " can be one of:\n" @@ -2230,13 +2165,11 @@ msgstr "" #: cobc/help.c:84 #, fuzzy -#| msgid " -F, -free use free source format" msgid " -F, --free use free source format (alias for -fformat=free)" msgstr " -F, -free verwendet freies Quellformat" #: cobc/help.c:85 #, fuzzy -#| msgid " -fixed use fixed source format (default)" msgid "" " --fixed use fixed source format (default; alias for\n" " -fformat=fixed)" @@ -2256,7 +2189,6 @@ msgstr " -g C Compiler Fehlerdiagnoseinformationen und Stape #: cobc/help.c:90 #, fuzzy -#| msgid " -d, -debug enable all run-time error checking" msgid "" " -d, --debug enable all run-time error checking,\n" " equal to -fstack-check -fec=EC-ALL" @@ -2319,9 +2251,6 @@ msgstr " -P[=] vorverarbeitetes Programmlisting (.lst) generier #: cobc/help.c:112 #, fuzzy -#| msgid "" -#| " -Xref generate cross reference through 'cobxref'\n" -#| " (V. Coen's 'cobxref' must be in path)" msgid "" " -X, --Xref generate cross reference through 'cobxref'\n" " (V. Coen's 'cobxref' must be in path)" @@ -2331,7 +2260,6 @@ msgstr "" #: cobc/help.c:115 #, fuzzy -#| msgid " -Xref specify cross reference in listing" msgid " -X, --Xref specify cross reference in listing" msgstr " -Xref Querverweise in Listing angeben" @@ -2366,7 +2294,6 @@ msgstr " -K CALL zum als statischen Aufruf #: cobc/help.c:124 #, fuzzy -#| msgid " -conf= user-defined dialect configuration; see -std" msgid " --conf= user-defined dialect configuration; see -std" msgstr "" " -conf= Benutzerdefinierte Konfiguration eines COBOL-Dialektes;\n" @@ -2374,39 +2301,31 @@ msgstr "" #: cobc/help.c:125 #, fuzzy -#| msgid " -list-reserved display reserved words" msgid " --list-reserved display reserved words" msgstr " -list-reserved zeigt reservierte Wörter an" #: cobc/help.c:126 #, fuzzy -#| msgid " -list-intrinsics display intrinsic functions" msgid " --list-intrinsics display intrinsic functions" msgstr " -list-intrinsics zeigt intrinsische Funktionen an" #: cobc/help.c:127 #, fuzzy -#| msgid " -list-mnemonics display mnemonic names" msgid " --list-mnemonics display mnemonic names" msgstr " -list-mnemonics zeigt mnemonische Namen an" #: cobc/help.c:128 #, fuzzy -#| msgid " -list-mnemonics display mnemonic names" msgid " --list-exceptions display exception names" msgstr " -list-mnemonics zeigt mnemonische Namen an" #: cobc/help.c:129 #, fuzzy -#| msgid " -list-system display system routines" msgid " --list-system display system routines" msgstr " -list-system zeigt Systemroutinen an" #: cobc/help.c:130 #, fuzzy -#| msgid "" -#| " -save-temps[=] save intermediate files\n" -#| " - default: current directory" msgid "" " --save-temps[=] save intermediate files\n" " * default: current directory" @@ -2437,7 +2356,6 @@ msgstr " -w Alle Warnungen ausschalten" #: cobc/help.c:143 #, fuzzy -#| msgid " -Wno- disable warning enabled by -W or -Wall" msgid " -Wno- disable warning enabled by default, -Wall or -Wextra" msgstr " -Wno- Warnung ausschalten, die mit -W oder -Wall eingeschaltet wurde" @@ -2449,7 +2367,6 @@ msgstr " * IMMER aktiv" #. TRANSLATORS: This msgid is appended to msgid for -Wpossible-truncate and others #: cobc/help.c:153 #, fuzzy -#| msgid " -W enable all warnings" msgid " * NOT set with -Wall" msgstr " -W schaltet alle Warnungen ein" @@ -2459,7 +2376,6 @@ msgstr " -Werror fasst alle Warnungen als Fehler auf" #: cobc/help.c:162 #, fuzzy -#| msgid " -Werror treat all warnings as errors" msgid " -Wno-error don't treat warnings as errors" msgstr " -Werror fasst alle Warnungen als Fehler auf" @@ -2469,7 +2385,6 @@ msgstr " -Werror= die angegebene als Fehler behandeln" #: cobc/help.c:164 #, fuzzy -#| msgid " -Werror= treat specified as error" msgid " -Wno-error= don't treat specified as error" msgstr " -Werror= die angegebene als Fehler behandeln" @@ -2567,7 +2482,6 @@ msgstr "ENTRY »%s« doppelt vergeben" #: cobc/parser.y:520 #, fuzzy, c-format -#| msgid "ENTRY '%s' duplicated" msgid "ENTRY FOR GO TO '%s' duplicated" msgstr "ENTRY »%s« doppelt vergeben" @@ -2597,7 +2511,6 @@ msgstr "%s und %s können nicht gleichzeitig angegeben werden" #: cobc/parser.y:677 #, fuzzy, c-format -#| msgid "%s ignored" msgid "%s is ignored" msgstr "%s ignoriert" @@ -2630,7 +2543,6 @@ msgstr "" #: cobc/parser.y:741 #, fuzzy -#| msgid "OCCURS DEPENDING ON '%s' out of bounds: %d" msgid "OCCURS DEPENDING ON without TO phrase" msgstr "OCCURS DEPENDING ON »%s« außerhalb des gültigen Bereichs: %d" @@ -2685,13 +2597,11 @@ msgstr "END PROGRAM '%s' ist unterschiedlich zur PROGRAM-ID '%s'" #: cobc/parser.y:1341 #, fuzzy -#| msgid "'%s' CURSOR must be 4 or 6 characters long" msgid "currency symbol must be one character long" msgstr "»%s« CURSOR muss 4 oder 6 Zeichen lang sein" #: cobc/parser.y:1398 #, fuzzy, c-format -#| msgid "invalid operator '%s' in expression" msgid "invalid character '%c' in currency symbol" msgstr "Ungültiger Operator »%s« im Ausdruck" @@ -2733,7 +2643,6 @@ msgstr "TYPEDEF kann hier nicht verwendet werden" #: cobc/parser.y:1572 #, fuzzy -#| msgid "integer value expected" msgid "elementary item expected" msgstr "Ganzzahlwert erwartet" @@ -2826,7 +2735,6 @@ msgstr "Ungültiges Ziel für %s" #: cobc/parser.y:2129 #, fuzzy -#| msgid "a constant may not be used here - '%s'" msgid "RENAMES item may not be used here" msgstr "Eine Konstante darf hier nicht verwendet werden – »%s«" @@ -2845,7 +2753,6 @@ msgstr "" #: cobc/parser.y:2229 cobc/parser.y:18631 #, fuzzy -#| msgid "integer value expected" msgid "non-zero value expected" msgstr "Ganzzahlwert erwartet" @@ -2911,13 +2818,11 @@ msgstr "Ungültige %s-Klausel" #: cobc/parser.y:4616 cobc/parser.y:4754 #, fuzzy -#| msgid "literal type does not match numeric data type" msgid "type does not match alphabet" msgstr "Typ des Literals stimmt nicht mit dem numerischen Datentypen überein" #: cobc/parser.y:4760 #, fuzzy -#| msgid "'%s' is not an alphabet-name" msgid "CLASS IS integer IN alphabet-name" msgstr "»%s« ist kein Bezeichner eines Alphabets" @@ -3017,7 +2922,6 @@ msgstr "" #: cobc/parser.y:6239 #, fuzzy, c-format -#| msgid "duplicate values in class '%s'" msgid "duplicate file description for %s" msgstr "Doppelte Werte in Klasse »%s«" @@ -3062,7 +2966,6 @@ msgstr "CONSTANT ist nicht auf Stufe 01" #: cobc/parser.y:7236 #, fuzzy -#| msgid "REDEFINES must follow the original definition" msgid "REDEFINES clause not following entry-name" msgstr "REDEFINES muss der ursprünglichen Definition folgen" @@ -3108,19 +3011,16 @@ msgstr "" #: cobc/parser.y:7610 cobc/typeck.c:4752 #, fuzzy, c-format -#| msgid "'%s' is not a locale name" msgid "'%s' is not a locale-name" msgstr "»%s« ist kein Locale-Name" #: cobc/parser.y:7656 #, fuzzy, c-format -#| msgid "'%s' is not a field" msgid "'%s' is not a valid USAGE" msgstr "»%s« ist kein Feld" #: cobc/parser.y:7661 #, fuzzy, c-format -#| msgid "unknown failure: %d" msgid "unknown USAGE: %s" msgstr "Unbekannter Fehler: %d" @@ -3144,7 +3044,6 @@ msgstr "" #: cobc/parser.y:8585 #, fuzzy, c-format -#| msgid "%s only allowed at 01/77 level" msgid "%s only allowed at 01 level" msgstr "%s nur auf den Stufen 01 und 77 zulässig" @@ -3159,7 +3058,6 @@ msgstr "" #: cobc/parser.y:9247 #, fuzzy, c-format -#| msgid "'%s' is not a field" msgid "%s is not valid for VARYING" msgstr "»%s« ist kein Feld" @@ -3201,7 +3099,6 @@ msgstr "" #: cobc/parser.y:9821 #, fuzzy, c-format -#| msgid "missing definitions:" msgid "missing %s" msgstr "Fehlende Definitionen:" @@ -3346,7 +3243,6 @@ msgstr "" #: cobc/parser.y:11987 cobc/parser.y:13289 #, fuzzy, c-format -#| msgid "ignoring sign" msgid "ignoring %s phrase" msgstr "Vorzeichen wird ignoriert" @@ -3505,7 +3401,6 @@ msgstr "" #: cobc/parser.y:15252 #, fuzzy, c-format -#| msgid "'%s' is not an integer" msgid "'%s' is not an object-reference" msgstr "»%s« ist keine Ganzzahl" @@ -3601,13 +3496,11 @@ msgstr "" #: cobc/parser.y:16786 cobc/parser.y:16795 cobc/parser.y:16813 #: cobc/parser.y:16849 cobc/typeck.c:4886 #, fuzzy, c-format -#| msgid "duplicate DEFINE '%s' - ignored" msgid "duplicate DEBUGGING target: '%s'" msgstr "doppeltes DEFINE »%s« – ignoriert" #: cobc/parser.y:16811 #, fuzzy -#| msgid "a constant may not be used here - '%s'" msgid "constant item cannot be used here" msgstr "Eine Konstante darf hier nicht verwendet werden – »%s«" @@ -3657,7 +3550,6 @@ msgstr "" #: cobc/parser.y:17392 #, fuzzy, c-format -#| msgid "'%s' is not a locale name" msgid "'%s' is not a schema name" msgstr "»%s« ist kein Locale-Name" @@ -3747,13 +3639,11 @@ msgstr "" #: cobc/parser.y:18606 #, fuzzy -#| msgid "a non-numeric literal is expected for '%s'" msgid "a numeric literal is expected here" msgstr "Ein nicht-numerisches Literal wird für »%s« erwartet" #: cobc/parser.y:18618 cobc/parser.y:19366 #, fuzzy -#| msgid "a non-numeric literal is expected for '%s'" msgid "a non-numeric literal is expected here" msgstr "Ein nicht-numerisches Literal wird für »%s« erwartet" @@ -3774,7 +3664,6 @@ msgstr "»%s« ist kein Feld" #: cobc/parser.y:18841 #, fuzzy, c-format -#| msgid "'%s' is not a file name" msgid "'%s' is not a type-name" msgstr "»%s« ist kein Dateiname" @@ -3785,19 +3674,16 @@ msgstr "" #: cobc/parser.y:19015 #, fuzzy, c-format -#| msgid "'%s' is not a field or file" msgid "'%s' is not a field or alphabet" msgstr "»%s« ist weder Feld noch Datei" #: cobc/parser.y:19041 #, fuzzy -#| msgid "'%s' cannot be used here" msgid "a subscripted data-item cannot be used here" msgstr "»%s« kann hier nicht verwendet werden" #: cobc/parser.y:19089 #, fuzzy -#| msgid "integer value expected" msgid "unsigned integer value expected" msgstr "Ganzzahlwert erwartet" @@ -3854,7 +3740,6 @@ msgstr "" #: cobc/pplex.l:420 cobc/pplex.l:441 #, fuzzy, c-format -#| msgid "ignoring invalid directive: '%s'" msgid "ignoring unknown directive: '%s'" msgstr "Ungültige Anweisung wird ignoriert: »%s«" @@ -3869,7 +3754,6 @@ msgstr "" #: cobc/pplex.l:1469 #, fuzzy, c-format -#| msgid "ignoring invalid directive: '%s'" msgid "ignoring %s directive because of %s" msgstr "Ungültige Anweisung wird ignoriert: »%s«" @@ -3956,7 +3840,6 @@ msgstr "" #: cobc/ppparse.y:331 cobc/ppparse.y:341 #, fuzzy, c-format -#| msgid "ignoring invalid directive: '%s'" msgid "invalid constant %s in DEFINE directive" msgstr "Ungültige Anweisung wird ignoriert: »%s«" @@ -3967,13 +3850,11 @@ msgstr "" #: cobc/ppparse.y:486 #, fuzzy, c-format -#| msgid "ignoring invalid directive: '%s'" msgid "invalid %s directive option '%s'" msgstr "Ungültige Anweisung wird ignoriert: »%s«" #: cobc/ppparse.y:488 #, fuzzy, c-format -#| msgid "ignoring invalid directive: '%s'" msgid "invalid %s directive option" msgstr "Ungültige Anweisung wird ignoriert: »%s«" @@ -4004,7 +3885,6 @@ msgstr "" #: cobc/reserved.c:4129 #, fuzzy, c-format -#| msgid "reserved word must have less than %d characters" msgid "reserved word (%s) must have less than %d characters" msgstr "Reservierte Wörter müssen weniger als %d Zeichen haben" @@ -4091,7 +3971,6 @@ msgstr "Definition" #: cobc/reserved.c:5337 #, fuzzy, c-format -#| msgid "unknown statement '%s'" msgid "unknown system-name '%s'" msgstr "Unbekannte Anweisung »%s«" @@ -4113,7 +3992,6 @@ msgstr "Nein (kontextabhängig)" #: cobc/scanner.l:272 #, fuzzy, c-format -#| msgid "'%s' is not defined, but is a reserved word in another dialect" msgid "'%s' is not a reserved word, so cannot be removed" msgstr "»%s« ist nicht definiert, aber in einem anderen Dialekt ein reserviertes Wort" @@ -4167,7 +4045,6 @@ msgstr "Ungültiges %s-Literal: »%s«" #: cobc/scanner.l:1350 #, fuzzy, c-format -#| msgid "literal length exceeds %d characters" msgid "literal length exceeds %u characters" msgstr "Länge des Literals überschreitet %d Zeichen" @@ -4178,7 +4055,6 @@ msgstr "" #: cobc/scanner.l:1382 cobc/scanner.l:1444 cobc/scanner.l:1729 #, fuzzy -#| msgid "numeric boolean literal" msgid "zero-length literal" msgstr "Numerisches boolesches Literal" @@ -4234,7 +4110,6 @@ msgstr "" #: cobc/scanner.l:1599 #, fuzzy, c-format -#| msgid "literal contains invalid character '%c'" msgid "%s literals must contain at least one character" msgstr "Literal enthält ungültiges Zeichen »%c«" @@ -4244,7 +4119,6 @@ msgstr "" #: cobc/scanner.l:1651 #, fuzzy -#| msgid "literal contains invalid character '%c'" msgid "H literals must contain at least one character" msgstr "Literal enthält ungültiges Zeichen »%c«" @@ -4277,7 +4151,6 @@ msgstr "PROGRAM Name überschreitet 31 Zeichen" #: cobc/scanner.l:2039 cobc/tree.c:3845 #, fuzzy, c-format -#| msgid "exponent has more than 4 digits" msgid "significand has more than %d digits" msgstr "Exponent hat mehr als 4 Stellen" @@ -4333,7 +4206,6 @@ msgstr "Ungültiges numerisches CONSTANT: %s" #: cobc/scanner.l:2384 cobc/scanner.l:2411 #, fuzzy, c-format -#| msgid "'%s' is not defined, but is a reserved word in another dialect" msgid "'%s' is not a default reserved word, so cannot be aliased" msgstr "»%s« ist nicht definiert, aber in einem anderen Dialekt ein reserviertes Wort" @@ -4353,7 +4225,6 @@ msgstr "'%s' ist kein Report-Name" #: cobc/scanner.l:2415 #, fuzzy -#| msgid "'%s' is a reserved word, but isn't supported" msgid "you may want ADDSYN or OVERRIDE instead" msgstr "»%s« ist ein reserviertes Wort, wird aber nicht unterstützt" @@ -4397,7 +4268,6 @@ msgstr "Unbekannte Konstante" #: cobc/tree.c:571 #, fuzzy, c-format -#| msgid "invalid literal: '%s'" msgid "literal \"%s\"" msgstr "Ungültiges Literal: »%s«" @@ -4648,13 +4518,11 @@ msgstr "Numerisches Feld kann nicht mehr als %d Stellen haben" #: cobc/tree.c:4267 #, fuzzy, c-format -#| msgid "PICTURE clause required for '%s'" msgid "needs PICTURE clause for SUM %s" msgstr "PICTURE-Klausel notwendig für »%s«" #: cobc/tree.c:4274 #, fuzzy, c-format -#| msgid "PICTURE clause required for '%s'" msgid "non-numeric PICTURE clause for SUM %s" msgstr "PICTURE-Klausel notwendig für »%s«" @@ -4723,7 +4591,6 @@ msgstr "" #: cobc/tree.c:4795 #, fuzzy, c-format -#| msgid "%s ignored" msgid "%s clause ignored" msgstr "%s ignoriert" @@ -4731,13 +4598,11 @@ msgstr "%s ignoriert" #: cobc/typeck.c:14477 libcob/fileio.c:4598 libcob/screenio.c:3720 #: libcob/screenio.c:3750 #, fuzzy, c-format -#| msgid "runtime library is not configured for this operation" msgid "runtime is not configured to support %s" msgstr "Die Laufzeitumgebung ist für diese Operation nicht konfiguriert" #: cobc/tree.c:5395 #, fuzzy, c-format -#| msgid "size of '%s' larger than size of '%s'" msgid "literal '%.38s' is longer than '%s'" msgstr "Größe von »%s« überschreitet die Größe von »%s«" @@ -4773,7 +4638,6 @@ msgstr "" #: cobc/tree.c:5614 cobc/tree.c:5639 #, fuzzy, c-format -#| msgid "'%s' cannot be used here" msgid "'%s' may not be %s %s" msgstr "»%s« kann hier nicht verwendet werden" @@ -4872,7 +4736,6 @@ msgstr "Fehlende Definition von '%s'" #: cobc/tree.c:6831 #, fuzzy, c-format -#| msgid "FUNCTION '%s' is not implemented" msgid "FUNCTION %s has invalid argument" msgstr "FUNCTION »%s« ist nicht implementiert" @@ -4909,13 +4772,11 @@ msgstr "" #: cobc/tree.c:7008 cobc/tree.c:7083 cobc/tree.c:7089 cobc/tree.c:7097 #: cobc/tree.c:7105 cobc/tree.c:7127 cobc/tree.c:7137 cobc/tree.c:7142 #, fuzzy, c-format -#| msgid "FUNCTION '%s' is not implemented" msgid "FUNCTION '%s' has invalid argument" msgstr "FUNCTION »%s« ist nicht implementiert" #: cobc/tree.c:7185 #, fuzzy, c-format -#| msgid "FUNCTION '%s' is not implemented" msgid "FUNCTION '%s' has invalid first argument" msgstr "FUNCTION »%s« ist nicht implementiert" @@ -4926,7 +4787,6 @@ msgstr "" #: cobc/typeck.c:850 #, fuzzy, c-format -#| msgid "%s not allowed here" msgid "%s item not allowed here: '%s'" msgstr "%s hier nicht zulässig" @@ -4947,13 +4807,11 @@ msgstr "'%s' ist kein Report-Name" #: cobc/typeck.c:974 #, fuzzy, c-format -#| msgid "'%s' is not a numeric value" msgid "'%s' is Alpha, instead of a numeric value" msgstr "»%s« ist kein numerischer Wert" #: cobc/typeck.c:977 #, fuzzy, c-format -#| msgid "'%s' is not a numeric value" msgid "'%s' is Alpha Edited, instead of a numeric value" msgstr "»%s« ist kein numerischer Wert" @@ -5001,7 +4859,6 @@ msgstr "Wortlänge überschreitet %d Zeichen: »%s«" #: cobc/typeck.c:2223 #, fuzzy, c-format -#| msgid "ASSIGN interpreted as %s" msgid "ASSIGN %s interpreted as '%s'" msgstr "ASSIGN wird als %s interpretiert" @@ -5125,7 +4982,6 @@ msgstr "" #: cobc/typeck.c:3177 #, fuzzy, c-format -#| msgid "redefinition of '%s'" msgid "prototype and definition of '%s' do not match" msgstr "Neudefinition von »%s«" @@ -5158,7 +5014,6 @@ msgstr "" #: cobc/typeck.c:3348 #, fuzzy -#| msgid "wrong number of WHEN parameters" msgid "number of parameters differ" msgstr "Ungültige Anzahl an WHEN-Parametern" @@ -5226,7 +5081,6 @@ msgstr "" #: cobc/typeck.c:3609 #, fuzzy -#| msgid "unexpected CONSTANT item" msgid "unexpected RETURNING item" msgstr "Unerwartetes CONSTANT-Element" @@ -5251,7 +5105,6 @@ msgstr "Ungültige Zeichenwerte in Alphabet »%s«, Beginn bei Position %d" #: cobc/typeck.c:4045 #, fuzzy, c-format -#| msgid "duplicate values in class '%s'" msgid "duplicate character values in class '%s'" msgstr "Doppelte Werte in Klasse »%s«" @@ -5279,7 +5132,6 @@ msgstr "" #: cobc/typeck.c:4298 #, fuzzy, c-format -#| msgid "value in AT clause is not numeric" msgid "file %s: RELATIVE KEY %s is not numeric" msgstr "Wert in AT-Klausel ist nicht numerisch" @@ -5330,7 +5182,6 @@ msgstr "'%s' CRT STATUS muss 4 Zeichen lang sein" #: cobc/typeck.c:4397 #, fuzzy, c-format -#| msgid "'%s' is not a field" msgid "FILE STATUS '%s' is not a field" msgstr "»%s« ist kein Feld" @@ -5346,7 +5197,6 @@ msgstr "" #: cobc/typeck.c:4418 #, fuzzy, c-format -#| msgid "%s is not an alphanumeric literal" msgid "FILE STATUS '%s' must be an alphanumeric or numeric field" msgstr "»%s« ist kein alphanumerisches Literal" @@ -5372,7 +5222,6 @@ msgstr "" #: cobc/typeck.c:4460 #, fuzzy, c-format -#| msgid "'%s' will be implicitly defined" msgid "variable '%s' will be implicitly defined" msgstr "»%s« wird implizit definiert" @@ -5392,19 +5241,16 @@ msgstr "»%s« CURSOR muss 4 oder 6 Zeichen lang sein" #: cobc/typeck.c:4680 #, fuzzy, c-format -#| msgid "'%s' cannot have OCCURS DEPENDING" msgid "'%s' cannot have nested OCCURS DEPENDING" msgstr "»%s« kann nicht mit OCCURS DEPENDING definiert werden" #: cobc/typeck.c:4694 #, fuzzy, c-format -#| msgid "'%s' REDEFINES field not allowed here" msgid "'%s' OCCURS DEPENDING ON field item invalid here" msgstr "»%s« Feld mit REDEFINES-Angabe hier nicht erlaubt" #: cobc/typeck.c:4704 #, fuzzy, c-format -#| msgid "'%s' cannot have OCCURS DEPENDING" msgid "'%s' cannot have OCCURS DEPENDING because of '%s'" msgstr "»%s« kann nicht mit OCCURS DEPENDING definiert werden" @@ -5438,7 +5284,6 @@ msgstr "" #: cobc/typeck.c:4806 #, fuzzy, c-format -#| msgid "%s not allowed here" msgid "item not allowed here: '%s'" msgstr "%s hier nicht zulässig" @@ -5493,19 +5338,16 @@ msgstr "'%s' ist kein Report-Name" #: cobc/typeck.c:5041 #, fuzzy, c-format -#| msgid "'%s' and '%s' must be in the same record" msgid "%s and %s are not in the same SECTION" msgstr "»%s« und »%s« müssen im gleichen Datensatz sein" #: cobc/typeck.c:5046 #, fuzzy, c-format -#| msgid "'%s' defined here" msgid "%s is defined before %s" msgstr "»%s« ist hier definiert" #: cobc/typeck.c:5088 #, fuzzy, c-format -#| msgid "'%s' ANY LENGTH must be 01 level" msgid "'%s' ANY LENGTH item must be a formal parameter" msgstr "»%s« ANY LENGTH muss auf Level 01 sein" @@ -5526,7 +5368,6 @@ msgstr "" #: cobc/typeck.c:5815 #, fuzzy -#| msgid "invalid expression" msgid "invalid conditional expression" msgstr "Ungültiger Ausdruck" @@ -5585,7 +5426,6 @@ msgstr "" #: cobc/typeck.c:7493 #, fuzzy -#| msgid "invalid type for DISPLAY operand" msgid "no items to DISPLAY found" msgstr "Ungültiger Typ für DISPLAY-Operand" @@ -5646,7 +5486,6 @@ msgstr "" #: cobc/typeck.c:8121 #, fuzzy -#| msgid "target of ALLOCATE is not a BASED item" msgid "target of ALLOCATE must have BASED clause" msgstr "Ziel von ALLOCATE ist kein BASED-Element" @@ -5693,7 +5532,6 @@ msgstr "Numerisches Literal übersteigt die Größenbeschränkung" #: cobc/typeck.c:8385 #, fuzzy, c-format -#| msgid "literal contains invalid character '%c'" msgid "figurative constant %s invalid here" msgstr "Literal enthält ungültiges Zeichen »%c«" @@ -5812,7 +5650,6 @@ msgstr "" #: cobc/typeck.c:10017 #, fuzzy, c-format -#| msgid "internal register '%s' defined as BINARY-LONG" msgid "internal register '%s' defined as USAGE %s" msgstr "Internes Register »%s« ist als BINARY-LONG definiert" @@ -5975,7 +5812,6 @@ msgstr "" #: cobc/typeck.c:12721 #, fuzzy, c-format -#| msgid "SET targets must be PROGRAM-POINTER" msgid "SET target '%s' is not a POINTER for FCD" msgstr "Ziel des SET muss ein PROGRAM-POINTER sein" @@ -6027,13 +5863,11 @@ msgstr "" #: cobc/typeck.c:13305 #, fuzzy, c-format -#| msgid "'%s' is not an integer" msgid "%s item '%s' must be numeric and an integer" msgstr "»%s« ist keine Ganzzahl" #: cobc/typeck.c:13311 #, fuzzy, c-format -#| msgid "'%s' is not an integer" msgid "%s item '%s' must be an integer" msgstr "»%s« ist keine Ganzzahl" @@ -6044,7 +5878,6 @@ msgstr "" #: cobc/typeck.c:13331 #, fuzzy, c-format -#| msgid "'%s' is not a statement" msgid "'%s' is not an elementary item" msgstr "»%s« ist keine Anweisung" @@ -6066,7 +5899,6 @@ msgstr "" #: cobc/typeck.c:13835 #, fuzzy, c-format -#| msgid "%s is not an alphanumeric literal" msgid "%s must be alphanumeric or national" msgstr "»%s« ist kein alphanumerisches Literal" @@ -6087,7 +5919,6 @@ msgstr "" #: cobc/typeck.c:13922 #, fuzzy, c-format -#| msgid "must be numeric" msgid "%s must be elementary" msgstr "muss numerisch sein" @@ -6103,7 +5934,6 @@ msgstr "'%s' ist nicht in der LINKAGE SECTION enthalten" #: cobc/typeck.c:13961 #, fuzzy, c-format -#| msgid "'%s' is not an integer" msgid "%s must be an integer" msgstr "»%s« ist keine Ganzzahl" @@ -6196,7 +6026,6 @@ msgstr "" #: cobc/warning.def:31 #, fuzzy -#| msgid " -Werror treat all warnings as errors" msgid " -Wadditional additional warnings only raised with -Wall" msgstr " -Werror fasst alle Warnungen als Fehler auf" @@ -6206,7 +6035,6 @@ msgstr "" #: cobc/warning.def:37 #, fuzzy -#| msgid " -Werror treat all warnings as errors" msgid " -Wno-pending do not warn if pending features are used" msgstr " -Werror fasst alle Warnungen als Fehler auf" @@ -6314,7 +6142,6 @@ msgstr "" #: cobc/warning.def:115 #, fuzzy -#| msgid " -Werror treat all warnings as errors" msgid " -Wno-goto-section do not warn about GO TO section-name" msgstr " -Werror fasst alle Warnungen als Fehler auf" @@ -6337,7 +6164,6 @@ msgstr "'%s' wird implizit definiert" #: cobc/warning.def:130 #, fuzzy -#| msgid " -Werror treat all warnings as errors" msgid " -Wno-others do not warn about different issues" msgstr " -Werror fasst alle Warnungen als Fehler auf" @@ -6352,13 +6178,11 @@ msgstr "LoadLibrary/GetProcAddress-Fehler %d" #: libcob/call.c:841 #, fuzzy, c-format -#| msgid "PROGRAM name exceeds 31 characters" msgid "%s: PROGRAM name exceeds %d characters" msgstr "PROGRAM Name überschreitet 31 Zeichen" #: libcob/call.c:842 #, fuzzy, c-format -#| msgid "PROGRAM name exceeds 31 characters" msgid "%s: FUNCTION name exceeds %d characters" msgstr "PROGRAM Name überschreitet 31 Zeichen" @@ -6409,7 +6233,6 @@ msgstr "" #: libcob/call.c:2050 #, fuzzy -#| msgid "file not open" msgid "field not allocated" msgstr "Datei wurde noch nicht geöffnet" @@ -6430,31 +6253,26 @@ msgstr "" #: libcob/cobgetopt.c:330 #, fuzzy, c-format -#| msgid "%s: option '-W %s' is ambiguous" msgid "%s: option '%s%s' is ambiguous" msgstr "%s: Option »-W %s« ist mehrdeutig" #: libcob/cobgetopt.c:338 #, fuzzy, c-format -#| msgid "%s: option '%s' is ambiguous; possibilities:" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: Option »%s« ist mehrdeutig, Möglichkeiten:" #: libcob/cobgetopt.c:371 #, fuzzy, c-format -#| msgid "%s: unrecognized option '%c%s'" msgid "%s: unrecognized option '%s%s'" msgstr "%s: Unbekannte Option »%c%s«" #: libcob/cobgetopt.c:400 #, fuzzy, c-format -#| msgid "%s: option '%c%s' doesn't allow an argument" msgid "%s: option '%s%s' doesn't allow an argument" msgstr "%s: Option »%c%s« erlaubt kein Argument" #: libcob/cobgetopt.c:418 #, fuzzy, c-format -#| msgid "%s: option '%s' requires an argument" msgid "%s: option '%s%s' requires an argument" msgstr "%s: Option »%s« erfordert ein Argument" @@ -6486,7 +6304,6 @@ msgstr "" #: libcob/common.c:1257 #, fuzzy -#| msgid "Definition" msgid "termination" msgstr "Definition" @@ -6500,13 +6317,11 @@ msgstr "" #: libcob/common.c:1269 #, fuzzy -#| msgid "signal %s" msgid "I/O signal" msgstr "Signal %s" #: libcob/common.c:1273 #, fuzzy -#| msgid "attempt to reference unallocated memory" msgid "attempt to reference invalid memory address" msgstr "Versuch auf nicht bereitgestellten Arbeitsspeicher zuzugreifen" @@ -6520,7 +6335,6 @@ msgstr "" #: libcob/common.c:1285 #, fuzzy -#| msgid "aborting" msgid "abort" msgstr "Abbruch" @@ -6530,13 +6344,11 @@ msgstr "" #: libcob/common.c:1293 #, fuzzy -#| msgid "caught signal" msgid "alarm signal" msgstr "Signal abgefangen" #: libcob/common.c:1297 #, fuzzy -#| msgid "preprocessing:" msgid "stop process" msgstr "Aufbereitung:" @@ -6547,7 +6359,6 @@ msgstr "" #. TRANSLATORS: This msgid is used for an OS signal like SIGABRT. #: libcob/common.c:1312 #, fuzzy -#| msgid "signal %s" msgid "signal" msgstr "Signal %s" @@ -6573,7 +6384,6 @@ msgstr "%s hat die Version %s.%d" #: libcob/common.c:3158 #, fuzzy, c-format -#| msgid "CALL to %s requires %d parameters" msgid "CALL to %s requires %d arguments" msgstr "CALL von %s benötigt %d Parameter" @@ -6594,7 +6404,6 @@ msgstr "" #: libcob/common.c:3892 #, fuzzy, c-format -#| msgid "'%s' not numeric: '%s'" msgid "'%s' (Type: %s) not numeric: '%s'" msgstr "»%s« ist nicht numerisch: »%s«" @@ -6625,13 +6434,11 @@ msgstr "Startposition von '%s' außerhalb des gültigen Bereichs: %d" #: libcob/common.c:3994 #, fuzzy, c-format -#| msgid "length of '%s' out of bounds: %d" msgid "length of '%s' out of bounds: %d, maximum: %d" msgstr "Länge von »%s« außerhalb des gültigen Bereichs: %d" #: libcob/common.c:4005 #, fuzzy, c-format -#| msgid "length of '%s' out of bounds: %d" msgid "length of '%s' out of bounds: %d, starting at: %d, maximum: %d" msgstr "Länge von »%s« außerhalb des gültigen Bereichs: %d" @@ -6793,7 +6600,6 @@ msgstr "Permanenter Dateifehler" #: libcob/common.c:8217 #, fuzzy -#| msgid "invalid configuration file name" msgid "inconsistent file name" msgstr "Ungültiger Name der Konfigurationsdatei" @@ -6827,7 +6633,6 @@ msgstr "" #: libcob/common.c:8241 #, fuzzy -#| msgid "READ after uncessful READ/START" msgid "READ after unsuccessful READ/START" msgstr "READ nach fehlgeschlagenem READ/START" @@ -6869,13 +6674,11 @@ msgstr "Unbekannter Dateifehler" #: libcob/common.c:8278 #, fuzzy, c-format -#| msgid "%s (status = %02d) file: '%s'" msgid "%s (status = %02d) for file %s" msgstr "%s (Status = %02d) Datei: »%s«" #: libcob/common.c:8281 #, fuzzy, c-format -#| msgid "%s (status = %02d) file: '%s'" msgid "%s (status = %02d) for file %s on %s" msgstr "%s (Status = %02d) Datei: »%s«" @@ -6885,13 +6688,11 @@ msgstr "Versuch, eine nicht implementierte Funktion zu benutzen" #: libcob/common.c:8291 #, fuzzy -#| msgid "attempt to use non-implemented function" msgid "attempt to use non-implemented XML I/O" msgstr "Versuch, eine nicht implementierte Funktion zu benutzen" #: libcob/common.c:8294 #, fuzzy -#| msgid "attempt to use non-implemented function" msgid "attempt to use non-implemented JSON I/O" msgstr "Versuch, eine nicht implementierte Funktion zu benutzen" @@ -6903,7 +6704,6 @@ msgstr "Umgebungsvariablen" #: libcob/common.c:8859 libcob/common.c:8893 libcob/common.c:8910 #: libcob/common.c:8925 #, fuzzy, c-format -#| msgid "C version %s%s" msgid "%s, version %d.%d.%d" msgstr "C-Version %s%s" @@ -6915,13 +6715,11 @@ msgstr "" #: libcob/common.c:8471 #, fuzzy, c-format -#| msgid "C version %s%s" msgid "%s, version %s" msgstr "C-Version %s%s" #: libcob/common.c:8739 #, fuzzy, c-format -#| msgid "License GPLv3+: GNU GPL version 3 or later " msgid "License LGPLv3+: GNU LGPL version 3 or later <%s>" msgstr "Lizenz GPLv3+: GNU GPL Version 3 oder neuer " @@ -6931,7 +6729,6 @@ msgstr "" #: libcob/common.c:8938 #, fuzzy -#| msgid "" msgid "mouse support" msgstr "" @@ -7003,7 +6800,6 @@ msgstr "" #: libcob/common.c:9969 #, fuzzy, c-format -#| msgid "Written by %s\n" msgid "dump written to %s" msgstr "Geschrieben von %s\n" @@ -7032,7 +6828,6 @@ msgstr "BDB-Umgebung kann nicht gestartet werden (%s), Fehler: %d %s" #: libcob/fileio.c:3458 libcob/fileio.c:3483 libcob/fileio.c:3509 #: libcob/fileio.c:3528 #, fuzzy, c-format -#| msgid "BDB error: %s %s" msgid "BDB (%s), error: %d %s" msgstr "BDB-Fehler: %s %s" @@ -7069,7 +6864,6 @@ msgstr "SORT kann keine temporäre Datei erstellen" #. setup translation to allow this to be followed on the right side. #: libcob/fileio.c:8432 #, fuzzy -#| msgid "implicit CLOSE of %s ('%s')" msgid "implicit CLOSE of " msgstr "Implizites CLOSE von %s (»%s«)" @@ -7152,7 +6946,6 @@ msgstr "(nicht darstellbar)" #: libcob/termio.c:354 #, fuzzy, c-format -#| msgid "cannot specify both %s and %s" msgid "cannot open %s (=%s)" msgstr "%s und %s können nicht gleichzeitig angegeben werden" @@ -7176,51 +6969,41 @@ msgstr " oder : %s Optionen" #: bin/cobcrun.c:126 #, fuzzy -#| msgid " -h, -help display this help and exit" msgid " -h, --help display this help and exit" msgstr " -h, -help zeigt diese Hilfe an und beendet das Programm" #: bin/cobcrun.c:127 #, fuzzy -#| msgid " -V, -version display cobcrun and runtime version and exit" msgid " -V, --version display version information for cobcrun + runtime and exit" msgstr " -V, -version zeigt Versionsinformation an und beendet das Programm" #: bin/cobcrun.c:128 #, fuzzy -#| msgid " -V, -version display cobcrun and runtime version and exit" msgid " -dumpversion display runtime version and exit" msgstr " -V, -version zeigt Versionsinformation an und beendet das Programm" #: bin/cobcrun.c:129 #, fuzzy -#| msgid " -i, -info display runtime information (build/environment)" msgid " -i, --info display runtime information (build/environment)" msgstr " -i, -info zeigt Compilerinformation an (Build/Umgebung)" #: bin/cobcrun.c:130 #, fuzzy -#| msgid " -h, -help display this help and exit" msgid " -v, --verbose display extended output with --info" msgstr " -h, -help zeigt diese Hilfe an und beendet das Programm" #: bin/cobcrun.c:132 #, fuzzy -#| msgid " -h, -help display this help and exit" msgid " -q, --brief reduced displays" msgstr " -h, -help zeigt diese Hilfe an und beendet das Programm" #: bin/cobcrun.c:134 #, fuzzy -#| msgid " -c , -config= set runtime configuration from " msgid " -c , --config= set runtime configuration from " msgstr " -c , -config= setzt die Laufzeitkonfiguration aus " #: bin/cobcrun.c:135 #, fuzzy -#| msgid "" -#| " -r, -runtime-conf display current runtime configuration\n" -#| " (value and origin for all settings)" msgid "" " -r, --runtime-config display current runtime configuration\n" " (value and origin for all settings)" @@ -7244,7 +7027,6 @@ msgstr "" #: bin/cobcrun.c:148 #, fuzzy, c-format -#| msgid "General help using GNU software: " msgid "General help using GNU software: <%s>" msgstr "Allgemeine Hilfe zur Verwendung von GNU-Software: " @@ -7254,7 +7036,6 @@ msgstr "Ungültiger Name der Konfigurationsdatei" #: bin/cobcrun.c:355 #, fuzzy, c-format -#| msgid "invalid module argument" msgid "invalid module argument '%s'" msgstr "Ungültiges Modul-Argument" diff --git a/po/es.po b/po/es.po index 30453098e..107392e9f 100644 --- a/po/es.po +++ b/po/es.po @@ -35,7 +35,6 @@ msgstr "desconocido" #: cobc/cobc.c:855 #, fuzzy -#| msgid "%s: %d: internal compiler error" msgid "internal compiler error" msgstr "%s:%d: error interno de compilador" @@ -73,7 +72,6 @@ msgstr "asumiendo literal para no entrecomillado «%s»" #: cobc/cobc.c:1495 #, fuzzy -#| msgid "literal length %d exceeds maximum of %d digits" msgid " - length exceeds maximum" msgstr "longitud literal %d excede máximo de %d dígitos" @@ -114,25 +112,21 @@ msgstr "invalida PROGRAM_ID '%s'%s" #: cobc/cobc.c:1659 #, fuzzy, c-format -#| msgid "file does not exist" msgid "file '%s' does not exist" msgstr "fichero no existente" #: cobc/cobc.c:1685 #, fuzzy, c-format -#| msgid "duplicate DEFINE directive '%s'" msgid "duplicate exception '%s'" msgstr "directiva DEFINE duplicada «%s»" #: cobc/cobc.c:1733 #, fuzzy, c-format -#| msgid "invalid parameter: %s" msgid "invalid exception-name: %s" msgstr "parámetro no válido: %s" #: cobc/cobc.c:1870 cobc/cobc.c:8780 #, fuzzy -#| msgid "environment variables" msgid "please check environment variables as noted above" msgstr "variables de entorno" @@ -168,7 +162,6 @@ msgstr "abortando compilación de %s en línea %d (%s: %s)" #: cobc/cobc.c:2243 #, fuzzy, c-format -#| msgid "aborting compile of %s at line %d (%s: %s)" msgid "aborting codegen for %s, last statement at line %d (%s: %s)" msgstr "abortando compilación de %s en línea %d (%s: %s)" @@ -188,7 +181,6 @@ msgstr "¡Por favor boletine esto!" #: cobc/cobc.c:2346 bin/cobcrun.c:100 #, fuzzy, c-format -#| msgid "License GPLv3+: GNU GPL version 3 or later " msgid "License GPLv3+: GNU GPL version 3 or later <%s>" msgstr "License GPLv3+: GNU GPL versión 3 o posterior " @@ -202,7 +194,6 @@ msgstr "" #: cobc/cobc.c:2350 libcob/common.c:8743 bin/cobcrun.c:104 #, fuzzy, c-format -#| msgid "Written by %s\n" msgid "Written by %s" msgstr "Escrito por %s\n" @@ -220,7 +211,6 @@ msgstr "Empaquetado %s" #: cobc/cobc.c:2356 cobc/cobc.c:2369 cobc/cobc.c:2478 libcob/common.c:8787 #, fuzzy -#| msgid "C version %s%s" msgid "C version" msgstr "Versión C %s%s" @@ -295,13 +285,11 @@ msgstr "extensión de E/S de pantalla" #: cobc/cobc.c:2549 libcob/common.c:8840 #, fuzzy -#| msgid "variable format" msgid "variable file format" msgstr "formato variable" #: cobc/cobc.c:2555 cobc/cobc.c:2557 libcob/common.c:8846 libcob/common.c:8848 #, fuzzy -#| msgid "sequential handler" msgid "sequential file handler" msgstr "manipulador secuencial" @@ -314,7 +302,6 @@ msgstr "compilado" #: libcob/common.c:8866 libcob/common.c:8868 libcob/common.c:8870 #: libcob/common.c:8873 libcob/common.c:8875 libcob/common.c:8878 #, fuzzy -#| msgid "sequential handler" msgid "indexed file handler" msgstr "manipulador secuencial" @@ -433,7 +420,6 @@ msgstr "no hay nada para -j para ejecutar" #: cobc/cobc.c:4406 cobc/cobc.c:4420 #, fuzzy, c-format -#| msgid "... removed from environment" msgid "%s is resolved by environment as: %s" msgstr "… quitado desde entorno" @@ -499,7 +485,6 @@ msgstr "Demasiados errores dentro del grupo de compilación: %d errores máximos #: cobc/cobc.c:6632 #, fuzzy, c-format -#| msgid "%s: %d: Too many continuation lines" msgid "%s:%d: too many continuation lines" msgstr "%s: %d: demasiadas líneas continuadas" @@ -690,7 +675,6 @@ msgstr "" #: cobc/config.def:67 #, fuzzy -#| msgid "invalid numeric literal: '%s'" msgid "maximum numeric literal size" msgstr "invalida literal numérico: «%s»" @@ -742,15 +726,11 @@ msgstr "" #: cobc/config.def:112 #, fuzzy -#| msgid "'%s' cannot have OCCURS DEPENDING" msgid "allow complex OCCURS DEPENDING ON" msgstr "«%s» no puede tener OCURRS DEPENDING" #: cobc/config.def:115 #, fuzzy -#| msgid "" -#| "adjust items following OCCURS DEPENDING\n" -#| "\t\t\t- requires implicit/explicit relaxed syntax" msgid "adjust items following OCCURS DEPENDING (implies complex-odo)" msgstr "" "ajusta elementos seguidos de OCCURS DEPENDING\n" @@ -762,9 +742,6 @@ msgstr "" #: cobc/config.def:121 #, fuzzy -#| msgid "" -#| "relax syntax checking\n" -#| "\t\t\t- e.g. REDEFINES position" msgid "allow certain syntax variations (e.g. REDEFINES position)" msgstr "" "comprobación relajada de sintaxis\n" @@ -882,7 +859,6 @@ msgstr "" #: cobc/config.def:214 #, fuzzy -#| msgid "SIZE IS clause" msgid "MEMORY-SIZE clause" msgstr "TAMAÑO de cláusula" @@ -892,19 +868,16 @@ msgstr "" #: cobc/config.def:220 #, fuzzy -#| msgid "RECORD clause invalid" msgid "LABEL-RECORDS clause" msgstr "RECORD de cláusula no válido" #: cobc/config.def:223 #, fuzzy -#| msgid "invalid VALUE clause" msgid "VALUE-OF clause" msgstr "invalida cláusula VALUE" #: cobc/config.def:226 #, fuzzy -#| msgid "RECORD clause invalid" msgid "DATA-RECORDS clause" msgstr "RECORD de cláusula no válido" @@ -914,13 +887,11 @@ msgstr "" #: cobc/config.def:232 cobc/parser.y:7285 #, fuzzy -#| msgid "SIZE IS clause" msgid "SAME AS clause" msgstr "TAMAÑO de cláusula" #: cobc/config.def:235 cobc/parser.y:7621 #, fuzzy -#| msgid "PROMPT clause" msgid "TYPE TO clause" msgstr "Cláusula PROMPT" @@ -930,7 +901,6 @@ msgstr "" #: cobc/config.def:241 cobc/parser.y:8190 #, fuzzy -#| msgid "SIZE IS clause" msgid "SYNCHRONIZED clause" msgstr "TAMAÑO de cláusula" @@ -940,37 +910,31 @@ msgstr "" #: cobc/config.def:247 #, fuzzy -#| msgid "SIZE IS clause" msgid "SPECIAL-NAMES clause" msgstr "TAMAÑO de cláusula" #: cobc/config.def:250 #, fuzzy -#| msgid "%s statement not terminated" msgid "GOTO statement without name" msgstr "declaración %s no terminada" #: cobc/config.def:253 #, fuzzy -#| msgid "STOP literal" msgid "STOP-literal statement" msgstr "DETENCIÓN literal" #: cobc/config.def:256 #, fuzzy -#| msgid "STOP identifier" msgid "STOP-identifier statement" msgstr "DETENCIÓN de identificador" #: cobc/config.def:259 #, fuzzy -#| msgid "*CONTROL statement" msgid "STOP ERROR statement" msgstr "*CONTROL sentencia" #: cobc/config.def:262 #, fuzzy -#| msgid "debugging indicator" msgid "DEBUGGING MODE and debugging indicator" msgstr "depurando indicador" @@ -992,37 +956,31 @@ msgstr "" #: cobc/config.def:280 #, fuzzy -#| msgid "*CONTROL statement" msgid "ENTRY statement" msgstr "*CONTROL sentencia" #: cobc/config.def:283 #, fuzzy -#| msgid "MOVE of non-integer to alphanumeric" msgid "move noninteger to alphanumeric" msgstr "MOVE de no entero a alfanumérico" #: cobc/config.def:286 #, fuzzy -#| msgid "MOVE of figurative constant to numeric item" msgid "move figurative constants to numeric" msgstr "MOVE de constante figurativa a ítem numérico" #: cobc/config.def:289 #, fuzzy -#| msgid "MOVE of figurative constant to numeric item" msgid "move figurative constant SPACE to numeric" msgstr "MOVE de constante figurativa a ítem numérico" #: cobc/config.def:292 #, fuzzy -#| msgid "MOVE of figurative constant QUOTE to numeric item" msgid "move figurative constant QUOTE to numeric" msgstr "MOVE de constante QUOTE figurativa a ítem numérico" #: cobc/config.def:295 #, fuzzy -#| msgid "OCCURS DEPENDING ON '%s' out of bounds: %d" msgid "OCCURS DEPENDING ON without to" msgstr "OCCURS DEPENDING ON «%s» fuera de límites: %d" @@ -1032,7 +990,6 @@ msgstr "" #: cobc/config.def:301 #, fuzzy -#| msgid "*CONTROL statement" msgid "ALTER statement" msgstr "*CONTROL sentencia" @@ -1042,25 +999,21 @@ msgstr "" #: cobc/config.def:307 #, fuzzy -#| msgid "numeric boolean literal" msgid "boolean literals (B'1010')" msgstr "numérico booleano literal" #: cobc/config.def:310 #, fuzzy -#| msgid "hexadecimal-boolean literal" msgid "hexadecimal-boolean literals (BX'A')" msgstr "booleana-hexadecimal literal" #: cobc/config.def:313 #, fuzzy -#| msgid "national literal" msgid "national literals (N'UTF-16 string')" msgstr "literal nacinal" #: cobc/config.def:316 #, fuzzy -#| msgid "hexadecimal-national literal" msgid "hexadecimal-national literals (NX'265E')" msgstr "nacional-hexadecimal literal" @@ -1082,13 +1035,11 @@ msgstr "continuación de palabras COBOL" #: cobc/config.def:331 #, fuzzy -#| msgid "NOT EXCEPTION before EXCEPTION" msgid "NOT ON EXCEPTION before ON EXCEPTION" msgstr "SIN EXCEPCIÓN tras EXCEPCIÓN" #: cobc/config.def:334 #, fuzzy -#| msgid "non-standard DISPLAY" msgid "extensions to ACCEPT and DISPLAY" msgstr "no común DISPLAY" @@ -1102,7 +1053,6 @@ msgstr "" #: cobc/config.def:344 #, fuzzy -#| msgid "'%s' is not defined in SPECIAL-NAMES" msgid "constants defined in SPECIAL-NAMES" msgstr "«%s» no esta definido en SPECIAL-NAMES" @@ -1136,7 +1086,6 @@ msgstr "" #: cobc/config.def:368 #, fuzzy -#| msgid "numeric literal in VALUE clause of numeric-edited item" msgid "numeric literals in VALUE clause of numeric-edited items" msgstr "literal numérico dentro de cláusula VALOR de ítem editado-numérico" @@ -1150,7 +1099,6 @@ msgstr "" #: cobc/config.def:377 #, fuzzy -#| msgid "REDEFINES clause must follow entry-name" msgid "REDEFINES clause not following entry-name in definition" msgstr "Cláusula de REDEFINES debe seguir nombre de entrada" @@ -1161,7 +1109,6 @@ msgstr "" #: cobc/config.def:383 cobc/parser.y:5736 cobc/parser.y:5750 cobc/parser.y:5763 #: cobc/parser.y:5774 #, fuzzy -#| msgid "PROMPT clause" msgid "RECORD DELIMITER clause" msgstr "Cláusula PROMPT" @@ -1231,13 +1178,11 @@ msgstr "" #: cobc/error.c:83 #, fuzzy, c-format -#| msgid "in section" msgid "in section '%s':" msgstr "dentro de sección" #: cobc/error.c:94 #, fuzzy, c-format -#| msgid "in paragraph" msgid "in paragraph '%s':" msgstr "dentro de párrafo" @@ -1247,7 +1192,6 @@ msgstr "demasiados errores" #: cobc/error.c:145 #, fuzzy, c-format -#| msgid "configuration file was included here" msgid "in file included from " msgstr "fichero de configuración incluido aquí" @@ -1333,13 +1277,11 @@ msgstr "«%s» es ambiguo; necesita cualificación" #: cobc/error.c:1090 #, fuzzy, c-format -#| msgid "'%s' is not an integer" msgid "'%s' is a special register" msgstr "«%s» no es un entero" #: cobc/error.c:1093 #, fuzzy, c-format -#| msgid "'%s' is not defined" msgid "'%s' internally defined" msgstr "%s no está definido" @@ -1381,7 +1323,6 @@ msgstr "nivel %02d de ítem «%s» solo puede tener una cláusula %s" #: cobc/field.c:136 #, fuzzy -#| msgid "Constant expression has Divide by ZERO" msgid "constant expression has Divide by ZERO" msgstr "Expresión contante tiene División entre CERO" @@ -1458,13 +1399,11 @@ msgstr "cláusula duplicada %s" #: cobc/field.c:906 #, fuzzy, c-format -#| msgid "PICTURE clause not compatible with USAGE %s" msgid "%s clause not compatible with PIC %s" msgstr "PICTURE clausurada no compatible con UTILIZACIÓN %s" #: cobc/field.c:917 cobc/field.c:953 #, fuzzy, c-format -#| msgid "PICTURE clause not compatible with USAGE %s" msgid "%s clause not compatible with USAGE %s" msgstr "PICTURE clausurada no compatible con UTILIZACIÓN %s" @@ -1510,7 +1449,6 @@ msgstr "«%s» ANY NUMERIC debe ser PIC 9" #: cobc/field.c:1198 #, fuzzy, c-format -#| msgid "'%s' ANY LENGTH must be PIC X or PIC A" msgid "'%s' ANY LENGTH must be PIC X, PIC N or PIC 1" msgstr "«%s» ANY LENGTH debe ser PIC X o PIC A" @@ -1556,13 +1494,11 @@ msgstr "«%s» BASED solamente se permite a los niveles 01 y 77" #: cobc/field.c:1279 #, fuzzy, c-format -#| msgid "'%s' cannot have the OCCURS clause due to '%s'" msgid "'%s' cannot have an OCCURS clause due to '%s'" msgstr "«%s» no puede tener la cláusula OCURRS debido a «%s»" #: cobc/field.c:1298 #, fuzzy, c-format -#| msgid "the original definition '%s' should not have OCCURS clause" msgid "the original definition '%s' should not have an OCCURS clause" msgstr "la definición original «%s» no debería tener cláusula OCURRS" @@ -1582,13 +1518,11 @@ msgstr "la definición original «%s» no puede ser de longitud variable" #: cobc/field.c:1335 #, fuzzy, c-format -#| msgid "'%s' cannot have JUSTIFIED RIGHT" msgid "'%s' cannot have JUSTIFIED RIGHT clause" msgstr "«%s» no se puede tener JUSTIFIED RIGHT" #: cobc/field.c:1342 #, fuzzy, c-format -#| msgid "'%s' cannot have PICTURE clause" msgid "'%s' cannot have BLANK WHEN ZERO clause" msgstr "«%s» no puede tener cláusula de PICTURE" @@ -1599,7 +1533,6 @@ msgstr "PANTALLA de grupo ítem «%s» tiene clausula inválida" #: cobc/field.c:1436 #, fuzzy, c-format -#| msgid "PICTURE clause not compatible with USAGE %s" msgid "%s USAGE %s incompatible with %s USAGE %s" msgstr "PICTURE clausurada no compatible con UTILIZACIÓN %s" @@ -1610,7 +1543,6 @@ msgstr "«%s» no puede tener cláusula de PICTURE" #: cobc/field.c:1533 #, fuzzy, c-format -#| msgid "'%s' is not USAGE DISPLAY" msgid "%s item '%s' should be USAGE DISPLAY" msgstr "«%s» no es USAGE DISPLAY" @@ -1659,7 +1591,6 @@ msgstr "" #: cobc/field.c:1708 cobc/field.c:1712 #, fuzzy, c-format -#| msgid "initial VALUE clause ignored for %s item" msgid "initial VALUE clause ignored for %s item '%s'" msgstr "cláusula inicial de VALUE ignorada para ítem %s" @@ -1673,7 +1604,6 @@ msgstr "" #: cobc/field.c:1763 #, fuzzy -#| msgid "cannot specify both %s and %s" msgid "cannot specify both FULL and JUSTIFIED" msgstr "no puede especificar ambos %s y %s" @@ -1689,7 +1619,6 @@ msgstr "" #: cobc/field.c:1805 #, fuzzy -#| msgid "cannot specify both %s and %s" msgid "cannot specify both PIC and VALUE" msgstr "no puede especificar ambos %s y %s" @@ -1707,7 +1636,6 @@ msgstr "" #: cobc/field.c:1841 #, fuzzy -#| msgid "INITIALIZED TO item is not alphanumeric" msgid "VALUE item may not be numeric" msgstr "Ítem INITIALIZED TO no es alfanumérico" @@ -1744,13 +1672,11 @@ msgstr "" #: cobc/field.c:1960 #, fuzzy -#| msgid "'%s' cannot have BLANK WHEN ZERO without being USAGE DISPLAY or NATIONAL" msgid "cannot have BLANK WHEN ZERO without PIC" msgstr "«%s» no pude mostrar NEGRO CUANDO CERO sin haber PANTALLA DE USO o NACIONAL" #: cobc/field.c:1963 #, fuzzy -#| msgid "'%s' cannot have JUSTIFIED RIGHT" msgid "cannot have JUSTIFIED without PIC" msgstr "«%s» no se puede tener JUSTIFIED RIGHT" @@ -1768,19 +1694,16 @@ msgstr "" #: cobc/field.c:1997 #, fuzzy -#| msgid "READ must be executed first" msgid "SECURE must be used with TO" msgstr "READ debe ser ejecutada primero" #: cobc/field.c:2016 #, fuzzy, c-format -#| msgid "'%s' is not defined" msgid "'%s' does nothing" msgstr "%s no está definido" #: cobc/field.c:2235 #, fuzzy, c-format -#| msgid "'%s' 77 level not allowed here" msgid "'%s' 77 level is not allowed here" msgstr "«%s» nivel 77 no se permite aquí" @@ -1790,7 +1713,6 @@ msgstr "" #: cobc/field.c:2655 #, fuzzy, c-format -#| msgid "duplicate DEFINE '%s' - ignored" msgid "duplicate LINE %d ignored" msgstr "duplica DEFINE «%s» - ignorado" @@ -1972,7 +1894,6 @@ msgstr "" #: cobc/flag.def:107 #, fuzzy -#| msgid "generate WinMain instead of main when compiling as executable" msgid "" " -fwinmain generate WinMain instead of main when compiling\n" " as executable" @@ -1980,7 +1901,6 @@ msgstr "genera WinMain en vez de principal cuando compila como ejecutable" #: cobc/flag.def:111 #, fuzzy -#| msgid "generate computed goto C statements" msgid " -fcomputed-goto generate computed goto C statements" msgstr "generar declaraciones computadas goto en C" @@ -1990,13 +1910,11 @@ msgstr "" #: cobc/flag.def:117 #, fuzzy -#| msgid "attempt correction of invalid numeric display items" msgid " -fcorrect-numeric attempt correction of invalid numeric display items" msgstr "intentar corrección de los elementos numéricos mostrados inválidos" #: cobc/flag.def:120 #, fuzzy -#| msgid "PERFORM stack allocated on heap" msgid " -fstack-on-heap PERFORM stack allocated on heap" msgstr "Pila PERFORM asignada sobre cabecera" @@ -2014,9 +1932,6 @@ msgstr "" #: cobc/flag.def:132 #, fuzzy -#| msgid "" -#| " -Xref generate cross reference through 'cobxref'\n" -#| " (V. Coen's 'cobxref' must be in path)" msgid "" " -ftrace generate trace code\n" " * scope: executed SECTION/PARAGRAPH" @@ -2032,15 +1947,11 @@ msgstr "" #: cobc/flag.def:140 #, fuzzy -#| msgid "syntax error checking only; don't emit any output" msgid " -fsyntax-only syntax error checking only; don't emit any output" msgstr "solamente comprobando error sintáctico; no emite ningún resultado" #: cobc/flag.def:143 #, fuzzy -#| msgid "" -#| "enable debugging lines\n" -#| "\t\t\t- 'D' in indicator column or floating >>D" msgid "" " -fdebugging-line enable debugging lines\n" " * 'D' in indicator column or floating >>D" @@ -2050,9 +1961,6 @@ msgstr "" #: cobc/flag.def:147 #, fuzzy -#| msgid "" -#| "generate source location code\n" -#| "\t\t\t- turned on by -debug/-g/-ftraceall" msgid "" " -fsource-location generate source location code\n" " * turned on by -debug/-ftraceall/-fec/-dump" @@ -2062,7 +1970,6 @@ msgstr "" #: cobc/flag.def:151 #, fuzzy -#| msgid "automatic initialization of the COBOL runtime system" msgid " -fimplicit-init automatic initialization of the COBOL runtime system" msgstr "inicialización automática del sistema de ejecución COBOL" @@ -2074,9 +1981,6 @@ msgstr "" #: cobc/flag.def:158 #, fuzzy -#| msgid "" -#| "PERFORM stack checking\n" -#| "\t\t\t- turned on by -debug or -g" msgid "" " -fstack-check PERFORM stack checking\n" " * turned on by -debug/-g" @@ -2094,9 +1998,6 @@ msgstr "" #: cobc/flag.def:168 #, fuzzy -#| msgid "" -#| "use AFTER 1 for WRITE of LINE SEQUENTIAL\n" -#| "\t\t\t- default: BEFORE 1" msgid "" " -fwrite-after use AFTER 1 for WRITE of LINE SEQUENTIAL\n" " * default: BEFORE 1" @@ -2106,9 +2007,6 @@ msgstr "" #: cobc/flag.def:172 #, fuzzy -#| msgid "" -#| "'*' or '/' in column 1 treated as comment\n" -#| "\t\t\t- FIXED format only" msgid "" " -fmfcomment '*' or '/' in column 1 treated as comment\n" " * FIXED format only" @@ -2118,9 +2016,6 @@ msgstr "" #: cobc/flag.def:176 #, fuzzy -#| msgid "" -#| "'$' in indicator area treated as '*',\n" -#| "\t\t\t'|' treated as floating comment" msgid "" " -facucomment '$' in indicator area treated as '*',\n" " '|' treated as floating comment" @@ -2130,9 +2025,6 @@ msgstr "" #: cobc/flag.def:181 #, fuzzy -#| msgid "" -#| "allow numeric field overflow\n" -#| "\t\t\t- non-ANSI behaviour" msgid "" " -fno-trunc allow numeric field overflow\n" " * non-ANSI behaviour" @@ -2142,9 +2034,6 @@ msgstr "" #: cobc/flag.def:185 #, fuzzy -#| msgid "" -#| "use a single quote (apostrophe) for QUOTE\n" -#| "\t\t\t- default: double quote" msgid "" " -fsingle-quote use a single quote (apostrophe) for QUOTE\n" " * default: double quote" @@ -2154,9 +2043,6 @@ msgstr "" #: cobc/flag.def:195 #, fuzzy -#| msgid "" -#| "treat all files as OPTIONAL\n" -#| "\t\t\t- unless NOT OPTIONAL specified" msgid "" " -foptional-file treat all files as OPTIONAL\n" " * unless NOT OPTIONAL specified" @@ -2166,13 +2052,11 @@ msgstr "" #: cobc/flag.def:199 #, fuzzy -#| msgid "output static function calls for the CALL statement" msgid " -fstatic-call output static function calls for the CALL statement" msgstr "llamadas de función estática de salida para la sentencia CALL" #: cobc/flag.def:202 #, fuzzy -#| msgid "disable generation of C function declations for subroutines with static CALL" msgid "" " -fno-gen-c-decl-static-call\tdisable generation of C function declarations\n" " for subroutines with static CALL" @@ -2198,7 +2082,6 @@ msgstr "" #: cobc/flag.def:218 #, fuzzy -#| msgid " -F, -free use free source format" msgid " -fno-tsource suppress source from listing" msgstr " -F, -free emplear formato de origen libre" @@ -2208,7 +2091,6 @@ msgstr "" #: cobc/flag.def:224 #, fuzzy -#| msgid " --tsymbols specify symbols in listing" msgid " -ftsymbols specify symbols in listing" msgstr " --tsymbols\t\tespecifica símbolos dentro de listado" @@ -2238,13 +2120,11 @@ msgstr "" #: cobc/help.c:51 #, fuzzy -#| msgid "GnuCOBOL home page: " msgid "GnuCOBOL home page: " msgstr "Página inicial de GnuCOBOL: " #: cobc/help.c:52 #, fuzzy -#| msgid "General help using GNU software: " msgid "General help using GNU software: " msgstr "Ayuda general utilizando software GNU: " @@ -2254,27 +2134,21 @@ msgstr "Opciones:" #: cobc/help.c:59 #, fuzzy -#| msgid " -h, -help display this help and exit" msgid " -h, --help display this help and exit" msgstr " -h, -help enseña esta ayuda y sale" #: cobc/help.c:60 #, fuzzy -#| msgid " -V, -version display compiler version and exit" msgid " -V, --version display compiler version information and exit" msgstr " -V, -version enseña la versión del compilador y sale" #: cobc/help.c:61 #, fuzzy -#| msgid " -V, -version display compiler version and exit" msgid " -dumpversion display compiler version and exit" msgstr " -V, -version enseña la versión del compilador y sale" #: cobc/help.c:62 #, fuzzy -#| msgid "" -#| " -i, -info display compiler information (build/environment)\n" -#| " and exit" msgid "" " -i, --info display compiler information (build/environment)\n" " and exit" @@ -2295,13 +2169,11 @@ msgstr "" #: cobc/help.c:71 #, fuzzy -#| msgid " -q, -brief reduced displays, commands invoked not shown" msgid " -q, --brief reduced displays, commands invoked not shown" msgstr " -q, -brief pantallas reducidas, órdenes invocadas no mostradas" #: cobc/help.c:72 #, fuzzy -#| msgid " -### like -v but commands not executed" msgid " -### like -v but commands not executed" msgstr " -### como -v pero órdenes no ejecutadas" @@ -2315,20 +2187,11 @@ msgstr " -m compila un módulo de carga dinámicamente (pred #: cobc/help.c:75 #, fuzzy -#| msgid " -j [], -job[=]\trun program after build, passing " msgid " -j [], --job[=]\trun program after build, passing " msgstr " -j [], -job[=]\tejecuta un programa tras compilación, pasando " #: cobc/help.c:76 #, fuzzy -#| msgid "" -#| " -std= warnings/features for a specific dialect\n" -#| " can be one of:\n" -#| " default, cobol2014, cobol2002, cobol85, xopen,\n" -#| " ibm-strict, ibm, mvs-strict, mvs,\n" -#| " mf-strict, mf, bs2000-strict, bs2000,\n" -#| " acu-strict, acu, rm-strict, rm;\n" -#| " see configuration files in directory config" msgid "" " -std= warnings/features for a specific dialect\n" " can be one of:\n" @@ -2350,13 +2213,11 @@ msgstr "" #: cobc/help.c:84 #, fuzzy -#| msgid " -F, -free use free source format" msgid " -F, --free use free source format (alias for -fformat=free)" msgstr " -F, -free emplear formato de origen libre" #: cobc/help.c:85 #, fuzzy -#| msgid " -fixed use fixed source format (default)" msgid "" " --fixed use fixed source format (default; alias for\n" " -fformat=fixed)" @@ -2368,19 +2229,16 @@ msgstr " -O, -O2, -O3, -Os optimización activada" #: cobc/help.c:88 #, fuzzy -#| msgid " -W enable all warnings" msgid " -O0 disable optimization" msgstr " -W activa todas las advertencias" #: cobc/help.c:89 #, fuzzy -#| msgid " -g enable C compiler debug / stack check / trace" msgid " -g enable C compiler debug and stack check" msgstr " -g activa depuración de compilador C / compilación de pila / traza" #: cobc/help.c:90 #, fuzzy -#| msgid " -d, -debug enable all run-time error checking" msgid "" " -d, --debug enable all run-time error checking,\n" " equal to -fstack-check -fec=EC-ALL" @@ -2435,7 +2293,6 @@ msgstr " --tlines= líneas especificas por página en lista, predet #: cobc/help.c:108 #, fuzzy -#| msgid " --tsymbols specify symbols in listing" msgid " --tsymbols specify symbols in listing, use -ftsymbols instead" msgstr " --tsymbols\t\tespecifica símbolos dentro de listado" @@ -2445,9 +2302,6 @@ msgstr " -P(=) genera listado de programa preprocesado (.lst)" #: cobc/help.c:112 #, fuzzy -#| msgid "" -#| " -Xref generate cross reference through 'cobxref'\n" -#| " (V. Coen's 'cobxref' must be in path)" msgid "" " -X, --Xref generate cross reference through 'cobxref'\n" " (V. Coen's 'cobxref' must be in path)" @@ -2457,7 +2311,6 @@ msgstr "" #: cobc/help.c:115 #, fuzzy -#| msgid " -Xref specify cross reference in listing" msgid " -X, --Xref specify cross reference in listing" msgstr " -Xref especifica referencia cruzada en listado" @@ -2491,45 +2344,36 @@ msgstr " -K generar CALL a como estática" #: cobc/help.c:124 #, fuzzy -#| msgid " -conf= user-defined dialect configuration; see -std" msgid " --conf= user-defined dialect configuration; see -std" msgstr " -conf= configuración de dialecto definido por usuario; vea -std" #: cobc/help.c:125 #, fuzzy -#| msgid " -list-reserved display reserved words" msgid " --list-reserved display reserved words" msgstr " -list-reserved enseña palabras reservadas" #: cobc/help.c:126 #, fuzzy -#| msgid " -list-intrinsics display intrinsic functions" msgid " --list-intrinsics display intrinsic functions" msgstr " -list-intrinsics enseña funciones intrínsecas" #: cobc/help.c:127 #, fuzzy -#| msgid " -list-mnemonics display mnemonic names" msgid " --list-mnemonics display mnemonic names" msgstr " -list-mnemonics enseña nombres mnemónicos" #: cobc/help.c:128 #, fuzzy -#| msgid " -list-mnemonics display mnemonic names" msgid " --list-exceptions display exception names" msgstr " -list-mnemonics enseña nombres mnemónicos" #: cobc/help.c:129 #, fuzzy -#| msgid " -list-system display system routines" msgid " --list-system display system routines" msgstr " -list-system enseña rutinas del sistema" #: cobc/help.c:130 #, fuzzy -#| msgid "" -#| " -save-temps[=] save intermediate files\n" -#| " - default: current directory" msgid "" " --save-temps[=] save intermediate files\n" " * default: current directory" @@ -2543,7 +2387,6 @@ msgstr " -ext añade extensión de fichero para resolver COPY" #: cobc/help.c:139 #, fuzzy -#| msgid "unknown warning option '%s'" msgid "Warning options:" msgstr "opción de aviso desconocido «%s»" @@ -2553,33 +2396,28 @@ msgstr " -Wall activar la mayoría de las advertencias (todas e #: cobc/help.c:141 #, fuzzy -#| msgid " -W enable all warnings" msgid " -Wextra like -Wall but enable some extra warning flags" msgstr " -W activa todas las advertencias" #: cobc/help.c:142 #, fuzzy -#| msgid " -W enable all warnings" msgid " -w disable all warnings" msgstr " -W activa todas las advertencias" #: cobc/help.c:143 #, fuzzy -#| msgid " -Wno- disable warning enabled by -W or -Wall" msgid " -Wno- disable warning enabled by default, -Wall or -Wextra" msgstr " -Wno- desactiva advertencias activadas por -W o -Wall" #. TRANSLATORS: This msgid is appended to msgid for -Wno-pending and others #: cobc/help.c:149 #, fuzzy -#| msgid " -W enable all warnings" msgid " * ALWAYS active" msgstr " -W activa todas las advertencias" #. TRANSLATORS: This msgid is appended to msgid for -Wpossible-truncate and others #: cobc/help.c:153 #, fuzzy -#| msgid " -W enable all warnings" msgid " * NOT set with -Wall" msgstr " -W activa todas las advertencias" @@ -2589,7 +2427,6 @@ msgstr " -Werror trata todas las advertencias como errores" #: cobc/help.c:162 #, fuzzy -#| msgid " -Werror treat all warnings as errors" msgid " -Wno-error don't treat warnings as errors" msgstr " -Werror trata todas las advertencias como errores" @@ -2599,7 +2436,6 @@ msgstr " -Werror= tratar especificado como error #: cobc/help.c:164 #, fuzzy -#| msgid " -Werror= treat specified as error" msgid " -Wno-error= don't treat specified as error" msgstr " -Werror= tratar especificado como error" @@ -2666,13 +2502,11 @@ msgstr ":" #: cobc/help.c:280 #, fuzzy -#| msgid "special register %s is unknown" msgid "special register to disable" msgstr "registro especial %s es desconocido" #: cobc/help.c:281 #, fuzzy -#| msgid "special register %s is unknown" msgid "special register to enable" msgstr "registro especial %s es desconocido" @@ -2701,7 +2535,6 @@ msgstr "ENTRY «%s» duplicado" #: cobc/parser.y:520 #, fuzzy, c-format -#| msgid "ENTRY '%s' duplicated" msgid "ENTRY FOR GO TO '%s' duplicated" msgstr "ENTRY «%s» duplicado" @@ -2731,7 +2564,6 @@ msgstr "no puede especificar ambos %s y %s" #: cobc/parser.y:677 #, fuzzy, c-format -#| msgid "%s ignored" msgid "%s is ignored" msgstr "%s ignorado" @@ -2756,7 +2588,6 @@ msgstr "PARA frase sin frase DEPENDIENTE" #: cobc/parser.y:727 #, fuzzy -#| msgid "maximum number of occurences assumed to be exact number" msgid "maximum number of occurrences assumed to be exact number" msgstr "número máximo de ocurrencias asumidas a ser número exacto" @@ -2766,7 +2597,6 @@ msgstr "OCURRE PARA debe ser mayor que OCURRE DESDE" #: cobc/parser.y:741 #, fuzzy -#| msgid "ODO without TO phrase" msgid "OCCURS DEPENDING ON without TO phrase" msgstr "ODO sin frase TO" @@ -2777,13 +2607,11 @@ msgstr "%s encabezado ausente" #: cobc/parser.y:807 #, fuzzy, c-format -#| msgid "%s header missing - assumed" msgid "%s header assumed" msgstr "%s encabezado ausente - asumido" #: cobc/parser.y:939 #, fuzzy, c-format -#| msgid "duplicate %s clause" msgid "duplicate %s" msgstr "cláusula duplicada %s" @@ -2823,13 +2651,11 @@ msgstr "END PROGRAM «%s» es diferente del PROGRAM-ID «%s»" #: cobc/parser.y:1341 #, fuzzy -#| msgid "'%s' CURSOR must be 4 or 6 characters long" msgid "currency symbol must be one character long" msgstr "«%s» CURSOR no es de 4 o 6 caracteres de longitud" #: cobc/parser.y:1398 #, fuzzy, c-format -#| msgid "a trailing currency symbol" msgid "invalid character '%c' in currency symbol" msgstr "un símbolo monetario trasero" @@ -2854,49 +2680,41 @@ msgstr "" #: cobc/parser.y:1548 cobc/parser.y:1939 cobc/typeck.c:829 #, fuzzy, c-format -#| msgid "reference modification not allowed here" msgid "condition-name not allowed here: '%s'" msgstr "modificación referencial no permitida aquí" #: cobc/parser.y:1554 cobc/parser.y:2127 #, fuzzy -#| msgid "'%s' cannot be used here" msgid "SCREEN item cannot be used here" msgstr "«%s» no puede ser empleado aquí" #: cobc/parser.y:1557 #, fuzzy -#| msgid "'%s' cannot be used here" msgid "REPORT item cannot be used here" msgstr "«%s» no puede ser empleado aquí" #: cobc/parser.y:1563 #, fuzzy -#| msgid "'%s' cannot be used here" msgid "TYPEDEF item cannot be used here" msgstr "«%s» no puede ser empleado aquí" #: cobc/parser.y:1572 #, fuzzy -#| msgid "integer value expected" msgid "elementary item expected" msgstr "valor entero esperado" #: cobc/parser.y:1579 #, fuzzy -#| msgid "RENAMES may not reference a level 88" msgid "item may not reference itself" msgstr "RENOMBRA quizá no referencia un nivel 88" #: cobc/parser.y:1586 #, fuzzy -#| msgid "THRU item '%s' may not be subordinate to '%s'" msgid "item may not be subordinate to any item with USAGE clause" msgstr "Ítem THRU «%s» quizá no es subordinado a «%s»" #: cobc/parser.y:1588 #, fuzzy -#| msgid "THRU item '%s' may not be subordinate to '%s'" msgid "item may not be subordinate to any item with SIGN clause" msgstr "Ítem THRU «%s» quizá no es subordinado a «%s»" @@ -2907,7 +2725,6 @@ msgstr "" #: cobc/parser.y:1641 #, fuzzy, c-format -#| msgid "THRU item '%s' may not be subordinate to '%s'" msgid "entry following %s may not be subordinate to it" msgstr "Ítem THRU «%s» quizá no es subordinado a «%s»" @@ -2921,7 +2738,6 @@ msgstr "faltando frase CARÁCTER/TODO/FRENTE/COLA tras frase PARA" #: cobc/parser.y:1868 #, fuzzy -#| msgid "missing value between CHARACTERS/ALL/LEADING/TRAILING words" msgid "missing value between ALL/LEADING/TRAILING words" msgstr "faltando valor entre palabras CARACTERES/TODO/CABECERA/COLA" @@ -2978,7 +2794,6 @@ msgstr "invalida objetivo para %s" #: cobc/parser.y:2129 #, fuzzy -#| msgid "a constant may not be used here - '%s'" msgid "RENAMES item may not be used here" msgstr "una constante quizá no está utilizada aquí - «%s»" @@ -2993,19 +2808,16 @@ msgstr "" #: cobc/parser.y:2144 #, fuzzy -#| msgid "REDEFINES clause must follow entry-name" msgid "WHEN clause must follow EVERY clause" msgstr "Cláusula de REDEFINES debe seguir nombre de entrada" #: cobc/parser.y:2229 cobc/parser.y:18631 #, fuzzy -#| msgid "integer value expected" msgid "non-zero value expected" msgstr "valor entero esperado" #: cobc/parser.y:2235 cobc/tree.c:4735 #, fuzzy, c-format -#| msgid "RECORD size exceeds maximum allowed (%d)" msgid "RECORD size (IDX) exceeds maximum allowed (%d)" msgstr "RECORD de tamaño excede el máximo permitido (%d)" @@ -3066,13 +2878,11 @@ msgstr "cláusula %s es inválida" #: cobc/parser.y:4616 cobc/parser.y:4754 #, fuzzy -#| msgid "literal type does not match numeric data type" msgid "type does not match alphabet" msgstr "tipo literal no coincide con el tipo de datos numérico" #: cobc/parser.y:4760 #, fuzzy -#| msgid "'%s' is not an alphabet-name" msgid "CLASS IS integer IN alphabet-name" msgstr "«%s» no es un nombre alfabético" @@ -3133,13 +2943,11 @@ msgstr "" #: cobc/parser.y:5733 cobc/parser.y:5758 #, fuzzy, c-format -#| msgid "RECORDING MODE U or S can only be used with RECORD SEQUENTIAL files" msgid "RECORD DELIMITER %s only allowed with SEQUENTIAL files" msgstr "MODO DE RECORDATORIO U o S puede solo ser empleado con ficheros REGISTRO SECUENCIAL" #: cobc/parser.y:5745 #, fuzzy, c-format -#| msgid "RECORDING MODE U or S can only be used with RECORD SEQUENTIAL files" msgid "RECORD DELIMITER %s only allowed with (LINE) SEQUENTIAL files" msgstr "MODO DE RECORDATORIO U o S puede solo ser empleado con ficheros REGISTRO SECUENCIAL" @@ -3153,7 +2961,6 @@ msgstr "" #: cobc/parser.y:5772 #, fuzzy -#| msgid "RECORDING MODE U or S can only be used with RECORD SEQUENTIAL files" msgid "RECORD DELIMITER clause only allowed with (LINE) SEQUENTIAL files" msgstr "MODO DE RECORDATORIO U o S puede solo ser empleado con ficheros REGISTRO SECUENCIAL" @@ -3176,7 +2983,6 @@ msgstr "RECORD descrito faltante o no válido" #: cobc/parser.y:6239 #, fuzzy, c-format -#| msgid "duplicate values in class '%s'" msgid "duplicate file description for %s" msgstr "valores duplicados en clase '%s'" @@ -3221,7 +3027,6 @@ msgstr "Ítem CONSTANTE no en el nivel 01" #: cobc/parser.y:7236 #, fuzzy -#| msgid "REDEFINES clause must follow entry-name" msgid "REDEFINES clause not following entry-name" msgstr "Cláusula de REDEFINES debe seguir nombre de entrada" @@ -3239,7 +3044,6 @@ msgstr "%s requiere un nombre de datos" #: cobc/parser.y:7316 cobc/parser.y:7565 #, fuzzy, c-format -#| msgid "%s not allowed on %s files" msgid "%s not allowed in %s" msgstr "%s no permitida en ficheros de %s" @@ -3251,7 +3055,6 @@ msgstr "%s no se permite aquí" #: cobc/parser.y:7528 #, fuzzy, c-format -#| msgid "%s FILE requires a FROM clause" msgid "%s requires DEPENDING clause" msgstr "FICHERO %s requiere una cláusula FROM" @@ -3269,19 +3072,16 @@ msgstr "" #: cobc/parser.y:7610 cobc/typeck.c:4752 #, fuzzy, c-format -#| msgid "'%s' is not a locale name" msgid "'%s' is not a locale-name" msgstr "«%s» no es un nombre local" #: cobc/parser.y:7656 #, fuzzy, c-format -#| msgid "'%s' is not a valid data name" msgid "'%s' is not a valid USAGE" msgstr "«%s» no es un nombre válido de datos" #: cobc/parser.y:7661 #, fuzzy, c-format -#| msgid "unknown failure: %d" msgid "unknown USAGE: %s" msgstr "fallo desconocido: %d" @@ -3305,7 +3105,6 @@ msgstr "" #: cobc/parser.y:8585 #, fuzzy, c-format -#| msgid "%s only allowed at 01/77 level" msgid "%s only allowed at 01 level" msgstr "%s solamente permitido a nivel 01/77" @@ -3320,7 +3119,6 @@ msgstr "GLOBAL no se permite con RD" #: cobc/parser.y:9247 #, fuzzy, c-format -#| msgid "'%s' is not a field or file" msgid "%s is not valid for VARYING" msgstr "«%s» no es campo o fichero" @@ -3334,7 +3132,6 @@ msgstr "" #: cobc/parser.y:9325 #, fuzzy -#| msgid "GLOBAL is not allowed with RD" msgid "PLUS is not allowed with LEFT, RIGHT or CENTER" msgstr "GLOBAL no se permite con RD" @@ -3364,13 +3161,11 @@ msgstr "" #: cobc/parser.y:9821 #, fuzzy, c-format -#| msgid "missing definitions:" msgid "missing %s" msgstr "definiciones ausentes:" #: cobc/parser.y:10508 #, fuzzy -#| msgid "GLOBAL screen items" msgid "OCCURS screen items" msgstr "GLOBAL de elementos de pantalla" @@ -3388,7 +3183,6 @@ msgstr "programa ejecutable requerido pero PROCEDURE/ENTRY tiene cláusula USING #: cobc/parser.y:10654 cobc/parser.y:10671 cobc/parser.y:12278 #, fuzzy, c-format -#| msgid "number of parameters exceeds maximum %d" msgid "number of arguments exceeds maximum %d" msgstr "número de parámetros excede el máximo %d" @@ -3511,7 +3305,6 @@ msgstr "ALLOCATE CHARACTERS requiere cláusula DEVOLVIENDO" #: cobc/parser.y:11987 cobc/parser.y:13289 #, fuzzy, c-format -#| msgid "ignoring sign" msgid "ignoring %s phrase" msgstr "ignorando signo" @@ -3525,7 +3318,6 @@ msgstr "" #: cobc/parser.y:12062 #, fuzzy -#| msgid "recursive program call - assuming RECURSIVE attribute" msgid "assuming RECURSIVE attribute" msgstr "llamada de programa recursivo - asumiendo atributo RECURSIVO" @@ -3551,7 +3343,6 @@ msgstr "ANIDACIÓN de frase es solo válida con literal" #: cobc/parser.y:12296 #, fuzzy, c-format -#| msgid "OMITTED only allowed when parameters are passed BY REFERENCE" msgid "%s only allowed when arguments are passed %s" msgstr "OMITIDO solo permitido cuando parámetros son pasados POR REFERENCIA" @@ -3569,13 +3360,11 @@ msgstr "SIN EXCEPCIÓN tras EXCEPCIÓN" #: cobc/parser.y:13162 #, fuzzy, c-format -#| msgid "HANDLE must be either a generic or a THREAD HANDLE" msgid "HANDLE must be a %s HANDLE" msgstr "HANDLE debe ser o un manipulador genérico o un THREAD HANDLE" #: cobc/parser.y:13174 #, fuzzy -#| msgid "HANDLE must be either a generic or a THREAD HANDLE" msgid "HANDLE must be a generic HANDLE" msgstr "HANDLE debe ser o un manipulador genérico o un THREAD HANDLE" @@ -3637,7 +3426,6 @@ msgstr "EXIT PARAGRAPH es solamente válido dentro de PARAGRAPH activo" #: cobc/parser.y:14034 #, fuzzy -#| msgid "RETURNING/GIVING not allowed for non-returning sources" msgid "RETURNING/GIVING not allowed for non-returning runtime elements" msgstr "RETORNANDO/DANDO no permitido para fuentes no devueltas" @@ -3672,13 +3460,11 @@ msgstr "" #: cobc/parser.y:15212 #, fuzzy -#| msgid "ODO without TO phrase" msgid "PERFORM VARYING without BY phrase" msgstr "ODO sin frase TO" #: cobc/parser.y:15252 #, fuzzy, c-format -#| msgid "'%s' is not an integer" msgid "'%s' is not an object-reference" msgstr "«%s» no es un entero" @@ -3700,7 +3486,6 @@ msgstr "ordenación de fichero requiere frase KEY" #: cobc/parser.y:16010 #, fuzzy -#| msgid "file sort requires KEY phrase" msgid "table SORT requires KEY phrase" msgstr "ordenación de fichero requiere frase KEY" @@ -3776,13 +3561,11 @@ msgstr "USE DEBUGGING no apoyado en contenidos del programa" #: cobc/parser.y:16786 cobc/parser.y:16795 cobc/parser.y:16813 #: cobc/parser.y:16849 cobc/typeck.c:4886 #, fuzzy, c-format -#| msgid "duplicate DEFINE directive '%s'" msgid "duplicate DEBUGGING target: '%s'" msgstr "directiva DEFINE duplicada «%s»" #: cobc/parser.y:16811 #, fuzzy -#| msgid "a constant may not be used here - '%s'" msgid "constant item cannot be used here" msgstr "una constante quizá no está utilizada aquí - «%s»" @@ -3832,7 +3615,6 @@ msgstr "" #: cobc/parser.y:17392 #, fuzzy, c-format -#| msgid "'%s' is not a locale name" msgid "'%s' is not a schema name" msgstr "«%s» no es un nombre local" @@ -3899,7 +3681,6 @@ msgstr "«%s» no indexado" #: cobc/parser.y:18180 #, fuzzy -#| msgid "file sort requires KEY phrase" msgid "SEARCH ALL requires KEY phrase" msgstr "ordenación de fichero requiere frase KEY" @@ -3915,7 +3696,6 @@ msgstr "«%s» no es nombre de CD" #: cobc/parser.y:18273 #, fuzzy, c-format -#| msgid "'%s' is not a report name" msgid "'%s' is not a valid report name" msgstr "«%s» no es un nombre de boletín" @@ -3925,13 +3705,11 @@ msgstr "identificador mnemónico inválido" #: cobc/parser.y:18606 #, fuzzy -#| msgid "a non-numeric literal is expected for '%s'" msgid "a numeric literal is expected here" msgstr "un literal no numérico está esperado para «%s»" #: cobc/parser.y:18618 cobc/parser.y:19366 #, fuzzy -#| msgid "a non-numeric literal is expected for '%s'" msgid "a non-numeric literal is expected here" msgstr "un literal no numérico está esperado para «%s»" @@ -3952,7 +3730,6 @@ msgstr "%s no es un campo" #: cobc/parser.y:18841 #, fuzzy, c-format -#| msgid "'%s' is not a file name" msgid "'%s' is not a type-name" msgstr "«%s» no es nombre de fichero" @@ -3963,19 +3740,16 @@ msgstr "«%s» no puede ser modificado por referencia" #: cobc/parser.y:19015 #, fuzzy, c-format -#| msgid "'%s' is not a field or file" msgid "'%s' is not a field or alphabet" msgstr "«%s» no es campo o fichero" #: cobc/parser.y:19041 #, fuzzy -#| msgid "'%s' cannot be used here" msgid "a subscripted data-item cannot be used here" msgstr "«%s» no puede ser empleado aquí" #: cobc/parser.y:19089 #, fuzzy -#| msgid "unsigned positive integer value expected" msgid "unsigned integer value expected" msgstr "esperado valor positivo sin signo" @@ -4032,7 +3806,6 @@ msgstr "Directiva VCS" #: cobc/pplex.l:420 cobc/pplex.l:441 #, fuzzy, c-format -#| msgid "ignoring invalid directive: '%s'" msgid "ignoring unknown directive: '%s'" msgstr "ignorando directiva inválida: «%s»" @@ -4047,7 +3820,6 @@ msgstr "" #: cobc/pplex.l:1469 #, fuzzy, c-format -#| msgid "ignoring invalid directive: '%s'" msgid "ignoring %s directive because of %s" msgstr "ignorando directiva inválida: «%s»" @@ -4096,13 +3868,11 @@ msgstr "continuación inválida dentro de registro comentado" #: cobc/pplex.l:2241 #, fuzzy, c-format -#| msgid "invalid indicator '%c' at column 7" msgid "invalid indicator '\\' at column %d" msgstr "indicador «%c» inválido en columna 7" #: cobc/pplex.l:2253 #, fuzzy, c-format -#| msgid "invalid indicator '%c' at column 7" msgid "invalid indicator '%c' at column %d" msgstr "indicador «%c» inválido en columna 7" @@ -4134,7 +3904,6 @@ msgstr "directiva DEFINE duplicada «%s»" #: cobc/ppparse.y:331 cobc/ppparse.y:341 #, fuzzy, c-format -#| msgid "invalid constant in DEFINE directive" msgid "invalid constant %s in DEFINE directive" msgstr "constante invalida dentro de directiva DEFINE" @@ -4145,13 +3914,11 @@ msgstr "" #: cobc/ppparse.y:486 #, fuzzy, c-format -#| msgid "invalid %s directive" msgid "invalid %s directive option '%s'" msgstr "invalida %s directiva" #: cobc/ppparse.y:488 #, fuzzy, c-format -#| msgid "invalid %s directive" msgid "invalid %s directive option" msgstr "invalida %s directiva" @@ -4182,13 +3949,11 @@ msgstr "nombre de característica" #: cobc/reserved.c:4129 #, fuzzy, c-format -#| msgid "reserved word must have less than %d characters" msgid "reserved word (%s) must have less than %d characters" msgstr "palabra reservada debe tener menos que %d caracteres" #: cobc/reserved.c:4149 #, fuzzy, c-format -#| msgid "should not contain '%c'" msgid "reserved word (%s) may not contain '%c'" msgstr "debería no contener «%c»" @@ -4247,19 +4012,16 @@ msgstr "" #: cobc/reserved.c:5148 #, fuzzy, c-format -#| msgid "special register %s is unknown, needs a defintion" msgid "special register '%s' is unknown, needs a definition" msgstr "registro especial %s es desconocido, requiere una definición" #: cobc/reserved.c:5155 #, fuzzy, c-format -#| msgid "special register %s is unknown, needs a defintion" msgid "special register '%s' has a bad definition: %s" msgstr "registro especial %s es desconocido, requiere una definición" #: cobc/reserved.c:5159 #, fuzzy, c-format -#| msgid "special register %s is unknown" msgid "special register '%s' is unknown" msgstr "registro especial %s es desconocido" @@ -4273,7 +4035,6 @@ msgstr "Definición" #: cobc/reserved.c:5337 #, fuzzy, c-format -#| msgid "unknown statement '%s'" msgid "unknown system-name '%s'" msgstr "sentencia desconocida «%s»" @@ -4295,7 +4056,6 @@ msgstr "No (Contexto distinguible de mayúsculas)" #: cobc/scanner.l:272 #, fuzzy, c-format -#| msgid "'%s' is a reserved word, but isn't supported" msgid "'%s' is not a reserved word, so cannot be removed" msgstr "«%s» es una palabra reservada, pero no es compatible" @@ -4348,7 +4108,6 @@ msgstr "invalida %s literal; «%s»" #: cobc/scanner.l:1350 #, fuzzy, c-format -#| msgid "literal length exceeds %d characters" msgid "literal length exceeds %u characters" msgstr "longitud literal excede %d caracteres" @@ -4359,13 +4118,11 @@ msgstr "" #: cobc/scanner.l:1382 cobc/scanner.l:1444 cobc/scanner.l:1729 #, fuzzy -#| msgid "numeric boolean literal" msgid "zero-length literal" msgstr "numérico booleano literal" #: cobc/scanner.l:1385 #, fuzzy -#| msgid "alphanumeric literal has zero length; a SPACE will be assumed" msgid "national literal has zero length; a SPACE will be assumed" msgstr "literal alfanumérica tiene longitud de cero; un ESPACIO será asumido" @@ -4380,13 +4137,11 @@ msgstr "literal nacinal" #: cobc/scanner.l:1416 #, fuzzy -#| msgid "national literal" msgid "national-character literal" msgstr "literal nacinal" #: cobc/scanner.l:1447 #, fuzzy -#| msgid "alphanumeric literal has zero length; a SPACE will be assumed" msgid "hexadecimal literal has zero length; X'00' will be assumed" msgstr "literal alfanumérica tiene longitud de cero; un ESPACIO será asumido" @@ -4397,7 +4152,6 @@ msgstr "booleana-hexadecimal literal" #: cobc/scanner.l:1480 cobc/scanner.l:1499 cobc/scanner.l:1608 #: cobc/scanner.l:1659 cobc/scanner.l:1754 cobc/scanner.l:1824 #, fuzzy, c-format -#| msgid "literal length %d exceeds %d characters" msgid "literal length %lu exceeds %u characters" msgstr "longitud literal %d excede %d caracteres" @@ -4418,7 +4172,6 @@ msgstr "literal no tiene un número par de elementos" #: cobc/scanner.l:1599 #, fuzzy, c-format -#| msgid "literal contains invalid character '%c'" msgid "%s literals must contain at least one character" msgstr "literal contiene carácter no válido «%c»" @@ -4428,7 +4181,6 @@ msgstr "ACUCOBOL numérico literal" #: cobc/scanner.l:1651 #, fuzzy -#| msgid "literal contains invalid character '%c'" msgid "H literals must contain at least one character" msgstr "literal contiene carácter no válido «%c»" @@ -4443,31 +4195,26 @@ msgstr "numérico booleano literal" #: cobc/scanner.l:1731 #, fuzzy -#| msgid "alphanumeric literal has zero length; a SPACE will be assumed" msgid "Boolean literal has zero length; B'0' will be assumed" msgstr "literal alfanumérica tiene longitud de cero; un ESPACIO será asumido" #: cobc/scanner.l:1807 #, fuzzy -#| msgid "ACUCOBOL numeric literal" msgid "HP COBOL octal literal" msgstr "ACUCOBOL numérico literal" #: cobc/scanner.l:1921 #, fuzzy, c-format -#| msgid "literal length %d exceeds maximum of %d digits" msgid "literal length %lu exceeds maximum of %u digits" msgstr "longitud literal %d excede máximo de %d dígitos" #: cobc/scanner.l:1927 #, fuzzy, c-format -#| msgid "literal length %d exceeds %d digits" msgid "literal length %lu exceeds %u digits" msgstr "longitud literal %d excede %d dígitos" #: cobc/scanner.l:2039 cobc/tree.c:3845 #, fuzzy, c-format -#| msgid "significand has more than 34 digits" msgid "significand has more than %d digits" msgstr "significación tiene más de 34 dígitos" @@ -4483,7 +4230,6 @@ msgstr "exponente tiene más que 4 dígitos" #: cobc/scanner.l:2080 #, fuzzy, c-format -#| msgid "exponent not between -78 and 76" msgid "exponent not between -6143 and 6144" msgstr "exponente no entre -78 y 76" @@ -4524,7 +4270,6 @@ msgstr "numérico CONSTANTE inválido: %s" #: cobc/scanner.l:2384 cobc/scanner.l:2411 #, fuzzy, c-format -#| msgid "'%s' is not defined, but is a reserved word in another dialect" msgid "'%s' is not a default reserved word, so cannot be aliased" msgstr "'%s' no está definido, pero es una palabra reservada en otro dialecto" @@ -4539,7 +4284,6 @@ msgstr "" #: cobc/scanner.l:2414 #, fuzzy, c-format -#| msgid "alias target '%s' is not a default reserved word" msgid "'%s' is not a reserved word" msgstr "objetivo alias «%s» no es una palabra reservada predeterminada" @@ -4587,13 +4331,11 @@ msgstr "constante desconocido" #: cobc/tree.c:571 #, fuzzy, c-format -#| msgid "invalid literal: '%s'" msgid "literal \"%s\"" msgstr "invalida literal: «%s»" #: cobc/tree.c:842 #, fuzzy, c-format -#| msgid "FUNCTION %s has invalid/not supported arguments - Tag %d" msgid "FUNCTION %s has invalid/not supported arguments - tag %d" msgstr "FUNCTION %s tiene argumentos inválidos/no compatibles - Tag %d" @@ -4652,7 +4394,6 @@ msgstr "solo literales con misma categoría puede ser concatenado" #: cobc/tree.c:2789 #, fuzzy -#| msgid "only alpanumeric, national or boolean literals may be concatenated" msgid "only alphanumeric, national or boolean literals may be concatenated" msgstr "solo alfanuméricos, nacionales o booleanos literales quizá son concatenados" @@ -4745,7 +4486,6 @@ msgstr "números o constantes entre paréntesis no es un entero sin signo" #: cobc/tree.c:3280 #, fuzzy, c-format -#| msgid "only up to 9 significant digits are permitted within parentheses" msgid "only up to %d significant digits are permitted within parentheses" msgstr "solo superior a 9 dígitos significantes están permitidos entre paréntesis" @@ -4763,7 +4503,6 @@ msgstr "paréntesis desequilibrados" #: cobc/tree.c:3337 #, fuzzy -#| msgid "parentheses must contain (a constant-name defined as) a positive integer" msgid "parentheses must contain an unsigned integer" msgstr "paréntesis deben contener (un nombre-constante definido como) un entero positiv" @@ -4801,7 +4540,6 @@ msgstr "D debe ser seguido por B" #: cobc/tree.c:3497 cobc/tree.c:3596 cobc/tree.c:3622 cobc/tree.c:3733 #, fuzzy -#| msgid "unbalanced parentheses" msgid "uncommon parentheses" msgstr "paréntesis desequilibrados" @@ -4811,7 +4549,6 @@ msgstr "" #: cobc/tree.c:3586 #, fuzzy -#| msgid "S must be at start of PICTURE string" msgid "L must be at start of PICTURE string" msgstr "S debe estar al inicio de la cadena PICTURE" @@ -4848,13 +4585,11 @@ msgstr "campo numérico no puede ser mayor de %d dígitos" #: cobc/tree.c:4267 #, fuzzy, c-format -#| msgid "PICTURE clause required for '%s'" msgid "needs PICTURE clause for SUM %s" msgstr "PICTURE clausurada requerida para «%s»" #: cobc/tree.c:4274 #, fuzzy, c-format -#| msgid "PICTURE clause required for '%s'" msgid "non-numeric PICTURE clause for SUM %s" msgstr "PICTURE clausurada requerida para «%s»" @@ -4900,7 +4635,6 @@ msgstr "longitud de registro mínimo %d puede mantener el elemento clave «%s»; #: cobc/tree.c:4696 #, fuzzy, c-format -#| msgid "missing definitions:" msgid "missing file description for %s" msgstr "definiciones ausentes:" @@ -4924,7 +4658,6 @@ msgstr "" #: cobc/tree.c:4795 #, fuzzy, c-format -#| msgid "%s ignored" msgid "%s clause ignored" msgstr "%s ignorado" @@ -4932,13 +4665,11 @@ msgstr "%s ignorado" #: cobc/typeck.c:14477 libcob/fileio.c:4598 libcob/screenio.c:3720 #: libcob/screenio.c:3750 #, fuzzy, c-format -#| msgid "runtime library is not configured for this operation" msgid "runtime is not configured to support %s" msgstr "biblioteca de tiempo de ejecución no está configurado para esta operación" #: cobc/tree.c:5395 #, fuzzy, c-format -#| msgid "literal is longer than field" msgid "literal '%.38s' is longer than '%s'" msgstr "literal es más largo que campo" @@ -4964,7 +4695,6 @@ msgstr "" #: cobc/tree.c:5548 cobc/tree.c:5572 #, fuzzy, c-format -#| msgid "THRU item '%s' may not be subordinate to '%s'" msgid "unsigned '%s' may not be %s %s" msgstr "Ítem THRU «%s» quizá no es subordinado a «%s»" @@ -4975,7 +4705,6 @@ msgstr "" #: cobc/tree.c:5614 cobc/tree.c:5639 #, fuzzy, c-format -#| msgid "'%s' cannot be used here" msgid "'%s' may not be %s %s" msgstr "«%s» no puede ser empleado aquí" @@ -5000,7 +4729,6 @@ msgstr "expresión no válida" #: cobc/tree.c:6148 #, fuzzy, c-format -#| msgid "invalid expression" msgid "invalid expression: %s %s %s" msgstr "expresión no válida" @@ -5033,13 +4761,11 @@ msgstr "referencia del nombre de fichero inválido" #: cobc/tree.c:6451 #, fuzzy, c-format -#| msgid "BY CONTENT assumed for alphanumeric item" msgid "BY CONTENT assumed for alphanumeric item '%s'" msgstr "BY CONTENT asumido para elementos alfanuméricos" #: cobc/tree.c:6456 #, fuzzy, c-format -#| msgid "BY CONTENT assumed for alphanumeric item" msgid "BY CONTENT assumed for national item '%s'" msgstr "BY CONTENT asumido para elementos alfanuméricos" @@ -5057,31 +4783,26 @@ msgstr "PERFORM NEVER desde UNTIL siempre es TRUE" #: cobc/tree.c:6726 #, fuzzy, c-format -#| msgid "no definition/prototype seen for program '%s'" msgid "no definition/prototype seen for FUNCTION '%s'" msgstr "sin definición/prototipo visto para programa «%s»" #: cobc/tree.c:6728 #, fuzzy, c-format -#| msgid "no definition/prototype seen for program '%s'" msgid "no definition/prototype seen for PROGRAM '%s'" msgstr "sin definición/prototipo visto para programa «%s»" #: cobc/tree.c:6737 #, fuzzy, c-format -#| msgid "no definition/prototype seen for program with external name '%s'" msgid "no definition/prototype seen for FUNCTION with external name '%s'" msgstr "ninguna definición/prototipo visto para programa con nombre externo «%s»" #: cobc/tree.c:6739 #, fuzzy, c-format -#| msgid "no definition/prototype seen for program with external name '%s'" msgid "no definition/prototype seen for PROGRAM with external name '%s'" msgstr "ninguna definición/prototipo visto para programa con nombre externo «%s»" #: cobc/tree.c:6831 #, fuzzy, c-format -#| msgid "FUNCTION '%s' has invalid parameter" msgid "FUNCTION %s has invalid argument" msgstr "FUNCTION «%s» tiene parámetro no válido" @@ -5118,13 +4839,11 @@ msgstr "FUNCTION «%s» no puede tener la modificación por referencia" #: cobc/tree.c:7008 cobc/tree.c:7083 cobc/tree.c:7089 cobc/tree.c:7097 #: cobc/tree.c:7105 cobc/tree.c:7127 cobc/tree.c:7137 cobc/tree.c:7142 #, fuzzy, c-format -#| msgid "FUNCTION '%s' has invalid parameter" msgid "FUNCTION '%s' has invalid argument" msgstr "FUNCTION «%s» tiene parámetro no válido" #: cobc/tree.c:7185 #, fuzzy, c-format -#| msgid "FUNCTION '%s' has invalid first parameter" msgid "FUNCTION '%s' has invalid first argument" msgstr "FUNCTION «%s» tiene primer parámetro no válido" @@ -5135,7 +4854,6 @@ msgstr "" #: cobc/typeck.c:850 #, fuzzy, c-format -#| msgid "%s not allowed here" msgid "%s item not allowed here: '%s'" msgstr "%s no se permite aquí" @@ -5156,13 +4874,11 @@ msgstr "«%s» no es nombre numérico o editado-numérico" #: cobc/typeck.c:974 #, fuzzy, c-format -#| msgid "'%s' is not a numeric value" msgid "'%s' is Alpha, instead of a numeric value" msgstr "«%s» no es un valor numérico" #: cobc/typeck.c:977 #, fuzzy, c-format -#| msgid "'%s' is not a numeric value" msgid "'%s' is Alpha Edited, instead of a numeric value" msgstr "«%s» no es un valor numérico" @@ -5210,7 +4926,6 @@ msgstr "longitud de palabra excede los %d caracteres: «%s»" #: cobc/typeck.c:2223 #, fuzzy, c-format -#| msgid "ASSIGN interpreted as %s" msgid "ASSIGN %s interpreted as '%s'" msgstr "ASSIGN interpretarse en el %s" @@ -5322,7 +5037,6 @@ msgstr "«%s» Campo de REDEFINES no se permite aquí" #: cobc/typeck.c:3075 cobc/typeck.c:8423 #, fuzzy, c-format -#| msgid "duplicate DEFINE directive '%s'" msgid "duplicate USING BY REFERENCE item '%s'" msgstr "directiva DEFINE duplicada «%s»" @@ -5333,7 +5047,6 @@ msgstr "«%s» ítem usando USING duplica ítem de retorno DEVOLVIENDO" #: cobc/typeck.c:3177 #, fuzzy, c-format -#| msgid "redefinition of '%s'" msgid "prototype and definition of '%s' do not match" msgstr "redefinición de «%s»" @@ -5349,13 +5062,11 @@ msgstr "" #: cobc/typeck.c:3295 #, fuzzy -#| msgid "no definition/prototype seen for function '%s'" msgid "definition is a program but the prototype is a function" msgstr "sin aparecer definición/prototipo para función «%s»" #: cobc/typeck.c:3299 #, fuzzy -#| msgid "no definition/prototype seen for program '%s'" msgid "definition is a function but the prototype is a program" msgstr "sin definición/prototipo visto para programa «%s»" @@ -5369,7 +5080,6 @@ msgstr "" #: cobc/typeck.c:3348 #, fuzzy -#| msgid "number of parameters exceeds maximum %d" msgid "number of parameters differ" msgstr "número de parámetros excede el máximo %d" @@ -5388,7 +5098,6 @@ msgstr "etiqueta de árbol inesperada: %d" #: cobc/typeck.c:3433 #, fuzzy, c-format -#| msgid "parameters passed BY VALUE" msgid "expected argument #%d, %s, to be passed BY VALUE" msgstr "parámetro pasado POR VALOR" @@ -5429,19 +5138,16 @@ msgstr "" #: cobc/typeck.c:3598 #, fuzzy -#| msgid "function RETURNING item may not be ANY LENGTH" msgid "the RETURNING item is of a fixed size, not ANY LENGTH" msgstr "función RETORNANDO ítem quizá no es CUALQUIER LONGITUD" #: cobc/typeck.c:3603 #, fuzzy, c-format -#| msgid "RETURNING item must have level 01" msgid "RETURNING item %s is not a valid type" msgstr "DEVOLVIENDO ítem debe de tener un nivel 01" #: cobc/typeck.c:3609 #, fuzzy -#| msgid "unexpected CONSTANT item" msgid "unexpected RETURNING item" msgstr "ítem CONSTANT inesperado" @@ -5466,7 +5172,6 @@ msgstr "valores de carácter inválidos en alfabeto «%s», iniciando en posici #: cobc/typeck.c:4045 #, fuzzy, c-format -#| msgid "duplicate values in class '%s'" msgid "duplicate character values in class '%s'" msgstr "valores duplicados en clase '%s'" @@ -5494,7 +5199,6 @@ msgstr "Ítem RECORD DEPENDING «%s» debería estar definido dentro de sección #: cobc/typeck.c:4298 #, fuzzy, c-format -#| msgid "value in AT clause is not numeric" msgid "file %s: RELATIVE KEY %s is not numeric" msgstr "valor dentro de cláusula AT no es numérico" @@ -5530,25 +5234,21 @@ msgstr "«%s» no es un nombre válido de datos" #: cobc/typeck.c:4363 #, fuzzy, c-format -#| msgid "RECORD DEPENDING item '%s' should be defined in WORKING-STORAGE, LOCAL-STORAGE or LINKAGE SECTION" msgid "CRT STATUS item '%s' should be defined in WORKING-STORAGE or LOCAL-STORAGE" msgstr "Ítem RECORD DEPENDING «%s» debería estar definido dentro de sección WORKING-STORAGE, LOCAL-STORAGE O LINKAGE SECTION" #: cobc/typeck.c:4369 #, fuzzy, c-format -#| msgid "'%s' CRT STATUS must be 4 characters long" msgid "'%s' numeric CRT STATUS must have at least 4 digits" msgstr "«%s» CRT STATUS debe ser de 4 caracteres de longitud" #: cobc/typeck.c:4375 #, fuzzy, c-format -#| msgid "'%s' CRT STATUS must be 4 characters long" msgid "'%s' CRT STATUS must be 3 or 4 characters long" msgstr "«%s» CRT STATUS debe ser de 4 caracteres de longitud" #: cobc/typeck.c:4397 #, fuzzy, c-format -#| msgid "'%s' is not a field" msgid "FILE STATUS '%s' is not a field" msgstr "%s no es un campo" @@ -5564,37 +5264,31 @@ msgstr "" #: cobc/typeck.c:4418 #, fuzzy, c-format -#| msgid "'%s' is not a numeric or numeric-edited name" msgid "FILE STATUS '%s' must be an alphanumeric or numeric field" msgstr "«%s» no es nombre numérico o editado-numérico" #: cobc/typeck.c:4425 #, fuzzy, c-format -#| msgid "'%s' is not USAGE DISPLAY" msgid "FILE STATUS '%s' must be USAGE DISPLAY" msgstr "«%s» no es USAGE DISPLAY" #: cobc/typeck.c:4432 #, fuzzy, c-format -#| msgid "'%s' CRT STATUS must be 4 characters long" msgid "FILE STATUS '%s' must be 2 characters long" msgstr "«%s» CRT STATUS debe ser de 4 caracteres de longitud" #: cobc/typeck.c:4440 #, fuzzy, c-format -#| msgid "RECORD DEPENDING item '%s' should be defined in WORKING-STORAGE, LOCAL-STORAGE or LINKAGE SECTION" msgid "FILE STATUS '%s' must be in WORKING-STORAGE, LOCAL-STORAGE or LINKAGE" msgstr "Ítem RECORD DEPENDING «%s» debería estar definido dentro de sección WORKING-STORAGE, LOCAL-STORAGE O LINKAGE SECTION" #: cobc/typeck.c:4446 #, fuzzy, c-format -#| msgid "RENAMES may not contain '%s' as it is an OCCURS DEPENDING table" msgid "FILE STATUS '%s' may not be located after an OCCURS DEPENDING field" msgstr "RENAMES quizá no contienen «%s» como sea una distribución OCCURS DEPENDING" #: cobc/typeck.c:4460 #, fuzzy, c-format -#| msgid "'%s' will be implicitly defined" msgid "variable '%s' will be implicitly defined" msgstr "«%s» será definido de forma implícita" @@ -5604,7 +5298,6 @@ msgstr "" #: cobc/typeck.c:4555 #, fuzzy, c-format -#| msgid "ASSIGN data item '%s' invalid" msgid "ASSIGN data item '%s' is invalid" msgstr "ASSIGN elementos de datos «%s» no válido" @@ -5615,25 +5308,21 @@ msgstr "«%s» CURSOR no es de 4 o 6 caracteres de longitud" #: cobc/typeck.c:4680 #, fuzzy, c-format -#| msgid "'%s' cannot have OCCURS DEPENDING" msgid "'%s' cannot have nested OCCURS DEPENDING" msgstr "«%s» no puede tener OCURRS DEPENDING" #: cobc/typeck.c:4694 #, fuzzy, c-format -#| msgid "'%s' ODO field item invalid here" msgid "'%s' OCCURS DEPENDING ON field item invalid here" msgstr "«%s» ítem de campo ODO no válido aquí" #: cobc/typeck.c:4704 #, fuzzy, c-format -#| msgid "'%s' cannot have OCCURS DEPENDING" msgid "'%s' cannot have OCCURS DEPENDING because of '%s'" msgstr "«%s» no puede tener OCURRS DEPENDING" #: cobc/typeck.c:4716 #, fuzzy, c-format -#| msgid "'%s' ODO item must have GLOBAL attribute" msgid "'%s' OCCURS DEPENDING ON item must have GLOBAL attribute" msgstr "«%s» ítem ODO debe tener atributo GLOBAL" @@ -5644,43 +5333,36 @@ msgstr "" #: cobc/typeck.c:4768 #, fuzzy, c-format -#| msgid "duplicate REPOSITORY entry for '%s'" msgid "duplicate APPLY COMMIT target: '%s'" msgstr "duplica asiento REPOSITORIO para «%s»" #: cobc/typeck.c:4782 #, fuzzy -#| msgid "USE statement invalid for SORT file" msgid "APPLY COMMIT statement invalid for SORT file" msgstr "Declaracion USE no válida con fichero SORT" #: cobc/typeck.c:4785 #, fuzzy -#| msgid "USE statement invalid for SORT file" msgid "APPLY COMMIT statement invalid for REPORT file" msgstr "Declaracion USE no válida con fichero SORT" #: cobc/typeck.c:4792 #, fuzzy, c-format -#| msgid "RECORD DEPENDING item '%s' should be defined in WORKING-STORAGE, LOCAL-STORAGE or LINKAGE SECTION" msgid "APPLY COMMIT item '%s' should be defined in WORKING-STORAGE or LOCAL-STORAGE" msgstr "Ítem RECORD DEPENDING «%s» debería estar definido dentro de sección WORKING-STORAGE, LOCAL-STORAGE O LINKAGE SECTION" #: cobc/typeck.c:4806 #, fuzzy, c-format -#| msgid "%s not allowed here" msgid "item not allowed here: '%s'" msgstr "%s no se permite aquí" #: cobc/typeck.c:4819 #, fuzzy, c-format -#| msgid "'%s' cannot be subscripted" msgid "%s may not be subscripted" msgstr "«%s» no puede ser subíndice" #: cobc/typeck.c:4823 #, fuzzy, c-format -#| msgid "'%s' cannot be reference modified" msgid "%s may not be reference modified" msgstr "«%s» no puede ser modificado por referencia" @@ -5691,13 +5373,11 @@ msgstr "DEBUGGING de objetivo inválido: «%s»" #: cobc/typeck.c:4889 #, fuzzy, c-format -#| msgid "DEBUGGING target invalid with ALL PROCEDURES: '%s'" msgid "DEBUGGING target already specified with ALL PROCEDURES: '%s'" msgstr "DEBUGGING objetivo inválido con ALL PROCEDURES: «%s»" #: cobc/typeck.c:4909 #, fuzzy -#| msgid "DEBUGGING target invalid: '%s'" msgid "DEBUGGING target" msgstr "DEBUGGING de objetivo inválido: «%s»" @@ -5728,19 +5408,16 @@ msgstr "«%s» no es el nombre de un procedimiento" #: cobc/typeck.c:5041 #, fuzzy, c-format -#| msgid "'%s' and '%s' must be in the same record" msgid "%s and %s are not in the same SECTION" msgstr "«%s» y «%s» deben estar dentro del mismo registro" #: cobc/typeck.c:5046 #, fuzzy, c-format -#| msgid "'%s' defined here" msgid "%s is defined before %s" msgstr "«%s» definido aquí" #: cobc/typeck.c:5088 #, fuzzy, c-format -#| msgid "ANY LENGTH items may only be BY REFERENCE formal parameters" msgid "'%s' ANY LENGTH item must be a formal parameter" msgstr "Elementos ANY LENGTH quizá solo está por parámetros formales referenciado por BY REFERENCE" @@ -5761,7 +5438,6 @@ msgstr "sugiere paréntesis alrededor de %s dentro de %s" #: cobc/typeck.c:5815 #, fuzzy -#| msgid "invalid expression" msgid "invalid conditional expression" msgstr "expresión no válida" @@ -5776,7 +5452,6 @@ msgstr "Intenta minimizar el número de paréntess o divide en múltiples cálcu #: cobc/typeck.c:5959 #, fuzzy, c-format -#| msgid "more than %d nested conditions" msgid "more than %d nested expressions" msgstr "más que %d condiciones anidadas" @@ -5821,7 +5496,6 @@ msgstr "" #: cobc/typeck.c:7493 #, fuzzy -#| msgid "invalid type for DISPLAY operand" msgid "no items to DISPLAY found" msgstr "tipo no válido para operando DISPLAY" @@ -5877,13 +5551,11 @@ msgstr "objetivo de DEVOLVIENDO no es un puntero de datos" #: cobc/typeck.c:8115 cobc/typeck.c:12634 cobc/typeck.c:12700 #: cobc/typeck.c:12768 #, fuzzy, c-format -#| msgid "cannot change address of '%s', which is not BASED or a linkage item" msgid "cannot change address of '%s', which is not BASED or a LINKAGE item" msgstr "no puede cambiar dirección de «%s», la cual no está BASADA o un ítem enlazado" #: cobc/typeck.c:8121 #, fuzzy -#| msgid "target of ALLOCATE is not a BASED item" msgid "target of ALLOCATE must have BASED clause" msgstr "objetivo de ALLOCATE no es un ítem BASED" @@ -5930,7 +5602,6 @@ msgstr "literal numérico excede límites del tamaño" #: cobc/typeck.c:8385 #, fuzzy, c-format -#| msgid "figurative constant invalid here" msgid "figurative constant %s invalid here" msgstr "constante figurativa inválido aquí" @@ -5963,7 +5634,6 @@ msgstr "posiciones no pueden ser especificadas para ventanas principales" #: cobc/typeck.c:8714 cobc/typeck.c:8718 cobc/typeck.c:8740 #, fuzzy -#| msgid "HANDLE must be either a generic or a WINDOW HANDLE" msgid "HANDLE must be either a generic or a WINDOW HANDLE or X(10)" msgstr "HANDLE debe ser o un genérico o un WINDOW HANDLE" @@ -6009,7 +5679,6 @@ msgstr "GO TO con multiples nombres-procedimiento" #: cobc/typeck.c:9582 #, fuzzy -#| msgid "GO TO with multiple procedure-names" msgid "GO TO ENTRY with multiple entry-names" msgstr "GO TO con multiples nombres-procedimiento" @@ -6053,7 +5722,6 @@ msgstr "«%s» definido aquí como un grupo de longitud %d" #: cobc/typeck.c:10017 #, fuzzy, c-format -#| msgid "internal register '%s' defined as BINARY-LONG" msgid "internal register '%s' defined as USAGE %s" msgstr "registro internos «%s» definido como BINARY-LONG" @@ -6064,7 +5732,6 @@ msgstr "«%s» definido aquí como USAGE %s" #: cobc/typeck.c:10045 cobc/typeck.c:10063 #, fuzzy, c-format -#| msgid "value size exceeds data size" msgid "value size is %d" msgstr "tamaño de valor excede tamaño de datos" @@ -6079,7 +5746,6 @@ msgstr "invalida destino para MOVE" #: cobc/typeck.c:10380 #, fuzzy -#| msgid "MOVE of figurative constant to numeric item" msgid "MOVE of figurative constant SPACE to numeric item" msgstr "MOVE de constante figurativa a ítem numérico" @@ -6179,7 +5845,6 @@ msgstr "KEY ignorado con READ secuencial" #: cobc/typeck.c:12209 #, fuzzy -#| msgid "figurative constant invalid here" msgid "figurative constants not allowed in FROM clause" msgstr "constante figurativa inválido aquí" @@ -6211,7 +5876,6 @@ msgstr "SET objetivo debe ser PROGRAM-POINTER" #: cobc/typeck.c:12610 #, fuzzy, c-format -#| msgid "SET target '%s' is not numeric, an index or a pointer" msgid "SET target '%s' is not numeric, an INDEX or a POINTER" msgstr "ESTABLECER objetivo «%s» no es numérico, un índice o un puntero" @@ -6222,7 +5886,6 @@ msgstr "no puede modificar dirección de «%s», la cual no es nivel 1 o 77" #: cobc/typeck.c:12721 #, fuzzy, c-format -#| msgid "SET target '%s' is not numeric, an index or a pointer" msgid "SET target '%s' is not a POINTER for FCD" msgstr "ESTABLECER objetivo «%s» no es numérico, un índice o un puntero" @@ -6273,13 +5936,11 @@ msgstr "INICIO no es permitido con MODO DE ACCESO ALEATORIO" #: cobc/typeck.c:13305 #, fuzzy, c-format -#| msgid "SET target '%s' is not numeric, an index or a pointer" msgid "%s item '%s' must be numeric and an integer" msgstr "ESTABLECER objetivo «%s» no es numérico, un índice o un puntero" #: cobc/typeck.c:13311 #, fuzzy, c-format -#| msgid "'%s' is not an integer" msgid "%s item '%s' must be an integer" msgstr "«%s» no es un entero" @@ -6290,13 +5951,11 @@ msgstr "" #: cobc/typeck.c:13331 #, fuzzy, c-format -#| msgid "'%s' is not a statement" msgid "'%s' is not an elementary item" msgstr "«%s» no es una sentencia" #: cobc/typeck.c:13407 #, fuzzy -#| msgid "RETURNING item must have level 01 or 77" msgid "STRING items must be all NATIONAL or none" msgstr "DEVOLVIENDO ítem debe tener un nivel 01 o 77" @@ -6314,7 +5973,6 @@ msgstr "" #: cobc/typeck.c:13835 #, fuzzy, c-format -#| msgid "%s is not an alphanumeric literal" msgid "%s must be alphanumeric or national" msgstr "%s no es un literal alfanumérico" @@ -6325,7 +5983,6 @@ msgstr "" #: cobc/typeck.c:13885 #, fuzzy, c-format -#| msgid "'%s' and '%s' must be in the same record" msgid "%s must be a child of the input record" msgstr "«%s» y «%s» deben estar dentro del mismo registro" @@ -6336,25 +5993,21 @@ msgstr "" #: cobc/typeck.c:13922 #, fuzzy, c-format -#| msgid "must be numeric" msgid "%s must be elementary" msgstr "debe ser numérico" #: cobc/typeck.c:13935 #, fuzzy, c-format -#| msgid "elementary items with SIGN clause must be USAGE DISPLAY or NATIONAL" msgid "STRING item '%s' must be USAGE DISPLAY or NATIONAL" msgstr "ítemes elementarios con cláusula SIGN debe ser USAGE DISPLAY o NATIONAL" #: cobc/typeck.c:13947 #, fuzzy, c-format -#| msgid "elementary items with SIGN clause must be USAGE DISPLAY or NATIONAL" msgid "%s must be USAGE DISPLAY or NATIONAL" msgstr "ítemes elementarios con cláusula SIGN debe ser USAGE DISPLAY o NATIONAL" #: cobc/typeck.c:13961 #, fuzzy, c-format -#| msgid "'%s' is not an integer" msgid "%s must be an integer" msgstr "«%s» no es un entero" @@ -6368,7 +6021,6 @@ msgstr "" #: cobc/typeck.c:14068 #, fuzzy -#| msgid "'%s' cannot be reference modified" msgid "JSON/XML GENERATE input record may not be reference modified" msgstr "«%s» no puede ser modificado por referencia" @@ -6449,19 +6101,16 @@ msgstr "" #: cobc/warning.def:31 #, fuzzy -#| msgid " -Wno- disable warning enabled by -W or -Wall" msgid " -Wadditional additional warnings only raised with -Wall" msgstr " -Wno- desactiva advertencias activadas por -W o -Wall" #: cobc/warning.def:34 #, fuzzy -#| msgid "do not warn if unfinished features are used" msgid " -Wno-unfinished do not warn if unfinished features are used" msgstr "no advierte si no finalizó características son utilizadas" #: cobc/warning.def:37 #, fuzzy -#| msgid "do not warn if pending features are mentioned" msgid " -Wno-pending do not warn if pending features are used" msgstr "no advierte si características pendientes son mencionadas" @@ -6475,13 +6124,11 @@ msgstr "" #: cobc/warning.def:46 #, fuzzy -#| msgid "warn if obsolete features are used" msgid " -Wobsolete warn if obsolete features are used" msgstr "advierte si se usan características obsoletas" #: cobc/warning.def:49 #, fuzzy -#| msgid "warn if archaic features are used" msgid " -Warchaic warn if archaic features are used" msgstr "advierte si características arcaicas son utilizadas" @@ -6491,31 +6138,26 @@ msgstr "" #: cobc/warning.def:55 #, fuzzy -#| msgid "warn field truncation from constant assignments" msgid " -Wtruncate warn about field truncation from constant assignments" msgstr "advierte truncación de campo desde asignaciones constantes" #: cobc/warning.def:58 #, fuzzy -#| msgid "warn possible field truncation" msgid " -Wpossible-truncate warn about possible field truncation" msgstr "advierte posible truncado de campo" #: cobc/warning.def:61 #, fuzzy -#| msgid "warn overlapping MOVE items" msgid " -Woverlap warn about overlapping MOVE of items" msgstr "advierte ítemes MOVE sobrepuestos" #: cobc/warning.def:64 #, fuzzy -#| msgid "warn MOVE items that may overlap depending on variables" msgid " -Wpossible-overlap warn about MOVE of items that may overlap depending on variables" msgstr "adverte ítem MOVE que quizá cubre dependiendo de variables" #: cobc/warning.def:67 #, fuzzy -#| msgid "warn lack of parentheses around AND within OR" msgid " -Wparentheses warn if parentheses are omitted around AND within OR" msgstr "aviso faltante de paréntesis alrededor de Y dentro de O" @@ -6529,43 +6171,36 @@ msgstr "" #: cobc/warning.def:76 #, fuzzy -#| msgid "warn CORRESPONDING with no matching items" msgid " -Wno-corresponding do not warn about CORRESPONDING with no matching items" msgstr "advierte CORRESPONDIENDO con ítemes no coincidentes" #: cobc/warning.def:79 #, fuzzy -#| msgid "warn Initial VALUE clause ignored" msgid " -Winitial-value warn if initial VALUE clause is ignored" msgstr "advierte cláusula de VALOR inicial ignorada" #: cobc/warning.def:82 #, fuzzy -#| msgid "warn missing FUNCTION prototypes/definitions" msgid " -Wprototypes warn about missing FUNCTION prototypes/definitions" msgstr "advierte prototipos/definiciones de FUNCIÓN" #: cobc/warning.def:85 #, fuzzy -#| msgid "warn if arithmetic expression precision has changed" msgid " -Warithmetic-osvs warn if arithmetic expression precision has changed" msgstr "advierte si preción de expresión aritmética ha modificado" #: cobc/warning.def:88 #, fuzzy -#| msgid "warn non 01/77 items for CALL params" msgid " -Wcall-params warn about non 01/77 items for CALL parameters" msgstr "advierte elementos no 01/77 para CALL parametrizados" #: cobc/warning.def:91 #, fuzzy -#| msgid "warn expressions that always resolve to true/false" msgid " -Wconstant-expression warn about expressions that always resolve to true/false" msgstr "advierte expresiones que siempre resuelven a verdad/falsa" #: cobc/warning.def:94 #, fuzzy -#| msgid "warn expressions that always resolve to true/false" msgid " -Wconstant-numlit-expression\twarn about numeric expressions that always resolve to true/false" msgstr "advierte expresiones que siempre resuelven a verdad/falsa" @@ -6575,19 +6210,16 @@ msgstr "" #: cobc/warning.def:100 #, fuzzy -#| msgid "warn text after program-text area, FIXED format" msgid " -Wcolumn-overflow warn about text after program-text area, FIXED format" msgstr "advierte texto tras área de texto programado, formato FIJADO" #: cobc/warning.def:103 #, fuzzy -#| msgid "warn lack of scope terminator END-XXX" msgid " -Wterminator warn about lack of scope terminator END-XXX" msgstr "advierte falta de alcance de terminador END-XXX" #: cobc/warning.def:106 #, fuzzy -#| msgid "warn dangling LINKAGE items" msgid " -Wlinkage warn about dangling LINKAGE items" msgstr "advierte elementos LINKAGE colgados" @@ -6634,13 +6266,11 @@ msgstr "LoadLibrary/GetProcAddress error %d" #: libcob/call.c:841 #, fuzzy, c-format -#| msgid "PROGRAM name exceeds 31 characters" msgid "%s: PROGRAM name exceeds %d characters" msgstr "Nombre de PROGRAM excede 31 caracteres" #: libcob/call.c:842 #, fuzzy, c-format -#| msgid "PROGRAM name exceeds 31 characters" msgid "%s: FUNCTION name exceeds %d characters" msgstr "Nombre de PROGRAM excede 31 caracteres" @@ -6677,13 +6307,11 @@ msgstr "cob_init() no ha sido llamado" #: libcob/call.c:1709 #, fuzzy, c-format -#| msgid "%s: param %d is not within range of %d" msgid "parameter %d is not within range of %d" msgstr "%s: parámetro %d no está dentro del rango de %d" #: libcob/call.c:1715 #, fuzzy, c-format -#| msgid "%s: param %d is NULL" msgid "parameter %d is NULL" msgstr "%s: parámetro %d es NULL" @@ -6693,67 +6321,56 @@ msgstr "" #: libcob/call.c:2050 #, fuzzy -#| msgid "file not open" msgid "field not allocated" msgstr "fichero no abierto" #: libcob/call.c:2116 #, fuzzy, c-format -#| msgid "%s: attempt to over-write constant param %d with '%s'" msgid "attempt to over-write constant field with '%s'" msgstr "%s: intente sobrescribir parámetro contante %d con «%s»" #: libcob/call.c:2156 libcob/call.c:2212 #, fuzzy, c-format -#| msgid "%s: attempt to over-write constant param %d with " msgid "attempt to over-write constant parameter %d with " msgstr "%s: intente sobrescribir parámetro contante %d con " #: libcob/call.c:2263 #, fuzzy, c-format -#| msgid "%s: attempt to over-write constant param %d with '%s'" msgid "attempt to over-write constant parameter %d with '%s'" msgstr "%s: intente sobrescribir parámetro contante %d con «%s»" #: libcob/cobgetopt.c:330 #, fuzzy, c-format -#| msgid "%s: option '-W %s' is ambiguous" msgid "%s: option '%s%s' is ambiguous" msgstr "%s: opción '-W %s' es ambigua" #: libcob/cobgetopt.c:338 #, fuzzy, c-format -#| msgid "%s: option '%s' is ambiguous; possibilities:" msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: opción «%s» es ambigua; posibilidades:" #: libcob/cobgetopt.c:371 #, fuzzy, c-format -#| msgid "%s: unrecognized option '%c%s'" msgid "%s: unrecognized option '%s%s'" msgstr "%s: opción no reconocida '%c%s'" #: libcob/cobgetopt.c:400 #, fuzzy, c-format -#| msgid "%s: option '%c%s' doesn't allow an argument" msgid "%s: option '%s%s' doesn't allow an argument" msgstr "%s: opción '%c%s' no admite un argumento" #: libcob/cobgetopt.c:418 #, fuzzy, c-format -#| msgid "%s: option '%s' requires an argument" msgid "%s: option '%s%s' requires an argument" msgstr "%s: la opción «%s» requiere un argumento" #: libcob/cobgetopt.c:689 #, fuzzy, c-format -#| msgid "%s: invalid option -- %c" msgid "%s: invalid option -- '%c'" msgstr "%s: opción no válida -- %c" #: libcob/cobgetopt.c:707 libcob/cobgetopt.c:754 #, fuzzy, c-format -#| msgid "%s: option requires an argument -- %c" msgid "%s: option requires an argument -- '%c'" msgstr "%s: la opción requiere un argumento -- %c" @@ -6775,7 +6392,6 @@ msgstr "" #: libcob/common.c:1257 #, fuzzy -#| msgid "Definition" msgid "termination" msgstr "Definición" @@ -6789,13 +6405,11 @@ msgstr "" #: libcob/common.c:1269 #, fuzzy -#| msgid "signal %s" msgid "I/O signal" msgstr "señal %s" #: libcob/common.c:1273 #, fuzzy -#| msgid "attempt to reference unallocated memory" msgid "attempt to reference invalid memory address" msgstr "trata referenciar memoria no asignada" @@ -6809,7 +6423,6 @@ msgstr "" #: libcob/common.c:1285 #, fuzzy -#| msgid "aborting" msgid "abort" msgstr "abortando" @@ -6819,13 +6432,11 @@ msgstr "" #: libcob/common.c:1293 #, fuzzy -#| msgid "caught signal" msgid "alarm signal" msgstr "señal obtenida" #: libcob/common.c:1297 #, fuzzy -#| msgid "preprocessing:" msgid "stop process" msgstr "preprocesando:" @@ -6836,7 +6447,6 @@ msgstr "" #. TRANSLATORS: This msgid is used for an OS signal like SIGABRT. #: libcob/common.c:1312 #, fuzzy -#| msgid "signal %s" msgid "signal" msgstr "señal %s" @@ -6852,20 +6462,17 @@ msgstr "terminación anormal - contenidos de fichero quizá son incorrectos" #: libcob/common.c:3145 libcob/common.c:8581 libcob/common.c:8595 #, fuzzy -#| msgid "error: version mismatch" msgid "version mismatch" msgstr "error: versión no coincide" #: libcob/common.c:3146 libcob/common.c:3148 libcob/common.c:8582 #: libcob/common.c:8584 #, fuzzy, c-format -#| msgid "%s has version/patch level %s/%d" msgid "%s has version %s.%d" msgstr "%s tiene versión/nivel de parche %s/%d" #: libcob/common.c:3158 #, fuzzy, c-format -#| msgid "CALL to %s requires %d parameters" msgid "CALL to %s requires %d arguments" msgstr "CALL para %s requiere %d parámetros" @@ -6886,7 +6493,6 @@ msgstr "LINKAGE %s de ítem no pasado por llamador" #: libcob/common.c:3892 #, fuzzy, c-format -#| msgid "'%s' not numeric: '%s'" msgid "'%s' (Type: %s) not numeric: '%s'" msgstr "«%s» no es numerico: «%s»" @@ -6912,19 +6518,16 @@ msgstr "subcadena máxima actual para «%s»: %d" #: libcob/common.c:3979 #, fuzzy, c-format -#| msgid "offset of '%s' out of bounds: %d" msgid "offset of '%s' out of bounds: %d, maximum: %d" msgstr "desplazamiento de «%s» fuera de límite: %d" #: libcob/common.c:3994 #, fuzzy, c-format -#| msgid "length of '%s' out of bounds: %d" msgid "length of '%s' out of bounds: %d, maximum: %d" msgstr "longitud de «%s» fuera de límites: %d" #: libcob/common.c:4005 #, fuzzy, c-format -#| msgid "length of '%s' out of bounds: %d" msgid "length of '%s' out of bounds: %d, starting at: %d, maximum: %d" msgstr "longitud de «%s» fuera de límites: %d" @@ -6949,7 +6552,6 @@ msgstr "parámetro para llamada SYSTEM es mayor de %d caracteres" #: libcob/common.c:6202 #, fuzzy, c-format -#| msgid "Error '%s' during CBL_GC_FORK" msgid "error '%s' during CBL_GC_FORK" msgstr "Error «%s» durante CBL_GC_FORK" @@ -6974,7 +6576,6 @@ msgstr "Llama a CBL_GC_GETOPT con longind ausente." #: libcob/common.c:6856 libcob/common.c:6877 libcob/common.c:6890 #: libcob/common.c:9107 libcob/common.c:9111 #, fuzzy, c-format -#| msgid " (default)" msgid "(default)" msgstr " (predeterminado)" @@ -6984,7 +6585,6 @@ msgstr "" #: libcob/common.c:7151 libcob/common.c:7200 #, fuzzy -#| msgid "must be numeric" msgid "should be numeric" msgstr "debe ser numérico" @@ -7006,7 +6606,6 @@ msgstr "" #: libcob/common.c:7410 libcob/common.c:7413 libcob/common.c:7416 #, fuzzy, c-format -#| msgid " (set by %s)" msgid "set by %s" msgstr " (establecer para %s)" @@ -7027,7 +6626,6 @@ msgstr "CUIDADO - «%s %s» sin un valor - ¡ignorado!" #: libcob/common.c:8085 #, fuzzy -#| msgid "error: " msgid "error" msgstr "error: " @@ -7091,7 +6689,6 @@ msgstr "error permanente de fichero" #: libcob/common.c:8217 #, fuzzy -#| msgid "invalid configuration file name" msgid "inconsistent file name" msgstr "configuración del nombre de fichero inválido" @@ -7125,7 +6722,6 @@ msgstr "desbordamiento de registro" #: libcob/common.c:8241 #, fuzzy -#| msgid "READ after uncessful READ/START" msgid "READ after unsuccessful READ/START" msgstr "READ tras READ/START no obtenido" @@ -7167,13 +6763,11 @@ msgstr "error de fichero desconocido" #: libcob/common.c:8278 #, fuzzy, c-format -#| msgid "%s (status = %02d) file: '%s'" msgid "%s (status = %02d) for file %s" msgstr "%s (estado = %02d) fichero: «%s»" #: libcob/common.c:8281 #, fuzzy, c-format -#| msgid "%s (status = %02d) file: '%s'" msgid "%s (status = %02d) for file %s on %s" msgstr "%s (estado = %02d) fichero: «%s»" @@ -7183,13 +6777,11 @@ msgstr "intento de usar función no implementada" #: libcob/common.c:8291 #, fuzzy -#| msgid "attempt to use non-implemented function" msgid "attempt to use non-implemented XML I/O" msgstr "intento de usar función no implementada" #: libcob/common.c:8294 #, fuzzy -#| msgid "attempt to use non-implemented function" msgid "attempt to use non-implemented JSON I/O" msgstr "intento de usar función no implementada" @@ -7201,7 +6793,6 @@ msgstr "variables de entorno" #: libcob/common.c:8859 libcob/common.c:8893 libcob/common.c:8910 #: libcob/common.c:8925 #, fuzzy, c-format -#| msgid "C version %s%s" msgid "%s, version %d.%d.%d" msgstr "Versión C %s%s" @@ -7213,13 +6804,11 @@ msgstr "" #: libcob/common.c:8471 #, fuzzy, c-format -#| msgid "C version %s%s" msgid "%s, version %s" msgstr "Versión C %s%s" #: libcob/common.c:8739 #, fuzzy, c-format -#| msgid "License LGPLv3+: GNU LGPL version 3 or later " msgid "License LGPLv3+: GNU LGPL version 3 or later <%s>" msgstr "Licencia LGPLv3+: GNU LGPL versión 3 o posterior " @@ -7229,7 +6818,6 @@ msgstr "carga dinámica" #: libcob/common.c:8938 #, fuzzy -#| msgid "" msgid "mouse support" msgstr "" @@ -7267,13 +6855,11 @@ msgstr "… quitado desde entorno" #: libcob/common.c:9094 libcob/common.c:9096 #, fuzzy, c-format -#| msgid " (set by %s)" msgid "(set by %s)" msgstr " (establecer para %s)" #: libcob/common.c:9104 #, fuzzy, c-format -#| msgid " (reset)" msgid "(reset)" msgstr " (restablecer)" @@ -7289,7 +6875,6 @@ msgstr "" #. TRANSLATORS: This msgid is shown for a requested but empty stack trace. #: libcob/common.c:9597 #, fuzzy -#| msgid "%s COBOL runtime is not initialized" msgid "No COBOL runtime elements on stack." msgstr "%s tiempo de ejecución COBOL no está inicializado" @@ -7305,7 +6890,6 @@ msgstr "" #: libcob/common.c:9969 #, fuzzy, c-format -#| msgid "Written by %s\n" msgid "dump written to %s" msgstr "Escrito por %s\n" @@ -7313,7 +6897,6 @@ msgstr "Escrito por %s\n" #: libcob/fileio.c:3812 libcob/fileio.c:4396 libcob/fileio.c:9658 #: libcob/fileio.c:9686 libcob/numeric.c:1583 #, fuzzy, c-format -#| msgid "invalid internal case: %u" msgid "invalid internal call of %s" msgstr "caso interno invalido: %u" @@ -7335,7 +6918,6 @@ msgstr "no puede unir a entorno BDB (%s), error: %d %s" #: libcob/fileio.c:3458 libcob/fileio.c:3483 libcob/fileio.c:3509 #: libcob/fileio.c:3528 #, fuzzy, c-format -#| msgid "BDB error: %s %s" msgid "BDB (%s), error: %d %s" msgstr "Error BDB: %s %s" @@ -7372,7 +6954,6 @@ msgstr "SORT es incapaz para obtener fichero temporalmente" #. setup translation to allow this to be followed on the right side. #: libcob/fileio.c:8432 #, fuzzy -#| msgid "implicit CLOSE of %s ('%s')" msgid "implicit CLOSE of " msgstr "implicita cierre CLOSE de %s ('%s')" @@ -7383,7 +6964,6 @@ msgstr "" #: libcob/fileio.c:9886 #, fuzzy, c-format -#| msgid "REPORT clause with wrong file type" msgid "ERROR: EXTFH called with wrong file organization %d" msgstr "REPORT clausura con el tipo de fichero equivocado" @@ -7456,7 +7036,6 @@ msgstr "(No representable)" #: libcob/termio.c:354 #, fuzzy, c-format -#| msgid "cannot specify both %s and %s" msgid "cannot open %s (=%s)" msgstr "no puede especificar ambos %s y %s" @@ -7480,51 +7059,41 @@ msgstr " o: %s opciones" #: bin/cobcrun.c:126 #, fuzzy -#| msgid " -h, -help display this help and exit" msgid " -h, --help display this help and exit" msgstr " -h, -help enseña esta ayuda y termina" #: bin/cobcrun.c:127 #, fuzzy -#| msgid " -V, -version display cobcrun and runtime version and exit" msgid " -V, --version display version information for cobcrun + runtime and exit" msgstr " -V, -version enseña versión del ejecutor cobcrun y tiempo de ejecución y termina" #: bin/cobcrun.c:128 #, fuzzy -#| msgid " -V, -version display cobcrun and runtime version and exit" msgid " -dumpversion display runtime version and exit" msgstr " -V, -version enseña versión del ejecutor cobcrun y tiempo de ejecución y termina" #: bin/cobcrun.c:129 #, fuzzy -#| msgid " -i, -info display runtime information (build/environment)" msgid " -i, --info display runtime information (build/environment)" msgstr " -i, -info enseña la información de tiempo de ejecución (compilador/entorno)" #: bin/cobcrun.c:130 #, fuzzy -#| msgid " -h, -help display this help and exit" msgid " -v, --verbose display extended output with --info" msgstr " -h, -help enseña esta ayuda y termina" #: bin/cobcrun.c:132 #, fuzzy -#| msgid " -q, -brief reduced displays" msgid " -q, --brief reduced displays" msgstr " -q, -brief pantallas reducidas" #: bin/cobcrun.c:134 #, fuzzy -#| msgid " -c , -config= set runtime configuration from " msgid " -c , --config= set runtime configuration from " msgstr " -c , config= establece configuración de tiempo de ejecución desde " #: bin/cobcrun.c:135 #, fuzzy -#| msgid "" -#| " -r, -runtime-conf display current runtime configuration\n" -#| " (value and origin for all settings)" msgid "" " -r, --runtime-config display current runtime configuration\n" " (value and origin for all settings)" @@ -7534,12 +7103,6 @@ msgstr "" #: bin/cobcrun.c:137 #, fuzzy -#| msgid "" -#| " -M , -module= set entry point module name and/or load path\n" -#| " where -M module prepends any directory to the\n" -#| " dynamic link loader library search path\n" -#| " and any basename to the module preload list\n" -#| " (COB_LIBRARY_PATH and/or COB_PRELOAD)" msgid "" " -M , --module= set entry point module name and/or load path\n" " where -M module prepends any directory to the\n" @@ -7560,7 +7123,6 @@ msgstr "" #: bin/cobcrun.c:148 #, fuzzy, c-format -#| msgid "General help using GNU software: " msgid "General help using GNU software: <%s>" msgstr "Ayuda general utilizando software GNU: " @@ -7570,7 +7132,6 @@ msgstr "configuración del nombre de fichero inválido" #: bin/cobcrun.c:355 #, fuzzy, c-format -#| msgid "invalid module argument" msgid "invalid module argument '%s'" msgstr "argumento modular no válido" diff --git a/po/insert-header.sin b/po/insert-header.sin index ceeebb937..b26de01f6 100644 --- a/po/insert-header.sin +++ b/po/insert-header.sin @@ -1,10 +1,5 @@ # Sed script that inserts the file called HEADER before the header entry. # -# Copyright (C) 2001 Free Software Foundation, Inc. -# Written by Bruno Haible , 2001. -# This file is free software; the Free Software Foundation gives -# unlimited permission to use, copy, distribute, and modify it. -# # At each occurrence of a line starting with "msgid ", we execute the following # commands. At the first occurrence, insert the file. At the following # occurrences, do nothing. The distinction between the first and the following diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin index 8c70dfbf1..2436c49e7 100644 --- a/po/remove-potcdate.sin +++ b/po/remove-potcdate.sin @@ -1,12 +1,6 @@ -# Sed script that removes the POT-Creation-Date line in the header entry +# Sed script that remove the POT-Creation-Date line in the header entry # from a POT file. # -# Copyright (C) 2002 Free Software Foundation, Inc. -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without any warranty. -# # The distinction between the first and the following occurrences of the # pattern is achieved by looking at the hold space. /^"POT-Creation-Date: .*"$/{