diff -Nru grep-2.24/aclocal.m4 grep-2.25/aclocal.m4 --- grep-2.24/aclocal.m4 2016-03-07 17:49:04.000000000 +0000 +++ grep-2.25/aclocal.m4 2016-04-22 04:03:03.000000000 +0000 @@ -1221,6 +1221,7 @@ m4_include([m4/glibc21.m4]) m4_include([m4/gnulib-common.m4]) m4_include([m4/gnulib-comp.m4]) +m4_include([m4/hard-locale.m4]) m4_include([m4/i-ring.m4]) m4_include([m4/iconv.m4]) m4_include([m4/iconv_h.m4]) diff -Nru grep-2.24/build-aux/config.guess grep-2.25/build-aux/config.guess --- grep-2.24/build-aux/config.guess 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/build-aux/config.guess 2016-04-10 16:49:32.000000000 +0000 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-01-01' +timestamp='2016-04-02' # 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 @@ -237,6 +237,10 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -268,42 +272,42 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -376,16 +380,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -410,7 +414,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -635,13 +639,13 @@ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -680,11 +684,11 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -697,12 +701,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -807,14 +811,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -896,7 +900,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -919,7 +923,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -1272,6 +1276,9 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1285,9 +1292,9 @@ UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in @@ -1309,7 +1316,7 @@ exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1340,7 +1347,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1382,7 +1389,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos diff -Nru grep-2.24/build-aux/config.sub grep-2.25/build-aux/config.sub --- grep-2.24/build-aux/config.sub 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/build-aux/config.sub 2016-04-10 16:49:32.000000000 +0000 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-01-01' +timestamp='2016-03-30' # 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 @@ -1382,7 +1382,7 @@ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ @@ -1531,6 +1531,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) diff -Nru grep-2.24/build-aux/gitlog-to-changelog grep-2.25/build-aux/gitlog-to-changelog --- grep-2.24/build-aux/gitlog-to-changelog 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/build-aux/gitlog-to-changelog 2016-04-10 16:49:32.000000000 +0000 @@ -3,7 +3,7 @@ if 0; # Convert git log output to ChangeLog format. -my $VERSION = '2016-01-12 23:09'; # UTC +my $VERSION = '2016-03-22 21:49'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -298,9 +298,7 @@ { if ($sha =~ /^$_/) { - $skipflag = 1; - ## Perhaps only warn if a pattern matches more than once? - warn "$ME: warning: skipping $sha due to $_\n"; + $skipflag = $_; last; } } @@ -386,8 +384,17 @@ } # Ignore commits that match the --ignore-matching pattern, if specified. - if (! ($skipflag || (defined $ignore_matching - && @line && $line[0] =~ /$ignore_matching/))) + if (defined $ignore_matching && @line && $line[0] =~ /$ignore_matching/) + { + $skipflag = 1; + } + elsif ($skipflag) + { + ## Perhaps only warn if a pattern matches more than once? + warn "$ME: warning: skipping $sha due to $skipflag\n"; + } + + if (! $skipflag) { if (defined $ignore_line && @line) { diff -Nru grep-2.24/build-aux/texinfo.tex grep-2.25/build-aux/texinfo.tex --- grep-2.24/build-aux/texinfo.tex 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/build-aux/texinfo.tex 2016-04-10 16:49:32.000000000 +0000 @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2016-02-02.07} +\def\texinfoversion{2016-03-29.15} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -310,7 +310,7 @@ % Margin to add to right of even pages, to left of odd pages. \newdimen\bindingoffset \newdimen\normaloffset -\newdimen\pagewidth \newdimen\pageheight +\newdimen\txipagewidth \newdimen\txipageheight % Main output routine. % @@ -334,7 +334,7 @@ % Common context changes for both heading and footing. % Do this outside of the \shipout so @code etc. will be expanded in % the headline as they should be, not taken literally (outputting ''code). - \def\commmonheadfootline{\let\hsize=\pagewidth \texinfochars} + \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars} % % Retrieve the information for the headings from the marks in the page, % and call Plain TeX's \makeheadline and \makefootline, which use the @@ -433,7 +433,7 @@ \newinsert\margin \dimen\margin=\maxdimen % Main part of page, including any footnotes -\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}} +\def\pagebody#1{\vbox to\txipageheight{\boxmaxdepth=\maxdepth #1}} {\catcode`\@ =11 \gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi % marginal hacks, juha@viisa.uucp (Juha Takala) @@ -724,11 +724,11 @@ % \dimen0 is the vertical size of the group's box. \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox % \dimen2 is how much space is left on the page (more or less). - \dimen2 = \pageheight \advance\dimen2 by -\pagetotal + \dimen2 = \txipageheight \advance\dimen2 by -\pagetotal % if the group doesn't fit on the current page, and it's a big big % group, force a page break. \ifdim \dimen0 > \dimen2 - \ifdim \pagetotal < \vfilllimit\pageheight + \ifdim \pagetotal < \vfilllimit\txipageheight \page \fi \fi @@ -1100,6 +1100,64 @@ \newif\ifpdf \newif\ifpdfmakepagedest +% +% For LuaTeX +% + +\ifx\luatexversion\thisisundefined +\else + % Escape PDF strings UTF-8 to UTF-16 + \begingroup + \catcode`\%=12 + \directlua{ + function UTF16oct(str) + tex.sprint(string.char(0x5c) .. '376' .. string.char(0x5c) .. '377') + for c in string.utfvalues(str) do + if c < 0x10000 then + tex.sprint( + string.format(string.char(0x5c) .. string.char(0x25) .. '03o' .. + string.char(0x5c) .. string.char(0x25) .. '03o', + (c / 256), (c % 256))) + else + c = c - 0x10000 + local c_hi = c / 1024 + 0xd800 + local c_lo = c % 1024 + 0xdc00 + tex.sprint( + string.format(string.char(0x5c) .. string.char(0x25) .. '03o' .. + string.char(0x5c) .. string.char(0x25) .. '03o' .. + string.char(0x5c) .. string.char(0x25) .. '03o' .. + string.char(0x5c) .. string.char(0x25) .. '03o', + (c_hi / 256), (c_hi % 256), + (c_lo / 256), (c_lo % 256))) + end + end + end + } + \endgroup + \def\pdfescapestring#1{\directlua{UTF16oct('\luaescapestring{#1}')}} + \ifnum\luatexversion>84 + % For LuaTeX >= 0.85 + \def\pdfdest{\pdfextension dest} + \let\pdfoutput\outputmode + \def\pdfliteral{\pdfextension literal} + \def\pdfcatalog{\pdfextension catalog} + \def\pdftexversion{\numexpr\pdffeedback version\relax} + \let\pdfximage\saveimageresource + \let\pdfrefximage\useimageresource + \let\pdflastximage\lastsavedimageresourceindex + \def\pdfendlink{\pdfextension endlink\relax} + \def\pdfoutline{\pdfextension outline} + \def\pdfstartlink{\pdfextension startlink} + \def\pdffontattr{\pdfextension fontattr} + \def\pdfobj{\pdfextension obj} + \def\pdflastobj{\numexpr\pdffeedback lastobj\relax} + \let\pdfpagewidth\pagewidth + \let\pdfpageheight\pageheight + \edef\pdfhorigin{\pdfvariable horigin} + \edef\pdfvorigin{\pdfvariable vorigin} + \fi +\fi + % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 % can be set). So we test for \relax and 0 as well as being undefined. \ifx\pdfoutput\thisisundefined @@ -1283,18 +1341,23 @@ % page number. We could generate a destination for the section % text in the case where a section has no node, but it doesn't % seem worth the trouble, since most documents are normally structured. - \edef\pdfoutlinedest{#3}% - \ifx\pdfoutlinedest\empty - \def\pdfoutlinedest{#4}% - \else - \txiescapepdf\pdfoutlinedest - \fi - % - % Also escape PDF chars in the display string. - \edef\pdfoutlinetext{#1}% - \txiescapepdf\pdfoutlinetext - % - \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}% + { + \ifx\luatexversion\thisisundefined \else + \turnoffactive % LuaTeX can use Unicode strings for PDF + \fi + \edef\pdfoutlinedest{#3}% + \ifx\pdfoutlinedest\empty + \def\pdfoutlinedest{#4}% + \else + \txiescapepdf\pdfoutlinedest + \fi + % + % Also escape PDF chars in the display string. + \edef\pdfoutlinetext{#1}% + \txiescapepdf\pdfoutlinetext + % + \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}% + } } % \def\pdfmakeoutlines{% @@ -1449,6 +1512,233 @@ \let\pdfmakeoutlines = \relax \fi % \ifx\pdfoutput +% +% For XeTeX +% +\newif\iftxiuseunicodedestname +\ifx\XeTeXrevision\thisisundefined +\else + % + % XeTeX version check + % + \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99995}>-1 + % XeTeX 0.99995+ contains xdvipdfmx 20160307+. + % It can handle Unicode destination name for PDF. + \txiuseunicodedestnametrue + \else + % XeTeX < 0.99995 can not handle Unicode destination name for PDF + % because xdvipdfmx 20150315 has UTF-16 convert issue. + % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753). + \txiuseunicodedestnamefalse + \fi + % + % PDF outline support + % + \pdfmakepagedesttrue \relax + % Emulate the primitive of pdfTeX + \def\pdfdest name#1 xyz{% + \special{pdf:dest (name#1) [@thispage /XYZ @xpos @ypos]}% + } + \def\pdfmkdest#1{{% + % We have to set dummies so commands such as @code, and characters + % such as \, aren't expanded when present in a section title. + \indexnofonts + \iftxiuseunicodedestname + \def\pdfdestname{#1}% Pass through Unicode characters. + \else + \edef\pdfdestname{#1}% Replace Unicode characters to ASCII. + \fi + \turnoffactive + \makevalueexpandable + \txiescapepdf\pdfdestname + \safewhatsit{\pdfdest name{\pdfdestname} xyz}% + }} + % + \def\dopdfoutline#1#2#3#4{% + \iftxiuseunicodedestname + \def\pdfoutlinedest{#3}% Pass through Unicode characters. + \else + \edef\pdfoutlinedest{#3}% Replace Unicode characters to ASCII. + \fi + \ifx\pdfoutlinedest\empty + \def\pdfoutlinedest{#4}% + \fi + { + \turnoffactive + \txiescapepdf\pdfoutlinedest + \edef\pdfoutlinetext{#1}% + \txiescapepdf\pdfoutlinetext + % + \special{pdf:out [-] #2 << /Title (\pdfoutlinetext) /A + << /S /GoTo /D (name\pdfoutlinedest) >> >> }% + } + } + % + \def\pdfmakeoutlines{% + \begingroup + % + % In the case of XeTeX, counts of subentries is not necesary. + % Therefore, read toc only once. + % + % We use the node names as the destinations. + \def\partentry##1##2##3##4{}% ignore parts in the outlines + \def\numchapentry##1##2##3##4{% + \dopdfoutline{##1}{1}{##3}{##4}}% + \def\numsecentry##1##2##3##4{% + \dopdfoutline{##1}{2}{##3}{##4}}% + \def\numsubsecentry##1##2##3##4{% + \dopdfoutline{##1}{3}{##3}{##4}}% + \def\numsubsubsecentry##1##2##3##4{% + \dopdfoutline{##1}{4}{##3}{##4}}% + % + \let\appentry\numchapentry% + \let\appsecentry\numsecentry% + \let\appsubsecentry\numsubsecentry% + \let\appsubsubsecentry\numsubsubsecentry% + \let\unnchapentry\numchapentry% + \let\unnsecentry\numsecentry% + \let\unnsubsecentry\numsubsecentry% + \let\unnsubsubsecentry\numsubsubsecentry% + % + % In the case of XeTeX, xdvipdfmx converts strings to UTF-16. + % Therefore, the encoding and the language may not be considered. + % + \indexnofonts + \setupdatafile + % We can have normal brace characters in the PDF outlines, unlike + % Texinfo index files. So set that up. + \def\{{\lbracecharliteral}% + \def\}{\rbracecharliteral}% + \catcode`\\=\active \otherbackslash + \input \tocreadfilename + \endgroup + } + {\catcode`[=1 \catcode`]=2 + \catcode`{=\other \catcode`}=\other + \gdef\lbracecharliteral[{]% + \gdef\rbracecharliteral[}]% + ] + + \special{pdf:docview << /PageMode /UseOutlines >> } + % ``\special{pdf:tounicode ...}'' is not necessary + % because xdvipdfmx converts strings from UTF-8 to UTF-16 without it. + % However, due to UTF-16 convert issue of xdvipdfmx 20150315, + % ``\special{pdf:dest ...}'' can not handle non-ASCII strings. + % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753). +% + \def\skipspaces#1{\def\PP{#1}\def\D{|}% + \ifx\PP\D\let\nextsp\relax + \else\let\nextsp\skipspaces + \addtokens{\filename}{\PP}% + \advance\filenamelength by 1 + \fi + \nextsp} + \def\getfilename#1{% + \filenamelength=0 + % If we don't expand the argument now, \skipspaces will get + % snagged on things like "@value{foo}". + \edef\temp{#1}% + \expandafter\skipspaces\temp|\relax + } + % make a live url in pdf output. + \def\pdfurl#1{% + \begingroup + % it seems we really need yet another set of dummies; have not + % tried to figure out what each command should do in the context + % of @url. for now, just make @/ a no-op, that's the only one + % people have actually reported a problem with. + % + \normalturnoffactive + \def\@{@}% + \let\/=\empty + \makevalueexpandable + % do we want to go so far as to use \indexnofonts instead of just + % special-casing \var here? + \def\var##1{##1}% + % + \leavevmode\setcolor{\urlcolor}% + \special{pdf:bann << /Border [0 0 0] + /Subtype /Link /A << /S /URI /URI (#1) >> >>}% + \endgroup} + \def\endlink{\setcolor{\maincolor}\special{pdf:eann}} + \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} + \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} + \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} + \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}} + \def\maketoks{% + \expandafter\poptoks\the\toksA|ENDTOKS|\relax + \ifx\first0\adn0 + \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3 + \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6 + \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 + \else + \ifnum0=\countA\else\makelink\fi + \ifx\first.\let\next=\done\else + \let\next=\maketoks + \addtokens{\toksB}{\the\toksD} + \ifx\first,\addtokens{\toksB}{\space}\fi + \fi + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi + \next} + \def\makelink{\addtokens{\toksB}% + {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} + \def\pdflink#1{% + \special{pdf:bann << /Border [0 0 0] + /Type /Annot /Subtype /Link /A << /S /GoTo /D (name#1) >> >>}% + \setcolor{\linkcolor}#1\endlink} + \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} +% + % + % @image support + % + % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto). + \def\doxeteximage#1#2#3{% + \def\xeteximagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}% + \def\xeteximageheight{#3}\setbox2 = \hbox{\ignorespaces #3}% + % + % XeTeX (and the PDF format) support .pdf, .png, .jpg (among + % others). Let's try in that order, PDF first since if + % someone has a scalable image, presumably better to use that than a + % bitmap. + \let\xeteximgext=\empty + \begingroup + \openin 1 #1.pdf \ifeof 1 + \openin 1 #1.PDF \ifeof 1 + \openin 1 #1.png \ifeof 1 + \openin 1 #1.jpg \ifeof 1 + \openin 1 #1.jpeg \ifeof 1 + \openin 1 #1.JPG \ifeof 1 + \errmessage{Could not find image file #1 for XeTeX}% + \else \gdef\xeteximgext{JPG}% + \fi + \else \gdef\xeteximgext{jpeg}% + \fi + \else \gdef\xeteximgext{jpg}% + \fi + \else \gdef\xeteximgext{png}% + \fi + \else \gdef\xeteximgext{PDF}% + \fi + \else \gdef\xeteximgext{pdf}% + \fi + \closein 1 + \endgroup + % + \def\xetexpdfext{pdf}% + \ifx\xeteximgext\xetexpdfext + \XeTeXpdffile "#1".\xeteximgext "" + \else + \def\xetexpdfext{PDF}% + \ifx\xeteximgext\xetexpdfext + \XeTeXpdffile "#1".\xeteximgext "" + \else + \XeTeXpicfile "#1".\xeteximgext "" + \fi + \fi + \ifdim \wd0 >0pt width \xeteximagewidth \fi + \ifdim \wd2 >0pt height \xeteximageheight \fi \relax + } +\fi \message{fonts,} @@ -2609,6 +2899,7 @@ \setbox0 = \hbox{\ignorespaces #2}% look for second arg \ifdim\wd0 > 0pt \ifpdf + % For pdfTeX and LuaTeX \ifurefurlonlylink % PDF plus option to not display url, show just arg \unhbox0 @@ -2618,7 +2909,19 @@ \unhbox0\ (\urefcode{#1})% \fi \else - \unhbox0\ (\urefcode{#1})% DVI, always show arg and url + \ifx\XeTeXrevision\thisisundefined + \unhbox0\ (\urefcode{#1})% DVI, always show arg and url + \else + % For XeTeX + \ifurefurlonlylink + % PDF plus option to not display url, show just arg + \unhbox0 + \else + % PDF, normally display both arg and url for consistency, + % visibility, if the pdf is eventually used to print, etc. + \unhbox0\ (\urefcode{#1})% + \fi + \fi \fi \else \urefcode{#1}% only url given, so show it @@ -2719,7 +3022,18 @@ \endlink \endgroup} \else - \let\email=\uref + \ifx\XeTeXrevision\thisisundefined + \let\email=\uref + \else + \def\email#1{\doemail#1,,\finish} + \def\doemail#1,#2,#3\finish{\begingroup + \unsepspaces + \pdfurl{mailto:#1}% + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi + \endlink + \endgroup} + \fi \fi % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), @@ -3273,13 +3587,16 @@ \newif\ifseenauthor \newif\iffinishedtitlepage -% Do an implicit @contents or @shortcontents after @end titlepage if the -% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage. -% -\newif\ifsetcontentsaftertitlepage - \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue -\newif\ifsetshortcontentsaftertitlepage - \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue +% @setcontentsaftertitlepage used to do an implicit @contents or +% @shortcontents after @end titlepage, but it is now obsolete. +\def\setcontentsaftertitlepage{% + \errmessage{@setcontentsaftertitlepage has been removed as a Texinfo + command; move your @contents command if you want the contents + after the title page.}}% +\def\setshortcontentsaftertitlepage{% + \errmessage{@setshortcontentsaftertitlepage has been removed as a Texinfo + command; move your @shortcontents and @contents commands if you + want the contents after the title page.}}% \parseargdef\shorttitlepage{% \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% @@ -3321,20 +3638,6 @@ % Need this before the \...aftertitlepage checks so that if they are % in effect the toc pages will come out with page numbers. \HEADINGSon - % - % If they want short, they certainly want long too. - \ifsetshortcontentsaftertitlepage - \shortcontents - \contents - \global\let\shortcontents = \relax - \global\let\contents = \relax - \fi - % - \ifsetcontentsaftertitlepage - \contents - \global\let\contents = \relax - \global\let\shortcontents = \relax - \fi } \def\finishtitlepage{% @@ -3438,7 +3741,7 @@ % % Leave some space for the footline. Hopefully ok to assume % @evenfooting will not be used by itself. - \global\advance\pageheight by -12pt + \global\advance\txipageheight by -12pt \global\advance\vsize by -12pt } @@ -3463,9 +3766,9 @@ \def\oddheadingmarks{\headingmarks{odd}{heading}} \def\evenfootingmarks{\headingmarks{even}{footing}} \def\oddfootingmarks{\headingmarks{odd}{footing}} -\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1} +\parseargdef\everyheadingmarks{\headingmarks{even}{heading}{#1} \headingmarks{odd}{heading}{#1} } -\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1} +\parseargdef\everyfootingmarks{\headingmarks{even}{footing}{#1} \headingmarks{odd}{footing}{#1} } % #1 = even/odd, #2 = heading/footing, #3 = top/bottom. \def\headingmarks#1#2#3 {% @@ -3486,7 +3789,7 @@ % By default, they are off at the start of a document, % and turned `on' after @end titlepage. -\def\headings #1 {\csname HEADINGS#1\endcsname} +\parseargdef\headings{\csname HEADINGS#1\endcsname} \def\headingsoff{% non-global headings elimination \evenheadline={\hfil}\evenfootline={\hfil}% @@ -5242,7 +5545,14 @@ % preserve coloured links across page boundaries. Otherwise the marks % would get in the way of \lastbox in \insertindexentrybox. \else - \hskip\skip\thinshrinkable #1% + \ifx\XeTeXrevision\thisisundefined + \hskip\skip\thinshrinkable #1% + \else + \pdfgettoks#1.% + \bgroup\let\domark\relax + \hskip\skip\thinshrinkable\the\toksA + \egroup + \fi \fi \fi \egroup % end \boxA @@ -5377,7 +5687,11 @@ \ifpdf \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. \else - #2 + \ifx\XeTeXrevision\thisisundefined + #2 + \else + \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. + \fi \fi \par }} @@ -5510,7 +5824,7 @@ \wd0=\hsize \wd2=\hsize \vbox{% \vskip\doublecolumntopgap - \hbox to\pagewidth{\box0\hfil\box2}}% + \hbox to\txipagewidth{\box0\hfil\box2}}% } @@ -5537,7 +5851,7 @@ % goal. When TeX sees \eject from below which follows the final % section, it invokes the new output routine that we've set after % \balancecolumns below; \onepageout will try to fit the two columns - % and the final section into the vbox of \pageheight (see + % and the final section into the vbox of \txipageheight (see % \pagebody), causing an overfull box. % % Note that glue won't work here, because glue does not exercise the @@ -6021,7 +6335,7 @@ \fi } -\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname} +\parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname} \def\CHAPPAGoff{% \global\let\contentsalignmacro = \chappager @@ -6054,7 +6368,13 @@ \def\Yomitfromtockeyword{Yomitfromtoc} % \def\chapmacro#1#2#3{% - \checkenv{}% chapters, etc., should not start inside an environment. + \expandafter\ifx\thisenv\titlepage\else + \checkenv{}% chapters, etc., should not start inside an environment. + \fi + % FIXME: \chapmacro is currently called from inside \titlepage when + % \setcontentsaftertitlepage to print the "Table of Contents" heading, but + % this should probably be done by \sectionheading with an option to print + % in chapter size. % % Insert the first mark before the heading break (see notes for \domark). \let\prevchapterdefs=\lastchapterdefs @@ -6161,30 +6481,6 @@ } -% I don't think this chapter style is supported any more, so I'm not -% updating it with the new noderef stuff. We'll see. --karl, 11aug03. -% -\def\setchapterstyle #1 {\csname CHAPF#1\endcsname} -% -\def\unnchfopen #1{% - \chapoddpage - \vbox{\chapfonts \raggedtitlesettings #1\par}% - \nobreak\bigskip\nobreak -} -\def\chfopen #1#2{\chapoddpage {\chapfonts -\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% -\par\penalty 5000 % -} -\def\centerchfopen #1{% - \chapoddpage - \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}% - \nobreak\bigskip \nobreak -} -\def\CHAPFopen{% - \global\let\chapmacro=\chfopen - \global\let\centerchapmacro=\centerchfopen} - - % Section titles. These macros combine the section number parts and % call the generic \sectionheading to do the printing. % @@ -7629,12 +7925,12 @@ % Argument is macro body with arguments substituted \def\scanmacro#1{% \newlinechar`\^^M - \def\xprocessmacroarg{\eatspaces}% + \def\xeatspaces{\eatspaces}% % % Process the macro body under the current catcode regime. \scantokens{#1\texinfoc}\aftermacro% % - % The \c is to remove the \newlinechar added by \scantokens, and + % The \texinfoc is to remove the \newlinechar added by \scantokens, and % can be noticed by \parsearg. % The \aftermacro allows a \comment at the end of the macro definition % to duplicate itself past the final \newlinechar added by \scantokens: @@ -7647,15 +7943,7 @@ % Used for copying and captions \def\scanexp#1{% - \bgroup - % Undo catcode changes of \startcontents and \printindex - % When called from @insertcopying or (short)caption, we need active - % backslash to get it printed correctly. - % FIXME: This may not be needed. - %\catcode`\@=0 \catcode`\\=\active \escapechar=`\@ - \edef\temp{\noexpand\scanmacro{#1}}% - \temp - \egroup + \expandafter\scanmacro\expandafter{#1}% } \newcount\paramno % Count of parameters @@ -7725,7 +8013,7 @@ \catcode`\_=\other \catcode`\|=\other \catcode`\~=\other - \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi + \passthroughcharstrue } \def\scanargctxt{% used for copying and captions, not macros. @@ -7859,7 +8147,7 @@ \paramno=0\def\paramlist{}% \let\hash\relax % \hash is redefined to `#' later to get it into definitions - \let\processmacroarg\relax + \let\xeatspaces\relax \parsemargdefxxx#1,;,% \ifnum\paramno<10\relax\else \paramno0\relax @@ -7871,7 +8159,7 @@ \else \let\next=\parsemargdefxxx \advance\paramno by 1 \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname - {\processmacroarg{\hash\the\paramno}}% + {\xeatspaces{\hash\the\paramno}}% \edef\paramlist{\paramlist\hash\the\paramno,}% \fi\next} @@ -8097,16 +8385,9 @@ %%%%%%%%%%%%%% End of code for > 10 arguments %%%%%%%%%%%%%%%%%% - -% Remove following spaces at the expansion stage. -% This works because spaces are discarded before each argument when TeX is -% getting the arguments for a macro. -% This must not be immediately followed by a }. -\long\def\gobblespaces#1{#1} - % This defines a Texinfo @macro or @rmacro, called by \parsemacbody. % \macrobody has the body of the macro in it, with placeholders for -% its parameters, looking like "\processmacroarg{\hash 1}". +% its parameters, looking like "\xeatspaces{\hash 1}". % \paramno is the number of parameters % \paramlist is a TeX parameter text, e.g. "#1,#2,#3," % There are eight cases: recursive and nonrecursive macros of zero, one, @@ -8117,14 +8398,13 @@ \def\defmacro{% \let\hash=##% convert placeholders to macro parameter chars \ifnum\paramno=1 - \def\processmacroarg{\gobblespaces}% + \def\xeatspaces##1{##1}% % This removes the pair of braces around the argument. We don't % use \eatspaces, because this can cause ends of lines to be lost % when the argument to \eatspaces is read, leading to line-based % commands like "@itemize" not being read correctly. \else - \def\processmacroarg{\xprocessmacroarg}% - \let\xprocessmacroarg\relax + \let\xeatspaces\relax % suppress expansion \fi \ifrecursive %%%%%%%%%%%%%% Recursive %%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifcase\paramno @@ -8137,12 +8417,9 @@ \noexpand\braceorline \expandafter\noexpand\csname\the\macname @@@\endcsname}% \expandafter\xdef\csname\the\macname @@@\endcsname##1{% - \expandafter\noexpand\csname\the\macname @@@@\endcsname{% - \noexpand\gobblespaces##1\empty}% - % The \empty is for \gobblespaces in case #1 is empty - }% - \expandafter\xdef\csname\the\macname @@@@\endcsname##1{% - \egroup\noexpand\scanmacro{\macrobody}}% + \egroup + \noexpand\scanmacro{\macrobody}% + }% \else \ifnum\paramno<10\relax % at most 9 % See non-recursive section below for comments @@ -8181,11 +8458,6 @@ \noexpand\braceorline \expandafter\noexpand\csname\the\macname @@@\endcsname}% \expandafter\xdef\csname\the\macname @@@\endcsname##1{% - \expandafter\noexpand\csname\the\macname @@@@\endcsname{% - \noexpand\gobblespaces##1\empty}% - % The \empty is for \gobblespaces in case #1 is empty - }% - \expandafter\xdef\csname\the\macname @@@@\endcsname##1{% \egroup \noexpand\scanmacro{\macrobody}% }% @@ -8504,6 +8776,7 @@ % % Make link in pdf output. \ifpdf + % For pdfTeX and LuaTeX {\indexnofonts \turnoffactive \makevalueexpandable @@ -8530,6 +8803,47 @@ \fi }% \setcolor{\linkcolor}% + \else + \ifx\XeTeXrevision\thisisundefined + \else + % For XeTeX + {\indexnofonts + \turnoffactive + \makevalueexpandable + % This expands tokens, so do it after making catcode changes, so _ + % etc. don't get their TeX definitions. This ignores all spaces in + % #4, including (wrongly) those in the middle of the filename. + \getfilename{#4}% + % + % This (wrongly) does not take account of leading or trailing + % spaces in #1, which should be ignored. + \iftxiuseunicodedestname + \def\pdfxrefdest{#1}% Pass through Unicode characters. + \else + \edef\pdfxrefdest{#1}% Replace Unicode characters to ASCII. + \fi + \ifx\pdfxrefdest\empty + \def\pdfxrefdest{Top}% no empty targets + \else + \txiescapepdf\pdfxrefdest % escape PDF special chars + \fi + % + \leavevmode + \ifnum\filenamelength>0 + % By the default settings, + % XeTeX (xdvipdfmx) replaces link destination names with integers. + % In this case, the replaced destination names of + % remote PDF cannot be known. In order to avoid replacement, + % you can use commandline option `-C 0x0010' for xdvipdfmx. + \special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A + << /S /GoToR /F (\the\filename.pdf) /D (name\pdfxrefdest) >> >>}% + \else + \special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A + << /S /GoTo /D (name\pdfxrefdest) >> >>}% + \fi + }% + \setcolor{\linkcolor}% + \fi \fi {% % Have to otherify everything special to allow the \csname to @@ -8601,9 +8915,15 @@ % % output the `page 3'. \turnoffactive \putwordpage\tie\refx{#1-pg}{}% - \if\noexpand\tokenafterxref\space - ,% add a , if xref not followed by punctuation - \fi + % Add a , if xref followed by a space + \if\space\noexpand\tokenafterxref ,% + \else\ifx\ \tokenafterxref ,% @TAB + \else\ifx\*\tokenafterxref ,% @* + \else\ifx\ \tokenafterxref ,% @SPACE + \else\ifx\ + \tokenafterxref ,% @NL + \else\ifx\tie\tokenafterxref ,% @tie + \fi\fi\fi\fi\fi\fi \fi\fi \fi \endlink @@ -8833,9 +9153,6 @@ % now. --karl, 15jan04. \catcode`\\=\other % - % Make the characters 128-255 be printing characters. - {\setnonasciicharscatcodenonglobal\other}% - % % @ is our escape character in .aux files, and we need braces. \catcode`\{=1 \catcode`\}=2 @@ -8899,7 +9216,7 @@ % We want to typeset this text as a normal paragraph, even if the % footnote reference occurs in (for example) a display environment. % So reset some parameters. - \hsize=\pagewidth + \hsize=\txipagewidth \interlinepenalty\interfootnotelinepenalty \splittopskip\ht\strutbox % top baseline for broken footnotes \splitmaxdepth\dp\strutbox @@ -9078,12 +9395,21 @@ % % Output the image. \ifpdf + % For pdfTeX and LuaTeX <= 0.80 \dopdfimage{#1}{#2}{#3}% \else - % \epsfbox itself resets \epsf?size at each figure. - \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi - \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi - \epsfbox{#1.eps}% + \ifx\XeTeXrevision\thisisundefined + % For epsf.tex + % \epsfbox itself resets \epsf?size at each figure. + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi + \setbox0 = \hbox{\ignorespaces #3}% + \ifdim\wd0 > 0pt \epsfysize=#3\relax \fi + \epsfbox{#1.eps}% + \else + % For XeTeX + \doxeteximage{#1}{#2}{#3}% + \fi \fi % \ifimagevmode @@ -9205,7 +9531,7 @@ % \ifx\thiscaption\empty \else \ifx\floatident\empty \else - \appendtomacro\captionline{: }% had ident, so need a colon between + \appendtomacro\captionline{: }% had ident, so need a colon between \fi % % caption text. @@ -9232,30 +9558,17 @@ \requireauxfile \atdummies % - % since we read the caption text in the macro world, where ^^M - % is turned into a normal character, we have to scan it back, so - % we don't write the literal three characters "^^M" into the aux file. - \scanexp{% - \xdef\noexpand\gtemp{% - \ifx\thisshortcaption\empty - \thiscaption - \else - \thisshortcaption - \fi - }% - }% + \ifx\thisshortcaption\empty + \def\gtemp{\thiscaption}% + \else + \def\gtemp{\thisshortcaption}% + \fi \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident - \ifx\gtemp\empty \else : \gtemp \fi}}% + \ifx\gtemp\empty \else : \gtemp \fi}}% }% \fi \egroup % end of \vtop % - % place the captured inserts - % - % BEWARE: when the floats start floating, we have to issue warning - % whenever an insert appears inside a float which could possibly - % float. --kasal, 26may04 - % \checkinserts } @@ -9430,43 +9743,68 @@ \global\righthyphenmin = #3\relax } -% Get input by bytes instead of by UTF-8 codepoints for XeTeX and LuaTeX, -% otherwise the encoding support is completely broken. +% XeTeX and LuaTeX can handle native Unicode. +% Their default I/O is UTF-8 sequence instead of byte-wise. +% Other TeX engine (pdfTeX etc.) I/O is byte-wise. +% +\newif\iftxinativeunicodecapable +\newif\iftxiusebytewiseio + \ifx\XeTeXrevision\thisisundefined + \ifx\luatexversion\thisisundefined + \txinativeunicodecapablefalse + \txiusebytewiseiotrue + \else + \txinativeunicodecapabletrue + \txiusebytewiseiofalse + \fi \else -\XeTeXdefaultencoding "bytes" % For subsequent files to be read -\XeTeXinputencoding "bytes" % Effective in texinfo.tex only -% Unfortunately, there seems to be no corresponding XeTeX command for -% output encoding. This is a problem for auxiliary index and TOC files. -% The only solution would be perhaps to write out @U{...} sequences in -% place of UTF-8 characters. + \txinativeunicodecapabletrue + \txiusebytewiseiofalse \fi -\ifx\luatexversion\thisisundefined -\else -\directlua{ -local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub -local function convert_char (char) - return utf8_char(byte(char)) -end +% Set I/O by bytes instead of UTF-8 sequence for XeTeX and LuaTex +% for non-UTF-8 (byte-wise) encodings. +% +\def\setbytewiseio{% + \ifx\XeTeXrevision\thisisundefined + \else + \XeTeXdefaultencoding "bytes" % For subsequent files to be read + \XeTeXinputencoding "bytes" % For document root file + % Unfortunately, there seems to be no corresponding XeTeX command for + % output encoding. This is a problem for auxiliary index and TOC files. + % The only solution would be perhaps to write out @U{...} sequences in + % place of non-ASCII characters. + \fi -local function convert_line (line) - return gsub(line, ".", convert_char) -end + \ifx\luatexversion\thisisundefined + \else + \directlua{ + local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub + local function convert_char (char) + return utf8_char(byte(char)) + end -callback.register("process_input_buffer", convert_line) + local function convert_line (line) + return gsub(line, ".", convert_char) + end -local function convert_line_out (line) - local line_out = "" - for c in string.utfvalues(line) do - line_out = line_out .. string.char(c) - end - return line_out -end + callback.register("process_input_buffer", convert_line) + + local function convert_line_out (line) + local line_out = "" + for c in string.utfvalues(line) do + line_out = line_out .. string.char(c) + end + return line_out + end -callback.register("process_output_buffer", convert_line_out) + callback.register("process_output_buffer", convert_line_out) + } + \fi + + \txiusebytewiseiotrue } -\fi % Helpers for encodings. @@ -9493,13 +9831,6 @@ % \def\documentencoding{\parseargusing\filenamecatcodes\documentencodingzzz} \def\documentencodingzzz#1{% - % Get input by bytes instead of by UTF-8 codepoints for XeTeX, - % otherwise the encoding support is completely broken. - % This settings is for the document root file. - \ifx\XeTeXrevision\thisisundefined - \else - \XeTeXinputencoding "bytes" - \fi % % Encoding being declared for the document. \def\declaredencoding{\csname #1.enc\endcsname}% @@ -9516,22 +9847,37 @@ \asciichardefs % \else \ifx \declaredencoding \lattwo + \iftxinativeunicodecapable + \setbytewiseio + \fi \setnonasciicharscatcode\active \lattwochardefs % \else \ifx \declaredencoding \latone + \iftxinativeunicodecapable + \setbytewiseio + \fi \setnonasciicharscatcode\active \latonechardefs % \else \ifx \declaredencoding \latnine + \iftxinativeunicodecapable + \setbytewiseio + \fi \setnonasciicharscatcode\active \latninechardefs % \else \ifx \declaredencoding \utfeight - \setnonasciicharscatcode\active - % since we already invoked \utfeightchardefs at the top level - % (below), do not re-invoke it, then our check for duplicated - % definitions triggers. Making non-ascii chars active is enough. + \iftxinativeunicodecapable + % For native Unicode (XeTeX and LuaTeX) + \nativeunicodechardefs + \else + % For UTF-8 byte sequence (TeX, eTeX and pdfTeX) + \setnonasciicharscatcode\active + % since we already invoked \utfeightchardefs at the top level + % (below), do not re-invoke it, then our check for duplicated + % definitions triggers. Making non-ascii chars active is enough. + \fi % \else \message{Ignoring unknown document encoding: #1.}% @@ -9557,109 +9903,119 @@ % macros containing the character definitions. \setnonasciicharscatcode\active % + +\def\gdefchar#1#2{% +\gdef#1{% + \ifpassthroughchars + \string#1% + \else + #2% + \fi +}} + % Latin1 (ISO-8859-1) character definitions. \def\latonechardefs{% - \gdef^^a0{\tie} - \gdef^^a1{\exclamdown} - \gdef^^a2{{\tcfont \char162}} % cent - \gdef^^a3{\pounds} - \gdef^^a4{{\tcfont \char164}} % currency - \gdef^^a5{{\tcfont \char165}} % yen - \gdef^^a6{{\tcfont \char166}} % broken bar - \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\copyright} - \gdef^^aa{\ordf} - \gdef^^ab{\guillemetleft} - \gdef^^ac{\ensuremath\lnot} - \gdef^^ad{\-} - \gdef^^ae{\registeredsymbol} - \gdef^^af{\={}} - % - \gdef^^b0{\textdegree} - \gdef^^b1{$\pm$} - \gdef^^b2{$^2$} - \gdef^^b3{$^3$} - \gdef^^b4{\'{}} - \gdef^^b5{$\mu$} - \gdef^^b6{\P} - \gdef^^b7{\ensuremath\cdot} - \gdef^^b8{\cedilla\ } - \gdef^^b9{$^1$} - \gdef^^ba{\ordm} - \gdef^^bb{\guillemetright} - \gdef^^bc{$1\over4$} - \gdef^^bd{$1\over2$} - \gdef^^be{$3\over4$} - \gdef^^bf{\questiondown} - % - \gdef^^c0{\`A} - \gdef^^c1{\'A} - \gdef^^c2{\^A} - \gdef^^c3{\~A} - \gdef^^c4{\"A} - \gdef^^c5{\ringaccent A} - \gdef^^c6{\AE} - \gdef^^c7{\cedilla C} - \gdef^^c8{\`E} - \gdef^^c9{\'E} - \gdef^^ca{\^E} - \gdef^^cb{\"E} - \gdef^^cc{\`I} - \gdef^^cd{\'I} - \gdef^^ce{\^I} - \gdef^^cf{\"I} - % - \gdef^^d0{\DH} - \gdef^^d1{\~N} - \gdef^^d2{\`O} - \gdef^^d3{\'O} - \gdef^^d4{\^O} - \gdef^^d5{\~O} - \gdef^^d6{\"O} - \gdef^^d7{$\times$} - \gdef^^d8{\O} - \gdef^^d9{\`U} - \gdef^^da{\'U} - \gdef^^db{\^U} - \gdef^^dc{\"U} - \gdef^^dd{\'Y} - \gdef^^de{\TH} - \gdef^^df{\ss} - % - \gdef^^e0{\`a} - \gdef^^e1{\'a} - \gdef^^e2{\^a} - \gdef^^e3{\~a} - \gdef^^e4{\"a} - \gdef^^e5{\ringaccent a} - \gdef^^e6{\ae} - \gdef^^e7{\cedilla c} - \gdef^^e8{\`e} - \gdef^^e9{\'e} - \gdef^^ea{\^e} - \gdef^^eb{\"e} - \gdef^^ec{\`{\dotless i}} - \gdef^^ed{\'{\dotless i}} - \gdef^^ee{\^{\dotless i}} - \gdef^^ef{\"{\dotless i}} - % - \gdef^^f0{\dh} - \gdef^^f1{\~n} - \gdef^^f2{\`o} - \gdef^^f3{\'o} - \gdef^^f4{\^o} - \gdef^^f5{\~o} - \gdef^^f6{\"o} - \gdef^^f7{$\div$} - \gdef^^f8{\o} - \gdef^^f9{\`u} - \gdef^^fa{\'u} - \gdef^^fb{\^u} - \gdef^^fc{\"u} - \gdef^^fd{\'y} - \gdef^^fe{\th} - \gdef^^ff{\"y} + \gdefchar^^a0{\tie} + \gdefchar^^a1{\exclamdown} + \gdefchar^^a2{{\tcfont \char162}} % cent + \gdefchar^^a3{\pounds} + \gdefchar^^a4{{\tcfont \char164}} % currency + \gdefchar^^a5{{\tcfont \char165}} % yen + \gdefchar^^a6{{\tcfont \char166}} % broken bar + \gdefchar^^a7{\S} + \gdefchar^^a8{\"{}} + \gdefchar^^a9{\copyright} + \gdefchar^^aa{\ordf} + \gdefchar^^ab{\guillemetleft} + \gdefchar^^ac{\ensuremath\lnot} + \gdefchar^^ad{\-} + \gdefchar^^ae{\registeredsymbol} + \gdefchar^^af{\={}} + % + \gdefchar^^b0{\textdegree} + \gdefchar^^b1{$\pm$} + \gdefchar^^b2{$^2$} + \gdefchar^^b3{$^3$} + \gdefchar^^b4{\'{}} + \gdefchar^^b5{$\mu$} + \gdefchar^^b6{\P} + \gdefchar^^b7{\ensuremath\cdot} + \gdefchar^^b8{\cedilla\ } + \gdefchar^^b9{$^1$} + \gdefchar^^ba{\ordm} + \gdefchar^^bb{\guillemetright} + \gdefchar^^bc{$1\over4$} + \gdefchar^^bd{$1\over2$} + \gdefchar^^be{$3\over4$} + \gdefchar^^bf{\questiondown} + % + \gdefchar^^c0{\`A} + \gdefchar^^c1{\'A} + \gdefchar^^c2{\^A} + \gdefchar^^c3{\~A} + \gdefchar^^c4{\"A} + \gdefchar^^c5{\ringaccent A} + \gdefchar^^c6{\AE} + \gdefchar^^c7{\cedilla C} + \gdefchar^^c8{\`E} + \gdefchar^^c9{\'E} + \gdefchar^^ca{\^E} + \gdefchar^^cb{\"E} + \gdefchar^^cc{\`I} + \gdefchar^^cd{\'I} + \gdefchar^^ce{\^I} + \gdefchar^^cf{\"I} + % + \gdefchar^^d0{\DH} + \gdefchar^^d1{\~N} + \gdefchar^^d2{\`O} + \gdefchar^^d3{\'O} + \gdefchar^^d4{\^O} + \gdefchar^^d5{\~O} + \gdefchar^^d6{\"O} + \gdefchar^^d7{$\times$} + \gdefchar^^d8{\O} + \gdefchar^^d9{\`U} + \gdefchar^^da{\'U} + \gdefchar^^db{\^U} + \gdefchar^^dc{\"U} + \gdefchar^^dd{\'Y} + \gdefchar^^de{\TH} + \gdefchar^^df{\ss} + % + \gdefchar^^e0{\`a} + \gdefchar^^e1{\'a} + \gdefchar^^e2{\^a} + \gdefchar^^e3{\~a} + \gdefchar^^e4{\"a} + \gdefchar^^e5{\ringaccent a} + \gdefchar^^e6{\ae} + \gdefchar^^e7{\cedilla c} + \gdefchar^^e8{\`e} + \gdefchar^^e9{\'e} + \gdefchar^^ea{\^e} + \gdefchar^^eb{\"e} + \gdefchar^^ec{\`{\dotless i}} + \gdefchar^^ed{\'{\dotless i}} + \gdefchar^^ee{\^{\dotless i}} + \gdefchar^^ef{\"{\dotless i}} + % + \gdefchar^^f0{\dh} + \gdefchar^^f1{\~n} + \gdefchar^^f2{\`o} + \gdefchar^^f3{\'o} + \gdefchar^^f4{\^o} + \gdefchar^^f5{\~o} + \gdefchar^^f6{\"o} + \gdefchar^^f7{$\div$} + \gdefchar^^f8{\o} + \gdefchar^^f9{\`u} + \gdefchar^^fa{\'u} + \gdefchar^^fb{\^u} + \gdefchar^^fc{\"u} + \gdefchar^^fd{\'y} + \gdefchar^^fe{\th} + \gdefchar^^ff{\"y} } % Latin9 (ISO-8859-15) encoding character definitions. @@ -9667,119 +10023,119 @@ % Encoding is almost identical to Latin1. \latonechardefs % - \gdef^^a4{\euro} - \gdef^^a6{\v S} - \gdef^^a8{\v s} - \gdef^^b4{\v Z} - \gdef^^b8{\v z} - \gdef^^bc{\OE} - \gdef^^bd{\oe} - \gdef^^be{\"Y} + \gdefchar^^a4{\euro} + \gdefchar^^a6{\v S} + \gdefchar^^a8{\v s} + \gdefchar^^b4{\v Z} + \gdefchar^^b8{\v z} + \gdefchar^^bc{\OE} + \gdefchar^^bd{\oe} + \gdefchar^^be{\"Y} } % Latin2 (ISO-8859-2) character definitions. \def\lattwochardefs{% - \gdef^^a0{\tie} - \gdef^^a1{\ogonek{A}} - \gdef^^a2{\u{}} - \gdef^^a3{\L} - \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} - \gdef^^a5{\v L} - \gdef^^a6{\'S} - \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\v S} - \gdef^^aa{\cedilla S} - \gdef^^ab{\v T} - \gdef^^ac{\'Z} - \gdef^^ad{\-} - \gdef^^ae{\v Z} - \gdef^^af{\dotaccent Z} - % - \gdef^^b0{\textdegree} - \gdef^^b1{\ogonek{a}} - \gdef^^b2{\ogonek{ }} - \gdef^^b3{\l} - \gdef^^b4{\'{}} - \gdef^^b5{\v l} - \gdef^^b6{\'s} - \gdef^^b7{\v{}} - \gdef^^b8{\cedilla\ } - \gdef^^b9{\v s} - \gdef^^ba{\cedilla s} - \gdef^^bb{\v t} - \gdef^^bc{\'z} - \gdef^^bd{\H{}} - \gdef^^be{\v z} - \gdef^^bf{\dotaccent z} - % - \gdef^^c0{\'R} - \gdef^^c1{\'A} - \gdef^^c2{\^A} - \gdef^^c3{\u A} - \gdef^^c4{\"A} - \gdef^^c5{\'L} - \gdef^^c6{\'C} - \gdef^^c7{\cedilla C} - \gdef^^c8{\v C} - \gdef^^c9{\'E} - \gdef^^ca{\ogonek{E}} - \gdef^^cb{\"E} - \gdef^^cc{\v E} - \gdef^^cd{\'I} - \gdef^^ce{\^I} - \gdef^^cf{\v D} - % - \gdef^^d0{\DH} - \gdef^^d1{\'N} - \gdef^^d2{\v N} - \gdef^^d3{\'O} - \gdef^^d4{\^O} - \gdef^^d5{\H O} - \gdef^^d6{\"O} - \gdef^^d7{$\times$} - \gdef^^d8{\v R} - \gdef^^d9{\ringaccent U} - \gdef^^da{\'U} - \gdef^^db{\H U} - \gdef^^dc{\"U} - \gdef^^dd{\'Y} - \gdef^^de{\cedilla T} - \gdef^^df{\ss} - % - \gdef^^e0{\'r} - \gdef^^e1{\'a} - \gdef^^e2{\^a} - \gdef^^e3{\u a} - \gdef^^e4{\"a} - \gdef^^e5{\'l} - \gdef^^e6{\'c} - \gdef^^e7{\cedilla c} - \gdef^^e8{\v c} - \gdef^^e9{\'e} - \gdef^^ea{\ogonek{e}} - \gdef^^eb{\"e} - \gdef^^ec{\v e} - \gdef^^ed{\'{\dotless{i}}} - \gdef^^ee{\^{\dotless{i}}} - \gdef^^ef{\v d} - % - \gdef^^f0{\dh} - \gdef^^f1{\'n} - \gdef^^f2{\v n} - \gdef^^f3{\'o} - \gdef^^f4{\^o} - \gdef^^f5{\H o} - \gdef^^f6{\"o} - \gdef^^f7{$\div$} - \gdef^^f8{\v r} - \gdef^^f9{\ringaccent u} - \gdef^^fa{\'u} - \gdef^^fb{\H u} - \gdef^^fc{\"u} - \gdef^^fd{\'y} - \gdef^^fe{\cedilla t} - \gdef^^ff{\dotaccent{}} + \gdefchar^^a0{\tie} + \gdefchar^^a1{\ogonek{A}} + \gdefchar^^a2{\u{}} + \gdefchar^^a3{\L} + \gdefchar^^a4{\missingcharmsg{CURRENCY SIGN}} + \gdefchar^^a5{\v L} + \gdefchar^^a6{\'S} + \gdefchar^^a7{\S} + \gdefchar^^a8{\"{}} + \gdefchar^^a9{\v S} + \gdefchar^^aa{\cedilla S} + \gdefchar^^ab{\v T} + \gdefchar^^ac{\'Z} + \gdefchar^^ad{\-} + \gdefchar^^ae{\v Z} + \gdefchar^^af{\dotaccent Z} + % + \gdefchar^^b0{\textdegree} + \gdefchar^^b1{\ogonek{a}} + \gdefchar^^b2{\ogonek{ }} + \gdefchar^^b3{\l} + \gdefchar^^b4{\'{}} + \gdefchar^^b5{\v l} + \gdefchar^^b6{\'s} + \gdefchar^^b7{\v{}} + \gdefchar^^b8{\cedilla\ } + \gdefchar^^b9{\v s} + \gdefchar^^ba{\cedilla s} + \gdefchar^^bb{\v t} + \gdefchar^^bc{\'z} + \gdefchar^^bd{\H{}} + \gdefchar^^be{\v z} + \gdefchar^^bf{\dotaccent z} + % + \gdefchar^^c0{\'R} + \gdefchar^^c1{\'A} + \gdefchar^^c2{\^A} + \gdefchar^^c3{\u A} + \gdefchar^^c4{\"A} + \gdefchar^^c5{\'L} + \gdefchar^^c6{\'C} + \gdefchar^^c7{\cedilla C} + \gdefchar^^c8{\v C} + \gdefchar^^c9{\'E} + \gdefchar^^ca{\ogonek{E}} + \gdefchar^^cb{\"E} + \gdefchar^^cc{\v E} + \gdefchar^^cd{\'I} + \gdefchar^^ce{\^I} + \gdefchar^^cf{\v D} + % + \gdefchar^^d0{\DH} + \gdefchar^^d1{\'N} + \gdefchar^^d2{\v N} + \gdefchar^^d3{\'O} + \gdefchar^^d4{\^O} + \gdefchar^^d5{\H O} + \gdefchar^^d6{\"O} + \gdefchar^^d7{$\times$} + \gdefchar^^d8{\v R} + \gdefchar^^d9{\ringaccent U} + \gdefchar^^da{\'U} + \gdefchar^^db{\H U} + \gdefchar^^dc{\"U} + \gdefchar^^dd{\'Y} + \gdefchar^^de{\cedilla T} + \gdefchar^^df{\ss} + % + \gdefchar^^e0{\'r} + \gdefchar^^e1{\'a} + \gdefchar^^e2{\^a} + \gdefchar^^e3{\u a} + \gdefchar^^e4{\"a} + \gdefchar^^e5{\'l} + \gdefchar^^e6{\'c} + \gdefchar^^e7{\cedilla c} + \gdefchar^^e8{\v c} + \gdefchar^^e9{\'e} + \gdefchar^^ea{\ogonek{e}} + \gdefchar^^eb{\"e} + \gdefchar^^ec{\v e} + \gdefchar^^ed{\'{\dotless{i}}} + \gdefchar^^ee{\^{\dotless{i}}} + \gdefchar^^ef{\v d} + % + \gdefchar^^f0{\dh} + \gdefchar^^f1{\'n} + \gdefchar^^f2{\v n} + \gdefchar^^f3{\'o} + \gdefchar^^f4{\^o} + \gdefchar^^f5{\H o} + \gdefchar^^f6{\"o} + \gdefchar^^f7{$\div$} + \gdefchar^^f8{\v r} + \gdefchar^^f9{\ringaccent u} + \gdefchar^^fa{\'u} + \gdefchar^^fb{\H u} + \gdefchar^^fc{\"u} + \gdefchar^^fd{\'y} + \gdefchar^^fe{\cedilla t} + \gdefchar^^ff{\dotaccent{}} } % UTF-8 character definitions. @@ -9809,35 +10165,56 @@ \fi } +% Give non-ASCII bytes the active definitions for processing UTF-8 sequences \begingroup \catcode`\~13 + \catcode`\$12 \catcode`\"12 + % Loop from \countUTFx to \countUTFy, performing \UTFviiiTmp + % substituting ~ and $ with a character token of that value. \def\UTFviiiLoop{% \global\catcode\countUTFx\active \uccode`\~\countUTFx + \uccode`\$\countUTFx \uppercase\expandafter{\UTFviiiTmp}% \advance\countUTFx by 1 \ifnum\countUTFx < \countUTFy \expandafter\UTFviiiLoop \fi} + % For bytes other than the first in a UTF-8 sequence. Not expected to + % be expanded except when writing to auxiliary files. + \countUTFx = "80 + \countUTFy = "C2 + \def\UTFviiiTmp{% + \gdef~{ + \ifpassthroughchars $\fi}}% + \UTFviiiLoop + \countUTFx = "C2 \countUTFy = "E0 \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiTwoOctets\string~}} + \gdef~{% + \ifpassthroughchars $% + \else\expandafter\UTFviiiTwoOctets\expandafter$\fi}}% \UTFviiiLoop \countUTFx = "E0 \countUTFy = "F0 \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiThreeOctets\string~}} + \gdef~{% + \ifpassthroughchars $% + \else\expandafter\UTFviiiThreeOctets\expandafter$\fi}}% \UTFviiiLoop \countUTFx = "F0 \countUTFy = "F4 \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiFourOctets\string~}} + \gdef~{% + \ifpassthroughchars $% + \else\expandafter\UTFviiiFourOctets\expandafter$\fi + }}% \UTFviiiLoop \endgroup @@ -9846,13 +10223,26 @@ % @U{xxxx} to produce U+xxxx, if we support it. \def\U#1{% \expandafter\ifx\csname uni:#1\endcsname \relax - \errhelp = \EMsimple - \errmessage{Unicode character U+#1 not supported, sorry}% + \iftxinativeunicodecapable + % Any Unicode characters can be used by native Unicode. + % However, if the font does not have the glyph, the letter will miss. + \begingroup + \uccode`\.="#1\relax + \uppercase{.} + \endgroup + \else + \errhelp = \EMsimple + \errmessage{Unicode character U+#1 not supported, sorry}% + \fi \else \csname uni:#1\endcsname \fi } +% For UTF-8 byte sequence (TeX, e-TeX and pdfTeX) +% Definition macro to replace the Unicode character +% Definition macro that is used by @U command +% \begingroup \catcode`\"=12 \catcode`\<=12 @@ -9861,11 +10251,12 @@ \catcode`\;=12 \catcode`\!=12 \catcode`\~=13 - \gdef\DeclareUnicodeCharacter#1#2{% + \gdef\DeclareUnicodeCharacterUTFviii#1#2{% \countUTFz = "#1\relax - %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% \begingroup \parseXMLCharref + % + % Access definitions of characters given UTF-8 sequences \def\UTFviiiTwoOctets##1##2{% \csname u8:##1\string ##2\endcsname}% \def\UTFviiiThreeOctets##1##2##3{% @@ -9883,7 +10274,8 @@ % define an additional control sequence for this code point. \expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp \endgroup} - + % + % Given the value in \countUTFz as a Unicode code point, set \UTFviiiTmp. \gdef\parseXMLCharref{% \ifnum\countUTFz < "A0\relax \errhelp = \EMsimple @@ -9913,12 +10305,20 @@ \uccode `#1\countUTFx \countUTFz = \countUTFy} + % Used to set \UTFviiiTmp to a UTF-8 byte sequence \gdef\parseUTFviiiB#1#2#3#4{% \advance\countUTFz by "#10\relax \uccode `#3\countUTFz \uppercase{\gdef\UTFviiiTmp{#2#3#4}}} \endgroup +% For native Unicode (XeTeX and LuaTeX) +% Definition macro that is set catcode other non global +% +\def\DeclareUnicodeCharacterNativeOther#1#2{% + \catcode"#1=\other +} + % https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_M % U+0000..U+007F = https://en.wikipedia.org/wiki/Basic_Latin_(Unicode_block) % U+0080..U+00FF = https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block) @@ -9933,732 +10333,747 @@ % We won't be doing that here in this simple file. But we can try to at % least make most of the characters not bomb out. % -\def\utfeightchardefs{% - \DeclareUnicodeCharacter{00A0}{\tie} - \DeclareUnicodeCharacter{00A1}{\exclamdown} +\def\unicodechardefs{% + \DeclareUnicodeCharacter{00A0}{\tie}% + \DeclareUnicodeCharacter{00A1}{\exclamdown}% \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent - \DeclareUnicodeCharacter{00A3}{\pounds} + \DeclareUnicodeCharacter{00A3}{\pounds}% \DeclareUnicodeCharacter{00A4}{{\tcfont \char164}}% 0244=currency \DeclareUnicodeCharacter{00A5}{{\tcfont \char165}}% 0245=yen \DeclareUnicodeCharacter{00A6}{{\tcfont \char166}}% 0246=brokenbar - \DeclareUnicodeCharacter{00A7}{\S} - \DeclareUnicodeCharacter{00A8}{\"{ }} - \DeclareUnicodeCharacter{00A9}{\copyright} - \DeclareUnicodeCharacter{00AA}{\ordf} - \DeclareUnicodeCharacter{00AB}{\guillemetleft} - \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot} - \DeclareUnicodeCharacter{00AD}{\-} - \DeclareUnicodeCharacter{00AE}{\registeredsymbol} - \DeclareUnicodeCharacter{00AF}{\={ }} - % - \DeclareUnicodeCharacter{00B0}{\ringaccent{ }} - \DeclareUnicodeCharacter{00B1}{\ensuremath\pm} - \DeclareUnicodeCharacter{00B2}{$^2$} - \DeclareUnicodeCharacter{00B3}{$^3$} - \DeclareUnicodeCharacter{00B4}{\'{ }} - \DeclareUnicodeCharacter{00B5}{$\mu$} - \DeclareUnicodeCharacter{00B6}{\P} - \DeclareUnicodeCharacter{00B7}{\ensuremath\cdot} - \DeclareUnicodeCharacter{00B8}{\cedilla{ }} - \DeclareUnicodeCharacter{00B9}{$^1$} - \DeclareUnicodeCharacter{00BA}{\ordm} - \DeclareUnicodeCharacter{00BB}{\guillemetright} - \DeclareUnicodeCharacter{00BC}{$1\over4$} - \DeclareUnicodeCharacter{00BD}{$1\over2$} - \DeclareUnicodeCharacter{00BE}{$3\over4$} - \DeclareUnicodeCharacter{00BF}{\questiondown} - % - \DeclareUnicodeCharacter{00C0}{\`A} - \DeclareUnicodeCharacter{00C1}{\'A} - \DeclareUnicodeCharacter{00C2}{\^A} - \DeclareUnicodeCharacter{00C3}{\~A} - \DeclareUnicodeCharacter{00C4}{\"A} - \DeclareUnicodeCharacter{00C5}{\AA} - \DeclareUnicodeCharacter{00C6}{\AE} - \DeclareUnicodeCharacter{00C7}{\cedilla{C}} - \DeclareUnicodeCharacter{00C8}{\`E} - \DeclareUnicodeCharacter{00C9}{\'E} - \DeclareUnicodeCharacter{00CA}{\^E} - \DeclareUnicodeCharacter{00CB}{\"E} - \DeclareUnicodeCharacter{00CC}{\`I} - \DeclareUnicodeCharacter{00CD}{\'I} - \DeclareUnicodeCharacter{00CE}{\^I} - \DeclareUnicodeCharacter{00CF}{\"I} - % - \DeclareUnicodeCharacter{00D0}{\DH} - \DeclareUnicodeCharacter{00D1}{\~N} - \DeclareUnicodeCharacter{00D2}{\`O} - \DeclareUnicodeCharacter{00D3}{\'O} - \DeclareUnicodeCharacter{00D4}{\^O} - \DeclareUnicodeCharacter{00D5}{\~O} - \DeclareUnicodeCharacter{00D6}{\"O} - \DeclareUnicodeCharacter{00D7}{\ensuremath\times} - \DeclareUnicodeCharacter{00D8}{\O} - \DeclareUnicodeCharacter{00D9}{\`U} - \DeclareUnicodeCharacter{00DA}{\'U} - \DeclareUnicodeCharacter{00DB}{\^U} - \DeclareUnicodeCharacter{00DC}{\"U} - \DeclareUnicodeCharacter{00DD}{\'Y} - \DeclareUnicodeCharacter{00DE}{\TH} - \DeclareUnicodeCharacter{00DF}{\ss} - % - \DeclareUnicodeCharacter{00E0}{\`a} - \DeclareUnicodeCharacter{00E1}{\'a} - \DeclareUnicodeCharacter{00E2}{\^a} - \DeclareUnicodeCharacter{00E3}{\~a} - \DeclareUnicodeCharacter{00E4}{\"a} - \DeclareUnicodeCharacter{00E5}{\aa} - \DeclareUnicodeCharacter{00E6}{\ae} - \DeclareUnicodeCharacter{00E7}{\cedilla{c}} - \DeclareUnicodeCharacter{00E8}{\`e} - \DeclareUnicodeCharacter{00E9}{\'e} - \DeclareUnicodeCharacter{00EA}{\^e} - \DeclareUnicodeCharacter{00EB}{\"e} - \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}} - \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}} - \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} - \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} - % - \DeclareUnicodeCharacter{00F0}{\dh} - \DeclareUnicodeCharacter{00F1}{\~n} - \DeclareUnicodeCharacter{00F2}{\`o} - \DeclareUnicodeCharacter{00F3}{\'o} - \DeclareUnicodeCharacter{00F4}{\^o} - \DeclareUnicodeCharacter{00F5}{\~o} - \DeclareUnicodeCharacter{00F6}{\"o} - \DeclareUnicodeCharacter{00F7}{\ensuremath\div} - \DeclareUnicodeCharacter{00F8}{\o} - \DeclareUnicodeCharacter{00F9}{\`u} - \DeclareUnicodeCharacter{00FA}{\'u} - \DeclareUnicodeCharacter{00FB}{\^u} - \DeclareUnicodeCharacter{00FC}{\"u} - \DeclareUnicodeCharacter{00FD}{\'y} - \DeclareUnicodeCharacter{00FE}{\th} - \DeclareUnicodeCharacter{00FF}{\"y} - % - \DeclareUnicodeCharacter{0100}{\=A} - \DeclareUnicodeCharacter{0101}{\=a} - \DeclareUnicodeCharacter{0102}{\u{A}} - \DeclareUnicodeCharacter{0103}{\u{a}} - \DeclareUnicodeCharacter{0104}{\ogonek{A}} - \DeclareUnicodeCharacter{0105}{\ogonek{a}} - \DeclareUnicodeCharacter{0106}{\'C} - \DeclareUnicodeCharacter{0107}{\'c} - \DeclareUnicodeCharacter{0108}{\^C} - \DeclareUnicodeCharacter{0109}{\^c} - \DeclareUnicodeCharacter{010A}{\dotaccent{C}} - \DeclareUnicodeCharacter{010B}{\dotaccent{c}} - \DeclareUnicodeCharacter{010C}{\v{C}} - \DeclareUnicodeCharacter{010D}{\v{c}} - \DeclareUnicodeCharacter{010E}{\v{D}} - \DeclareUnicodeCharacter{010F}{d'} - % - \DeclareUnicodeCharacter{0110}{\DH} - \DeclareUnicodeCharacter{0111}{\dh} - \DeclareUnicodeCharacter{0112}{\=E} - \DeclareUnicodeCharacter{0113}{\=e} - \DeclareUnicodeCharacter{0114}{\u{E}} - \DeclareUnicodeCharacter{0115}{\u{e}} - \DeclareUnicodeCharacter{0116}{\dotaccent{E}} - \DeclareUnicodeCharacter{0117}{\dotaccent{e}} - \DeclareUnicodeCharacter{0118}{\ogonek{E}} - \DeclareUnicodeCharacter{0119}{\ogonek{e}} - \DeclareUnicodeCharacter{011A}{\v{E}} - \DeclareUnicodeCharacter{011B}{\v{e}} - \DeclareUnicodeCharacter{011C}{\^G} - \DeclareUnicodeCharacter{011D}{\^g} - \DeclareUnicodeCharacter{011E}{\u{G}} - \DeclareUnicodeCharacter{011F}{\u{g}} - % - \DeclareUnicodeCharacter{0120}{\dotaccent{G}} - \DeclareUnicodeCharacter{0121}{\dotaccent{g}} - \DeclareUnicodeCharacter{0122}{\cedilla{G}} - \DeclareUnicodeCharacter{0123}{\cedilla{g}} - \DeclareUnicodeCharacter{0124}{\^H} - \DeclareUnicodeCharacter{0125}{\^h} - \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}} - \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}} - \DeclareUnicodeCharacter{0128}{\~I} - \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}} - \DeclareUnicodeCharacter{012A}{\=I} - \DeclareUnicodeCharacter{012B}{\={\dotless{i}}} - \DeclareUnicodeCharacter{012C}{\u{I}} - \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}} - \DeclareUnicodeCharacter{012E}{\ogonek{I}} - \DeclareUnicodeCharacter{012F}{\ogonek{i}} - % - \DeclareUnicodeCharacter{0130}{\dotaccent{I}} - \DeclareUnicodeCharacter{0131}{\dotless{i}} - \DeclareUnicodeCharacter{0132}{IJ} - \DeclareUnicodeCharacter{0133}{ij} - \DeclareUnicodeCharacter{0134}{\^J} - \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}} - \DeclareUnicodeCharacter{0136}{\cedilla{K}} - \DeclareUnicodeCharacter{0137}{\cedilla{k}} - \DeclareUnicodeCharacter{0138}{\ensuremath\kappa} - \DeclareUnicodeCharacter{0139}{\'L} - \DeclareUnicodeCharacter{013A}{\'l} - \DeclareUnicodeCharacter{013B}{\cedilla{L}} - \DeclareUnicodeCharacter{013C}{\cedilla{l}} + \DeclareUnicodeCharacter{00A7}{\S}% + \DeclareUnicodeCharacter{00A8}{\"{ }}% + \DeclareUnicodeCharacter{00A9}{\copyright}% + \DeclareUnicodeCharacter{00AA}{\ordf}% + \DeclareUnicodeCharacter{00AB}{\guillemetleft}% + \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot}% + \DeclareUnicodeCharacter{00AD}{\-}% + \DeclareUnicodeCharacter{00AE}{\registeredsymbol}% + \DeclareUnicodeCharacter{00AF}{\={ }}% + % + \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}% + \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}% + \DeclareUnicodeCharacter{00B2}{$^2$}% + \DeclareUnicodeCharacter{00B3}{$^3$}% + \DeclareUnicodeCharacter{00B4}{\'{ }}% + \DeclareUnicodeCharacter{00B5}{$\mu$}% + \DeclareUnicodeCharacter{00B6}{\P}% + \DeclareUnicodeCharacter{00B7}{\ensuremath\cdot}% + \DeclareUnicodeCharacter{00B8}{\cedilla{ }}% + \DeclareUnicodeCharacter{00B9}{$^1$}% + \DeclareUnicodeCharacter{00BA}{\ordm}% + \DeclareUnicodeCharacter{00BB}{\guillemetright}% + \DeclareUnicodeCharacter{00BC}{$1\over4$}% + \DeclareUnicodeCharacter{00BD}{$1\over2$}% + \DeclareUnicodeCharacter{00BE}{$3\over4$}% + \DeclareUnicodeCharacter{00BF}{\questiondown}% + % + \DeclareUnicodeCharacter{00C0}{\`A}% + \DeclareUnicodeCharacter{00C1}{\'A}% + \DeclareUnicodeCharacter{00C2}{\^A}% + \DeclareUnicodeCharacter{00C3}{\~A}% + \DeclareUnicodeCharacter{00C4}{\"A}% + \DeclareUnicodeCharacter{00C5}{\AA}% + \DeclareUnicodeCharacter{00C6}{\AE}% + \DeclareUnicodeCharacter{00C7}{\cedilla{C}}% + \DeclareUnicodeCharacter{00C8}{\`E}% + \DeclareUnicodeCharacter{00C9}{\'E}% + \DeclareUnicodeCharacter{00CA}{\^E}% + \DeclareUnicodeCharacter{00CB}{\"E}% + \DeclareUnicodeCharacter{00CC}{\`I}% + \DeclareUnicodeCharacter{00CD}{\'I}% + \DeclareUnicodeCharacter{00CE}{\^I}% + \DeclareUnicodeCharacter{00CF}{\"I}% + % + \DeclareUnicodeCharacter{00D0}{\DH}% + \DeclareUnicodeCharacter{00D1}{\~N}% + \DeclareUnicodeCharacter{00D2}{\`O}% + \DeclareUnicodeCharacter{00D3}{\'O}% + \DeclareUnicodeCharacter{00D4}{\^O}% + \DeclareUnicodeCharacter{00D5}{\~O}% + \DeclareUnicodeCharacter{00D6}{\"O}% + \DeclareUnicodeCharacter{00D7}{\ensuremath\times}% + \DeclareUnicodeCharacter{00D8}{\O}% + \DeclareUnicodeCharacter{00D9}{\`U}% + \DeclareUnicodeCharacter{00DA}{\'U}% + \DeclareUnicodeCharacter{00DB}{\^U}% + \DeclareUnicodeCharacter{00DC}{\"U}% + \DeclareUnicodeCharacter{00DD}{\'Y}% + \DeclareUnicodeCharacter{00DE}{\TH}% + \DeclareUnicodeCharacter{00DF}{\ss}% + % + \DeclareUnicodeCharacter{00E0}{\`a}% + \DeclareUnicodeCharacter{00E1}{\'a}% + \DeclareUnicodeCharacter{00E2}{\^a}% + \DeclareUnicodeCharacter{00E3}{\~a}% + \DeclareUnicodeCharacter{00E4}{\"a}% + \DeclareUnicodeCharacter{00E5}{\aa}% + \DeclareUnicodeCharacter{00E6}{\ae}% + \DeclareUnicodeCharacter{00E7}{\cedilla{c}}% + \DeclareUnicodeCharacter{00E8}{\`e}% + \DeclareUnicodeCharacter{00E9}{\'e}% + \DeclareUnicodeCharacter{00EA}{\^e}% + \DeclareUnicodeCharacter{00EB}{\"e}% + \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}% + \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}% + \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}% + \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}% + % + \DeclareUnicodeCharacter{00F0}{\dh}% + \DeclareUnicodeCharacter{00F1}{\~n}% + \DeclareUnicodeCharacter{00F2}{\`o}% + \DeclareUnicodeCharacter{00F3}{\'o}% + \DeclareUnicodeCharacter{00F4}{\^o}% + \DeclareUnicodeCharacter{00F5}{\~o}% + \DeclareUnicodeCharacter{00F6}{\"o}% + \DeclareUnicodeCharacter{00F7}{\ensuremath\div}% + \DeclareUnicodeCharacter{00F8}{\o}% + \DeclareUnicodeCharacter{00F9}{\`u}% + \DeclareUnicodeCharacter{00FA}{\'u}% + \DeclareUnicodeCharacter{00FB}{\^u}% + \DeclareUnicodeCharacter{00FC}{\"u}% + \DeclareUnicodeCharacter{00FD}{\'y}% + \DeclareUnicodeCharacter{00FE}{\th}% + \DeclareUnicodeCharacter{00FF}{\"y}% + % + \DeclareUnicodeCharacter{0100}{\=A}% + \DeclareUnicodeCharacter{0101}{\=a}% + \DeclareUnicodeCharacter{0102}{\u{A}}% + \DeclareUnicodeCharacter{0103}{\u{a}}% + \DeclareUnicodeCharacter{0104}{\ogonek{A}}% + \DeclareUnicodeCharacter{0105}{\ogonek{a}}% + \DeclareUnicodeCharacter{0106}{\'C}% + \DeclareUnicodeCharacter{0107}{\'c}% + \DeclareUnicodeCharacter{0108}{\^C}% + \DeclareUnicodeCharacter{0109}{\^c}% + \DeclareUnicodeCharacter{010A}{\dotaccent{C}}% + \DeclareUnicodeCharacter{010B}{\dotaccent{c}}% + \DeclareUnicodeCharacter{010C}{\v{C}}% + \DeclareUnicodeCharacter{010D}{\v{c}}% + \DeclareUnicodeCharacter{010E}{\v{D}}% + \DeclareUnicodeCharacter{010F}{d'}% + % + \DeclareUnicodeCharacter{0110}{\DH}% + \DeclareUnicodeCharacter{0111}{\dh}% + \DeclareUnicodeCharacter{0112}{\=E}% + \DeclareUnicodeCharacter{0113}{\=e}% + \DeclareUnicodeCharacter{0114}{\u{E}}% + \DeclareUnicodeCharacter{0115}{\u{e}}% + \DeclareUnicodeCharacter{0116}{\dotaccent{E}}% + \DeclareUnicodeCharacter{0117}{\dotaccent{e}}% + \DeclareUnicodeCharacter{0118}{\ogonek{E}}% + \DeclareUnicodeCharacter{0119}{\ogonek{e}}% + \DeclareUnicodeCharacter{011A}{\v{E}}% + \DeclareUnicodeCharacter{011B}{\v{e}}% + \DeclareUnicodeCharacter{011C}{\^G}% + \DeclareUnicodeCharacter{011D}{\^g}% + \DeclareUnicodeCharacter{011E}{\u{G}}% + \DeclareUnicodeCharacter{011F}{\u{g}}% + % + \DeclareUnicodeCharacter{0120}{\dotaccent{G}}% + \DeclareUnicodeCharacter{0121}{\dotaccent{g}}% + \DeclareUnicodeCharacter{0122}{\cedilla{G}}% + \DeclareUnicodeCharacter{0123}{\cedilla{g}}% + \DeclareUnicodeCharacter{0124}{\^H}% + \DeclareUnicodeCharacter{0125}{\^h}% + \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}}% + \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}}% + \DeclareUnicodeCharacter{0128}{\~I}% + \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}% + \DeclareUnicodeCharacter{012A}{\=I}% + \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}% + \DeclareUnicodeCharacter{012C}{\u{I}}% + \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}% + \DeclareUnicodeCharacter{012E}{\ogonek{I}}% + \DeclareUnicodeCharacter{012F}{\ogonek{i}}% + % + \DeclareUnicodeCharacter{0130}{\dotaccent{I}}% + \DeclareUnicodeCharacter{0131}{\dotless{i}}% + \DeclareUnicodeCharacter{0132}{IJ}% + \DeclareUnicodeCharacter{0133}{ij}% + \DeclareUnicodeCharacter{0134}{\^J}% + \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}% + \DeclareUnicodeCharacter{0136}{\cedilla{K}}% + \DeclareUnicodeCharacter{0137}{\cedilla{k}}% + \DeclareUnicodeCharacter{0138}{\ensuremath\kappa}% + \DeclareUnicodeCharacter{0139}{\'L}% + \DeclareUnicodeCharacter{013A}{\'l}% + \DeclareUnicodeCharacter{013B}{\cedilla{L}}% + \DeclareUnicodeCharacter{013C}{\cedilla{l}}% \DeclareUnicodeCharacter{013D}{L'}% should kern \DeclareUnicodeCharacter{013E}{l'}% should kern - \DeclareUnicodeCharacter{013F}{L\U{00B7}} + \DeclareUnicodeCharacter{013F}{L\U{00B7}}% % - \DeclareUnicodeCharacter{0140}{l\U{00B7}} - \DeclareUnicodeCharacter{0141}{\L} - \DeclareUnicodeCharacter{0142}{\l} - \DeclareUnicodeCharacter{0143}{\'N} - \DeclareUnicodeCharacter{0144}{\'n} - \DeclareUnicodeCharacter{0145}{\cedilla{N}} - \DeclareUnicodeCharacter{0146}{\cedilla{n}} - \DeclareUnicodeCharacter{0147}{\v{N}} - \DeclareUnicodeCharacter{0148}{\v{n}} - \DeclareUnicodeCharacter{0149}{'n} - \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}} - \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}} - \DeclareUnicodeCharacter{014C}{\=O} - \DeclareUnicodeCharacter{014D}{\=o} - \DeclareUnicodeCharacter{014E}{\u{O}} - \DeclareUnicodeCharacter{014F}{\u{o}} - % - \DeclareUnicodeCharacter{0150}{\H{O}} - \DeclareUnicodeCharacter{0151}{\H{o}} - \DeclareUnicodeCharacter{0152}{\OE} - \DeclareUnicodeCharacter{0153}{\oe} - \DeclareUnicodeCharacter{0154}{\'R} - \DeclareUnicodeCharacter{0155}{\'r} - \DeclareUnicodeCharacter{0156}{\cedilla{R}} - \DeclareUnicodeCharacter{0157}{\cedilla{r}} - \DeclareUnicodeCharacter{0158}{\v{R}} - \DeclareUnicodeCharacter{0159}{\v{r}} - \DeclareUnicodeCharacter{015A}{\'S} - \DeclareUnicodeCharacter{015B}{\'s} - \DeclareUnicodeCharacter{015C}{\^S} - \DeclareUnicodeCharacter{015D}{\^s} - \DeclareUnicodeCharacter{015E}{\cedilla{S}} - \DeclareUnicodeCharacter{015F}{\cedilla{s}} - % - \DeclareUnicodeCharacter{0160}{\v{S}} - \DeclareUnicodeCharacter{0161}{\v{s}} - \DeclareUnicodeCharacter{0162}{\cedilla{T}} - \DeclareUnicodeCharacter{0163}{\cedilla{t}} - \DeclareUnicodeCharacter{0164}{\v{T}} - \DeclareUnicodeCharacter{0165}{\v{t}} - \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}} - \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}} - \DeclareUnicodeCharacter{0168}{\~U} - \DeclareUnicodeCharacter{0169}{\~u} - \DeclareUnicodeCharacter{016A}{\=U} - \DeclareUnicodeCharacter{016B}{\=u} - \DeclareUnicodeCharacter{016C}{\u{U}} - \DeclareUnicodeCharacter{016D}{\u{u}} - \DeclareUnicodeCharacter{016E}{\ringaccent{U}} - \DeclareUnicodeCharacter{016F}{\ringaccent{u}} - % - \DeclareUnicodeCharacter{0170}{\H{U}} - \DeclareUnicodeCharacter{0171}{\H{u}} - \DeclareUnicodeCharacter{0172}{\ogonek{U}} - \DeclareUnicodeCharacter{0173}{\ogonek{u}} - \DeclareUnicodeCharacter{0174}{\^W} - \DeclareUnicodeCharacter{0175}{\^w} - \DeclareUnicodeCharacter{0176}{\^Y} - \DeclareUnicodeCharacter{0177}{\^y} - \DeclareUnicodeCharacter{0178}{\"Y} - \DeclareUnicodeCharacter{0179}{\'Z} - \DeclareUnicodeCharacter{017A}{\'z} - \DeclareUnicodeCharacter{017B}{\dotaccent{Z}} - \DeclareUnicodeCharacter{017C}{\dotaccent{z}} - \DeclareUnicodeCharacter{017D}{\v{Z}} - \DeclareUnicodeCharacter{017E}{\v{z}} - \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}} - % - \DeclareUnicodeCharacter{01C4}{D\v{Z}} - \DeclareUnicodeCharacter{01C5}{D\v{z}} - \DeclareUnicodeCharacter{01C6}{d\v{z}} - \DeclareUnicodeCharacter{01C7}{LJ} - \DeclareUnicodeCharacter{01C8}{Lj} - \DeclareUnicodeCharacter{01C9}{lj} - \DeclareUnicodeCharacter{01CA}{NJ} - \DeclareUnicodeCharacter{01CB}{Nj} - \DeclareUnicodeCharacter{01CC}{nj} - \DeclareUnicodeCharacter{01CD}{\v{A}} - \DeclareUnicodeCharacter{01CE}{\v{a}} - \DeclareUnicodeCharacter{01CF}{\v{I}} - % - \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}} - \DeclareUnicodeCharacter{01D1}{\v{O}} - \DeclareUnicodeCharacter{01D2}{\v{o}} - \DeclareUnicodeCharacter{01D3}{\v{U}} - \DeclareUnicodeCharacter{01D4}{\v{u}} - % - \DeclareUnicodeCharacter{01E2}{\={\AE}} - \DeclareUnicodeCharacter{01E3}{\={\ae}} - \DeclareUnicodeCharacter{01E6}{\v{G}} - \DeclareUnicodeCharacter{01E7}{\v{g}} - \DeclareUnicodeCharacter{01E8}{\v{K}} - \DeclareUnicodeCharacter{01E9}{\v{k}} - % - \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}} - \DeclareUnicodeCharacter{01F1}{DZ} - \DeclareUnicodeCharacter{01F2}{Dz} - \DeclareUnicodeCharacter{01F3}{dz} - \DeclareUnicodeCharacter{01F4}{\'G} - \DeclareUnicodeCharacter{01F5}{\'g} - \DeclareUnicodeCharacter{01F8}{\`N} - \DeclareUnicodeCharacter{01F9}{\`n} - \DeclareUnicodeCharacter{01FC}{\'{\AE}} - \DeclareUnicodeCharacter{01FD}{\'{\ae}} - \DeclareUnicodeCharacter{01FE}{\'{\O}} - \DeclareUnicodeCharacter{01FF}{\'{\o}} - % - \DeclareUnicodeCharacter{021E}{\v{H}} - \DeclareUnicodeCharacter{021F}{\v{h}} - % - \DeclareUnicodeCharacter{0226}{\dotaccent{A}} - \DeclareUnicodeCharacter{0227}{\dotaccent{a}} - \DeclareUnicodeCharacter{0228}{\cedilla{E}} - \DeclareUnicodeCharacter{0229}{\cedilla{e}} - \DeclareUnicodeCharacter{022E}{\dotaccent{O}} - \DeclareUnicodeCharacter{022F}{\dotaccent{o}} - % - \DeclareUnicodeCharacter{0232}{\=Y} - \DeclareUnicodeCharacter{0233}{\=y} - \DeclareUnicodeCharacter{0237}{\dotless{j}} + \DeclareUnicodeCharacter{0140}{l\U{00B7}}% + \DeclareUnicodeCharacter{0141}{\L}% + \DeclareUnicodeCharacter{0142}{\l}% + \DeclareUnicodeCharacter{0143}{\'N}% + \DeclareUnicodeCharacter{0144}{\'n}% + \DeclareUnicodeCharacter{0145}{\cedilla{N}}% + \DeclareUnicodeCharacter{0146}{\cedilla{n}}% + \DeclareUnicodeCharacter{0147}{\v{N}}% + \DeclareUnicodeCharacter{0148}{\v{n}}% + \DeclareUnicodeCharacter{0149}{'n}% + \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}}% + \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}}% + \DeclareUnicodeCharacter{014C}{\=O}% + \DeclareUnicodeCharacter{014D}{\=o}% + \DeclareUnicodeCharacter{014E}{\u{O}}% + \DeclareUnicodeCharacter{014F}{\u{o}}% + % + \DeclareUnicodeCharacter{0150}{\H{O}}% + \DeclareUnicodeCharacter{0151}{\H{o}}% + \DeclareUnicodeCharacter{0152}{\OE}% + \DeclareUnicodeCharacter{0153}{\oe}% + \DeclareUnicodeCharacter{0154}{\'R}% + \DeclareUnicodeCharacter{0155}{\'r}% + \DeclareUnicodeCharacter{0156}{\cedilla{R}}% + \DeclareUnicodeCharacter{0157}{\cedilla{r}}% + \DeclareUnicodeCharacter{0158}{\v{R}}% + \DeclareUnicodeCharacter{0159}{\v{r}}% + \DeclareUnicodeCharacter{015A}{\'S}% + \DeclareUnicodeCharacter{015B}{\'s}% + \DeclareUnicodeCharacter{015C}{\^S}% + \DeclareUnicodeCharacter{015D}{\^s}% + \DeclareUnicodeCharacter{015E}{\cedilla{S}}% + \DeclareUnicodeCharacter{015F}{\cedilla{s}}% + % + \DeclareUnicodeCharacter{0160}{\v{S}}% + \DeclareUnicodeCharacter{0161}{\v{s}}% + \DeclareUnicodeCharacter{0162}{\cedilla{T}}% + \DeclareUnicodeCharacter{0163}{\cedilla{t}}% + \DeclareUnicodeCharacter{0164}{\v{T}}% + \DeclareUnicodeCharacter{0165}{\v{t}}% + \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}}% + \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}}% + \DeclareUnicodeCharacter{0168}{\~U}% + \DeclareUnicodeCharacter{0169}{\~u}% + \DeclareUnicodeCharacter{016A}{\=U}% + \DeclareUnicodeCharacter{016B}{\=u}% + \DeclareUnicodeCharacter{016C}{\u{U}}% + \DeclareUnicodeCharacter{016D}{\u{u}}% + \DeclareUnicodeCharacter{016E}{\ringaccent{U}}% + \DeclareUnicodeCharacter{016F}{\ringaccent{u}}% + % + \DeclareUnicodeCharacter{0170}{\H{U}}% + \DeclareUnicodeCharacter{0171}{\H{u}}% + \DeclareUnicodeCharacter{0172}{\ogonek{U}}% + \DeclareUnicodeCharacter{0173}{\ogonek{u}}% + \DeclareUnicodeCharacter{0174}{\^W}% + \DeclareUnicodeCharacter{0175}{\^w}% + \DeclareUnicodeCharacter{0176}{\^Y}% + \DeclareUnicodeCharacter{0177}{\^y}% + \DeclareUnicodeCharacter{0178}{\"Y}% + \DeclareUnicodeCharacter{0179}{\'Z}% + \DeclareUnicodeCharacter{017A}{\'z}% + \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}% + \DeclareUnicodeCharacter{017C}{\dotaccent{z}}% + \DeclareUnicodeCharacter{017D}{\v{Z}}% + \DeclareUnicodeCharacter{017E}{\v{z}}% + \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}}% + % + \DeclareUnicodeCharacter{01C4}{D\v{Z}}% + \DeclareUnicodeCharacter{01C5}{D\v{z}}% + \DeclareUnicodeCharacter{01C6}{d\v{z}}% + \DeclareUnicodeCharacter{01C7}{LJ}% + \DeclareUnicodeCharacter{01C8}{Lj}% + \DeclareUnicodeCharacter{01C9}{lj}% + \DeclareUnicodeCharacter{01CA}{NJ}% + \DeclareUnicodeCharacter{01CB}{Nj}% + \DeclareUnicodeCharacter{01CC}{nj}% + \DeclareUnicodeCharacter{01CD}{\v{A}}% + \DeclareUnicodeCharacter{01CE}{\v{a}}% + \DeclareUnicodeCharacter{01CF}{\v{I}}% + % + \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}% + \DeclareUnicodeCharacter{01D1}{\v{O}}% + \DeclareUnicodeCharacter{01D2}{\v{o}}% + \DeclareUnicodeCharacter{01D3}{\v{U}}% + \DeclareUnicodeCharacter{01D4}{\v{u}}% + % + \DeclareUnicodeCharacter{01E2}{\={\AE}}% + \DeclareUnicodeCharacter{01E3}{\={\ae}}% + \DeclareUnicodeCharacter{01E6}{\v{G}}% + \DeclareUnicodeCharacter{01E7}{\v{g}}% + \DeclareUnicodeCharacter{01E8}{\v{K}}% + \DeclareUnicodeCharacter{01E9}{\v{k}}% + % + \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}% + \DeclareUnicodeCharacter{01F1}{DZ}% + \DeclareUnicodeCharacter{01F2}{Dz}% + \DeclareUnicodeCharacter{01F3}{dz}% + \DeclareUnicodeCharacter{01F4}{\'G}% + \DeclareUnicodeCharacter{01F5}{\'g}% + \DeclareUnicodeCharacter{01F8}{\`N}% + \DeclareUnicodeCharacter{01F9}{\`n}% + \DeclareUnicodeCharacter{01FC}{\'{\AE}}% + \DeclareUnicodeCharacter{01FD}{\'{\ae}}% + \DeclareUnicodeCharacter{01FE}{\'{\O}}% + \DeclareUnicodeCharacter{01FF}{\'{\o}}% + % + \DeclareUnicodeCharacter{021E}{\v{H}}% + \DeclareUnicodeCharacter{021F}{\v{h}}% + % + \DeclareUnicodeCharacter{0226}{\dotaccent{A}}% + \DeclareUnicodeCharacter{0227}{\dotaccent{a}}% + \DeclareUnicodeCharacter{0228}{\cedilla{E}}% + \DeclareUnicodeCharacter{0229}{\cedilla{e}}% + \DeclareUnicodeCharacter{022E}{\dotaccent{O}}% + \DeclareUnicodeCharacter{022F}{\dotaccent{o}}% + % + \DeclareUnicodeCharacter{0232}{\=Y}% + \DeclareUnicodeCharacter{0233}{\=y}% + \DeclareUnicodeCharacter{0237}{\dotless{j}}% % - \DeclareUnicodeCharacter{02DB}{\ogonek{ }} + \DeclareUnicodeCharacter{02DB}{\ogonek{ }}% % % Greek letters upper case - \DeclareUnicodeCharacter{0391}{{\it A}} - \DeclareUnicodeCharacter{0392}{{\it B}} - \DeclareUnicodeCharacter{0393}{\ensuremath{\mit\Gamma}} - \DeclareUnicodeCharacter{0394}{\ensuremath{\mit\Delta}} - \DeclareUnicodeCharacter{0395}{{\it E}} - \DeclareUnicodeCharacter{0396}{{\it Z}} - \DeclareUnicodeCharacter{0397}{{\it H}} - \DeclareUnicodeCharacter{0398}{\ensuremath{\mit\Theta}} - \DeclareUnicodeCharacter{0399}{{\it I}} - \DeclareUnicodeCharacter{039A}{{\it K}} - \DeclareUnicodeCharacter{039B}{\ensuremath{\mit\Lambda}} - \DeclareUnicodeCharacter{039C}{{\it M}} - \DeclareUnicodeCharacter{039D}{{\it N}} - \DeclareUnicodeCharacter{039E}{\ensuremath{\mit\Xi}} - \DeclareUnicodeCharacter{039F}{{\it O}} - \DeclareUnicodeCharacter{03A0}{\ensuremath{\mit\Pi}} - \DeclareUnicodeCharacter{03A1}{{\it P}} + \DeclareUnicodeCharacter{0391}{{\it A}}% + \DeclareUnicodeCharacter{0392}{{\it B}}% + \DeclareUnicodeCharacter{0393}{\ensuremath{\mit\Gamma}}% + \DeclareUnicodeCharacter{0394}{\ensuremath{\mit\Delta}}% + \DeclareUnicodeCharacter{0395}{{\it E}}% + \DeclareUnicodeCharacter{0396}{{\it Z}}% + \DeclareUnicodeCharacter{0397}{{\it H}}% + \DeclareUnicodeCharacter{0398}{\ensuremath{\mit\Theta}}% + \DeclareUnicodeCharacter{0399}{{\it I}}% + \DeclareUnicodeCharacter{039A}{{\it K}}% + \DeclareUnicodeCharacter{039B}{\ensuremath{\mit\Lambda}}% + \DeclareUnicodeCharacter{039C}{{\it M}}% + \DeclareUnicodeCharacter{039D}{{\it N}}% + \DeclareUnicodeCharacter{039E}{\ensuremath{\mit\Xi}}% + \DeclareUnicodeCharacter{039F}{{\it O}}% + \DeclareUnicodeCharacter{03A0}{\ensuremath{\mit\Pi}}% + \DeclareUnicodeCharacter{03A1}{{\it P}}% %\DeclareUnicodeCharacter{03A2}{} % none - corresponds to final sigma - \DeclareUnicodeCharacter{03A3}{\ensuremath{\mit\Sigma}} - \DeclareUnicodeCharacter{03A4}{{\it T}} - \DeclareUnicodeCharacter{03A5}{\ensuremath{\mit\Upsilon}} - \DeclareUnicodeCharacter{03A6}{\ensuremath{\mit\Phi}} - \DeclareUnicodeCharacter{03A7}{{\it X}} - \DeclareUnicodeCharacter{03A8}{\ensuremath{\mit\Psi}} - \DeclareUnicodeCharacter{03A9}{\ensuremath{\mit\Omega}} + \DeclareUnicodeCharacter{03A3}{\ensuremath{\mit\Sigma}}% + \DeclareUnicodeCharacter{03A4}{{\it T}}% + \DeclareUnicodeCharacter{03A5}{\ensuremath{\mit\Upsilon}}% + \DeclareUnicodeCharacter{03A6}{\ensuremath{\mit\Phi}}% + \DeclareUnicodeCharacter{03A7}{{\it X}}% + \DeclareUnicodeCharacter{03A8}{\ensuremath{\mit\Psi}}% + \DeclareUnicodeCharacter{03A9}{\ensuremath{\mit\Omega}}% % % Vowels with accents - \DeclareUnicodeCharacter{0390}{\ensuremath{\ddot{\acute\iota}}} - \DeclareUnicodeCharacter{03AC}{\ensuremath{\acute\alpha}} - \DeclareUnicodeCharacter{03AD}{\ensuremath{\acute\epsilon}} - \DeclareUnicodeCharacter{03AE}{\ensuremath{\acute\eta}} - \DeclareUnicodeCharacter{03AF}{\ensuremath{\acute\iota}} - \DeclareUnicodeCharacter{03B0}{\ensuremath{\acute{\ddot\upsilon}}} + \DeclareUnicodeCharacter{0390}{\ensuremath{\ddot{\acute\iota}}}% + \DeclareUnicodeCharacter{03AC}{\ensuremath{\acute\alpha}}% + \DeclareUnicodeCharacter{03AD}{\ensuremath{\acute\epsilon}}% + \DeclareUnicodeCharacter{03AE}{\ensuremath{\acute\eta}}% + \DeclareUnicodeCharacter{03AF}{\ensuremath{\acute\iota}}% + \DeclareUnicodeCharacter{03B0}{\ensuremath{\acute{\ddot\upsilon}}}% % % Standalone accent - \DeclareUnicodeCharacter{0384}{\ensuremath{\acute{\ }}} + \DeclareUnicodeCharacter{0384}{\ensuremath{\acute{\ }}}% % % Greek letters lower case - \DeclareUnicodeCharacter{03B1}{\ensuremath\alpha} - \DeclareUnicodeCharacter{03B2}{\ensuremath\beta} - \DeclareUnicodeCharacter{03B3}{\ensuremath\gamma} - \DeclareUnicodeCharacter{03B4}{\ensuremath\delta} - \DeclareUnicodeCharacter{03B5}{\ensuremath\epsilon} - \DeclareUnicodeCharacter{03B6}{\ensuremath\zeta} - \DeclareUnicodeCharacter{03B7}{\ensuremath\eta} - \DeclareUnicodeCharacter{03B8}{\ensuremath\theta} - \DeclareUnicodeCharacter{03B9}{\ensuremath\iota} - \DeclareUnicodeCharacter{03BA}{\ensuremath\kappa} - \DeclareUnicodeCharacter{03BB}{\ensuremath\lambda} - \DeclareUnicodeCharacter{03BC}{\ensuremath\mu} - \DeclareUnicodeCharacter{03BD}{\ensuremath\nu} - \DeclareUnicodeCharacter{03BE}{\ensuremath\xi} - \DeclareUnicodeCharacter{03BF}{{\it o}} % omicron - \DeclareUnicodeCharacter{03C0}{\ensuremath\pi} - \DeclareUnicodeCharacter{03C1}{\ensuremath\rho} - \DeclareUnicodeCharacter{03C2}{\ensuremath\varsigma} - \DeclareUnicodeCharacter{03C3}{\ensuremath\sigma} - \DeclareUnicodeCharacter{03C4}{\ensuremath\tau} - \DeclareUnicodeCharacter{03C5}{\ensuremath\upsilon} - \DeclareUnicodeCharacter{03C6}{\ensuremath\phi} - \DeclareUnicodeCharacter{03C7}{\ensuremath\chi} - \DeclareUnicodeCharacter{03C8}{\ensuremath\psi} - \DeclareUnicodeCharacter{03C9}{\ensuremath\omega} + \DeclareUnicodeCharacter{03B1}{\ensuremath\alpha}% + \DeclareUnicodeCharacter{03B2}{\ensuremath\beta}% + \DeclareUnicodeCharacter{03B3}{\ensuremath\gamma}% + \DeclareUnicodeCharacter{03B4}{\ensuremath\delta}% + \DeclareUnicodeCharacter{03B5}{\ensuremath\epsilon}% + \DeclareUnicodeCharacter{03B6}{\ensuremath\zeta}% + \DeclareUnicodeCharacter{03B7}{\ensuremath\eta}% + \DeclareUnicodeCharacter{03B8}{\ensuremath\theta}% + \DeclareUnicodeCharacter{03B9}{\ensuremath\iota}% + \DeclareUnicodeCharacter{03BA}{\ensuremath\kappa}% + \DeclareUnicodeCharacter{03BB}{\ensuremath\lambda}% + \DeclareUnicodeCharacter{03BC}{\ensuremath\mu}% + \DeclareUnicodeCharacter{03BD}{\ensuremath\nu}% + \DeclareUnicodeCharacter{03BE}{\ensuremath\xi}% + \DeclareUnicodeCharacter{03BF}{{\it o}}% omicron + \DeclareUnicodeCharacter{03C0}{\ensuremath\pi}% + \DeclareUnicodeCharacter{03C1}{\ensuremath\rho}% + \DeclareUnicodeCharacter{03C2}{\ensuremath\varsigma}% + \DeclareUnicodeCharacter{03C3}{\ensuremath\sigma}% + \DeclareUnicodeCharacter{03C4}{\ensuremath\tau}% + \DeclareUnicodeCharacter{03C5}{\ensuremath\upsilon}% + \DeclareUnicodeCharacter{03C6}{\ensuremath\phi}% + \DeclareUnicodeCharacter{03C7}{\ensuremath\chi}% + \DeclareUnicodeCharacter{03C8}{\ensuremath\psi}% + \DeclareUnicodeCharacter{03C9}{\ensuremath\omega}% % % More Greek vowels with accents - \DeclareUnicodeCharacter{03CA}{\ensuremath{\ddot\iota}} - \DeclareUnicodeCharacter{03CB}{\ensuremath{\ddot\upsilon}} - \DeclareUnicodeCharacter{03CC}{\ensuremath{\acute o}} - \DeclareUnicodeCharacter{03CD}{\ensuremath{\acute\upsilon}} - \DeclareUnicodeCharacter{03CE}{\ensuremath{\acute\omega}} + \DeclareUnicodeCharacter{03CA}{\ensuremath{\ddot\iota}}% + \DeclareUnicodeCharacter{03CB}{\ensuremath{\ddot\upsilon}}% + \DeclareUnicodeCharacter{03CC}{\ensuremath{\acute o}}% + \DeclareUnicodeCharacter{03CD}{\ensuremath{\acute\upsilon}}% + \DeclareUnicodeCharacter{03CE}{\ensuremath{\acute\omega}}% % % Variant Greek letters - \DeclareUnicodeCharacter{03D1}{\ensuremath\vartheta} - \DeclareUnicodeCharacter{03D6}{\ensuremath\varpi} - \DeclareUnicodeCharacter{03F1}{\ensuremath\varrho} - % - \DeclareUnicodeCharacter{1E02}{\dotaccent{B}} - \DeclareUnicodeCharacter{1E03}{\dotaccent{b}} - \DeclareUnicodeCharacter{1E04}{\udotaccent{B}} - \DeclareUnicodeCharacter{1E05}{\udotaccent{b}} - \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}} - \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}} - \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}} - \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}} - \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}} - \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}} - \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}} - \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}} - % - \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}} - \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}} - % - \DeclareUnicodeCharacter{1E20}{\=G} - \DeclareUnicodeCharacter{1E21}{\=g} - \DeclareUnicodeCharacter{1E22}{\dotaccent{H}} - \DeclareUnicodeCharacter{1E23}{\dotaccent{h}} - \DeclareUnicodeCharacter{1E24}{\udotaccent{H}} - \DeclareUnicodeCharacter{1E25}{\udotaccent{h}} - \DeclareUnicodeCharacter{1E26}{\"H} - \DeclareUnicodeCharacter{1E27}{\"h} - % - \DeclareUnicodeCharacter{1E30}{\'K} - \DeclareUnicodeCharacter{1E31}{\'k} - \DeclareUnicodeCharacter{1E32}{\udotaccent{K}} - \DeclareUnicodeCharacter{1E33}{\udotaccent{k}} - \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}} - \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}} - \DeclareUnicodeCharacter{1E36}{\udotaccent{L}} - \DeclareUnicodeCharacter{1E37}{\udotaccent{l}} - \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}} - \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}} - \DeclareUnicodeCharacter{1E3E}{\'M} - \DeclareUnicodeCharacter{1E3F}{\'m} - % - \DeclareUnicodeCharacter{1E40}{\dotaccent{M}} - \DeclareUnicodeCharacter{1E41}{\dotaccent{m}} - \DeclareUnicodeCharacter{1E42}{\udotaccent{M}} - \DeclareUnicodeCharacter{1E43}{\udotaccent{m}} - \DeclareUnicodeCharacter{1E44}{\dotaccent{N}} - \DeclareUnicodeCharacter{1E45}{\dotaccent{n}} - \DeclareUnicodeCharacter{1E46}{\udotaccent{N}} - \DeclareUnicodeCharacter{1E47}{\udotaccent{n}} - \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}} - \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}} - % - \DeclareUnicodeCharacter{1E54}{\'P} - \DeclareUnicodeCharacter{1E55}{\'p} - \DeclareUnicodeCharacter{1E56}{\dotaccent{P}} - \DeclareUnicodeCharacter{1E57}{\dotaccent{p}} - \DeclareUnicodeCharacter{1E58}{\dotaccent{R}} - \DeclareUnicodeCharacter{1E59}{\dotaccent{r}} - \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}} - \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}} - \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}} - \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}} - % - \DeclareUnicodeCharacter{1E60}{\dotaccent{S}} - \DeclareUnicodeCharacter{1E61}{\dotaccent{s}} - \DeclareUnicodeCharacter{1E62}{\udotaccent{S}} - \DeclareUnicodeCharacter{1E63}{\udotaccent{s}} - \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}} - \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}} - \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}} - \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}} - \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}} - \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}} - % - \DeclareUnicodeCharacter{1E7C}{\~V} - \DeclareUnicodeCharacter{1E7D}{\~v} - \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}} - \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}} - % - \DeclareUnicodeCharacter{1E80}{\`W} - \DeclareUnicodeCharacter{1E81}{\`w} - \DeclareUnicodeCharacter{1E82}{\'W} - \DeclareUnicodeCharacter{1E83}{\'w} - \DeclareUnicodeCharacter{1E84}{\"W} - \DeclareUnicodeCharacter{1E85}{\"w} - \DeclareUnicodeCharacter{1E86}{\dotaccent{W}} - \DeclareUnicodeCharacter{1E87}{\dotaccent{w}} - \DeclareUnicodeCharacter{1E88}{\udotaccent{W}} - \DeclareUnicodeCharacter{1E89}{\udotaccent{w}} - \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}} - \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}} - \DeclareUnicodeCharacter{1E8C}{\"X} - \DeclareUnicodeCharacter{1E8D}{\"x} - \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}} - \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}} - % - \DeclareUnicodeCharacter{1E90}{\^Z} - \DeclareUnicodeCharacter{1E91}{\^z} - \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}} - \DeclareUnicodeCharacter{1E93}{\udotaccent{z}} - \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}} - \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}} - \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}} - \DeclareUnicodeCharacter{1E97}{\"t} - \DeclareUnicodeCharacter{1E98}{\ringaccent{w}} - \DeclareUnicodeCharacter{1E99}{\ringaccent{y}} - % - \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}} - \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}} - % - \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}} - \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}} - \DeclareUnicodeCharacter{1EBC}{\~E} - \DeclareUnicodeCharacter{1EBD}{\~e} - % - \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}} - \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}} - \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}} - \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}} - % - \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}} - \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}} - % - \DeclareUnicodeCharacter{1EF2}{\`Y} - \DeclareUnicodeCharacter{1EF3}{\`y} - \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}} + \DeclareUnicodeCharacter{03D1}{\ensuremath\vartheta}% + \DeclareUnicodeCharacter{03D6}{\ensuremath\varpi}% + \DeclareUnicodeCharacter{03F1}{\ensuremath\varrho}% + % + \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}% + \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}% + \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}% + \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}% + \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}% + \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}% + \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}% + \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}% + \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}% + \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}% + \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}% + \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}% + % + \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}% + \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}% + % + \DeclareUnicodeCharacter{1E20}{\=G}% + \DeclareUnicodeCharacter{1E21}{\=g}% + \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}% + \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}% + \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}% + \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}% + \DeclareUnicodeCharacter{1E26}{\"H}% + \DeclareUnicodeCharacter{1E27}{\"h}% + % + \DeclareUnicodeCharacter{1E30}{\'K}% + \DeclareUnicodeCharacter{1E31}{\'k}% + \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}% + \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}% + \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}% + \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}% + \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}% + \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}% + \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}% + \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}% + \DeclareUnicodeCharacter{1E3E}{\'M}% + \DeclareUnicodeCharacter{1E3F}{\'m}% + % + \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}% + \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}% + \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}% + \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}% + \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}% + \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}% + \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}% + \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}% + \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}% + \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}% + % + \DeclareUnicodeCharacter{1E54}{\'P}% + \DeclareUnicodeCharacter{1E55}{\'p}% + \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}% + \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}% + \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}% + \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}% + \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}% + \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}% + \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}% + \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}% + % + \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}% + \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}% + \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}% + \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}% + \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}% + \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}% + \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}% + \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}% + \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}% + \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}% + % + \DeclareUnicodeCharacter{1E7C}{\~V}% + \DeclareUnicodeCharacter{1E7D}{\~v}% + \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}% + \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}% + % + \DeclareUnicodeCharacter{1E80}{\`W}% + \DeclareUnicodeCharacter{1E81}{\`w}% + \DeclareUnicodeCharacter{1E82}{\'W}% + \DeclareUnicodeCharacter{1E83}{\'w}% + \DeclareUnicodeCharacter{1E84}{\"W}% + \DeclareUnicodeCharacter{1E85}{\"w}% + \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}% + \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}% + \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}% + \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}% + \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}% + \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}% + \DeclareUnicodeCharacter{1E8C}{\"X}% + \DeclareUnicodeCharacter{1E8D}{\"x}% + \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}% + \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}% + % + \DeclareUnicodeCharacter{1E90}{\^Z}% + \DeclareUnicodeCharacter{1E91}{\^z}% + \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}% + \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}% + \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}% + \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}% + \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}% + \DeclareUnicodeCharacter{1E97}{\"t}% + \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}% + \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}% + % + \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}% + \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}% + % + \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}% + \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}% + \DeclareUnicodeCharacter{1EBC}{\~E}% + \DeclareUnicodeCharacter{1EBD}{\~e}% + % + \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}% + \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}% + \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}% + \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}% + % + \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}% + \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}% + % + \DeclareUnicodeCharacter{1EF2}{\`Y}% + \DeclareUnicodeCharacter{1EF3}{\`y}% + \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}% % - \DeclareUnicodeCharacter{1EF8}{\~Y} - \DeclareUnicodeCharacter{1EF9}{\~y} + \DeclareUnicodeCharacter{1EF8}{\~Y}% + \DeclareUnicodeCharacter{1EF9}{\~y}% % % Punctuation - \DeclareUnicodeCharacter{2013}{--} - \DeclareUnicodeCharacter{2014}{---} - \DeclareUnicodeCharacter{2018}{\quoteleft} - \DeclareUnicodeCharacter{2019}{\quoteright} - \DeclareUnicodeCharacter{201A}{\quotesinglbase} - \DeclareUnicodeCharacter{201C}{\quotedblleft} - \DeclareUnicodeCharacter{201D}{\quotedblright} - \DeclareUnicodeCharacter{201E}{\quotedblbase} - \DeclareUnicodeCharacter{2020}{\ensuremath\dagger} - \DeclareUnicodeCharacter{2021}{\ensuremath\ddagger} - \DeclareUnicodeCharacter{2022}{\bullet} - \DeclareUnicodeCharacter{202F}{\thinspace} - \DeclareUnicodeCharacter{2026}{\dots} - \DeclareUnicodeCharacter{2039}{\guilsinglleft} - \DeclareUnicodeCharacter{203A}{\guilsinglright} + \DeclareUnicodeCharacter{2013}{--}% + \DeclareUnicodeCharacter{2014}{---}% + \DeclareUnicodeCharacter{2018}{\quoteleft}% + \DeclareUnicodeCharacter{2019}{\quoteright}% + \DeclareUnicodeCharacter{201A}{\quotesinglbase}% + \DeclareUnicodeCharacter{201C}{\quotedblleft}% + \DeclareUnicodeCharacter{201D}{\quotedblright}% + \DeclareUnicodeCharacter{201E}{\quotedblbase}% + \DeclareUnicodeCharacter{2020}{\ensuremath\dagger}% + \DeclareUnicodeCharacter{2021}{\ensuremath\ddagger}% + \DeclareUnicodeCharacter{2022}{\bullet}% + \DeclareUnicodeCharacter{202F}{\thinspace}% + \DeclareUnicodeCharacter{2026}{\dots}% + \DeclareUnicodeCharacter{2039}{\guilsinglleft}% + \DeclareUnicodeCharacter{203A}{\guilsinglright}% % - \DeclareUnicodeCharacter{20AC}{\euro} + \DeclareUnicodeCharacter{20AC}{\euro}% % - \DeclareUnicodeCharacter{2192}{\expansion} - \DeclareUnicodeCharacter{21D2}{\result} + \DeclareUnicodeCharacter{2192}{\expansion}% + \DeclareUnicodeCharacter{21D2}{\result}% % % Mathematical symbols - \DeclareUnicodeCharacter{2200}{\ensuremath\forall} - \DeclareUnicodeCharacter{2203}{\ensuremath\exists} - \DeclareUnicodeCharacter{2208}{\ensuremath\in} - \DeclareUnicodeCharacter{2212}{\minus} - \DeclareUnicodeCharacter{2217}{\ast} - \DeclareUnicodeCharacter{221E}{\ensuremath\infty} - \DeclareUnicodeCharacter{2225}{\ensuremath\parallel} - \DeclareUnicodeCharacter{2227}{\ensuremath\wedge} - \DeclareUnicodeCharacter{2229}{\ensuremath\cap} - \DeclareUnicodeCharacter{2261}{\equiv} - \DeclareUnicodeCharacter{2264}{\ensuremath\leq} - \DeclareUnicodeCharacter{2265}{\ensuremath\geq} - \DeclareUnicodeCharacter{2282}{\ensuremath\subset} - \DeclareUnicodeCharacter{2287}{\ensuremath\supseteq} - % - \DeclareUnicodeCharacter{2016}{\ensuremath\Vert} - \DeclareUnicodeCharacter{2032}{\ensuremath\prime} - \DeclareUnicodeCharacter{210F}{\ensuremath\hbar} - \DeclareUnicodeCharacter{2111}{\ensuremath\Im} - \DeclareUnicodeCharacter{2113}{\ensuremath\ell} - \DeclareUnicodeCharacter{2118}{\ensuremath\wp} - \DeclareUnicodeCharacter{211C}{\ensuremath\Re} - \DeclareUnicodeCharacter{2127}{\ensuremath\mho} - \DeclareUnicodeCharacter{2135}{\ensuremath\aleph} - \DeclareUnicodeCharacter{2190}{\ensuremath\leftarrow} - \DeclareUnicodeCharacter{2191}{\ensuremath\uparrow} - \DeclareUnicodeCharacter{2193}{\ensuremath\downarrow} - \DeclareUnicodeCharacter{2194}{\ensuremath\leftrightarrow} - \DeclareUnicodeCharacter{2195}{\ensuremath\updownarrow} - \DeclareUnicodeCharacter{2196}{\ensuremath\nwarrow} - \DeclareUnicodeCharacter{2197}{\ensuremath\nearrow} - \DeclareUnicodeCharacter{2198}{\ensuremath\searrow} - \DeclareUnicodeCharacter{2199}{\ensuremath\swarrow} - \DeclareUnicodeCharacter{21A6}{\ensuremath\mapsto} - \DeclareUnicodeCharacter{21A9}{\ensuremath\hookleftarrow} - \DeclareUnicodeCharacter{21AA}{\ensuremath\hookrightarrow} - \DeclareUnicodeCharacter{21BC}{\ensuremath\leftharpoonup} - \DeclareUnicodeCharacter{21BD}{\ensuremath\leftharpoondown} - \DeclareUnicodeCharacter{21BE}{\ensuremath\upharpoonright} - \DeclareUnicodeCharacter{21C0}{\ensuremath\rightharpoonup} - \DeclareUnicodeCharacter{21C1}{\ensuremath\rightharpoondown} - \DeclareUnicodeCharacter{21CC}{\ensuremath\rightleftharpoons} - \DeclareUnicodeCharacter{21D0}{\ensuremath\Leftarrow} - \DeclareUnicodeCharacter{21D1}{\ensuremath\Uparrow} - \DeclareUnicodeCharacter{21D3}{\ensuremath\Downarrow} - \DeclareUnicodeCharacter{21D4}{\ensuremath\Leftrightarrow} - \DeclareUnicodeCharacter{21D5}{\ensuremath\Updownarrow} - \DeclareUnicodeCharacter{21DD}{\ensuremath\leadsto} - \DeclareUnicodeCharacter{2201}{\ensuremath\complement} - \DeclareUnicodeCharacter{2202}{\ensuremath\partial} - \DeclareUnicodeCharacter{2205}{\ensuremath\emptyset} - \DeclareUnicodeCharacter{2207}{\ensuremath\nabla} - \DeclareUnicodeCharacter{2209}{\ensuremath\notin} - \DeclareUnicodeCharacter{220B}{\ensuremath\owns} - \DeclareUnicodeCharacter{220F}{\ensuremath\prod} - \DeclareUnicodeCharacter{2210}{\ensuremath\coprod} - \DeclareUnicodeCharacter{2211}{\ensuremath\sum} - \DeclareUnicodeCharacter{2213}{\ensuremath\mp} - \DeclareUnicodeCharacter{2218}{\ensuremath\circ} - \DeclareUnicodeCharacter{221A}{\ensuremath\surd} - \DeclareUnicodeCharacter{221D}{\ensuremath\propto} - \DeclareUnicodeCharacter{2220}{\ensuremath\angle} - \DeclareUnicodeCharacter{2223}{\ensuremath\mid} - \DeclareUnicodeCharacter{2228}{\ensuremath\vee} - \DeclareUnicodeCharacter{222A}{\ensuremath\cup} - \DeclareUnicodeCharacter{222B}{\ensuremath\smallint} - \DeclareUnicodeCharacter{222E}{\ensuremath\oint} - \DeclareUnicodeCharacter{223C}{\ensuremath\sim} - \DeclareUnicodeCharacter{2240}{\ensuremath\wr} - \DeclareUnicodeCharacter{2243}{\ensuremath\simeq} - \DeclareUnicodeCharacter{2245}{\ensuremath\cong} - \DeclareUnicodeCharacter{2248}{\ensuremath\approx} - \DeclareUnicodeCharacter{224D}{\ensuremath\asymp} - \DeclareUnicodeCharacter{2250}{\ensuremath\doteq} - \DeclareUnicodeCharacter{2260}{\ensuremath\neq} - \DeclareUnicodeCharacter{226A}{\ensuremath\ll} - \DeclareUnicodeCharacter{226B}{\ensuremath\gg} - \DeclareUnicodeCharacter{227A}{\ensuremath\prec} - \DeclareUnicodeCharacter{227B}{\ensuremath\succ} - \DeclareUnicodeCharacter{2283}{\ensuremath\supset} - \DeclareUnicodeCharacter{2286}{\ensuremath\subseteq} - \DeclareUnicodeCharacter{228E}{\ensuremath\uplus} - \DeclareUnicodeCharacter{228F}{\ensuremath\sqsubset} - \DeclareUnicodeCharacter{2290}{\ensuremath\sqsupset} - \DeclareUnicodeCharacter{2291}{\ensuremath\sqsubseteq} - \DeclareUnicodeCharacter{2292}{\ensuremath\sqsupseteq} - \DeclareUnicodeCharacter{2293}{\ensuremath\sqcap} - \DeclareUnicodeCharacter{2294}{\ensuremath\sqcup} - \DeclareUnicodeCharacter{2295}{\ensuremath\oplus} - \DeclareUnicodeCharacter{2296}{\ensuremath\ominus} - \DeclareUnicodeCharacter{2297}{\ensuremath\otimes} - \DeclareUnicodeCharacter{2298}{\ensuremath\oslash} - \DeclareUnicodeCharacter{2299}{\ensuremath\odot} - \DeclareUnicodeCharacter{22A2}{\ensuremath\vdash} - \DeclareUnicodeCharacter{22A3}{\ensuremath\dashv} - \DeclareUnicodeCharacter{22A4}{\ensuremath\ptextop} - \DeclareUnicodeCharacter{22A5}{\ensuremath\bot} - \DeclareUnicodeCharacter{22A8}{\ensuremath\models} - \DeclareUnicodeCharacter{22B4}{\ensuremath\unlhd} - \DeclareUnicodeCharacter{22B5}{\ensuremath\unrhd} - \DeclareUnicodeCharacter{22C0}{\ensuremath\bigwedge} - \DeclareUnicodeCharacter{22C1}{\ensuremath\bigvee} - \DeclareUnicodeCharacter{22C2}{\ensuremath\bigcap} - \DeclareUnicodeCharacter{22C3}{\ensuremath\bigcup} - \DeclareUnicodeCharacter{22C4}{\ensuremath\diamond} - \DeclareUnicodeCharacter{22C5}{\ensuremath\cdot} - \DeclareUnicodeCharacter{22C6}{\ensuremath\star} - \DeclareUnicodeCharacter{22C8}{\ensuremath\bowtie} - \DeclareUnicodeCharacter{2308}{\ensuremath\lceil} - \DeclareUnicodeCharacter{2309}{\ensuremath\rceil} - \DeclareUnicodeCharacter{230A}{\ensuremath\lfloor} - \DeclareUnicodeCharacter{230B}{\ensuremath\rfloor} - \DeclareUnicodeCharacter{2322}{\ensuremath\frown} - \DeclareUnicodeCharacter{2323}{\ensuremath\smile} - % - \DeclareUnicodeCharacter{25A1}{\ensuremath\Box} - \DeclareUnicodeCharacter{25B3}{\ensuremath\triangle} - \DeclareUnicodeCharacter{25B7}{\ensuremath\triangleright} - \DeclareUnicodeCharacter{25BD}{\ensuremath\bigtriangledown} - \DeclareUnicodeCharacter{25C1}{\ensuremath\triangleleft} - \DeclareUnicodeCharacter{25C7}{\ensuremath\Diamond} - \DeclareUnicodeCharacter{2660}{\ensuremath\spadesuit} - \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit} - \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit} - \DeclareUnicodeCharacter{2663}{\ensuremath\clubsuit} - \DeclareUnicodeCharacter{266D}{\ensuremath\flat} - \DeclareUnicodeCharacter{266E}{\ensuremath\natural} - \DeclareUnicodeCharacter{266F}{\ensuremath\sharp} - \DeclareUnicodeCharacter{26AA}{\ensuremath\bigcirc} - \DeclareUnicodeCharacter{27B9}{\ensuremath\rangle} - \DeclareUnicodeCharacter{27C2}{\ensuremath\perp} - \DeclareUnicodeCharacter{27E8}{\ensuremath\langle} - \DeclareUnicodeCharacter{27F5}{\ensuremath\longleftarrow} - \DeclareUnicodeCharacter{27F6}{\ensuremath\longrightarrow} - \DeclareUnicodeCharacter{27F7}{\ensuremath\longleftrightarrow} - \DeclareUnicodeCharacter{27FC}{\ensuremath\longmapsto} - \DeclareUnicodeCharacter{29F5}{\ensuremath\setminus} - \DeclareUnicodeCharacter{2A00}{\ensuremath\bigodot} - \DeclareUnicodeCharacter{2A01}{\ensuremath\bigoplus} - \DeclareUnicodeCharacter{2A02}{\ensuremath\bigotimes} - \DeclareUnicodeCharacter{2A04}{\ensuremath\biguplus} - \DeclareUnicodeCharacter{2A06}{\ensuremath\bigsqcup} - \DeclareUnicodeCharacter{2A1D}{\ensuremath\Join} - \DeclareUnicodeCharacter{2A3F}{\ensuremath\amalg} - \DeclareUnicodeCharacter{2AAF}{\ensuremath\preceq} - \DeclareUnicodeCharacter{2AB0}{\ensuremath\succeq} - % - \global\mathchardef\checkmark="1370 % actually the square root sign - \DeclareUnicodeCharacter{2713}{\ensuremath\checkmark} -}% end of \utfeightchardefs + \DeclareUnicodeCharacter{2200}{\ensuremath\forall}% + \DeclareUnicodeCharacter{2203}{\ensuremath\exists}% + \DeclareUnicodeCharacter{2208}{\ensuremath\in}% + \DeclareUnicodeCharacter{2212}{\minus}% + \DeclareUnicodeCharacter{2217}{\ast}% + \DeclareUnicodeCharacter{221E}{\ensuremath\infty}% + \DeclareUnicodeCharacter{2225}{\ensuremath\parallel}% + \DeclareUnicodeCharacter{2227}{\ensuremath\wedge}% + \DeclareUnicodeCharacter{2229}{\ensuremath\cap}% + \DeclareUnicodeCharacter{2261}{\equiv}% + \DeclareUnicodeCharacter{2264}{\ensuremath\leq}% + \DeclareUnicodeCharacter{2265}{\ensuremath\geq}% + \DeclareUnicodeCharacter{2282}{\ensuremath\subset}% + \DeclareUnicodeCharacter{2287}{\ensuremath\supseteq}% + % + \DeclareUnicodeCharacter{2016}{\ensuremath\Vert}% + \DeclareUnicodeCharacter{2032}{\ensuremath\prime}% + \DeclareUnicodeCharacter{210F}{\ensuremath\hbar}% + \DeclareUnicodeCharacter{2111}{\ensuremath\Im}% + \DeclareUnicodeCharacter{2113}{\ensuremath\ell}% + \DeclareUnicodeCharacter{2118}{\ensuremath\wp}% + \DeclareUnicodeCharacter{211C}{\ensuremath\Re}% + \DeclareUnicodeCharacter{2127}{\ensuremath\mho}% + \DeclareUnicodeCharacter{2135}{\ensuremath\aleph}% + \DeclareUnicodeCharacter{2190}{\ensuremath\leftarrow}% + \DeclareUnicodeCharacter{2191}{\ensuremath\uparrow}% + \DeclareUnicodeCharacter{2193}{\ensuremath\downarrow}% + \DeclareUnicodeCharacter{2194}{\ensuremath\leftrightarrow}% + \DeclareUnicodeCharacter{2195}{\ensuremath\updownarrow}% + \DeclareUnicodeCharacter{2196}{\ensuremath\nwarrow}% + \DeclareUnicodeCharacter{2197}{\ensuremath\nearrow}% + \DeclareUnicodeCharacter{2198}{\ensuremath\searrow}% + \DeclareUnicodeCharacter{2199}{\ensuremath\swarrow}% + \DeclareUnicodeCharacter{21A6}{\ensuremath\mapsto}% + \DeclareUnicodeCharacter{21A9}{\ensuremath\hookleftarrow}% + \DeclareUnicodeCharacter{21AA}{\ensuremath\hookrightarrow}% + \DeclareUnicodeCharacter{21BC}{\ensuremath\leftharpoonup}% + \DeclareUnicodeCharacter{21BD}{\ensuremath\leftharpoondown}% + \DeclareUnicodeCharacter{21BE}{\ensuremath\upharpoonright}% + \DeclareUnicodeCharacter{21C0}{\ensuremath\rightharpoonup}% + \DeclareUnicodeCharacter{21C1}{\ensuremath\rightharpoondown}% + \DeclareUnicodeCharacter{21CC}{\ensuremath\rightleftharpoons}% + \DeclareUnicodeCharacter{21D0}{\ensuremath\Leftarrow}% + \DeclareUnicodeCharacter{21D1}{\ensuremath\Uparrow}% + \DeclareUnicodeCharacter{21D3}{\ensuremath\Downarrow}% + \DeclareUnicodeCharacter{21D4}{\ensuremath\Leftrightarrow}% + \DeclareUnicodeCharacter{21D5}{\ensuremath\Updownarrow}% + \DeclareUnicodeCharacter{21DD}{\ensuremath\leadsto}% + \DeclareUnicodeCharacter{2201}{\ensuremath\complement}% + \DeclareUnicodeCharacter{2202}{\ensuremath\partial}% + \DeclareUnicodeCharacter{2205}{\ensuremath\emptyset}% + \DeclareUnicodeCharacter{2207}{\ensuremath\nabla}% + \DeclareUnicodeCharacter{2209}{\ensuremath\notin}% + \DeclareUnicodeCharacter{220B}{\ensuremath\owns}% + \DeclareUnicodeCharacter{220F}{\ensuremath\prod}% + \DeclareUnicodeCharacter{2210}{\ensuremath\coprod}% + \DeclareUnicodeCharacter{2211}{\ensuremath\sum}% + \DeclareUnicodeCharacter{2213}{\ensuremath\mp}% + \DeclareUnicodeCharacter{2218}{\ensuremath\circ}% + \DeclareUnicodeCharacter{221A}{\ensuremath\surd}% + \DeclareUnicodeCharacter{221D}{\ensuremath\propto}% + \DeclareUnicodeCharacter{2220}{\ensuremath\angle}% + \DeclareUnicodeCharacter{2223}{\ensuremath\mid}% + \DeclareUnicodeCharacter{2228}{\ensuremath\vee}% + \DeclareUnicodeCharacter{222A}{\ensuremath\cup}% + \DeclareUnicodeCharacter{222B}{\ensuremath\smallint}% + \DeclareUnicodeCharacter{222E}{\ensuremath\oint}% + \DeclareUnicodeCharacter{223C}{\ensuremath\sim}% + \DeclareUnicodeCharacter{2240}{\ensuremath\wr}% + \DeclareUnicodeCharacter{2243}{\ensuremath\simeq}% + \DeclareUnicodeCharacter{2245}{\ensuremath\cong}% + \DeclareUnicodeCharacter{2248}{\ensuremath\approx}% + \DeclareUnicodeCharacter{224D}{\ensuremath\asymp}% + \DeclareUnicodeCharacter{2250}{\ensuremath\doteq}% + \DeclareUnicodeCharacter{2260}{\ensuremath\neq}% + \DeclareUnicodeCharacter{226A}{\ensuremath\ll}% + \DeclareUnicodeCharacter{226B}{\ensuremath\gg}% + \DeclareUnicodeCharacter{227A}{\ensuremath\prec}% + \DeclareUnicodeCharacter{227B}{\ensuremath\succ}% + \DeclareUnicodeCharacter{2283}{\ensuremath\supset}% + \DeclareUnicodeCharacter{2286}{\ensuremath\subseteq}% + \DeclareUnicodeCharacter{228E}{\ensuremath\uplus}% + \DeclareUnicodeCharacter{228F}{\ensuremath\sqsubset}% + \DeclareUnicodeCharacter{2290}{\ensuremath\sqsupset}% + \DeclareUnicodeCharacter{2291}{\ensuremath\sqsubseteq}% + \DeclareUnicodeCharacter{2292}{\ensuremath\sqsupseteq}% + \DeclareUnicodeCharacter{2293}{\ensuremath\sqcap}% + \DeclareUnicodeCharacter{2294}{\ensuremath\sqcup}% + \DeclareUnicodeCharacter{2295}{\ensuremath\oplus}% + \DeclareUnicodeCharacter{2296}{\ensuremath\ominus}% + \DeclareUnicodeCharacter{2297}{\ensuremath\otimes}% + \DeclareUnicodeCharacter{2298}{\ensuremath\oslash}% + \DeclareUnicodeCharacter{2299}{\ensuremath\odot}% + \DeclareUnicodeCharacter{22A2}{\ensuremath\vdash}% + \DeclareUnicodeCharacter{22A3}{\ensuremath\dashv}% + \DeclareUnicodeCharacter{22A4}{\ensuremath\ptextop}% + \DeclareUnicodeCharacter{22A5}{\ensuremath\bot}% + \DeclareUnicodeCharacter{22A8}{\ensuremath\models}% + \DeclareUnicodeCharacter{22B4}{\ensuremath\unlhd}% + \DeclareUnicodeCharacter{22B5}{\ensuremath\unrhd}% + \DeclareUnicodeCharacter{22C0}{\ensuremath\bigwedge}% + \DeclareUnicodeCharacter{22C1}{\ensuremath\bigvee}% + \DeclareUnicodeCharacter{22C2}{\ensuremath\bigcap}% + \DeclareUnicodeCharacter{22C3}{\ensuremath\bigcup}% + \DeclareUnicodeCharacter{22C4}{\ensuremath\diamond}% + \DeclareUnicodeCharacter{22C5}{\ensuremath\cdot}% + \DeclareUnicodeCharacter{22C6}{\ensuremath\star}% + \DeclareUnicodeCharacter{22C8}{\ensuremath\bowtie}% + \DeclareUnicodeCharacter{2308}{\ensuremath\lceil}% + \DeclareUnicodeCharacter{2309}{\ensuremath\rceil}% + \DeclareUnicodeCharacter{230A}{\ensuremath\lfloor}% + \DeclareUnicodeCharacter{230B}{\ensuremath\rfloor}% + \DeclareUnicodeCharacter{2322}{\ensuremath\frown}% + \DeclareUnicodeCharacter{2323}{\ensuremath\smile}% + % + \DeclareUnicodeCharacter{25A1}{\ensuremath\Box}% + \DeclareUnicodeCharacter{25B3}{\ensuremath\triangle}% + \DeclareUnicodeCharacter{25B7}{\ensuremath\triangleright}% + \DeclareUnicodeCharacter{25BD}{\ensuremath\bigtriangledown}% + \DeclareUnicodeCharacter{25C1}{\ensuremath\triangleleft}% + \DeclareUnicodeCharacter{25C7}{\ensuremath\Diamond}% + \DeclareUnicodeCharacter{2660}{\ensuremath\spadesuit}% + \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit}% + \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit}% + \DeclareUnicodeCharacter{2663}{\ensuremath\clubsuit}% + \DeclareUnicodeCharacter{266D}{\ensuremath\flat}% + \DeclareUnicodeCharacter{266E}{\ensuremath\natural}% + \DeclareUnicodeCharacter{266F}{\ensuremath\sharp}% + \DeclareUnicodeCharacter{26AA}{\ensuremath\bigcirc}% + \DeclareUnicodeCharacter{27B9}{\ensuremath\rangle}% + \DeclareUnicodeCharacter{27C2}{\ensuremath\perp}% + \DeclareUnicodeCharacter{27E8}{\ensuremath\langle}% + \DeclareUnicodeCharacter{27F5}{\ensuremath\longleftarrow}% + \DeclareUnicodeCharacter{27F6}{\ensuremath\longrightarrow}% + \DeclareUnicodeCharacter{27F7}{\ensuremath\longleftrightarrow}% + \DeclareUnicodeCharacter{27FC}{\ensuremath\longmapsto}% + \DeclareUnicodeCharacter{29F5}{\ensuremath\setminus}% + \DeclareUnicodeCharacter{2A00}{\ensuremath\bigodot}% + \DeclareUnicodeCharacter{2A01}{\ensuremath\bigoplus}% + \DeclareUnicodeCharacter{2A02}{\ensuremath\bigotimes}% + \DeclareUnicodeCharacter{2A04}{\ensuremath\biguplus}% + \DeclareUnicodeCharacter{2A06}{\ensuremath\bigsqcup}% + \DeclareUnicodeCharacter{2A1D}{\ensuremath\Join}% + \DeclareUnicodeCharacter{2A3F}{\ensuremath\amalg}% + \DeclareUnicodeCharacter{2AAF}{\ensuremath\preceq}% + \DeclareUnicodeCharacter{2AB0}{\ensuremath\succeq}% + % + \global\mathchardef\checkmark="1370% actually the square root sign + \DeclareUnicodeCharacter{2713}{\ensuremath\checkmark}% +}% end of \unicodechardefs -% US-ASCII character definitions. -\def\asciichardefs{% nothing need be done - \relax +% UTF-8 byte sequence (pdfTeX) definitions (replacing and @U command) +% It makes the setting that replace UTF-8 byte sequence. +\def\utfeightchardefs{% + \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterUTFviii + \unicodechardefs } -% Latin1 (ISO-8859-1) character definitions. -\def\nonasciistringdefs{% - \setnonasciicharscatcode\active - \def\defstringchar##1{\def##1{\string##1}}% - % - \defstringchar^^80\defstringchar^^81\defstringchar^^82\defstringchar^^83% - \defstringchar^^84\defstringchar^^85\defstringchar^^86\defstringchar^^87% - \defstringchar^^88\defstringchar^^89\defstringchar^^8a\defstringchar^^8b% - \defstringchar^^8c\defstringchar^^8d\defstringchar^^8e\defstringchar^^8f% - % - \defstringchar^^90\defstringchar^^91\defstringchar^^92\defstringchar^^93% - \defstringchar^^94\defstringchar^^95\defstringchar^^96\defstringchar^^97% - \defstringchar^^98\defstringchar^^99\defstringchar^^9a\defstringchar^^9b% - \defstringchar^^9c\defstringchar^^9d\defstringchar^^9e\defstringchar^^9f% - % - \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3% - \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7% - \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab% - \defstringchar^^ac\defstringchar^^ad\defstringchar^^ae\defstringchar^^af% - % - \defstringchar^^b0\defstringchar^^b1\defstringchar^^b2\defstringchar^^b3% - \defstringchar^^b4\defstringchar^^b5\defstringchar^^b6\defstringchar^^b7% - \defstringchar^^b8\defstringchar^^b9\defstringchar^^ba\defstringchar^^bb% - \defstringchar^^bc\defstringchar^^bd\defstringchar^^be\defstringchar^^bf% - % - \defstringchar^^c0\defstringchar^^c1\defstringchar^^c2\defstringchar^^c3% - \defstringchar^^c4\defstringchar^^c5\defstringchar^^c6\defstringchar^^c7% - \defstringchar^^c8\defstringchar^^c9\defstringchar^^ca\defstringchar^^cb% - \defstringchar^^cc\defstringchar^^cd\defstringchar^^ce\defstringchar^^cf% - % - \defstringchar^^d0\defstringchar^^d1\defstringchar^^d2\defstringchar^^d3% - \defstringchar^^d4\defstringchar^^d5\defstringchar^^d6\defstringchar^^d7% - \defstringchar^^d8\defstringchar^^d9\defstringchar^^da\defstringchar^^db% - \defstringchar^^dc\defstringchar^^dd\defstringchar^^de\defstringchar^^df% - % - \defstringchar^^e0\defstringchar^^e1\defstringchar^^e2\defstringchar^^e3% - \defstringchar^^e4\defstringchar^^e5\defstringchar^^e6\defstringchar^^e7% - \defstringchar^^e8\defstringchar^^e9\defstringchar^^ea\defstringchar^^eb% - \defstringchar^^ec\defstringchar^^ed\defstringchar^^ee\defstringchar^^ef% - % - \defstringchar^^f0\defstringchar^^f1\defstringchar^^f2\defstringchar^^f3% - \defstringchar^^f4\defstringchar^^f5\defstringchar^^f6\defstringchar^^f7% - \defstringchar^^f8\defstringchar^^f9\defstringchar^^fa\defstringchar^^fb% - \defstringchar^^fc\defstringchar^^fd\defstringchar^^fe\defstringchar^^ff% +% Whether the active definitions of non-ASCII characters expand to +% non-active tokens with the same character code. This is used to +% write characters literally, instead of using active definitions for +% printing the correct glyphs. +\newif\ifpassthroughchars +\passthroughcharsfalse + +% For native Unicode (XeTeX and LuaTeX) +% Definition macro to replace / pass-through the Unicode character +% +\def\DeclareUnicodeCharacterNative#1#2{% + \catcode"#1=\active + \def\dodeclareunicodecharacternative##1##2##3{% + \begingroup + \uccode`\~="##2\relax + \uppercase{\gdef~}{% + \ifpassthroughchars + ##1% + \else + ##3% + \fi + } + \endgroup + } + \begingroup + \uccode`\.="#1\relax + \uppercase{\def\UTFNativeTmp{.}}% + \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}% + \endgroup +} + +% Native Unicode (XeTeX and LuaTeX) character replacing definitions +% It makes the setting that replace the Unicode characters. +\def\nativeunicodechardefs{% + \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNative + \unicodechardefs +} + +% For native Unicode (XeTeX and LuaTeX). Make the character token expand +% to the sequences given in \unicodechardefs for printing. +\def\DeclareUnicodeCharacterNativeAtU#1#2{% + \def\UTFAtUTmp{#2} + \expandafter\globallet\csname uni:#1\endcsname \UTFAtUTmp +} + +% Native Unicode (XeTeX and LuaTeX) @U command definitions +\def\nativeunicodechardefsatu{% + \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNativeAtU + \unicodechardefs } +% US-ASCII character definitions. +\def\asciichardefs{% nothing need be done + \relax +} % define all the unicode characters we know about, for the sake of @U. -\utfeightchardefs +\iftxinativeunicodecapable + \nativeunicodechardefsatu +\else + \utfeightchardefs +\fi % Make non-ASCII characters printable again for compatibility with @@ -10716,12 +11131,12 @@ \advance\vsize by \topskip \outervsize = \vsize \advance\outervsize by 2\topandbottommargin - \pageheight = \vsize + \txipageheight = \vsize % \hsize = #2\relax \outerhsize = \hsize \advance\outerhsize by 0.5in - \pagewidth = \hsize + \txipagewidth = \hsize % \normaloffset = #4\relax \bindingoffset = #5\relax @@ -10733,6 +11148,13 @@ % whatever layout pdftex was dumped with. \pdfhorigin = 1 true in \pdfvorigin = 1 true in + \else + \ifx\XeTeXrevision\thisisundefined + \else + \pdfpageheight #7\relax + \pdfpagewidth #8\relax + % XeTeX does not have \pdfhorigin and \pdfvorigin. + \fi \fi % \setleading{\textleading} @@ -11007,7 +11429,7 @@ % {@catcode`- = @active @gdef@normalturnoffactive{% - @nonasciistringdefs + @passthroughcharstrue @let-=@normaldash @let"=@normaldoublequote @let$=@normaldollar %$ font-lock fix @@ -11045,9 +11467,10 @@ @global@let\ = @eatinput% @catcode`@^^M=13% @def@c{@fixbackslash@c}% + % Definition for the newline at the end of this file. @def ^^M{@let^^M@secondlinenl}% - @gdef @secondlinenl{@let^^M@thirdlinenl}% - @gdef @thirdlinenl{@fixbackslash}% + % Definition for a newline in the main Texinfo file. + @gdef @secondlinenl{@fixbackslash}% }} {@catcode`@^=7 @catcode`@^^M=13% diff -Nru grep-2.24/cfg.mk grep-2.25/cfg.mk --- grep-2.24/cfg.mk 2016-03-06 01:12:17.000000000 +0000 +++ grep-2.25/cfg.mk 2016-03-11 06:09:12.000000000 +0000 @@ -55,7 +55,7 @@ # 1127556 9e export XZ_OPT = -6e -old_NEWS_hash = 3379d61dae538c411df7438f5e2fb6ad +old_NEWS_hash = 7225c806189eaa7ffd4c744e3248d0a5 # Many m4 macros names once began with 'jm_'. # Make sure that none are inadvertently reintroduced. diff -Nru grep-2.24/ChangeLog grep-2.25/ChangeLog --- grep-2.24/ChangeLog 2016-03-11 05:39:36.000000000 +0000 +++ grep-2.25/ChangeLog 2016-04-22 04:38:07.000000000 +0000 @@ -1,5 +1,143 @@ +2016-04-21 Jim Meyering + + version 2.25 + * NEWS: Record release date. + +2016-04-19 Paul Eggert + + dfa: remove dependency on btowc + MirOS BSD btowc is a macro that (when GCC is being used) hardcodes + btowc (0x80) == WEOF regardless of locale, which contradicts + future POSIX in the C locale. Instead of bothering to develop a + Gnulib workaround for the btowc incompatibility, use mbrtowc, + which we are using elsewhere and fixing anyway, and are caching so + it is fast here. Problem reported by Nelson H. F. Beebe via Jim + Meyering in: http://bugs.gnu.org/23269#14 + * bootstrap.conf (gnulib_modules): Remove btowc. + * src/dfa.c (struct dfa): Remove mbrtowc_cache member, replacing with ... + (mbrtowc_cache): ... this new static var. All uses changed. + (dfambcache): Remove; now done by setsyntax. Call removed. + (is_valid_unibyte_character): Remove. + (IS_WORD_CONSTITUENT): Remove this macro, replacing it with ... + (unibyte_word_constituent): ... this new function. It uses + mbrtowc_cache rather than btowc. + (dfasyntax): Initialize mbrtowc_cache before using it. + +2016-04-10 Paul Eggert + + grep: minor doc tweaks inspired by Debian + Problem reported by Santiago Ruano Rincón in: http://bugs.gnu.org/22911 + * doc/grep.in.1: + * doc/grep.texi (Matching Control, grep Programs) + (Regular Expressions): + Document -e, -f, and PCRE more carefully. + +2016-04-10 Jim Meyering + + maint: remove unused mbtoupper function + * src/searchutils.c (mbtoupper): Remove now-unused function. + Also remove inclusion of , since this change removed + the final use of assert. + * src/search.h (mbtoupper): Remove declaration. + +2016-04-10 Paul Eggert + + grep: in C locale, all bytes are valid characters + This works around glibc bug 19932: + https://sourceware.org/bugzilla/show_bug.cgi?id=19932 + The actual bug fix was the update to the current version of Gnulib. + grep problem reported by Björn Jacke in: http://bugs.gnu.org/23234 + * NEWS: Mention this. + * doc/grep.texi (File and Directory Selection): Crossref to LC_* + section. Suggest why -a or LC_ALL=C might be useful. + (Environment Variables): Mention 'locale -a'. + Say that LC_CTYPE also specifies encoding, and that every + byte is a valid character in the C or POSIX locale. + * tests/c-locale: New test. + * tests/Makefile.am (TESTS): Add it. + + build: update gnulib submodule to latest + +2016-04-05 Paul Eggert + + Give another example of binary file processing + Problem reported by Shlomi Fish + * doc/grep.texi (File and Directory Selection): + Document that 'q$' might match 'q' followed by a NUL + if --binary-files=binary is in effect. + +2016-04-03 Paul Eggert + + tests: test egrep/fgrep help only if our grep + Problem reported by Christian Weisgerber in: http://bugs.gnu.org/23146 + * tests/Makefile.am (TESTS_ENVIRONMENT): + Test egrep and fgrep only if they use our grep. + +2016-03-29 Jim Meyering + + tests: remove spurious test of egrep + * tests/reversed-range-endpoints: Do not test egrep here. + There is already a test of grep -E. + Prompted by http://bugs.gnu.org/23146 + +2016-03-23 Paul Eggert + + grep: -Pz no longer misdiagnoses [^a] + Problem reported by Michael Jess. + * NEWS: Document this. + * src/pcresearch.c (Pcompile): Do not diagnose [^ when [ is unescaped. + * tests/pcre: Test for the bug. + +2016-03-22 Jim Meyering + + maint: move new 'Improvements' blurb into proper section + * NEWS (Improvements): Move this new section from within the block + for the already-released 2.24 into the proper "next-release" block. + Also, retain the 2-blank-line separator between blocks. + +2016-03-18 Jim Meyering + + maint: avoid spurious "binary file ... matches" in generated THANKS + * Makefile.am (THANKS): Don't apply grep to a stream containing + NUL bytes. Sync this rule from the one in coreutils: it was missing + some improvements. + Reported by Bailes Magio in http://bugs.gnu.org/22899 + +2016-03-18 Paul Eggert + + grep: -oz now outputs null bytes, not newlines + * NEWS: Document this. + * doc/grep.texi (Other Options): Clarify that -z affects output + as well as input data. + * src/grep.c (print_line_middle): Output eolbyte, not newline, if -o. + * tests/null-byte: Test -o too. + * tests/pcre-context: Adjust test to match new behavior. + +2016-03-17 Paul Eggert + + grep: use errno consistently in write diagnostics + Feature request and initial version reported by Assaf Gordon in: + http://bugs.gnu.org/23031 + * NEWS: Document this. + * src/grep.c: Include . + (stdout_errno): New static var. + (write_error_seen): Remove; superseded by stdout_errno. + All uses changed. + (putchar_errno, fputs_errno, printf_errno, fwrite_errno) + (fflush_errno): New static functions. + (print_filename, print_sep, print_offset, print_line_head) + (print_line_middle, print_line_tail, prline, prtext, grep) + (grepdesc): Use them. + * tests/write-error-msg: New file. + * tests/Makefile.am (TESTS): Add it. + 2016-03-10 Jim Meyering + maint: post-release administrivia + * NEWS: Add header line for next release. + * .prev-version: Record previous version. + * cfg.mk (old_NEWS_hash): Auto-update. + version 2.24 * NEWS: Record release date. diff -Nru grep-2.24/config.hin grep-2.25/config.hin --- grep-2.24/config.hin 2016-03-07 17:49:06.000000000 +0000 +++ grep-2.25/config.hin 2016-04-22 04:03:06.000000000 +0000 @@ -35,6 +35,9 @@ /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA +/* Define to 1 if the C locale may have encoding errors. */ +#undef C_LOCALE_MAYBE_EILSEQ + /* Define as the bit index in the word where to find bit 0 of the exponent of 'double'. */ #undef DBL_EXPBIT0_BIT @@ -1819,6 +1822,12 @@ used. */ #undef __GETOPT_PREFIX +/* Define to 1 if the system predates C++11. */ +#undef __STDC_CONSTANT_MACROS + +/* Define to 1 if the system predates C++11. */ +#undef __STDC_LIMIT_MACROS + /* Define to empty if `const' does not conform to ANSI C. */ #undef const @@ -1868,6 +1877,7 @@ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ : (199901L <= __STDC_VERSION__ \ && !defined __HP_cc \ + && !defined __PGI \ && !(defined __SUNPRO_C && __STDC__))) \ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) # define _GL_INLINE inline diff -Nru grep-2.24/configure grep-2.25/configure --- grep-2.24/configure 2016-03-11 05:38:43.000000000 +0000 +++ grep-2.25/configure 2016-04-22 04:37:19.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69.147-5ad35 for GNU grep 2.24. +# Generated by GNU Autoconf 2.69.147-5ad35 for GNU grep 2.25. # # Report bugs to . # @@ -565,8 +565,8 @@ # Identity of this package. PACKAGE_NAME='GNU grep' PACKAGE_TARNAME='grep' -PACKAGE_VERSION='2.24' -PACKAGE_STRING='GNU grep 2.24' +PACKAGE_VERSION='2.25' +PACKAGE_STRING='GNU grep 2.25' PACKAGE_BUGREPORT='bug-grep@gnu.org' PACKAGE_URL='http://www.gnu.org/software/grep/' @@ -2090,7 +2090,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU grep 2.24 to adapt to many kinds of systems. +\`configure' configures GNU grep 2.25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2161,7 +2161,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU grep 2.24:";; + short | recursive ) echo "Configuration of GNU grep 2.25:";; esac cat <<\_ACEOF @@ -2288,7 +2288,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU grep configure 2.24 +GNU grep configure 2.25 generated by GNU Autoconf 2.69.147-5ad35 Copyright (C) 2015 Free Software Foundation, Inc. @@ -2925,7 +2925,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU grep $as_me 2.24, which was +It was created by GNU grep $as_me 2.25, which was generated by GNU Autoconf 2.69.147-5ad35. Invocation command line was $ $0 $@ @@ -3930,7 +3930,7 @@ # Define the identity of the package. PACKAGE='grep' - VERSION='2.24' + VERSION='2.25' cat >>confdefs.h <<_ACEOF @@ -6988,6 +6988,7 @@ # Code from module gnumakefile: # Code from module gnupload: # Code from module gperf: + # Code from module hard-locale: # Code from module hash: # Code from module hash-pjw: # Code from module hash-tests: @@ -9868,6 +9869,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +# include # if HAVE_UNISTD_H # include # else /* on Windows with MSVC */ @@ -9896,6 +9898,7 @@ return 3; if (f[1] != '\0') return 4; + free (f); return 0; } #endif @@ -12388,6 +12391,8 @@ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ +#define __STDC_CONSTANT_MACROS 1 +#define __STDC_LIMIT_MACROS 1 #include /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in . */ #if !(defined WCHAR_MIN && defined WCHAR_MAX) @@ -12558,6 +12563,8 @@ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ +#define __STDC_CONSTANT_MACROS 1 +#define __STDC_LIMIT_MACROS 1 #include @@ -12645,6 +12652,60 @@ printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; } fi if test "$gl_cv_header_working_stdint_h" = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5 +printf %s "checking whether stdint.h predates C++11... " >&6; } +if test ${gl_cv_header_stdint_predates_cxx11_h+y} +then : + printf %s "(cached) " >&6 +else + gl_cv_header_stdint_predates_cxx11_h=yes + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ +#include + + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + + +intmax_t im = INTMAX_MAX; +int32_t i32 = INT32_C (0x7fffffff); + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_header_stdint_predates_cxx11_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_predates_cxx11_h" >&5 +printf "%s\n" "$gl_cv_header_stdint_predates_cxx11_h" >&6; } + + if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then + +printf "%s\n" "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h + + +printf "%s\n" "#define __STDC_LIMIT_MACROS 1" >>confdefs.h + + fi STDINT_H= else for ac_header in sys/inttypes.h sys/bitypes.h @@ -15194,7 +15255,10 @@ int main (void) { -return ! malloc (0); +char *p = malloc (0); + int result = !p; + free (p); + return result; ; return 0; } @@ -16251,6 +16315,63 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5 printf "%s\n" "$gl_cv_func_mbrtowc_empty_input" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5 +printf %s "checking whether the C locale is free of encoding errors... " >&6; } +if test ${gl_cv_C_locale_sans_EILSEQ+y} +then : + printf %s "(cached) " >&6 +else + + gl_cv_C_locale_sans_EILSEQ="guessing no" + + if test "$cross_compiling" = yes +then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include + +int +main (void) +{ + + int i; + char *locale = setlocale (LC_ALL, "C"); + if (! locale) + return 1; + for (i = CHAR_MIN; i <= CHAR_MAX; i++) + { + char c = i; + wchar_t wc; + mbstate_t mbs = { 0, }; + size_t ss = mbrtowc (&wc, &c, 1, &mbs); + if (1 < ss) + return 1; + } + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_C_locale_sans_EILSEQ=yes +else + gl_cv_C_locale_sans_EILSEQ=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_C_locale_sans_EILSEQ" >&5 +printf "%s\n" "$gl_cv_C_locale_sans_EILSEQ" >&6; } + case "$gl_cv_func_mbrtowc_null_arg1" in *yes) ;; *) @@ -16291,6 +16412,14 @@ REPLACE_MBRTOWC=1 ;; esac + case $gl_cv_C_locale_sans_EILSEQ in + *yes) ;; + *) +printf "%s\n" "#define C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h + + REPLACE_MBRTOWC=1 + ;; + esac fi fi @@ -19374,6 +19503,7 @@ return 3; if (e->d_ino != st.st_ino) return 4; + closedir (dp); return 0; ; @@ -21957,6 +22087,9 @@ : + : + + @@ -23524,7 +23657,10 @@ int main (void) { -return ! malloc (0); +char *p = malloc (0); + int result = !p; + free (p); + return result; ; return 0; } @@ -24311,6 +24447,63 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5 printf "%s\n" "$gl_cv_func_mbrtowc_empty_input" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5 +printf %s "checking whether the C locale is free of encoding errors... " >&6; } +if test ${gl_cv_C_locale_sans_EILSEQ+y} +then : + printf %s "(cached) " >&6 +else + + gl_cv_C_locale_sans_EILSEQ="guessing no" + + if test "$cross_compiling" = yes +then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include + +int +main (void) +{ + + int i; + char *locale = setlocale (LC_ALL, "C"); + if (! locale) + return 1; + for (i = CHAR_MIN; i <= CHAR_MAX; i++) + { + char c = i; + wchar_t wc; + mbstate_t mbs = { 0, }; + size_t ss = mbrtowc (&wc, &c, 1, &mbs); + if (1 < ss) + return 1; + } + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_C_locale_sans_EILSEQ=yes +else + gl_cv_C_locale_sans_EILSEQ=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_C_locale_sans_EILSEQ" >&5 +printf "%s\n" "$gl_cv_C_locale_sans_EILSEQ" >&6; } + case "$gl_cv_func_mbrtowc_null_arg1" in *yes) ;; *) @@ -24351,6 +24544,14 @@ REPLACE_MBRTOWC=1 ;; esac + case $gl_cv_C_locale_sans_EILSEQ in + *yes) ;; + *) +printf "%s\n" "#define C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h + + REPLACE_MBRTOWC=1 + ;; + esac fi fi @@ -25946,7 +26147,10 @@ int main (void) { -return ! realloc (0, 0); +char *p = realloc (0, 0); + int result = !p; + free (p); + return result; ; return 0; } @@ -26142,6 +26346,7 @@ 0, sizeof data - 1, ®s) != -1) result |= 1; + regfree (®ex); } { @@ -26173,6 +26378,7 @@ if (i != 0 && i != 21) result |= 1; } + regfree (®ex); } if (! setlocale (LC_ALL, "C")) @@ -38167,7 +38373,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU grep $as_me 2.24, which was +This file was extended by GNU grep $as_me 2.25, which was generated by GNU Autoconf 2.69.147-5ad35. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -38239,7 +38445,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`printf "%s\n" "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU grep config.status 2.24 +GNU grep config.status 2.25 configured by $0, generated by GNU Autoconf 2.69.147-5ad35, with options \\"\$ac_cs_config\\" diff -Nru grep-2.24/debian/changelog grep-2.25/debian/changelog --- grep-2.24/debian/changelog 2016-03-12 11:22:24.000000000 +0000 +++ grep-2.25/debian/changelog 2016-04-28 06:02:10.000000000 +0000 @@ -1,3 +1,20 @@ +grep (2.25-1~16.04.1) xenial-proposed; urgency=medium + + * New upstream release. + - Don't switch into binary mode when encountering non-ASCII characters + and running in the C locale. (LP: #1547466) + + -- Martin Pitt Thu, 28 Apr 2016 08:01:38 +0200 + +grep (2.25-1) unstable; urgency=medium + + * New upstream release. + - Treat all characters as valid in C or POSIX locales. Closes: #800670. + * Remove 80-587930-man-ere-reference.patch + * Update 81-356120-document-multiple-e.patch + + -- Santiago Ruano Rincón Fri, 22 Apr 2016 11:24:39 +0200 + grep (2.24-1) unstable; urgency=medium * New upstream release. diff -Nru grep-2.24/debian/patches/80-587930-man-ere-reference.patch grep-2.25/debian/patches/80-587930-man-ere-reference.patch --- grep-2.24/debian/patches/80-587930-man-ere-reference.patch 2016-03-04 18:53:41.000000000 +0000 +++ grep-2.25/debian/patches/80-587930-man-ere-reference.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ ---- a/doc/grep.texi -+++ b/doc/grep.texi -@@ -1102,7 +1102,7 @@ - @opindex -P - @opindex --perl-regexp - @cindex matching Perl regular expressions --Interpret the pattern as a Perl regular expression. -+Interpret the pattern as a Perl regular expression (PCRE). - This is highly experimental and - @samp{grep@ -P} may warn of unimplemented features. - -@@ -1127,7 +1127,7 @@ - by using various operators to combine smaller expressions. - @command{grep} understands - three different versions of regular expression syntax: --``basic,'' (BRE) ``extended'' (ERE) and ``perl''. -+``basic,'' (BRE) ``extended'' (ERE) and ``perl'' (PCRE). - In GNU @command{grep}, - there is no difference in available functionality between the basic and - extended syntaxes. diff -Nru grep-2.24/debian/patches/81-356120-document-multiple-e.patch grep-2.25/debian/patches/81-356120-document-multiple-e.patch --- grep-2.24/debian/patches/81-356120-document-multiple-e.patch 2016-03-04 17:02:24.000000000 +0000 +++ grep-2.25/debian/patches/81-356120-document-multiple-e.patch 2016-04-22 09:34:22.000000000 +0000 @@ -14,48 +14,3 @@ .RI [ FILE .\|.\|.] . .SH DESCRIPTION -@@ -112,8 +111,10 @@ - Use - .I PATTERN - as the pattern. --This can be used to specify multiple search patterns, --or to protect a pattern beginning with a hyphen -+Multiple -+.BR \-e -+can be used to specify different search patterns. -+This option is also useful to protect a pattern beginning with a hyphen - .RB ( \- ). - .TP - .BI \-f " FILE" "\fR,\fP \-\^\-file=" FILE -@@ -121,6 +122,9 @@ - .IR FILE , - one per line. - The empty file contains zero patterns, and therefore matches nothing. -+Multiple -+.BR \-f -+can be used to specify different files. - .TP - .BR \-i ", " \-\^\-ignore\-case - Ignore case distinctions in both the ---- a/doc/grep.texi -+++ b/doc/grep.texi -@@ -175,8 +175,9 @@ - @opindex --regexp=@var{pattern} - @cindex pattern list - Use @var{pattern} as the pattern. --This can be used to specify multiple search patterns, --or to protect a pattern beginning with a @samp{-}. -+Multiple @option{-e} can be used to specify different search patterns. -+This option is also useful to protect a pattern beginning with a -+@samp{-}. - (@option{-e} is specified by POSIX.) - - @item -f @var{file} -@@ -186,6 +187,7 @@ - @cindex pattern from file - Obtain patterns from @var{file}, one per line. - The empty file contains zero patterns, and therefore matches nothing. -+Multiple @option{-f} can be used to specify different files. - (@option{-f} is specified by POSIX.) - - @item -i diff -Nru grep-2.24/debian/patches/series grep-2.25/debian/patches/series --- grep-2.24/debian/patches/series 2016-03-06 18:09:21.000000000 +0000 +++ grep-2.25/debian/patches/series 2016-04-22 09:30:29.000000000 +0000 @@ -1,5 +1,4 @@ 02-man_rgrep.patch 03-397262-dlopen-pcre.patch 05-grep-wrapper-sh.patch -80-587930-man-ere-reference.patch 81-356120-document-multiple-e.patch diff -Nru grep-2.24/doc/grep.in.1 grep-2.25/doc/grep.in.1 --- grep-2.24/doc/grep.in.1 2016-01-01 22:45:41.000000000 +0000 +++ grep-2.25/doc/grep.in.1 2016-04-13 21:06:17.000000000 +0000 @@ -98,9 +98,7 @@ This is the default. .TP .BR \-P ", " \-\^\-perl\-regexp -Interpret -.I PATTERN -as a Perl regular expression (PCRE, see below). +Interpret the pattern as a Perl-compatible regular expression (PCRE). This is highly experimental and .B "grep \-P" may warn of unimplemented features. @@ -110,14 +108,20 @@ Use .I PATTERN as the pattern. -This can be used to specify multiple search patterns, -or to protect a pattern beginning with a hyphen -.RB ( \- ). +If this option is used multiple times or is combined with the +.B \-f +.RB ( \-\-file ) +option, search for all patterns given. +This option can be used to protect a pattern beginning with \*(lq\-\*(rq. .TP .BI \-f " FILE" "\fR,\fP \-\^\-file=" FILE Obtain patterns from .IR FILE , one per line. +If this option is used multiple times or is combined with the +.B \-e +.RB ( \-\-regexp ) +option, search for all patterns given. The empty file contains zero patterns, and therefore matches nothing. .TP .BR \-i ", " \-\^\-ignore\-case @@ -545,7 +549,7 @@ In other implementations, basic regular expressions are less powerful. The following description applies to extended regular expressions; differences for basic regular expressions are summarized afterwards. -Perl regular expressions give additional functionality, and are +Perl-compatible regular expressions give additional functionality, and are documented in pcresyntax(3) and pcrepattern(3), but work only if PCRE is available in the system. .PP diff -Nru grep-2.24/doc/grep.info grep-2.25/doc/grep.info --- grep-2.24/doc/grep.info 2016-03-11 05:38:50.000000000 +0000 +++ grep-2.25/doc/grep.info 2016-04-22 04:37:25.000000000 +0000 @@ -23,7 +23,7 @@ ‘grep’ prints lines that contain a match for a pattern. - This manual is for version 2.24 of GNU Grep. + This manual is for version 2.25 of GNU Grep. This manual is for ‘grep’, a pattern matching engine. @@ -135,15 +135,17 @@ ‘-e PATTERN’ ‘--regexp=PATTERN’ - Use PATTERN as the pattern. This can be used to specify multiple - search patterns, or to protect a pattern beginning with a ‘-’. - (‘-e’ is specified by POSIX.) + Use PATTERN as the pattern. If this option is used multiple times + or is combined with the ‘-f’ (‘--file’) option, search for all + patterns given. (‘-e’ is specified by POSIX.) ‘-f FILE’ ‘--file=FILE’ - Obtain patterns from FILE, one per line. The empty file contains - zero patterns, and therefore matches nothing. (‘-f’ is specified - by POSIX.) + Obtain patterns from FILE, one per line. If this option is used + multiple times or is combined with the ‘-e’ (‘--regexp’) option, + search for all patterns given. The empty file contains zero + patterns, and therefore matches nothing. (‘-f’ is specified by + POSIX.) ‘-i’ ‘-y’ @@ -428,18 +430,14 @@ If a file’s data or metadata indicate that the file contains binary data, assume that the file is of type TYPE. Non-text bytes indicate binary data; these are either output bytes that are - improperly encoded for the current locale, or null input bytes when - the ‘-z’ (‘--null-data’) option is not given (*note Other - Options::). + improperly encoded for the current locale (*note Environment + Variables::), or null input bytes when the ‘-z’ (‘--null-data’) + option is not given (*note Other Options::). By default, TYPE is ‘binary’, and when ‘grep’ discovers that a file is binary it suppresses any further output, and instead outputs either a one-line message saying that a binary file matches, or no - message if there is no match. When processing binary data, ‘grep’ - may treat non-text bytes as line terminators; for example, the - pattern ‘.’ (period) might not match a null byte, as the null byte - might be treated as a line terminator even without the ‘-z’ - (‘--null-data’) option. + message if there is no match. If TYPE is ‘without-match’, when ‘grep’ discovers that a file is binary it assumes that the rest of the file does not match; this is @@ -448,9 +446,22 @@ If TYPE is ‘text’, ‘grep’ processes a binary file as if it were text; this is equivalent to the ‘-a’ option. - _Warning:_ ‘--binary-files=text’ might output binary garbage, which - can have nasty side effects if the output is a terminal and if the - terminal driver interprets some of it as commands. + When TYPE is ‘binary’, ‘grep’ may treat non-text bytes as line + terminators even without the ‘-z’ (‘--null-data’) option. This + means choosing ‘binary’ versus ‘text’ can affect whether a pattern + matches a file. For example, when TYPE is ‘binary’ the pattern + ‘q$’ might match ‘q’ immediately followed by a null byte, even + though this is not matched when TYPE is ‘text’. Conversely, when + TYPE is ‘binary’ the pattern ‘.’ (period) might not match a null + byte. + + _Warning:_ The ‘-a’ (‘--binary-files=text’) option might output + binary garbage, which can have nasty side effects if the output is + a terminal and if the terminal driver interprets some of it as + commands. On the other hand, when reading files whose text + encodings are unknown, it can be helpful to use ‘-a’ or to set + ‘LC_ALL='C'’ in the environment, in order to find more matches even + if the matches are unsafe for direct display. ‘-D ACTION’ ‘--devices=ACTION’ @@ -540,10 +551,10 @@ ‘-z’ ‘--null-data’ - Treat the input as a set of lines, each terminated by a zero byte - (the ASCII NUL character) instead of a newline. Like the ‘-Z’ or - ‘--null’ option, this option can be used with commands like ‘sort - -z’ to process arbitrary file names. + Treat input and output data as sequences of lines, each terminated + by a zero byte (the ASCII NUL character) instead of a newline. + Like the ‘-Z’ or ‘--null’ option, this option can be used with + commands like ‘sort -z’ to process arbitrary file names.  File: grep.info-t, Node: Environment Variables, Next: Exit Status, Prev: Command-line Options, Up: Invoking @@ -564,7 +575,8 @@ overrides the three environment variables that ordinarily specify the ‘LC_MESSAGES’ category. The ‘C’ locale is used if none of these environment variables are set, if the locale catalog is not installed, -or if ‘grep’ was not compiled with national language support (NLS). +or if ‘grep’ was not compiled with national language support (NLS). The +shell command ‘locale -a’ lists locales that are currently available. Many of the environment variables in the following list let you control highlighting using Select Graphic Rendition (SGR) commands @@ -714,7 +726,10 @@ ‘LANG’ These variables specify the locale for the ‘LC_CTYPE’ category, which determines the type of characters, e.g., which characters are - whitespace. + whitespace. This category also determines the character encoding, + that is, whether text is encoded in UTF-8, ASCII, or some other + encoding. In the ‘C’ or ‘POSIX’ locale, all characters are encoded + as a single byte and every byte is a valid character. ‘LANGUAGE’ ‘LC_ALL’ @@ -786,8 +801,9 @@ ‘-P’ ‘--perl-regexp’ - Interpret the pattern as a Perl regular expression. This is highly - experimental and ‘grep -P’ may warn of unimplemented features. + Interpret the pattern as a Perl-compatible regular expression + (PCRE). This is highly experimental and ‘grep -P’ may warn of + unimplemented features. In addition, two variant programs ‘egrep’ and ‘fgrep’ are available. ‘egrep’ is the same as ‘grep -E’. ‘fgrep’ is the same as ‘grep -F’. @@ -805,13 +821,13 @@ Regular expressions are constructed analogously to arithmetic expressions, by using various operators to combine smaller expressions. ‘grep’ understands three different versions of regular expression -syntax: “basic,” (BRE) “extended” (ERE) and “perl”. In GNU ‘grep’, -there is no difference in available functionality between the basic and -extended syntaxes. In other implementations, basic regular expressions -are less powerful. The following description applies to extended -regular expressions; differences for basic regular expressions are -summarized afterwards. Perl regular expressions give additional -functionality, and are documented in the pcresyntax(3) and +syntax: “basic” (BRE), “extended” (ERE) and “perl” (PCRE). In GNU +‘grep’, there is no difference in available functionality between the +basic and extended syntaxes. In other implementations, basic regular +expressions are less powerful. The following description applies to +extended regular expressions; differences for basic regular expressions +are summarized afterwards. Perl-compatible regular expressions give +additional functionality, and are documented in the pcresyntax(3) and pcrepattern(3) manual pages, but work only if PCRE is available in the system. @@ -1845,17 +1861,17 @@ * --count: General Output Control. (line 8) * --dereference-recursive: File and Directory Selection. - (line 99) + (line 108) * --devices: File and Directory Selection. - (line 41) + (line 50) * --directories: File and Directory Selection. - (line 52) + (line 61) * --exclude: File and Directory Selection. - (line 63) + (line 72) * --exclude-dir: File and Directory Selection. - (line 76) + (line 85) * --exclude-from: File and Directory Selection. - (line 72) + (line 81) * --extended-regexp: grep Programs. (line 20) * --file: Matching Control. (line 14) * --files-with-matches: General Output Control. @@ -1869,18 +1885,18 @@ (line 29) * --help: Generic Program Information. (line 7) -* --ignore-case: Matching Control. (line 21) +* --ignore-case: Matching Control. (line 23) * --include: File and Directory Selection. - (line 86) + (line 95) * --initial-tab: Output Line Prefix Control. (line 43) -* --invert-match: Matching Control. (line 40) +* --invert-match: Matching Control. (line 42) * --label: Output Line Prefix Control. (line 30) * --line-buffered: Other Options. (line 7) * --line-number: Output Line Prefix Control. (line 38) -* --line-regexp: Matching Control. (line 55) +* --line-regexp: Matching Control. (line 57) * --max-count: General Output Control. (line 42) * --no-filename: Output Line Prefix Control. @@ -1896,7 +1912,7 @@ * --quiet: General Output Control. (line 80) * --recursive: File and Directory Selection. - (line 91) + (line 100) * --regexp=PATTERN: Matching Control. (line 8) * --silent: General Output Control. (line 80) @@ -1908,7 +1924,7 @@ (line 12) * --with-filename: Output Line Prefix Control. (line 20) -* --word-regexp: Matching Control. (line 45) +* --word-regexp: Matching Control. (line 47) * -A: Context Line Control. (line 13) * -a: File and Directory Selection. @@ -1922,9 +1938,9 @@ * -C: Context Line Control. (line 22) * -D: File and Directory Selection. - (line 41) + (line 50) * -d: File and Directory Selection. - (line 52) + (line 61) * -e: Matching Control. (line 8) * -E: grep Programs. (line 20) * -f: Matching Control. (line 14) @@ -1934,7 +1950,7 @@ (line 20) * -h: Output Line Prefix Control. (line 25) -* -i: Matching Control. (line 21) +* -i: Matching Control. (line 23) * -L: General Output Control. (line 29) * -l: General Output Control. @@ -1951,9 +1967,9 @@ * -q: General Output Control. (line 80) * -r: File and Directory Selection. - (line 91) + (line 100) * -R: File and Directory Selection. - (line 99) + (line 108) * -s: General Output Control. (line 87) * -T: Output Line Prefix Control. @@ -1963,10 +1979,10 @@ * -U: Other Options. (line 12) * -V: Generic Program Information. (line 12) -* -v: Matching Control. (line 40) -* -w: Matching Control. (line 45) -* -x: Matching Control. (line 55) -* -y: Matching Control. (line 21) +* -v: Matching Control. (line 42) +* -w: Matching Control. (line 47) +* -x: Matching Control. (line 57) +* -y: Matching Control. (line 23) * -Z: Output Line Prefix Control. (line 63) * -z: Other Options. (line 25) @@ -1975,7 +1991,7 @@ * ?: Fundamental Structure. (line 18) * _N_GNU_nonoption_argv_flags_ environment variable: Environment Variables. - (line 189) + (line 193) * {,M}: Fundamental Structure. (line 33) * {N,M}: Fundamental Structure. @@ -2014,7 +2030,7 @@ * blank characters: Character Classes and Bracket Expressions. (line 39) * bn GREP_COLORS capability: Environment Variables. - (line 133) + (line 134) * braces, first argument omitted: Fundamental Structure. (line 33) * braces, one argument: Fundamental Structure. @@ -2031,7 +2047,7 @@ (line 12) * byte offsets, on MS-DOS/MS-Windows: Output Line Prefix Control. (line 53) -* case insensitive search: Matching Control. (line 21) +* case insensitive search: Matching Control. (line 23) * changing name of standard input: Output Line Prefix Control. (line 30) * character class: Character Classes and Bracket Expressions. @@ -2039,7 +2055,7 @@ * character classes: Character Classes and Bracket Expressions. (line 28) * character type: Environment Variables. - (line 160) + (line 161) * classes of characters: Character Classes and Bracket Expressions. (line 28) * cntrl character class: Character Classes and Bracket Expressions. @@ -2056,46 +2072,46 @@ * counting lines: General Output Control. (line 8) * cx GREP_COLORS capability: Environment Variables. - (line 84) + (line 85) * default options environment variable: Environment Variables. - (line 44) + (line 45) * device search: File and Directory Selection. - (line 41) + (line 50) * digit character class: Character Classes and Bracket Expressions. (line 47) * digit characters: Character Classes and Bracket Expressions. (line 47) * directory search: File and Directory Selection. - (line 52) + (line 61) * dot: Fundamental Structure. (line 15) * environment variables: Environment Variables. - (line 43) + (line 44) * exclude directories: File and Directory Selection. - (line 76) + (line 85) * exclude files: File and Directory Selection. - (line 63) -* exclude files <1>: File and Directory Selection. (line 72) +* exclude files <1>: File and Directory Selection. + (line 81) * exit status: Exit Status. (line 6) * FAQ about ‘grep’ usage: Usage. (line 17) * files which don’t match: General Output Control. (line 29) * fn GREP_COLORS capability: Environment Variables. - (line 123) + (line 124) * fn GREP_COLORS capability <1>: Environment Variables. - (line 138) + (line 139) * graph character class: Character Classes and Bracket Expressions. (line 50) * graphic characters: Character Classes and Bracket Expressions. (line 50) * ‘grep’ programs: grep Programs. (line 6) * GREP_COLOR environment variable: Environment Variables. - (line 57) + (line 58) * GREP_COLORS environment variable: Environment Variables. - (line 68) + (line 69) * GREP_OPTIONS environment variable: Environment Variables. - (line 44) + (line 45) * group separator: Context Line Control. (line 25) * group separator <1>: Context Line Control. @@ -2103,50 +2119,50 @@ * hexadecimal digits: Character Classes and Bracket Expressions. (line 74) * highlight markers: Environment Variables. - (line 57) + (line 58) * highlight markers <1>: Environment Variables. - (line 68) + (line 69) * highlight, color, colour: General Output Control. (line 14) * include files: File and Directory Selection. - (line 86) + (line 95) * interval specifications: Basic vs Extended. (line 10) -* invert matching: Matching Control. (line 40) +* invert matching: Matching Control. (line 42) * LANG environment variable: Environment Variables. (line 9) * LANG environment variable <1>: Environment Variables. - (line 160) + (line 161) * LANG environment variable <2>: Environment Variables. - (line 167) + (line 168) * LANG environment variable <3>: Environment Variables. - (line 175) + (line 179) * LANGUAGE environment variable: Environment Variables. (line 9) * LANGUAGE environment variable <1>: Environment Variables. - (line 175) + (line 179) * language of messages: Environment Variables. - (line 175) + (line 179) * LC_ALL environment variable: Environment Variables. (line 9) * LC_ALL environment variable <1>: Environment Variables. - (line 160) + (line 161) * LC_ALL environment variable <2>: Environment Variables. - (line 167) + (line 168) * LC_ALL environment variable <3>: Environment Variables. - (line 175) + (line 179) * LC_COLLATE environment variable: Environment Variables. - (line 160) + (line 161) * LC_CTYPE environment variable: Environment Variables. - (line 167) + (line 168) * LC_MESSAGES environment variable: Environment Variables. (line 9) * LC_MESSAGES environment variable <1>: Environment Variables. - (line 175) + (line 179) * line buffering: Other Options. (line 7) * line numbering: Output Line Prefix Control. (line 38) * ln GREP_COLORS capability: Environment Variables. - (line 128) + (line 129) * lower character class: Character Classes and Bracket Expressions. (line 53) * lower-case letters: Character Classes and Bracket Expressions. @@ -2165,35 +2181,36 @@ (line 24) * match expression zero or more times: Fundamental Structure. (line 21) -* match the whole line: Matching Control. (line 55) +* match the whole line: Matching Control. (line 57) * matching basic regular expressions: grep Programs. (line 15) * matching extended regular expressions: grep Programs. (line 20) * matching fixed strings: grep Programs. (line 25) -* matching Perl regular expressions: grep Programs. (line 31) -* matching whole words: Matching Control. (line 45) +* matching Perl-compatible regular expressions: grep Programs. + (line 31) +* matching whole words: Matching Control. (line 47) * max-count: General Output Control. (line 42) * mc GREP_COLORS capability: Environment Variables. - (line 115) + (line 116) * message language: Environment Variables. - (line 175) + (line 179) * ms GREP_COLORS capability: Environment Variables. - (line 107) + (line 108) * MS-DOS/MS-Windows binary files: Other Options. (line 12) * MS-DOS/MS-Windows byte offsets: Output Line Prefix Control. (line 53) * mt GREP_COLORS capability: Environment Variables. - (line 99) + (line 100) * names of matching files: General Output Control. (line 35) * national language support: Environment Variables. - (line 160) + (line 161) * national language support <1>: Environment Variables. - (line 175) + (line 179) * ne GREP_COLORS capability: Environment Variables. - (line 145) + (line 146) * NLS: Environment Variables. - (line 160) + (line 161) * no filename prefix: Output Line Prefix Control. (line 25) * numeric characters: Character Classes and Bracket Expressions. @@ -2208,10 +2225,10 @@ * plus sign: Fundamental Structure. (line 24) * POSIXLY_CORRECT environment variable: Environment Variables. - (line 180) + (line 184) * print character class: Character Classes and Bracket Expressions. (line 57) -* print non-matching lines: Matching Control. (line 40) +* print non-matching lines: Matching Control. (line 42) * printable characters: Character Classes and Bracket Expressions. (line 57) * punct character class: Character Classes and Bracket Expressions. @@ -2225,26 +2242,26 @@ * range expression: Character Classes and Bracket Expressions. (line 12) * recursive search: File and Directory Selection. - (line 91) + (line 100) * recursive search <1>: File and Directory Selection. - (line 99) + (line 108) * regular expressions: Regular Expressions. (line 6) * return status: Exit Status. (line 6) * rv GREP_COLORS capability: Environment Variables. - (line 93) + (line 94) * searching directory trees: File and Directory Selection. - (line 63) -* searching directory trees <1>: File and Directory Selection. (line 72) +* searching directory trees <1>: File and Directory Selection. + (line 81) * searching directory trees <2>: File and Directory Selection. - (line 86) + (line 95) * searching directory trees <3>: File and Directory Selection. - (line 91) + (line 100) * searching directory trees <4>: File and Directory Selection. - (line 99) + (line 108) * searching for a pattern: Introduction. (line 6) * sl GREP_COLORS capability: Environment Variables. - (line 76) + (line 77) * space character class: Character Classes and Bracket Expressions. (line 65) * space characters: Character Classes and Bracket Expressions. @@ -2256,15 +2273,15 @@ * suppress error messages: General Output Control. (line 87) * symbolic links: File and Directory Selection. - (line 52) + (line 61) * symbolic links <1>: File and Directory Selection. - (line 91) + (line 100) * symbolic links <2>: File and Directory Selection. - (line 99) + (line 108) * tab-aligned content lines: Output Line Prefix Control. (line 43) * translation of message language: Environment Variables. - (line 175) + (line 179) * upper character class: Character Classes and Bracket Expressions. (line 70) * upper-case letters: Character Classes and Bracket Expressions. @@ -2297,28 +2314,28 @@ Node: Command-line Options3414 Node: Generic Program Information4299 Node: Matching Control4775 -Node: General Output Control7338 -Ref: General Output Control-Footnote-111469 -Node: Output Line Prefix Control11538 -Node: Context Line Control14600 -Node: File and Directory Selection16531 -Node: Other Options21404 -Node: Environment Variables22697 -Node: Exit Status32634 -Node: grep Programs33114 -Node: Regular Expressions34669 -Node: Fundamental Structure35855 -Node: Character Classes and Bracket Expressions37663 -Ref: invalid-bracket-expr41085 -Node: The Backslash Character and Special Expressions42325 -Node: Anchoring43399 -Node: Back-references and Subexpressions43860 -Node: Basic vs Extended44600 -Node: Usage45693 -Node: Reporting Bugs53173 -Node: Copying53857 -Node: GNU Free Documentation License54985 -Node: Index80290 +Node: General Output Control7498 +Ref: General Output Control-Footnote-111629 +Node: Output Line Prefix Control11698 +Node: Context Line Control14760 +Node: File and Directory Selection16691 +Node: Other Options22133 +Node: Environment Variables23441 +Node: Exit Status33720 +Node: grep Programs34200 +Node: Regular Expressions35777 +Node: Fundamental Structure36980 +Node: Character Classes and Bracket Expressions38788 +Ref: invalid-bracket-expr42210 +Node: The Backslash Character and Special Expressions43450 +Node: Anchoring44524 +Node: Back-references and Subexpressions44985 +Node: Basic vs Extended45725 +Node: Usage46818 +Node: Reporting Bugs54298 +Node: Copying54982 +Node: GNU Free Documentation License56110 +Node: Index81415  End Tag Table diff -Nru grep-2.24/doc/grep.texi grep-2.25/doc/grep.texi --- grep-2.24/doc/grep.texi 2016-01-28 08:00:05.000000000 +0000 +++ grep-2.25/doc/grep.texi 2016-04-13 21:06:17.000000000 +0000 @@ -175,8 +175,8 @@ @opindex --regexp=@var{pattern} @cindex pattern list Use @var{pattern} as the pattern. -This can be used to specify multiple search patterns, -or to protect a pattern beginning with a @samp{-}. +If this option is used multiple times or is combined with the +@option{-f} (@option{--file}) option, search for all patterns given. (@option{-e} is specified by POSIX.) @item -f @var{file} @@ -185,6 +185,8 @@ @opindex --file @cindex pattern from file Obtain patterns from @var{file}, one per line. +If this option is used multiple times or is combined with the +@option{-e} (@option{--regexp}) option, search for all patterns given. The empty file contains zero patterns, and therefore matches nothing. (@option{-f} is specified by POSIX.) @@ -599,7 +601,8 @@ indicate that the file contains binary data, assume that the file is of type @var{type}. Non-text bytes indicate binary data; these are either output bytes that are -improperly encoded for the current locale, or null input bytes when the +improperly encoded for the current locale (@pxref{Environment +Variables}), or null input bytes when the @option{-z} (@option{--null-data}) option is not given (@pxref{Other Options}). @@ -607,10 +610,6 @@ discovers that a file is binary it suppresses any further output, and instead outputs either a one-line message saying that a binary file matches, or no message if there is no match. -When processing binary data, @command{grep} may treat non-text bytes -as line terminators; for example, the pattern @samp{.} (period) might -not match a null byte, as the null byte might be treated as a line -terminator even without the @option{-z} (@option{--null-data}) option. If @var{type} is @samp{without-match}, when @command{grep} discovers that a file is binary @@ -621,10 +620,23 @@ @command{grep} processes a binary file as if it were text; this is equivalent to the @option{-a} option. -@emph{Warning:} @samp{--binary-files=text} might output binary garbage, -which can have nasty side effects -if the output is a terminal and -if the terminal driver interprets some of it as commands. +When @var{type} is @samp{binary}, @command{grep} may treat non-text +bytes as line terminators even without the @option{-z} +(@option{--null-data}) option. This means choosing @samp{binary} +versus @samp{text} can affect whether a pattern matches a file. For +example, when @var{type} is @samp{binary} the pattern @samp{q$} might +match @samp{q} immediately followed by a null byte, even though this +is not matched when @var{type} is @samp{text}. Conversely, when +@var{type} is @samp{binary} the pattern @samp{.} (period) might not +match a null byte. + +@emph{Warning:} The @option{-a} (@option{--binary-files=text}) option +might output binary garbage, which can have nasty side effects if the +output is a terminal and if the terminal driver interprets some of it +as commands. On the other hand, when reading files whose text +encodings are unknown, it can be helpful to use @option{-a} or to set +@samp{LC_ALL='C'} in the environment, in order to find more matches +even if the matches are unsafe for direct display. @item -D @var{action} @itemx --devices=@var{action} @@ -762,8 +774,8 @@ @opindex -z @opindex --null-data @cindex zero-terminated lines -Treat the input as a set of lines, each terminated by a zero byte (the -ASCII NUL character) instead of a newline. +Treat input and output data as sequences of lines, each terminated by +a zero byte (the ASCII NUL character) instead of a newline. Like the @option{-Z} or @option{--null} option, this option can be used with commands like @samp{sort -z} to process arbitrary file names. @@ -797,6 +809,7 @@ if the locale catalog is not installed, or if @command{grep} was not compiled with national language support (NLS). +The shell command @code{locale -a} lists locales that are currently available. Many of the environment variables in the following list let you control highlighting using @@ -998,6 +1011,10 @@ These variables specify the locale for the @env{LC_CTYPE} category, which determines the type of characters, e.g., which characters are whitespace. +This category also determines the character encoding, that is, whether +text is encoded in UTF-8, ASCII, or some other encoding. In the +@samp{C} or @samp{POSIX} locale, all characters are encoded as a +single byte and every byte is a valid character. @item LANGUAGE @itemx LC_ALL @@ -1101,8 +1118,8 @@ @itemx --perl-regexp @opindex -P @opindex --perl-regexp -@cindex matching Perl regular expressions -Interpret the pattern as a Perl regular expression. +@cindex matching Perl-compatible regular expressions +Interpret the pattern as a Perl-compatible regular expression (PCRE). This is highly experimental and @samp{grep@ -P} may warn of unimplemented features. @@ -1127,16 +1144,16 @@ by using various operators to combine smaller expressions. @command{grep} understands three different versions of regular expression syntax: -``basic,'' (BRE) ``extended'' (ERE) and ``perl''. +``basic'' (BRE), ``extended'' (ERE) and ``perl'' (PCRE). In GNU @command{grep}, there is no difference in available functionality between the basic and extended syntaxes. In other implementations, basic regular expressions are less powerful. The following description applies to extended regular expressions; differences for basic regular expressions are summarized afterwards. -Perl regular expressions give additional functionality, and are -documented in the @i{pcresyntax}(3) and @i{pcrepattern}(3) manual pages, -but work only if PCRE is available in the system. +Perl-compatible regular expressions give additional functionality, and +are documented in the @i{pcresyntax}(3) and @i{pcrepattern}(3) manual +pages, but work only if PCRE is available in the system. @menu * Fundamental Structure:: diff -Nru grep-2.24/doc/Makefile.in grep-2.25/doc/Makefile.in --- grep-2.24/doc/Makefile.in 2016-03-07 17:49:07.000000000 +0000 +++ grep-2.25/doc/Makefile.in 2016-04-22 04:03:07.000000000 +0000 @@ -134,7 +134,8 @@ $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/i-ring.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/i-ring.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/iconv_open.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ diff -Nru grep-2.24/doc/stamp-vti grep-2.25/doc/stamp-vti --- grep-2.24/doc/stamp-vti 2016-03-11 05:38:50.000000000 +0000 +++ grep-2.25/doc/stamp-vti 2016-04-22 04:37:24.000000000 +0000 @@ -1,4 +1,4 @@ -@set UPDATED 28 January 2016 -@set UPDATED-MONTH January 2016 -@set EDITION 2.24 -@set VERSION 2.24 +@set UPDATED 13 April 2016 +@set UPDATED-MONTH April 2016 +@set EDITION 2.25 +@set VERSION 2.25 diff -Nru grep-2.24/doc/version.texi grep-2.25/doc/version.texi --- grep-2.24/doc/version.texi 2016-03-11 05:38:50.000000000 +0000 +++ grep-2.25/doc/version.texi 2016-04-22 04:37:24.000000000 +0000 @@ -1,4 +1,4 @@ -@set UPDATED 28 January 2016 -@set UPDATED-MONTH January 2016 -@set EDITION 2.24 -@set VERSION 2.24 +@set UPDATED 13 April 2016 +@set UPDATED-MONTH April 2016 +@set EDITION 2.25 +@set VERSION 2.25 diff -Nru grep-2.24/gnulib-tests/init.sh grep-2.25/gnulib-tests/init.sh --- grep-2.24/gnulib-tests/init.sh 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/gnulib-tests/init.sh 2016-04-10 16:49:32.000000000 +0000 @@ -308,13 +308,19 @@ fi } fi -elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then +elif + for diff_opt_ in -U3 -c '' no; do + test "$diff_opt_" = no && break + diff_out_=`exec 2>/dev/null; diff $diff_opt_ "$0" "$0" diff.out; then + if diff $diff_opt_ "$@" > diff.out; then # No differences were found, but AIX and HP-UX 'diff' produce output # "No differences encountered" or "There are no differences between the # files.". Hide this output. @@ -466,7 +472,6 @@ fi initial_cwd_=$PWD - fail=0 pfx_=`testdir_prefix_` test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \ @@ -550,8 +555,9 @@ # Disallow any trailing slash on specified destdir: # it would subvert the post-mktemp "case"-based destdir test. case $destdir_ in - /) ;; + / | //) destdir_slash_=$destdir;; */) fail_ "invalid destination dir: remove trailing slash(es)";; + *) destdir_slash_=$destdir_/;; esac case $template_ in @@ -561,20 +567,17 @@ esac # First, try to use mktemp. - d=`unset TMPDIR; { mktemp -d -t -p "$destdir_" "$template_"; } 2>/dev/null` \ - || fail=1 + d=`unset TMPDIR; { mktemp -d -t -p "$destdir_" "$template_"; } 2>/dev/null` && # The resulting name must be in the specified directory. - case $d in "$destdir_"*);; *) fail=1;; esac + case $d in "$destdir_slash_"*) :;; *) false;; esac && # It must have created the directory. - test -d "$d" || fail=1 + test -d "$d" && # It must have 0700 permissions. Handle sticky "S" bits. - perms=`ls -dgo "$d" 2>/dev/null|tr S -` || fail=1 - case $perms in drwx------*) ;; *) fail=1;; esac - - test $fail = 0 && { + perms=`ls -dgo "$d" 2>/dev/null` && + case $perms in drwx--[-S]---*) :;; *) false;; esac && { echo "$d" return } @@ -593,7 +596,7 @@ i_=1 while :; do X_=`rand_bytes_ $nx_` - candidate_dir_="$destdir_/$base_template_$X_" + candidate_dir_="$destdir_slash_$base_template_$X_" err_=`mkdir -m 0700 "$candidate_dir_" 2>&1` \ && { echo "$candidate_dir_"; return; } test $MAX_TRIES_ -le $i_ && break; diff -Nru grep-2.24/gnulib-tests/Makefile.in grep-2.25/gnulib-tests/Makefile.in --- grep-2.24/gnulib-tests/Makefile.in 2016-03-07 17:49:07.000000000 +0000 +++ grep-2.25/gnulib-tests/Makefile.in 2016-04-22 04:03:07.000000000 +0000 @@ -258,7 +258,8 @@ $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/i-ring.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/i-ring.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/iconv_open.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ diff -Nru grep-2.24/gnulib-tests/setlocale.c grep-2.25/gnulib-tests/setlocale.c --- grep-2.24/gnulib-tests/setlocale.c 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/gnulib-tests/setlocale.c 2016-04-10 16:49:32.000000000 +0000 @@ -381,6 +381,7 @@ { "sq", "Albanian" }, { "sr", "Serbian (Latin)" }, { "sr@cyrillic", "SRB" }, /* Serbian (Cyrillic) */ + { "sv", "Swedish" }, { "sw", "Swahili" }, { "syr", "Syriac" }, { "ta", "Tamil" }, diff -Nru grep-2.24/gnulib-tests/test-inttostr.c grep-2.25/gnulib-tests/test-inttostr.c --- grep-2.24/gnulib-tests/test-inttostr.c 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/gnulib-tests/test-inttostr.c 2016-04-10 16:49:32.000000000 +0000 @@ -84,9 +84,11 @@ CK (off_t, offtostr); CK (uintmax_t, umaxtostr); CK (intmax_t, imaxtostr); + free (b); return 0; } /* snprintf doesn't accept %ju; skip this test. */ + free (b); return 77; } diff -Nru grep-2.24/gnulib-tests/test-localename.c grep-2.25/gnulib-tests/test-localename.c --- grep-2.24/gnulib-tests/test-localename.c 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/gnulib-tests/test-localename.c 2016-04-10 16:49:32.000000000 +0000 @@ -183,6 +183,8 @@ ASSERT (strcmp (name, "fr_FR.UTF-8") == 0); name = gl_locale_name (LC_MESSAGES, "LC_MESSAGES"); ASSERT (strcmp (name, "fr_FR.UTF-8") == 0); + uselocale (LC_GLOBAL_LOCALE); + freelocale (locale); } } @@ -194,11 +196,13 @@ for (i = 0; i < SIZEOF (categories); i++) { int category_mask = categories[i].mask; - locale_t locale = newlocale (LC_ALL_MASK, "fr_FR.UTF-8", NULL); - if (locale != NULL) + locale_t loc = newlocale (LC_ALL_MASK, "fr_FR.UTF-8", NULL); + if (loc != NULL) { - locale = newlocale (category_mask, "de_DE.UTF-8", locale); - if (locale != NULL) + locale_t locale = newlocale (category_mask, "de_DE.UTF-8", loc); + if (locale == NULL) + freelocale (loc); + else { unsigned int j; @@ -212,6 +216,8 @@ else ASSERT (strcmp (name_j, "fr_FR.UTF-8") == 0); } + uselocale (LC_GLOBAL_LOCALE); + freelocale (locale); } } } @@ -245,6 +251,8 @@ ASSERT (strcmp (name, "fr_FR.UTF-8") == 0); name = gl_locale_name_thread (LC_MESSAGES, "LC_MESSAGES"); ASSERT (strcmp (name, "fr_FR.UTF-8") == 0); + uselocale (LC_GLOBAL_LOCALE); + freelocale (locale); } } @@ -256,11 +264,13 @@ for (i = 0; i < SIZEOF (categories); i++) { int category_mask = categories[i].mask; - locale_t locale = newlocale (LC_ALL_MASK, "fr_FR.UTF-8", NULL); - if (locale != NULL) + locale_t loc = newlocale (LC_ALL_MASK, "fr_FR.UTF-8", NULL); + if (loc != NULL) { - locale = newlocale (category_mask, "de_DE.UTF-8", locale); - if (locale != NULL) + locale_t locale = newlocale (category_mask, "de_DE.UTF-8", loc); + if (locale == NULL) + freelocale (loc); + else { unsigned int j; @@ -275,6 +285,8 @@ else ASSERT (strcmp (name_j, "fr_FR.UTF-8") == 0); } + uselocale (LC_GLOBAL_LOCALE); + freelocale (locale); } } } @@ -444,6 +456,7 @@ ASSERT (strcmp (unsaved_names[j][i], name) == 0); } uselocale (LC_GLOBAL_LOCALE); + freelocale (locale); } } /* Verify the unsaved_names are still valid. */ @@ -453,7 +466,10 @@ unsigned int i; for (i = 0; i < SIZEOF (categories); i++) - ASSERT (strcmp (unsaved_names[j][i], saved_names[j][i]) == 0); + { + ASSERT (strcmp (unsaved_names[j][i], saved_names[j][i]) == 0); + free (saved_names[j][i]); + } } } #else @@ -590,6 +606,8 @@ uselocale (locale); name = gl_locale_name_posix (LC_MESSAGES, "LC_MESSAGES"); ASSERT (strcmp (name, "C") == 0); + uselocale (LC_GLOBAL_LOCALE); + freelocale (locale); } } #endif @@ -702,6 +720,8 @@ uselocale (locale); name = gl_locale_name_environ (LC_MESSAGES, "LC_MESSAGES"); ASSERT (strcmp (name, "C") == 0); + uselocale (LC_GLOBAL_LOCALE); + freelocale (locale); } } #endif @@ -729,6 +749,8 @@ { uselocale (locale); ASSERT (strcmp (gl_locale_name_default (), name) == 0); + uselocale (LC_GLOBAL_LOCALE); + freelocale (locale); } } #endif diff -Nru grep-2.24/gnulib-tests/test-regex.c grep-2.25/gnulib-tests/test-regex.c --- grep-2.24/gnulib-tests/test-regex.c 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/gnulib-tests/test-regex.c 2016-04-10 16:49:32.000000000 +0000 @@ -20,6 +20,7 @@ #include #include +#include #include #if HAVE_DECL_ALARM # include @@ -61,10 +62,17 @@ s = re_compile_pattern (pat, sizeof pat - 1, ®ex); if (s) result |= 1; - else if (re_search (®ex, data, sizeof data - 1, - 0, sizeof data - 1, ®s) - != -1) - result |= 1; + else + { + memset (®s, 0, sizeof regs); + if (re_search (®ex, data, sizeof data - 1, + 0, sizeof data - 1, ®s) + != -1) + result |= 1; + regfree (®ex); + free (regs.start); + free (regs.end); + } } /* Check whether it's really a UTF-8 locale. @@ -96,10 +104,14 @@ result |= 1; else { + memset (®s, 0, sizeof regs); i = re_search (®ex, data, sizeof data - 1, 0, sizeof data - 1, 0); if (i != 0 && i != 21) result |= 1; + regfree (®ex); + free (regs.start); + free (regs.end); } } @@ -114,8 +126,15 @@ if (s) result |= 2; /* This should fail, but succeeds for glibc-2.5. */ - else if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) - result |= 2; + else + { + memset (®s, 0, sizeof regs); + if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) + result |= 2; + regfree (®ex); + free (regs.start); + free (regs.end); + } /* This regular expression is from Spencer ere test number 75 in grep-2.3. */ @@ -127,7 +146,10 @@ s = re_compile_pattern ("a[[:@:>@:]]b\n", 11, ®ex); /* This should fail with _Invalid character class name_ error. */ if (!s) - result |= 4; + { + result |= 4; + regfree (®ex); + } /* Ensure that [b-a] is diagnosed as invalid, when using RE_NO_EMPTY_RANGES. */ @@ -135,13 +157,18 @@ memset (®ex, 0, sizeof regex); s = re_compile_pattern ("a[b-a]", 6, ®ex); if (s == 0) - result |= 8; + { + result |= 8; + regfree (®ex); + } /* This should succeed, but does not for glibc-2.1.3. */ memset (®ex, 0, sizeof regex); s = re_compile_pattern ("{1", 2, ®ex); if (s) result |= 8; + else + regfree (®ex); /* The following example is derived from a problem report against gawk from Jorge Stolfi . */ @@ -150,16 +177,30 @@ if (s) result |= 8; /* This should match, but does not for glibc-2.2.1. */ - else if (re_match (®ex, "an", 2, 0, ®s) != 2) - result |= 8; + else + { + memset (®s, 0, sizeof regs); + if (re_match (®ex, "an", 2, 0, ®s) != 2) + result |= 8; + regfree (®ex); + free (regs.start); + free (regs.end); + } memset (®ex, 0, sizeof regex); s = re_compile_pattern ("x", 1, ®ex); if (s) result |= 8; /* glibc-2.2.93 does not work with a negative RANGE argument. */ - else if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) - result |= 8; + else + { + memset (®s, 0, sizeof regs); + if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) + result |= 8; + regfree (®ex); + free (regs.start); + free (regs.end); + } /* The version of regex.c in older versions of gnulib ignored RE_ICASE. Detect that problem too. */ @@ -168,8 +209,15 @@ s = re_compile_pattern ("x", 1, ®ex); if (s) result |= 16; - else if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) - result |= 16; + else + { + memset (®s, 0, sizeof regs); + if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) + result |= 16; + regfree (®ex); + free (regs.start); + free (regs.end); + } /* Catch a bug reported by Vin Shelton in http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html @@ -181,6 +229,8 @@ s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); if (s) result |= 32; + else + regfree (®ex); /* REG_STARTEND was added to glibc on 2004-01-15. Reject older versions. */ diff -Nru grep-2.24/gnulib-tests/test-setlocale1.c grep-2.25/gnulib-tests/test-setlocale1.c --- grep-2.24/gnulib-tests/test-setlocale1.c 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/gnulib-tests/test-setlocale1.c 2016-04-10 16:49:32.000000000 +0000 @@ -54,6 +54,8 @@ /* Test that the two results are the same. */ ASSERT (strcmp (name1, name2) == 0); + free (name1); + free (name2); return 0; } diff -Nru grep-2.24/gnulib-tests/test-stat.c grep-2.25/gnulib-tests/test-stat.c --- grep-2.24/gnulib-tests/test-stat.c 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/gnulib-tests/test-stat.c 2016-04-10 16:49:32.000000000 +0000 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include diff -Nru grep-2.24/gnulib-tests/test-stat.h grep-2.25/gnulib-tests/test-stat.h --- grep-2.24/gnulib-tests/test-stat.h 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/gnulib-tests/test-stat.h 2016-04-10 16:49:32.000000000 +0000 @@ -95,6 +95,7 @@ ASSERT (unlink (BASE "link2") == 0); ASSERT (unlink (BASE "link3") == 0); ASSERT (unlink (BASE "link4") == 0); + free (cwd); return 0; } diff -Nru grep-2.24/INSTALL grep-2.25/INSTALL --- grep-2.24/INSTALL 2015-07-04 18:05:23.000000000 +0000 +++ grep-2.25/INSTALL 2016-04-10 16:49:32.000000000 +0000 @@ -1,7 +1,7 @@ Installation Instructions ************************* - Copyright (C) 1994-1996, 1999-2002, 2004-2015 Free Software + Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff -Nru grep-2.24/lib/gnulib.mk grep-2.25/lib/gnulib.mk --- grep-2.24/lib/gnulib.mk 2016-01-28 08:00:43.000000000 +0000 +++ grep-2.25/lib/gnulib.mk 2016-04-22 04:02:54.000000000 +0000 @@ -21,7 +21,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --local-dir=gl --lib=libgreputils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=lock-tests --avoid=mbrtowc-tests --avoid=update-copyright-tests --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl alloca announce-gen argmatch binary-io btowc c-ctype closeout do-release-commit-and-tag error exclude fcntl-h fdl fnmatch fstatat fts getopt-gnu getpagesize gettext-h git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload ignore-value intprops inttypes isatty isblank iswctype largefile locale lseek maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc memchr memchr2 mempcpy minmax obstack openat-safer perl progname propername quote readme-release realloc-gnu regex safe-read same-inode ssize_t stddef stdlib stpcpy strerror string strstr strtoull strtoumax sys_stat unistd unlocked-io update-copyright useless-if-before-free version-etc-fsf wchar wcrtomb wctob wctype-h xalloc xstrtoimax +# Reproduce by: gnulib-tool --import --local-dir=gl --lib=libgreputils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=lock-tests --avoid=mbrtowc-tests --avoid=update-copyright-tests --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl alloca announce-gen argmatch binary-io c-ctype closeout do-release-commit-and-tag error exclude fcntl-h fdl fnmatch fstatat fts getopt-gnu getpagesize gettext-h git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload ignore-value intprops inttypes isatty isblank iswctype largefile locale lseek maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc memchr memchr2 mempcpy minmax obstack openat-safer perl progname propername quote readme-release realloc-gnu regex safe-read same-inode ssize_t stddef stdlib stpcpy strerror string strstr strtoull strtoumax sys_stat unistd unlocked-io update-copyright useless-if-before-free version-etc-fsf wchar wcrtomb wctob wctype-h xalloc xstrtoimax MOSTLYCLEANFILES += core *.stackdump @@ -734,6 +734,14 @@ ## end gnulib module gperf +## begin gnulib module hard-locale + +libgreputils_a_SOURCES += hard-locale.c + +EXTRA_DIST += hard-locale.h + +## end gnulib module hard-locale + ## begin gnulib module hash libgreputils_a_SOURCES += hash.c diff -Nru grep-2.24/lib/hard-locale.c grep-2.25/lib/hard-locale.c --- grep-2.24/lib/hard-locale.c 1970-01-01 00:00:00.000000000 +0000 +++ grep-2.25/lib/hard-locale.c 2016-02-03 05:46:26.000000000 +0000 @@ -0,0 +1,72 @@ +/* hard-locale.c -- Determine whether a locale is hard. + + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2016 Free Software + Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#include "hard-locale.h" + +#include +#include +#include + +#ifdef __GLIBC__ +# define GLIBC_VERSION __GLIBC__ +#elif defined __UCLIBC__ +# define GLIBC_VERSION 2 +#else +# define GLIBC_VERSION 0 +#endif + +/* Return true if the current CATEGORY locale is hard, i.e. if you + can't get away with assuming traditional C or POSIX behavior. */ +bool +hard_locale (int category) +{ + bool hard = true; + char const *p = setlocale (category, NULL); + + if (p) + { + if (2 <= GLIBC_VERSION) + { + if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0) + hard = false; + } + else + { + char *locale = strdup (p); + if (locale) + { + /* Temporarily set the locale to the "C" and "POSIX" locales + to find their names, so that we can determine whether one + or the other is the caller's locale. */ + if (((p = setlocale (category, "C")) + && strcmp (p, locale) == 0) + || ((p = setlocale (category, "POSIX")) + && strcmp (p, locale) == 0)) + hard = false; + + /* Restore the caller's locale. */ + setlocale (category, locale); + free (locale); + } + } + } + + return hard; +} diff -Nru grep-2.24/lib/hard-locale.h grep-2.25/lib/hard-locale.h --- grep-2.24/lib/hard-locale.h 1970-01-01 00:00:00.000000000 +0000 +++ grep-2.25/lib/hard-locale.h 2016-02-03 05:46:26.000000000 +0000 @@ -0,0 +1,25 @@ +/* Determine whether a locale is hard. + + Copyright (C) 1999, 2003-2004, 2009-2016 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef HARD_LOCALE_H_ +# define HARD_LOCALE_H_ 1 + +# include + +bool hard_locale (int); + +#endif /* HARD_LOCALE_H_ */ diff -Nru grep-2.24/lib/intprops.h grep-2.25/lib/intprops.h --- grep-2.24/lib/intprops.h 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/lib/intprops.h 2016-04-10 16:50:01.000000000 +0000 @@ -1,10 +1,10 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2005, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2016 Free Software Foundation, Inc. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or + 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 program is distributed in the hope that it will be useful, diff -Nru grep-2.24/lib/Makefile.in grep-2.25/lib/Makefile.in --- grep-2.24/lib/Makefile.in 2016-03-07 17:49:07.000000000 +0000 +++ grep-2.25/lib/Makefile.in 2016-04-22 04:03:07.000000000 +0000 @@ -51,7 +51,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --local-dir=gl --lib=libgreputils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=lock-tests --avoid=mbrtowc-tests --avoid=update-copyright-tests --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl alloca announce-gen argmatch binary-io btowc c-ctype closeout do-release-commit-and-tag error exclude fcntl-h fdl fnmatch fstatat fts getopt-gnu getpagesize gettext-h git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload ignore-value intprops inttypes isatty isblank iswctype largefile locale lseek maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc memchr memchr2 mempcpy minmax obstack openat-safer perl progname propername quote readme-release realloc-gnu regex safe-read same-inode ssize_t stddef stdlib stpcpy strerror string strstr strtoull strtoumax sys_stat unistd unlocked-io update-copyright useless-if-before-free version-etc-fsf wchar wcrtomb wctob wctype-h xalloc xstrtoimax +# Reproduce by: gnulib-tool --import --local-dir=gl --lib=libgreputils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=lock-tests --avoid=mbrtowc-tests --avoid=update-copyright-tests --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl alloca announce-gen argmatch binary-io c-ctype closeout do-release-commit-and-tag error exclude fcntl-h fdl fnmatch fstatat fts getopt-gnu getpagesize gettext-h git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload ignore-value intprops inttypes isatty isblank iswctype largefile locale lseek maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc memchr memchr2 mempcpy minmax obstack openat-safer perl progname propername quote readme-release realloc-gnu regex safe-read same-inode ssize_t stddef stdlib stpcpy strerror string strstr strtoull strtoumax sys_stat unistd unlocked-io update-copyright useless-if-before-free version-etc-fsf wchar wcrtomb wctob wctype-h xalloc xstrtoimax VPATH = @srcdir@ am__is_gnu_make = { \ @@ -159,7 +159,8 @@ $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/i-ring.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/i-ring.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/iconv_open.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ @@ -247,18 +248,18 @@ closeout.c cycle-check.c opendir-safer.c dirname-lgpl.c \ basename-lgpl.c stripslash.c exclude.c exitfail.c \ creat-safer.c open-safer.c fd-hook.c filenamecat-lgpl.c \ - gettext.h hash.c i-ring.c localcharset.h localcharset.c \ - glthread/lock.h glthread/lock.c malloca.c mbchar.c mbiter.h \ - mbiter.c mbscasecmp.c mbslen.c mbsstr.c mbuiter.h mbuiter.c \ - memchr2.h memchr2.c minmax.h openat-die.c openat-safer.c \ - progname.h progname.c propername.h propername.c quotearg.c \ - safe-read.c save-cwd.c striconv.h striconv.c strnlen1.h \ - strnlen1.c glthread/threadlib.c trim.c unistd.c dup-safer.c \ - fd-safer.c pipe-safer.c unistr/u8-mbtoucr.c unistr/u8-uctomb.c \ - unistr/u8-uctomb-aux.c uniwidth/width.c version-etc.h \ - version-etc.c version-etc-fsf.c wctype-h.c xmalloc.c \ - xalloc-die.c xstriconv.h xstriconv.c xstrtoimax.c xstrtol.c \ - xstrtoul.c xstrtol-error.c colorize.h + gettext.h hard-locale.c hash.c i-ring.c localcharset.h \ + localcharset.c glthread/lock.h glthread/lock.c malloca.c \ + mbchar.c mbiter.h mbiter.c mbscasecmp.c mbslen.c mbsstr.c \ + mbuiter.h mbuiter.c memchr2.h memchr2.c minmax.h openat-die.c \ + openat-safer.c progname.h progname.c propername.h propername.c \ + quotearg.c safe-read.c save-cwd.c striconv.h striconv.c \ + strnlen1.h strnlen1.c glthread/threadlib.c trim.c unistd.c \ + dup-safer.c fd-safer.c pipe-safer.c unistr/u8-mbtoucr.c \ + unistr/u8-uctomb.c unistr/u8-uctomb-aux.c uniwidth/width.c \ + version-etc.h version-etc.c version-etc-fsf.c wctype-h.c \ + xmalloc.c xalloc-die.c xstriconv.h xstriconv.c xstrtoimax.c \ + xstrtol.c xstrtoul.c xstrtol-error.c colorize.h am__dirstamp = .dirstamp @LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_1 = unistr/u8-mbtoucr.$(OBJEXT) @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_2 = unistr/u8-uctomb.$(OBJEXT) \ @@ -272,14 +273,14 @@ dirname-lgpl.$(OBJEXT) basename-lgpl.$(OBJEXT) \ stripslash.$(OBJEXT) exclude.$(OBJEXT) exitfail.$(OBJEXT) \ creat-safer.$(OBJEXT) open-safer.$(OBJEXT) fd-hook.$(OBJEXT) \ - filenamecat-lgpl.$(OBJEXT) hash.$(OBJEXT) i-ring.$(OBJEXT) \ - localcharset.$(OBJEXT) glthread/lock.$(OBJEXT) \ - malloca.$(OBJEXT) mbchar.$(OBJEXT) mbiter.$(OBJEXT) \ - mbscasecmp.$(OBJEXT) mbslen.$(OBJEXT) mbsstr.$(OBJEXT) \ - mbuiter.$(OBJEXT) memchr2.$(OBJEXT) openat-die.$(OBJEXT) \ - openat-safer.$(OBJEXT) progname.$(OBJEXT) propername.$(OBJEXT) \ - quotearg.$(OBJEXT) safe-read.$(OBJEXT) save-cwd.$(OBJEXT) \ - striconv.$(OBJEXT) strnlen1.$(OBJEXT) \ + filenamecat-lgpl.$(OBJEXT) hard-locale.$(OBJEXT) \ + hash.$(OBJEXT) i-ring.$(OBJEXT) localcharset.$(OBJEXT) \ + glthread/lock.$(OBJEXT) malloca.$(OBJEXT) mbchar.$(OBJEXT) \ + mbiter.$(OBJEXT) mbscasecmp.$(OBJEXT) mbslen.$(OBJEXT) \ + mbsstr.$(OBJEXT) mbuiter.$(OBJEXT) memchr2.$(OBJEXT) \ + openat-die.$(OBJEXT) openat-safer.$(OBJEXT) progname.$(OBJEXT) \ + propername.$(OBJEXT) quotearg.$(OBJEXT) safe-read.$(OBJEXT) \ + save-cwd.$(OBJEXT) striconv.$(OBJEXT) strnlen1.$(OBJEXT) \ glthread/threadlib.$(OBJEXT) trim.$(OBJEXT) unistd.$(OBJEXT) \ dup-safer.$(OBJEXT) fd-safer.$(OBJEXT) pipe-safer.$(OBJEXT) \ $(am__objects_1) $(am__objects_2) $(am__objects_3) \ @@ -328,8 +329,8 @@ ./$(DEPDIR)/fts.Po ./$(DEPDIR)/getcwd-lgpl.Po \ ./$(DEPDIR)/getdtablesize.Po ./$(DEPDIR)/getopt.Po \ ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/getpagesize.Po \ - ./$(DEPDIR)/gettimeofday.Po ./$(DEPDIR)/hash.Po \ - ./$(DEPDIR)/i-ring.Po ./$(DEPDIR)/iconv.Po \ + ./$(DEPDIR)/gettimeofday.Po ./$(DEPDIR)/hard-locale.Po \ + ./$(DEPDIR)/hash.Po ./$(DEPDIR)/i-ring.Po ./$(DEPDIR)/iconv.Po \ ./$(DEPDIR)/iconv_close.Po ./$(DEPDIR)/iconv_open.Po \ ./$(DEPDIR)/isatty.Po ./$(DEPDIR)/isblank.Po \ ./$(DEPDIR)/iswblank.Po ./$(DEPDIR)/iswctype.Po \ @@ -1339,8 +1340,8 @@ $(top_srcdir)/build-aux/gitlog-to-changelog \ $(top_srcdir)/build-aux/gnu-web-doc-update \ $(top_srcdir)/GNUmakefile $(top_srcdir)/build-aux/gnupload \ - hash.h $(top_srcdir)/build-aux/config.rpath i-ring.h \ - iconv.in.h iconv_open-aix.h iconv_open-hpux.h \ + hard-locale.h hash.h $(top_srcdir)/build-aux/config.rpath \ + i-ring.h iconv.in.h iconv_open-aix.h iconv_open-hpux.h \ iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h \ iconv.c iconv_close.c iconv_open-aix.gperf \ iconv_open-hpux.gperf iconv_open-irix.gperf \ @@ -1406,17 +1407,18 @@ closeout.c cycle-check.c opendir-safer.c dirname-lgpl.c \ basename-lgpl.c stripslash.c exclude.c exitfail.c \ creat-safer.c open-safer.c fd-hook.c filenamecat-lgpl.c \ - gettext.h hash.c i-ring.c localcharset.h localcharset.c \ - glthread/lock.h glthread/lock.c malloca.c mbchar.c mbiter.h \ - mbiter.c mbscasecmp.c mbslen.c mbsstr.c mbuiter.h mbuiter.c \ - memchr2.h memchr2.c minmax.h openat-die.c openat-safer.c \ - progname.h progname.c propername.h propername.c quotearg.c \ - safe-read.c save-cwd.c striconv.h striconv.c strnlen1.h \ - strnlen1.c glthread/threadlib.c trim.c unistd.c dup-safer.c \ - fd-safer.c pipe-safer.c $(am__append_1) $(am__append_2) \ - $(am__append_3) version-etc.h version-etc.c version-etc-fsf.c \ - wctype-h.c xmalloc.c xalloc-die.c xstriconv.h xstriconv.c \ - xstrtoimax.c xstrtol.c xstrtoul.c xstrtol-error.c colorize.h + gettext.h hard-locale.c hash.c i-ring.c localcharset.h \ + localcharset.c glthread/lock.h glthread/lock.c malloca.c \ + mbchar.c mbiter.h mbiter.c mbscasecmp.c mbslen.c mbsstr.c \ + mbuiter.h mbuiter.c memchr2.h memchr2.c minmax.h openat-die.c \ + openat-safer.c progname.h progname.c propername.h propername.c \ + quotearg.c safe-read.c save-cwd.c striconv.h striconv.c \ + strnlen1.h strnlen1.c glthread/threadlib.c trim.c unistd.c \ + dup-safer.c fd-safer.c pipe-safer.c $(am__append_1) \ + $(am__append_2) $(am__append_3) version-etc.h version-etc.c \ + version-etc-fsf.c wctype-h.c xmalloc.c xalloc-die.c \ + xstriconv.h xstriconv.c xstrtoimax.c xstrtol.c xstrtoul.c \ + xstrtol-error.c colorize.h libgreputils_a_LIBADD = $(gl_LIBOBJS) @ALLOCA@ $(LIBOBJS) $(ALLOCA) libgreputils_a_DEPENDENCIES = $(gl_LIBOBJS) @ALLOCA@ $(LIBOBJS) \ $(ALLOCA) @@ -1586,6 +1588,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpagesize.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hard-locale.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i-ring.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconv.Po@am__quote@ # am--include-marker @@ -1883,6 +1886,7 @@ -rm -f ./$(DEPDIR)/getopt1.Po -rm -f ./$(DEPDIR)/getpagesize.Po -rm -f ./$(DEPDIR)/gettimeofday.Po + -rm -f ./$(DEPDIR)/hard-locale.Po -rm -f ./$(DEPDIR)/hash.Po -rm -f ./$(DEPDIR)/i-ring.Po -rm -f ./$(DEPDIR)/iconv.Po @@ -2069,6 +2073,7 @@ -rm -f ./$(DEPDIR)/getopt1.Po -rm -f ./$(DEPDIR)/getpagesize.Po -rm -f ./$(DEPDIR)/gettimeofday.Po + -rm -f ./$(DEPDIR)/hard-locale.Po -rm -f ./$(DEPDIR)/hash.Po -rm -f ./$(DEPDIR)/i-ring.Po -rm -f ./$(DEPDIR)/iconv.Po diff -Nru grep-2.24/lib/mbrtowc.c grep-2.25/lib/mbrtowc.c --- grep-2.24/lib/mbrtowc.c 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/lib/mbrtowc.c 2016-04-10 16:49:32.000000000 +0000 @@ -20,6 +20,11 @@ /* Specification. */ #include +#if C_LOCALE_MAYBE_EILSEQ +# include "hard-locale.h" +# include +#endif + #if GNULIB_defined_mbstate_t /* Implement mbrtowc() on top of mbtowc(). */ @@ -328,6 +333,9 @@ size_t rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) { + size_t ret; + wchar_t wc; + # if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG if (s == NULL) { @@ -342,6 +350,9 @@ return (size_t) -2; # endif + if (! pwc) + pwc = &wc; + # if MBRTOWC_RETVAL_BUG { static mbstate_t internal_state; @@ -357,8 +368,7 @@ size_t count = 0; for (; n > 0; s++, n--) { - wchar_t wc; - size_t ret = mbrtowc (&wc, s, 1, ps); + ret = mbrtowc (&wc, s, 1, ps); if (ret == (size_t)(-1)) return (size_t)(-1); @@ -366,8 +376,7 @@ if (ret != (size_t)(-2)) { /* The multibyte character has been completed. */ - if (pwc != NULL) - *pwc = wc; + *pwc = wc; return (wc == 0 ? 0 : count); } } @@ -376,32 +385,23 @@ } # endif -# if MBRTOWC_NUL_RETVAL_BUG - { - wchar_t wc; - size_t ret = mbrtowc (&wc, s, n, ps); + ret = mbrtowc (pwc, s, n, ps); - if (ret != (size_t)(-1) && ret != (size_t)(-2)) - { - if (pwc != NULL) - *pwc = wc; - if (wc == 0) - ret = 0; - } - return ret; - } -# else - { -# if MBRTOWC_NULL_ARG1_BUG - wchar_t dummy; - - if (pwc == NULL) - pwc = &dummy; -# endif +# if MBRTOWC_NUL_RETVAL_BUG + if (ret < (size_t) -2 && !*pwc) + return 0; +# endif - return mbrtowc (pwc, s, n, ps); - } +# if C_LOCALE_MAYBE_EILSEQ + if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE)) + { + unsigned char uc = *s; + *pwc = uc; + return 1; + } # endif + + return ret; } #endif diff -Nru grep-2.24/lib/regcomp.c grep-2.25/lib/regcomp.c --- grep-2.24/lib/regcomp.c 2016-02-02 06:00:45.000000000 +0000 +++ grep-2.25/lib/regcomp.c 2016-04-10 16:50:01.000000000 +0000 @@ -213,17 +213,9 @@ Assumes the 'allocated' (and perhaps 'buffer') and 'translate' fields are set in BUFP on entry. */ -#ifdef _LIBC -const char * -re_compile_pattern (pattern, length, bufp) - const char *pattern; - size_t length; - struct re_pattern_buffer *bufp; -#else /* size_t might promote */ const char * re_compile_pattern (const char *pattern, size_t length, struct re_pattern_buffer *bufp) -#endif { reg_errcode_t ret; @@ -261,8 +253,7 @@ defined in regex.h. We return the old syntax. */ reg_syntax_t -re_set_syntax (syntax) - reg_syntax_t syntax; +re_set_syntax (reg_syntax_t syntax) { reg_syntax_t ret = re_syntax_options; @@ -274,8 +265,7 @@ #endif int -re_compile_fastmap (bufp) - struct re_pattern_buffer *bufp; +re_compile_fastmap (struct re_pattern_buffer *bufp) { re_dfa_t *dfa = bufp->buffer; char *fastmap = bufp->fastmap; @@ -474,10 +464,7 @@ the return codes and their meanings.) */ int -regcomp (preg, pattern, cflags) - regex_t *_Restrict_ preg; - const char *_Restrict_ pattern; - int cflags; +regcomp (regex_t *__restrict preg, const char *__restrict pattern, int cflags) { reg_errcode_t ret; reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED @@ -535,18 +522,9 @@ /* Returns a message corresponding to an error code, ERRCODE, returned from either regcomp or regexec. We don't use PREG here. */ -#ifdef _LIBC -size_t -regerror (errcode, preg, errbuf, errbuf_size) - int errcode; - const regex_t *_Restrict_ preg; - char *_Restrict_ errbuf; - size_t errbuf_size; -#else /* size_t might promote */ size_t -regerror (int errcode, const regex_t *_Restrict_ preg, - char *_Restrict_ errbuf, size_t errbuf_size) -#endif +regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf, + size_t errbuf_size) { const char *msg; size_t msg_size; @@ -662,8 +640,7 @@ /* Free dynamically allocated space used by PREG. */ void -regfree (preg) - regex_t *preg; +regfree (regex_t *preg) { re_dfa_t *dfa = preg->buffer; if (BE (dfa != NULL, 1)) @@ -699,8 +676,7 @@ regcomp/regexec above without link errors. */ weak_function # endif -re_comp (s) - const char *s; +re_comp (const char *s) { reg_errcode_t ret; char *fastmap; @@ -1421,7 +1397,7 @@ { node->first = node; node->node_idx = re_dfa_add_node (dfa, node->token); - if (BE (node->node_idx == REG_MISSING, 0)) + if (BE (node->node_idx == -1, 0)) return REG_ESPACE; if (node->token.type == ANCHOR) dfa->nodes[node->node_idx].constraint = node->token.opr.ctx_type; @@ -1482,8 +1458,8 @@ right = node->right->first->node_idx; else right = node->next->node_idx; - assert (REG_VALID_INDEX (left)); - assert (REG_VALID_INDEX (right)); + assert (left > -1); + assert (right > -1); err = re_node_set_init_2 (dfa->edests + idx, left, right); } break; @@ -1533,7 +1509,7 @@ org_dest = dfa->nexts[org_node]; re_node_set_empty (dfa->edests + clone_node); clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == REG_MISSING, 0)) + if (BE (clone_dest == -1, 0)) return REG_ESPACE; dfa->nexts[clone_node] = dfa->nexts[org_node]; ok = re_node_set_insert (dfa->edests + clone_node, clone_dest); @@ -1566,7 +1542,7 @@ /* In case the node has another constraint, append it. */ constraint |= dfa->nodes[org_node].constraint; clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == REG_MISSING, 0)) + if (BE (clone_dest == -1, 0)) return REG_ESPACE; ok = re_node_set_insert (dfa->edests + clone_node, clone_dest); if (BE (! ok, 0)) @@ -1580,12 +1556,12 @@ re_node_set_empty (dfa->edests + clone_node); /* Search for a duplicated node which satisfies the constraint. */ clone_dest = search_duplicated_node (dfa, org_dest, constraint); - if (clone_dest == REG_MISSING) + if (clone_dest == -1) { /* There is no such duplicated node, create a new one. */ reg_errcode_t err; clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == REG_MISSING, 0)) + if (BE (clone_dest == -1, 0)) return REG_ESPACE; ok = re_node_set_insert (dfa->edests + clone_node, clone_dest); if (BE (! ok, 0)) @@ -1606,7 +1582,7 @@ org_dest = dfa->edests[org_node].elems[1]; clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == REG_MISSING, 0)) + if (BE (clone_dest == -1, 0)) return REG_ESPACE; ok = re_node_set_insert (dfa->edests + clone_node, clone_dest); if (BE (! ok, 0)) @@ -1632,18 +1608,18 @@ && constraint == dfa->nodes[idx].constraint) return idx; /* Found. */ } - return REG_MISSING; /* Not found. */ + return -1; /* Not found. */ } /* Duplicate the node whose index is ORG_IDX and set the constraint CONSTRAINT. - Return the index of the new node, or REG_MISSING if insufficient storage is + Return the index of the new node, or -1 if insufficient storage is available. */ static Idx duplicate_node (re_dfa_t *dfa, Idx org_idx, unsigned int constraint) { Idx dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]); - if (BE (dup_idx != REG_MISSING, 1)) + if (BE (dup_idx != -1, 1)) { dfa->nodes[dup_idx].constraint = constraint; dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].constraint; @@ -1702,7 +1678,7 @@ } #ifdef DEBUG - assert (dfa->eclosures[node_idx].nelem != REG_MISSING); + assert (dfa->eclosures[node_idx].nelem != -1); #endif /* If we have already calculated, skip it. */ @@ -1738,7 +1714,7 @@ /* This indicates that we are calculating this node now. We reference this value to avoid infinite loop. */ - dfa->eclosures[node].nelem = REG_MISSING; + dfa->eclosures[node].nelem = -1; /* If the current node has constraints, duplicate all nodes since they must inherit the constraints. */ @@ -1760,7 +1736,7 @@ Idx edest = dfa->edests[node].elems[i]; /* If calculating the epsilon closure of 'edest' is in progress, return intermediate result. */ - if (dfa->eclosures[edest].nelem == REG_MISSING) + if (dfa->eclosures[edest].nelem == -1) { incomplete = true; continue; @@ -2557,7 +2533,7 @@ { end = 0; start = fetch_number (regexp, token, syntax); - if (start == REG_MISSING) + if (start == -1) { if (token->type == CHARACTER && token->opr.c == ',') start = 0; /* We treat "{,m}" as "{0,m}". */ @@ -2567,14 +2543,14 @@ return NULL; } } - if (BE (start != REG_ERROR, 1)) + if (BE (start != -2, 1)) { /* We treat "{n}" as "{n,n}". */ end = ((token->type == OP_CLOSE_DUP_NUM) ? start : ((token->type == CHARACTER && token->opr.c == ',') - ? fetch_number (regexp, token, syntax) : REG_ERROR)); + ? fetch_number (regexp, token, syntax) : -2)); } - if (BE (start == REG_ERROR || end == REG_ERROR, 0)) + if (BE (start == -2 || end == -2, 0)) { /* Invalid sequence. */ if (BE (!(syntax & RE_INVALID_INTERVAL_ORD), 0)) @@ -2596,7 +2572,7 @@ return elem; } - if (BE ((end != REG_MISSING && start > end) + if (BE ((end != -1 && start > end) || token->type != OP_CLOSE_DUP_NUM, 0)) { /* First number greater than second. */ @@ -2604,7 +2580,7 @@ return NULL; } - if (BE (RE_DUP_MAX < (end == REG_MISSING ? start : end), 0)) + if (BE (RE_DUP_MAX < (end == -1 ? start : end), 0)) { *err = REG_ESIZE; return NULL; @@ -2613,7 +2589,7 @@ else { start = (token->type == OP_DUP_PLUS) ? 1 : 0; - end = (token->type == OP_DUP_QUESTION) ? 1 : REG_MISSING; + end = (token->type == OP_DUP_QUESTION) ? 1 : -1; } fetch_token (token, regexp, syntax); @@ -2657,7 +2633,7 @@ } tree = create_tree (dfa, elem, NULL, - (end == REG_MISSING ? OP_DUP_ASTERISK : OP_ALT)); + (end == -1 ? OP_DUP_ASTERISK : OP_ALT)); if (BE (tree == NULL, 0)) goto parse_dup_op_espace; @@ -2665,10 +2641,10 @@ True if the arithmetic type T is signed. */ #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) - /* This loop is actually executed only when end != REG_MISSING, + /* This loop is actually executed only when end != -1, to rewrite {0,n} as ((...?)?)?... We have already created the start+1-th copy. */ - if (TYPE_SIGNED (Idx) || end != REG_MISSING) + if (TYPE_SIGNED (Idx) || end != -1) for (i = start + 2; i <= end; ++i) { elem = duplicate_tree (elem, dfa); @@ -3785,27 +3761,26 @@ /* This is intended for the expressions like "a{1,3}". Fetch a number from 'input', and return the number. - Return REG_MISSING if the number field is empty like "{,1}". + Return -1 if the number field is empty like "{,1}". Return RE_DUP_MAX + 1 if the number field is too large. - Return REG_ERROR if an error occurred. */ + Return -2 if an error occurred. */ static Idx fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax) { - Idx num = REG_MISSING; + Idx num = -1; unsigned char c; while (1) { fetch_token (token, input, syntax); c = token->opr.c; if (BE (token->type == END_OF_RE, 0)) - return REG_ERROR; + return -2; if (token->type == OP_CLOSE_DUP_NUM || c == ',') break; - num = ((token->type != CHARACTER || c < '0' || '9' < c - || num == REG_ERROR) - ? REG_ERROR - : num == REG_MISSING + num = ((token->type != CHARACTER || c < '0' || '9' < c || num == -2) + ? -2 + : num == -1 ? c - '0' : MIN (RE_DUP_MAX + 1, num * 10 + c - '0')); } @@ -3869,7 +3844,7 @@ tree->token.opt_subexp = 0; tree->first = NULL; tree->next = NULL; - tree->node_idx = REG_MISSING; + tree->node_idx = -1; if (left != NULL) left->parent = tree; diff -Nru grep-2.24/lib/regexec.c grep-2.25/lib/regexec.c --- grep-2.24/lib/regexec.c 2016-01-28 08:00:37.000000000 +0000 +++ grep-2.25/lib/regexec.c 2016-04-10 16:50:01.000000000 +0000 @@ -219,12 +219,8 @@ We return 0 if we find a match and REG_NOMATCH if not. */ int -regexec (preg, string, nmatch, pmatch, eflags) - const regex_t *_Restrict_ preg; - const char *_Restrict_ string; - size_t nmatch; - regmatch_t pmatch[_Restrict_arr_]; - int eflags; +regexec (const regex_t *_Restrict_ preg, const char *_Restrict_ string, + size_t nmatch, regmatch_t pmatch[], int eflags) { reg_errcode_t err; Idx start, length; @@ -305,11 +301,8 @@ match was found and -2 indicates an internal error. */ regoff_t -re_match (bufp, string, length, start, regs) - struct re_pattern_buffer *bufp; - const char *string; - Idx length, start; - struct re_registers *regs; +re_match (struct re_pattern_buffer *bufp, const char *string, Idx length, + Idx start, struct re_registers *regs) { return re_search_stub (bufp, string, length, start, 0, length, regs, true); } @@ -318,12 +311,8 @@ #endif regoff_t -re_search (bufp, string, length, start, range, regs) - struct re_pattern_buffer *bufp; - const char *string; - Idx length, start; - regoff_t range; - struct re_registers *regs; +re_search (struct re_pattern_buffer *bufp, const char *string, Idx length, + Idx start, regoff_t range, struct re_registers *regs) { return re_search_stub (bufp, string, length, start, range, length, regs, false); @@ -333,11 +322,9 @@ #endif regoff_t -re_match_2 (bufp, string1, length1, string2, length2, start, regs, stop) - struct re_pattern_buffer *bufp; - const char *string1, *string2; - Idx length1, length2, start, stop; - struct re_registers *regs; +re_match_2 (struct re_pattern_buffer *bufp, const char *string1, Idx length1, + const char *string2, Idx length2, Idx start, + struct re_registers *regs, Idx stop) { return re_search_2_stub (bufp, string1, length1, string2, length2, start, 0, regs, stop, true); @@ -347,12 +334,9 @@ #endif regoff_t -re_search_2 (bufp, string1, length1, string2, length2, start, range, regs, stop) - struct re_pattern_buffer *bufp; - const char *string1, *string2; - Idx length1, length2, start, stop; - regoff_t range; - struct re_registers *regs; +re_search_2 (struct re_pattern_buffer *bufp, const char *string1, Idx length1, + const char *string2, Idx length2, Idx start, regoff_t range, + struct re_registers *regs, Idx stop) { return re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs, stop, false); @@ -362,10 +346,10 @@ #endif static regoff_t -re_search_2_stub (struct re_pattern_buffer *bufp, - const char *string1, Idx length1, - const char *string2, Idx length2, - Idx start, regoff_t range, struct re_registers *regs, +internal_function +re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1, + Idx length1, const char *string2, Idx length2, Idx start, + regoff_t range, struct re_registers *regs, Idx stop, bool ret_len) { const char *str; @@ -409,8 +393,8 @@ otherwise the position of the match is returned. */ static regoff_t -re_search_stub (struct re_pattern_buffer *bufp, - const char *string, Idx length, +internal_function +re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length, Idx start, regoff_t range, Idx stop, struct re_registers *regs, bool ret_len) { @@ -499,6 +483,7 @@ } static unsigned +internal_function re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs, int regs_allocated) { @@ -577,11 +562,8 @@ freeing the old data. */ void -re_set_registers (bufp, regs, num_regs, starts, ends) - struct re_pattern_buffer *bufp; - struct re_registers *regs; - __re_size_t num_regs; - regoff_t *starts, *ends; +re_set_registers (struct re_pattern_buffer *bufp, struct re_registers *regs, + __re_size_t num_regs, regoff_t *starts, regoff_t *ends) { if (num_regs) { @@ -609,8 +591,7 @@ # ifdef _LIBC weak_function # endif -re_exec (s) - const char *s; +re_exec (const char *s) { return 0 == regexec (&re_comp_buf, s, 0, NULL, 0); } @@ -628,12 +609,10 @@ (0 <= LAST_START && LAST_START <= LENGTH) */ static reg_errcode_t -__attribute_warn_unused_result__ -re_search_internal (const regex_t *preg, - const char *string, Idx length, - Idx start, Idx last_start, Idx stop, - size_t nmatch, regmatch_t pmatch[], - int eflags) +__attribute_warn_unused_result__ internal_function +re_search_internal (const regex_t *preg, const char *string, Idx length, + Idx start, Idx last_start, Idx stop, size_t nmatch, + regmatch_t pmatch[], int eflags) { reg_errcode_t err; const re_dfa_t *dfa = preg->buffer; @@ -642,7 +621,7 @@ bool fl_longest_match; int match_kind; Idx match_first; - Idx match_last = REG_MISSING; + Idx match_last = -1; Idx extra_nmatch; bool sb; int ch; @@ -851,9 +830,9 @@ mctx.state_log_top = mctx.nbkref_ents = mctx.max_mb_elem_len = 0; match_last = check_matching (&mctx, fl_longest_match, start <= last_start ? &match_first : NULL); - if (match_last != REG_MISSING) + if (match_last != -1) { - if (BE (match_last == REG_ERROR, 0)) + if (BE (match_last == -2, 0)) { err = REG_ESPACE; goto free_return; @@ -875,7 +854,7 @@ break; if (BE (err != REG_NOMATCH, 0)) goto free_return; - match_last = REG_MISSING; + match_last = -1; } else break; /* We found a match. */ @@ -886,7 +865,7 @@ } #ifdef DEBUG - assert (match_last != REG_MISSING); + assert (match_last != -1); assert (err == REG_NOERROR); #endif @@ -964,7 +943,7 @@ } static reg_errcode_t -__attribute_warn_unused_result__ +internal_function __attribute_warn_unused_result__ prune_impossible_nodes (re_match_context_t *mctx) { const re_dfa_t *const dfa = mctx->dfa; @@ -1012,7 +991,7 @@ do { --match_last; - if (! REG_VALID_INDEX (match_last)) + if (match_last < 0) { ret = REG_NOMATCH; goto free_return; @@ -1093,8 +1072,8 @@ } /* Check whether the regular expression match input string INPUT or not, - and return the index where the matching end. Return REG_MISSING if - there is no match, and return REG_ERROR in case of an error. + and return the index where the matching end. Return -1 if + there is no match, and return -2 in case of an error. FL_LONGEST_MATCH means we want the POSIX longest matching. If P_MATCH_FIRST is not NULL, and the match fails, it is set to the next place where we may want to try matching. @@ -1109,7 +1088,7 @@ const re_dfa_t *const dfa = mctx->dfa; reg_errcode_t err; Idx match = 0; - Idx match_last = REG_MISSING; + Idx match_last = -1; Idx cur_str_idx = re_string_cur_idx (&mctx->input); re_dfastate_t *cur_state; bool at_init_state = p_match_first != NULL; @@ -1121,7 +1100,7 @@ if (BE (cur_state == NULL, 0)) { assert (err == REG_ESPACE); - return REG_ERROR; + return -2; } if (mctx->state_log != NULL) @@ -1176,7 +1155,7 @@ if (BE (err != REG_NOERROR, 0)) { assert (err == REG_ESPACE); - return REG_ERROR; + return -2; } } @@ -1190,7 +1169,7 @@ state using the state log, if available and if we have not already found a valid (even if not the longest) match. */ if (BE (err != REG_NOERROR, 0)) - return REG_ERROR; + return -2; if (mctx->state_log == NULL || (match && !fl_longest_match) @@ -1273,7 +1252,7 @@ /* Compute the next node to which "NFA" transit from NODE("NFA" is a NFA corresponding to the DFA). Return the destination node, and update EPS_VIA_NODES; - return REG_MISSING in case of errors. */ + return -1 in case of errors. */ static Idx internal_function @@ -1291,15 +1270,15 @@ Idx dest_node; ok = re_node_set_insert (eps_via_nodes, node); if (BE (! ok, 0)) - return REG_ERROR; - /* Pick up a valid destination, or return REG_MISSING if none + return -2; + /* Pick up a valid destination, or return -1 if none is found. */ - for (dest_node = REG_MISSING, i = 0; i < edests->nelem; ++i) + for (dest_node = -1, i = 0; i < edests->nelem; ++i) { Idx candidate = edests->elems[i]; if (!re_node_set_contains (cur_nodes, candidate)) continue; - if (dest_node == REG_MISSING) + if (dest_node == -1) dest_node = candidate; else @@ -1313,7 +1292,7 @@ else if (fs != NULL && push_fail_stack (fs, *pidx, candidate, nregs, regs, eps_via_nodes)) - return REG_ERROR; + return -2; /* We know we are going to exit. */ break; @@ -1338,13 +1317,13 @@ if (fs != NULL) { if (regs[subexp_idx].rm_so == -1 || regs[subexp_idx].rm_eo == -1) - return REG_MISSING; + return -1; else if (naccepted) { char *buf = (char *) re_string_get_buffer (&mctx->input); if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, naccepted) != 0) - return REG_MISSING; + return -1; } } @@ -1353,7 +1332,7 @@ Idx dest_node; ok = re_node_set_insert (eps_via_nodes, node); if (BE (! ok, 0)) - return REG_ERROR; + return -2; dest_node = dfa->edests[node].elems[0]; if (re_node_set_contains (&mctx->state_log[*pidx]->nodes, dest_node)) @@ -1369,12 +1348,12 @@ if (fs && (*pidx > mctx->match_last || mctx->state_log[*pidx] == NULL || !re_node_set_contains (&mctx->state_log[*pidx]->nodes, dest_node))) - return REG_MISSING; + return -1; re_node_set_empty (eps_via_nodes); return dest_node; } } - return REG_MISSING; + return -1; } static reg_errcode_t @@ -1410,7 +1389,7 @@ regmatch_t *regs, re_node_set *eps_via_nodes) { Idx num = --fs->num; - assert (REG_VALID_INDEX (num)); + assert (num >= 0); *pidx = fs->stack[num].idx; memcpy (regs, fs->stack[num].regs, sizeof (regmatch_t) * nregs); re_node_set_free (eps_via_nodes); @@ -1503,9 +1482,9 @@ cur_node = proceed_next_node (mctx, nmatch, pmatch, &idx, cur_node, &eps_via_nodes, fs); - if (BE (! REG_VALID_INDEX (cur_node), 0)) + if (BE (cur_node < 0, 0)) { - if (BE (cur_node == REG_ERROR, 0)) + if (BE (cur_node == -2, 0)) { re_node_set_free (&eps_via_nodes); if (prev_idx_match_malloced) @@ -1889,10 +1868,10 @@ { Idx edst1 = dfa->edests[cur_node].elems[0]; Idx edst2 = ((dfa->edests[cur_node].nelem > 1) - ? dfa->edests[cur_node].elems[1] : REG_MISSING); + ? dfa->edests[cur_node].elems[1] : -1); if ((!re_node_set_contains (inv_eclosure, edst1) && re_node_set_contains (dest_nodes, edst1)) - || (REG_VALID_NONZERO_INDEX (edst2) + || (edst2 > 0 && !re_node_set_contains (inv_eclosure, edst2) && re_node_set_contains (dest_nodes, edst2))) { @@ -1972,7 +1951,7 @@ switch (dfa->nodes[node].type) { case OP_BACK_REF: - if (bkref_idx != REG_MISSING) + if (bkref_idx != -1) { struct re_backref_cache_entry *ent = mctx->bkref_ents + bkref_idx; do @@ -2088,8 +2067,8 @@ subexp_idx = dfa->nodes[ent->node].opr.idx; if (ent->subexp_to == str_idx) { - Idx ops_node = REG_MISSING; - Idx cls_node = REG_MISSING; + Idx ops_node = -1; + Idx cls_node = -1; for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx) { Idx node = dest_nodes->elems[node_idx]; @@ -2104,7 +2083,7 @@ /* Check the limitation of the open subexpression. */ /* Note that (ent->subexp_to = str_idx != ent->subexp_from). */ - if (REG_VALID_INDEX (ops_node)) + if (ops_node >= 0) { err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes, candidates); @@ -2113,7 +2092,7 @@ } /* Check the limitation of the close subexpression. */ - if (REG_VALID_INDEX (cls_node)) + if (cls_node >= 0) for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx) { Idx node = dest_nodes->elems[node_idx]; @@ -2166,7 +2145,7 @@ re_sift_context_t local_sctx; Idx first_idx = search_cur_bkref_entry (mctx, str_idx); - if (first_idx == REG_MISSING) + if (first_idx == -1) return REG_NOERROR; local_sctx.sifted_states = NULL; /* Mark that it hasn't been initialized. */ @@ -2570,7 +2549,7 @@ if (BE (err != REG_NOERROR, 0)) return err; #ifdef DEBUG - assert (dfa->nexts[cur_node_idx] != REG_MISSING); + assert (dfa->nexts[cur_node_idx] != -1); #endif new_nodes = dfa->eclosures + dfa->nexts[cur_node_idx]; @@ -2636,7 +2615,7 @@ /* And add the epsilon closures (which is 'new_dest_nodes') of the backreference to appropriate state_log. */ #ifdef DEBUG - assert (dfa->nexts[node_idx] != REG_MISSING); + assert (dfa->nexts[node_idx] != -1); #endif for (; bkc_idx < mctx->nbkref_ents; ++bkc_idx) { @@ -2720,7 +2699,7 @@ const char *buf = (const char *) re_string_get_buffer (&mctx->input); /* Return if we have already checked BKREF_NODE at BKREF_STR_IDX. */ Idx cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx); - if (cache_idx != REG_MISSING) + if (cache_idx != -1) { const struct re_backref_cache_entry *entry = mctx->bkref_ents + cache_idx; @@ -2825,7 +2804,7 @@ nodes = &mctx->state_log[sl_str]->nodes; cls_node = find_subexp_node (dfa, nodes, subexp_num, OP_CLOSE_SUBEXP); - if (cls_node == REG_MISSING) + if (cls_node == -1) continue; /* No. */ if (sub_top->path == NULL) { @@ -2904,7 +2883,7 @@ && node->opr.idx == subexp_idx) return cls_node; } - return REG_MISSING; + return -1; } /* Check whether the node TOP_NODE at TOP_STR can arrive to the node @@ -3180,7 +3159,7 @@ Idx cur_node = cur_nodes->elems[idx]; const re_node_set *eclosure = dfa->eclosures + cur_node; outside_node = find_subexp_node (dfa, eclosure, ex_subexp, type); - if (outside_node == REG_MISSING) + if (outside_node == -1) { /* There are no problematic nodes, just merge them. */ err = re_node_set_merge (&new_nodes, eclosure); @@ -3266,7 +3245,7 @@ Idx cache_idx_start = search_cur_bkref_entry (mctx, cur_str); struct re_backref_cache_entry *ent; - if (cache_idx_start == REG_MISSING) + if (cache_idx_start == -1) return REG_NOERROR; restart: @@ -3391,7 +3370,7 @@ /* At first, group all nodes belonging to 'state' into several destinations. */ ndests = group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch); - if (BE (! REG_VALID_NONZERO_INDEX (ndests), 0)) + if (BE (ndests <= 0, 0)) { if (dests_node_malloced) free (dests_alloc); @@ -3453,7 +3432,7 @@ for (j = 0; j < dests_node[i].nelem; ++j) { next_node = dfa->nexts[dests_node[i].elems[j]]; - if (next_node != REG_MISSING) + if (next_node != -1) { err = re_node_set_merge (&follows, dfa->eclosures + next_node); if (BE (err != REG_NOERROR, 0)) @@ -3764,7 +3743,7 @@ error_return: for (j = 0; j < ndests; ++j) re_node_set_free (dests_node + j); - return REG_MISSING; + return -1; } #ifdef RE_ENABLE_I18N @@ -4195,7 +4174,7 @@ match_ctx_init (re_match_context_t *mctx, int eflags, Idx n) { mctx->eflags = eflags; - mctx->match_last = REG_MISSING; + mctx->match_last = -1; if (n > 0) { /* Avoid overflow. */ @@ -4316,7 +4295,7 @@ return REG_NOERROR; } -/* Return the first entry with the same str_idx, or REG_MISSING if none is +/* Return the first entry with the same str_idx, or -1 if none is found. Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX. */ static Idx @@ -4336,7 +4315,7 @@ if (left < last && mctx->bkref_ents[left].str_idx == str_idx) return left; else - return REG_MISSING; + return -1; } /* Register the node NODE, whose type is OP_OPEN_SUBEXP, and which matches diff -Nru grep-2.24/lib/regex.h grep-2.25/lib/regex.h --- grep-2.24/lib/regex.h 2016-01-28 08:00:37.000000000 +0000 +++ grep-2.25/lib/regex.h 2016-04-10 16:50:01.000000000 +0000 @@ -42,11 +42,6 @@ supported within glibc itself, and glibc users should not define _REGEX_LARGE_OFFSETS. */ -/* The type of nonnegative object indexes. Traditionally, GNU regex - uses 'int' for these. Code that uses __re_idx_t should work - regardless of whether the type is signed. */ -typedef size_t __re_idx_t; - /* The type of object sizes. */ typedef size_t __re_size_t; @@ -58,7 +53,6 @@ /* The traditional GNU regex implementation mishandles strings longer than INT_MAX. */ -typedef int __re_idx_t; typedef unsigned int __re_size_t; typedef unsigned long int __re_long_size_t; @@ -488,7 +482,8 @@ #ifdef _REGEX_LARGE_OFFSETS /* POSIX 1003.1-2008 requires that regoff_t be at least as wide as ptrdiff_t and ssize_t. We don't know of any hosts where ptrdiff_t - is wider than ssize_t, so ssize_t is safe. */ + is wider than ssize_t, so ssize_t is safe. ptrdiff_t is not + visible here, so use ssize_t. */ typedef ssize_t regoff_t; #else /* The traditional GNU regex implementation mishandles strings longer @@ -538,7 +533,7 @@ BUFFER. Return NULL if successful, and an error string if not. To free the allocated storage, you must call 'regfree' on BUFFER. - Note that the translate table must either have been initialised by + Note that the translate table must either have been initialized by 'regcomp', with a malloc'ed value, or set to NULL before calling 'regfree'. */ extern const char *re_compile_pattern (const char *__pattern, size_t __length, @@ -557,34 +552,34 @@ match, or -2 for an internal error. Also return register information in REGS (if REGS and BUFFER->no_sub are nonzero). */ extern regoff_t re_search (struct re_pattern_buffer *__buffer, - const char *__string, __re_idx_t __length, - __re_idx_t __start, regoff_t __range, + const char *__string, regoff_t __length, + regoff_t __start, regoff_t __range, struct re_registers *__regs); /* Like 're_search', but search in the concatenation of STRING1 and STRING2. Also, stop searching at index START + STOP. */ extern regoff_t re_search_2 (struct re_pattern_buffer *__buffer, - const char *__string1, __re_idx_t __length1, - const char *__string2, __re_idx_t __length2, - __re_idx_t __start, regoff_t __range, + const char *__string1, regoff_t __length1, + const char *__string2, regoff_t __length2, + regoff_t __start, regoff_t __range, struct re_registers *__regs, - __re_idx_t __stop); + regoff_t __stop); /* Like 're_search', but return how many characters in STRING the regexp in BUFFER matched, starting at position START. */ extern regoff_t re_match (struct re_pattern_buffer *__buffer, - const char *__string, __re_idx_t __length, - __re_idx_t __start, struct re_registers *__regs); + const char *__string, regoff_t __length, + regoff_t __start, struct re_registers *__regs); /* Relates to 're_match' as 're_search_2' relates to 're_search'. */ extern regoff_t re_match_2 (struct re_pattern_buffer *__buffer, - const char *__string1, __re_idx_t __length1, - const char *__string2, __re_idx_t __length2, - __re_idx_t __start, struct re_registers *__regs, - __re_idx_t __stop); + const char *__string1, regoff_t __length1, + const char *__string2, regoff_t __length2, + regoff_t __start, struct re_registers *__regs, + regoff_t __stop); /* Set REGS to hold NUM_REGS registers, storing them in STARTS and diff -Nru grep-2.24/lib/regex_internal.c grep-2.25/lib/regex_internal.c --- grep-2.24/lib/regex_internal.c 2016-01-28 08:00:37.000000000 +0000 +++ grep-2.25/lib/regex_internal.c 2016-04-10 16:50:01.000000000 +0000 @@ -922,7 +922,7 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags) { int c; - if (BE (! REG_VALID_INDEX (idx), 0)) + if (BE (idx < 0, 0)) /* In this case, we use the value stored in input->tip_context, since we can't know the character in input->mbs[-1] here. */ return input->tip_context; @@ -938,10 +938,10 @@ { #if defined DEBUG && DEBUG /* It must not happen. */ - assert (REG_VALID_INDEX (wc_idx)); + assert (wc_idx >= 0); #endif --wc_idx; - if (! REG_VALID_INDEX (wc_idx)) + if (wc_idx < 0) return input->tip_context; } wc = input->wcs[wc_idx]; @@ -1077,25 +1077,25 @@ if (src1->elems[i1] == src2->elems[i2]) { /* Try to find the item in DEST. Maybe we could binary search? */ - while (REG_VALID_INDEX (id) && dest->elems[id] > src1->elems[i1]) + while (id >= 0 && dest->elems[id] > src1->elems[i1]) --id; - if (! REG_VALID_INDEX (id) || dest->elems[id] != src1->elems[i1]) + if (id < 0 || dest->elems[id] != src1->elems[i1]) dest->elems[--sbase] = src1->elems[i1]; - if (! REG_VALID_INDEX (--i1) || ! REG_VALID_INDEX (--i2)) + if (--i1 < 0 || --i2 < 0) break; } /* Lower the highest of the two items. */ else if (src1->elems[i1] < src2->elems[i2]) { - if (! REG_VALID_INDEX (--i2)) + if (--i2 < 0) break; } else { - if (! REG_VALID_INDEX (--i1)) + if (--i1 < 0) break; } } @@ -1108,7 +1108,7 @@ DEST elements are already in place; this is more or less the same loop that is in re_node_set_merge. */ dest->nelem += delta; - if (delta > 0 && REG_VALID_INDEX (id)) + if (delta > 0 && id >= 0) for (;;) { if (dest->elems[is] > dest->elems[id]) @@ -1122,7 +1122,7 @@ { /* Slide from the bottom. */ dest->elems[id + delta] = dest->elems[id]; - if (! REG_VALID_INDEX (--id)) + if (--id < 0) break; } } @@ -1216,8 +1216,7 @@ /* Copy into the top of DEST the items of SRC that are not found in DEST. Maybe we could binary search in DEST? */ for (sbase = dest->nelem + 2 * src->nelem, - is = src->nelem - 1, id = dest->nelem - 1; - REG_VALID_INDEX (is) && REG_VALID_INDEX (id); ) + is = src->nelem - 1, id = dest->nelem - 1; is >= 0 && id >= 0; ) { if (dest->elems[id] == src->elems[is]) is--, id--; @@ -1227,7 +1226,7 @@ --id; } - if (REG_VALID_INDEX (is)) + if (is >= 0) { /* If DEST is exhausted, the remaining items of SRC must be unique. */ sbase -= is + 1; @@ -1256,7 +1255,7 @@ { /* Slide from the bottom. */ dest->elems[id + delta] = dest->elems[id]; - if (! REG_VALID_INDEX (--id)) + if (--id < 0) { /* Copy remaining SRC elements. */ memcpy (dest->elems, dest->elems + sbase, @@ -1355,7 +1354,7 @@ Idx i; if (set1 == NULL || set2 == NULL || set1->nelem != set2->nelem) return false; - for (i = set1->nelem ; REG_VALID_INDEX (--i) ; ) + for (i = set1->nelem ; --i >= 0 ; ) if (set1->elems[i] != set2->elems[i]) return false; return true; @@ -1368,7 +1367,7 @@ re_node_set_contains (const re_node_set *set, Idx elem) { __re_size_t idx, right, mid; - if (! REG_VALID_NONZERO_INDEX (set->nelem)) + if (set->nelem <= 0) return 0; /* Binary search the element. */ @@ -1398,7 +1397,7 @@ /* Add the token TOKEN to dfa->nodes, and return the index of the token. - Or return REG_MISSING if an error occurred. */ + Or return -1 if an error occurred. */ static Idx internal_function @@ -1416,11 +1415,11 @@ MAX (sizeof (re_node_set), sizeof (Idx))); if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_nodes_alloc, 0)) - return REG_MISSING; + return -1; new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc); if (BE (new_nodes == NULL, 0)) - return REG_MISSING; + return -1; dfa->nodes = new_nodes; new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc); new_indices = re_realloc (dfa->org_indices, Idx, new_nodes_alloc); @@ -1433,7 +1432,7 @@ re_free (new_indices); re_free (new_edests); re_free (new_eclosures); - return REG_MISSING; + return -1; } dfa->nexts = new_nexts; dfa->org_indices = new_indices; @@ -1448,7 +1447,7 @@ ((token.type == OP_PERIOD && dfa->mb_cur_max > 1) || token.type == COMPLEX_BRACKET); #endif - dfa->nexts[dfa->nodes_len] = REG_MISSING; + dfa->nexts[dfa->nodes_len] = -1; re_node_set_init_empty (dfa->edests + dfa->nodes_len); re_node_set_init_empty (dfa->eclosures + dfa->nodes_len); return dfa->nodes_len++; diff -Nru grep-2.24/lib/regex_internal.h grep-2.25/lib/regex_internal.h --- grep-2.24/lib/regex_internal.h 2016-01-28 08:00:37.000000000 +0000 +++ grep-2.25/lib/regex_internal.h 2016-04-10 16:50:01.000000000 +0000 @@ -151,31 +151,22 @@ # define __attribute__(arg) #endif -typedef __re_idx_t Idx; -#ifdef _REGEX_LARGE_OFFSETS -# define IDX_MAX (SIZE_MAX - 2) -#else -# define IDX_MAX INT_MAX -#endif - -/* Special return value for failure to match. */ -#define REG_MISSING ((Idx) -1) - -/* Special return value for internal error. */ -#define REG_ERROR ((Idx) -2) - -/* Test whether N is a valid index, and is not one of the above. */ -#ifdef _REGEX_LARGE_OFFSETS -# define REG_VALID_INDEX(n) ((Idx) (n) < REG_ERROR) -#else -# define REG_VALID_INDEX(n) (0 <= (n)) +#ifndef SSIZE_MAX +# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) #endif -/* Test whether N is a valid nonzero index. */ +/* The type of indexes into strings. This is signed, not size_t, + since the API requires indexes to fit in regoff_t anyway, and using + signed integers makes the code a bit smaller and presumably faster. + The traditional GNU regex implementation uses int for indexes. + The POSIX-compatible implementation uses a possibly-wider type. + The name 'Idx' is three letters to minimize the hassle of + reindenting a lot of regex code that formerly used 'int'. */ +typedef regoff_t Idx; #ifdef _REGEX_LARGE_OFFSETS -# define REG_VALID_NONZERO_INDEX(n) ((Idx) ((n) - 1) < (Idx) (REG_ERROR - 1)) +# define IDX_MAX SSIZE_MAX #else -# define REG_VALID_NONZERO_INDEX(n) (0 < (n)) +# define IDX_MAX INT_MAX #endif /* A hash value, suitable for computing hash tables. */ diff -Nru grep-2.24/lib/stdalign.in.h grep-2.25/lib/stdalign.in.h --- grep-2.24/lib/stdalign.in.h 2016-01-28 08:00:37.000000000 +0000 +++ grep-2.25/lib/stdalign.in.h 2016-04-10 16:50:01.000000000 +0000 @@ -103,15 +103,15 @@ # elif ((defined __APPLE__ && defined __MACH__ \ ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ : __GNUC__) \ - || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ - || __ICC || 0x590 <= __SUNPRO_C) + || 061200 <= __HP_cc || 061200 <= __HP_aCC \ + || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__) # define _Alignas(a) __attribute__ ((__aligned__ (a))) # elif 1300 <= _MSC_VER # define _Alignas(a) __declspec (align (a)) # endif #endif #if ((defined _Alignas && ! (defined __cplusplus && 201103 <= __cplusplus)) \ - || (defined __STDC_VERSION && 201112 <= __STDC_VERSION__)) + || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) # define alignas _Alignas #endif #if defined alignas || (defined __cplusplus && 201103 <= __cplusplus) diff -Nru grep-2.24/lib/stddef.in.h grep-2.25/lib/stddef.in.h --- grep-2.24/lib/stddef.in.h 2016-01-28 08:00:37.000000000 +0000 +++ grep-2.25/lib/stddef.in.h 2016-04-10 16:50:01.000000000 +0000 @@ -81,8 +81,10 @@ # define wchar_t int #endif -/* Some platforms lack max_align_t. */ -#if !@HAVE_MAX_ALIGN_T@ +/* Some platforms lack max_align_t. The check for _GCC_MAX_ALIGN_T is + a hack in case the configure-time test was done with g++ even though + we are currently compiling with gcc. */ +#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T) /* On the x86, the maximum storage alignment of double, long, etc. is 4, but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8, and the C11 standard allows this. Work around this problem by diff -Nru grep-2.24/m4/d-ino.m4 grep-2.25/m4/d-ino.m4 --- grep-2.24/m4/d-ino.m4 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/m4/d-ino.m4 2016-04-10 16:49:32.000000000 +0000 @@ -1,4 +1,4 @@ -# serial 14 +# serial 15 dnl From Jim Meyering. dnl @@ -34,6 +34,7 @@ return 3; if (e->d_ino != st.st_ino) return 4; + closedir (dp); return 0; ]])], [gl_cv_struct_dirent_d_ino=yes], diff -Nru grep-2.24/m4/extern-inline.m4 grep-2.25/m4/extern-inline.m4 --- grep-2.24/m4/extern-inline.m4 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/m4/extern-inline.m4 2016-04-10 16:49:32.000000000 +0000 @@ -54,6 +54,7 @@ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ : (199901L <= __STDC_VERSION__ \ && !defined __HP_cc \ + && !defined __PGI \ && !(defined __SUNPRO_C && __STDC__))) \ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) # define _GL_INLINE inline diff -Nru grep-2.24/m4/getcwd.m4 grep-2.25/m4/getcwd.m4 --- grep-2.24/m4/getcwd.m4 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/m4/getcwd.m4 2016-04-10 16:49:32.000000000 +0000 @@ -6,7 +6,7 @@ # with or without modifications, as long as this notice is preserved. # Written by Paul Eggert. -# serial 12 +# serial 13 AC_DEFUN([gl_FUNC_GETCWD_NULL], [ @@ -15,6 +15,7 @@ AC_CACHE_CHECK([whether getcwd (NULL, 0) allocates memory for result], [gl_cv_func_getcwd_null], [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ +# include # if HAVE_UNISTD_H # include # else /* on Windows with MSVC */ @@ -39,6 +40,7 @@ return 3; if (f[1] != '\0') return 4; + free (f); return 0; } #endif diff -Nru grep-2.24/m4/gnulib-comp.m4 grep-2.25/m4/gnulib-comp.m4 --- grep-2.24/m4/gnulib-comp.m4 2016-01-28 08:00:46.000000000 +0000 +++ grep-2.25/m4/gnulib-comp.m4 2016-04-10 16:50:10.000000000 +0000 @@ -159,6 +159,7 @@ # Code from module gnumakefile: # Code from module gnupload: # Code from module gperf: + # Code from module hard-locale: # Code from module hash: # Code from module hash-pjw: # Code from module hash-tests: @@ -575,6 +576,7 @@ m4_defn([m4_PACKAGE_VERSION])), [1], [], [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], [GNUmakefile=$GNUmakefile])]) + gl_HARD_LOCALE gl_I_RING AM_ICONV m4_ifdef([gl_ICONV_MODULE_INDICATOR], @@ -1270,6 +1272,8 @@ lib/glthread/lock.c lib/glthread/lock.h lib/glthread/threadlib.c + lib/hard-locale.c + lib/hard-locale.h lib/hash.c lib/hash.h lib/i-ring.c @@ -1493,6 +1497,7 @@ m4/gettimeofday.m4 m4/glibc21.m4 m4/gnulib-common.m4 + m4/hard-locale.m4 m4/i-ring.m4 m4/iconv.m4 m4/iconv_h.m4 diff -Nru grep-2.24/m4/hard-locale.m4 grep-2.25/m4/hard-locale.m4 --- grep-2.24/m4/hard-locale.m4 1970-01-01 00:00:00.000000000 +0000 +++ grep-2.25/m4/hard-locale.m4 2016-02-03 05:46:26.000000000 +0000 @@ -0,0 +1,11 @@ +# hard-locale.m4 serial 8 +dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl No prerequisites of lib/hard-locale.c. +AC_DEFUN([gl_HARD_LOCALE], +[ + : +]) diff -Nru grep-2.24/m4/malloc.m4 grep-2.25/m4/malloc.m4 --- grep-2.24/m4/malloc.m4 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/m4/malloc.m4 2016-04-10 16:49:32.000000000 +0000 @@ -1,4 +1,4 @@ -# malloc.m4 serial 14 +# malloc.m4 serial 15 dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,8 +6,8 @@ m4_version_prereq([2.70], [] ,[ -# This is taken from the following Autoconf patch: -# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9 +# This is adapted with modifications from upstream Autoconf here: +# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c AC_DEFUN([_AC_FUNC_MALLOC_IF], [ AC_REQUIRE([AC_HEADER_STDC])dnl @@ -23,7 +23,10 @@ char *malloc (); #endif ]], - [[return ! malloc (0);]]) + [[char *p = malloc (0); + int result = !p; + free (p); + return result;]]) ], [ac_cv_func_malloc_0_nonnull=yes], [ac_cv_func_malloc_0_nonnull=no], diff -Nru grep-2.24/m4/mbrtowc.m4 grep-2.25/m4/mbrtowc.m4 --- grep-2.24/m4/mbrtowc.m4 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/m4/mbrtowc.m4 2016-04-10 16:49:32.000000000 +0000 @@ -1,4 +1,4 @@ -# mbrtowc.m4 serial 26 -*- coding: utf-8 -*- +# mbrtowc.m4 serial 27 -*- coding: utf-8 -*- dnl Copyright (C) 2001-2002, 2004-2005, 2008-2016 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -40,6 +40,7 @@ gl_MBRTOWC_RETVAL gl_MBRTOWC_NUL_RETVAL gl_MBRTOWC_EMPTY_INPUT + gl_MBRTOWC_C_LOCALE case "$gl_cv_func_mbrtowc_null_arg1" in *yes) ;; *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1], @@ -76,6 +77,13 @@ REPLACE_MBRTOWC=1 ;; esac + case $gl_cv_C_locale_sans_EILSEQ in + *yes) ;; + *) AC_DEFINE([C_LOCALE_MAYBE_EILSEQ], [1], + [Define to 1 if the C locale may have encoding errors.]) + REPLACE_MBRTOWC=1 + ;; + esac fi fi ]) @@ -577,6 +585,46 @@ ]) ]) +dnl Test whether mbrtowc reports encoding errors in the C locale. +dnl Although POSIX was never intended to allow this, the GNU C Library +dnl and other implementations do it. See: +dnl https://sourceware.org/bugzilla/show_bug.cgi?id=19932 + +AC_DEFUN([gl_MBRTOWC_C_LOCALE], +[ + AC_CACHE_CHECK([whether the C locale is free of encoding errors], + [gl_cv_C_locale_sans_EILSEQ], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. + gl_cv_C_locale_sans_EILSEQ="guessing no" + + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + #include + ]], [[ + int i; + char *locale = setlocale (LC_ALL, "C"); + if (! locale) + return 1; + for (i = CHAR_MIN; i <= CHAR_MAX; i++) + { + char c = i; + wchar_t wc; + mbstate_t mbs = { 0, }; + size_t ss = mbrtowc (&wc, &c, 1, &mbs); + if (1 < ss) + return 1; + } + return 0; + ]])], + [gl_cv_C_locale_sans_EILSEQ=yes], + [gl_cv_C_locale_sans_EILSEQ=no], + [:])]) +]) + # Prerequisites of lib/mbrtowc.c. AC_DEFUN([gl_PREREQ_MBRTOWC], [ : diff -Nru grep-2.24/m4/realloc.m4 grep-2.25/m4/realloc.m4 --- grep-2.24/m4/realloc.m4 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/m4/realloc.m4 2016-04-10 16:49:32.000000000 +0000 @@ -1,4 +1,4 @@ -# realloc.m4 serial 13 +# realloc.m4 serial 14 dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,8 +6,8 @@ m4_version_prereq([2.70], [] ,[ -# This is taken from the following Autoconf patch: -# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9 +# This is adapted with modifications from upstream Autoconf here: +# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c AC_DEFUN([_AC_FUNC_REALLOC_IF], [ AC_REQUIRE([AC_HEADER_STDC])dnl @@ -23,7 +23,10 @@ char *realloc (); #endif ]], - [[return ! realloc (0, 0);]]) + [[char *p = realloc (0, 0); + int result = !p; + free (p); + return result;]]) ], [ac_cv_func_realloc_0_nonnull=yes], [ac_cv_func_realloc_0_nonnull=no], diff -Nru grep-2.24/m4/regex.m4 grep-2.25/m4/regex.m4 --- grep-2.24/m4/regex.m4 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/m4/regex.m4 2016-04-10 16:49:32.000000000 +0000 @@ -1,4 +1,4 @@ -# serial 65 +# serial 66 # Copyright (C) 1996-2001, 2003-2016 Free Software Foundation, Inc. # @@ -93,6 +93,7 @@ 0, sizeof data - 1, ®s) != -1) result |= 1; + regfree (®ex); } { @@ -124,6 +125,7 @@ if (i != 0 && i != 21) result |= 1; } + regfree (®ex); } if (! setlocale (LC_ALL, "C")) diff -Nru grep-2.24/m4/stdint.m4 grep-2.25/m4/stdint.m4 --- grep-2.24/m4/stdint.m4 2016-02-03 05:46:26.000000000 +0000 +++ grep-2.25/m4/stdint.m4 2016-04-10 16:49:32.000000000 +0000 @@ -1,4 +1,4 @@ -# stdint.m4 serial 43 +# stdint.m4 serial 44 dnl Copyright (C) 2001-2016 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -70,6 +70,8 @@ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ +#define __STDC_CONSTANT_MACROS 1 +#define __STDC_LIMIT_MACROS 1 #include /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in . */ #if !(defined WCHAR_MIN && defined WCHAR_MAX) @@ -218,6 +220,8 @@ AC_RUN_IFELSE([ AC_LANG_PROGRAM([[ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ +#define __STDC_CONSTANT_MACROS 1 +#define __STDC_LIMIT_MACROS 1 #include ] gl_STDINT_INCLUDES @@ -279,6 +283,29 @@ ]) fi if test "$gl_cv_header_working_stdint_h" = yes; then + dnl Now see whether the system works without + dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined. + AC_CACHE_CHECK([whether stdint.h predates C++11], + [gl_cv_header_stdint_predates_cxx11_h], + [gl_cv_header_stdint_predates_cxx11_h=yes + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ +#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ +#include +] +gl_STDINT_INCLUDES +[ +intmax_t im = INTMAX_MAX; +int32_t i32 = INT32_C (0x7fffffff); + ]])], + [gl_cv_header_stdint_predates_cxx11_h=no])]) + + if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then + AC_DEFINE([__STDC_CONSTANT_MACROS], [1], + [Define to 1 if the system predates C++11.]) + AC_DEFINE([__STDC_LIMIT_MACROS], [1], + [Define to 1 if the system predates C++11.]) + fi STDINT_H= else dnl Check for , and for diff -Nru grep-2.24/Makefile.am grep-2.25/Makefile.am --- grep-2.24/Makefile.am 2016-03-06 01:12:17.000000000 +0000 +++ grep-2.25/Makefile.am 2016-04-03 00:45:51.000000000 +0000 @@ -73,12 +73,12 @@ $(AM_V_GEN)rm -f $@-t $@; \ { \ $(prologue); echo; \ - { perl -ne '/^$$/.../^$$/ and print' $(srcdir)/THANKS.in \ - | grep -v '^$$' | perl -pe 's/ +/\0/'; \ + { perl -ne '/^$$/.../^$$/ and !/^$$/ and s/ +/\0/ and print' \ + $(srcdir)/THANKS.in; \ git log --pretty=format:'%aN%x00%aE' \ | $(ASSORT) -u; \ } | $(srcdir)/thanks-gen \ - | LC_ALL=en_US.UTF-8 sort -f; \ + | LC_ALL=en_US.UTF-8 sort -k1,1; \ echo; \ printf ';; %s\n' 'Local Variables:' 'coding: utf-8' End:; \ } > $@-t && chmod a-w $@-t && mv $@-t $@ diff -Nru grep-2.24/Makefile.in grep-2.25/Makefile.in --- grep-2.24/Makefile.in 2016-03-07 17:49:07.000000000 +0000 +++ grep-2.25/Makefile.in 2016-04-22 04:03:07.000000000 +0000 @@ -116,7 +116,8 @@ $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/i-ring.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/i-ring.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/iconv_open.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ @@ -1703,12 +1704,12 @@ $(AM_V_GEN)rm -f $@-t $@; \ { \ $(prologue); echo; \ - { perl -ne '/^$$/.../^$$/ and print' $(srcdir)/THANKS.in \ - | grep -v '^$$' | perl -pe 's/ +/\0/'; \ + { perl -ne '/^$$/.../^$$/ and !/^$$/ and s/ +/\0/ and print' \ + $(srcdir)/THANKS.in; \ git log --pretty=format:'%aN%x00%aE' \ | $(ASSORT) -u; \ } | $(srcdir)/thanks-gen \ - | LC_ALL=en_US.UTF-8 sort -f; \ + | LC_ALL=en_US.UTF-8 sort -k1,1; \ echo; \ printf ';; %s\n' 'Local Variables:' 'coding: utf-8' End:; \ } > $@-t && chmod a-w $@-t && mv $@-t $@ diff -Nru grep-2.24/NEWS grep-2.25/NEWS --- grep-2.24/NEWS 2016-03-11 05:38:23.000000000 +0000 +++ grep-2.25/NEWS 2016-04-22 04:05:28.000000000 +0000 @@ -1,5 +1,28 @@ GNU grep NEWS -*- outline -*- +* Noteworthy changes in release 2.25 (2016-04-21) [stable] + +** Bug fixes + + In the C or POSIX locale, grep now treats all bytes as valid + characters even if the C runtime library says otherwise. The + revised behavior is more compatible with the original intent of + POSIX, and the next release of POSIX will likely make this official. + [bug introduced in grep-2.23] + + grep -Pz no longer mistakenly diagnoses patterns like [^a] that use + negated character classes. [bug introduced in grep-2.24] + + grep -oz now uses null bytes, not newlines, to terminate output lines. + [bug introduced in grep-2.5] + +** Improvements + + grep now outputs details more consistently when reporting a write error. + E.g., "grep: write error: No space left on device" rather than just + "grep: write error". + + * Noteworthy changes in release 2.24 (2016-03-10) [stable] ** Bug fixes Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/af.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/af.gmo differ diff -Nru grep-2.24/po/af.po grep-2.25/po/af.po --- grep-2.24/po/af.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/af.po 2016-04-22 04:37:24.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: grep 2.5g\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2004-03-03 13:33+0200\n" "Last-Translator: Petri Jooste \n" "Language-Team: Afrikaans \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "" @@ -101,7 +101,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opsie `%s' benodig 'n parameter\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "geheue uitgeput" @@ -225,7 +225,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "" @@ -392,116 +392,116 @@ msgid "%s%s argument '%s' too large" msgstr "" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 #, fuzzy msgid "unbalanced [" msgstr "Ongebalanseerde [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" -#: src/dfa.c:1245 +#: src/dfa.c:1230 #, fuzzy msgid "unfinished \\ escape" msgstr "Onbeindigde \\-ontsnapstring" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "ongeldige maks-telling" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "" -#: src/dfa.c:1811 +#: src/dfa.c:1796 #, fuzzy msgid "unbalanced (" msgstr "Ongebalanseerde (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 #, fuzzy msgid "no syntax specified" msgstr "Geen sintaks gespesifiseer" -#: src/dfa.c:1945 +#: src/dfa.c:1930 #, fuzzy msgid "unbalanced )" msgstr "Ongebalanseerde )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "ongeldige konteks-lengte-parameter" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "toevoer is te veel om te tel" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Binre ler %s pas\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, fuzzy, c-format msgid "warning: %s: %s" msgstr "waarskuwing: %s: %s\n" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekursiewe lus van gidsinskrywings" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standaardtoevoer)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Gebruik so: %s [OPSIE]... PATROON [LER]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Probeer `%s --help' vir meer inligting.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" -#: src/grep.c:1808 +#: src/grep.c:1846 #, fuzzy, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -513,7 +513,7 @@ "\n" "Relmatige uitdrukking-seleksie en -interpretasie:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -528,7 +528,7 @@ " -G, --basic-regexp PATROON is 'n basic regular expression\n" " -P, --perl-regexp PATROON is 'n Perl regular expression\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, fuzzy, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -546,7 +546,7 @@ " -z, --null-data elke datarel eindig met 'n 0-greep, nie 'n " "nuwerelkarakter nie\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -564,7 +564,7 @@ " --help wys hierdie hulpboodskap en stop\n" " --mmap gebruik geheue-gebonde toevoer indien moontlik\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -579,7 +579,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -589,7 +589,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -601,7 +601,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -612,7 +612,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -622,7 +622,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -632,7 +632,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, fuzzy, c-format msgid "" " -NUM same as --context=NUM\n" @@ -665,14 +665,14 @@ "Indien minder as twee LERs gegee is, aanvaar -h. Uittreestatus is\n" " 0 vir passing, 1 vir geen passing, en 2 vir probleemgevalle.\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" "Direct invocation as either 'egrep' or 'fgrep' is deprecated.\n" msgstr "" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -682,32 +682,32 @@ "if any error occurs and -q is not given, the exit status is 2.\n" msgstr "" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "teenstrydige passers is gespesifiseer" -#: src/grep.c:1969 +#: src/grep.c:2007 #, fuzzy, c-format msgid "invalid matcher %s" msgstr "ongeldige maks-telling" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "onbekende metode vir toestelle" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "ongeldige maks-telling" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "onbekende binre-lertipe" @@ -738,32 +738,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/be.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/be.gmo differ diff -Nru grep-2.24/po/be.po grep-2.25/po/be.po --- grep-2.24/po/be.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/be.po 2016-04-22 04:37:24.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: grep 2.5g\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2003-07-22 17:18+0300\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "" @@ -98,7 +98,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: выбар \"%s\" патрабуе довад\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "памяць вычарпана" @@ -210,7 +210,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "" @@ -377,116 +377,116 @@ msgid "%s%s argument '%s' too large" msgstr "" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 #, fuzzy msgid "unbalanced [" msgstr "Неўраўнаважаная [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" -#: src/dfa.c:1245 +#: src/dfa.c:1230 #, fuzzy msgid "unfinished \\ escape" msgstr "Незавершаная \\ кіруючая пасьлядоўнасьць" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "недапушчальны найбольшы лічыльнік" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "" -#: src/dfa.c:1811 +#: src/dfa.c:1796 #, fuzzy msgid "unbalanced (" msgstr "Неўраважаная (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 #, fuzzy msgid "no syntax specified" msgstr "Сынтаксіс нявызначаны" -#: src/dfa.c:1945 +#: src/dfa.c:1930 #, fuzzy msgid "unbalanced )" msgstr "Неўраўнаважаная )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "недапушчальны довад даўжыні кантэксту" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "увод занадта вялікі для падліку" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Супадзеньні двайковага файла %s\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, fuzzy, c-format msgid "warning: %s: %s" msgstr "Увага! %s: %s\n" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "тэчкі зацыклены" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(стандартны ўвод)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Выкарыстаньне: %s [ВЫБАР]... УЗОР [ФАЙЛ]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" -#: src/grep.c:1808 +#: src/grep.c:1846 #, fuzzy, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -498,7 +498,7 @@ "\n" "Выбар і тлумачэньне выразаў:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -512,7 +512,7 @@ " -G, --basic-regexp УЗОР - гэта асноўны сталы выраз.\n" " -P, --perl-regexp УЗОР - гэта сталы выраз на Perl.\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, fuzzy, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -531,7 +531,7 @@ " -z, --null-data Радок даньняў павінен мець канчатак ў выглядзе\n" " нулявога байта, замест знака новага радка.\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -550,7 +550,7 @@ " --mmap Выкарыстоўваць memory-mapped, калі гэта " "магчыма.\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -565,7 +565,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -575,7 +575,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -587,7 +587,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -598,7 +598,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -608,7 +608,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -618,7 +618,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, fuzzy, c-format msgid "" " -NUM same as --context=NUM\n" @@ -651,14 +651,14 @@ "роўны 0, калі ё супадзеньні, 1, калі супадзеньняў няма й 2 у выпадку " "памылкі.\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" "Direct invocation as either 'egrep' or 'fgrep' is deprecated.\n" msgstr "" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -668,32 +668,32 @@ "if any error occurs and -q is not given, the exit status is 2.\n" msgstr "" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "заданы супярэчлівыя супадальнікі" -#: src/grep.c:1969 +#: src/grep.c:2007 #, fuzzy, c-format msgid "invalid matcher %s" msgstr "недапушчальны найбольшы лічыльнік" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "невядомы мэтад пралад" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "недапушчальны найбольшы лічыльнік" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "невядомы від дваічнага файла" @@ -724,32 +724,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/bg.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/bg.gmo differ diff -Nru grep-2.24/po/bg.po grep-2.25/po/bg.po --- grep-2.24/po/bg.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/bg.po 2016-04-22 04:37:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grep-2.21.78\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2015-11-26 21:58+0200\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" @@ -31,7 +31,7 @@ msgid "Valid arguments are:" msgstr "Възможните аргументи са:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "грешка при запис" @@ -100,7 +100,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: опцията „-W %s“ изисква аргумент\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "паметта е изчерпана" @@ -213,7 +213,7 @@ msgid "Unmatched ) or \\)" msgstr "„)“ или „\\)“ без еш" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Липсва предхождащ регулярен израз" @@ -409,112 +409,112 @@ msgid "%s%s argument '%s' too large" msgstr "прекалено дълъг аргумент „%3$s“ за опцията „%1$s%2$s“" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "„[“ без еш" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "неправилен клас за знаци" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "синтаксисът на класовете от знаци е „[[:space:]]“, а не „[:space:]“" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "незавършена екранираща последователност чрез „\\“" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "неправилно съдържание в „\\{\\}“" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "прекалено голям регулярен израз" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "„(“ без еш" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "не е зададен синтаксис" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "„)“ без еш" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "и др., вижте " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "неправилен размер на контекста" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "входните данни са прекалено големи, за да бъдат преброени" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "неуспешно изпълнение на „lseek“" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Двоичният файл „%s“ напасва\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "предупреждение: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "зацикляне при рекурсивна обработка на директориите" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "входният файл „%s“ е и изходен" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(стандартен вход)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Употреба: %s [ОПЦИЯ]… ШАБЛОН [ФАЙЛ]…\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Вижте „%s --help“ за повече информация.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" "Търсене на текст, напасващ с ШАБЛОНа във всеки зададен ФАЙЛ или от " "стандартния вход.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "Стандартно ШАБЛОНът е основен регулярен израз.\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -525,7 +525,7 @@ "\n" "Избор на вида регулярен израз и интерпретация:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -539,7 +539,7 @@ " -G, --basic-regexp ШАБЛОНът е основен регулярен израз\n" " -P, --perl-regexp ШАБЛОНът е регулярен израз на Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -557,7 +557,7 @@ " -z, --null-data редовете завършват с NULL, а не със знак за нов " "ред\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -574,7 +574,7 @@ " -V, --version извеждане на информация за версията и изход\n" " --help извеждане на помощна информация и изход\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -602,7 +602,7 @@ " --label=ЕТИКЕТ използване на ЕТИКЕТ като име за стандартния " "вход\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -619,7 +619,7 @@ " или „without-match“ (без съвпадение).\n" " -a, --text същото като „--binary-files=text“\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -642,7 +642,7 @@ " „skip“ (пропускане)\n" " -R, -r, --recursive същото като „--directories=recurse“\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -664,7 +664,7 @@ " пропускане на директории с имена, напасващи\n" " ШАБЛОНа_ЗА_ИМЕ\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -682,7 +682,7 @@ " -T, --initial-tab подравняване на табулациите при необходимост\n" " -Z, --null извеждане на знак NULL след всяко име на файл\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -698,7 +698,7 @@ " -C, --context=БРОЙ извеждане на този БРОЙ предхождащи и следващи\n" " редове\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -722,7 +722,7 @@ " -u, --unix-byte-offsets отместванията се изчисляват сякаш знаците „CR“\n" " липсват (DOS/Windows)\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -731,7 +731,7 @@ "„egrep“ е същото като „grep -E“, а „fgrep“ е същото като „grep -F“.\n" "Стартирането чрез „egrep“ и „fgrep“ е остаряло — ползвайте изрични опции.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -746,17 +746,17 @@ "случаи. Ако не е зададена опцията „-q“ и възникне грешка, изходният код е " "2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "зададените изрази за съвпадение са в конфликт" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "неправилен израз „%s“" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" @@ -764,17 +764,17 @@ "на\n" "обвивката или скрипт" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "неизвестен метод за обработка на специалните файлове" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "неправилен максимален брой" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "непознат вид двоичен файл" @@ -809,32 +809,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "вътрешна грешка, която не трябва да възниква — молим да я докладвате" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "вътрешна грешка, която не трябва да възниква — молим да я докладвате" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "максималният размер на реда за „PCRE“ е превишен" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "паметта за стека за изпълнение на шаблоните за „PCRE“ свърши" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "максималният брой връщания при рекурсия на „PCRE“ е превишен" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "вътрешна грешка на „PCRE“: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/ca.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/ca.gmo differ diff -Nru grep-2.24/po/ca.po grep-2.25/po/ca.po --- grep-2.24/po/ca.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/ca.po 2016-04-22 04:37:24.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: GNU grep-2.20.72\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2014-12-28 14:04+0100\n" "Last-Translator: Àngel Mompó \n" "Language-Team: Catalan \n" @@ -33,7 +33,7 @@ msgid "Valid arguments are:" msgstr "Els arguments vàlids són:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "error d'escriptura" @@ -102,7 +102,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: l'opció «-W %s» necessita un argument\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "memòria exhaurida" @@ -215,7 +215,7 @@ msgid "Unmatched ) or \\)" msgstr "Falten o sobren ) o \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "No hi ha una expressió regular prèvia" @@ -410,110 +410,110 @@ msgid "%s%s argument '%s' too large" msgstr "l'argument «%s» de %s%s és massa gran" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "[ desaparellat" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "La classe de caràcter no és vàlida" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "La sintaxi de la classe de caràcter és [[:espai]], no [:espai:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "Codi d'escapada \\ inacabat" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "el context de \\{\\} no és vàlid" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "l'expressió regular és massa gran" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "( desaparellat" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "no s'ha especificat cap sintaxi" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr ") desaparellat" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "la resta, vegeu " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "la longitud de l'argument no és vàlida" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "l'entrada és massa llarga per a comptar" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "l'lseek ha fallat" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Hi ha coincidències en el fitxer binari %s\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "aví­s: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "bucle de directori recursiu" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "el fitxer d'entrada %s és també la sortida" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(entrada estàndard)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Forma d'ús: %s [OPCIÓ]... PATRÓ [FITXER] ...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Feu servir «%s --help» per a obtenir més informació.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Busca el PATRÓ a cada FITXER o a l'entrada estàndard.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "El PATRÓ és, per defecte, una expressió regular bàsica (ERB).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -524,7 +524,7 @@ "\n" "Selecció i interpretació de l'expressió regular:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -538,7 +538,7 @@ " -G, --basic-regexp PATRÓ és un expressió regular bàsica (ERB)\n" " -P, --perl-regexp PATRÓ és un expressió regular de Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -558,7 +558,7 @@ " -z, --null-data considera que una lí­nia de dades acaba amb byte " "0 i no amb un salt de línia\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -575,7 +575,7 @@ " -V, --version mostra la informació sobre la versió i surt\n" " --help mostra aquesta ajuda i surt\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -602,7 +602,7 @@ " --label=ETIQUETA fes servir ETIQUETA com a prefix del nom del " "fitxer per l'entrada estàndard\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -620,7 +620,7 @@ "match»\n" " -a, --text equivalent a --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -640,7 +640,7 @@ " -R, --dereference-recursive igual que l'anterior, però segueix tots els " "enllaços simbòlics\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -659,7 +659,7 @@ " --exclude-dir=PATRÓ salta els directoris que coincideixin amb el " "PATRÓ.\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -677,7 +677,7 @@ " -T, --initial-tab alinea les tabulacions (si cal)\n" " -Z, --null mostra 0 byte després del nom de FITXER\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -695,7 +695,7 @@ " -C, --context=NOMBRE mostra un NOMBRE de línies del context de " "sortida\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -720,7 +720,7 @@ " (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -729,7 +729,7 @@ "«egrep» ara és «grep -E». «fgrep» ara és «grep -F».\n" "La crida directa tant de «egrep» com de «fgrep» és obsoleta.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -745,32 +745,32 @@ "L'estat de sortida és 0 si s'havia seleccionat alguna línia, si no 1.\n" "Si hi ha algun error i no s'ha indicat -q, l'estat de sortida és 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "s'han especificat expressions conflictives" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "l'expressió %s no és vàlida" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "avís: GREP_OPTIONS està desfasat; feu servir un alies o un script" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "el mètode de dispositius és desconegut" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "el comptador de màxims no és vàlid" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "el tipus de fitxer binari és desconegut" @@ -803,34 +803,34 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "error intern (no hauria de passar mai)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "error intern" # PCRE is 'Perl Compatible Regular Expression' -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "s'ha superat el límit de longitud de línia del PCRE" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" # PCRE is 'Perl Compatible Regular Expression' -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "s'ha superat el límit de l'estratègia «tornada enrere» del PCRE" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "error intern del PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/cs.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/cs.gmo differ diff -Nru grep-2.24/po/cs.po grep-2.25/po/cs.po --- grep-2.24/po/cs.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/cs.po 2016-04-22 04:37:24.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: grep 2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2016-03-04 17:26+01:00\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -33,7 +33,7 @@ msgid "Valid arguments are:" msgstr "Platné argumenty jsou:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "chyba při zápisu" @@ -102,7 +102,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: přepínač „-W %s“ vyžaduje argument\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "paměť vyčerpána" @@ -214,7 +214,7 @@ msgid "Unmatched ) or \\)" msgstr "Nepárový ) nebo \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Žádný předchozí regulární výraz" @@ -409,101 +409,101 @@ msgid "%s%s argument '%s' too large" msgstr "argument „%3$s“ u %1$s%2$s je příliš dlouhý" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "nevyvážená [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "neplatný třída znaků" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "zápis třídy znaků je [[:space:]], ne [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "neukončená escape sekvence \\" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "neplatný obsah \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "regulární výraz je příliš velký" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "nevyvážená (" # ? Není zadaná syntaxe -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "syntaxe není určena" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "nevyvážená )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "další, vizte " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "neplatný argument délky kontextu" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "počet vstupních řádků nelze spočítat (je jich hodně)" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "posun v souboru (lseek) se nezdařil" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Binární soubor %s odpovídá\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "varování: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "smyčka pro rekurzivní průchod" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "vstupní soubor %s je rovněž výstupem" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standardní vstup)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Použití: %s [PŘEPÍNAČ]… VZOREK [SOUBOR]…\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Více informací získáte příkazem „%s --help“.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" @@ -511,13 +511,13 @@ "postupně\n" "ze všech zadaných SOUBORů nebo ze standardního vstupu.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" "VZOREK představuje základní regulární výraz (BRE), pokud není řečeno jinak.\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -528,7 +528,7 @@ "\n" "Výběr a interpretace regulárního výrazu:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -542,7 +542,7 @@ " -G, --basic-regexp VZOREK je základní regulární výraz (BRE)\n" " -P, --perl-regexp VZOREK je regulární výraz z jazyka Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -560,7 +560,7 @@ " -z, --null-data řádek končí nulovým bajtem místo znaku nového " "řádku\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -577,7 +577,7 @@ " -V, --version vypíše označení verze a skončí\n" " --help vypíše tuto nápovědu a skončí\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -604,7 +604,7 @@ " --label=NÁZEV použije NÁZEV jako označení standardního\n" " vstupu na výstupu\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -621,7 +621,7 @@ " nebo „without-match“ (bez vyhovění vzorku)\n" " -a, --text jako --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -645,7 +645,7 @@ " obdobně, jen následuje všechny symbolické " "odkazy\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -665,7 +665,7 @@ " --exclude-dir=VZOREK adresáře, které vyhovují vzorku, budou " "přeskočeny\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -684,7 +684,7 @@ "třeba)\n" " -Z, --null vypíše nulový bajt za jménem SOUBORU\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -699,7 +699,7 @@ " -A, --after-context=POČET vypíše POČET řádků za shodou\n" " -C, --context=POČET vypíše POČET řádků kontextu (před i za shodou)\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -723,7 +723,7 @@ " -u, --unix-byte-offsets vypisuje pozici, jako by CR nebyly v souboru\n" " (MSDOS/Windows)\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -732,7 +732,7 @@ "„egrep“ znamená „grep -E“. „fgrep“ znamená „grep -F“.\n" "Přímé spouštění příkazem „egrep“ nebo „fgrep“ je zastaralé.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -747,33 +747,33 @@ "Návratový kód je 0 při nalezení vyhovujícího řádku, 1 nevyhovoval-li žádný\n" "řádek. Vyskytne-li se chyba a není-li zadán argument -q, bude vrácen kód 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "zadány kolidující vzorky" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "neplatný syntaxe vzorku %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "pozor: proměnná GREP_OPTIONS je zastaralá, prosím, použijte alias nebo skript" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "neznámá metoda obsluhy zařízení" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "neplatný maximální počet" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "neznámý typ binárního souboru" @@ -806,32 +806,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "s přepínači -Pz nejsou podporovány neescapované znaky ^ a $" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "vnitřní chyba (to by se nikdy nemělo stát)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "vnitřní chyba" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "překročeno omezení PCRE na délku řádku" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "JIT zásobník knihovny PCRE vyčerpán" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "překročeno omezení PCRE na hloubku zanoření" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "vnitřní chyba PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/da.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/da.gmo differ diff -Nru grep-2.24/po/da.po grep-2.25/po/da.po --- grep-2.24/po/da.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/da.po 2016-04-22 04:37:24.000000000 +0000 @@ -29,7 +29,7 @@ msgstr "" "Project-Id-Version: grep-2.21.78\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2015-12-03 14:47+0100\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" @@ -52,7 +52,7 @@ msgid "Valid arguments are:" msgstr "Gyldige argumenter er:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "skrivefejl" @@ -121,7 +121,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: flaget '-W %s' kræver et argument\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "hukommelse opbrugt" @@ -234,7 +234,7 @@ msgid "Unmatched ) or \\)" msgstr "Uparret ) eller \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Intet foregående regulært udtryk" @@ -428,111 +428,111 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s-argumentet '%s' er for stort" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "ubalanceret [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "ugyldig tegnklasse" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "syntaksen for tegnklasser er [[:space:]], ikke [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "ufærdig \\-undvigesekvens" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "ugyldigt indhold af \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "regulært udtryk er for stort" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "ubalanceret (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "ingen syntaks angivet" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "ubalanceret )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "andre, se " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "ugyldigt kontekstlængdeargument" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "inddata er for omfattende at optælle" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek mislykkedes" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Binær fil %s stemmer\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "advarsel: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekursiv katalogsløjfe" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "indfilen %s er også udfilen" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standard-inddata)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Brug: %s [FLAG]... MØNSTER [FIL]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Prøv '%s --help' for mere information.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Søg efter MØNSTER i hver FIL eller i standard-inddata.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "MØNSTER er som standard et almindeligt regulært udtryk (BRE).\n" # Nederste linje er en overskrift for en samling af kommandolinjeflag. Oversættelsen er ikke direkte, men opdelingen skulle være klar nok -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -543,7 +543,7 @@ "\n" "Regulære udtryk og fortolkning:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -557,7 +557,7 @@ " -G, --basic-regexp MØNSTER er et almindeligt regulært udtryk (BRE)\n" " -P, --perl-regexp MØNSTER er et Perl-regulært udtryk\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -575,7 +575,7 @@ " -z, --null-data en datalinje slutter med en 0-byte, ikke " "linjeskift\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -592,7 +592,7 @@ " -V, --version vis versionsinformation og afslut\n" " --help vis denne hjælpetekst og afslut\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -617,7 +617,7 @@ " -h, --no-filename undertryk indledende filnavn i udskrift\n" " --label=NAVN udskriv NAVN som filnavn for standard-inddata\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -633,7 +633,7 @@ " TYPE er 'binary', 'text', eller 'without-match'\n" " -a, --text svarer til --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -654,7 +654,7 @@ " -R, --dereference-recursive tilsvarende, men følg alle symlænker\n" # 'spring over' er måske pænere end 'ignorér', men fylder mere, og det er rart at være på <80 kolonner -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -671,7 +671,7 @@ "FIL\n" " --exclude-dir=MØNSTER ignorér kataloger, der matcher MØNSTER.\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -688,7 +688,7 @@ " -T, --initial-tab arrangér tabulatortegn (om nødvendigt)\n" " -Z, --null udskriv 0-byte efter FILnavn\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -703,7 +703,7 @@ " -A, --after-context=ANTAL udskriv ANTAL linjer af efterfølgende tekst\n" " -C, --context=ANTAL udskriv ANTAL linjer af omgivende tekst\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -726,7 +726,7 @@ " der (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -735,7 +735,7 @@ "'egrep' betyder 'grep -E'. 'fgrep' betyder 'grep -F'.\n" "Direkte kørsel som enten 'egrep' eller 'fgrep' er forældet.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -749,34 +749,34 @@ "Afslutningsstatus er 0 hvis mindst én linje blev valgt, ellers 1; hvis der\n" "opstår nogen fejl, og -q ikke blev givet, er afslutningsstatus 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "modstridende søgeudtryk angivet" # en 'matcher' er tydeligvis et substantiv her... mystisk -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "ugyldig matcher %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "advarsel: GREP_OPTIONS er forældet; brug venligst et alias eller skript" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "ukendt enhedsmetode" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "ugyldig angivelse af maksimum" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "ukendt binær filtype" @@ -809,32 +809,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "intern fejl (burde aldrig ske)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "intern fejl" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "overskred maksimal linjelængde for PCRE" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "PCRE JIT-stak tømt" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "overskred tilbagerækkevidde for PCRE" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "intern PCRE-fejl: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/de.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/de.gmo differ diff -Nru grep-2.24/po/de.po grep-2.25/po/de.po --- grep-2.24/po/de.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/de.po 2016-04-22 04:37:24.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: GNU grep 2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" -"PO-Revision-Date: 2016-03-07 14:45+0100\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" +"PO-Revision-Date: 2016-03-08 10:01+0100\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" "Language: de\n" @@ -32,7 +32,7 @@ msgid "Valid arguments are:" msgstr "Gültige Argumente sind:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "Schreibfehler" @@ -79,12 +79,12 @@ #: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: ungültige Option -- „%c“\n" +msgstr "%s: ungültige Option -- „%c“\n" #: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: Option erfordert ein Argument -- „%c“\n" +msgstr "%s: Option erfordert ein Argument -- „%c“\n" #: lib/getopt.c:964 lib/getopt.c:980 #, c-format @@ -101,7 +101,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: Option „-W %s“ erfordert ein Argument\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "Speicher ausgeschöpft" @@ -213,7 +213,7 @@ msgid "Unmatched ) or \\)" msgstr "Kein Gegenstück für ) oder \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Kein vorhergehender regulärer Ausdruck" @@ -245,7 +245,7 @@ msgstr "" "\n" "Lizenz GPLv3+: GNU GPL Version 3 oder neer \n" +"html>.\n" "Dies ist freie Software: Sie können sie ändern und weitergeben.\n" "Es gibt keinerlei Garantien, soweit gesetzlich zulässig.\n" "\n" @@ -371,7 +371,7 @@ "\n" "Melden Sie Übersetzungsfehler an ,\n" -"Programmfehler dagegen (auf Englisch, mit LC_ALL=C) an <%s>.\n" +"Programmfehler dagegen (auf Englisch, mit LC_ALL=C) an <%s>\n" #: lib/version-etc.c:247 #, c-format @@ -411,110 +411,110 @@ # Is this message used only for [ without matching ], # or for ] without [ as well? -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" -msgstr "[ ohne schließendes Gegenstück." +msgstr "[ ohne schließendes Gegenstück" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "Ungültige Zeichenklasse %s" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "die Syntax für Zeichenklassen ist [[:space:]], nicht [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" -msgstr "unbeendete \\-Escape-Sequenz." +msgstr "unbeendete \\-Escape-Sequenz" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "Ungültiger Inhalt von \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "Der reguläre Ausdruck ist zu groß" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" -msgstr "( ohne schließendes Gegenstück." +msgstr "( ohne schließendes Gegenstück" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "es wurde keine Syntax angegeben" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "Schließende ) ohne öffnendes Gegenstück" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "für weitere siehe " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "ungültiges Argument für die Kontextlänge" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "die Eingabe ist zu groß, um gezählt zu werden" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek ist fehlgeschlagen" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" -msgstr "Übereinstimmungen in Binärdatei %s.\n" +msgstr "Übereinstimmungen in Binärdatei %s\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "Warnung: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekursive Verzeichnisschleife" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "die Eingabedatei %s ist auch die Ausgabedatei" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(Standardeingabe)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "„%s --help“ liefert weitere Informationen.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Suche nach MUSTER in jeder DATEI oder der Standardeingabe.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "MUSTER ist normalerweise ein regulärer Standardausdruck (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -525,7 +525,7 @@ "\n" "Auswahl und Interpretation regulärer Ausdrücke:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -533,14 +533,14 @@ " -G, --basic-regexp PATTERN is a basic regular expression (BRE)\n" " -P, --perl-regexp PATTERN is a Perl regular expression\n" msgstr "" -" -E, --extended-regexp MUSTER ist ein erweiterter regulärer Ausdruck.\n" +" -E, --extended-regexp MUSTER ist ein erweiterter regulärer Ausdruck\n" " -F, --fixed-strings MUSTER ist eine Menge durch Zeilenumbruch\n" -" getrennter Zeichenketten.\n" -" -G, --basic-regexp MUSTER ist ein regulärer Standardausdruck.\n" -" -P, --perl-regexp MUSTER ist ein regulärer Ausdruck, \n" -" wie Perl ihn akzeptiert.\n" +" getrennter Zeichenketten\n" +" -G, --basic-regexp MUSTER ist ein regulärer Standardausdruck\n" +" -P, --perl-regexp MUSTER ist ein regulärer Ausdruck, wie Perl\n" +" ihn akzeptiert\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -550,15 +550,15 @@ " -x, --line-regexp force PATTERN to match only whole lines\n" " -z, --null-data a data line ends in 0 byte, not newline\n" msgstr "" -" -e, --regexp=MUSTER MUSTER als regulären Ausdruck verwenden.\n" -" -f, --file=FILE MUSTER aus DATEI lesen.\n" +" -e, --regexp=MUSTER MUSTER als regulären Ausdruck verwenden\n" +" -f, --file=DATEI MUSTER aus DATEI lesen\n" " -i, --ignore-case Unterschied zwischen Groß- und Kleinschreibung\n" -" ignorieren.\n" -" -w, --word-regexp MUSTER passt nur auf ganze Wörter.\n" -" -x, --line-regexp MUSTER passt nur auf ganze Zeilen.\n" -" -z, --null-data Eine Zeile endet mit Nullbyte, nicht Newline.\n" +" ignorieren\n" +" -w, --word-regexp MUSTER passt nur auf ganze Wörter\n" +" -x, --line-regexp MUSTER passt nur auf ganze Zeilen\n" +" -z, --null-data Eine Zeile endet mit Nullbyte, nicht Newline\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -570,12 +570,12 @@ msgstr "" "\n" "Verschiedenes:\n" -" -s, --no-messages Fehlermeldungen unterdrücken.\n" -" -v, --invert-match Nicht-passende Zeilen anzeigen.\n" -" -V, --version Versionsnummer ausgeben und beenden.\n" -" --help Diese Hilfe ausgeben und beenden.\n" +" -s, --no-messages Fehlermeldungen unterdrücken\n" +" -v, --invert-match Nicht-passende Zeilen anzeigen\n" +" -V, --version Versionsnummer ausgeben und beenden\n" +" --help Diese Hilfe ausgeben und beenden\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -603,7 +603,7 @@ " --label=BEZEICHNUNG verwendet BEZEICHNUNG als Präfix für Dateinamen\n" " der Standardeingabe\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -620,7 +620,7 @@ "sein\n" " -a, --text gleichbedeutend mit --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -641,7 +641,7 @@ " -r, --recursive wie --directories=recurse\n" " -R, --dereference-recursive ebenso, folgt aber allen symbolischen Links\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -656,11 +656,11 @@ " --exclude=DATEIMUSTER überspringt Dateien und Verzeichnisse, die \n" " DATEIMUSTER entsprechen\n" " --exclude-from=DATEI überspringt Dateien, die einem Dateimuster\n" -" in DATEI entsprechen\n" +" in DATEI entsprechen.\n" " --exclude-dir=MUSTER Verzeichnisse, die MUSTER entsprechen, werden " "übersprungen\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -678,7 +678,7 @@ " -T, --initial-tab Tabulatoren (wenn nötig) ausrichten\n" " -Z, --null ein 0-Byte nach einem Dateinamen ausgeben\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -695,7 +695,7 @@ "ausgeben\n" " -C, --context=ANZAHL ANZAHL Zeilen Kontext ausgeben\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -708,16 +708,16 @@ " (MSDOS/Windows)\n" "\n" msgstr "" -" -ANZAHL Wie --context=ANZAHL.\n" +" -ANZAHL Wie --context=ANZAHL\n" " --color[=WANN], \n" -" --colour=[WANN] Passende Textfragmente markieren.\n" -" WANN kann „always“, „never“ oder „auto“ sein.\n" -" -U, --binary CR-Zeichen am Zeilenende belassen (MSDOS).\n" +" --colour=[WANN] Passende Textfragmente markieren\n" +" WANN kann „always“, „never“ oder „auto“ sein\n" +" -U, --binary CR-Zeichen am Zeilenende belassen (MSDOS)\n" " -u, --unix-byte-offsets Offsets ausgeben, als fehlten CR-Zeichen " -"(MSDOS).\n" +"(MSDOS)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -726,7 +726,7 @@ "„egrep“ bedeutet „grep -E“ und „fgrep“ bedeutet „grep -F“.\n" "Der direkte Aufruf als entweder „egrep“ oder „fgrep“ ist veraltet.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -735,41 +735,41 @@ "Exit status is 0 if any line is selected, 1 otherwise;\n" "if any error occurs and -q is not given, the exit status is 2.\n" msgstr "" -"Wenn DATEI - ist, wird die Standardeingabe gelesen. Ohne DATEI wird „.“\n" +"Wenn DATEI - ist, wird die Standardeingabe gelesen. Ohne DATEI wird „.“\n" "gelesen, wenn -r auf der Befehlszeile angegeben wurde, ansonsten -\n" -"Wenn weniger als zwei FIFOs angegeben wurden, wird -h angenommen.\n" -"Der Rückgabewert ist 0, wenn eine Zeile passte, ansonsten 1.\n" +"Wenn weniger als zwei DATEIen angegeben wurden, wird -h angenommen.\n" +"Der Rückgabewert ist 0, wenn eine Zeile passte, ansonsten 1;\n" "Wenn ein Fehler auftrat und -q nicht angegeben wurde, ist der Rückgabewert " "2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" -msgstr "die angegebenen Entsprechungen stehen in Konflikt zueinander" +msgstr "die angegebenen Suchmuster stehen in Konflikt zueinander" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "ungültige Entsprechung %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "Warnung: GREP_OPTIONS sind veraltet. Bitte benutzen Sie ein Alias oder ein " "Skript" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "Unbekannte Methode für Gerätedateien" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "ungültige Maximalanzahl" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "unbekannter Typ für Binärdateien" @@ -800,34 +800,34 @@ #: src/pcresearch.c:138 #, c-format msgid "unescaped ^ or $ not supported with -Pz" -msgstr "ein nicht geschÚTZTES ^ oder $ wird mit -Pz nicht unterstützt" +msgstr "ein nicht geschütztes ^ oder $ wird mit -Pz nicht unterstützt" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "Interner Fehler (sollte nie vorkommen)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" -msgstr "interner Fehler" +msgstr "Interner Fehler" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "Überschreitung der zulässigen Zeilenlänge von PCREs" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "Kellerspeicher für PCRE JIT ist erschöpft" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "Überschreitung der Zurückverfolgungsbeschränkung des PCREs" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "interner PCRE-Fehler: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/el.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/el.gmo differ diff -Nru grep-2.24/po/el.po grep-2.25/po/el.po --- grep-2.24/po/el.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/el.po 2016-04-22 04:37:24.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grep 2.11.11-pre1\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2012-05-05 23:23+0100\n" "Last-Translator: Savvas Radevic \n" "Language-Team: Greek \n" @@ -33,7 +33,7 @@ msgid "Valid arguments are:" msgstr "Έγκυρες επιλογές είναι οι εξής:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "σφάλμα εγγραφής" @@ -130,7 +130,7 @@ # src/kwset.c:190 # src/grep.c:164 src/grep.c:181 src/grep.c:283 src/grep.c:338 src/kwset.c:184 # src/kwset.c:190 -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "η μνήμη εξαντλήθηκε" @@ -244,7 +244,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Καμία προηγούμενη κανονική έκφραση" @@ -441,67 +441,67 @@ # src/dfa.c:690 src/dfa.c:703 src/dfa.c:704 # src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695 # src/dfa.c:698 src/dfa.c:711 src/dfa.c:712 -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 #, fuzzy msgid "unbalanced [" msgstr "Μη ισορροπημένο [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "άκυρη κατηγορία χαρακτήρων" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "η σύνταξη κατηγορίας χαρακτήρων είναι [[:space:]], όχι [:space:]" # src/dfa.c:444 # src/dfa.c:452 -#: src/dfa.c:1245 +#: src/dfa.c:1230 #, fuzzy msgid "unfinished \\ escape" msgstr "Μη τερματισμένος χαρακτήρας διαφυγής \\" # src/dfa.c:556 src/dfa.c:562 src/dfa.c:573 src/dfa.c:584 # src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592 -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "μη έγκυρος μέγιστος μετρητής" -#: src/dfa.c:1395 +#: src/dfa.c:1380 #, fuzzy msgid "regular expression too big" msgstr "Υπερβολικά μεγάλη η κανονική έκφραση" # src/dfa.c:841 # src/dfa.c:849 -#: src/dfa.c:1811 +#: src/dfa.c:1796 #, fuzzy msgid "unbalanced (" msgstr "Μη ισορροπημένο (" # src/dfa.c:962 # src/dfa.c:970 -#: src/dfa.c:1937 +#: src/dfa.c:1922 #, fuzzy msgid "no syntax specified" msgstr "Δεν ορίστηκε συντακτικό" # src/dfa.c:970 # src/dfa.c:978 -#: src/dfa.c:1945 +#: src/dfa.c:1930 #, fuzzy msgid "unbalanced )" msgstr "Μη ισορροπημένο )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" "άλλοι, κοιτάξτε τον σύνδεσμο \n" "Language-Team: Esperanto \n" @@ -37,7 +37,7 @@ msgid "Valid arguments are:" msgstr "Validaj argumentoj estas:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "skrib-eraro" @@ -106,7 +106,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opcio «-W %s» bezonas argumenton\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "mankas sufiĉa memoro" @@ -218,7 +218,7 @@ msgid "Unmatched ) or \\)" msgstr "Senpara ) aŭ \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Mankas antaŭa regulesprimo" @@ -411,110 +411,110 @@ msgid "%s%s argument '%s' too large" msgstr "argumento de %s%s tro grandas: «%s»" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "senpara [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "nevalida signoklaso" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "sintakso de signoklaso estas ekzemple [[:spaco:]], ne [:spaco:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "nefinita \\-eskapo" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "nevalida enhavo de \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "regulesprimo tro grandas" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "senpara (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "neniu sintakso indikatas" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "senpara )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Majk HERTEL (Mike Haertel)" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "aliuloj, vidu " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "nevalida kuntekstlongeca argumento" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "enigo tro longas por nombri" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "malsukcesis 'lseek'" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Duuma dosiero %s kongruas\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "averto: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rikura ciklo de dosierujoj" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "eniga dosiero %s estas ankaŭ la eliga dosiero; ĝi ignoriĝas" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(ĉefenigujo)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Uzmaniero: %s [OPCIO...] ŜABLONO [DOSIERO...]\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Tajpu '%s --help' por pli da informoj.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Serĉas ŜABLONOn en ĉiu DOSIERO aŭ en ĉefenigujo.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "ŜABLONO defaŭlte estas baza regulesprimo (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -525,7 +525,7 @@ "\n" "Elekto kaj interpreto de regulesprimoj:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -539,7 +539,7 @@ " -G, --basic-regexp ŜABLONO estas baza regulesprimo (BRE)\n" " -P, --perl-regexp ŜABLONO estas regulesprimo de Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -557,7 +557,7 @@ " -z, --null-data datenlinio finiĝas per bitoko 0, ne per " "linifino\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -574,7 +574,7 @@ " -V, --version montri programversion kaj eliri\n" " --help montri ĉi tiun helpon kaj eliri\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -598,7 +598,7 @@ " -h, --no-filename subpremi la prefiksan dosiernomon ĉe eligo\n" " --label=ETIKEDO uzi ETIKEDOn kiel dosiernomon de ĉefenigujo\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -616,7 +616,7 @@ " aŭ 'without-match' (sen-trafa)\n" " -a, --text egalas al «--binary-files=text»\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -635,7 +635,7 @@ " AGO estus 'read' (legi), aŭ 'skip' (ignori)\n" " -R, -r, --recursive egalas al «--directories=recurse»\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -652,7 +652,7 @@ "DSRO\n" " --exclude-dir=ŜABLONO ignori dosierujojn kiuj kongruas kun ŜABLONO\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -668,7 +668,7 @@ " -T, --initial-tab rektigi la TAB-signojn (se necesas)\n" " -Z, --null montri la bitokon «0» post dosiernomo\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -683,7 +683,7 @@ " -A, --after-context=NOM montri NOM liniojn da posta kunteksto\n" " -C, --context=NOMBRO egalas al «-A NOMBRO -B NOMBRO»\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -706,7 +706,7 @@ "(MSDOS)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -715,7 +715,7 @@ "Rekta alvoko kiel aŭ 'egrep' aŭ 'fgrep' malrekomendatas;\n" "'egrep' signifas 'grep -E; 'fgrep' signifas 'grep -F'.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -730,32 +730,32 @@ "Elirstato estas 0 se iu linio elektiĝis, alie 1;\n" "elirstato estas 2 se iu eraro okazis kaj «-q» ne indikatis.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "pluraj esprimtipoj indikatas" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "nevalida esprimtipo %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "averto: GREP_OPTIONS evitindas; bonvolu uzi 'alias' aŭ skripton" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "nekonata ago por aparatoj" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "nevalida maksimuma nombro" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "nekonata ago por duumaj dosieroj" @@ -788,32 +788,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "seneskapa ^ aŭ $ ne subtenatas kun opcio «-Pz»" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "**interna eraro** (devus neniam okazi)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "**interna eraro**" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "transpasiĝis linilongecan limon de PCRE" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "la PCRE-JIT-stako tute pleniĝis" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "transpasiĝis retroreferencan limon de PCRE" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "**interna eraro** en PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/es.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/es.gmo differ diff -Nru grep-2.24/po/es.po grep-2.25/po/es.po --- grep-2.24/po/es.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/es.po 2016-04-22 04:37:24.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: GNU grep 2.19.12\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2014-07-11 18:53+0200\n" "Last-Translator: Santiago Vila Doncel \n" "Language-Team: Spanish \n" @@ -31,7 +31,7 @@ msgid "Valid arguments are:" msgstr "Los argumentos válidos son:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "error de escritura" @@ -100,7 +100,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: la opción '-W %s' requiere un argumento\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "memoria agotada" @@ -213,7 +213,7 @@ msgid "Unmatched ) or \\)" msgstr ") o \\) desemparejado" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "No hay ninguna expresión regular anterior" @@ -406,110 +406,110 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s argumento '%s' demasiado grande" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "[ desemparejado" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "clase de caracteres inválida" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "la sintaxis de la clase de caracteres es [[:space:]], no [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "secuencia de escape \\ sin terminar" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "contenido inválido de \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "la expresión regular es demasiado grande" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "( desemparejado" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "no se ha especificado ninguna sintaxis" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr ") desemparejado" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "otros, véase " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "longitud de contexto inválida" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "la entrada es demasiado grande para contar" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "falló la llamada al sistema `lskeek'" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Coincidencia en el fichero binario %s\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "atención: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "bucle de directorio recursivo" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "el fichero de entrada %s también es el de salida" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(entrada estándar)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Modo de empleo: %s [OPCIÓN]... PATRÓN [FICHERO]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Pruebe '%s --help' para más información.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Busca PATRÓN en cada FICHERO o en la entrada estándar.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "PATRÓN es, por omisión, una expresión regular básica (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -520,7 +520,7 @@ "\n" "Selección e interpretación de Expreg:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -534,7 +534,7 @@ " -G, --basic-regexp PATRÓN es una expresión regular básica (BRE)\n" " -P, --perl-regexp PATRÓN es una expresión regular en Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -554,7 +554,7 @@ " -z, --null-data una línea de datos termina en un byte 0, no\n" " en un carácter de nueva línea\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -571,7 +571,7 @@ " -V, --version muestra la versión y finaliza\n" " --help muestra este texto de ayuda y finaliza\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -601,7 +601,7 @@ " --label=ETIQUETA utiliza ETIQUETA como nombre de fichero prefijo\n" " para la entrada estándar\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -617,7 +617,7 @@ " TIPO es 'binary', 'text', o 'without-match'\n" " -a, --text equivalente a --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -637,7 +637,7 @@ " -R, --dereference-recursive similar, pero sigue todos los enlaces " "simbólicos\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -654,7 +654,7 @@ " de FICHERO\n" " --exclude-dir=PATRÓN se salta los directorios que encajan con PATRÓN\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -673,7 +673,7 @@ " -Z, --null imprime un byte 0 después del nombre del " "FICHERO\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -688,7 +688,7 @@ " -A, --after-context=NÚM muestra NÚM líneas de contexto posterior\n" " -C, --context=NÚM muestra NÚM líneas de contexto\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -710,7 +710,7 @@ " -u, --unix-byte-offsets cuenta los desplazamientos como si no hubiera\n" " retornos de carro (MSDOS/Windows)\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -719,7 +719,7 @@ "'egrep' significa 'grep -E'. 'fgrep' significa 'grep -F'.\n" "La invocación directa como 'egrep' o 'fgrep' está obsoleta.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -745,32 +745,32 @@ # # No me gusta nada lo de opción "a buscar". # Se admiten sugerencias. sv -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "se han especificado expresiones conflictivas" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "expresión inválida %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "método de dispositivos desconocido" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "contador máximo inválido" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "tipo binary-files desconocido" @@ -803,32 +803,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "error interno (no debería ocurrir nunca)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "error interno" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "se ha excedido el límite de longitud de línea de las PCREs" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "se ha excedido el límite de vuelta atrás de las PCREs" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "error interno de PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/et.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/et.gmo differ diff -Nru grep-2.24/po/et.po grep-2.25/po/et.po --- grep-2.24/po/et.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/et.po 2016-04-22 04:37:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grep 2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2016-03-04 17:55+0200\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -30,7 +30,7 @@ msgid "Valid arguments are:" msgstr "Lubatud argumendid on:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "viga kirjutamisel" @@ -99,7 +99,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: võti '-W %s' nõuab argumenti\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "mälu on otsas" @@ -211,7 +211,7 @@ msgid "Unmatched ) or \\)" msgstr "Puudub ) või \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Eelnevat regulaaravaldist pole" @@ -402,110 +402,110 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s argument '%s' on liiga suur" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "balanseerimata [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "vigane sümboliklass" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "sümbolklassi süntaks on [[:space:]], mitte [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "lõpetamata \\ paojada" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "vigane \\{\\} sisu" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "regulaaravaldis on liiga suur" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "balanseerimata (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "süntaksit pole määratud" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "balanseerimata )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "teised, vaata " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "vigane konteksti pikkuse argument" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "sisend on loendamiseks liiga suur" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek ebaõnnestus" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Kahendfail %s sobib\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "hoiatus: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekursiivne kataloogipuu tsükkel" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "sisendfail %s on samuti väljund" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standardsisend)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Kasuta: %s [VÕTI]... MUSTER [FAIL] ...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Lisainfo saamiseks proovige võtit '%s --help'.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Otsib MUSTRIT igast FAIList või standardsisendist.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "MUSTER on vaikimisi lihtne regulaaravaldis (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -516,7 +516,7 @@ "\n" "Regulaaravaldise valik ja interpreteerimine:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -529,7 +529,7 @@ " -G, --basic-regexp MUSTER on lihtne regulaaravaldis (BRE)\n" " -P, --perl-regexp MUSTER on Perl regulaaravaldis\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -546,7 +546,7 @@ " -x, --line-regexp kasuta MUSTRIT ridade leidmiseks\n" " -z, --null-data andmerida lõppeb baidil 0, mitte reavahetusel\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -564,7 +564,7 @@ " --help esita see abiinfo ja lõpeta töö\n" "\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -588,7 +588,7 @@ " -h, --no-filename blokeeri väljundis failinimi\n" " --label=MÄRGEND kasuta väljundis failinime asemel märgendit\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -603,7 +603,7 @@ " TÜÜP on 'binary', 'text', või 'without-match'\n" " -a, --text sama, kui --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -623,7 +623,7 @@ " -r, --recursive sama, kui --directories=recurse\n" " -R sama, aga järgib kõiki nimeviiteid\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -640,7 +640,7 @@ "mustrile\n" " --exclude-dir=MUSTER välista mustrile vastavad kataloogid.\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -656,7 +656,7 @@ "tabulaatorit\n" " -Z, --null väljasta faili nime järel bait 0\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -671,7 +671,7 @@ " -A, --after-context=NUM väljasta NUM rida järgnevat konteksti\n" " -C, --context=NUM väljasta NUM rida väljundi konteksti\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -694,7 +694,7 @@ " (MSDOS/WINDOWS)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -703,7 +703,7 @@ "'egrep' tähendab 'grep -E'. 'fgrep' tähendab 'grep -F'.\n" "Otsene 'egrep' või 'fgrep' kasutamine pole soovitatav.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -718,32 +718,32 @@ "Lõpetamise kood on 0, kui rida leiti, muidu 1;\n" "kui tekkis viga ja -q ei kasutatud, on lõpetamise kood 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "määrati konfliktsed otsijad" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "vigane sobitaja %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "hoiatus: GREP_OPTIONS pole soovitatav; kasutage palun alias või script" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "tundmatu seadmete meetod" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "vigane maksimum" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "tundmatu kahendfailide tüüp" @@ -775,32 +775,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "kvootimata ^ või $ ei ole -Pz korral toetatud" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "sisemine viga (ei peaks kunagi juhtuma)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "sisemine viga" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "PCRE rea pikkuse piirang on ületatud" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "PCRE JIT pinu sai täis" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "PCRE tagasivaate piirang on ületatud" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "sisemine PCRE viga: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/eu.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/eu.gmo differ diff -Nru grep-2.24/po/eu.po grep-2.25/po/eu.po --- grep-2.24/po/eu.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/eu.po 2016-04-22 04:37:24.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grep 2.5.1a\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2005-03-03 21:40+0100\n" "Last-Translator: Mikel Olasagasti \n" "Language-Team: Basque \n" @@ -32,7 +32,7 @@ msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "" @@ -101,7 +101,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: `%s' aukerak argumentu bat behar du\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "memoria agortuta" @@ -213,7 +213,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "" @@ -382,116 +382,116 @@ msgid "%s%s argument '%s' too large" msgstr "" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 #, fuzzy msgid "unbalanced [" msgstr "Parekatu gabeko [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" -#: src/dfa.c:1245 +#: src/dfa.c:1230 #, fuzzy msgid "unfinished \\ escape" msgstr "Amaitu gabeko \\ eskapea" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "baliogabeko gehienezko zenbaketa" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "" -#: src/dfa.c:1811 +#: src/dfa.c:1796 #, fuzzy msgid "unbalanced (" msgstr "Parekatu gabeko (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 #, fuzzy msgid "no syntax specified" msgstr "Ez da sintaxirik zehaztu" -#: src/dfa.c:1945 +#: src/dfa.c:1930 #, fuzzy msgid "unbalanced )" msgstr "Parekatu gabeko )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "balio gabeko testuinguru luzeera argumentua" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "sarrera luzeegia da kontatzeko" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "%s fitxategi binarioa bat dator\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, fuzzy, c-format msgid "warning: %s: %s" msgstr "abisua: %s: %s\n" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "direktorio bukle errekurtsiboa" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(sarrera estandarra)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Erabilera: %s [AUKERA]... EREDUA [FITXATEGIA]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Saiatu `%s --help' informazio gehiagorako.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" -#: src/grep.c:1808 +#: src/grep.c:1846 #, fuzzy, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -503,7 +503,7 @@ "\n" "Regexp aukera eta interpretazioa:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -517,7 +517,7 @@ " -G, --basic-regexp EREDUA oinarrizko espresio erregular bat da\n" " -P, --perl-regexp EREDUA Perl espresio erregular bat da\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, fuzzy, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -537,7 +537,7 @@ " -z, --null-data datu lerroa 0 byte-arekin amaitzen da, eta ez " "lerro berriarekin\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -556,7 +556,7 @@ " --mmap erabili asignatutako memoria sarrera posible " "bada\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -571,7 +571,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -581,7 +581,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -593,7 +593,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -604,7 +604,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -614,7 +614,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -624,7 +624,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, fuzzy, c-format msgid "" " -NUM same as --context=NUM\n" @@ -659,14 +659,14 @@ "badator, 1 ez badator,\n" "eta 2 arazorik badago.\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" "Direct invocation as either 'egrep' or 'fgrep' is deprecated.\n" msgstr "" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -676,32 +676,32 @@ "if any error occurs and -q is not given, the exit status is 2.\n" msgstr "" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "espresio konfliktiboak espezifikatu dira" -#: src/grep.c:1969 +#: src/grep.c:2007 #, fuzzy, c-format msgid "invalid matcher %s" msgstr "baliogabeko gehienezko zenbaketa" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "gailu metodo ezezaguna" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "baliogabeko gehienezko zenbaketa" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "fitxategi-binario moeta ezezaguna" @@ -732,32 +732,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/fi.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/fi.gmo differ diff -Nru grep-2.24/po/fi.po grep-2.25/po/fi.po --- grep-2.24/po/fi.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/fi.po 2016-04-22 04:37:24.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grep 2.21.78\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2015-11-08 12:59+0200\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" @@ -33,7 +33,7 @@ msgid "Valid arguments are:" msgstr "Kelvollisia argumentteja ovat:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "kirjoitusvirhe" @@ -102,7 +102,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: valitsin ’-W %s’ tarvitsee argumentin\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "muisti loppui" @@ -215,7 +215,7 @@ msgid "Unmatched ) or \\)" msgstr "Pariton ) tai \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Ei edeltävää säännöllistä lauseketta" @@ -415,110 +415,110 @@ msgid "%s%s argument '%s' too large" msgstr "valitsimen %s%s argumentti ’%s’ on liian iso" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "pariton [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "virheellinen merkkiluokkanimi" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "merkkiluokkasyntaksi on [[:välilyönti:]], ei [:välilyönti:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "päättymätön \\-ohjausmerkki" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "virheellinen kohteen \\{\\} sisältö" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "säännöllinen lauseke on liian suuri" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "pariton (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "syntaksia ei ole määritelty" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "pariton )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "muut, katso " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "virheellinen kontekstin pituusargumentti" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "syöte on liian suuri laskettavaksi" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek epäonnistui" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Binääritiedosto %s täsmää hakuun\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "varoitus: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekursiivinen hakemistosilmukka" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "syötetiedosto %s on myös tuloste" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(vakiosyöte)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Käyttö: %s [VALITSIN]... HAKULAUSEKE [TIEDOSTO]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Katso lisäohjeet valitsimella ’%s --help’.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Haetaan HAKULAUSEKEtta jokaisessa TIEDOSTOssa tai vakiosyötteessä.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "HAKULAUSEKE on oletuksena perussäännöllinen lauseke (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -529,7 +529,7 @@ "\n" "Säännöllisten lausekkeiden valinta ja tulkinta:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -545,7 +545,7 @@ " -P, --perl-regexp HAKULAUSEKE on Perl-tyyppinen säännöllinen " "lauseke\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -564,7 +564,7 @@ "riveihin\n" " -z, --null-data datarivi päättyy nollatavuun, ei rivinvaihtoon\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -581,7 +581,7 @@ " -V, --version tulosta versiotiedot ja poistu\n" " --help tulosta tämä ohje ja poistu\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -606,7 +606,7 @@ "tulosteessa\n" " --label=NIMIÖ tulosta NIMIÖ tiedostonimenä vakiosyötteelle\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -621,7 +621,7 @@ " TYYPPI on ’binary’, ’text’, tai ’without-match’\n" " -a, --text sama kuin --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -642,7 +642,7 @@ " -R, --dereference-recursive samoin, mutta seuraa kaikkia symbolisia " "linkkejä\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -661,7 +661,7 @@ " --exclude-dir=HAKULAUSEKE ohitetaan HAKULAUSEKE-täsmäävät " "hakemistot.\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -679,7 +679,7 @@ " -T, --initial-tab tee sarkaimet rivi ylöspäin (jos tarvitaan)\n" " -Z, --null tulosta nollatavu TIEDOSTOnimen jälkeen\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -694,7 +694,7 @@ " -A, --after-context=N tulosta N riviä konteksin jälkeen\n" " -C, --context=N tulosta N riviä tulostekonteksia\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -719,7 +719,7 @@ " -merkkiä CR ei olisi lainkaan (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -728,7 +728,7 @@ "Käsky ’egrep’ tarkoittaa ’grep -E’. Käsky ’fgrep’ tarkoittaa ’grep -F’.\n" "Suora kutsuminen ’egrep’- ja ’fgrep’-käskyillä ei ole enää suositeltavaa.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -744,32 +744,32 @@ "jos tapahtuu virheitä ja ”-q”-valitsinta ei ollut annettu, niin paluuarvo\n" "on kaksi.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "määritelty ristiriitaiset haut" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "virheellinen täsmääjä %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "varoitus: GREP_OPTIONS on vanhentunut; käytä aliasta tai skriptiä" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "tuntematon laitemetodi" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "virheellinen maksimimäärä" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "tuntematon binääritiedostojen tyyppi" @@ -802,32 +802,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "sisäinen virhe (ei pitäisi koskaan tapahtua)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "sisäinen virhe" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "ylitettiin PCRE-rivipituusraja" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "loppuunkäsitelty PCRE JIT-pino" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "ylitettiin PCRE-paluujäljitysraja" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "sisäinen PCRE-virhe: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/fr.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/fr.gmo differ diff -Nru grep-2.24/po/fr.po grep-2.25/po/fr.po --- grep-2.24/po/fr.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/fr.po 2016-04-22 04:37:24.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: GNU grep 2.20.72\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2014-11-11 10:51-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" @@ -35,7 +35,7 @@ msgid "Valid arguments are:" msgstr "Les arguments valables sont :" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "erreur d'écriture" @@ -104,7 +104,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s : l'option « -W %s » nécessite un argument\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "mémoire épuisée" @@ -217,7 +217,7 @@ msgid "Unmatched ) or \\)" msgstr ") ou \\) sans correspondance" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Pas d'expression rationnelle précédente" @@ -410,112 +410,112 @@ msgid "%s%s argument '%s' too large" msgstr "argument %s%s « %s » trop grand" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "[ non apparié" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "classe de caractères incorrecte" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "la syntaxe d'une classe de caractères est [[:space:]], pas [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "séquence d'échappement \\ non terminée" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "contenu de \\{\\} incorrect" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "expression rationnelle trop grande" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "( non appariée" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "aucune syntaxe indiquée" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr ") non appariée" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "autres, consultez " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "argument de longueur de contexte incorrect" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "taille des données en entrée trop importante pour compter" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "échec de lseek" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Fichier binaire %s correspondant\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "Avertissement : %s : %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "boucle de répertoire récursive" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "le fichier d'entrée %s est aussi en sortie" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(entrée standard)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Utilisation : %s [OPTION]... MOTIF [FICHIER]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "" "Exécutez « %s --help » pour obtenir des renseignements complémentaires.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" "Chercher un MOTIF dans chaque FICHIER ou à partir de l'entrée standard.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "MOTIF est, par défaut, une expression rationnelle simple.\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -526,7 +526,7 @@ "\n" "Sélection et interprétation de l'expression rationnelle :\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -539,7 +539,7 @@ " -G, --basic-regexp MOTIF est une expression rationnelle de base\n" " -P, --perl-regexp MOTIF est une expression rationnelle en Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -558,7 +558,7 @@ "entières\n" " -z, --null-data finir les lignes de données par un octet nul\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -575,7 +575,7 @@ " -V, --version afficher le nom et la version du logiciel\n" " --help afficher l'aide et quitter\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -602,7 +602,7 @@ " --label=ÉTIQUETTE utiliser ÉTIQUETTE pour le préfixe d'entrée " "standard\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -620,7 +620,7 @@ "match »\n" " -a, --text identique à --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -642,7 +642,7 @@ " -R, --dereference-recursive similaire, mais avec suivi des liens " "symboliques\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -660,7 +660,7 @@ "FIC\n" " --exclude-dir=MOTIF ignorer les répertoires correspondants au MOTIF\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -677,7 +677,7 @@ " -T, --initial-tab insérer des tabulations (si nécessaire)\n" " -Z, --null afficher l'octet nul après le nom de fichier\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -692,7 +692,7 @@ " -A, --after-context=NBRE afficher NBRE lignes de contexte après\n" " -C, --context=NBRE afficher NBRE lignes de contexte en sortie\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -718,7 +718,7 @@ " chariot (MS-DOS ou Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -727,7 +727,7 @@ "« egrep » équivaut à « grep -E ». « fgrep » équivaut à « grep -F ».\n" "L'invocation directe de « egrep » ou « fgrep » doit être abandonnée.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -743,34 +743,34 @@ "en cas d'erreur et si l'option -q n'est pas présente, le code de sortie est " "2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "opérateurs de correspondance indiqués en conflit" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "motif de correspondance incorrect %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "Avertissement : GREP_OPTIONS doit être abandonnée ; veuillez utiliser un " "alias ou un script" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "méthode d'examen des périphériques inconnue" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "décompte maximal incorrect" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "type de fichier binaire inconnu" @@ -803,32 +803,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "erreur interne (ça ne devrait jamais arriver)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "erreur interne" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "limite de longueur de ligne des PCRE dépassée" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "limite de retour arrière des PCRE dépassée" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "erreur PCRE interne : %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/ga.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/ga.gmo differ diff -Nru grep-2.24/po/ga.po grep-2.25/po/ga.po --- grep-2.24/po/ga.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/ga.po 2016-04-22 04:37:24.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: grep 2.8\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2011-05-18 15:48-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" msgstr "Na hargóintí bailí:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "earráid sa scríobh" @@ -98,7 +98,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: tá argóint de dhíth i ndiaidh rogha '-W %s'\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "cuimhne ídithe" @@ -211,7 +211,7 @@ msgid "Unmatched ) or \\)" msgstr ") nó \\) corr" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Níl aon slonn ionadaíochta roimhe seo" @@ -403,116 +403,116 @@ msgid "%s%s argument '%s' too large" msgstr "argóint %s%s rómhór: `%s'" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "[ corr" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "Aicme charachtar neamhbhailí" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" "Is é [[:space:]] an chomhréir cheart in aicme carachtar, in ionad [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "Seicheamh éalúcháin \\ gan chríochnú" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "Ábhar neamhbhailí idir \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 #, fuzzy msgid "regular expression too big" msgstr "Slonn ionadaíochta rómhór" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "( corr" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "Níor sonraíodh aon chomhréir" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr ") corr" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" "agus daoine eile, féach ar " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "Tá an argóint a shonraíonn an méid chomhthéacs neamhbhailí" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "Tá an t-ionchur rómhór le háireamh" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "theip ar lseek" # using lit. "matching string" throughout for "match" - KPS -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Teaghrán comhoiriúnach sa chomhad dhénártha %s\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "rabhadh: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "lúb athchúrsach i gcomhadlann" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(gnáth-ionchur)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Úsáid: %s [ROGHA]... PATRÚN [COMHAD]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fháil.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Déan cuardach ar PATRÚN i ngach COMHAD nó sa ghnáth-ionchur.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" "Is slonn ionadaíochta bunúsach (BRE) é PATRÚN, de réir réamhshocraithe.\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -523,7 +523,7 @@ "\n" "Roghnú agus léirmhíniú sloinn ionadaíochta:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -538,7 +538,7 @@ " -G, --basic-regexp is slonn ionadaíochta bunúsach (BRE) é PATRÚN\n" " -P, --perl-regexp is slonn ionadaíochta Perl é PATRÚN\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -555,7 +555,7 @@ " -x, --line-regexp meaitseálann PATRÚN línte iomlána amháin\n" " -z, --null-data léiríonn bearta '0' na foircinn línte (vs. \\n)\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -573,7 +573,7 @@ " --help taispeáin an chabhair seo agus scoir\n" " --mmap ná bac leis; comhoiriúnacht shiarghabhálach\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, fuzzy, c-format msgid "" "\n" @@ -597,7 +597,7 @@ " -h, --no-filename ná taispeáin ainmneacha comhad\n" " --label=LIPÉAD úsáid LIPÉAD mar ainm ar an ngnáth-ionchur\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, fuzzy, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -612,7 +612,7 @@ " CINEÁL = 'binary', 'text', nó 'without-match'\n" " -a, --text ar comhbhrí le '--binary-files=text'\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, fuzzy, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -630,7 +630,7 @@ " agus soicéid; MODH = 'read' nó 'skip'\n" " -R, -r, --recursive ar comhbhrí le '--directories=recurse'\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -647,7 +647,7 @@ " haon phatrún i gCOMHAD\n" " --exclude-dir=PATRÚN ná déan cuardach i gcomhadlanna comhoiriúnacha.\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -666,7 +666,7 @@ " -T, --initial-tab Ailínigh na táib (más gá)\n" " -Z, --null priontáil beart '0' i ndiaidh ainm an chomhaid\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -681,7 +681,7 @@ " -A, --after-context=UIMH taispeáin UIMH líne de chomhthéacs deiridh\n" " -C, --context=UIMHIR taispeáin UIMHIR líne de chomhthéacs\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, fuzzy, c-format msgid "" " -NUM same as --context=NUM\n" @@ -703,7 +703,7 @@ "(MSDOS)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, fuzzy, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -712,7 +712,7 @@ "`egrep' = `grep -E', agus `fgrep' = `grep -F'.\n" "Tá na horduithe `egrep' agus `fgrep' imithe i léig.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, fuzzy, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -726,32 +726,32 @@ "Stádas scortha: 0 (roghnaíodh aon líne ar a laghad), 1 (níor roghnaíodh),\n" "nó 2 (trioblóid de shaghas éigin agus níor tugadh -q).\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "sonraíodh patrúin chontrártha" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "meaitseálaí neamhbhailí %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "modh anaithnid gléasanna" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "uasmhéid neamhbhailí" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "cineál anaithnid de chomhad dénártha" @@ -784,32 +784,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, fuzzy, c-format msgid "internal error" msgstr "earráid sa scríobh" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/gl.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/gl.gmo differ diff -Nru grep-2.24/po/gl.po grep-2.25/po/gl.po --- grep-2.24/po/gl.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/gl.po 2016-04-22 04:37:24.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: grep 2.10\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2012-02-23 18:30+0100\n" "Last-Translator: Leandro Regueiro \n" "Language-Team: Galician \n" @@ -37,7 +37,7 @@ msgid "Valid arguments are:" msgstr "Os argumentos válidos son:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "erro de escritura" @@ -106,7 +106,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: a opción '-W %s' require un argumento\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "memoria esgotada" @@ -219,7 +219,7 @@ msgid "Unmatched ) or \\)" msgstr ") o \\) desemparellado" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "No hai ningunha expresión regular anterior" @@ -411,112 +411,112 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s argumento `%s' demasiado grande" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "[ desemparellado" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "clase de caracteres non válida" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "a sintaxe da clase de caracteres é [[:space:]], non [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "secuencia de escape \\ sen rematar" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "Contido non válido de \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 #, fuzzy msgid "regular expression too big" msgstr "A expresión regular é demasiado grande" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "( desemparellado" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "no se especificou ningunha sintaxe" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr ") desemparellado" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "outros, véase " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "argumento de lonxitude do contexto non vlido" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "a entrada longa de mis para contala" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "fallou a chamada ao sistema `lskeek'" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Arquivo binario %s aparicins\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "atención: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "ciclo de directorios recursivo" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "o fichero de entrada %s tamén é o de salida" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(entrada estándar)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Emprego: %s [OPCIN]... PATRN [FICHEIRO]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Escriba `%s --help' para mis informacin.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Busca PATRÓN en cada FICHERO ou na entrada estándar.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "PATRÓN é, por omisión, unha expresión regular básica (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -527,7 +527,7 @@ "\n" "Selección e interpretación de Expreg:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -541,7 +541,7 @@ " -G, --basic-regexp PATRÓN é unha expresión regular básica (BRE)\n" " -P, --perl-regexp PATRÓN é unha expresión regular en Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -561,7 +561,7 @@ " -z, --null-data unha liña de datos termina nun byte 0, non\n" " nun carácter de nova liña\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -579,7 +579,7 @@ " --help mostra esta axuda e finaliza\n" " --mmap descártase para compatibilidade cara atrás\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -608,7 +608,7 @@ " --label=ETIQUETA utiliza ETIQUETA como nome de ficheiro prefixo\n" " para a entrada estándar\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, fuzzy, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -624,7 +624,7 @@ " TIPO é `binary', `text', ou `without-match'\n" " -a, --text equivalente a --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, fuzzy, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -642,7 +642,7 @@ " `sockets', pode ser 'read' ou 'skip'\n" " -R, -r, --recursive equivalente a --directories=recurse\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -661,7 +661,7 @@ " --exclude-dir=PATRÓN omítense os directorios que coinciden con " "PATRÓN\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -678,7 +678,7 @@ " por cada FICHEIRO\n" " -Z, --null imprime un byte 0 despois do nome do FICHEIRO\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -693,7 +693,7 @@ " -A, --after-context=NÚM mostra NÚM liñas de contexto posterior\n" " -C, --context=NÚM mostra NÚM liñas de contexto\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, fuzzy, c-format msgid "" " -NUM same as --context=NUM\n" @@ -715,7 +715,7 @@ " -u, --unix-byte-offsets conta os desprazamentos como se non houbera\n" " retornos de carro (MSDOS)\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, fuzzy, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -724,7 +724,7 @@ "`egrep' significa `grep -E'. `fgrep' significa `grep -F'.\n" "A invocación directa como `egrep' ou `fgrep' está obsoleta.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, fuzzy, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -738,32 +738,32 @@ "é 0 se hai coincidencias, 1 se non as hai; se se produce algún error e non \n" "se especificou -q, o estado de saída é 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "especificronse patrns conflictivos" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "expresión non válida %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "método de dispositivos descoñecido" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "contador máximo non válido" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "tipo binary-files descoñecido" @@ -796,32 +796,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "erro interno" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, fuzzy, c-format msgid "exceeded PCRE's line length limit" msgstr "excedeuse o límite de volta atrás das PCREs" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "excedeuse o límite de volta atrás das PCREs" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, fuzzy, c-format msgid "internal PCRE error: %d" msgstr "erro interno" diff -Nru grep-2.24/po/grep.pot grep-2.25/po/grep.pot --- grep-2.24/po/grep.pot 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/grep.pot 2016-04-22 04:37:24.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU grep 2.24\n" +"Project-Id-Version: GNU grep 2.25\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "" @@ -100,7 +100,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "" @@ -212,7 +212,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "" @@ -379,110 +379,110 @@ msgid "%s%s argument '%s' too large" msgstr "" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -490,7 +490,7 @@ "Regexp selection and interpretation:\n" msgstr "" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -499,7 +499,7 @@ " -P, --perl-regexp PATTERN is a Perl regular expression\n" msgstr "" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -510,7 +510,7 @@ " -z, --null-data a data line ends in 0 byte, not newline\n" msgstr "" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -521,7 +521,7 @@ " --help display this help text and exit\n" msgstr "" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -536,7 +536,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -546,7 +546,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -558,7 +558,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -569,7 +569,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -579,7 +579,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -589,7 +589,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -603,14 +603,14 @@ "\n" msgstr "" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" "Direct invocation as either 'egrep' or 'fgrep' is deprecated.\n" msgstr "" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -620,32 +620,32 @@ "if any error occurs and -q is not given, the exit status is 2.\n" msgstr "" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "" @@ -676,32 +676,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/he.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/he.gmo differ diff -Nru grep-2.24/po/he.po grep-2.25/po/he.po --- grep-2.24/po/he.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/he.po 2016-04-22 04:37:24.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: grep 2.5.1a\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2005-03-04 14:55+0200\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Hebrew \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "" @@ -98,7 +98,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s `%s' \n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr " " @@ -210,7 +210,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "" @@ -379,116 +379,116 @@ msgid "%s%s argument '%s' too large" msgstr "" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 #, fuzzy msgid "unbalanced [" msgstr "- [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" -#: src/dfa.c:1245 +#: src/dfa.c:1230 #, fuzzy msgid "unfinished \\ escape" msgstr "- \\ " -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr " " -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "" -#: src/dfa.c:1811 +#: src/dfa.c:1796 #, fuzzy msgid "unbalanced (" msgstr "- (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 #, fuzzy msgid "no syntax specified" msgstr " " -#: src/dfa.c:1945 +#: src/dfa.c:1930 #, fuzzy msgid "unbalanced )" msgstr "- )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr " " -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr " " -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr " %s \n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, fuzzy, c-format msgid "warning: %s: %s" msgstr "%s %s :\n" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr " " -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "( )" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "%s []... PATTERN [] : \n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr ". `%s --help' \n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" -#: src/grep.c:1808 +#: src/grep.c:1846 #, fuzzy, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -500,7 +500,7 @@ "\n" " : \n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -513,7 +513,7 @@ " PATTERN -E, --extended-regexp\n" " Perl PATTERN -P, --perl-regexp\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, fuzzy, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -530,7 +530,7 @@ " PATTERN -x, --line-regexp\n" " newline- ,0- -z, --null-data\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -548,7 +548,7 @@ " --help\n" " , --mmap\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -563,7 +563,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -573,7 +573,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -585,7 +585,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -596,7 +596,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -606,7 +606,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -616,7 +616,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, fuzzy, c-format msgid "" " -NUM same as --context=NUM\n" @@ -646,14 +646,14 @@ " .-h , \n" " . 2 , 1 , 0 \n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" "Direct invocation as either 'egrep' or 'fgrep' is deprecated.\n" msgstr "" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -663,32 +663,32 @@ "if any error occurs and -q is not given, the exit status is 2.\n" msgstr "" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr " " -#: src/grep.c:1969 +#: src/grep.c:2007 #, fuzzy, c-format msgid "invalid matcher %s" msgstr " " -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr " - " -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr " " -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr " - " @@ -719,32 +719,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/hr.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/hr.gmo differ diff -Nru grep-2.24/po/hr.po grep-2.25/po/hr.po --- grep-2.24/po/hr.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/hr.po 2016-04-22 04:37:24.000000000 +0000 @@ -1,25 +1,36 @@ # The Croatian translation of grep. -# Copyright (C) 1999, 2002 Free Software Foundation, Inc. +# Copyright © 2015 Free Software Foundation, Inc. # This file is distributed under the same license as the grep package. # # Matej Vela , 1999. # Hrvoje Niksic , 2002. # Tomislav Krznar , 2012. +# bp, nekoliko noticija +# ovo je ista verzija grep.po kao 2012. od TK. Samo je nekoliko riječi +# izmjenjeno. Dodani su novi msgid-ovi i popravljeni su fuzzies. +# U sljedećoj verziji bit će više izmjena, nakon konzultacije s +# lingvistima, i hrvatskim TP članovima. +# Zahvaljujem prijašnjim prevoditeljima, jer je na njihovom trudu, +# napravljena i ova dopuna. +# bp, 2016-04-03 msgid "" msgstr "" -"Project-Id-Version: grep 2.14\n" +"Project-Id-Version: grep-2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" -"PO-Revision-Date: 2012-09-27 23:22+0200\n" -"Last-Translator: Tomislav Krznar \n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" +"PO-Revision-Date: 2016-04-04 07:34-0700\n" +"Last-Translator: Božidar Putanec \n" "Language-Team: Croatian \n" "Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -"X-Generator: Lokalize 1.4\n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.8.7.1\n" +"X-Poedit-SourceCharset: UTF-8\n" +"X-Poedit-Basepath: ../../Downloads/grep/src\n" +"X-Poedit-SearchPath-0: .\n" #: lib/argmatch.c:133 #, c-format @@ -35,7 +46,7 @@ msgid "Valid arguments are:" msgstr "Ispravni argumenti su:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "greška pisanja" @@ -47,72 +58,76 @@ #: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: opcija „%s” je višeznačna; mogućnosti:" +msgstr "%s: opcija „%s“ je višeznačna; mogućnosti:" #: lib/getopt.c:619 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: opcija „-W %s” je višeznačna\n" +msgstr "%s: opcija „%s“ je višeznačna\n" +# http://ihjj.hr/ : dozvoljava > dopušta #: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: opcija „--%s” ne dozvoljava argument\n" +msgstr "%s: opcija „--%s“ ne dopušta argument\n" #: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: opcija „%c%s” ne dozvoljava argument\n" +msgstr "%s: opcija „%c%s“ ne dopušta argument\n" #: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: opcija „--%s” zahtijeva argument\n" +msgstr "%s: opcija „--%s“ zahtijeva argument\n" +# http://ihjj.hr/ : nepropoznat > nije prepoznat > nepoznat +# neprepoznat: možda bi trebao biti prepoznat, ali nije #: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: neprepoznata opcija „--%s”\n" +msgstr "%s: nepoznata opcija „--%s“\n" #: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: neprepoznata opcija „%c%s”\n" +msgstr "%s: nepoznata opcija „%c%s“\n" #: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: neispravna opcija -- „%c”\n" +msgstr "%s: neispravna opcija -- „%c“\n" #: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: opcija zahtijeva argument -- „%c”\n" +msgstr "%s: opcija zahtijeva argument -- „%c“\n" #: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: opcija „-W %s” je višeznačna\n" +msgstr "%s: opcija „-W %s“ je višeznačna\n" #: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: opcija „-W %s” ne dozvoljava argument\n" +msgstr "%s: opcija „-W %s“ ne dopušta argument\n" #: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: opcija „-W %s” zahtijeva argument\n" +msgstr "%s: opcija „-W %s“ zahtijeva argument\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" -msgstr "memorija iscrpljena" +msgstr "nema dovoljno memorije" +# lingvisti: trenutni > trenutačni #: lib/openat-die.c:38 #, c-format msgid "unable to record current working directory" -msgstr "ne mogu zapisati trenutni radni direktorij" +msgstr "ne mogu registrirati trenutačni radni direktorij" #: lib/openat-die.c:57 #, c-format @@ -146,15 +161,16 @@ #: lib/quotearg.c:348 msgid "'" -msgstr "”" +msgstr "“" #: lib/regcomp.c:135 msgid "Success" msgstr "Uspjeh" +# no match: _REG_NOMATCH, /* Didn't find a match (for regexec). */ #: lib/regcomp.c:138 msgid "No match" -msgstr "Nema poklapanja" +msgstr "Nema podudaranja" #: lib/regcomp.c:141 msgid "Invalid regular expression" @@ -168,18 +184,21 @@ msgid "Invalid character class name" msgstr "Neispravno ime razreda znakova" +# obrnuta > obratna #: lib/regcomp.c:150 msgid "Trailing backslash" -msgstr "Obrnuta kosa crta na kraju" +msgstr "Obratna kosa crta na kraju" +# http://ihjj.hr/ referenca > referencija #: lib/regcomp.c:153 msgid "Invalid back reference" -msgstr "Neispravna povratna referenca" +msgstr "Neispravna povratna referencija" +# bp: fuzzy > popravljen +# razmotri: nema para za [, [^, [:, [., ili [= #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Nesparena [ ili [^" +msgstr "Nesparena [, [^, [:, [., ili [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -197,9 +216,10 @@ msgid "Invalid range end" msgstr "Neispravan kraj raspona" +# nedostaje memorije #: lib/regcomp.c:171 msgid "Memory exhausted" -msgstr "Memorija iscrpljena" +msgstr "Nema dovoljno memorije" #: lib/regcomp.c:174 msgid "Invalid preceding regular expression" @@ -217,7 +237,7 @@ msgid "Unmatched ) or \\)" msgstr "Nesparena ) ili \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Nedostaje prethodni regularni izraz" @@ -236,7 +256,7 @@ #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:84 msgid "(C)" -msgstr "(C)" +msgstr "©" #: lib/version-etc.c:86 msgid "" @@ -248,10 +268,10 @@ "\n" msgstr "" "\n" -"Licenca GPLv3+: GNU GPL inačica 3 ili kasnija .\n" -"Ovo je slobodan softver: slobodno ga smijete mijenjati i dijeliti.\n" -"NEMA JAMSTAVA, do krajnje mjere dozvoljene zakonom.\n" +"Ovo je slobodan softver: slobodno ga mijenjajte i dijelite.\n" +"NEMA JAMSTVA, do granica dopuštenih zakonom.\n" "\n" #. TRANSLATORS: %s denotes an author name. @@ -373,13 +393,15 @@ "Report bugs to: %s\n" msgstr "" "\n" -"Prijavite greške na %s.\n" -"Prijavite greške prijevoda na .\n" +"Greškice (bugs) na engleskom (LC_ALL=C) javite na <%s>.\n" +"Primjedbe i pogreške u prijevodu javite na .\n" +# prvi %s PACKAGE_PACKAGER, +# drugi %s PACKAGE_PACKAGER_BUG_REPORTS #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" -msgstr "Prijavite greške %s na %s\n" +msgstr "Pogreške %s javite na engleskom (LC_ALL=C) na <%s>\n" #: lib/version-etc.c:251 #, c-format @@ -393,142 +415,144 @@ #: lib/version-etc.c:256 msgid "General help using GNU software: \n" -msgstr "" -"Općenita pomoć za korištenje GNU softvera: \n" +msgstr "Opća pomoć za korištenje GNU softvera: \n" #: lib/xstrtol-error.c:63 #, c-format msgid "invalid %s%s argument '%s'" -msgstr "neispravan %s%s argument „%s”" +msgstr "neispravan %s%s argument „%s“" #: lib/xstrtol-error.c:68 #, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "neispravan sufiks u %s%s argumentu „%s”" +msgstr "neispravan sufiks u %s%s argumentu „%s“" #: lib/xstrtol-error.c:72 #, c-format msgid "%s%s argument '%s' too large" -msgstr "%s%s argument „%s” je prevelik" +msgstr "%s%s argument „%s“ je prevelik" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "nesparena [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "neispravan razred znakova" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "sintaksa razreda znakova je [[:space]], ne [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" -msgstr "nedovršeni \\ izlaz" +msgstr "nedovršeni \\ izlaz (escape znak)" -#: src/dfa.c:1392 -#, fuzzy +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" -msgstr "Neispravan sadržaj \\{\\}" +msgstr "neispravan sadržaj \\{\\}" -#: src/dfa.c:1395 -#, fuzzy +#: src/dfa.c:1380 msgid "regular expression too big" -msgstr "Regularni izraz je prevelik" +msgstr "regularni izraz je prevelik" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "nesparena (" -#: src/dfa.c:1937 +# „zadano“ je često „default“, pa radije „navedena“ ili „imenovana“ +#: src/dfa.c:1922 msgid "no syntax specified" -msgstr "nije zadana sintaksa" +msgstr "sintaksa nije imenovana" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "nesparena )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "ostali, pogledajte " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "neispravan argument duljine konteksta" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" -msgstr "ulaz je prevelik za brojanje" +msgstr "ulaz je prevelik da se prebroji" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek nije uspio" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Binarna datoteka %s se podudara\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "upozorenje: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekurzivna petlja direktorija" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "ulazna datoteka %s je također i izlaz" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standardni ulaz)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Uporaba: %s [OPCIJA]... UZORAK [DATOTEKA]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" -msgstr "Pokušajte „%s --help” za više informacija.\n" +msgstr "‘%s --help’ za pomoć i više informacija\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Traži UZORAK u svakoj DATOTECI ili standardnom ulazu.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "UZORAK je uobičajeno osnovni regularni izraz (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" "\n" "Regexp selection and interpretation:\n" msgstr "" -"Primjer: %s -i „hello world” menu.h main.c\n" +"Primjer: %s -i „hello world“ menu.h main.c\n" "\n" "Izbor i interpretacija regularnih izraza:\n" -#: src/grep.c:1812 -#, fuzzy, c-format +# engl. „string“ hrvatske mogućnosti: biseri, zrna i sl. nanizani na nit; niska. +# Prijedlog je string > niska +# vidi http://hjp.znanje.hr/index.php?show=search_by_id&id=eF1uXRg%3D +# ili ostavimo string = string ! +#: src/grep.c:1850 +#, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" " -F, --fixed-strings PATTERN is a set of newline-separated strings\n" @@ -536,12 +560,12 @@ " -P, --perl-regexp PATTERN is a Perl regular expression\n" msgstr "" " -E, --extended-regexp UZORAK je prošireni regularni izraz (ERE)\n" -" -F, --fixed-strings UZORAK je skup znakom novog retka odvojenih\n" -" fiksnih znakovnih nizova\n" +" -F, --fixed-strings UZORAK je skup fiksnih nizova, jedan niz po " +"retku\n" " -G, --basic-regexp UZORAK je osnovni regularni izraz (BRE)\n" " -P, --perl-regexp UZORAK je Perl regularni izraz\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -559,8 +583,8 @@ " -z, --null-data podatkovni redak završava bajtom 0, ne znakom\n" " novog retka\n" -#: src/grep.c:1825 -#, fuzzy, c-format +#: src/grep.c:1863 +#, c-format msgid "" "\n" "Miscellaneous:\n" @@ -572,13 +596,11 @@ "\n" "Razno:\n" " -s, --no-messages izostavi poruke o greškama\n" -" -v, --revert-match odaberi redove koji se ne podudaraju\n" +" -v, --invert-match odaberi redove koji se ne podudaraju\n" " -V, --version ispiši informacije o inačici i izađi\n" " --help prikaži ovu pomoć i izađi\n" -" --mmap zastarjela prazna operacija (no-op); javlja\n" -" upozorenje\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -600,10 +622,11 @@ " --line-buffered ispiši izlaz na svaki redak\n" " -H, --with-filename ispiši ime datoteke za svako podudaranje\n" " -h, --no-filename izostavi prefiks imena datoteke na izlazu\n" -" --label=OZNAKA koristi OZNAKU kao prefiks imena datoteke " -"standardnog ulaza\n" +" --label=OZNAKA koristi OZNAKU kao prefiks imena datoteke\n" +" standardnog ulaza\n" +"\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -615,10 +638,12 @@ " -o, --only-matching prikaži samo dio retka koji odgovara UZORKU\n" " -q, --quiet, --silent ispusti sav normalan izlaz\n" " --binary-files=VRSTA pretpostavi VRSTU binarnih datoteka;\n" -" VRSTA je „binary”, „text” ili „without-match”\n" +" VRSTA je „binary“, „text“ ili „without-match“\n" " -a, --text ekvivalentno opciji --binary-files=text\n" +"\n" +"\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -629,16 +654,18 @@ " -r, --recursive like --directories=recurse\n" " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -" -I isto kao --binary-files=without-match\n" -" -d, --directories=RADNJA kako rukovati direktorijima;\n" -" RADNJA je „read”, „recurse” ili „skip”\n" -" -D, --devices=RADNJA kako rukovati uređajima, FIFO uređajima i " -"utičnicama;\n" -" RADNJA je „read” ili „skip”\n" -" -r, --recursive isto kao --directories=recurse\n" +" -I isto kao --binary-files=without-match\n" +" -d, --directories=AKCIJA kako rukovati direktorijima;\n" +" AKCIJA je „read“, „recurse“ ili „skip“\n" +" -D, --devices=AKCIJA kako rukovati uređajima, FIFO uređajima\n" +" i utičnicama; AKCIJA je „read“ ili „skip“\n" +" -r, --recursive isto kao --directories=recurse\n" " -R, --dereference-recursive jednako, ali slijedi simboličke veze\n" +"\n" -#: src/grep.c:1859 +# http://hjp.znanje.hr/index.php?show=kosi_oblici&id=eVxhWxI%3D +# podudaran > koji je sukladan s čim, koji se poklapa s kim/čim +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -648,16 +675,18 @@ " --exclude-dir=PATTERN directories that match PATTERN will be " "skipped.\n" msgstr "" -" --include=UZORAK_DATOTEKE pretraži samo datoteke koje odgovaraju " -"UZORKU_DATOTEKE\n" -" --exclude=UZORAK_DATOTEKE preskoči datoteke i direktorije koji " -"odgovaraju UZORKU_DATOTEKE\n" -" --exclude-from=DATOTEKA preskoči datoteke koje odgovaraju bilo kojem " -"uzorku iz DATOTEKE\n" -" --exclude-dir=UZORAK direktoriji koji odgovaraju UZORKU će se " -"preskočiti.\n" +" --include=UZORAK_DATOTEKE pretraži samo datoteke podudarne\n" +" s UZORAK_DATOTEKE\n" +" --exclude=UZORAK_DATOTEKE preskoči datoteke i direktorije podudarne\n" +" s UZORAK_DATOTEKE\n" +" --exclude-from=DATOTEKA preskoči datoteke podudarne bilo kojem " +"uzorku\n" +" iz DATOTEKA\n" +" --exclude-dir=UZORAK preskoči direktorije podudarne s UZORAK\n" +"\n" +"\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -667,13 +696,13 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" " -L, --files-without-match ispiši samo imena DATOTEKA bez podudaranja\n" -" -l, --files-with-matches ispiši samo imena DATOTEKA s podudaranjima\n" -" -c, --count ispiši samo broj odgovarajućih redaka po " +" -l, --files-with-matches ispiši samo imena DATOTEKA s podudaranjima\n" +" -c, --count ispiši samo broj odgovarajućih redaka po " "DATOTECI\n" -" -T, --initial-tab poravnaj tabulatore (ako je potrebno)\n" -" -Z, --null ispiši bajt 0 nakon imena DATOTEKE\n" +" -T, --initial-tab poravnaj tabulatore (ako je potrebno)\n" +" -Z, --null ispiši bajt 0 nakon imena DATOTEKE\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -684,11 +713,11 @@ msgstr "" "\n" "Kontrola sadržaja:\n" -" -B, --before-context=BROJ ispiši BROJ redaka sadržaja koji prethodi\n" -" -A, --after-context=BROJ ispiši BROJ redaka sadržaja koji slijedi\n" -" -C, --context=BROJ ispiši BROJ redaka izlaznog sadržaja\n" +" -B, --before-context=BROJ ispiši BROJ redaka sadržaja koji prethodi\n" +" -A, --after-context=BROJ ispiši BROJ redaka sadržaja koji slijedi\n" +" -C, --context=BROJ ispiši BROJ redaka izlaznog sadržaja\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -701,29 +730,29 @@ " (MSDOS/Windows)\n" "\n" msgstr "" -" -BROJ isto kao --context=BROJ\n" +" -BROJ isto kao --context=BROJ\n" " --color[=KADA],\n" -" --colour[=KADA] koristi oznake za razlikovanje podudarajućeg " +" --colour[=KADA] koristi oznake za razlikovanje podudarajućeg " "niza;\n" -" KADA može biti „always” (uvijek), " -"„never” (nikad)\n" -" ili „auto” (automatski).\n" -" -U, --binary ne uklanjaj CR znakove na kraju retka (MSDOS/" -"Windows)\n" -" -u, --unix-byte-offsets prikazuj pomake kao da CR-ova nema (MSDOS/" +" KADA može biti „always“ (uvijek), " +"„never“ (nikad)\n" +" ili „auto“ (automatski).\n" +" -U, --binary ne uklanjaj CR znakove na kraju retka\n" +" (MSDOS/Windows)\n" +" -u, --unix-byte-offsets prikazuj pomake kao da CR-ova nema (MSDOS/" "Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" "Direct invocation as either 'egrep' or 'fgrep' is deprecated.\n" msgstr "" -"„egrep” znači „grep -E”. „fgrep” znači „grep -F”.\n" -"Izravno pozivanje „egrep” i „fgrep” je zastarjelo.\n" +"„egrep“ znači „grep -E“. „fgrep“ znači „grep -F“.\n" +"Izravno pozivanje „egrep“ i „fgrep“ je zastarjelo.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -738,40 +767,46 @@ "Izlazno stanje je 0 ako je odabran bilo koji redak, inače 1;\n" "ako su se pojavile greške i opcija -q nije zadana, izlazno stanje je 2.\n" -#: src/grep.c:1958 +# matchers su tragači (java, perl, itd.) +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "navedeni su suprotstavljeni izrazi" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "neispravan uspoređivač %s" -#: src/grep.c:2252 +# bp: alias > pseudonim ? > nadimak ? +# script > skripta +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" -msgstr "" +msgstr "Upozorenje: GREP_OPTIONS je zastarjela; upotrijebite alias ili script" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" -msgstr "nepoznata metoda uređaja" +msgstr "nepoznati uređaj" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "neispravan maksimalni broj ponavljanja" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "nepoznata vrsta binarnih datoteka" +# bp: novi msgid #: src/pcresearch.c:71 #, c-format msgid "failed to allocate memory for the PCRE JIT stack" msgstr "" +"failed to allocate memory for the PCRE JIT stack\\n\n" +"dodjela memorije za PCRE JIT stog nije uspjela" #: src/pcresearch.c:96 msgid "" @@ -781,67 +816,55 @@ "podrška za opciju -P nije kompajlirana u ovu --disable-perl-regexp binarnu " "datoteku" +# bp: novi msgid #: src/pcresearch.c:119 #, c-format msgid "-P supports only unibyte and UTF-8 locales" -msgstr "" +msgstr "-P podržava samo jednobajtne kodove i UTF-8 locale" #: src/pcresearch.c:126 #, c-format msgid "the -P option only supports a single pattern" msgstr "opcija -P podržava samo jedan uzorak" +# bp: novi msgid +# escape > cause (a subsequent character or characters) to be interpreted differently. #: src/pcresearch.c:138 #, c-format msgid "unescaped ^ or $ not supported with -Pz" -msgstr "" +msgstr "znakovi ^ ili $ bez prethodne ‘\\’ (unescaped) nisu podržani s -Pz" -#: src/pcresearch.c:182 +# bp: novi msgid +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" -msgstr "" +msgstr "interna greška (ne bi se smjela dogoditi)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "interna greška" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "prekoračeno ograničenje PCRE duljine retka" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" -msgstr "" +msgstr "PCRE JIT stog je iscrpljen" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "prekoračeno ograničenje PCRE praćenja" -#: src/pcresearch.c:353 -#, fuzzy, c-format +# bp:fuzzy popravljen +#: src/pcresearch.c:355 +#, c-format msgid "internal PCRE error: %d" -msgstr "interna greška" - -#, fuzzy -#~ msgid "" -#~ "Usage: %s [OPTION]... PATTERN [FILE]...\n" -#~ " or: %s [OPTION]... --files0-from=F PATTERN\n" -#~ msgstr "Koritenje: %s [OPCIJA]... UZORAK [SPIS] ...\n" - -#, fuzzy -#~ msgid "%s: read error" -#~ msgstr "greška pisanja" - -#, fuzzy -#~ msgid "invalid zero-length file name" -#~ msgstr "neispravan argument duljine konteksta" - -#~ msgid "GNU Grep home page: <%s>\n" -#~ msgstr "GNU Grep početna stranica: <%s>\n" +msgstr "interna PCRE greška: %d" #~ msgid "PATTERN is an extended regular expression (ERE).\n" #~ msgstr "UZORAK je prošireni regularni izraz (ERE).\n" @@ -856,6 +879,9 @@ #~ msgid "Invocation as 'fgrep' is deprecated; use 'grep -F' instead.\n" #~ msgstr "Pozivanje naredbom „fgrep” je zastarjelo; koristite „grep -F”.\n" +#~ msgid "GNU Grep home page: <%s>\n" +#~ msgstr "GNU Grep početna stranica: <%s>\n" + #~ msgid "%s can only use the %s pattern syntax" #~ msgstr "%s može koristiti samo %s sintaksu uzoraka" @@ -874,6 +900,9 @@ #~ msgid "writing output" #~ msgstr "piem izlaz" +#~ msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n" +#~ msgstr "Koritenje: %s [OPCIJA]... UZORAK [SPIS] ...\n" + #~ msgid "" #~ "\n" #~ "Output control:\n" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/hu.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/hu.gmo differ diff -Nru grep-2.24/po/hu.po grep-2.25/po/hu.po --- grep-2.24/po/hu.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/hu.po 2016-04-22 04:37:24.000000000 +0000 @@ -3,21 +3,21 @@ # Copyright (C) 2002, 2009, 2010, 2014 Free Software Foundation, Inc. # # Emese Kovács , 2002, 2010. -# Gabor Kelemen , 2009, 2010, 2014. +# Gabor Kelemen , 2009, 2010, 2014, 2016. # Balázs Úr , 2014, 2015. msgid "" msgstr "" -"Project-Id-Version: grep 2.21.78\n" +"Project-Id-Version: grep 2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" -"PO-Revision-Date: 2015-11-20 23:43+0100\n" -"Last-Translator: Balázs Úr \n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" +"PO-Revision-Date: 2016-03-14 18:34+0100\n" +"Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: lib/argmatch.c:133 @@ -34,7 +34,7 @@ msgid "Valid arguments are:" msgstr "Az érvényes argumentumok a következők:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "íráshiba" @@ -103,7 +103,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: a(z) „-W%s” kapcsolóhoz argumentum szükséges\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "elfogyott a memória" @@ -176,9 +176,8 @@ msgstr "Érvénytelen visszahivatkozás" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Pár nélküli [ vagy [^" +msgstr "Pár nélküli [, [^, [:, [., vagy [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -216,7 +215,7 @@ msgid "Unmatched ) or \\)" msgstr "Pár nélküli ) vagy \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Nincs megelőző reguláris kifejezés" @@ -410,110 +409,110 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s: a(z) „%s” argumentum túl nagy" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "kiegyensúlyozatlan [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "érvénytelen karakterosztály" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "a karakterosztály szintaxisa [[:space:]], nem [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "befejezetlen \\ escape" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "a \\{\\} tartalma érvénytelen" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "a reguláris kifejezés túl nagy" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "kiegyensúlyozatlan (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "nincs szintaxis megadva" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "kiegyensúlyozatlan )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "mások, lásd: " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "érvénytelen szövegkörnyezethossz argumentum" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "a bemenet túl nagy a megszámláláshoz" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "az lseek meghiúsult" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "%s bináris fájl illeszkedik\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "figyelmeztetés: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekurzív könyvtárhurok" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "%s bemeneti fájl a kimenet is" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(szabványos bemenet)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Használat: %s [KAPCSOLÓ]… MINTA [FÁJL]…\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "További információkért adja ki a(z) „%s --help” parancsot.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "A MINTA keresése minden FÁJLBAN vagy a szabványos bemeneten.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "A MINTA egy alapszintű reguláris kifejezés (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -524,7 +523,7 @@ "\n" "Reguláris kifejezés kiválasztása és értelmezése:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -538,7 +537,7 @@ " -G, --basic-regexp a MINTA alapvető reguláris kifejezés (BRE)\n" " -P, --perl-regexp a MINTA Perl reguláris kifejezés\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -555,7 +554,7 @@ " -x, --line-regexp a MINTA csak egész sorra illeszkedik\n" " -z, --null-data az adat sorai 0 bájtra végződnek, nem újsorra\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -572,7 +571,7 @@ " -V, --version verzióinformációk kiírása és kilépés\n" " --help ezen súgó kiírása és kilépés\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -599,7 +598,7 @@ "bemenet\n" " használatakor\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -617,7 +616,7 @@ "egyike\n" " -a, --text ugyanaz, mint a --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -637,7 +636,7 @@ " -r, --recursive ugyanaz, mint a --directories=recurse\n" " -R, --dereference-recursive hasonló, de követi az összes szimlinket\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -654,7 +653,7 @@ " fájlok kihagyása.\n" " --exclude-dir=MINTA a MINTÁRA illeszkedő könyvtárak kihagyása\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -671,7 +670,7 @@ " -T, --initial-tab sorok feltöltése tabokkal (ha szükséges)\n" " -Z, --null 0 bájt írása a FÁJLNÉV után\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -688,7 +687,7 @@ "környezetből\n" " -C, -- context=SZÁM SZÁM darab sor kiírása a környezetből\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -711,7 +710,7 @@ " (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -720,7 +719,7 @@ "Az „egrep” jelentése „grep -E”. Az „fgrep” jelentése „grep -F”.\n" "A közvetlen hívás „egrep” vagy „fgrep” formában elavult.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -735,32 +734,32 @@ "érték: 0, ha van találat, egyébként 1, ha hiba történt és a -q nincs " "megadva: 2\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "ütköző illesztők lettek megadva" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "érvénytelen illesztő: %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "figyelem: a GREP_OPTIONS elavult; használjon álnevet vagy parancsfájlt" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "ismeretlen eszközmódszer" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "érvénytelen maximális szám" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "ismeretlen bináris fájl típus" @@ -791,34 +790,34 @@ #: src/pcresearch.c:138 #, c-format msgid "unescaped ^ or $ not supported with -Pz" -msgstr "" +msgstr "a nem escapelt ^ vagy $ nem támogatott a -Pz kapcsolóval" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "belső hiba (soha nem szabadna előfordulnia)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "belső hiba" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "a PCRE sorhossza túllépve" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "kifogyott a PCRE JIT verem" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "a PCRE visszakövetési korlátja túllépve" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "belső PCRE hiba: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/id.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/id.gmo differ diff -Nru grep-2.24/po/id.po grep-2.25/po/id.po --- grep-2.24/po/id.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/id.po 2016-04-22 04:37:24.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grep 2.19.12\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2014-08-05 07:00+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -31,7 +31,7 @@ msgid "Valid arguments are:" msgstr "Valid (sesuai) argumen adalah:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "penulisan error" @@ -100,7 +100,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opsi `-W %s' membutuhkan sebuah argumen\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "kehabisan memori" @@ -213,7 +213,7 @@ msgid "Unmatched ) or \\)" msgstr "Tidak cocok ) atau \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Tidak ada ekspresi umum sebelumnya" @@ -406,111 +406,111 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s argumen '%s' terlalu besar" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "[ tidak seimbang" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "Nama kelas karakter tidak valid" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" "character (karakter) tingkat sintaks adalah [[:space:]], tidak [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "escape \\\\ tidak selesai" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "Isi dari \\{\\} tidak valid" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "Ekspresi umum terlalu besar" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "( tidak seimbang" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "Tidak ada sintaks yang dispesifikasikan" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr ") tidak seimbang" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "lain, lihat " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "konteks panjang argumen tidak valid" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "masukan terlalu besar untuk dihitung" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "gagal lseek" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Berkas binari %s cocok\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "peringatan: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "perulangan direktori rekursif" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "input (masuk) berkas %s juga keluar" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standar masukan)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Penggunaan: %s [OPSI]... POLA [BERKAS]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Coba '%s --help' untuk informasi lebih lanjut.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Cari untuk POLA dalam setiap berkas atau standar masukan.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "POLA adalah, secara baku, sebuah ekspresi regular dasar (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -521,7 +521,7 @@ "\n" "Seleksi dan interpretasi regexp:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -535,7 +535,7 @@ " -G, --basic-regexp POLA adalah ekspresi reguler dasar\n" " -P, --perl-regexp POLA adalah sebuah ekspresi reguler Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -556,7 +556,7 @@ "baru\n" "\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -573,7 +573,7 @@ " -V, --version tampilkan informasi versi dan keluar\n" " --help tampilkan bantuan ini dan keluar\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -598,7 +598,7 @@ " --label=LABEL use LABEL as the standard input file name " "prefix\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -613,7 +613,7 @@ " TYPE is 'binary', 'text', or 'without-match'\n" " -a, --text equivalent to --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -632,7 +632,7 @@ " -r, --recursive like --directories=recurse\n" " -R, --dereference-recursive likewise, but follow all symlinks\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -649,7 +649,7 @@ " --exclude-dir=PATTERN directories that match PATTERN will be " "skipped.\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -664,7 +664,7 @@ " -T, --initial-tab make tabs line up (if needed)\n" " -Z, --null print 0 byte after FILE name\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -679,7 +679,7 @@ " -A, --after-context=NUM print NUM lines of trailing context\n" " -C, --context=NUM print NUM lines of output context\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -703,7 +703,7 @@ "(MSDOS)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -712,7 +712,7 @@ "`egrep' berarti `grep -E'. `fgrep' berarti `grep -F'.\n" "Pemanggilan langsung baik sebagai `egrep' atau `fgrep' sudah ditinggalkan.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -728,32 +728,32 @@ "jika ada error apapun yang terjadi dan opsi -q tidak diberikan, status " "keluar adalah 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "konflik pencocokan dispesifikasikan" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "matcher tidak valid %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "metode device tidak dikenal" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "jumlah maksimal tidak valid" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "tipe berkas binari tidak dikenal" @@ -786,32 +786,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "internal error (should never happen)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "penulisan error" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "exceeded PCRE's line length limit" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "exceeded PCRE's backtracking limit" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "penulisan error PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/it.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/it.gmo differ diff -Nru grep-2.24/po/it.po grep-2.25/po/it.po --- grep-2.24/po/it.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/it.po 2016-04-22 04:37:24.000000000 +0000 @@ -1,16 +1,16 @@ # Italian translation of grep -# Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016 Free Software Foundation, Inc. # This file is distributed under the same license as the grep package. # # Marco d'Itri , 1999, 2001. -# Milo Casagrande , 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Milo Casagrande , 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016. # msgid "" msgstr "" -"Project-Id-Version: grep-2.21.78\n" +"Project-Id-Version: grep-2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" -"PO-Revision-Date: 2015-10-18 17:27+0200\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" +"PO-Revision-Date: 2016-03-15 12:10+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: it\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 1.8.5\n" +"X-Generator: Poedit 1.8.7\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/argmatch.c:133 @@ -35,7 +35,7 @@ msgid "Valid arguments are:" msgstr "Gli argomenti validi sono:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "errore di scrittura" @@ -104,7 +104,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: l'opzione \"-W %s\" richiede un argomento\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "memoria esaurita" @@ -178,9 +178,8 @@ msgstr "Riferimento all'indietro non valido" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "[ o [^ senza corrispondenza" +msgstr "[, [^, [:, [., o [= senza corrispondenza" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -218,7 +217,7 @@ msgid "Unmatched ) or \\)" msgstr ") o \\) senza corrispondenza" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Nessuna espressione regolare precedente" @@ -413,111 +412,111 @@ msgid "%s%s argument '%s' too large" msgstr "l'argomento \"%3$s\" di %1$s%2$s è troppo grande" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "[ non bilanciata" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "Classe del carattere non valido" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "La sintassi per la classe di caratteri è [[:space:]], non [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "Escape \\ incompleto" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "Contenuto di \\{\\} non valido" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "Espressione regolare troppo grande" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "( non bilanciata" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "Nessuna sintassi specificata" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr ") non bilanciata" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "altri, consultare " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "argomento della lunghezza del contesto non valido" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "l'input è troppo grande per essere contato" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek non riuscita" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Il file binario %s corrisponde\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "attenzione: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "ciclo ricorsivo di directory" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "il file di input %s è anche l'output" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standard input)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Uso: %s [OPZIONE]... MODELLO [FILE]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Usare \"%s --help\" per ulteriori informazioni.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Cerca il MODELLO in ogni FILE o nello standard input.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" "MODELLO è, in modo predefinito, un'espressione regolare di base (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -528,7 +527,7 @@ "\n" "Selezione e interpretazione delle regexp:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -544,7 +543,7 @@ "(BRE)\n" " -P, --perl-regexp MODELLO è un'espressione regolare Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -565,7 +564,7 @@ "che\n" " newline\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -582,7 +581,7 @@ " -V, --version Stampa la versione ed esce\n" " --help Visualizza questo aiuto ed esce\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -608,7 +607,7 @@ " --label=ETICH Usa ETICH come nome del file per lo standard " "input\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -626,7 +625,7 @@ " \\\"text\\\" oppure \\\"without-match\\\"\n" " -a, --text Equivale a --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -647,7 +646,7 @@ " Simile al precedente, ma segue i collegamenti\n" " simbolici\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -662,7 +661,7 @@ " --exclude-from=FILE Salta i file corrispondenti ai modelli nel FILE\n" " --exclude-dir=MODELLO Salta le directory corrispondenti al MODELLO\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -681,7 +680,7 @@ " -T, --initial-tab Allinea le tabulazioni (se necessario)\n" " -Z, --null Stampa il byte 0 dopo ogni nome di FILE\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -696,7 +695,7 @@ " -A, --after-context=NUM Stampa NUM righe di contesto seguente\n" " -C, --context=NUM Stampa NUM righe di contesto dell'output\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -721,7 +720,7 @@ " (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -730,7 +729,7 @@ "\"egrep\" significa \"grep -E\", \"fgrep\" significa \"grep -F\".\n" "L'invocazione diretta come \"egrep\" o \"fgrep\" è deprecata.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -748,32 +747,32 @@ "stato\n" "è 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "specificate corrispondenze in conflitto" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "corrispondenza %s non valida" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "attenzione: GREP_OPTIONS è deprecata, utilizzare un alias o uno script" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "metodo per i device sconosciuto" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "numero massimo non valido" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "tipo di file binario sconosciuto" @@ -804,34 +803,34 @@ #: src/pcresearch.c:138 #, c-format msgid "unescaped ^ or $ not supported with -Pz" -msgstr "" +msgstr "^ o $ senza escape non supportato con -Pz" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "errore interno (non si dovrebbe mai verificare)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "errore interno" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "limite di lunghezza riga PCRE raggiunto" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "stack JIT PCRE esaurito" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "limite di backtrack PCRE raggiunto" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "errore interno PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/ja.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/ja.gmo differ diff -Nru grep-2.24/po/ja.po grep-2.25/po/ja.po --- grep-2.24/po/ja.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/ja.po 2016-04-22 04:37:24.000000000 +0000 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: GNU grep 2.20.72\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2014-10-30 06:46+0100\n" "Last-Translator: Yasuaki Taniguchi \n" "Language-Team: Japanese \n" @@ -40,7 +40,7 @@ msgid "Valid arguments are:" msgstr "有効な引数:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "書き込みエラー" @@ -109,7 +109,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: オプション '-W %s' には引数が必要です\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "メモリを使い果たしました" @@ -222,7 +222,7 @@ msgid "Unmatched ) or \\)" msgstr ") または \\) が不一致です" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "以前に正規表現がありません" @@ -420,112 +420,112 @@ msgid "%s%s argument '%s' too large" msgstr "引数 '%3$s' に対する %1$s%2$s が大きすぎます" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "対応がとれていない [ です" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "無効な文字クラス名です" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "文字クラスの構文は [[:space:]] です。 [:space:] ではありません" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "\\ エスケープが終了していません" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "\\{\\} の中身が無効です" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "正規表現が大きすぎます" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "対応がとれていない ( です" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "構文が指定されていません" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "対応がとれていない ) です" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" "その他の方々は を参照して" "ください" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "一致した前後の行の表示に関する引数が無効です" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "入力が大きすぎて数えられません" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek に失敗しました" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "バイナリファイル %s に一致しました\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "警告: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "ディレクトリーが再帰的ループをしています" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "入力ファイル %s が出力にもなっています" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(標準入力)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "使用法: %s [OPTION]... PATTERN [FILE]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "詳しくは'%s --help'を実行してください。\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "各 FILE または標準入力内の PATTERN を検索します。\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "PATTERN はデフォルトでは基本正規表現 (BRE) です。\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -536,7 +536,7 @@ "\n" "正規表現の選択および解釈:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -549,7 +549,7 @@ " -G, --basic-regexp PATTERN を基本正規表現 (BRE) とする\n" " -P, --perl-regexp PATTERN を Perl 正規表現とする\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -566,7 +566,7 @@ " -x, --line-regexp 強制的に行全体で PATTERN の一致処理を行う\n" " -z, --null-data データの行末を改行ではなく NULL とする\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -583,7 +583,7 @@ " -V, --version バージョン情報を表示して終了する\n" " --help このヘルプを表示して終了する\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -608,7 +608,7 @@ " --label=LABEL 標準入力のファイル名の接頭辞として LABEL を使用す" "る\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -623,7 +623,7 @@ " TYPE は 'binary'、'text' または 'without-match'\n" " -a, --text --binary-files=text と等価\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -642,7 +642,7 @@ " -r, --recursive --directories=recurse と等価\n" " -R, --dereference-recursive 上と同様だがシンボリックリンクを辿る\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -659,7 +659,7 @@ "ファイルをスキップする\n" " --exclude-dir=PATTERN PATTERN に一致したディレクトリをスキップする\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -675,7 +675,7 @@ " -Z, --null FILE の名前を表示した後に値が 0 のバイトを出力す" "る\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -690,7 +690,7 @@ " -A, --after-context=NUM 一致した後の NUM 行を表示する\n" " -C, --context=NUM 一致した前後 NUM 行を表示する\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -713,7 +713,7 @@ " (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -722,7 +722,7 @@ "'egrep' は 'grep -E' を意味します。 'fgrep' は 'grep -F' を意味します。\n" "'egrep' または 'fgrep' による直接起動は廃止予定です。\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, fuzzy, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -738,33 +738,33 @@ "それ以外は 1 です。エラーが発生して -q を指定していない場合の終了コードは 2\n" "になります。\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "指定した一致処理系が競合しています" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "%s は無効な一致処理系です" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "警告: GREP_OPTIONS は廃止されました。alias またはスクリプトを使用してください" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "デバイスに対する不明な操作です" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "無効な一致回数です" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "不明なバイナリファイルの形式です" @@ -797,32 +797,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "内部エラー (決して発生しないはず)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "内部エラー" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "PCRE の行長制限を超過しました" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "PCRE のバックスラッシュ制限を超過しました" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "PCRE 内部エラー: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/ko.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/ko.gmo differ diff -Nru grep-2.24/po/ko.po grep-2.25/po/ko.po --- grep-2.24/po/ko.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/ko.po 2016-04-22 04:37:24.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: GNU grep 2.0f\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 1997-09-03 11:19+0900\n" "Last-Translator: Bang Jun-Young \n" "Language-Team: Korean \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "" @@ -98,7 +98,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: `%s' ɼ μ ʿմϴ\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "޸𸮰 ٴڳ" @@ -210,7 +210,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "" @@ -377,115 +377,115 @@ msgid "%s%s argument '%s' too large" msgstr "" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 #, fuzzy msgid "unbalanced [" msgstr "¦ ʴ [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" -#: src/dfa.c:1245 +#: src/dfa.c:1230 #, fuzzy msgid "unfinished \\ escape" msgstr "ϰ \\ ̽" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "" -#: src/dfa.c:1811 +#: src/dfa.c:1796 #, fuzzy msgid "unbalanced (" msgstr "¦ ʴ (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 #, fuzzy msgid "no syntax specified" msgstr " ʾ" -#: src/dfa.c:1945 +#: src/dfa.c:1930 #, fuzzy msgid "unbalanced )" msgstr "¦ ʴ )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "" -#: src/grep.c:1550 +#: src/grep.c:1588 #, fuzzy, c-format msgid "warning: %s: %s" msgstr "%s: : %s: %s\n" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(ǥ Է)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr ": %s [ɼ]... []...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr " `%s --help' Ͻʽÿ.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" -#: src/grep.c:1807 +#: src/grep.c:1845 #, fuzzy, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr " -G, --basic-regexp ⺻ Խ ˴ϴ\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, fuzzy, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -493,7 +493,7 @@ "Regexp selection and interpretation:\n" msgstr "Խ ð ؼ:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -502,7 +502,7 @@ " -P, --perl-regexp PATTERN is a Perl regular expression\n" msgstr "" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -513,7 +513,7 @@ " -z, --null-data a data line ends in 0 byte, not newline\n" msgstr "" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -524,7 +524,7 @@ " --help display this help text and exit\n" msgstr "" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -539,7 +539,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -549,7 +549,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -561,7 +561,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -572,7 +572,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -582,7 +582,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -592,7 +592,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -606,14 +606,14 @@ "\n" msgstr "" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" "Direct invocation as either 'egrep' or 'fgrep' is deprecated.\n" msgstr "" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -623,32 +623,32 @@ "if any error occurs and -q is not given, the exit status is 2.\n" msgstr "" -#: src/grep.c:1958 +#: src/grep.c:1996 #, fuzzy, c-format msgid "conflicting matchers specified" msgstr "¦ ̹ Ǿ" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "" -#: src/grep.c:2409 +#: src/grep.c:2447 #, fuzzy, c-format msgid "invalid max count" msgstr "ϰ ݺ ȸ" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "" @@ -679,32 +679,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/ky.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/ky.gmo differ diff -Nru grep-2.24/po/ky.po grep-2.25/po/ky.po --- grep-2.24/po/ky.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/ky.po 2016-04-22 04:37:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grep 2.5.3\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2007-09-01 17:27+0100\n" "Last-Translator: Azilet Beishenaliev \n" "Language-Team: Kirghiz \n" @@ -33,7 +33,7 @@ msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "" @@ -103,7 +103,7 @@ msgstr "%s: `%s' опциясы менен аргумент болуш керек\n" # Памятты эмне дейбиз яя? ;) -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "память жетпей калды" @@ -216,7 +216,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "" @@ -387,120 +387,120 @@ msgid "%s%s argument '%s' too large" msgstr "" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 #, fuzzy msgid "unbalanced [" msgstr "[ - мунун уйкашы жок" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" # escape - кыргызча??? -#: src/dfa.c:1245 +#: src/dfa.c:1230 #, fuzzy msgid "unfinished \\ escape" msgstr "Бүтпөй калган эскейп \\" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "максимум сан жарабайт" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "" -#: src/dfa.c:1811 +#: src/dfa.c:1796 #, fuzzy msgid "unbalanced (" msgstr "( - мунун уйкашы жок" # кайсы синтаксис? грептин шаблонубу? -#: src/dfa.c:1937 +#: src/dfa.c:1922 #, fuzzy msgid "no syntax specified" msgstr "Синтаксис аталган жок" -#: src/dfa.c:1945 +#: src/dfa.c:1930 #, fuzzy msgid "unbalanced )" msgstr ") - мунун уйкашы жок" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "контекст узундугу жарабайт" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "берилген данныйлардын саны саналбай турганча көп" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Экилик форматтагы %s файлы уйкашат\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, fuzzy, c-format msgid "warning: %s: %s" msgstr "эскертүү: %s: %s\n" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "бирибирине кирген папка айлампасы бар" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(стандарт кирүү)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Колдонулушу: %s [ОПЦИЯ]... ШАБЛОН [ФАЙЛ]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Толук маалымат үчүн `%s --help' деп жазгыла.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Ар ФАЙЛда же стандарт кирүүдө ШАБЛОНду изде.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" "ШАБЛОН, алдынала тандалгандай, негизги түрдөгү регулярдуу выражение (BRE)\n" # выражение дегендин кыргызчасын жазыш керек -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -512,7 +512,7 @@ "Регулярдуу выражение тандоо жана мааниси:\n" # выражение - кыргызчасын жаз!!!! -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -526,7 +526,7 @@ " -P, --perl-regexp ШАБЛОН Perl түрүндөгү регулярдуу выражение\n" # выражение!!!! -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -544,7 +544,7 @@ " -z, --null-data дата(данный) саптары 0 байты(EOL эмес) менен " "бүтөт\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -562,7 +562,7 @@ " --help бул жардам маалыматын көрсөтүп бүтүрөт\n" " --mmap мүмкүнчүлүк болсо mmap кирүүсү колдонулат\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -577,7 +577,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -587,7 +587,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -599,7 +599,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -610,7 +610,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -620,7 +620,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -630,7 +630,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, fuzzy, c-format msgid "" " -NUM same as --context=NUM\n" @@ -659,7 +659,7 @@ "(MSDOS)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, fuzzy, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -668,7 +668,7 @@ "`egrep' деген `grep -E'. `fgrep' деген `grep -F'.\n" "`egrep' же `fgrep' деп туз иштетуу колдонулбай калды.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, fuzzy, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -682,32 +682,32 @@ "статусу 0 болот, башка учурда 1; эгерде ката чыкса жана -q опциясы " "берилбеген болсо бүтүрүү статусу 2 болот.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "уйкаштыруучуларда конфликттер табылды" -#: src/grep.c:1969 +#: src/grep.c:2007 #, fuzzy, c-format msgid "invalid matcher %s" msgstr "максимум сан жарабайт" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "аспап методу белгисиз" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "максимум сан жарабайт" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "белгисиз файл түрү" @@ -740,32 +740,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/lt.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/lt.gmo differ diff -Nru grep-2.24/po/lt.po grep-2.25/po/lt.po --- grep-2.24/po/lt.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/lt.po 2016-04-22 04:37:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grep-2.5.4-pre3\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2008-07-09 13:28+0300\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -33,7 +33,7 @@ msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "" @@ -102,7 +102,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: parametrui „%s“ reikia argumento\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "baigėsi atmintis" @@ -214,7 +214,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "" @@ -390,117 +390,117 @@ msgid "%s%s argument '%s' too large" msgstr "" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 #, fuzzy msgid "unbalanced [" msgstr "Nesubalansuotas [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" -#: src/dfa.c:1245 +#: src/dfa.c:1230 #, fuzzy msgid "unfinished \\ escape" msgstr "Nebaigta \\ kaitos seka" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "netaisyklingas maksimalus skaičius" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "" -#: src/dfa.c:1811 +#: src/dfa.c:1796 #, fuzzy msgid "unbalanced (" msgstr "Nesubalansuotas (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 #, fuzzy msgid "no syntax specified" msgstr "Nenurodyta sintaksė" -#: src/dfa.c:1945 +#: src/dfa.c:1930 #, fuzzy msgid "unbalanced )" msgstr "Nesubalansuotas )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "netaisyklingas konteksto ilgio argumentas" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "įvedimas per didelis skaičiavimui" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Dvejetainis failas %s atitinka\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, fuzzy, c-format msgid "warning: %s: %s" msgstr "įspėjimas: %s: %s\n" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekursyvus aplankų ciklas" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standartinis įvedimas)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Naudojimas: %s [ARGUMENTAS]... ŠABLONAS [FAILAS]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Pabandykite „%s --help“, jei norite gauti daugiau informacijos.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Ieškoti ŠABLONO kiekviename faile arba standartiniame įėjime.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" "ŠABLONAS numatytuoju atveju yra paprasta reguliarioji išraiška (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -511,7 +511,7 @@ "\n" "Reguliariųjų išraiškų parinkimas ir interpretacija:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -526,7 +526,7 @@ "(BRE)\n" " -P, --perl-regexp ŠABLONAS yra Perl reguliarioji išraiška\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -544,7 +544,7 @@ " -z, --null-data duomenų eilutė baigiasi 0 baitu, o ne nauja " "eil.\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -562,7 +562,7 @@ " --help parodyti šią informaciją ir išeiti\n" " --mmap naudoti mmap įvedimą, jei tai įmanoma\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -577,7 +577,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -587,7 +587,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -599,7 +599,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -610,7 +610,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -620,7 +620,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -630,7 +630,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, fuzzy, c-format msgid "" " -NUM same as --context=NUM\n" @@ -657,7 +657,7 @@ "(MSDOS)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, fuzzy, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -666,7 +666,7 @@ "„egrep“ reiškia „grep -E“. „fgrep“ reiškia „grep -F“.\n" "Tiesioginiai kvietimai vardais „egrep“ arba „fgrep“ nebenaudotini.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, fuzzy, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -680,32 +680,32 @@ "0, jei rasta bent viena eilutė, 1 kitais atvejais;\n" "jei įvyksta klaida ir nenurodytas -q, klaidos kodas yra 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "nurodyti nesuderinami atitikimo mechanizmai" -#: src/grep.c:1969 +#: src/grep.c:2007 #, fuzzy, c-format msgid "invalid matcher %s" msgstr "netaisyklingas maksimalus skaičius" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "nežinomas įrenginių metodas" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "netaisyklingas maksimalus skaičius" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "nežinomas dvejetainių failų tipas" @@ -738,32 +738,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/nb.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/nb.gmo differ diff -Nru grep-2.24/po/nb.po grep-2.25/po/nb.po --- grep-2.24/po/nb.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/nb.po 2016-04-22 04:37:24.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: grep-2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2016-03-07 12:12+0100\n" "Last-Translator: Åka Sikrom \n" "Language-Team: Norwegian Bokmaal \n" @@ -33,7 +33,7 @@ msgid "Valid arguments are:" msgstr "Følgende argumenter er gyldige:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "skrivefeil" @@ -102,7 +102,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: valget «-W %s» krever et argument\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "minnet er oppbrukt" @@ -214,7 +214,7 @@ msgid "Unmatched ) or \\)" msgstr "Ingen treff på «)» eller «\\)»" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Intet tidligere regulært uttrykk" @@ -408,110 +408,110 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s-argumentet «%s» er for stort/langt" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "ubalansert «[»" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "ugyldig tegnklasse" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "gjeldende tegnklasse-syntaks er [[:space:]], ikke [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "ufullstendig \\-skiftetegn" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "ugyldig innhold i \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "regulært uttrykk er for stort" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "ubalansert «(»" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "ingen syntaks er valgt" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "ubalansert «)»" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "andre (se )" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "ugyldig kontekstlengde" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "for mye inndata å telle" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek mislyktes" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Binærfil %s samsvarer\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "advarsel: %s. %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekursiv mappeløkke" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "inndatafil %s er også brukt som utdata" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standard inndata)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Bruk: %s [VALG] … MØNSTER [FIL] …\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Prøv å skrive «%s --help» for mer informasjon.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Søk etter valgt MØNSTER i valgt(e) FIL(er) eller standard inndata.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "MØNSTER er et enkelt regulært uttrykk (BRE) som standard. \n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -522,7 +522,7 @@ "\n" "Reg.uttrykksutvalg og tolkning:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -535,7 +535,7 @@ " -G, --basic-regexp MØNSTER er et enkelt regulært uttrykk (BRE)\n" " -P, --perl-regexp MØNSTER er et regulært uttrykk i Perl-format\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -553,7 +553,7 @@ " -z, --null-data datalinjer slutter med tomme byte, i stedet for " "linjeskift\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -570,7 +570,7 @@ " -V, --version vis versjon og avslutt\n" " --help vis denne helpeteksten og avslutt\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -596,7 +596,7 @@ " --label=ETTIKETT bruk valgt ETIKETT som prefiks på standard " "inndata-filnavn\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -612,7 +612,7 @@ "«without-match» (uten treff)\n" " -a, --text tilsvarer «--binary-files=text»\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -634,7 +634,7 @@ " -r, --recursive tilsvarer «--directories=recurse»\n" " -R, --dereference-recursive likner «-r», men følger symbolske lenker\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -652,7 +652,7 @@ "FIL\n" " --exclude-dir=MØNSTER hopp over mapper som samsvarer med MØNSTER.\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -668,7 +668,7 @@ " -T, --initial-tab still opp tabulatorer (hvis nødvendig)\n" " -Z, --null skriv ut tom byte etter FILnavn\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -686,7 +686,7 @@ " -C, --context=ANT skriv ut valgt ANTall linjer med utdata-" "kontekst\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -711,7 +711,7 @@ " (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -720,7 +720,7 @@ "«egrep» betyr «grep -E». «fgrep» betyr «grep -F».\n" "Direkte kjøring som «egrep» eller «fgrep» er foreldet.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -736,32 +736,32 @@ "Avsluttende statuskode er 0 hvis linje(r) er valgt, og ellers 1.\n" "Hvis det oppstår feil og «-q» ikke er valgt, gjelder statuskode 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "søkeuttrykkene er i konflikt med hverandre" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "«%s» er et ugyldig søkeuttrykk" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "advarsel: GREP_OPTIONS er utdatert. Bruk et alias eller skript" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "ukjent enhetsmetode" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "ugyldig maksantall" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "ukjent binærfiltype" @@ -794,32 +794,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "ingen treff på «^», eller «$» støttes ikke med «-Pz»" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "intern feil (dette skal aldri skje)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "intern feil" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "grensa for PCRE-linjelengde er overskredet" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "PCRE JIT-stabel er oppbrukt" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "grensa for PCRE-tilbakegang er overskredet" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "intern PCRE-feil: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/nl.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/nl.gmo differ diff -Nru grep-2.24/po/nl.po grep-2.25/po/nl.po --- grep-2.24/po/nl.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/nl.po 2016-04-22 04:37:24.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: grep-2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2016-03-05 17:34+0100\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" @@ -38,7 +38,7 @@ msgid "Valid arguments are:" msgstr "Geldige argumenten zijn:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "schrijffout" @@ -107,7 +107,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: optie '-W %s' vereist een argument\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "onvoldoende geheugen beschikbaar" @@ -220,7 +220,7 @@ msgid "Unmatched ) or \\)" msgstr "Ongepaarde ) of \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Geen eerdere reguliere expressie" @@ -417,112 +417,112 @@ msgid "%s%s argument '%s' too large" msgstr "argument '%3$s' van %1$s%2$s is te groot" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "ongepaarde [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "ongeldige tekenklasse" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "syntax van tekenklasse is [[:space:]], niet [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "onafgemaakte \\-stuurcode" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "ongeldige inhoud van \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "reguliere expressie is te groot" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "ongepaarde (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "geen syntax opgegeven" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "ongepaarde )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "anderen, zie " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "ongeldig argument voor contextlengte" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "invoer is te groot om te kunnen tellen" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "'lseek' is mislukt" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Binair bestand %s bevat de gezochte tekst.\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "waarschuwing: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "oneindige lus in de mappen" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "invoerbestand %s is gelijk aan het uitvoerbestand" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standaardinvoer)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Gebruik: %s [OPTIE...] PATROON [BESTAND...]\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Typ '%s --help' voor meer informatie.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" " \n" "Zoekt naar PATROON in ieder gegeven BESTAND, of in standaardinvoer.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "PATROON is standaard een gewone reguliere expressie (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -534,7 +534,7 @@ "\n" "Selectie en interpretatie van reguliere expressies:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -549,7 +549,7 @@ " -G, --basic-regexp PATROON is een gewone reguliere expressie (BRE)\n" " -P, --perl-regexp PATROON is een reguliere Perl-expressie\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -569,7 +569,7 @@ "regel\n" " -z, --null-data regels eindigen op 0-byte, niet op LF-teken\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -586,7 +586,7 @@ " -V, --version programmaversie tonen en stoppen\n" " --help deze hulptekst tonen en stoppen\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -611,7 +611,7 @@ " --label=LABEL dit LABEL als naam voor standaardinvoer " "gebruiken\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -630,7 +630,7 @@ "overeenkomsten)\n" " -a, --text hetzelfde als '--binary-files=text'\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -654,7 +654,7 @@ " -R, --dereference-recursive idem, maar alle symbolische koppelingen " "volgen\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -673,7 +673,7 @@ " BESTAND voldoen\n" " --exclude-dir=PATROON mappen overslaan die aan PATROON voldoen\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -692,7 +692,7 @@ "invoegen)\n" " -Z, --null een 0-byte invoegen na iedere bestandsnaam\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -708,7 +708,7 @@ " -A, --after-context=AANTAL dit AANTAL regels nakomende context tonen\n" " -C, --context=AANTAL dit AANTAL regels context tonen\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -733,7 +733,7 @@ "Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -743,7 +743,7 @@ "'egrep' betekent 'grep -E'; 'fgrep' betekent 'grep -F'.\n" "\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -759,33 +759,33 @@ "De afsluitwaarde is 0 in geval van overeenkomsten, anders 1; als er\n" "een fout optreedt en '-q' is niet gegeven, dan is de afsluitwaarde 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "conflicterende expressiesoorten" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "ongeldige expressiesoort '%s'" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "waarschuwing: GREP_OPTIONS is verouderd; gebruik een alias of een script" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "onbekende apparaten-actie" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "ongeldig maximum aantal" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "onbekend binair bestandstype" @@ -817,32 +817,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "een naakte ^ of $ wordt niet ondersteund met optie '-Pz'" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "**interne programmafout** (zou nooit mogen gebeuren)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "**interne programmafout**" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "de regellengtegrens van PCRE is overschreden" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "de PCRE-JIT-stack is volledig gebruikt" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "de terugverwijzingsgrens van PCRE is overschreden" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "**interne programmafout** in PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/pa.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/pa.gmo differ diff -Nru grep-2.24/po/pa.po grep-2.25/po/pa.po --- grep-2.24/po/pa.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/pa.po 2016-04-22 04:37:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grep 2.11.11-pre1\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2012-05-19 17:52+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi \n" @@ -32,7 +32,7 @@ msgid "Valid arguments are:" msgstr "ਠੀਕ ਆਰਗੂਮੈਂਟ ਹਨ:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "ਲਿਖਣ ਗਲਤੀ" @@ -101,7 +101,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "ਮੈਮੋਰੀ ਖਤਮ ਹੋਈ" @@ -214,7 +214,7 @@ msgid "Unmatched ) or \\)" msgstr "ਨਾ ਮਿਲਦੇ ) ਜਾਂ \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "ਕੋਈ ਪਿਛਲਾ ਨਿਯਮਤ ਸਮੀਕਰਨ ਨਹੀਂ" @@ -400,112 +400,112 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s ਆਰਗੂਮੈਂਟ '%s' ਬਹੁਤ ਵੱਡਾ ਹੈ" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "ਅਧੂਰੀ [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "ਗਲਤ ਕਰੈਕਟਰ ਕਲਾਸ" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "ਗਲਤ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ" -#: src/dfa.c:1395 +#: src/dfa.c:1380 #, fuzzy msgid "regular expression too big" msgstr "ਨਿਯਮਤ ਸਮੀਕਰਨ ਬਹੁਤ ਵੱਡੀ ਹੈ" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "ਅਧੂਰੀ (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "ਕੋਈ ਸੰਟੈਕਸ ਨਹੀਂ ਦਿੱਤਾ" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "ਅਧੂਰੀ )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "ਮਾਈਕ ਹਾਇਰਟੇਲ" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "ਹੋਰਾਂ ਲਈ ਵੇਖੋ" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "ਇੰਪੁੱਟ ਗਿਣਤੀ ਕਰਨ ਲਈ ਬਹੁਤ ਵੱਡੀ ਹੈ" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek ਫੇਲ੍ਹ ਹੈ" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "ਬਾਈਨਰੀ ਫਾਇਲ %s ਮਿਲਦੀ ਹੈ\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "ਸਾਵਧਾਨ: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "ਲਗਾਤਾਰ ਡਾਇਰੈਕਟਰੀ ਲੂਪ" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "ਇੰਪੁੱਟ ਫਾਇਲ %s ਆਉਟਪੁੱਟ ਫਾਇਲ ਵੀ ਹੈ" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(ਸਟੈਂਡਰਡ ਆਉਟਪੁੱਟ)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "ਵਰਤੋਂ: %s [ਚੋਣਾਂ]... ਪੈਟਰਨ [ਫਾਇਲ]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ '%s --help' ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ।\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "ਹਰੇਕ ਫਾਇਲ (FILE) ਜਾਂ ਸਟੈਂਡਰਡ ਆਉਟਪੁੱਟ ਲਈ ਪੈਟਰਨ ਦੀ ਖੋਜ।\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "ਪੈਟਰਨ (PATTERN) ਮੂਲ ਰੂਪ ਵਿੱਚ ਇੱਕ ਨਿਯਮਤ ਸਕਰੀਨ (BRE) ਹੁੰਦਾ ਹੈ।\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -516,7 +516,7 @@ "\n" "ਨਿਯਮਤ-ਸਮੀਕਰਨ (Regexp) ਚੋਣ ਅਤੇ ਚਲਾਉਣਾ:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -525,7 +525,7 @@ " -P, --perl-regexp PATTERN is a Perl regular expression\n" msgstr "" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -536,7 +536,7 @@ " -z, --null-data a data line ends in 0 byte, not newline\n" msgstr "" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -547,7 +547,7 @@ " --help display this help text and exit\n" msgstr "" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -562,7 +562,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -572,7 +572,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -584,7 +584,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -595,7 +595,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -605,7 +605,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -615,7 +615,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -629,14 +629,14 @@ "\n" msgstr "" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" "Direct invocation as either 'egrep' or 'fgrep' is deprecated.\n" msgstr "" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -646,32 +646,32 @@ "if any error occurs and -q is not given, the exit status is 2.\n" msgstr "" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "ਗਲਤ ਮੈਚਰ %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "ਅਣਜਾਣ ਜੰਤਰ ਢੰਗ" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "ਗਲਤ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "ਅਣਜਾਣ ਬਾਈਨਰੀ-ਫਾਇਲ ਕਿਸਮ" @@ -702,32 +702,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, fuzzy, c-format msgid "internal PCRE error: %d" msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/pl.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/pl.gmo differ diff -Nru grep-2.24/po/pl.po grep-2.25/po/pl.po --- grep-2.24/po/pl.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/pl.po 2016-04-22 04:37:24.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: GNU grep 2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2016-03-04 13:30+0100\n" "Last-Translator: Rafał Maszkowski \n" "Language-Team: Polish \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" msgstr "Prawidłowe agrumenty to:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "błąd zapisu" @@ -98,7 +98,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opcja „-W %s” wymaga argumentu\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "pamięć wyczerpana" @@ -210,7 +210,7 @@ msgid "Unmatched ) or \\)" msgstr "Nie pasujący ) albo \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Brak poprzedniego wyrażenia regularnego" @@ -401,110 +401,110 @@ msgid "%s%s argument '%s' too large" msgstr "argument %s%s „%s” jest za duży" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "[ nie do pary" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "błędna nazwa klasy znaków" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "składnia klasy znaków to [[:space:]], nie [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "niedokończona sekwencja \\" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "błędna zawartość \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "za duże wyrażenie regularne" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "( nie do pary" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "brak specyfikacji składni" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr ") nie do pary" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike'a Haertela" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "innych, zobacz: http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "błędny argument długości kontekstowej" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "danych wejściowych jest zbyt dużo do policzenia" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "błąd lseek" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Plik binarny %s pasuje do wzorca\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "uwaga: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "nieskończona pętla przeglądania katalogów" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "plik wejściowy %s jest również plikiem wyjściowym" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standardowe wejście)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Składnia: %s [OPCJA]... WZORZEC [PLIK] ...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Napisz „%s --help” żeby dowiedzieć się więcej.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Szukanie WZORCA w każdym PLIKU lub na standardowym wejściu\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "WZORZEC domyślnie jest podstawowym wyrażeniem regularnym (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -515,7 +515,7 @@ "\n" "Wybór i interpretacja wyrażeń regularnych:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -530,7 +530,7 @@ " -G, --basic-regexp WZORZEC jest podstawowym wyr. regularnym (BRE)\n" " -P, --perl-regexp WZORZEC jest wyrażeniem regularnym perla\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -548,7 +548,7 @@ " -z, --null-data linie są zakończone bajtem 0, nie znakiem\n" " nowej linii\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -566,7 +566,7 @@ " --help wypisanie tych informacji i zakończenie\n" "\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -590,7 +590,7 @@ " -h, --no-filename bez nazwy pliku w liniach wyjściowych\n" " --label=ETYKIETA w wyniku ETYKIETA zastępuje nazwe pliku\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -605,7 +605,7 @@ " TYP to „binary”, „text” lub „without-match”.\n" " -a, --text równoważne --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -628,7 +628,7 @@ " -R, --dereference-recursive podobnie, ale z podążaniem za dowiązaniami\n" " symbolicznymi\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -643,7 +643,7 @@ " --exclude-from=PLIK pominięcie plików pasujących do WZORCÓW w PLIKU\n" " --exclude-dir=WZORZEC katalogi pasujące do WZORCA będą pominięte\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -659,7 +659,7 @@ " -T, --initial-tab wyrównanie linii przez TAB (jeżeli potrzebne)\n" " -Z, --null wypisanie bajtu 0 po każdej nazwie PLIKU\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -674,7 +674,7 @@ " -A, --after-context=ILE wypisanie ILU linii kontekstu po\n" " -C, --context=ILE wypisanie ILU linii kontekstu\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -698,7 +698,7 @@ " (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -707,7 +707,7 @@ "„egrep” oznacza „grep -E”. „fgrep” oznacza „grep -F”.\n" "Używanie nazw „egrep” i „fgrep” nie jest już zalecane.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -732,34 +732,34 @@ # grep --help -> # usage: grep [-[[AB] ]] [-[CEFGVchilnqsvwx]] [-[ef]] [] # La opción -X es a la que corresponde esta línea. -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "podano sprzeczne wzorce" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "błędna dopasowanie %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "uwaga: zmienna GREP_OPTIONS nie będzie już używana, proszę użyć aliasu albo " "skryptu" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "nieznany sposób przeglądania urządzeń" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "błędna maksymalna liczba powtórzeń" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "nieznany typ pliku binarnego" @@ -793,32 +793,32 @@ "^ i $ bez ochrony przed interpretacją jako znaki specjalne nie są dozwolne z " "opcją -Pz" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "błąd wewnętrzny (nigdy nie powinien się zdarzyć)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "błąd wewnętrzny" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "przekroczony limit długości linii PCRE" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "wyczerpany stos JIT PCRE" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "przekroczony limit analizy wstecznej PCRE" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "błąd wewnętrzny PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/pt_BR.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/pt_BR.gmo differ diff -Nru grep-2.24/po/pt_BR.po grep-2.25/po/pt_BR.po --- grep-2.24/po/pt_BR.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/pt_BR.po 2016-04-22 04:37:24.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: GNU grep-2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2016-03-05 15:03-0300\n" "Last-Translator: Rodolfo Ribeiro Gomes \n" "Language-Team: Brazilian Portuguese " msgstr "outros, veja " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "argumento inválido para comprimento do contexto" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "entrada longa demais para contar" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "a movimentação pelo arquivo (lseek) falhou" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Arquivo binário %s coincide com o padrão\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "aviso: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "recursão cíclica de diretório" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "o arquivo de entrada %s é também o de saída" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(entrada padrão)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Uso: %s [OPÇÃO]... PADRÃO [ARQUIVO]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Experimente \"%s --help\" para mais informações.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Busca por PADRÃO em cada ARQUIVO ou entrada padrão.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "PADRÃO é, por padrão, uma expressão regular básica (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -526,7 +526,7 @@ "\n" "Seleção e interpretação de expressão regular:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -539,7 +539,7 @@ " -G, --basic-regexp PADRÃO é uma expressão regular básica (BRE)\n" " -P, --perl-regexp PADRÃO é uma expressão regular de sintaxe Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -559,7 +559,7 @@ "com\n" " caractere de nova linha\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -576,7 +576,7 @@ " -V, --version mostra informações sobre versão e sai\n" " --help exibe esta ajuda e sai\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -600,7 +600,7 @@ " -h, --no-filename inibe o nome de arquivo na saída\n" " --label=RÓTULO usa RÓTULO para identificar a entrada padrão\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -618,7 +618,7 @@ " ou \\\"without-match\\\" (nunca coincide)\n" " -a, --text equivalente a --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -641,7 +641,7 @@ " -R, --dereference-recursive similar, mas segue todas as ligações " "simbólicas\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -660,7 +660,7 @@ " em ARQUIvo\n" " --exclude-dir=PADRÃO diretórios que casam com PADRÃO serão ignorados\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -681,7 +681,7 @@ " -T, --initial-tab alinha por tabulação (se necessário)\n" " -Z, --null emite byte 0 depois do nome do ARQUIVO\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -696,7 +696,7 @@ " -A, --after-context=NÚM emite NÚM linhas de contexto posteriores\n" " -C, --context=NÚM emite NÚM linhas de contexto de saída\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -722,7 +722,7 @@ " (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -731,7 +731,7 @@ "\"egrep\" significa \"grep -E\". \"fgrep\" significa \"grep -F\".\n" "A invocação direta tanto por \"egrep\" como por \"fgrep\" está obsoleta.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -749,34 +749,34 @@ "foi\n" "especificado, o estado de saída é 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "especificou-se padrões de busca conflitantes" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "comparador inválido %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "aviso: a variável de ambiente GREP_OPTIONS está obsoleta; use um alias ou " "script" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "método desconhecido de dispositivos" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "valor máximo inválido" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "tipo de arquivo binário desconhecido" @@ -809,32 +809,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "não há suporte para ^ ou $ sem escape ao usar -Pz" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "erro interno (nunca deveria acontecer)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "erro interno" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "atingiu o limite de comprimento de linha das PCRE" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "pilha PCRE JIT estourada" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "atingiu o limite de backtracking das PCRE" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "erro interno de PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/pt.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/pt.gmo differ diff -Nru grep-2.24/po/pt.po grep-2.25/po/pt.po --- grep-2.24/po/pt.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/pt.po 2016-04-22 04:37:24.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: grep 2.5g\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2003-04-09 00:07+0100\n" "Last-Translator: Rui Malheiro \n" "Language-Team: Portuguese \n" @@ -30,7 +30,7 @@ msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "" @@ -99,7 +99,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "\"%s: a opção `%s' exige um argumento\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "memória esgotada" @@ -211,7 +211,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "" @@ -378,116 +378,116 @@ msgid "%s%s argument '%s' too large" msgstr "" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 #, fuzzy msgid "unbalanced [" msgstr "[ sem correspondência" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" -#: src/dfa.c:1245 +#: src/dfa.c:1230 #, fuzzy msgid "unfinished \\ escape" msgstr "\\ não terminado" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "número máximo inválido" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "" -#: src/dfa.c:1811 +#: src/dfa.c:1796 #, fuzzy msgid "unbalanced (" msgstr "( sem correspondência" -#: src/dfa.c:1937 +#: src/dfa.c:1922 #, fuzzy msgid "no syntax specified" msgstr "Sintaxe não especificada" -#: src/dfa.c:1945 +#: src/dfa.c:1930 #, fuzzy msgid "unbalanced )" msgstr ") sem correspondência" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "número de linhas de contexto inválido" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "ficheiro demasiado grande para manter contagem" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Padrão encontrado no ficheiro binário %s\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, fuzzy, c-format msgid "warning: %s: %s" msgstr "aviso: %s: %s\n" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "directoria em ciclo recursivo" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standard input)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Utilização: %s [OPÇÃO]... PADRÃO [FICHEIRO]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Experimente `%s --help' para mais informação.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" -#: src/grep.c:1808 +#: src/grep.c:1846 #, fuzzy, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -499,7 +499,7 @@ "\n" "Selecção e interpretação de regexp\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -513,7 +513,7 @@ " -G, --basic-regexp PADRÃO é uma expressão regular básica\n" " -P, --perl-regexp PADRÃO é uma expressão regular de Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, fuzzy, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -534,7 +534,7 @@ " -z, --null-data uma linha é terminada com o byte 0, não com " "newline\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -552,7 +552,7 @@ " --help apresenta este texto de auxílio e termina\n" " --mmap utilizar 'memory-mapped input' se possível\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -567,7 +567,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -577,7 +577,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -589,7 +589,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -600,7 +600,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -610,7 +610,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -620,7 +620,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, fuzzy, c-format msgid "" " -NUM same as --context=NUM\n" @@ -655,14 +655,14 @@ "dois FICHEIROS, assume -h. Devolve 0 se encontrar pelo menos uma occorência\n" "de PADRÃO, 1 se não encontrar, 2 se tiver algum problema.\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" "Direct invocation as either 'egrep' or 'fgrep' is deprecated.\n" msgstr "" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -672,32 +672,32 @@ "if any error occurs and -q is not given, the exit status is 2.\n" msgstr "" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "foram especificados métodos de pesquisa incompatíveis" -#: src/grep.c:1969 +#: src/grep.c:2007 #, fuzzy, c-format msgid "invalid matcher %s" msgstr "número máximo inválido" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "método para acesso a «devices» desconhecido" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "número máximo inválido" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "tipo de ficheiro binário desconhecido" @@ -728,32 +728,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/ro.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/ro.gmo differ diff -Nru grep-2.24/po/ro.po grep-2.25/po/ro.po --- grep-2.24/po/ro.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/ro.po 2016-04-22 04:37:24.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: grep-2.5g.ro\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2003-04-19 02:47+0000\n" "Last-Translator: Eugen Hoanca \n" "Language-Team: Romanian \n" @@ -30,7 +30,7 @@ msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "" @@ -99,7 +99,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opiunea `%s' necesit un parametru\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "memorie plin" @@ -211,7 +211,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "" @@ -378,116 +378,116 @@ msgid "%s%s argument '%s' too large" msgstr "" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 #, fuzzy msgid "unbalanced [" msgstr "[ fr pereche" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" -#: src/dfa.c:1245 +#: src/dfa.c:1230 #, fuzzy msgid "unfinished \\ escape" msgstr "\\ escape neterminat" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "numrare maxim invalid" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "" -#: src/dfa.c:1811 +#: src/dfa.c:1796 #, fuzzy msgid "unbalanced (" msgstr "( fr pereche" -#: src/dfa.c:1937 +#: src/dfa.c:1922 #, fuzzy msgid "no syntax specified" msgstr "Nu s-a specificat sintaxa" -#: src/dfa.c:1945 +#: src/dfa.c:1930 #, fuzzy msgid "unbalanced )" msgstr ") fra pereche" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "parametru lungime context invalid" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "intrarea(input) este prea mare pentru numrare" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Fiierul binar %s corespunde\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, fuzzy, c-format msgid "warning: %s: %s" msgstr "avertisment: %s: %s\n" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "bucl recursiv de directoare" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(intrare standard)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Folosire: %s [OPIUNE]... TIPAR [FIIER]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "ncercai `%s --help' pentru mai multe informaii.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" -#: src/grep.c:1808 +#: src/grep.c:1846 #, fuzzy, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -499,7 +499,7 @@ "\n" "Selecie i interpretare regexp:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -513,7 +513,7 @@ " -G, --basic-regexp TIPAR este o expresie exact primar\n" " -P, --perl-regexp TIPAR este o expresie exact Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, fuzzy, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -533,7 +533,7 @@ " -z, --null-data linia de date se termin n octet 0, nu " "linie_nou\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -551,7 +551,7 @@ " --help afieaz acest ajutor i termin\n" " --mmap folosete intrare memory-mapped dac e posibil\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -566,7 +566,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -576,7 +576,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -588,7 +588,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -599,7 +599,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -609,7 +609,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -619,7 +619,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, fuzzy, c-format msgid "" " -NUM same as --context=NUM\n" @@ -652,14 +652,14 @@ "mai puin de 2 FIIERe, se presupune -h. Starea de ieire e 0 pentru\n" "corespunztor, 1 pentru necorespunztor, i 2 pentru probleme.\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" "Direct invocation as either 'egrep' or 'fgrep' is deprecated.\n" msgstr "" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -669,32 +669,32 @@ "if any error occurs and -q is not given, the exit status is 2.\n" msgstr "" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "conflicte ntre cuttorii (matchers) specificai" -#: src/grep.c:1969 +#: src/grep.c:2007 #, fuzzy, c-format msgid "invalid matcher %s" msgstr "numrare maxim invalid" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "metod dispozitive(devices) necunoscut" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "numrare maxim invalid" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "tip fiiere-binare necunoscut" @@ -725,32 +725,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/ru.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/ru.gmo differ diff -Nru grep-2.24/po/ru.po grep-2.25/po/ru.po --- grep-2.24/po/ru.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/ru.po 2016-04-22 04:37:24.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: grep 2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2016-03-05 08:44+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -35,7 +35,7 @@ msgid "Valid arguments are:" msgstr "Допустимые аргументы:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "ошибка записи" @@ -104,7 +104,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: для параметра «-W %s» требуется аргумент\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "память исчерпана" @@ -216,7 +216,7 @@ msgid "Unmatched ) or \\)" msgstr "Непарная ) или \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Нет предыдущего регулярного выражения" @@ -409,111 +409,111 @@ msgid "%s%s argument '%s' too large" msgstr "аргумент %s%s слишком велик для «%s»" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "несбалансированная [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "неправильный класс символов" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "синтаксис класса символов: [[:space:]], а не [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "незавершённая \\ экранирующая последовательность" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "неправильное содержимое в \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "регулярное выражение слишком большое" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "несбалансированная (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "не указан синтаксис" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "несбалансированная )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Майк Хертель (Mike Haertel)" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "другие, см. " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "неверный аргумент длины контекста" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "входные данные слишком велики, чтобы сосчитать" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "Вызов lseek завершился неудачно" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Двоичный файл %s совпадает\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "предупреждение: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "каталоги зациклены" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "файл ввода %s также используется и для вывода" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(стандартный ввод)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Использование: %s [ПАРАМЕТР]… ШАБЛОН [ФАЙЛ]…\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Запустите «%s --help» для получения более подробного описания.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Поиск ШАБЛОНА в каждом ФАЙЛЕ или в стандартном вводе.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" "По умолчанию, ШАБЛОН представляет собой простое регулярное выражение (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -524,7 +524,7 @@ "\n" "Выбор типа регулярного выражения и его интерпретация:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -538,7 +538,7 @@ " -G, --basic-regexp ШАБЛОН — простое регулярное выражение (BRE)\n" " -P, --perl-regexp ШАБЛОН — регулярное выражения языка Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -557,7 +557,7 @@ "не\n" " символом конца строки\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -574,7 +574,7 @@ " -V, --version показать информацию о версии и закончить работу\n" " --help показать эту справку и закончить работу\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -601,7 +601,7 @@ " --label=МЕТКА использовать МЕТКУ в качестве имени файла для\n" " стандартного ввода\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -617,7 +617,7 @@ " «binary», «text» или «without-match».\n" " -a, --text то же что и --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -638,7 +638,7 @@ " -R, --dereference-recursive тоже, но с " "переходом по всем символьным ссылкам\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -657,7 +657,7 @@ " --exclude-dir=ШАБЛОН каталоги, подпадающие под ШАБЛОН,\n" " будут пропущены\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -673,7 +673,7 @@ " -T, --initial-tab выравнивать табуляцией (если нужно)\n" " -Z, --null печатать байт 0 после имени ФАЙЛА\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -688,7 +688,7 @@ " -A, --after-context=ЧИС печатать ЧИСЛО строк последующего контекста\n" " -C, --context[=ЧИС] печатать ЧИСЛО строк контекста\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -712,7 +712,7 @@ "Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -722,7 +722,7 @@ "предполагается\n" "«grep -F». Запуск под именами «egrep» или «fgrep» лучше не выполнять.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -738,33 +738,33 @@ "0, и 1, если ничего не совпало. При возникновении ошибок и если не указан\n" "параметр -q, кодом завершения будет 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "заданы конфликтующие образцы" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "неверный образец %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "предупреждение: GREP_OPTIONS устарел; используйте псевдоним или сценарий" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "неизвестный метод для устройств" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "неверное максимальное количество совпадений" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "неизвестный тип двоичных файлов" @@ -797,32 +797,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "неэкранированный символ ^ или $ не поддерживается при указании -Pz" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "внутренняя ошибка (не должна возникать)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "внутренняя ошибка" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "превышено ограничение длины строки PCRE" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "исчерпан стек PCRE JIT" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "исчерпан лимит в PCRE по возврату" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "внутренняя ошибка PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/sk.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/sk.gmo differ diff -Nru grep-2.24/po/sk.po grep-2.25/po/sk.po --- grep-2.24/po/sk.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/sk.po 2016-04-22 04:37:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grep 2.13.16-pre1\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2012-08-17 13:52+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -30,7 +30,7 @@ msgid "Valid arguments are:" msgstr "Platné argumentu sú:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "chyba zápisu" @@ -99,7 +99,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: voľba „-W %s“ vyžaduje argument\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "pamäť bola vyčerpaná" @@ -212,7 +212,7 @@ msgid "Unmatched ) or \\)" msgstr ") alebo \\) bez náprotivku." -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Žiadny predošlý regulárny výraz" @@ -405,112 +405,112 @@ msgid "%s%s argument '%s' too large" msgstr "argument %s%s „%s“ je príliš veľký" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "[ bez náprotivku" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "neplatná trieda znakov" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "syntax triedy znakov je [[:space:]], nie [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "nedokončená úniková klauzula \\" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "Neplatný obsah \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 #, fuzzy msgid "regular expression too big" msgstr "Regulárny výraz je príliš veľký" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "( bez náprotivku" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "neuvedená syntax" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr ") bez náprotivku" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "iní, pozri " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "neplatný argument dĺžky kontextu" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "vstup je príliš veľký, aby sa dal spočítať" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "nepodarilo sa vykonať lseek()" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Zhody v binárnom súbore %s\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "upozornenie: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekurzívna slučka v adresári" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "vstupný súbor %s je tiež uvedený ako výstupný" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(štandardný vstup)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Použitie: %s [VOĽBA]... VZORKA [SÚBOR]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Ďalšie informácie získate príkazom „%s --help“.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Hľadať VZORKU v každom SÚBORE alebo na štandardnom vstupe.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "VZORKA je štandardne základný regulárny výraz (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -521,7 +521,7 @@ "\n" "Výber a interpretácia regulárneho výrazu:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -535,7 +535,7 @@ " -G, --basic-regexp VZORKA je základný regulárny výraz (BRE)\n" " -P, --perl-regexp VZORKA je perlovský regulárny výraz\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -554,7 +554,7 @@ "riadkom\n" " -z, --null-data údaje končia bajtom 0, nie novým riadkom\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -573,7 +573,7 @@ " --mmap zavrhovaný príkaz, ktorý nič nerobí, vyvolá " "upozornenie\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -598,7 +598,7 @@ " --label=NÁVESTIE vypísať NÁVESTIE ako názov súboru pre štand. " "vstup\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -615,7 +615,7 @@ "match“\n" " -a, --text ekvivalentné s --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -636,7 +636,7 @@ " -r, --recursive ekvivalentné s --directories=recurse\n" " -R, --dereference-recursive podobné, ale nasleduje symbolické odkazy\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -655,7 +655,7 @@ " súboru zo SÚBORU\n" " --exclude-dir=VZOR preskočiť adresáre, ktoré zodpovedajú VZORu\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -671,7 +671,7 @@ " -T, --initial-tab zarovnávať tabulátory (ak je to potrebné)\n" " -Z, --null vypísať za názvom SÚBORu bajt 0\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -686,7 +686,7 @@ " -A, --after-context=POČ vytlačiť POČ riadkov kontextu za\n" " -C, --context=POČ vytlačiť POČ riadkov kontextu výstupu\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -709,7 +709,7 @@ " znaky CR (MSDOS)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -718,7 +718,7 @@ "„egrep“ znamená „grep -E“. „fgrep“ znamená „grep -F“.\n" "Priame vyvolanie príkazu ako „egrep“ či „fgrep“ sa neodporúča.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -733,32 +733,32 @@ "Chybová úroveň je 0 ak bol vybraný nejaký riadok a 1 inak;\n" "ak sa vyskytne nejaká chyba a nebolo zadané -q, chybová úroveň je 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "boli zadané konfliktné špecifikátory" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "neplatný zástupný znak %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "neznáme metódy zariadení" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "neplatný maximálny počet" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "neznámy typ binárneho súboru" @@ -790,32 +790,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "vnútorná chyba" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "prekročený limit dĺžky riadka PCRE" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "prekročený limit backtrackingu PCRE" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, fuzzy, c-format msgid "internal PCRE error: %d" msgstr "vnútorná chyba" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/sl.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/sl.gmo differ diff -Nru grep-2.24/po/sl.po grep-2.25/po/sl.po --- grep-2.24/po/sl.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/sl.po 2016-04-22 04:37:24.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: GNU grep 2.21.78\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2015-12-13 22:32+0100\n" "Last-Translator: Primož Peterlin \n" "Language-Team: Slovenian \n" @@ -34,7 +34,7 @@ msgid "Valid arguments are:" msgstr "Veljavni argumenti so:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "napaka pri pisanju" @@ -103,7 +103,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: izbira »-W %s« zahteva argument\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "pomnilnik porabljen" @@ -216,7 +216,7 @@ msgid "Unmatched ) or \\)" msgstr "Zaklepaj ) ali \\\\) brez para" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Manjkajoč prejšnji regularni izraz" @@ -410,110 +410,110 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s: argument '%s' je prevelik" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "uklepaj [ brez zaklepaja" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "neveljavno ime razreda znakov" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "skladnja imena razreda znakov je [[:space:]], ne [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "nedokončano ubežno zaporedje \\" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "neveljavna vsebina \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "regularni izraz je preobsežen" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "uklepaj ( brez zaklepaja" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "skladnja ni podana" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "zaklepaj ) brez uklepaja" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "drugi, glejte " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "velikost konteksta ni veljavna" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "vhod je prevelik, da bi ga mogli prešteti" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "klic lseek ni uspel" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Binarna datoteka %s ustreza\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "opozorilo: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekurzivna zanka imenikov" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "vhodna datoteka %s je tudi izhodna" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standardni vhod)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Poskusite »%s --help« za dodatna pojasnila.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "V DATOTEKI ali na standardnem vhodu se išče VZOREC.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "VZOREC je privzeto osnovni regularni izraz (ORI).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -524,7 +524,7 @@ "\n" "Izbira in tolmačenje regularnih izrazov:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -537,7 +537,7 @@ " -G, --basic-regexp VZOREC je osnovni regularni izraz (ORI)\n" " -P, --perl-regexp VZOREC je regularni izraz z razširitvami perla\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -555,7 +555,7 @@ " -z, --null-data vrstica podatkov je končana z znakom NUL, ne z\n" " znakom za skok v novo vrstico\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -572,7 +572,7 @@ " -V, --version verzija programa\n" " --help ta pomoč\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -597,7 +597,7 @@ " --label=OZNAKA z navedeno OZNAKO, kadar beremo s standardnega " "vhoda\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -613,7 +613,7 @@ "match«\n" " -a, --text isto kot --binary-type=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -633,7 +633,7 @@ " -R, --dereference-recursive podobno, vendar s sledenjem vseh simbolnih \n" " povezav\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -649,7 +649,7 @@ "DATOTEKI\n" " --exclude-dir=VZOREC izpusti imenike, ki ustrezajo VZORCU\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -667,7 +667,7 @@ " -T, --initial-tab dodaj začetni tabulator (če je potrebno)\n" " -Z, --null izpiši znak NUL za imenom DATOTEKE\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -683,7 +683,7 @@ " -C, --context=ŠT ŠT vrstic konteksta pred in za vrstico z " "VZORCEM\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -705,7 +705,7 @@ " -u, --unix-byte-offsets v odmikih ne štejemo znakov CR (MS-DOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -714,7 +714,7 @@ "Ukaz »egrep« pomeni isto kot »grep -E«, »fgrep« pa isto kot »grep -F«.\n" "Neposredna raba ukazov »egrep« ali »fgrep« je odsvetovana.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -734,33 +734,33 @@ # opt = getopt(argc, argv, "0123456789A:B:CEFGVX:bce:f:hiLlnqsvwxy" # grep --help -> # usage: grep [-[[AB] ]] [-[CEFGVchilnqsvwx]] [-[ef]] [] -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "podana navodila si nasprotujejo" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "neveljaven ujemalnik %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "opozorilo: uporabo GREP_OPTIONS odsvetujemo; uporabite alias ali skript" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "neznana metoda datotek naprav" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "neveljavno največje število" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "neznan tip binarne datoteke" @@ -793,32 +793,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "interna napaka (to tega ne bi smelo priti)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "interna napaka" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "prekoračena meja PCRE za dolžino vrstice" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "prekoračitev sklada PCRE JIT" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "prekoračena meja PCRE za iskanje s povratnim sledenjem" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "interna napaka PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/sr.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/sr.gmo differ diff -Nru grep-2.24/po/sr.po grep-2.25/po/sr.po --- grep-2.24/po/sr.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/sr.po 2016-04-22 04:37:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grep-2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2016-03-05 09:37+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" @@ -32,7 +32,7 @@ msgid "Valid arguments are:" msgstr "Исправни аргументи су:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "грешка писања" @@ -101,7 +101,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: опција „-W %s“ захтева аргумент\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "меморија је потрошена" @@ -214,7 +214,7 @@ msgid "Unmatched ) or \\)" msgstr "Не одговара ) или \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Нема претходног регуларног израза" @@ -406,110 +406,110 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s аргумент „%s“ је превелик" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "неуравнотежена [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "неисправна класа знака" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "синтакса класе знака је [[:размак:]], а не [:размак:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "недовршена \\ излазим" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "неисправан садржај \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "регуларни израз је превелик" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "неуравнотежена (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "синтакса није наведена" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "неуравнотежена )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Мајк Хартел" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "остали, погледајте " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "неисправан аргумент дужине контекста" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "улаз је превелик за пребројавање" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "„lseek“ није успело" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Бинарна датотека %s одговара\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "упозорење: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "дубинско вртење кроз директоријуме" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "улазна датотека %s је такође излаз" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(стандардни улаз)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Употреба: %s [ОПЦИЈА]... ШАБЛОН [ДАТОТЕКА]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Пробајте „%s --help“ за више података.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Тражи наведени ШАБЛОН у свакој датотеци или стандардном улазу.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "ШАБЛОН је, по основи, основни регуларан израз (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -520,7 +520,7 @@ "\n" "Избор регуларних израза и обрада:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -533,7 +533,7 @@ " -G, --basic-regexp ШАБЛОН је основни регуларан израз\n" " -P, --perl-regexp ШАБЛОН је Перлов регуларан израз\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -553,7 +553,7 @@ " -z, --null-data ред података се завршава 0-бајтом, не " "новим редом\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -570,7 +570,7 @@ " -V, --version исписује податке о издању и излази\n" " --help приказује ову помоћ и излази\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -597,7 +597,7 @@ " --label=НАТПИС користи НАТПИС као префикс назива датотеке " "стандардног улаза\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -614,7 +614,7 @@ "„without-match“\n" " -a, --text исто као и „--binary-files=text“\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -635,7 +635,7 @@ " -r, --recursive исто као и „--directories=recurse“\n" " -R, --dereference-recursive слично, али прати све симболичке везе\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -654,7 +654,7 @@ " --exclude-dir=ШАБЛОН директоријуми који се поклапају са " "ШАБЛОНОМ биће прескочени.\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -672,7 +672,7 @@ " -T, --initial-tab помера табове ред горе (ако је потребно)\n" " -Z, --null исписује 0-ти бајт након назива ДАТОТЕКЕ\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -687,7 +687,7 @@ " -A, --after-context=БРОЈ исписује БРОЈ редова пратећег контекста\n" " -C, --context=БРОЈ исписује БРОЈ редова излазног контекста\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -712,7 +712,7 @@ "били ту (МСДОС/Виндоуз)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -721,7 +721,7 @@ "„egrep“ значи „grep -E“. „fgrep“ значи „grep -F“.\n" "Директно призивање као „egrep“ или „fgrep“ није одобрено.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -736,32 +736,32 @@ "Излазно стање је 0 ако је изабран неки ред, у супротном 1;\n" "ако је дошло до неке грешке а „-q“ није дато, онда је излазно стање 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "наведени су трагачи у сукобу" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "неисправан трагач %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "упозорење: „GREP_OPTIONS“ је застарело; користите алијас или скрипту" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "непознат метод уређаја" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "неисправан највећи број" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "непозната врста бинарних датотека" @@ -793,32 +793,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "непреспојено ^ или $ није подржано са „-Pz“" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "унутрашња грешка (не треба никада да се деси)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "унутрашња грешка" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "прекорачено је ограничење дужине реда ПЦРЕ-а" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "потрошени ПЦРЕ ЈИТ спремник" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "прекорачено је ПЦРЕ-ово ограничење тражења уназад" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "унутрашња грешка ПЦРЕ-а: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/sv.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/sv.gmo differ diff -Nru grep-2.24/po/sv.po grep-2.25/po/sv.po --- grep-2.24/po/sv.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/sv.po 2016-04-22 04:37:24.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: grep 2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2016-03-04 19:32+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" @@ -34,7 +34,7 @@ msgid "Valid arguments are:" msgstr "Giltiga argument är:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "skrivfel" @@ -103,7 +103,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: flaggan ”-W %s” behöver ett argument\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "minnet är slut" @@ -219,7 +219,7 @@ msgid "Unmatched ) or \\)" msgstr "Omatchad ) eller \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Inget tidigare reguljärt uttryck" @@ -414,110 +414,110 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s-argumentet ”%s” är för stort" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "obalanserad [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "ogiltig teckenklass" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "syntax för teckenklass är [[:space:]], inte [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "oavslutad \\-sekvens" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "ogiltigt innehåll i \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "reguljärt uttryck är för stort" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "obalanserad (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "ingen syntax angiven" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "obalanserad )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "andra, se " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "ogiltigt argument till -A, -B eller -C" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "det är för mycket indata för att räkna" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek misslyckades" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Binär fil %s matchar\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "varning: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "rekursiv katalogloop" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "inmatningsfilen %s är även utmatningen" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standard in)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Försök med ”%s --help” för mer information\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Sök efter MÖNSTER i varje FIL eller standard in.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "MÖNSTER är, som standard, ett enkelt reguljärt uttryck (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -528,7 +528,7 @@ "\n" "Val och tolkning av reguljära uttryck:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -542,7 +542,7 @@ " -G, --basic-regexp MÖNSTER är ett enkelt reguljärt uttryck (BRE)\n" " -P, --perl-regexp MÖNSTER är ett reguljärt uttryck som i Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -559,7 +559,7 @@ " -x, --line-regexp tvinga MÖNSTER att endast matcha hela rader\n" " -z, --null-data en datarad slutar i 0 byte, inte nyradstecken\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -576,7 +576,7 @@ " -V, --version visa versionsinformation och avsluta\n" " --help visa detta hjälpmeddelande och avsluta\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -601,7 +601,7 @@ " --label=ETIKETT skriv ut ETIKETT som filnamnsprefix för standard " "in\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -617,7 +617,7 @@ " TYP är ”binary”, ”text” eller ”without-match”\n" " -a, --text samma som --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -636,7 +636,7 @@ " -r, --recursive samma som --directories=recurse\n" " -R, --dereference-recursive detsamma, men följ alla symboliska länkar\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -653,7 +653,7 @@ "FIL\n" " --exclude-dir=MÖNSTER kataloger som matchar MÖNSTER hoppas över.\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -672,7 +672,7 @@ "behövs)\n" " -Z, --null skriv ut 0-tecken efter FILnamn\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -687,7 +687,7 @@ " -A, --after-context=ANTAL skriv ANTAL rader efter träffad rad\n" " -C, --context=ANTAL skriv ANTAL rader runt träffad rad\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -710,7 +710,7 @@ " (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -719,7 +719,7 @@ "”egrep” betyder ”grep -E”. ”fgrep” betyder ”grep -F”.\n" "Direktanrop som antingen ”egrep” eller ”fgrep” är föråldrat.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -733,32 +733,32 @@ "Avslutningsstatus är 0 om någon rad valdes, annars 1;\n" "om något fel inträffar och -q inte angavs, är avslutningsstatusen 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "motstridiga söksträngar angivna" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "ogiltig matchning %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "warning: GREP_OPTIONS är föråldrat; använd ett alias eller ett skript" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "okänd metod för enheter" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "ogiltigt värde för antal träffar" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "okänd binärfiltyp" @@ -791,32 +791,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "oskyddat ^ eller $ stöds ej med -Pz" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "internt fel (bör aldrig inträffa)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "internt fel" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "översteg radlängdsgräns för PCRE" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "fyllde JIT-stacken för PCRE" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "översteg gräns för PCRE-bakåtspårning" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "internt PCRE-fel: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/th.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/th.gmo differ diff -Nru grep-2.24/po/th.po grep-2.25/po/th.po --- grep-2.24/po/th.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/th.po 2016-04-22 04:37:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grep-2.20.72\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2014-10-30 09:58+0700\n" "Last-Translator: Seksan Poltree \n" "Language-Team: Thai \n" @@ -31,7 +31,7 @@ msgid "Valid arguments are:" msgstr "อาร์กิวเมนต์ที่ถูกต้องได้แก่:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "การเขียนผิดพลาด" @@ -100,7 +100,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: ตัวเลือก ‘-W %s’ ต้องการอาร์กิวเมนต์\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "หน่วยความจำถูกใช้จนหมด" @@ -213,7 +213,7 @@ msgid "Unmatched ) or \\)" msgstr "ไม่ตรงกันกับ ) หรือ \\) " -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "ไม่มีนิพจน์ปกติก่อนหน้า" @@ -405,110 +405,110 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s อาร์กิวเมนต์ ‘%s’ ใหญ่มากเกินไป" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr " [ ไม่สมดุลกัน" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "ชื่อกลุ่มชุดอักขระไม่ถูกต้อง" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "character class syntax is [[:space:]], not [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "เครื่องหมายหลีก \\ ไม่เสร็จสิ้น" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "เนื้อหาของ \\{\\} ไม่ถูกต้อง" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "นิพจน์ปกติใหญ่เกินไป" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "( ไม่สมดุลกัน" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "ไม่ระบุวากยสัมพันธ์" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr ") ไม่สมดุลกัน" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "ไมค์ ฮาเออร์เทล" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "อื่น ๆ , ดูที่ " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "ความยาวบริบทอาร์กิวเมนต์ไม่ถูกต้อง" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "ข้อมูลเข้ายาวเกินกว่าจะนับได้" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek ล้มเหลว" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "ตรงกันกันกับแฟ้มฐานสอง %s\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "คำเตือน: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "เรียกซ้ำไดเรกทอรีเป็นวงวน" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "แฟ้มนำเข้า %s เป็นแฟ้มส่งออกด้วยเหมือนกัน" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(นำเข้ามาตรฐาน)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "วิธีใช้: %s [OPTION]… PATTERN [FILE]…\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "ลองใช้ ‘%s —help’ เพื่อข้อมูลเพิ่มเติม.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "ค้นหาสำหรับ PATTERN ในแต่ละ FILE หรือตัวนำเข้ามาตรฐาน.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "PATTERN โดยมาตรฐานเป็นนิพจน์ปกติพื้นฐาน (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -519,7 +519,7 @@ "\n" "การเลือกนิพจน์ปกติและการแปลความหมาย:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -532,7 +532,7 @@ " -G, —basic-regexp PATTERN เป็นนิพจน์ปกติพื้นฐาน (BRE)\n" " -P, —perl-regexp PATTERN เป็นนิจน์ปกติภาษา Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -549,7 +549,7 @@ " -x, —line-regexp บังคับ PATTERN ให้จับคู่เฉพาะที่ตรงกันทั้งบรรทัดเท่าทั้น\n" " -z, —null-data ข้อมูลบรรทัดจบด้วยขนาด 0 ไบต์, ไม่มีตัวขึ้นบรรทัดใหม่\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -566,7 +566,7 @@ " -V, —version พิมพ์ข้อมูลรุ่นแล้วออก\n" " —help แสดงความช่วยเหลือนี้แล้วออก\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -590,7 +590,7 @@ " -h, —no-filename ระงับคำนำหน้าชื่อแฟ้มในการนำออก\n" " —label=LABEL พิมพ์ LABEL เป็นชื่อคำนำหน้าแฟ้มสำหรับนำเข้ามาตรฐาน\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -605,7 +605,7 @@ " TYPE เป็น `binary’, `text’, หรือ `without-match’\n" " -a, —text มีค่าเท่ากันกับ —binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -624,7 +624,7 @@ " -r, —recursive เหมือนกับ —directories=recurse\n" " -R, —dereference-recursive เช่นกัน, แต่ตาม symlink ทั้งหมด\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -639,7 +639,7 @@ " —exclude-from=FILE ข้ามแฟ้มที่ตรงกันกับแบบแผนแฟ้มจาก FILE\n" " —exclude-dir=PATTERN ไดเร็กทอรีที่ตรงกันกับ PATTERN จะถูกข้ามไป.\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -654,7 +654,7 @@ " -T, —initial-tab ทำการจัดเตรียมแท็บ (ถ้าจำเป็น)\n" " -Z, —null พิมพ์ 0 ไบต์หลังชื่อ FILE\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -669,7 +669,7 @@ " -A, —after-context=NUM พิมพ์ NUM บรรทัดของบริบทส่วนตาม\n" " -C, —context=NUM พิมพ์ NUM บรรทัดของบริบทส่งออก\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -691,7 +691,7 @@ " (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -700,7 +700,7 @@ "‘egrep’ หมายถึง `grep -E’. ‘fgrep’ หมายถึง `grep -F’.\n" "การร้องขอโดยตรงทั้ง `egrep’ หรือ `fgrep’ ไม่แนะนำให้ใช้.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -714,32 +714,32 @@ "สถานะการออกเป็น 0 เมื่อบรรทัดใด ๆ ถูกเลือก, มิฉะนั้น 1 ;\n" "ถ้าเกิดข้อผิดพลาดขึ้นและ -q ไม่ได้ถูกให้มา, สถานะการออกเป็น 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "การขัดแย้งของการตรงกันได้รับการระบุ" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "ตัวจับคู่ไม่ถูกต้อง %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "คำเตือน: GREP_OPTIONS ไม่สนับสนุนให้ใช้ ; กรุณาใช้นามแฝงหรือสคริปต์" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "ไม่รู้จักกระบวนการอุปกรณ์" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "ตัวนับสูงสุดไม่ถูกต้อง" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "ไม่รู้จักชนิดแฟ้มฐานสอง" @@ -770,32 +770,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "ข้อผิดพลาดภายใน (ไม่ควรเกิดขึ้นมาก่อน)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "ข้อผิดพลาดภายใน" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "ขอบเขตความยาวบรรทัด PCRE เกินจากข้อจำกัด" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "ขอบเขตการ backtrack ของ PCRE เกินจากข้อจำกัด" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "ข้อผิดพลาด PCRE ภายใน: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/tr.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/tr.gmo differ diff -Nru grep-2.24/po/tr.po grep-2.25/po/tr.po --- grep-2.24/po/tr.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/tr.po 2016-04-22 04:37:24.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: grep 2.5.1a\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2005-03-04 16:37+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -30,7 +30,7 @@ msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "" @@ -99,7 +99,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "bellek tükendi" @@ -211,7 +211,7 @@ msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "" @@ -381,116 +381,116 @@ msgid "%s%s argument '%s' too large" msgstr "" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 #, fuzzy msgid "unbalanced [" msgstr "Karşılıksız [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" -#: src/dfa.c:1245 +#: src/dfa.c:1230 #, fuzzy msgid "unfinished \\ escape" msgstr "Tamamlanmamış \\ öncelemi" -#: src/dfa.c:1392 +#: src/dfa.c:1377 #, fuzzy msgid "invalid content of \\{\\}" msgstr "en çok miktarı geçersiz" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "" -#: src/dfa.c:1811 +#: src/dfa.c:1796 #, fuzzy msgid "unbalanced (" msgstr "Karşılıksız (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 #, fuzzy msgid "no syntax specified" msgstr "Sözdizimi belirtilmemiş" -#: src/dfa.c:1945 +#: src/dfa.c:1930 #, fuzzy msgid "unbalanced )" msgstr "Karşılıksız )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "bağlam uzunluk değeri geçersiz" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "girdi sayılamayacak kadar büyük" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "İkilik dosya %s eşleşir\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, fuzzy, c-format msgid "warning: %s: %s" msgstr "uyarı: %s: %s\n" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "ardışık dizin çevrimi" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(standart girdi)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Kullanımı: %s [SEÇENEK]... MASKE [DOSYA]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "" -#: src/grep.c:1808 +#: src/grep.c:1846 #, fuzzy, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -502,7 +502,7 @@ "\n" "Düzenli ifade seçimi ve yorumlanması:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, fuzzy, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -515,7 +515,7 @@ " -G, --basic-regexp KALIP bir temel düzenli ifadedir\n" " -P, --perl-regexp KALIP bir Perl düzenli ifadesidir\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, fuzzy, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -532,7 +532,7 @@ " -x, --line-regexp KALIP bir bütün satır olarak ele alınır\n" " -z, --null-data satır sonu içermeyen 0 baytlık satır\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, fuzzy, c-format msgid "" "\n" @@ -550,7 +550,7 @@ " --help bu iletileri gösterir ve çıkar\n" " --mmap mümkünse bellek-eşlemli girdi kullanılır\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -565,7 +565,7 @@ "prefix\n" msgstr "" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -575,7 +575,7 @@ " -a, --text equivalent to --binary-files=text\n" msgstr "" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -587,7 +587,7 @@ " -R, --dereference-recursive likewise, but follow all symlinks\n" msgstr "" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -598,7 +598,7 @@ "skipped.\n" msgstr "" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -608,7 +608,7 @@ " -Z, --null print 0 byte after FILE name\n" msgstr "" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -618,7 +618,7 @@ " -C, --context=NUM print NUM lines of output context\n" msgstr "" -#: src/grep.c:1879 +#: src/grep.c:1917 #, fuzzy, c-format msgid "" " -NUM same as --context=NUM\n" @@ -649,14 +649,14 @@ "İki DOSYAdan az verilmişse -h varsayılır.\n" "Çıkışta durum eşleşme varsa 0, yoksa 1, belirsizlik varsa 2 dir.\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" "Direct invocation as either 'egrep' or 'fgrep' is deprecated.\n" msgstr "" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -666,32 +666,32 @@ "if any error occurs and -q is not given, the exit status is 2.\n" msgstr "" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "birbiriyle çatışan eşleştiriciler belirtildi" -#: src/grep.c:1969 +#: src/grep.c:2007 #, fuzzy, c-format msgid "invalid matcher %s" msgstr "en çok miktarı geçersiz" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "bilinmeyen aygıt yöntemi" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "en çok miktarı geçersiz" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "bilinmeyen ikilik dosya türü" @@ -722,32 +722,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/uk.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/uk.gmo differ diff -Nru grep-2.24/po/uk.po grep-2.25/po/uk.po --- grep-2.24/po/uk.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/uk.po 2016-04-22 04:37:24.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: grep-2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2016-03-04 14:18+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -34,7 +34,7 @@ msgid "Valid arguments are:" msgstr "Список коректних аргументів:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "помилка запису" @@ -103,7 +103,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: до параметра «-W %s» слід додати аргумент\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "пам'ять вичерпано" @@ -215,7 +215,7 @@ msgid "Unmatched ) or \\)" msgstr "Неврівноважена послідовність ) або \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Не виявлено попереднього формального виразу" @@ -410,113 +410,113 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s, аргумент «%s» є занадто об'ємним" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "неврівноважена дужка [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "некоректний клас символів" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "" "синтаксичну конструкцію класу символів слід визначати так: [[:space:]], а не " "так: [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "незавершена \\-послідовність" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "некоректний вміст \\{\\}" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "занадто об'ємний формальний вираз" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "неврівноважена дужка (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "не вказано синтаксис" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "неврівноважена дужка )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "інші, див. " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "помилковий аргумент довжини контексту" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "вхідні дані занадто довгі для обліку" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "помилка lseek" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Двійковий файл %s містить збіжність\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "попередження: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "зациклення рекурсивного проходу каталогів" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "файл вхідних даних %s є також файлом вихідних даних" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(стандартне джерело вхідних даних)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Використання: %s [ПАРАМЕТР]... ШАБЛОН [ФАЙЛ]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Віддайте команду «%s --help», щоб дізнатися більше.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "" "Шукати ШАБЛОН у кожному ФАЙЛі або стандартному джерелі вхідних даних.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "ШАБЛОНом, типово, є звичайний формальний вираз (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -527,7 +527,7 @@ "\n" "Вибір за формальними виразами і інтерпретація:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -541,7 +541,7 @@ " -G, --basic-regexp ШАБЛОН є звичайним формальним виразом (BRE)\n" " -P, --perl-regexp ШАБЛОН є формальним виразом Perl\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -563,7 +563,7 @@ "символом\n" " кінця рядка (\\n)\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -580,7 +580,7 @@ " -V, --version показати дані щодо версії і завершити роботу\n" " --help показати ці довідкові дані і завершити роботу\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -608,7 +608,7 @@ " --label=МІТКА показувати МІТКУ замість назви файла для " "стандартного джерела вхідних даних\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -626,7 +626,7 @@ "match'\n" " -a, --text те саме, що і --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -650,7 +650,7 @@ "символічними\n" " посиланнями\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -669,7 +669,7 @@ " --exclude-dir=ШАБЛОН пропустити каталоги, назви яких відповідають " "ШАБЛОНу.\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -688,7 +688,7 @@ "потрібно)\n" " -Z, --null вивести байти 0 після назви ФАЙЛа\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -706,7 +706,7 @@ " -C, --context=ЧИСЛО показати ЧИСЛО рядків контексту виведених " "даних\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -731,7 +731,7 @@ " CR (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -740,7 +740,7 @@ "«egrep» відповідає команді «grep -E». «fgrep» — «grep -F».\n" "Безпосередній виклик команд «egrep» та «fgrep» використовувати не варто.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -755,34 +755,34 @@ "Код завершення 0 — якщо було виявлено відповідники, 1 — коли їх нема,\n" "2 — якщо сталася помилка і не було використано параметр -q.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "задані умови відповідності є суперечливими" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "некоректний вираз порівняння %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "попередження: GREP_OPTIONS вважається застарілою; будь ласка, скористайтеся " "альтернативною змінною або скриптом" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "невідомий спосіб обробки для пристроїв" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "помилкова максимальна кількість" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "невідомий тип двійкових файлів" @@ -815,32 +815,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "підтримки неекранованих ^ чи $ при використанні з -Pz не передбачено" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "внутрішня помилка (такої помилки не повинно було статися)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "внутрішня помилка" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "перевищено обмеження на довжину рядка PCRE" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "вичерпано стек JIT PCRE" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "перевищено обмеження на зворотне стеження у PCRE" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "внутрішня помилка PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/vi.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/vi.gmo differ diff -Nru grep-2.24/po/vi.po grep-2.25/po/vi.po --- grep-2.24/po/vi.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/vi.po 2016-04-22 04:37:24.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: grep 2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" "PO-Revision-Date: 2016-03-05 07:45+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -35,7 +35,7 @@ msgid "Valid arguments are:" msgstr "Các đối số hợp lệ là:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "lỗi ghi" @@ -104,7 +104,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: tùy chọn “-W %s” yêu cầu một đối số\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "hết bộ nhớ" @@ -216,7 +216,7 @@ msgid "Unmatched ) or \\)" msgstr "Có ký tự “)” hay “\\)” lẻ cặp" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "Không có biểu thức chính quy nằm trước" @@ -412,111 +412,111 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s đối số “%s” quá lớn" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "thiếu dấu ngoặc vuông mở [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "sai lớp ký tự" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "cú pháp lớp ký tự là [[:space:]], không phải [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "chưa kết thúc thoát chuỗi \\" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "nội dung của \\{\\} không hợp lệ" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "biểu thức chính quy quá lớn" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "thiếu dấu ngoặc đơn mở (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "chưa đưa ra cú pháp" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "thiếu dấu ngoặc đơn đóng )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "" "nhiều người khác, xem tại " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "đối số chiều dài ngữ cảnh không hợp lệ" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "dữ liệu đầu vào quá lớn nên không thể đếm được" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek gặp lỗi" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "Tập tin nhị phân “%s” khớp mẫu tìm kiếm\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "cảnh báo: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "vòng lặp thư mục đệ quy" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "tập tin đầu vào “%s” cũng là kết xuất" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(đầu vào tiêu chuẩn)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "Cách dùng: %s [TÙY_CHỌN]… MẪU [TẬP_TIN]…\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Hãy chạy lệnh “%s --help” để biết thêm thông tin.\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "Tìm kiếm MẪU trong mỗi TẬP_TIN hay từ đầu vào tiêu chuẩn.\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "MẪU, theo mặc định, là một biểu thức chính quy cơ bản (BRE).\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -527,7 +527,7 @@ "\n" "Chọn và biên dịch biểu thức chính quy:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -541,7 +541,7 @@ " -G, --basic-regexp MẪU là một biểu thức chính quy cơ bản (BRE).\n" " -P, --perl-regexp MẪU là một biểu thức chính quy Perl.\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -559,7 +559,7 @@ " -z, --null-data một dòng dữ liệu kết thúc bằng byte 0,\n" " không phải ký tự dòng mới\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -576,7 +576,7 @@ " -V, --version in ra thông tin phiên bản rồi thoát\n" " --help hiển thị trợ giúp này rồi thoát\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -602,7 +602,7 @@ " --label=NHÃN sử dụng NHÃN này làm tiền tố cho tập tin\n" " cho đầu ra tiêu chuẩn\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -619,7 +619,7 @@ " * “without-match” không khớp\n" " -a, --text giống với tùy chọn “--binary-files=text”\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -642,7 +642,7 @@ " -r, --recursive giống với tùy chọn “--directories=recurse”\n" " -R, --dereference-recursive cũng vậy nhưng cho phép cả các liên kết mềm\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -659,7 +659,7 @@ " tin trong tập tin này\n" " --exclude-dir=MẪU thư mục nào khớp với mẫu này thì bị bỏ qua\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -674,7 +674,7 @@ " -T, --initial-tab sắp hàng cột tab (nếu cần)\n" " -Z, --null in ra byte 0 (null) đằng sau tên TẬP TIN\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -689,7 +689,7 @@ " -A, --after-context=SỐ in ra SỐ dòng ngữ cảnh đi sau\n" " -C, --context=SỐ in ra SỐ dòng ngữ cảnh kết xuất\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -714,7 +714,7 @@ " (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -723,7 +723,7 @@ "“egrep” nên là “grep -E”, “fgrep” nên là “grep -F”.\n" "Không tán thành gọi trực tiếp “egrep” cũng như “fgrep”.\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -739,33 +739,33 @@ "Trạng thái thoát là 0 nếu dòng nào được chọn, không thì bằng 1.\n" "Nếu có lỗi phát sinh và “-q” không được đưa ra thì trạng thái thoát là 2.\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "đã ghi rõ dữ liệu khớp mà xung đột" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "sai mẫu so khớp %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "" "cảnh báo: GREP_OPTIONS đã lỗi thời; vui lòng dòng một bí danh hoặc văn lệnh" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "không rõ phương thức thiết bị" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "số lượng tối đa không hợp lệ" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "không rõ kiểu tập tin nhị phân (binary-files)" @@ -798,32 +798,32 @@ msgid "unescaped ^ or $ not supported with -Pz" msgstr "không thoát ^ hay $ không được hỗ trợ với -Pz" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "lỗi nội bộ (không nên xảy ra như thế)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "lỗi nội bộ" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "đã vượt quá giới hạn chiều dài dòng của PCRE" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "ngăn xếp “PCRE JIT” đã hết" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "đã vượt quá giới hạn tìm ngược của PCRE" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "lỗi nội bộ PCRE: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/zh_CN.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/zh_CN.gmo differ diff -Nru grep-2.24/po/zh_CN.po grep-2.25/po/zh_CN.po --- grep-2.24/po/zh_CN.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/zh_CN.po 2016-04-22 04:37:24.000000000 +0000 @@ -1,13 +1,13 @@ # Simplified Chinese(zh_CN) messages for grep. # This file is distributed under the same license as the grep package. # Copyright (C) 2008 Free Software Foundation, Inc. -# Ji ZhengYu , 2015 +# Ji ZhengYu , 2016 msgid "" msgstr "" -"Project-Id-Version: grep 2.21.78\n" +"Project-Id-Version: grep 2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" -"PO-Revision-Date: 2015-11-11 15:27中国标准时间\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" +"PO-Revision-Date: 2016-03-30 16:53China Standard Time\n" "Last-Translator: Ji ZhengYu \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" msgstr "有效参数是:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "写错误" @@ -98,7 +98,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: 选项'-W %s' 必须带参数\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "内存耗尽" @@ -171,9 +171,8 @@ msgstr "无效的回退索引" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "[ 或 [^ 不匹配" +msgstr "[, [^, [:, [.或[= 不匹配" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -211,7 +210,7 @@ msgid "Unmatched ) or \\)" msgstr ") 或 \\) 不匹配" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "没有之前的正则表达式" @@ -404,110 +403,110 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s 参数'%s' 过多" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "有未匹配的 [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "无效的字符类名" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "字符类的语法是 [[:space:]],而非 [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "未做好 \\ 转义" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "\\{\\}中内容无效" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "正则表达式太长" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "有未匹配的 (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "未指定语法" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "有未匹配的 )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "其余作者请参看 " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "无效的文本长度参数" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "输入太多无法计数" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek 失败" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "匹配到二进制文件 %s\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "警告: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "嵌套目录循环" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "输入文件 %s 同时也作输出" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(标准输入)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "用法: %s [选项]... PATTERN [FILE]...\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "试用'%s --help' 来获得更多信息。\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "在每个 FILE 或是标准输入中查找 PATTERN。\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "默认的 PATTERN 是一个基本正则表达式(缩写为 BRE)。\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -518,7 +517,7 @@ "\n" "正则表达式选择与解释:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -531,7 +530,7 @@ " -G, --basic-regexp PATTERN 是一个基本正则表达式(缩写为 BRE)\n" " -P, --perl-regexp PATTERN 是一个 Perl 正则表达式\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -548,7 +547,7 @@ " -x, --line-regexp 强制 PATTERN 仅完全匹配一行\n" " -z, --null-data 一个 0 字节的数据行，但不是空行\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -565,7 +564,7 @@ " -V, --version 显示版本信息并退出\n" " --help 显示此帮助并退出\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -589,7 +588,7 @@ " -h, --no-filename 输出时不显示文件名前缀\n" " --label=LABEL 将LABEL 作为标准输入文件名前缀\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -604,7 +603,7 @@ " TYPE 可以是`binary', `text', 或`without-match'\n" " -a, --text 等同于 --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -623,7 +622,7 @@ " -r, --recursive 等同于--directories=recurse\n" " -R, --dereference-recursive 同上，但遍历所有符号链接\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -638,7 +637,7 @@ " --exclude-from=FILE 跳过所有除FILE 以外的文件\n" " --exclude-dir=PATTERN 跳过所有匹配PATTERN 的目录。\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -653,7 +652,7 @@ " -T, --initial-tab 行首tabs 分隔（如有必要）\n" " -Z, --null 在FILE 文件最后打印空字符\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -668,7 +667,7 @@ " -A, --after-context=NUM 打印文本及其后面NUM 行\n" " -C, --context=NUM 打印NUM 行输出文本\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -690,7 +689,7 @@ "\t\t\t (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -699,7 +698,7 @@ "'egrep' 即'grep -E'。'fgrep' 即'grep -F'。\n" "直接调用'egrep' 或是'fgrep' 均已被废弃。\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -714,32 +713,32 @@ "如果有任意行被匹配，那退出状态为 0，否则为 1；\n" "如果有错误产生，且未指定 -q 参数，那退出状态为 2。\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "指定了互相冲突的比较程序" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "无效匹配 %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "警告: GREP_OPTIONS 已被废除; 请使用别名或脚本" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "未知的设备处理方式" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "无效的最大计数" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "未知的二进制文件类型" @@ -768,34 +767,34 @@ #: src/pcresearch.c:138 #, c-format msgid "unescaped ^ or $ not supported with -Pz" -msgstr "" +msgstr "-Pz 不支持未经转义的字符^ 或$" -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "内部错误(本应不可能发生)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "内部错误" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "超过PCRE 的行长度限制" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "PCRE JIT栈已经用尽" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "超过PCRE 的回溯限制" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "内部PCRE 错误: %d" Binary files /tmp/tmpYQ8pHI/pbybeon8_C/grep-2.24/po/zh_TW.gmo and /tmp/tmpYQ8pHI/6DkDTyTvcd/grep-2.25/po/zh_TW.gmo differ diff -Nru grep-2.24/po/zh_TW.po grep-2.25/po/zh_TW.po --- grep-2.24/po/zh_TW.po 2016-03-11 05:38:49.000000000 +0000 +++ grep-2.25/po/zh_TW.po 2016-04-22 04:37:24.000000000 +0000 @@ -4,15 +4,14 @@ # Yuan-Chen Cheng , 2004. # Webber Liao , 2012. # Wei-Lun Chao , 2013. -# Webber Liao , 2015. -# +# Webber Liao , 2016. # msgid "" msgstr "" -"Project-Id-Version: grep 2.21.78\n" +"Project-Id-Version: grep 2.23.7\n" "Report-Msgid-Bugs-To: bug-grep@gnu.org\n" -"POT-Creation-Date: 2016-03-10 21:38-0800\n" -"PO-Revision-Date: 2015-10-25 13:34+0800\n" +"POT-Creation-Date: 2016-04-21 21:37-0700\n" +"PO-Revision-Date: 2016-03-26 04:25+0800\n" "Last-Translator: Webber Liao \n" "Language-Team: Chinese (traditional) \n" "Language: zh_TW\n" @@ -36,7 +35,7 @@ msgid "Valid arguments are:" msgstr "有效的引數為:" -#: lib/closeout.c:112 src/grep.c:1199 +#: lib/closeout.c:112 src/grep.c:1238 #, c-format msgid "write error" msgstr "寫入發生錯誤" @@ -105,7 +104,7 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: 選項 \"-W %s\" 需要一個引數\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:338 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:340 #, c-format msgid "memory exhausted" msgstr "記憶體用盡" @@ -178,9 +177,8 @@ msgstr "無效的向後引用" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "沒有對應的 [ 或 [^" +msgstr "沒有對應的 [，[^，[:，[. 或 [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -218,7 +216,7 @@ msgid "Unmatched ) or \\)" msgstr "沒有對應的 ) 或 \\)" -#: lib/regcomp.c:711 +#: lib/regcomp.c:687 msgid "No previous regular expression" msgstr "沒有先前的正規表示式" @@ -409,110 +407,110 @@ msgid "%s%s argument '%s' too large" msgstr "%s%s 引數 \"%s\" 過大" -#: src/dfa.c:1005 src/dfa.c:1008 src/dfa.c:1027 src/dfa.c:1037 src/dfa.c:1049 -#: src/dfa.c:1076 src/dfa.c:1085 src/dfa.c:1088 src/dfa.c:1093 src/dfa.c:1114 -#: src/dfa.c:1117 +#: src/dfa.c:990 src/dfa.c:993 src/dfa.c:1012 src/dfa.c:1022 src/dfa.c:1034 +#: src/dfa.c:1061 src/dfa.c:1070 src/dfa.c:1073 src/dfa.c:1078 src/dfa.c:1099 +#: src/dfa.c:1102 msgid "unbalanced [" msgstr "不對稱的 [" -#: src/dfa.c:1061 +#: src/dfa.c:1046 msgid "invalid character class" msgstr "無效的字元類別" -#: src/dfa.c:1183 +#: src/dfa.c:1168 msgid "character class syntax is [[:space:]], not [:space:]" msgstr "字元類別的語法為 [[:space:]], 非 [:space:]" -#: src/dfa.c:1245 +#: src/dfa.c:1230 msgid "unfinished \\ escape" msgstr "不完整的 \\ 逸出" -#: src/dfa.c:1392 +#: src/dfa.c:1377 msgid "invalid content of \\{\\}" msgstr "\\{\\} 的內容無效" -#: src/dfa.c:1395 +#: src/dfa.c:1380 msgid "regular expression too big" msgstr "正規表示式過長" -#: src/dfa.c:1811 +#: src/dfa.c:1796 msgid "unbalanced (" msgstr "不對稱的 (" -#: src/dfa.c:1937 +#: src/dfa.c:1922 msgid "no syntax specified" msgstr "沒有指定的語法" -#: src/dfa.c:1945 +#: src/dfa.c:1930 msgid "unbalanced )" msgstr "不對稱的 )" #. This is a proper name. See the gettext manual, section Names. -#: src/grep.c:57 +#: src/grep.c:58 msgid "Mike Haertel" msgstr "Mike Haertel" -#: src/grep.c:58 +#: src/grep.c:59 msgid "others, see " msgstr "其他作者，請見 " -#: src/grep.c:648 +#: src/grep.c:689 msgid "invalid context length argument" msgstr "無效的內容列數值" -#: src/grep.c:712 +#: src/grep.c:753 #, c-format msgid "input is too large to count" msgstr "輸入過長無法計數" -#: src/grep.c:754 +#: src/grep.c:795 msgid "lseek failed" msgstr "lseek 失敗" -#: src/grep.c:1501 +#: src/grep.c:1539 #, c-format msgid "Binary file %s matches\n" msgstr "二進位格式檔案 %s 符合\n" -#: src/grep.c:1550 +#: src/grep.c:1588 #, c-format msgid "warning: %s: %s" msgstr "警告: %s: %s" -#: src/grep.c:1551 +#: src/grep.c:1589 msgid "recursive directory loop" msgstr "遞迴的目錄結構" -#: src/grep.c:1720 +#: src/grep.c:1758 #, c-format msgid "input file %s is also the output" msgstr "輸入檔 %s 也是輸出對象" -#: src/grep.c:1782 +#: src/grep.c:1820 msgid "(standard input)" msgstr "(標準輸入)" -#: src/grep.c:1798 src/grep.c:1805 +#: src/grep.c:1836 src/grep.c:1843 #, c-format msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" msgstr "用法: %s [選項]… PATTERN [檔案]…\n" -#: src/grep.c:1800 +#: src/grep.c:1838 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "請使用 \"%s --help\" 以閱讀更多的資訊。\n" -#: src/grep.c:1806 +#: src/grep.c:1844 #, c-format msgid "Search for PATTERN in each FILE or standard input.\n" msgstr "對每個 檔案 或標準輸入搜尋 PATTERN。\n" -#: src/grep.c:1807 +#: src/grep.c:1845 #, c-format msgid "PATTERN is, by default, a basic regular expression (BRE).\n" msgstr "PATTERN 原則上是一個基本正規表示式 (BRE)。\n" -#: src/grep.c:1808 +#: src/grep.c:1846 #, c-format msgid "" "Example: %s -i 'hello world' menu.h main.c\n" @@ -523,7 +521,7 @@ "\n" "正規表示式選項及解釋:\n" -#: src/grep.c:1812 +#: src/grep.c:1850 #, c-format msgid "" " -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n" @@ -536,7 +534,7 @@ " -G, --basic-regexp PATTERN 是一個基本正規表示式 (BRE)\n" " -P, --perl-regexp PATTERN 是一個 Perl 的正規表示式\n" -#: src/grep.c:1818 +#: src/grep.c:1856 #, c-format msgid "" " -e, --regexp=PATTERN use PATTERN for matching\n" @@ -553,7 +551,7 @@ " -x, --line-regexp 限制整列符合 PATTERN\n" " -z, --null-data 設定資料列結尾為空白位元組，非換列符號\n" -#: src/grep.c:1825 +#: src/grep.c:1863 #, c-format msgid "" "\n" @@ -570,7 +568,7 @@ " -V, --version 印出版本資訊然後結束\n" " --help 顯示此說明然後結束\n" -#: src/grep.c:1832 +#: src/grep.c:1870 #, c-format msgid "" "\n" @@ -594,7 +592,7 @@ " -h, --no-filename 抑制輸出列的檔名前綴\n" " --label=LABEL 以 LABEL 作標準輸入的檔名前綴\n" -#: src/grep.c:1843 +#: src/grep.c:1881 #, c-format msgid "" " -o, --only-matching show only the part of a line matching PATTERN\n" @@ -610,7 +608,7 @@ "\"\n" " -a, --text 等同於 --binary-files=text\n" -#: src/grep.c:1850 +#: src/grep.c:1888 #, c-format msgid "" " -I equivalent to --binary-files=without-match\n" @@ -628,7 +626,7 @@ " ACTION 為 \"read\" 或 \"skip\"\n" " -R, -r, --recursive 等同於 --directories=recurse\n" -#: src/grep.c:1859 +#: src/grep.c:1897 #, c-format msgid "" " --include=FILE_PATTERN search only files that match FILE_PATTERN\n" @@ -643,7 +641,7 @@ " --exclude-from=FILE 跳過檔名符合 FILE 中樣式的檔案\n" " --exclude-dir=PATTERN 跳過名字符合 PATTERN 的檔案目錄。\n" -#: src/grep.c:1866 +#: src/grep.c:1904 #, c-format msgid "" " -L, --files-without-match print only names of FILEs containing no match\n" @@ -658,7 +656,7 @@ " -T, --initial-tab (需要時) 對齊欄標符號\n" " -Z, --null 在 檔案 名稱後印出空白位元組\n" -#: src/grep.c:1872 +#: src/grep.c:1910 #, c-format msgid "" "\n" @@ -673,7 +671,7 @@ " -A, --after-context=NUM 印出 NUM 列的後文\n" " -C, --context=NUM 印出 NUM 列的內容\n" -#: src/grep.c:1879 +#: src/grep.c:1917 #, c-format msgid "" " -NUM same as --context=NUM\n" @@ -695,7 +693,7 @@ " (MSDOS/Windows)\n" "\n" -#: src/grep.c:1888 +#: src/grep.c:1926 #, c-format msgid "" "'egrep' means 'grep -E'. 'fgrep' means 'grep -F'.\n" @@ -704,7 +702,7 @@ "\"egrep\" 等同於 \"grep -E\". \"fgrep\" 等同於 \"grep -F\"。\n" "直接呼叫 \"egrep\" 或 \"fgrep\" 的做法已被廢除。\n" -#: src/grep.c:1891 +#: src/grep.c:1929 #, c-format msgid "" "When FILE is -, read standard input. With no FILE, read . if a command-" @@ -718,32 +716,32 @@ "如果有符合的行列時，結束狀態為 0，否則為 1;\n" "如果有任何錯誤且沒有採用 -q 選項時，結束狀態則為 2。\n" -#: src/grep.c:1958 +#: src/grep.c:1996 #, c-format msgid "conflicting matchers specified" msgstr "指定了互相衝突的配對選項" -#: src/grep.c:1969 +#: src/grep.c:2007 #, c-format msgid "invalid matcher %s" msgstr "無效的配對選項 %s" -#: src/grep.c:2252 +#: src/grep.c:2290 #, c-format msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script" msgstr "警告: GREP_OPTIONS 已經被廢除。請使用別名或腳本取代。" -#: src/grep.c:2282 +#: src/grep.c:2320 #, c-format msgid "unknown devices method" msgstr "未知的裝置方法" -#: src/grep.c:2409 +#: src/grep.c:2447 #, c-format msgid "invalid max count" msgstr "無效的最大計次" -#: src/grep.c:2466 +#: src/grep.c:2504 #, c-format msgid "unknown binary-files type" msgstr "未知的二進位檔案類別" @@ -762,7 +760,7 @@ #: src/pcresearch.c:119 #, c-format msgid "-P supports only unibyte and UTF-8 locales" -msgstr "-P supports only unibyte and UTF-8 locales" +msgstr "-P 只支援單位元組和 UTF-8 編碼" #: src/pcresearch.c:126 #, c-format @@ -772,34 +770,34 @@ #: src/pcresearch.c:138 #, c-format msgid "unescaped ^ or $ not supported with -Pz" -msgstr "" +msgstr "-Pz 不支援未逸出的 ^ 或 $ " -#: src/pcresearch.c:182 +#: src/pcresearch.c:184 #, c-format msgid "internal error (should never happen)" msgstr "內部錯誤 (不應該出現這個錯誤)" -#: src/pcresearch.c:204 +#: src/pcresearch.c:206 #, c-format msgid "internal error" msgstr "內部錯誤" -#: src/pcresearch.c:248 +#: src/pcresearch.c:250 #, c-format msgid "exceeded PCRE's line length limit" msgstr "已超過 PCRE 的字數上限" -#: src/pcresearch.c:342 +#: src/pcresearch.c:344 #, c-format msgid "exhausted PCRE JIT stack" msgstr "已耗盡 PCRE JIT 堆疊" -#: src/pcresearch.c:346 +#: src/pcresearch.c:348 #, c-format msgid "exceeded PCRE's backtracking limit" msgstr "已超過 PCRE 的回溯上限" -#: src/pcresearch.c:353 +#: src/pcresearch.c:355 #, c-format msgid "internal PCRE error: %d" msgstr "內部 PCRE 錯誤: %d" diff -Nru grep-2.24/src/dfa.c grep-2.25/src/dfa.c --- grep-2.24/src/dfa.c 2016-01-01 22:45:41.000000000 +0000 +++ grep-2.25/src/dfa.c 2016-04-19 21:25:27.000000000 +0000 @@ -350,11 +350,6 @@ */ int *multibyte_prop; - /* A table indexed by byte values that contains the corresponding wide - character (if any) for that byte. WEOF means the byte is not a - valid single-byte character. */ - wint_t mbrtowc_cache[NOTCHAR]; - /* Array of the bracket expression in the DFA. */ struct mb_char_classes *mbcsets; size_t nmbcsets; @@ -431,19 +426,10 @@ static void regexp (void); -static void -dfambcache (struct dfa *d) -{ - int i; - for (i = CHAR_MIN; i <= CHAR_MAX; ++i) - { - char c = i; - unsigned char uc = i; - mbstate_t s = { 0 }; - wchar_t wc; - d->mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF; - } -} +/* A table indexed by byte values that contains the corresponding wide + character (if any) for that byte. WEOF means the byte is not a + valid single-byte character. */ +static wint_t mbrtowc_cache[NOTCHAR]; /* Store into *PWC the result of converting the leading bytes of the multibyte buffer S of length N bytes, using the mbrtowc_cache in *D @@ -466,7 +452,7 @@ mbs_to_wchar (wint_t *pwc, char const *s, size_t n, struct dfa *d) { unsigned char uc = s[0]; - wint_t wc = d->mbrtowc_cache[uc]; + wint_t wc = mbrtowc_cache[uc]; if (wc == WEOF) { @@ -671,25 +657,18 @@ /* Set of characters that are newline. */ static charclass newline; -/* Add this to the test for whether a byte is word-constituent, since on - BSD-based systems, many values in the 128..255 range are classified as - alphabetic, while on glibc-based systems, they are not. */ -#ifdef __GLIBC__ -# define is_valid_unibyte_character(c) 1 -#else -# define is_valid_unibyte_character(c) (btowc (c) != WEOF) -#endif - -/* C is a "word-constituent" byte. */ -#define IS_WORD_CONSTITUENT(C) \ - (is_valid_unibyte_character (C) && (isalnum (C) || (C) == '_')) +static bool +unibyte_word_constituent (unsigned char c) +{ + return mbrtowc_cache[c] != WEOF && (isalnum (c) || (c) == '_'); +} static int char_context (unsigned char c) { if (c == eolbyte) return CTX_NEWLINE; - if (IS_WORD_CONSTITUENT (c)) + if (unibyte_word_constituent (c)) return CTX_LETTER; return CTX_NONE; } @@ -708,23 +687,29 @@ void dfasyntax (reg_syntax_t bits, int fold, unsigned char eol) { - unsigned int i; - + int i; syntax_bits_set = 1; syntax_bits = bits; case_fold = fold != 0; eolbyte = eol; - for (i = 0; i < NOTCHAR; ++i) + for (i = CHAR_MIN; i <= CHAR_MAX; ++i) { - sbit[i] = char_context (i); - switch (sbit[i]) + char c = i; + unsigned char uc = i; + mbstate_t s = { 0 }; + wchar_t wc; + mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF; + + /* Now that mbrtowc_cache[uc] is set, use it to calculate sbit. */ + sbit[uc] = char_context (uc); + switch (sbit[uc]) { case CTX_LETTER: - setbit (i, letters); + setbit (uc, letters); break; case CTX_NEWLINE: - setbit (i, newline); + setbit (uc, newline); break; } } @@ -1489,7 +1474,7 @@ { zeroset (ccl); for (c2 = 0; c2 < NOTCHAR; ++c2) - if (IS_WORD_CONSTITUENT (c2)) + if (unibyte_word_constituent (c2)) setbit (c2, ccl); if (c == 'W') notset (ccl); @@ -2714,7 +2699,7 @@ state_letter = state; for (i = 0; i < NOTCHAR; ++i) - trans[i] = (IS_WORD_CONSTITUENT (i)) ? state_letter : state; + trans[i] = unibyte_word_constituent (i) ? state_letter : state; trans[eolbyte] = state_newline; } else @@ -2820,7 +2805,7 @@ if (c == eolbyte) trans[c] = state_newline; - else if (IS_WORD_CONSTITUENT (c)) + else if (unibyte_word_constituent (c)) trans[c] = state_letter; else if (c < NOTCHAR) trans[c] = state; @@ -3626,7 +3611,6 @@ dfacomp (char const *s, size_t len, struct dfa *d, int searchflag) { dfainit (d); - dfambcache (d); dfaparse (s, len, d); dfassbuild (d); diff -Nru grep-2.24/src/grep.c grep-2.25/src/grep.c --- grep-2.24/src/grep.c 2016-02-02 05:59:58.000000000 +0000 +++ grep-2.25/src/grep.c 2016-04-03 00:45:51.000000000 +0000 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include "system.h" @@ -296,6 +297,47 @@ { NULL, NULL, NULL } }; +/* Saved errno value from failed output functions on stdout. */ +static int stdout_errno; + +static void +putchar_errno (int c) +{ + if (putchar (c) < 0) + stdout_errno = errno; +} + +static void +fputs_errno (char const *s) +{ + if (fputs (s, stdout) < 0) + stdout_errno = errno; +} + +static void _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2) +printf_errno (char const *format, ...) +{ + va_list ap; + va_start (ap, format); + if (vfprintf (stdout, format, ap) < 0) + stdout_errno = errno; + va_end (ap); +} + +static void +fwrite_errno (void const *ptr, size_t size, size_t nmemb) +{ + if (fwrite (ptr, size, nmemb, stdout) != nmemb) + stdout_errno = errno; +} + +static void +fflush_errno (void) +{ + if (fflush (stdout) != 0) + stdout_errno = errno; +} + static struct exclude *excluded_patterns[2]; static struct exclude *excluded_directory_patterns[2]; /* Short options. */ @@ -386,7 +428,6 @@ /* Omit leading "./" from file names in diagnostics. */ static bool omit_dot_slash; static bool errseen; -static bool write_error_seen; /* True if output from the current input file has been suppressed because an output line had an encoding error. */ @@ -480,7 +521,7 @@ static void clean_up_stdout (void) { - if (! write_error_seen) + if (! stdout_errno) close_stdout (); } @@ -940,7 +981,7 @@ print_filename (void) { pr_sgr_start_if (filename_color); - fputs (filename, stdout); + fputs_errno (filename); pr_sgr_end_if (filename_color); } @@ -949,7 +990,7 @@ print_sep (char sep) { pr_sgr_start_if (sep_color); - fputc (sep, stdout); + putchar_errno (sep); pr_sgr_end_if (sep_color); } @@ -976,7 +1017,7 @@ *--p = ' '; pr_sgr_start_if (color); - fwrite (p, 1, buf + sizeof buf - p, stdout); + fwrite_errno (p, 1, buf + sizeof buf - p); pr_sgr_end_if (color); } @@ -1013,7 +1054,7 @@ if (filename_mask) pending_sep = true; else - fputc (0, stdout); + putchar_errno (0); } if (out_line) @@ -1047,7 +1088,7 @@ (and its combining and wide characters) filenames and you're wasting your efforts. */ if (align_tabs) - fputs ("\t\b", stdout); + fputs_errno ("\t\b"); print_sep (sep); } @@ -1104,14 +1145,14 @@ cur = mid; mid = NULL; } - fwrite (cur, sizeof (char), b - cur, stdout); + fwrite_errno (cur, 1, b - cur); } pr_sgr_start_if (match_color); - fwrite (b, sizeof (char), match_size, stdout); + fwrite_errno (b, 1, match_size); pr_sgr_end_if (match_color); if (only_matching) - fputs ("\n", stdout); + putchar_errno (eolbyte); } } @@ -1136,7 +1177,7 @@ if (tail_size > 0) { pr_sgr_start (line_color); - fwrite (beg, 1, tail_size, stdout); + fwrite_errno (beg, 1, tail_size); beg += tail_size; pr_sgr_end (line_color); } @@ -1188,16 +1229,13 @@ } if (!only_matching && lim > beg) - fwrite (beg, 1, lim - beg, stdout); + fwrite_errno (beg, 1, lim - beg); if (line_buffered) - fflush (stdout); + fflush_errno (); - if (ferror (stdout)) - { - write_error_seen = true; - error (EXIT_TROUBLE, 0, _("write error")); - } + if (stdout_errno) + error (EXIT_TROUBLE, stdout_errno, _("write error")); lastout = lim; } @@ -1253,9 +1291,9 @@ && p != lastout && group_separator) { pr_sgr_start_if (sep_color); - fputs (group_separator, stdout); + fputs_errno (group_separator); pr_sgr_end_if (sep_color); - fputc ('\n', stdout); + putchar_errno ('\n'); } while (p < beg) @@ -1498,9 +1536,9 @@ if (!out_quiet && (encoding_error_output || (0 <= nlines_first_null && nlines_first_null < nlines))) { - printf (_("Binary file %s matches\n"), filename); + printf_errno (_("Binary file %s matches\n"), filename); if (line_buffered) - fflush (stdout); + fflush_errno (); } return nlines; } @@ -1742,20 +1780,20 @@ if (filename_mask) print_sep (SEP_CHAR_SELECTED); else - fputc (0, stdout); + putchar_errno (0); } - printf ("%" PRIdMAX "\n", count); + printf_errno ("%" PRIdMAX "\n", count); if (line_buffered) - fflush (stdout); + fflush_errno (); } status = !count; if (list_files == 1 - 2 * status) { print_filename (); - fputc ('\n' & filename_mask, stdout); + putchar_errno ('\n' & filename_mask); if (line_buffered) - fflush (stdout); + fflush_errno (); } if (desc == STDIN_FILENO) diff -Nru grep-2.24/src/Makefile.in grep-2.25/src/Makefile.in --- grep-2.24/src/Makefile.in 2016-03-07 17:49:08.000000000 +0000 +++ grep-2.25/src/Makefile.in 2016-04-22 04:03:07.000000000 +0000 @@ -135,7 +135,8 @@ $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/i-ring.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/i-ring.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/iconv_open.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ diff -Nru grep-2.24/src/pcresearch.c grep-2.25/src/pcresearch.c --- grep-2.24/src/pcresearch.c 2016-03-03 02:06:08.000000000 +0000 +++ grep-2.25/src/pcresearch.c 2016-04-03 00:45:51.000000000 +0000 @@ -127,15 +127,17 @@ if (! eolbyte) { bool escaped = false; + bool after_unescaped_left_bracket = false; for (p = pattern; *p; p++) if (escaped) - escaped = false; + escaped = after_unescaped_left_bracket = false; else { - escaped = *p == '\\'; - if (*p == '^' || *p == '$') + if (*p == '$' || (*p == '^' && !after_unescaped_left_bracket)) error (EXIT_TROUBLE, 0, _("unescaped ^ or $ not supported with -Pz")); + escaped = *p == '\\'; + after_unescaped_left_bracket = *p == '['; } } diff -Nru grep-2.24/src/search.h grep-2.25/src/search.h --- grep-2.24/src/search.h 2016-01-06 18:00:13.000000000 +0000 +++ grep-2.25/src/search.h 2016-04-10 19:35:10.000000000 +0000 @@ -48,7 +48,6 @@ /* searchutils.c */ extern void kwsinit (kwset_t *); -extern char *mbtoupper (char const *, size_t *, mb_len_map_t **); extern void build_mbclen_cache (void); extern size_t mbclen_cache[]; extern ptrdiff_t mb_goback (char const **, char const *, char const *); diff -Nru grep-2.24/src/searchutils.c grep-2.25/src/searchutils.c --- grep-2.24/src/searchutils.c 2016-01-01 22:45:41.000000000 +0000 +++ grep-2.25/src/searchutils.c 2016-04-10 19:38:49.000000000 +0000 @@ -22,8 +22,6 @@ #define SYSTEM_INLINE _GL_EXTERN_INLINE #include "search.h" -#include - #define NCHAR (UCHAR_MAX + 1) size_t mbclen_cache[NCHAR]; @@ -48,169 +46,6 @@ xalloc_die (); } -/* Convert BEG, an *N-byte string, to uppercase, and write the - NUL-terminated result into malloc'd storage. Upon success, set *N - to the length (in bytes) of the resulting string (not including the - trailing NUL byte), and return a pointer to the uppercase string. - Upon memory allocation failure, exit. *N must be positive. - - Although this function returns a pointer to malloc'd storage, - the caller must not free it, since this function retains a pointer - to the buffer and reuses it on any subsequent call. As a consequence, - this function is not thread-safe. - - When each character in the uppercase result string has the same length - as the corresponding character in the input string, set *LEN_MAP_P - to NULL. Otherwise, set it to a malloc'd buffer (like the returned - buffer, this must not be freed by caller) of the same length as the - result string. (*LEN_MAP_P)[J] is the change in byte-length of the - character in BEG that formed byte J of the result as it was converted to - uppercase. It is usually zero. For lowercase Turkish dotless I it - is -1, since the lowercase input occupies two bytes, while the - uppercase output occupies only one byte. For lowercase I in the - tr_TR.utf8 locale, it is 1 because the uppercase Turkish dotted I - is one byte longer than the original. When that happens, we have two - or more slots in *LEN_MAP_P for each such character. We store the - difference in the first one and 0's in any remaining slots. - - This map is used by the caller to convert offset,length pairs that - reference the uppercase result to numbers that refer to the matched - part of the original buffer. */ - -char * -mbtoupper (const char *beg, size_t *n, mb_len_map_t **len_map_p) -{ - static char *out; - static mb_len_map_t *len_map; - static size_t outalloc; - size_t outlen, mb_cur_max; - mbstate_t is, os; - const char *end; - char *p; - mb_len_map_t *m; - bool lengths_differ = false; - - if (*n > outalloc || outalloc == 0) - { - outalloc = MAX (1, *n); - out = xrealloc (out, outalloc); - len_map = xrealloc (len_map, outalloc); - } - - /* appease clang-2.6 */ - assert (out); - assert (len_map); - if (*n == 0) - return out; - - memset (&is, 0, sizeof (is)); - memset (&os, 0, sizeof (os)); - end = beg + *n; - - mb_cur_max = MB_CUR_MAX; - p = out; - m = len_map; - outlen = 0; - while (beg < end) - { - wchar_t wc; - size_t mbclen = mbrtowc (&wc, beg, end - beg, &is); -#ifdef __CYGWIN__ - /* Handle a UTF-8 sequence for a character beyond the base plane. - Cygwin's wchar_t is UTF-16, as in the underlying OS. This - results in surrogate pairs which need some extra attention. */ - wint_t wci = 0; - if (mbclen == 3 && (wc & 0xdc00) == 0xd800) - { - /* We got the start of a 4 byte UTF-8 sequence. This is returned - as a UTF-16 surrogate pair. The first call to mbrtowc returned 3 - and wc has been set to a high surrogate value, now we're going - to fetch the matching low surrogate. This second call to mbrtowc - is supposed to return 1 to complete the 4 byte UTF-8 sequence. */ - wchar_t wc_2; - size_t mbclen_2 = mbrtowc (&wc_2, beg + mbclen, end - beg - mbclen, - &is); - if (mbclen_2 == 1 && (wc_2 & 0xdc00) == 0xdc00) - { - /* Match. Convert this to a 4 byte wint_t which constitutes - a 32-bit UTF-32 value. */ - wci = ( (((wint_t) (wc - 0xd800)) << 10) - | ((wint_t) (wc_2 - 0xdc00))) - + 0x10000; - ++mbclen; - } - else - { - /* Invalid UTF-8 sequence. */ - mbclen = (size_t) -1; - } - } -#endif - if (outlen + mb_cur_max >= outalloc) - { - size_t dm = m - len_map; - out = x2nrealloc (out, &outalloc, 1); - len_map = xrealloc (len_map, outalloc); - p = out + outlen; - m = len_map + dm; - } - - if (mbclen == (size_t) -1 || mbclen == (size_t) -2 || mbclen == 0) - { - /* An invalid sequence, or a truncated multi-octet character. - We treat it as a single-octet character. */ - *m++ = 0; - *p++ = *beg++; - outlen++; - memset (&is, 0, sizeof (is)); - memset (&os, 0, sizeof (os)); - } - else - { - size_t ombclen; - beg += mbclen; -#ifdef __CYGWIN__ - /* Handle Unicode characters beyond the base plane. */ - if (mbclen == 4) - { - /* towupper, taking wint_t (4 bytes), handles UCS-4 values. */ - wci = towupper (wci); - if (wci >= 0x10000) - { - wci -= 0x10000; - wc = (wci >> 10) | 0xd800; - /* No need to check the return value. When reading the - high surrogate, the return value will be 0 and only the - mbstate indicates that we're in the middle of reading a - surrogate pair. The next wcrtomb call reading the low - surrogate will then return 4 and reset the mbstate. */ - wcrtomb (p, wc, &os); - wc = (wci & 0x3ff) | 0xdc00; - } - else - { - wc = (wchar_t) wci; - } - ombclen = wcrtomb (p, wc, &os); - } - else -#endif - ombclen = wcrtomb (p, towupper (wc), &os); - *m = mbclen - ombclen; - memset (m + 1, 0, ombclen - 1); - m += ombclen; - p += ombclen; - outlen += ombclen; - lengths_differ |= (mbclen != ombclen); - } - } - - *len_map_p = lengths_differ ? len_map : NULL; - *n = p - out; - *p = 0; - return out; -} - /* Initialize a cache of mbrlen values for each of its 1-byte inputs. */ void build_mbclen_cache (void) diff -Nru grep-2.24/.tarball-version grep-2.25/.tarball-version --- grep-2.24/.tarball-version 2016-03-11 05:39:36.000000000 +0000 +++ grep-2.25/.tarball-version 2016-04-22 04:38:07.000000000 +0000 @@ -1 +1 @@ -2.24 +2.25 diff -Nru grep-2.24/tests/c-locale grep-2.25/tests/c-locale --- grep-2.24/tests/c-locale 1970-01-01 00:00:00.000000000 +0000 +++ grep-2.25/tests/c-locale 2016-04-10 16:46:58.000000000 +0000 @@ -0,0 +1,26 @@ +#! /bin/sh +# Regression test for GNU grep. +# +# Copyright 2016 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. + +. "${srcdir=.}/init.sh"; path_prepend_ ../src + +fail=0 + +c=1 +while test $c -lt 256; do + tr2=$(printf '\\%o\n' $c) + echo X | tr X "$tr2" >in + if test $(wc -l out || fail=1 + compare in out || fail=1 + fi + test $fail -ne 0 && Exit $fail + c=$(expr $c + 1) +done + +Exit $fail diff -Nru grep-2.24/tests/Makefile.am grep-2.25/tests/Makefile.am --- grep-2.24/tests/Makefile.am 2016-02-21 01:20:32.000000000 +0000 +++ grep-2.25/tests/Makefile.am 2016-04-10 16:46:58.000000000 +0000 @@ -53,6 +53,7 @@ big-match \ bogus-wctob \ bre \ + c-locale \ case-fold-backref \ case-fold-backslash-w \ case-fold-char-class \ @@ -141,6 +142,7 @@ word-delim-multibyte \ word-multi-file \ word-multibyte \ + write-error-msg \ yesno \ z-anchor-newline @@ -181,6 +183,14 @@ done; \ }; \ fi; \ + \ + : 'Test egrep/fgrep help if they use our grep.'; \ + grep=`echo grep | sed -e '$(transform)'` || exit; \ + if test "$$grep" = grep; then \ + built_programs='grep egrep fgrep'; \ + else \ + built_programs='grep'; \ + fi; \ \ export_with_values \ VERSION='$(VERSION)' \ @@ -192,7 +202,7 @@ abs_top_builddir='$(abs_top_builddir)' \ abs_top_srcdir='$(abs_top_srcdir)' \ abs_srcdir='$(abs_srcdir)' \ - built_programs='grep egrep fgrep' \ + built_programs="$$built_programs" \ srcdir='$(srcdir)' \ top_srcdir='$(top_srcdir)' \ CC='$(CC)' \ diff -Nru grep-2.24/tests/Makefile.in grep-2.25/tests/Makefile.in --- grep-2.24/tests/Makefile.in 2016-03-07 17:49:08.000000000 +0000 +++ grep-2.25/tests/Makefile.in 2016-04-22 04:03:07.000000000 +0000 @@ -141,7 +141,8 @@ $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/i-ring.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/i-ring.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/iconv_open.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ @@ -1389,6 +1390,7 @@ big-match \ bogus-wctob \ bre \ + c-locale \ case-fold-backref \ case-fold-backslash-w \ case-fold-char-class \ @@ -1477,6 +1479,7 @@ word-delim-multibyte \ word-multi-file \ word-multibyte \ + write-error-msg \ yesno \ z-anchor-newline @@ -1517,6 +1520,14 @@ done; \ }; \ fi; \ + \ + : 'Test egrep/fgrep help if they use our grep.'; \ + grep=`echo grep | sed -e '$(transform)'` || exit; \ + if test "$$grep" = grep; then \ + built_programs='grep egrep fgrep'; \ + else \ + built_programs='grep'; \ + fi; \ \ export_with_values \ VERSION='$(VERSION)' \ @@ -1528,7 +1539,7 @@ abs_top_builddir='$(abs_top_builddir)' \ abs_top_srcdir='$(abs_top_srcdir)' \ abs_srcdir='$(abs_srcdir)' \ - built_programs='grep egrep fgrep' \ + built_programs="$$built_programs" \ srcdir='$(srcdir)' \ top_srcdir='$(top_srcdir)' \ CC='$(CC)' \ @@ -1883,6 +1894,13 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +c-locale.log: c-locale + @p='c-locale'; \ + b='c-locale'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) case-fold-backref.log: case-fold-backref @p='case-fold-backref'; \ b='case-fold-backref'; \ @@ -2498,6 +2516,13 @@ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +write-error-msg.log: write-error-msg + @p='write-error-msg'; \ + b='write-error-msg'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) yesno.log: yesno @p='yesno'; \ diff -Nru grep-2.24/tests/null-byte grep-2.25/tests/null-byte --- grep-2.24/tests/null-byte 2016-02-02 05:59:58.000000000 +0000 +++ grep-2.25/tests/null-byte 2016-04-03 00:45:51.000000000 +0000 @@ -60,4 +60,9 @@ grep -E 'xxx|z' in >out || fail=1 compare exp out || fail=1 +printf '%s\0' 'abcadc' >in || framework_failure_ +printf '%s\0' 'abc' 'adc' >exp || framework_failure_ +grep -oz 'a[^c]*c' in >out || fail=1 +compare exp out || fail=1 + Exit $fail diff -Nru grep-2.24/tests/pcre grep-2.25/tests/pcre --- grep-2.24/tests/pcre 2016-03-03 02:06:08.000000000 +0000 +++ grep-2.25/tests/pcre 2016-04-03 00:45:51.000000000 +0000 @@ -15,5 +15,6 @@ echo | grep -P '\s*$' || fail=1 echo | returns_ 2 grep -zP '\s$' || fail=1 echo '.ab' | returns_ 1 grep -Pwx ab || fail=1 +echo x | grep -Pz '[^a]' || fail=1 Exit $fail diff -Nru grep-2.24/tests/pcre-context grep-2.25/tests/pcre-context --- grep-2.24/tests/pcre-context 2015-07-03 22:20:07.000000000 +0000 +++ grep-2.25/tests/pcre-context 2016-04-03 00:45:51.000000000 +0000 @@ -23,12 +23,10 @@ EOF test $? -eq 0 || framework_failure_ -cat >exp <<'EOF' -Preceded by 2 empty lines. -Preceded by 3 empty lines. -Preceded by 4 empty lines. -EOF -test $? -eq 0 || framework_failure_ +printf '%s\0' \ + 'Preceded by 2 empty lines.' \ + 'Preceded by 3 empty lines.' \ + 'Preceded by 4 empty lines.' >exp || framework_failure_ fail=0 diff -Nru grep-2.24/tests/reversed-range-endpoints grep-2.25/tests/reversed-range-endpoints --- grep-2.24/tests/reversed-range-endpoints 2014-06-27 22:32:09.000000000 +0000 +++ grep-2.25/tests/reversed-range-endpoints 2016-04-03 00:45:51.000000000 +0000 @@ -5,7 +5,7 @@ fail=0 printf 'Invalid range end\n' > exp -for prog in grep egrep 'grep -E'; do +for prog in grep 'grep -E'; do $prog '[b-a]' < /dev/null > out 2>&1 # exit status must be 2, not 1 test $? = 2 || fail=1 diff -Nru grep-2.24/tests/write-error-msg grep-2.25/tests/write-error-msg --- grep-2.24/tests/write-error-msg 1970-01-01 00:00:00.000000000 +0000 +++ grep-2.25/tests/write-error-msg 2016-04-03 00:45:51.000000000 +0000 @@ -0,0 +1,55 @@ +#!/bin/sh +# Ensure that output errors are reported with errno information. + +# Copyright 2016 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/init.sh"; path_prepend_ ../src +test -e /dev/full || skip_ your system lacks /dev/full + +export LC_ALL=C + +# generate large input, filling the libc stdio buffers +# and triggering a write(2) even without line buffering. +yes 12345 | head -n 50000 > in || framework_failure_ + +fail=0 + +# disk-full error, line buffered +# (note: GNU grep returns 2 on error) +returns_ 2 grep --line-buffered -v '^$' /dev/full 2>err1 \ + || framework_failure_ + +# disk-full error, unbuffered +# (note: GNU grep returns 2 on error) +returns_ 2 grep -v '^$' /dev/full 2>err2 \ + || framework_failure_ + +# ensure each error message file contains a 'write error' with additional text +for f in err1 err2 ; +do + grep -Eiq '^grep: write error: [a-z]+' $f \ + || { + warn_ "incorrect/missing error message in file $f" + compare /dev/null $f # print the content in the logs + fail=1 + } +done + +# These messages should be identical +compare err1 err2 \ + || { warn_ "err1,err2 contain different error messages" ; fail=1 ; } + +Exit $fail diff -Nru grep-2.24/THANKS grep-2.25/THANKS --- grep-2.24/THANKS 2016-03-11 03:54:01.000000000 +0000 +++ grep-2.25/THANKS 2016-04-10 16:50:23.000000000 +0000 @@ -19,7 +19,6 @@ Benno Schulenberg bensberg@justemail.net Bernd Strieder strieder@student.uni-kl.de Bernhard Rosenkraenzer bero@arklinux.org -Binary file (standard input) matches Bob Proulx rwp@hprwp.fc.hp.com Brian Youmans 3diff@gnu.org Bruno Haible bruno@clisp.org @@ -40,31 +39,98 @@ Eric Blake eblake@redhat.com Fernando Basso fernandobasso.br@gmail.com Florian La Roche laroche@redhat.com +François Pinard pinard@iro.umontreal.ca +Gerald Stoller gerald_stoller@hotmail.com +Grant McDorman grant@isgtec.com +Greg Boyd gboyd.ccsf@gmail.com +Greg Louis glouis@dynamicro.on.ca +Guglielmo 'bond' Bondioni g.bondioni@libero.it +H. Merijn Brand h.m.brand@hccnet.nl +Hans-Bernhard Broeker broeker@physik.rwth-aachen.de +Harald Hanche-Olsen hanche@math.ntnu.no +Heikki Korpela heko@iki.fi +Igor O. Ladygin assa@zabtrans.ru +Ilya Basin basinilya@gmail.com +Isamu Hasegawa isamu@yamato.ibm.com Jaroslav Škarvada jskarvad@redhat.com Javier Villavicencio the_paya@gentoo.org +Jeff Bailey jbailey@nisa.net +Jim Hand jhand@austx.tandem.com Jim Meyering jim@meyering.net +Jochen Hein jochen.hein@delphi.central.de +Joel N. Weber II devnull@gnu.org Johan Walles johan.walles@gmail.com +John Hughes john@nitelite.calvacom.fr +Jorge Stolfi stolfi@dcc.unicamp.br +Juan Manuel Guerrero ST001906@HRZ1.HRZ.TU-Darmstadt.De Julian Foad julianfoad@btopenworld.com Karl Berry karl@gnu.org +Karl Heuer kwzh@gnu.org +Kaveh R. Ghazi ghazi@caip.rutgers.edu +Kazuro Furukawa furukawa@apricot.kek.jp +Keith Bostic bostic@bsdi.com +Krishna Sethuraman krishna@sgihub.corp.sgi.com +Kurt D Schwehr kdschweh@insci14.ucsd.edu +Ludovic Courtès ludo@gnu.org +Marc Aldorasi m101010a@gmail.com +Mark Waite markw@mddmew.fc.hp.com +Martin P.J. Zinser zinser@decus.de +Martin Rex martin.rex@sap-ag.de Matthew Burgess matthew@linuxfromscratch.org +Michael Aichlmayr mikla@nx.com Mike Frysinger vapier@gentoo.org Mike Haertel mike@ducky.net +Miles Bader miles@ccs.mt.nec.co.jp +Mirraz Mirraz mirraz1@rambler.ru +Nelson H. F. Beebe beebe@math.utah.edu Nicolas Vigier boklm@mars-attacks.org +Nima Aghdaii naghdaii@fb.com Norihiro Tanaka noritnk@kcn.ne.jp +Olaf Kirch okir@ns.lst.de Pádraig Brady P@draigBrady.com Paolo Bonzini bonzini@gnu.org Patrick Boyd pboyd04@gmail.com Paul Eggert eggert@cs.ucla.edu +Paul Kimoto kimoto@spacenet.tn.cornell.edu +Péter Radics mitchnull@gmail.com Petr Písař petr.pisar@atlas.cz Petr Pisar ppisar@redhat.com +Philip Hazel ph10@cus.cam.ac.uk +Philipp Kohlbecher xt28@gmx.de +Philippe Defert Philippe.Defert@cern.ch +Philippe De Muyter phdm@info.ucl.ac.be +Phillip C. Brisco phillip.craig.brisco@ccmail.census.gov +Rainer Orth ro@cebitec.uni-bielefeld.de Reuben Thomas rrt@sc3d.org +Roland Roberts rroberts@muller.com +Ruslan Ermilov ru@freebsd.org Santiago Ruano Rincón santiago@debian.org +Santiago Vila sanvila@unex.es +Shannon Hill hill@synnet.com +Sotiris Vassilopoulos Sotiris.Vassilopoulos@betatech.gr +Standish Parsley adsspamtrap01@yahoo.com Stefano Lattarini stefano.lattarini@gmail.com Stepan Kasal kasal@ucw.cz Stephane Chazelas stephane.chazelas@gmail.com +Stewart Levin stew@sep.stanford.edu +Strahinja Kustudic kustodian@gmail.com +Sven Joachim svenjoac@gmx.de +Sydoruk Stepan step@unitex.kiev.ua +Tapani Tarvainen tt@mit.jyu.fi +Tim Waugh twaugh@redhat.com +Tom 'moof' Spindler dogcow@ccs.neu.edu +Tom Tromey tromey@creche.cygnus.com Tony Abou-Assaleh taa@acm.org +UEBAYASHI Masao masao@nf.enveng.titech.ac.jp +Ulrich Drepper drepper@cygnus.com +Uwe H. Steinfeld usteinfeld@gmx.net +Volker Borchert bt@teknon.de +Wichert Akkerman wichert@cistron.nl +William Bader william@nscs.fast.net +Wolfgang Schludi schludi@syscomp.de Yuliy Pisetsky ypisetsky@fb.com Zev Weiss zev@bewilderbeest.net +Zoltan Herczeg hzmester@freemail.hu ;; Local Variables: ;; coding: utf-8