+2016-08-20 Jim Meyering <meyering@fb.com>
+
+ version 3.5
+ * NEWS: Record release date.
+
+2016-08-16 Jim Meyering <meyering@fb.com>
+
+ build: arrange to build with -fno-common, when possible
+ * configure.ac (WERROR_CFLAGS): Add -fno-common, when possible.
+ This would have prevented the duplicate definition of
+ presume_output_tty that was fixed in v3.4-10-gc2dc91f.
+
+2016-08-16 Hanno Böck <hanno@hboeck.de>
+
+ diff: avoid duplicate definition of presume_output_tty
+ * src/util.c (presume_output_tty): Remove this definition.
+ The other is in diff.h. Reported in https://bugs.gnu.org/24248
+
+2016-08-14 Jim Meyering <meyering@fb.com>
+
+ gnulib: update to latest
+
+ tests: diff3: work around missing seq on some systems
+ * tests/diff3 (seq): Provide a seq replacement function,
+ since at least AIX, SunOS 5.10, OpenBSD-5.8 lack it.
+ Reported by Assaf Gordon in https://bugs.gnu.org/24227#8
+
+2016-08-13 Jim Meyering <meyering@fb.com>
+
+ diff3: fix leaks, for real
+ * src/diff3.c (struct diff_block)[lint]: Add member, n2.
+ (free_diff_block, next_to_n2): New functions.
+ * tests/diff3: Add more test coverage.
+
+ maint: require that commit messages be of a certain form
+ * bootstrap.conf (bootstrap_epilogue): Merge from coreutils, so that
+ a local commit hook will now help enforce consistent commit messages.
+ * Makefile.am (check-git-hook-script-sync): New rule, largely copied
+ from coreutils.
+ * scripts/git-hooks/commit-msg: New file, from coreutils, but
+ with adapted list of program names.
+ * scripts/git-hooks/applypatch-msg: New file, from git.
+ * scripts/git-hooks/pre-applypatch: Likewise.
+ * scripts/git-hooks/pre-commit: Likewise.
+
+2016-08-13 Bastian Beischer <bastian.beischer@rwth-aachen.de>
+
+ diff3: fix heap use-after-free; add minimal diff3 test coverage
+ Commit v3.3-42-g3b74a90, "FIXME: src/diff3: plug a leak" added an
+ invalid use of free, leading to use-after-free in nearly any invocation
+ of diff3. Revert that commit.
+ * NEWS (Bug fixes): Mention it.
+ * tests/diff3: New file, to add minimal test coverage.
+ * tests/Makefile.am (TESTS): Add it.
+ Reported by Bastian Beischer in http://bugs.gnu.org/24210
+
+2016-08-13 Jim Meyering <meyering@fb.com>
+
+ build: ignore texinfo build artifacts
+ * .gitignore: Ignore texinfo artifacts in doc/.
+
+ maint: diff3: remove an unreachable statement
+ * src/diff3.c (main): Remove unreachable "return" after exit from main.
+
2016-08-08 Jim Meyering <meyering@fb.com>
+ diff: disable colorization for TERM=dumb
+ * src/diff.c (main): With --color or --color=auto, when TERM is
+ "dumb", disable colorization. Suggested by Daniel Colascione.
+ * NEWS (Bug fixes): Mention it.
+ * tests/colors: Add a test that would fail without this change,
+ yet passes with it.
+
+ maint: post-release administrivia
+ * NEWS: Add header line for next release.
+ * .prev-version: Record previous version.
+ * cfg.mk (old_NEWS_hash): Auto-update.
+
version 3.4
* NEWS: Record release date.
ALL_RECURSIVE_TARGETS += distcheck-hook
distcheck-hook:
$(MAKE) my-distcheck
+
+# Some of our git hook scripts are supposed to be identical to git's samples.
+# See if they are still in sync.
+.PHONY: check-git-hook-script-sync
+check-git-hook-script-sync:
+ @fail=0; \
+ t=$$(mktemp -d) \
+ && cd $$t && git init -q && cd .git/hooks \
+ && for i in pre-commit pre-applypatch applypatch-msg; do \
+ diff -u $(abs_top_srcdir)/scripts/git-hooks/$$i $$i.sample \
+ || fail=1; \
+ done; \
+ rm -rf $$t; \
+ test $$fail = 0
distcheck-hook:
$(MAKE) my-distcheck
+# Some of our git hook scripts are supposed to be identical to git's samples.
+# See if they are still in sync.
+.PHONY: check-git-hook-script-sync
+check-git-hook-script-sync:
+ @fail=0; \
+ t=$$(mktemp -d) \
+ && cd $$t && git init -q && cd .git/hooks \
+ && for i in pre-commit pre-applypatch applypatch-msg; do \
+ diff -u $(abs_top_srcdir)/scripts/git-hooks/$$i $$i.sample \
+ || fail=1; \
+ done; \
+ rm -rf $$t; \
+ test $$fail = 0
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
GNU diffutils NEWS -*- outline -*-
+* Noteworthy changes in release 3.5 (2016-08-20) [stable]
+
+** Bug fixes
+
+ diff3 no longer malfunctions due to use-after-free
+ [bug introduced in 3.4]
+
+ diff --color no longer colorizes when TERM=dumb
+
+
* Noteworthy changes in release 3.4 (2016-08-08) [stable]
** New features
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2016-08-06.12}
+\def\texinfoversion{2016-08-09.22}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
\else
% Use Unicode destination names
\txiuseunicodedestnametrue
- % Escape PDF strings UTF-8 to UTF-16
+ % Escape PDF strings with converting UTF-16 from UTF-8
\begingroup
\catcode`\%=12
\directlua{
end
}
\endgroup
- \def\pdfescapestring#1{\directlua{UTF16oct('\luaescapestring{#1}')}}
+ \def\pdfescapestrutfsixteen#1{\directlua{UTF16oct('\luaescapestring{#1}')}}
+ % Escape PDF strings without converting
+ \begingroup
+ \directlua{
+ function PDFescstr(str)
+ for c in string.bytes(str) do
+ if c <= 0x20 or c >= 0x80 or c == 0x28 or c == 0x29 or c == 0x5c then
+ tex.sprint(
+ string.format(string.char(0x5c) .. string.char(0x25) .. '03o',
+ c))
+ else
+ tex.sprint(string.char(c))
+ end
+ end
+ end
+ }
+ \endgroup
+ \def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}}
\ifnum\luatexversion>84
% For LuaTeX >= 0.85
\def\pdfdest{\pdfextension dest}
\xdef#1{\pdfescapestring{#1}}%
\fi
}
+\def\txiescapepdfutfsixteen#1{%
+ \ifx\pdfescapestrutfsixteen\thisisundefined
+ % No UTF-16 converting macro available.
+ \txiescapepdf{#1}%
+ \else
+ \xdef#1{\pdfescapestrutfsixteen{#1}}%
+ \fi
+}
\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
with PDF output, and none of those formats could be found. (.eps cannot
\pdfrefximage \pdflastximage
\fi}
%
- \def\pdfmkdest#1{{%
+ \def\setpdfdestname#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
\fi
\def\pdfdestname{#1}%
\txiescapepdf\pdfdestname
- \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
}}
%
+ \def\setpdfoutlinetext#1{{%
+ \indexnofonts
+ \makevalueexpandable
+ \turnoffactive
+ \ifx \declaredencoding \latone
+ % The PDF format can use an extended form of Latin-1 in bookmark
+ % strings. See Appendix D of the PDF Reference, Sixth Edition, for
+ % the "PDFDocEncoding".
+ \passthroughcharstrue
+ % Pass through Latin-1 characters.
+ % LuaTeX: Convert to Unicode
+ % pdfTeX: Use Latin-1 as PDFDocEncoding
+ \def\pdfoutlinetext{#1}%
+ \else
+ \ifx \declaredencoding \utfeight
+ \ifx\luatexversion\thisisundefined
+ % For pdfTeX with UTF-8.
+ % TODO: the PDF format can use UTF-16 in bookmark strings,
+ % but the code for this isn't done yet.
+ % Use ASCII approximations.
+ \passthroughcharsfalse
+ \def\pdfoutlinetext{#1}%
+ \else
+ % For LuaTeX with UTF-8.
+ % Pass through Unicode characters for title texts.
+ \passthroughcharstrue
+ \def\pdfoutlinetext{#1}%
+ \fi
+ \else
+ % For non-Latin-1 or non-UTF-8 encodings.
+ % Use ASCII approximations.
+ \passthroughcharsfalse
+ \def\pdfoutlinetext{#1}%
+ \fi
+ \fi
+ % LuaTeX: Convert to UTF-16
+ % pdfTeX: Use Latin-1 as PDFDocEncoding
+ \txiescapepdfutfsixteen\pdfoutlinetext
+ }}
+ %
+ \def\pdfmkdest#1{%
+ \setpdfdestname{#1}%
+ \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
+ }
+ %
% used to mark target names; must be expandable.
\def\pdfmkpgn#1{#1}
%
% 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.
- {
- \turnoffactive
- \ifx \declaredencoding \latone
- % The PDF format can use an extended form of Latin-1 in bookmark
- % strings. See Appendix D of the PDF Reference, Sixth Edition, for
- % the "PDFDocEncoding".
- \passthroughcharstrue
- % Pass through Latin-1 characters.
- % LuaTeX: Convert to Unicode
- % pdfTeX: Use Latin-1 as PDFDocEncoding
- \edef\pdfoutlinetext{#1}%
- \iftxiuseunicodedestname
- % Pass through Latin-1 characters.
- % LuaTeX with byte wise I/O converts Latin-1 characters to Unicode.
- \edef\pdfoutlinedest{#3}%
- \else
- % Use ASCII approximations in destination names.
- \passthroughcharsfalse
- \edef\pdfoutlinedest{#3}%
- \fi
- \else
- \ifx \declaredencoding \utfeight
- \ifx\luatexversion\thisisundefined
- % For pdfTeX with UTF-8.
- % TODO: the PDF format can use UTF-16 in bookmark strings,
- % but the code for this isn't done yet.
- % Use ASCII approximations.
- \passthroughcharsfalse
- \edef\pdfoutlinetext{#1}%
- \edef\pdfoutlinedest{#3}%
- \else
- % For LuaTeX with UTF-8.
- % Pass through Unicode characters for title texts.
- \passthroughcharstrue
- \edef\pdfoutlinetext{#1}%
- \iftxiuseunicodedestname
- % Pass through Unicode characters for destination names.
- \edef\pdfoutlinedest{#3}%
- \else
- % Use ASCII approximations in destination names.
- \passthroughcharsfalse
- \edef\pdfoutlinedest{#3}%
- \fi
- \fi
- \else
- % For non-Latin-1 or non-UTF-8 encodings.
- % Use ASCII approximations.
- \passthroughcharsfalse
- \edef\pdfoutlinetext{#1}%
- \edef\pdfoutlinedest{#3}%
- \fi
- \fi
- %
- \ifx\pdfoutlinedest\empty
- \def\pdfoutlinedest{#4}%
- \else
- \txiescapepdf\pdfoutlinedest
- \fi
- \txiescapepdf\pdfoutlinetext
- %
- \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
- }
+ \setpdfoutlinetext{#1}
+ \setpdfdestname{#3}
+ \ifx\pdfdestname\empty
+ \def\pdfdestname{#4}%
+ \fi
+ %
+ \pdfoutline goto name{\pdfmkpgn{\pdfdestname}}#2{\pdfoutlinetext}%
}
%
\def\pdfmakeoutlines{%
\def\pdfdest name#1 xyz{%
\special{pdf:dest (#1) [@thispage /XYZ @xpos @ypos null]}%
}
- \def\pdfmkdest#1{{%
+ %
+ \def\setpdfdestname#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
\fi
\def\pdfdestname{#1}%
\txiescapepdf\pdfdestname
- \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
}}
%
+ \def\setpdfoutlinetext#1{{%
+ \turnoffactive
+ % Always use Unicode characters in title texts.
+ \def\pdfoutlinetext{#1}%
+ % For XeTeX, xdvipdfmx converts to UTF-16.
+ % So we do not convert.
+ \txiescapepdf\pdfoutlinetext
+ }}
+ %
+ \def\pdfmkdest#1{%
+ \setpdfdestname{#1}%
+ \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
+ }
+ %
% by default, use black for everything.
\def\urlcolor{\rgbBlack}
\def\linkcolor{\rgbBlack}
\def\endlink{\setcolor{\maincolor}\pdfendlink}
%
- \def\dopdfoutline#1#2#3#4{{%
- \turnoffactive
- % Always use Unicode characters in title texts.
- \def\pdfoutlinetext{#1}%
- \txiescapepdf\pdfoutlinetext
- \iftxiuseunicodedestname
- % Pass through Unicode characters.
- \else
- % Use ASCII approximations in destination names.
- \passthroughcharsfalse
- \fi
- \def\pdfoutlinedest{#3}%
- \ifx\pdfoutlinedest\empty
- \def\pdfoutlinedest{#4}%
+ \def\dopdfoutline#1#2#3#4{%
+ \setpdfoutlinetext{#1}
+ \setpdfdestname{#3}
+ \ifx\pdfdestname\empty
+ \def\pdfdestname{#4}%
\fi
- \txiescapepdf\pdfoutlinedest
%
\special{pdf:out [-] #2 << /Title (\pdfoutlinetext) /A
- << /S /GoTo /D (\pdfoutlinedest) >> >> }%
- }}
+ << /S /GoTo /D (\pdfdestname) >> >> }%
+ }
%
\def\pdfmakeoutlines{%
\begingroup
\definedummyword\TeX
%
% Assorted special characters.
+ \definedummyword\atchar
\definedummyword\arrow
\definedummyword\bullet
\definedummyword\comma
\def\LaTeX{LaTeX}%
\def\TeX{TeX}%
%
- % Assorted special characters.
- % (The following {} will end up in the sort string, but that's ok.)
- \def\arrow{->}%
- \def\bullet{bullet}%
- \def\comma{,}%
- \def\copyright{copyright}%
- \def\dots{...}%
- \def\enddots{...}%
- \def\equiv{==}%
- \def\error{error}%
- \def\euro{euro}%
- \def\expansion{==>}%
- \def\geq{>=}%
- \def\guillemetleft{<<}%
- \def\guillemetright{>>}%
- \def\guilsinglleft{<}%
- \def\guilsinglright{>}%
- \def\leq{<=}%
- \def\minus{-}%
- \def\point{.}%
- \def\pounds{pounds}%
- \def\print{-|}%
- \def\quotedblbase{"}%
- \def\quotedblleft{"}%
- \def\quotedblright{"}%
- \def\quoteleft{`}%
- \def\quoteright{'}%
- \def\quotesinglbase{,}%
- \def\registeredsymbol{R}%
- \def\result{=>}%
- \def\textdegree{o}%
+ % Assorted special characters. \defglyph gives the control sequence a
+ % definition that removes the {} that follows its use.
+ \defglyph\atchar{@}%
+ \defglyph\arrow{->}%
+ \defglyph\bullet{bullet}%
+ \defglyph\comma{,}%
+ \defglyph\copyright{copyright}%
+ \defglyph\dots{...}%
+ \defglyph\enddots{...}%
+ \defglyph\equiv{==}%
+ \defglyph\error{error}%
+ \defglyph\euro{euro}%
+ \defglyph\expansion{==>}%
+ \defglyph\geq{>=}%
+ \defglyph\guillemetleft{<<}%
+ \defglyph\guillemetright{>>}%
+ \defglyph\guilsinglleft{<}%
+ \defglyph\guilsinglright{>}%
+ \defglyph\leq{<=}%
+ \defglyph\lbracechar{\{}%
+ \defglyph\minus{-}%
+ \defglyph\point{.}%
+ \defglyph\pounds{pounds}%
+ \defglyph\print{-|}%
+ \defglyph\quotedblbase{"}%
+ \defglyph\quotedblleft{"}%
+ \defglyph\quotedblright{"}%
+ \defglyph\quoteleft{`}%
+ \defglyph\quoteright{'}%
+ \defglyph\quotesinglbase{,}%
+ \defglyph\rbracechar{\}}%
+ \defglyph\registeredsymbol{R}%
+ \defglyph\result{=>}%
+ \defglyph\textdegree{o}%
%
% We need to get rid of all macros, leaving only the arguments (if present).
% Of course this is not nearly correct, but it is the best we can do for now.
\macrolist
\let\value\indexnofontsvalue
}
+\def\defglyph#1#2{\def#1##1{#2}} % see above
\f
\newbox\partialpage
\newdimen\doublecolumnhsize
-\newdimen\doublecolumntopgap
-\doublecolumntopgap = 0pt
% Use inside an output routine to save \topmark and \firstmark
\def\savemarks{%
%
% Double the \vsize as well. (We don't need a separate register here,
% since nobody clobbers \vsize.)
- \global\doublecolumntopgap = \topskip
- \global\advance\doublecolumntopgap by -1\baselineskip
- \advance\vsize by -1\doublecolumntopgap
\vsize = 2\vsize
- \topskip=0pt
%
% For the benefit of balancing columns
\advance\baselineskip by 0pt plus 0.5pt
%
\hsize = \doublecolumnhsize
\wd0=\hsize \wd2=\hsize
- \vbox{%
- \vskip\doublecolumntopgap
- \hbox to\txipagewidth{\box0\hfil\box2}}%
+ \hbox to\txipagewidth{\box0\hfil\box2}%
}
\loop
\global\setbox3 = \copy0
\global\setbox1 = \vsplit3 to \dimen@
- % Remove glue from bottom of columns to compare
- % apparent heights.
- \global\setbox1 = \vbox{\unvbox1\unpenalty\unskip}%
- \global\setbox3 = \vbox{\unvbox3\unpenalty\unskip}%
\ifdim\ht1<\ht3
\global\advance\dimen@ by 1pt
\repeat
% Just split the last of the double column material roughly in half.
\setbox2=\box0
\setbox0 = \vsplit2 to \dimen@ii
- \setbox0=\vbox to\ht2{\unvbox0\vfill}%
- \setbox2=\vbox to\ht2{\unvbox2\vfill}%
+ \setbox0=\vbox to \dimen@ii {\unvbox0\vfill}%
+ \setbox2=\vbox to \dimen@ii {\unvbox2\vfill}%
\else
% Compare the heights of the two columns.
\ifdim4\ht1>5\ht3
\setbox0=\vbox to \ht1 {\unvbox1\vfill}%
\else
% Make column bottoms flush with each other.
- \setbox0=\vbox to\dimen@{\unvbox1}%
- \setbox2=\vbox to\dimen@{\unvbox3}%
+ \setbox2=\vbox to\ht1{\unvbox3\unskip}%
+ \setbox0=\vbox to\ht1{\unvbox1\unskip}%
\fi
\fi
\fi
%
% This (wrongly) does not take account of leading or trailing
% spaces in #1, which should be ignored.
- \iftxiuseunicodedestname
- \ifx \declaredencoding \latone
- % Pass through Latin-1 characters.
- \else
- \ifx \declaredencoding \utfeight
- % Pass through Unicode characters.
- \else
- % Use ASCII approximations in destination names.
- \passthroughcharsfalse
- \fi
- \fi
- \else
- % Use ASCII approximations in destination names.
- \passthroughcharsfalse
- \fi
- \def\pdfxrefdest{#1}%
+ \setpdfdestname{#1}%
%
- \ifx\pdfxrefdest\empty
- \def\pdfxrefdest{Top}% no empty targets
- \else
- \txiescapepdf\pdfxrefdest % escape PDF special chars
+ \ifx\pdfdestname\empty
+ \def\pdfdestname{Top}% no empty targets
\fi
%
\leavevmode
\startlink attr{/Border [0 0 0]}%
\ifnum\filenamelength>0
- goto file{\the\filename.pdf} name{\pdfxrefdest}%
+ goto file{\the\filename.pdf} name{\pdfdestname}%
\else
- goto name{\pdfmkpgn{\pdfxrefdest}}%
+ goto name{\pdfmkpgn{\pdfdestname}}%
\fi
}%
\setcolor{\linkcolor}%
%
% This (wrongly) does not take account of leading or trailing
% spaces in #1, which should be ignored.
- \iftxiuseunicodedestname
- % Pass through Unicode characters.
- \else
- % Use ASCII approximations in destination names.
- \passthroughcharsfalse
- \fi
- \def\pdfxrefdest{#1}%
+ \setpdfdestname{#1}%
%
- \ifx\pdfxrefdest\empty
- \def\pdfxrefdest{Top}% no empty targets
- \else
- \txiescapepdf\pdfxrefdest % escape PDF special chars
+ \ifx\pdfdestname\empty
+ \def\pdfdestname{Top}% no empty targets
\fi
%
\leavevmode
% this command line option is no longer necessary
% because we can use the `dvipdfmx:config' special.
\special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A
- << /S /GoToR /F (\the\filename.pdf) /D (\pdfxrefdest) >> >>}%
+ << /S /GoToR /F (\the\filename.pdf) /D (\pdfdestname) >> >>}%
\else
\special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A
- << /S /GoTo /D (\pdfxrefdest) >> >>}%
+ << /S /GoTo /D (\pdfdestname) >> >>}%
\fi
}%
\setcolor{\linkcolor}%
# Now that we have better tests, make this the default.
export VERBOSE = yes
-old_NEWS_hash = 8632093db0c946f65f639f06ac7de39a
+old_NEWS_hash = 69329628b612be7ab46517bbf067c85f
# Tell maint.mk's syntax-check rules that diff gets config.h directly or
# via diff.h or system.h.
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.147-5ad35 for GNU diffutils 3.4.
+# Generated by GNU Autoconf 2.69.147-5ad35 for GNU diffutils 3.5.
#
# Report bugs to <bug-diffutils@gnu.org>.
#
# Identity of this package.
PACKAGE_NAME='GNU diffutils'
PACKAGE_TARNAME='diffutils'
-PACKAGE_VERSION='3.4'
-PACKAGE_STRING='GNU diffutils 3.4'
+PACKAGE_VERSION='3.5'
+PACKAGE_STRING='GNU diffutils 3.5'
PACKAGE_BUGREPORT='bug-diffutils@gnu.org'
PACKAGE_URL='http://www.gnu.org/software/diffutils/'
# 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 diffutils 3.4 to adapt to many kinds of systems.
+\`configure' configures GNU diffutils 3.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU diffutils 3.4:";;
+ short | recursive ) echo "Configuration of GNU diffutils 3.5:";;
esac
cat <<\_ACEOF
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU diffutils configure 3.4
+GNU diffutils configure 3.5
generated by GNU Autoconf 2.69.147-5ad35
Copyright (C) 2015 Free Software Foundation, Inc.
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNU diffutils $as_me 3.4, which was
+It was created by GNU diffutils $as_me 3.5, which was
generated by GNU Autoconf 2.69.147-5ad35. Invocation command line was
$ $0 $@
# Define the identity of the package.
PACKAGE='diffutils'
- VERSION='3.4'
+ VERSION='3.5'
cat >>confdefs.h <<_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fno-common" >&5
+printf %s "checking whether C compiler handles -fno-common... " >&6; }
+if test ${gl_cv_warn_c__fno_common+y}
+then :
+ printf %s "(cached) " >&6
+else
+
+ gl_save_compiler_FLAGS="$CFLAGS"
+ as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fno-common"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ gl_cv_warn_c__fno_common=yes
+else
+ gl_cv_warn_c__fno_common=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$gl_save_compiler_FLAGS"
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fno_common" >&5
+printf "%s\n" "$gl_cv_warn_c__fno_common" >&6; }
+if test "x$gl_cv_warn_c__fno_common" = xyes
+then :
+ as_fn_append WARN_CFLAGS " -fno-common"
+fi
+
+
+
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNU diffutils $as_me 3.4, which was
+This file was extended by GNU diffutils $as_me 3.5, which was
generated by GNU Autoconf 2.69.147-5ad35. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
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 diffutils config.status 3.4
+GNU diffutils config.status 3.5
configured by $0, generated by GNU Autoconf 2.69.147-5ad35,
with options \\"\$ac_cs_config\\"
gl_WARN_ADD([-fdiagnostics-show-option])
gl_WARN_ADD([-funit-at-a-time])
+ gl_WARN_ADD([-fno-common])
AC_SUBST([WARN_CFLAGS])
This is diffutils.info-t, produced by makeinfo version 6.1 from
diffutils.texi.
-This manual is for GNU Diffutils (version 3.4, 4 August 2016), and
+This manual is for GNU Diffutils (version 3.5, 4 August 2016), and
documents the GNU 'diff', 'diff3', 'sdiff', and 'cmp' commands for
showing the differences between files and the GNU 'patch' command for
using their output to update files.
Comparing and Merging Files
***************************
-This manual is for GNU Diffutils (version 3.4, 4 August 2016), and
+This manual is for GNU Diffutils (version 3.5, 4 August 2016), and
documents the GNU 'diff', 'diff3', 'sdiff', and 'cmp' commands for
showing the differences between files and the GNU 'patch' command for
using their output to update files.
@set UPDATED 4 August 2016
@set UPDATED-MONTH August 2016
-@set EDITION 3.4
-@set VERSION 3.4
+@set EDITION 3.5
+@set VERSION 3.5
@set UPDATED 4 August 2016
@set UPDATED-MONTH August 2016
-@set EDITION 3.4
-@set VERSION 3.4
+@set EDITION 3.5
+@set VERSION 3.5
fi
# We require $(...) support unconditionally.
+# We require non-surprising "local" semantics (this eliminates dash).
+# This takes the admittedly draconian step of eliminating dash, because the
+# assignment tab=$(printf '\t') works fine, yet preceding it with "local "
+# transforms it into an assignment that sets the variable to the empty string.
+# That is too counter-intuitive, and can lead to subtle run-time malfunction.
+# The example below is less subtle in that with dash, it evokes the run-time
+# exception "dash: 1: local: 1: bad variable name".
# We require a few additional shell features only when $EXEEXT is nonempty,
# in order to support automatic $EXEEXT emulation:
# - hyphen-containing alias names
gl_shell_test_script_='
test $(echo y) = y || exit 1
f_local_() { local v=1; }; f_local_ || exit 1
+f_dash_local_fail_() { local t=$(printf " 1"); }; f_dash_local_fail_
score_=10
if test "$VERBOSE" = yes; then
test -n "$( (exec 3>&1; set -x; P=1 true 2>&3) 2> /dev/null)" && score_=9
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4.
-.TH CMP "1" "August 2016" "diffutils 3.4" "User Commands"
+.TH CMP "1" "August 2016" "diffutils 3.5" "User Commands"
.SH NAME
cmp \- compare two files byte by byte
.SH SYNOPSIS
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4.
-.TH DIFF "1" "August 2016" "diffutils 3.4" "User Commands"
+.TH DIFF "1" "August 2016" "diffutils 3.5" "User Commands"
.SH NAME
diff \- compare files line by line
.SH SYNOPSIS
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4.
-.TH DIFF3 "1" "August 2016" "diffutils 3.4" "User Commands"
+.TH DIFF3 "1" "August 2016" "diffutils 3.5" "User Commands"
.SH NAME
diff3 \- compare three files line by line
.SH SYNOPSIS
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4.
-.TH SDIFF "1" "August 2016" "diffutils 3.4" "User Commands"
+.TH SDIFF "1" "August 2016" "diffutils 3.5" "User Commands"
.SH NAME
sdiff \- side-by-side merge of file differences
.SH SYNOPSIS
msgstr ""
"Project-Id-Version: diffutils 2.8.7\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2004-04-21 13:33+0200\n"
"Last-Translator: Ernest Adrogué Calveras <eadrogue@gmx.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr ""
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Els fitxers %s i %s difereixen\n"
msgid "Binary files %s and %s differ\n"
msgstr "Els fitxers %s i %s difereixen\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "No hi ha cap caràcter de salt de línia al final del fitxer"
msgid "David MacKenzie"
msgstr ""
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, fuzzy, c-format
msgid "Try '%s --help' for more information."
msgstr "Proveu «%s --help» per obtenir més informació."
msgid "options -l and -s are incompatible"
msgstr "les opcions -l i -s són incompatibles"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "error d'escriptura"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "sortida estàndard"
msgstr ""
"SALT1 i SALT2 són el nombre d'octets que es passen per alt de cada fitxer."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Si un FITXER és «-» o falta, llegeix l'entrada estàndard."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"L'estat de sortida és 0 si les entrades són iguals, 1 si són diferents\n"
msgid "invalid --bytes value '%s'"
msgstr "el valor «%s» per l'opció --bytes no és vàlid"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, fuzzy, c-format
msgid "missing operand after '%s'"
msgstr "falta un operand després de «%s»"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, fuzzy, c-format
msgid "extra operand '%s'"
msgstr "sobra l'operand «%s»"
msgid "pagination not supported on this host"
msgstr "aquest sistema no suporta paginació"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "massa opcions d'etiqueta de fitxer"
msgid "conflicting tabsize options"
msgstr "opcions de distància de tabulació incompatibles"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "heu especificat les opcions --from-file i --to-file al mateix temps"
-#: src/diff.c:883
+#: src/diff.c:890
#, fuzzy
msgid " --normal output a normal diff (the default)"
msgstr "--normal Genera un diff normal."
-#: src/diff.c:884
+#: src/diff.c:891
#, fuzzy
msgid "-q, --brief report only when files differ"
msgstr "-q --brief Indica només si els fitxers difereixen o no."
-#: src/diff.c:885
+#: src/diff.c:892
#, fuzzy
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s --report-identical-files Avisa quan dos fitxers són idèntics."
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
-#: src/diff.c:887
+#: src/diff.c:894
#, fuzzy
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-w NÚM --width=NÚM No més de NÚM (130 per omissió) caràcters per línia."
-#: src/diff.c:888
+#: src/diff.c:895
#, fuzzy
msgid "-e, --ed output an ed script"
msgstr "-e --ed Genera un script ed."
-#: src/diff.c:889
+#: src/diff.c:896
#, fuzzy
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs Genera un diff en format RCS."
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr ""
-#: src/diff.c:891
+#: src/diff.c:898
#, fuzzy
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-w NÚM --width=NÚM No més de NÚM (130 per omissió) caràcters per línia."
-#: src/diff.c:892
+#: src/diff.c:899
#, fuzzy
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
"-l --left-column Només escriu les línies en comú a la columna esquerra."
-#: src/diff.c:893
+#: src/diff.c:900
#, fuzzy
msgid " --suppress-common-lines do not output common lines"
msgstr "-s --suppress-common-lines No mostra les línies en comú."
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
"--from-file=FITXER1 Compara FITXER1 amb tots els operands. FITXER1 pot ser\n"
" un directori."
-#: src/diff.c:900
+#: src/diff.c:907
#, fuzzy
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t --expand-tabs Expandeix les tabulacions de la sortida a espais."
-#: src/diff.c:901
+#: src/diff.c:908
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab Alinea el text de cada línia amb un caràcter de tabulació."
-#: src/diff.c:902
+#: src/diff.c:909
#, fuzzy
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
"--tabsize=NÚM Estableix la distància de tabulació en NÚM (8 per omissió)\n"
" caràcters."
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
-#: src/diff.c:904
+#: src/diff.c:911
#, fuzzy
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr "-l --paginate Pagina la sortida amb el programa «pr»."
-#: src/diff.c:906
+#: src/diff.c:913
#, fuzzy
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r --recursive Compara recursivament qualsevol subdirectori existent."
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
-#: src/diff.c:908
+#: src/diff.c:915
#, fuzzy
msgid "-N, --new-file treat absent files as empty"
msgstr "-N --new-file Considera els fitxers inexistents com si fóssin buits."
-#: src/diff.c:909
+#: src/diff.c:916
#, fuzzy
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
"--unidirectional-new-file Tracta els fitxers primers inexistents com si\n"
" fóssin buits."
-#: src/diff.c:910
+#: src/diff.c:917
#, fuzzy
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
"en\n"
" els noms dels fitxers."
-#: src/diff.c:911
+#: src/diff.c:918
#, fuzzy
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
"--no-ignore-file-name-case Té en compte diferències entre majúscules i\n"
" minúscules en comparar noms de fitxers."
-#: src/diff.c:912
+#: src/diff.c:919
#, fuzzy
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x PAT --exclude=PAT Exclou fitxers que coincideixen amb PAT."
-#: src/diff.c:913
+#: src/diff.c:920
#, fuzzy
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
"-X FITXER --exclude-from=FITXER Exclou fitxers que coincideixen amb\n"
" qualsevol patró de FITXER."
-#: src/diff.c:914
+#: src/diff.c:921
#, fuzzy
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
"-S FITXER --starting-file=FITXER Comença per FITXER quan es comparen\n"
" directoris."
-#: src/diff.c:915
+#: src/diff.c:922
#, fuzzy
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
"--from-file=FITXER1 Compara FITXER1 amb tots els operands. FITXER1 pot ser\n"
" un directori."
-#: src/diff.c:917
+#: src/diff.c:924
#, fuzzy
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
"--to-file=FITXER1 Compara tots els operands amb FITXER2. FITXER2 pot ser\n"
" un directori."
-#: src/diff.c:920
+#: src/diff.c:927
#, fuzzy
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr "-i --ignore-case Ignora diferències entre majúscules i minúscules."
-#: src/diff.c:921
+#: src/diff.c:928
#, fuzzy
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E --ignore-tab-expansion Ignora canvis provocats per la distància de\n"
" tabulació."
-#: src/diff.c:922
+#: src/diff.c:929
#, fuzzy
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-w --ignore-all-space Ignora tot l'espai en blanc."
-#: src/diff.c:923
+#: src/diff.c:930
#, fuzzy
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b --ignore-space-change Ignora canvis en la quantitat d'espai en blanc."
-#: src/diff.c:924
+#: src/diff.c:931
#, fuzzy
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w --ignore-all-space Ignora tot l'espai en blanc."
-#: src/diff.c:925
+#: src/diff.c:932
#, fuzzy
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr "-B --ignore-blank-lines Ignora canvis en línies que estan en blanc."
-#: src/diff.c:926
+#: src/diff.c:933
#, fuzzy
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I ER --ignore-matching-lines=ER Ignora canvis en línies que continguin ER."
-#: src/diff.c:928
+#: src/diff.c:935
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text Tracta tots els fitxers com a text."
-#: src/diff.c:929
+#: src/diff.c:936
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
"--strip-trailing-cr Treu els caràcters finals de retorn de carro de "
"l'entrada."
-#: src/diff.c:931
+#: src/diff.c:938
#, fuzzy
msgid " --binary read and write data in binary mode"
msgstr "--binary Escriu i llegeix dades en mode binari."
-#: src/diff.c:934
+#: src/diff.c:941
#, fuzzy
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
" amb directives `#ifdef NOM'."
# `grups' o `grups de línies' (no queda prou clar)
-#: src/diff.c:935
+#: src/diff.c:942
#, fuzzy
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
"--TIPUSG-group-format=FMTG Similar, però formata els grups TIPUSG amb FMTG."
-#: src/diff.c:936
+#: src/diff.c:943
#, fuzzy
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr "--line-format=FMTL Similar, però formata totes les línies amb FMTL."
-#: src/diff.c:937
+#: src/diff.c:944
#, fuzzy
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
"--TIPUSL-line-format=FMTL Similar, però formata les línies TIPUSL amb FMTL."
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
#, fuzzy
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
"«unchanged» (inalterades).\n"
" TIPUSG pot ser qualsevol TIPUSL o bé «changed» (alterades)."
-#: src/diff.c:941
+#: src/diff.c:948
#, fuzzy
msgid ""
" GFMT (only) may contain:\n"
" E F-1\n"
" M L+1"
-#: src/diff.c:953
+#: src/diff.c:960
#, fuzzy
msgid ""
" LFMT (only) may contain:\n"
" %[-][AMPLADA][.[PRECISIÓ]]{doxX}n espec. estil printf pel nombre de "
"línia"
-#: src/diff.c:957
+#: src/diff.c:964
#, fuzzy
msgid ""
" Both GFMT and LFMT may contain:\n"
" %c'C' el caràcter C\n"
" %c'\\OOO' el caràcter de codi octal OOO"
-#: src/diff.c:963
+#: src/diff.c:970
#, fuzzy
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d --minimal Intenta trobar canvis mínims."
-#: src/diff.c:964
+#: src/diff.c:971
#, fuzzy
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr "--horizon-lines=NÚM No descarta NÚM línies amb prefix i sufix comú."
-#: src/diff.c:965
+#: src/diff.c:972
#, fuzzy
msgid ""
" --speed-large-files assume large files and many scattered small changes"
"-H --speed-large-files Assumeix fitxers grans i molts canvis petits "
"dispersos."
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr "--normal Genera un diff normal."
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr ""
-#: src/diff.c:972
+#: src/diff.c:979
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "-v --version Mostra la versió del programa."
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FITXERS és «FITXER1 FITXER2» o «DIR1 DIR2» o «DIR FITXER...» o «FITXER... "
"DIR»."
-#: src/diff.c:975
+#: src/diff.c:982
#, fuzzy
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Amb les opcions --from-file o --to-file no hi ha restriccions de FITXERS."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
#, fuzzy
msgid "If a FILE is '-', read standard input."
msgstr "Si FITXER és «-», llegeix l'entrada estàndard."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Mode d'ús: %s [OPCIÓ]... FITXERS\n"
-#: src/diff.c:987
+#: src/diff.c:994
#, fuzzy
msgid "Compare FILES line by line."
msgstr "Compara fitxers línia per línia."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, fuzzy, c-format
msgid "conflicting %s option value '%s'"
msgstr "el valor «%s» per l'opció %s és conflictiu"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "opcions d'estil de sortida conflictives"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "l'amplada «%s» no és vàlida"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Només a %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
#, fuzzy
msgid "cannot compare '-' to a directory"
msgstr "no es pot comparar «-» amb un directori"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "l'opció -D no funciona amb directoris"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Subdirectoris comuns: %s i %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "El fitxer %s és un %s mentre que el fitxer %s és un %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, fuzzy, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Els fitxers %s i %s difereixen\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Els fitxers %s i %s són idèntics\n"
msgid "Randy Smith"
msgstr ""
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "opcions incompatibles"
-#: src/diff3.c:353
+#: src/diff3.c:388
#, fuzzy
msgid "'-' specified for more than one input file"
msgstr "heu especificat «-» per més d'un fitxer d'entrada"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "lectura fallida"
-#: src/diff3.c:428
+#: src/diff3.c:473
#, fuzzy
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A --show-all Mostra tots els canvis, senyalant els conflictes amb "
"separadors."
-#: src/diff3.c:430
+#: src/diff3.c:475
#, fuzzy
msgid ""
"-e, --ed output ed script incorporating changes\n"
msgstr ""
"-e --ed Mostra els canvis no comuns de FITXER-VELL a FITXER2 en FITXER1."
-#: src/diff3.c:432
+#: src/diff3.c:477
#, fuzzy
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"amb\n"
" separadors."
-#: src/diff3.c:433
+#: src/diff3.c:478
#, fuzzy
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr "-3 --easy-only Mostra els canvis no comuns i no solapats."
-#: src/diff3.c:434
+#: src/diff3.c:479
#, fuzzy
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x --overlap-only Mostra els canvis solapats."
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
-#: src/diff3.c:436
+#: src/diff3.c:481
#, fuzzy
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i Afegeix les instruccions «w» i «q» a l'script ed."
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text Tracta tots els fitxers com a text."
-#: src/diff3.c:442
+#: src/diff3.c:487
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
"--strip-trailing-cr Treu els caràcters finals de retorn de carro de "
"l'entrada."
-#: src/diff3.c:443
+#: src/diff3.c:488
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab Alinea el text de cada línia amb un caràcter de tabulació."
-#: src/diff3.c:444
+#: src/diff3.c:489
#, fuzzy
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr "--diff-program=PROGRAMA Usa PROGRAMA per comparar fitxers."
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr ""
-#: src/diff3.c:449
+#: src/diff3.c:494
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "-v --version Mostra la versió del programa."
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Mode d'ús: %s [OPCIÓ]... FITXER1 FITXER-VELL FITXER2\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Compara tres fitxers línia per línia."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"L'estat de sortida és 0 si s'acaba amb èxit, 1 si hi ha conflictes\n"
"i 2 en cas d'error."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "error intern: format dels blocs diff desmanegat"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff ha fallat: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "error intern: tipus de diff invàlid en process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "el format diff no és vàlid: el separador de canvis no és vàlid"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "el format diff no és vàlid: l'última línia està incompleta"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, fuzzy, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "no s'ha pogut invocar el programa subsidiari «%s»"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "el format diff no és vàlid: caràcters invàlids al principi de línia"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "error intern: tipus de diff no vàlid passat a la sortida"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "el fitxer d'entrada s'ha encongit"
"v:\tInclou les línies comunes i informa amb loquacitat\n"
"q:\tSurt.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: opció no reconeguda «--%s»\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2014-04-16 06:33+0200\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
msgstr ""
"Obecná pomoc při používání softwaru GNU:: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Soubory %s a %s jsou různé\n"
msgid "Binary files %s and %s differ\n"
msgstr "Binární soubory %s a %s jsou rozdílné\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Chybí znak konce řádku na konci souboru"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Více informací získáte příkazem „%s --help“."
msgid "options -l and -s are incompatible"
msgstr "přepínače -l a -s nejsou kompatibilní"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "zápis selhal"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "standardní výstup"
"Volitelné argumenty N1 a N2 udávají počet bajtů, které budou přeskočeny\n"
"na začátku každého souboru (výchozí je nula)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Pokud SOUBOR je „-“ nebo nebo chybí, bude čten standardní vstup."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Návratový kód je roven 0 pokud jsou vstupy shodné, 1 pokud se liší a 2 při "
msgid "invalid --bytes value '%s'"
msgstr "neplatná hodnota přepínače --bytes „%s“"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "po „%s“ chybí operand"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "operand „%s“ je nadbytečný"
msgid "pagination not supported on this host"
msgstr "přestránkování není na tomto počítači podporováno"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "příliš mnoho přepínačů popisu souboru"
msgid "conflicting tabsize options"
msgstr "konfliktní přepínače tabsize"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "parametry --from-file i to-file použity najednou"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal normálním formát výstupu diff (výchozí)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q --brief výstup pouze při rozdílných souborech"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s --report-identical-files hlásí shodné soubory"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
" vypíše POČET (výchozí je 3) řádků\n"
" kopírovaného kontextu"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
" vypíše POČET (výchozí je 3) řádků\n"
" unifikovaného kontextu"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e --ed vypíše skript pro ed"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs vypíše rozdíl ve formátu RCS"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side vypíše ve dvou sloupcích"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=POČET vypíše nejvýše POČET (výchozí je 130)\n"
" tiskových sloupců"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column vypíše pouze levý sloupec společných řádků"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines nevypisuje shodné řádky"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function ukáže, ve které funkci C se změna nachází"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr "-F, --show-function-line=RV ukáže poslední řádek odpovídající RV"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label NÁZEV použije NÁZEV místo názvu souboru\n"
" (lze opakovat)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t, --expand-tabs ve výstupu převede tabulátory na mezery"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T, --initial-tab na začátek řádků se vloží tabulátor"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=POČET tabulátor zastavuje každých POČET\n"
" (výchozí je 8) tiskových sloupců"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty potlačí mezeru nebo tabulátor před prázdnými\n"
" řádky výstupu"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate výstup projde přes „pr“ pro přestránkování"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r --recursive rekurzivně porovná všechny nalezené "
"podadresáře"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference nenásleduje symbolické odkazy"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr ""
"-N, --new-file neexistující soubory považuje za prázdné"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file neexistující soubory z prvního adresáře\n"
" považuje za prázdné"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case ignoruje velikost písmen v názvech souborů"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case bere v potaz velikost písmen v názvech "
"souborů"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=VZOR vynechá soubory odpovídající VZORU"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=SOUBOR vynechá soubory, které odpovídají\n"
" libovolnému vzoru ze SOUBORU"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=SOUBOR při porovnávání adresářů začne SOUBOREM"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=SOUBOR1 porovná SOUBOR1 se všemi operandy,\n"
" SOUBOR1 může být adresář"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=SOUBOR2 porovná všechny operandy se SOUBOREM2,\n"
" SOUBOR2 může být adresář"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case ignoruje velikost písmen v obsahu souborů"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr "-E, --ignore-tab-expansion ignoruje změny v odsazení tabulátorem"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space ignoruje bílá místa na konci řádku"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b, --ignore-space-change ignoruje změny v počtu bílých míst"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space ignoruje všechna bílá místa"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines ignoruje změny v případě prázdných řádků"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RV ignoruje změny na všech řádcích\n"
" odpovídajících RV"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text pokládá všechny soubory za text"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr odstraní ukončovací znak CR na vstupu"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr ""
" --binary data čte a zapisuje data v binárním režimu"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NÁZEV vypíše sloučený soubor s rozdíly „#ifdef "
"NÁZEV“"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
" --GTYPE-group-format=GFMT formátuje vstupní skupiny GTYPE podle FMTS"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
" --line-format=LFMT formátuje všechny vstupní řádky podle LFMT"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
" --LTYPE-line-format=LFMT formátuje vstupní řádky LTYPE podle LFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Tyto formátovací přepínače poskytují jemnou kontrolu nad výstupem diffu\n"
" a zobecňují -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE je „old“ (starý), „new“ (nový) nebo „unchanged“ (nezměněn). GTYPE\n"
" je LTYPE nebo „changed“ (změněn)."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) pokud A se rovná B, tak T, jinak E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
"vstupního\n"
" řádku"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\000' znak s osmičkovým kódem 000\n"
" C znak C (ostatní znaky zastupují samy sebe)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d, --minimal pokusí se nalézt nejmenší sadu změn"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=POČET\n"
" ponechá POČET shodných řádků předpony a přípony"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files předpokládá velké soubory a mnoho rozptýlených\n"
" drobných změn"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal normálním formát výstupu diff (výchozí)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help zobrazí tuto nápovědu a skončí"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version vypíše údaje o verzi a skončí"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"SOUBORY jsou „SOUBOR1 SOUBOR2“ nebo „ADRESÁŘ1 ADRESÁŘ2' nebo\n"
"„ADRESÁŘ SOUBOR…“ nebo „SOUBOR… ADRESÁŘ“."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Pokud je uveden --from-file nebo --to-file, pak nejsou u SOUBORŮ žádná "
"omezení."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Pokud SOUBOR bude „-“, bude čten standardní vstup."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Použití: %s [PŘEPÍNAČ]… SOUBORY\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Porovnává SOUBORY řádek po řádku."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "konfliktní hodnota „%2$s“ přepínače „%1$s“"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "konfliktní přepínače pro styl výstupu"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "nesprávná délka „%s“"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Pouze v %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "„-“ s adresářem nelze porovnat"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "-D přepínač nepodporuje práci s adresáři"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Společné podadresáře: %s a %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Soubor %s je %s zatímco soubor %s je %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Symbolické odkazy %s a %s se liší\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Soubory %s a %s jsou identické\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "nekompatibilní přepínače"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "„-“ zadáno pro více než jeden vstupní soubor"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "čtení selhalo"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all vypíše všechny rozdíly, konflikty v závorkách"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e, --ed vypíše ed skript zahrnující změny mezi\n"
" STARÝM_SOUBOREM a VAŠÍM_SOUBOREM do MÉHO_SOUBORU"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr "-E, --show-overlap jako -e, ale konflikty umístí do závorek"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr ""
"-3, --easy-only jako -e, ale zahrne jen nepřekrývající se změny"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only jako -e, ale zahrne jen překrývající se změny"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X jako -x, ale konflikty umístí do závorek"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i přidá příkazy „w“ a „q“ do skriptů pro ed"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"li\n"
" uvedeny další přepínače"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text pokládá všechny soubory za text"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr odstraní ukončovací znak CR na vstupu"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T, --initial-tab na začátek řádků se vloží tabulátor"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr " --diff-program=PROGRAM použije PROGRAM k porovnání souborů"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=NÁZEV použije NÁZEV namísto názvu souboru\n"
" (lze opakovat až třikrát)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help zobrazí tuto nápovědu a skončí"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version vypíše údaje o verzi a skončí"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Použití: %s [PŘEPÍNAČ]… MŮJ_SOUBOR STARÝ_SOUBOR VÁŠ_SOUBOR\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Porovnání tří souborů řádek po řádku."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"vlastní spojený soubor. V případě neobvyklého vstupu, je toto spolehlivější\n"
"způsob než použití programu ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr "Návratová hodnota je 0 při úspěchu, 1 při konfliktu a 2 při chybě."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "vnitřní chyba: chyba ve formátu diff bloků"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff selhal: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "vnitřní chyba: nesprávný typ diffu v process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "neplatný formát diff souboru; neplatný oddělovač změny"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "neplatný formát diff souboru; nekompletní poslední řádek"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "pomocný program „%s“ nebylo možné zavolat"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "neplatný formát diff souboru; nesprávné úvodní znaky na řádku"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "vnitřní chyba: nesprávný typ diffu pro výstup"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "vstupní soubor se zmenšil"
"v:\tUpozorní na vložení společných řádků.\n"
"q:\tUkončení.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: neznámý přepínač „--%s“\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils-3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2012-11-03 14:34+0100\n"
"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr "Generel hjælp til GNU-programmer: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Filerne %s og %s er forskellige\n"
msgid "Binary files %s and %s differ\n"
msgstr "Binære filer %s og %s er forskellige\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Intet linjeskift ved filafslutning"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Prøv '%s --help' for mere information."
msgid "options -l and -s are incompatible"
msgstr "tilvalgene -l og -s er inkompatible"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "skrivning mislykkedes"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "standard-ud"
"De valgfri SPRING1 og SPRING2 angiver antallet af byte, der skal springes\n"
"over ved begyndelsen af hver fil (normalt 0)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Såfremt en FIL er '-' eller mangler, læses fra standard-ind."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Slutstatus er 0 hvis inddata er ens, 1 hvis ikke, og 2 hvis der er problemer."
msgid "invalid --bytes value '%s'"
msgstr "ugyldig værdi '%s' for --bytes"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "manglende operand efter '%s'"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "ekstra operand '%s'"
msgid "pagination not supported on this host"
msgstr "paginering understøttes ikke af denne vært"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "for mange fil-mærke tilvalg"
msgid "conflicting tabsize options"
msgstr "modstridende angivelser af tabulatorbredde"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "både --from-file og --to-file er angivet"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal udskriv en almindelig diff (forvalg)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief angiv kun når filerne er forskellige"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files rapportér hvis to filer er ens"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"kopieret\n"
" kontekst"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U ANTAL, --unified[=ANTAL] Udskriv højst ANTAL (normalt 3) linjer\n"
" forenet kontekst"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed udskriv et ed-script"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs udskriv en diff i RCS-format"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side udskriv i to kolonner"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=ANTAL udskriv højst ANTAL (normalt 130) kolonner"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column udskriv kun venstre kolonne i fælles linjer"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines udskriv ikke fælles linjer"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr "-p, --show-c-function vis hvilken C-funktion hver ændring er i"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr "-F, --show-function-line=RE vis den seneste linje der matcher RE"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label MÆRKAT brug MÆRKAT frem for filnavn\n"
" (kan gentages)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t, --expand-tabs lav tabulatorer om til mellemrum i udskrift"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab få tabulatorer på linje ved at forudstille en\n"
" tabulator"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=ANTAL tabulatorstop for hver ANTAL (normalt 8) "
"kolonner"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty intet mellemrum eller tabulator før tomme\n"
" ud-linjer"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate led uddata gennem 'pr' for at sideinddele det"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive sammenlign alle fundne underkataloger "
"rekursivt"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference følg ikke symbolske lænker"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr ""
"-N, --new-file behandl manglende filer som var de tomme"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file behandl manglende førstefiler som var de "
"tomme"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case ingen forskel på store og små bogstaver ved\n"
" sammenligning af filnavne"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case skeln mellem store og små bogstaver ved\n"
" sammenligning af filnavne"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=MØNSTER udelad filer, det matcher MØNSTER"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=FIL udelad filer, der matcher ethvert mønster i "
"FIL"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=FIL start med FIL, når der sammenlignes kataloger"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=FIL1 sammenlign FIL1 med alle operander; FIL1 må\n"
" godt være et katalog"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
"må\n"
" godt være et katalog"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr "-i, --ignore-case ignorér versalforskelle i filindhold"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion ignorér ændringer der skyldes\n"
" tabulatoromsætning"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr ""
"-Z, --ignore-trailing-space ignorér blanke tegn ved linjens afslutning"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b, --ignore-space-change ignorér ændringer i mængden af blanke tegn"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space ignorér alle blanke tegn"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr "-B, --ignore-blank-lines ignorér ændringer med kun tomme linjer"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=MØNSTER ignorér ændringer, hvis linjer alle\n"
" matcher MØNSTER"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text behandl alle filer som tekst"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr fjern afsluttende vognretur i inddata"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary læs og skriv data binært"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NAVN udskriv flettet fil med '#ifdef NAVN'-differ"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr " --GTYPE-group-format=GFMT formatér GTYPE-inputgrupper med GFMT"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr " --line-format=LFMT formatér alle inputlinjer med LFMT"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr " --LTYPE-line-format=LFMT formatér LTYPE-inputlinjer med LFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Disse formattilvalg giver finkontrol over udskriften af diff, og\n"
" generaliserer -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE er 'old' (gammel), 'new' (ny) eller 'unchanged' (uændret).\n"
# hvad er PREC? Det står ingen steder i filen. PRÆC blev brugt i tidligere
# oversættelse, så beholder. -Ask
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) hvis A lig med B så T, ellers E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %l indhold af linje, undtagen eventuelt følgende linjeskift\n"
" %[-][BREDDE][.[PRÆC]]{doxX}n printf-angivelse for inputlinjenummer"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' tegnet med oktalkode OOO\n"
" C tegnet C (andre tegn repræsenterer sig selv)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
"-d, --minimal grundigt forsøg på at finde et mindre antal "
"ændringer"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=ANTAL behold ANTAL linjer af fælles præfiks og suffiks"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files antag store filer og mange spredte, små ændringer"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal udskriv en almindelig diff (forvalg)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help vis denne hjælpetekst og afslut"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version vis versionsoplysninger og afslut"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FILER er 'FIL1 FIL2' eller 'KATALOG1 KATALOG2' eller 'KATALOG FIL...' eller "
"'FIL... KATALOG'."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Hvis --from-file eller --to-file er givet, er der ingen restriktioner på "
"FILer."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Såfremt en FIL er '-', læses fra standard-ind."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Brug: %s [TILVALG]... FILER\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Sammenlign filer linjevis."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "modstridende værdi for %s-tilvalget: '%s'"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "modstridende valg af uddata-stil"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "ugyldig bredde '%s'"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Kun i %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "kan ikke sammenligne '-' med et katalog"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "-D tilvalg understøttes ikke for kataloger"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Identiske underkataloger: %s og %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Filen %s er en %s mens filen %s er en %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "De symbolske lænker %s og %s er forskellige\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Filerne %s og %s er identiske\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "inkompatible tilvalg"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "'-' angivet for mere end én ind-fil"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "læsning mislykkedes"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all udskriv alle ændringer, med konflikter i "
"parenteser"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e, --ed udskriv et ed-script som udfører ændringerne\n"
" fra GAMMELFIL til DINFIL ind i MINFIL"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr "-E, --show-overlap som -e, men sæt konflikter i parentes"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only som -e, men inkludér kun ikke-overlappende "
"ændringer"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only som -e, men inkludér kun overlappende ændringer"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X som -x, men sæt konflikter i parenteser"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i tilføj 'w' og 'q'-kommandoer til ed-script"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge udskriv faktisk flettet fil ifølge -A\n"
" hvis ingen andre tilvalg er givet"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text behandl alle filer som tekst"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr fjern afsluttende vognretur i inddata"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab få tabulatorer på linje ved at forudstille\n"
" en tabulator"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr " --diff-program=PROGRAM brug PROGRAM til at sammenligne filerne"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=MÆRKAT brug MÆRKAT frem for filnavn\n"
" (kan gentages op til tre gange)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help vis denne hjælpetekst og afslut"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version vis versionsoplysninger og afslut"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Brug: %s [TILVALG]... MINFIL GAMMELFIL DINFIL\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Sammenlign tre filer linje for linje."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"end\n"
"med ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Slutstatus er 0 hvis succes, 1 hvis der er konflikter, 2 hvis der er "
"problemer."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "intern fejl: rod i formatet på diff blokke"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff fejlede: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "intern fejl: ugyldig diff type i process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "ugyldigt diff format; ugyldig ændrings-separator"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "ugyldigt diff format; uafsluttet sidste linje"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "hjælpeprogrammet '%s' kunne ikke køres"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "ugyldigt diff format; forkerte linje-begyndelses-tegn"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "intern fejl: ugyldig diff type sendt til uddata"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "ind-fil formindskedes"
"v:\tMedtag og vis fælles linjer.\n"
"q:\tAfslut.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: ukendt tilvalg '--%s'\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: GNU diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2014-04-20 20:43+0100\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
"Allgemeine Hilfe zur Benutzung von GNU-Software: <http://www.gnu.org/gethelp/"
">\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Dateien %s und %s sind verschieden.\n"
msgid "Binary files %s and %s differ\n"
msgstr "Binärdateien %s und %s sind verschieden.\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Kein Zeilenumbruch am Dateiende."
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "»%s --help« gibt Ihnen mehr Informationen."
msgid "options -l and -s are incompatible"
msgstr "Die Optionen -l und -s sind inkompatibel."
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "Schreibfehler."
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "Standardausgabe"
"Die optionalen Argumente SKIP1 und SKIP2 geben die Zahl der Bytes an,\n"
"die in jeder Datei übersprungen werden (standardmäßig null)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Wenn DATEI »-« ist oder fehlt, von der Standardeingabe lesen."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Der Rückgabewert des Programms ist 0, falls die Eingaben identisch\n"
msgid "invalid --bytes value '%s'"
msgstr "ungültiger --bytes-Wert »%s«"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "fehlender Operand nach »%s«"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "extra Operand »%s«."
msgid "pagination not supported on this host"
msgstr "Seitenumbruch wird auf diesem System nicht unterstützt."
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "Zu viele Datei-Label-Optionen wurden angegeben."
msgid "conflicting tabsize options"
msgstr "widersprüchliche Tabulatorbreitenoptionen."
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "--from-file und --to-file sind beide angegeben."
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal Ein normales Diff ausgeben (Standard)."
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr ""
"-q, --brief Nur ausgeben, ob die Dateien verschieden sind."
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files Meldung, wenn zwei Dateien gleich sind."
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C ZAHL, --context[=ZAHL] ZAHL Zeilen des kopierten Kontexts ausgeben "
"(Vorgabe: 3)."
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U ZAHL, --unified[=ZAHL] ZAHL Zeilen des Unified-Kontexts ausgeben "
"(Vorgabe: 3)."
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed Ein ed-Skript ausgeben."
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs Im RCS-Format ausgeben."
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side In zwei Spalten ausgeben."
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=ZAHL Maximal ZAHL Druckspalten pro Zeile ausgeben\n"
" (Vorgabe: 130)."
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column Nur linke Spalte der gemeinsamen Zeilen "
"ausgeben."
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines Keine gemeinsamen Zeilen ausgeben."
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function Für jede Änderung zeigen, in welcher C-"
"Funktion sie ist"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=RE Die neueste Zeile zeigen, die dem Muster RE "
"entspricht"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label LABEL LABEL statt des Dateinamens benutzen\n"
" (kann wiederholt werden)."
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t, -expand-tabs Tabulatoren in der Ausgabe zu Leerzeichen "
"ausdehnen."
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab Einrückungen durch vorangestellte Tabulatoren "
"erzeugen."
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=ZAHL Tabulatorstopps sind alle ZAHL Spalten "
"(Vorgabe: 8)."
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty Leerzeichen oder Tabulator vor leeren\n"
" Ausgabezeilen verhindern."
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate Ausgabe an »pr« zum Seitenumbruch übergeben."
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive Rekursiv alle Unterverzeichnisse vergleichen."
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
" --no-derefence Symbolischen Verknüpfungen nicht folgen."
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file Fehlende Dateien als leer betrachten."
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file Die ersten fehlenden Dateien als leer "
"betrachten."
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case Unterschiede der Groß/Kleinschreibung von "
"Dateinamen\n"
" ignorieren."
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case Unterschiede der Groß/Kleinschreibung von \n"
" Dateinamen beachten."
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x, --exclude=MUSTER Dateien ausschließen, die auf MUSTER passen."
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=DATEI Dateien überspringen, die auf eines der\n"
" Muster in DATEI passen."
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=DATEI Beim Verzeichnisvergleich mit DATEI beginnen."
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=DATEI1 DATEI1 mit allen Operanden vergleichen.\n"
" DATEI1 kann ein Verzeichnis sein."
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=DATEI2 Alle Operanden mit DATEI2 vergleichen.\n"
" DATEI2 kann ein Verzeichnis sein."
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case Unterschiede der Groß/Kleinschreibung\n"
" im Dateiinhalt ignorieren."
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion Änderungen aufgrund von Tabausdehnungen "
"ignorieren."
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space Freiraum am Zeilenende ignorieren."
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b, --ignore-space-change Änderungen im Leerraum ignorieren."
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space Freiraum ignorieren."
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines Die Änderungen übergehen, wo alle Zeilen "
"leer sind."
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE Änderungen ignorieren, bei denen alle "
"Zeilen\n"
" auf das Muster RE passen."
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text Alle Dateien als Text behandeln."
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr Wagenrücklauf (CR) am Zeilenende\n"
" beim Einlesen entfernen."
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr ""
" --binary Daten im Binärmodus lesen und schreiben."
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NAME Zusammengefügte Datei mit »#ifdef NAME« in\n"
" die Ausgabe mischen."
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr " --GTYPE-group-format=GFMT GTYPE-Eingabe mit GFMT formatieren."
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
" --line-format=LFMT Alle Eingabe-Zeilen mit LFMT formatieren."
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr " --LTYPE-line-format=LFMT LTYPE-Eingabe mit LFMT formatieren."
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Diese Formatoptionen stellen haargenaue Kontrolle über die Eingabe\n"
" von diff bereit, indem -D/--ifdef verallgemeinert wird."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE kann »old«, »new« oder »unchanged« sein. GTYPE ist LTYPE oder "
"»changed«."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1.\n"
" %(A=B?T:E) Falls A gleich B, dann T, sonst E."
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %l Inhalt der Zeile, ohne Zeilenumbruch am Ende.\n"
" %[-][BREITE][.[PRÄZ]]{doxX}n Zeilennummer im printf-Stil."
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' das Zeichen mit dem Oktalcode OOO\n"
" C Das Zeichen C (andere Zeichen stellen sich selbst dar)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
"-d, --minimal Aufwendig nach einem kleineren Satz von Änderungen "
"suchen."
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=ZAHL ZAHL Zeilen mit gemeinsamem Prä- und Suffix "
"behalten."
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
"kleine\n"
" Änderungen vermutet."
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal Ein normales Diff ausgeben (Standard)."
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help Diese Hilfe anzeigen und beenden."
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, -version Versionsinformation ausgeben und beenden."
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"DATEIEN sind »DATEI1 DATEI2« oder »VERZ1 VERZ2« oder »VERZ DATEI...«\n"
"oder »DATEI... VERZ«."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Wenn --from-file oder --to-file angegeben werden, gibt es keine\n"
"Einschränkungen für DATEI(EN)."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Wenn DATEI »-« ist, von der Standardeingabe lesen."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Aufruf: %s [OPTION]... DATEIEN\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "DATEIEN Zeile für Zeile vergleichen."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "Widersprüchlicher %s-Optionswert »%s«."
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "Widersprüchliche Optionen für den Ausgabestil."
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "ungültige Breite »%s«."
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Nur in %s: %s.\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "»-« kann nicht mit Verzeichnis verglichen werden."
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "Option -D nicht unterstützt bei Verzeichnissen"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Gemeinsame Unterverzeichnisse: %s und %s.\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Datei %s ist ein %s, während Datei %s ein %s ist.\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Symbolische Verknüpfungen %s und %s sind verschieden.\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Dateien %s und %s sind identisch.\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "Inkompatible Optionen."
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "»-« für mehr als eine Eingabedatei angegeben."
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "Lesefehler."
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all Alle Änderungen ausgeben, Konflikte in Klammern."
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
" von DEINEDATEI und ALTEDATEI in MEINEDATEI\n"
" integriert."
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr "-E --show-overlap Wie -e, aber Konflikte in Klammern."
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only Wie -e, aber nur nichtüberlappende Änderungen "
"integrieren."
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only Wie -e, aber nur überlappende Änderungen "
"integrieren."
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X Wie -x, aber Konflikte in Klammern."
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i An ed-Skripte »w«- und »q«-Befehle anhängen."
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge Zusammengefügte Datei ausgeben, wie -A,\n"
" falls keine anderen Optionen übergeben wurden."
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text Alle Dateien als Text behandeln."
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr Wagenrücklauf (CR) am Zeilenende beim Einlesen "
"entfernen."
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab Einrückungen durch vorangestellte Tabulatoren "
"erzeugen."
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
" --diff-program=PROGRAMM PROGRAMM zum Vergleichen von Dateien verwenden."
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=LABEL LABEL statt des Dateinamens benutzen\n"
" (kann bis zu dreimal wiederholt werden)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help Diese Hilfe anzeigen und beenden."
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version Versionsinformation ausgeben und beenden."
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Aufruf: %s [OPTION]... MEINEDATEI ALTEDATEI DEINEDATEI\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Drei Dateien Zeile für Zeile vergleichen."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"intern zusammenführt und die eigentliche, zusammengeführte Datei ausgegeben\n"
"wird. Für ungewöhnliche Eingaben ist dies robuster, als ed zu benutzen.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Der Rückgabewert des Programms ist 0, falls es erfolgreich ist, 1 falls\n"
"es Konflikte gibt und 2 falls Probleme auftreten."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "Interner Fehler: Format für diff-Blöcke ist durcheinander."
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: »diff« ist gescheitert: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "Interner Fehler: Ungültiger diff-Typ in process_diff."
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "Ungültiges Diff-Format; ungültiger Änderungstrenner."
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "Ungültiges Diff-Format; fehlende letzte Zeile."
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "Unterprogramm »%s« konnte nicht aufgerufen werden."
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "Ungültiges Diff-Format; inkorrektes Zeichen in führender Zeile"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "Interner Fehler: Ungültiger diff-Typ an Ausgabe übergeben."
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "Eingabedatei schrumpfte."
"v:\tAusführlich gemeinsame Zeilen übernehmen.\n"
"q:\tBeenden.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: Unbekannte Option »--%s«.\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: GNU diffutils 3.4\n"
+"Project-Id-Version: GNU diffutils 3.5\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr ""
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr ""
msgid "Binary files %s and %s differ\n"
msgstr ""
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr ""
msgid "David MacKenzie"
msgstr ""
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr ""
msgid "options -l and -s are incompatible"
msgstr ""
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr ""
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr ""
"at the beginning of each file (zero by default)."
msgstr ""
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr ""
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
msgid "invalid --bytes value '%s'"
msgstr ""
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr ""
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr ""
msgid "pagination not supported on this host"
msgstr ""
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr ""
msgid "conflicting tabsize options"
msgstr ""
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr ""
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr ""
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr ""
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr ""
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr ""
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr ""
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr ""
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr ""
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
-#: src/diff.c:897
+#: src/diff.c:904
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" (can be repeated)"
msgstr ""
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr ""
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
msgstr ""
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
msgstr ""
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr ""
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr ""
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr ""
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr ""
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" %(A=B?T:E) if A equals B then T else E"
msgstr ""
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number"
msgstr ""
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" C the character C (other characters represent themselves)"
msgstr ""
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
msgid " or 'auto' (the default)"
msgstr ""
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr ""
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr ""
-#: src/diff.c:974
+#: src/diff.c:981
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr ""
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr ""
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr ""
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr ""
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr ""
-#: src/diff.c:1050
+#: src/diff.c:1057
#, c-format
msgid "invalid color '%s'"
msgstr ""
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr ""
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr ""
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr ""
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr ""
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr ""
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr ""
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr ""
msgid "Randy Smith"
msgstr ""
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr ""
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr ""
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr ""
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
msgstr ""
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr ""
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr ""
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr ""
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr ""
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr ""
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr ""
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr ""
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr ""
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr ""
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr ""
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr ""
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr ""
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr ""
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr ""
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr ""
"q:\tQuit.\n"
msgstr ""
-#: src/util.c:665
+#: src/util.c:663
#, c-format
msgid "unrecognized prefix: %s"
msgstr ""
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils-3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2014-11-28 23:51+0200\n"
"Last-Translator: Lefteris Dimitroulakis <ledimitro@gmail.com>\n"
"Language-Team: Greek <team@lists.gnome.gr>\n"
msgstr ""
"Γενική βοήθεια στη χρήση λογισμικού GNU: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Τα αρχεία %s και %s διαφέρουν\n"
msgid "Binary files %s and %s differ\n"
msgstr "Τα δυαδικά αρχεία %s και %s διαφέρουν\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Δεν υπάρχει χαρακτήρας νέας γραμμής στο τέλος του αρχείου"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Δοκιμάστε «%s --help» για περισσότερες πληροφορίες."
msgid "options -l and -s are incompatible"
msgstr "οι επιλογές -l και -s είναι ασύμβατες"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "η εγγραφή απέτυχε"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "κανονική έξοδος"
"προς παράβλεψη\n"
"στην αρχή κάθε αρχείου (η προεπιλογή είναι μηδέν)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Αν ένα ΑΡΧΕΙΟ είναι «-» ή απών, τότε ανάγνωση από την κανονική είσοδο."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Η έξοδος είναι 0 αν τα δεδομένα αρχεία είναι ίδια, 1 αν είναι διαφορετικά,\n"
msgid "invalid --bytes value '%s'"
msgstr "άκυρη τιμή «%s» για την επιλογή --bytes "
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "απών τελεστέος μετά από «%s»"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "συμπληρωματικός τελεστέος «%s»"
msgid "pagination not supported on this host"
msgstr "Η αρίθμιση σελίδων δεν υποστηρίζεται σ' αυτόν τον υπολογιστή"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "πάρα πολλές επιλογές ετικέττας αρχείου"
msgid "conflicting tabsize options"
msgstr "αντικρουόμενες επιλογές μήκους στηλοθέτησης"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "--from-file και --to-file έχουν οριστεί μαζί"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal Δημιουργία ενός κανονικού `diff' (προεπιλογή)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q --brief αποτέλεσμα στην έξοδο μόνο αν τ' αρχεία διαφέρουν"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files Ειδοποιεί όταν δύο αρχεία είναι ίδια"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C NUM, --context[=NUM] έξοδος NUM (προεπιλογή 3) γραμμές of copied "
"context"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed εμφανίζει ένα ed script"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs Δημιουργία αρχείου «diff» σε μορφή RCS."
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side έξοδος σε δυο στήλες"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=NUM output at most NUM (default 130) print columns"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
"--left-column Εμφάνιση μόνο της αριστερής στήλης των ταυτόσημων γραμμών."
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr "-s --suppress-common-lines Οι ταυτόσημες γραμμές δεν εμφανίζονται."
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function εμφάνιση σε ποιά συνάρτηση C βρίσκεται κάθε αλλαγή"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=RE εμφάνιση του πιο πρόσφατου ταιριάσματος "
"γραμμής RE"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
"-L, --label=LABEL χρήση LABEL αντί ονόματος αρχείου\n"
" (μπορεί να επαναληφθεί)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t, --expand-tabs Μετατροπή στηλοθετών σε διαστήματα στην έξοδο."
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab Στοίχιση των στηλοθετών με την επιπρόσθεση ενός στην "
"αρχή."
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=ΑΡ Ο αριθμός διαστημάτων του στηλοθέτη είναι ΑΡ (προεπιλογή 8)"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty απάλειψη διαστήματος ή στ/θέτη πριν από κενές "
"γραμμές στην έξοδο"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
" -l, --paginate Έξοδος δια μέσου του «pr» ώστε να αριθμιθούν οι σελίδες"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr "-r, --recursive Αναδρομική σύγκριση όσων υποκαταλόγων βρεθούν"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference μην ακολουθείς συμβολικούς συνδέσμους"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file Θεωρεί τα απόντα αρχεία ως κενά"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr "--unidirectional-new-file Θεωρεί τα απόντα πρώτα αρχεία ως κενά."
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
"--ignore-file-name-case Αγνοεί τις διαφορές λόγω πεζών-κεφαλαίων\n"
" κατά τη σύγκριση ονομάτων αρχείων."
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
"--no-ignore-file-name-case Λαμβάνει υπ' όψιν τις διαφορές λόγω\n"
" πεζών-κεφαλαίων κατά τη σύγκριση ονομάτων αρχείων."
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=PAT Εξαίρεση αρχείων με όνομα που ταιριάζει με PAT."
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=ΑΡΧΕΙΟ Εξαίρεση αρχείων με όνομα που ταιράζει\n"
" με τα ονόματα που βρίσκονται στο ΑΡΧΕΙΟ"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=ΑΡΧΕΙΟ Εκκίνηση σύγκρισης καταλόγων από το ΑΡΧΕΙΟ"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
"--from-file=ΑΡΧΕΙΟ1 Σύγκριση ΑΡΧΕΙΟ1 με όλους τους τελεστέους·\n"
" ΑΡΧΕΙΟ1 μπορεί να είναι κατάλογος"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
"--to-file=ΑΡΧΕΙΟ2 Σύγκριση όλων των τελεστέων στο ΑΡΧΕΙΟ2·\n"
" ΑΡΧΕΙΟ2 μπορεί να είναι κατάλογος"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case Αγνοεί τις διαφορές λόγω πεζών-κεφαλαίων στα περιεχόμενα "
"των αρχείων"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion Αγνοεί αλλαγές οφειλόμενες στη στηλοθέτηση"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr ""
"-Z, --ignore-trailing-space αγνοεί λευκά διαστήματα στο τέλος γραμμής"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b, --ignore-space-change Αγνοεί αλλαγές οφειλόμενες στον αριθμό λευκών "
"διαστημάτων."
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space Αγνοεί όλα τα λευκά διαστήματα."
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines Αγνοεί αλλαγές οφειλόμενες στις λευκές γραμμές"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE Αγνοεί αλλαγές που οι γραμμές τους "
"ταιριάζουν με RE."
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text Θεωρεί όλα τα αρχεία ως κείμενο."
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr Απαλειφή του χαρακτήρα επιστροφής στην είσοδο."
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr "--binary Ανάγνωση και εγγραφή πληροφορίας σε δυαδική μορφή."
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=ΟΝΟΜΑ Έξοδος συγχωνευμένου αρχείου με τις διαφορές «#ifdef "
"NAME»."
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr "--GTYPE-group-format=GFMT μορφοποίηση ομάδων εισόδου GTYPE με GFMT."
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
"--line-format=LFMT μορφοποίηση όλων των γραμμών εισόδου με LFMT"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr "--LTYPE-line-format=LFMT μορφοποίηση γραμμών εισόδου LTYPE με LFMT."
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
"Αυτές οι επιλογές μορφής παρέχουν λεπτομερή έλεγχο πάνω στην έξοδο\n"
" του diff, γενικεύοντας -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE είναι «old», «new», ή «unchanged». GTYPE είναι LTYPE ή «changed»."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) αν A ίσον B τότε T αλλιώς E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %[-][ΠΛΑΤΟΣ][.[PREC]]{doxX}n την προδιαγραφή του αριθμού γραμμής\n"
" εισόδου κατά τη μορφή της printf()"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' το χαρακτήρα με οκταδικό κωδικό OOO\n"
" C το χαρακτήρα C (οι άλλοι χαρακτήρες αναπαριστούν τον εαυτόν τους)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d --minimal προσπάθεια εύρεσης μικρότερου συνόλου διαφορών."
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
"--horizon-lines=ΑΡ Διατηρεί ΑΡ γραμμές με ταυτόσημα προθέματα κι επιθέματα."
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
"--speed-large-files Υποθέτει μεγάλα αρχεία με πολλές σκόρπιες μικροαλλαγές."
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal Δημιουργία ενός κανονικού `diff' (προεπιλογή)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help εμφάνιση αυτής εδώ της βοήθειας κι έξοδος"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v --version Εμφάνιση πληροφοριών έκδοσης κι έξοδος"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"ΑΡΧΕΙΑ είναι «ΑΡΧΕΙΟ1 ΑΡΧΕΙΟ2» ή «ΚΑΤ1 ΚΑΤ2» ή «ΚΑΤ ΑΡΧΕΙΟ...» ή «ΑΡΧΕΙΟ..."
"ΚΑΤ»."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Αν δίδεται το --from-file ή το --to-file, τότε δεν υπάρχει περιορισμός στα "
"ΑΡΧΕΙΑ."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Αν ένα ΑΡΧΕΙΟ είναι «-», τότε ανάγνωση από την τυπική είσοδο."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΑ\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Σύγκριση αρχείων γραμμή προς γραμμή."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "η επιλογή %s είναι αντικρουόμενη με την τιμή «%s»"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "αντικρουόμενες επιλογές για τη μορφή εξόδου"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "άκυρο πλάτος «%s»"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Μόνο στο %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "Αδύνατη η σύγκριση του «-» με ένα κατάλογο"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "Η επιλογή -D δεν υποστηρίζεται για καταλόγους"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Οι υποκατάλογοι %s και %s είναι ταυτόσημοι\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Το αρχείο %s είναι %s ενώ το αρχείο %s είναι %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Οι συμβολικοί σύνδεσμοι %s και %s διαφέρουν\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Τα αρχεία %s καί %s είναι πανομοιότυπα\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "ασύμβατες επιλογές"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "«-» ορίστηκε για περισσότερα από ένα αρχεία εισόδου"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "αποτυχία ανάγνωσης"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr "-A --show-all Έξοδος όλων των διαφορών σε αγκύλες."
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e, --ed έξοδος ενός ed script που περιλαμβάνει τις αλλαγές από OLDFILE σε "
"YOURFILE στο MYFILE"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr "-E, --show-overlap όπως -e, αλλά οι διαφορές σε αγκύλες"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only όπως -e, αλλά περιλαμβάνει μόνο τις μη "
"αλληλοεπικαλυπτόμενες αλλαγές"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only όπως -e, αλλά περιλαμβάνει μόνο τις αλληλοκαλυπτόμενες "
"αλλαγές"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X like -x, but bracket conflicts"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i προσάρτηση των εντολών «w» και «q» στα σενάρια του «ed»"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge έξοδος του συγχωνευμένου αρχείου σύμφωνα με την\n"
" -A αν δεν δίνεται άλλη επιλογή"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text Θεωρεί όλα τα αρχεία ως κείμενο."
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr Απαλειφή του χαρακτήρα επιστροφής στην είσοδο."
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab στοίχιση των στηλοθετών με την επιπρόσθεση ενός στην "
"αρχή."
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr "--diff-program=ΠΡΟΓΡ Χρήση του ΠΡΟΓΡάμματος στη σύγκριση αρχείων."
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=LABEL χρήση LABEL αντί ονόματος αρχείου\n"
" (μπορεί να επαναληφθεί μέχρι τρεις φορές)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help εμφάνιση αυτής εδώ της βοήθειας κι έξοδος"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version εμφάνιση πληροφοριών έκδοσης κι έξοδος"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... MYFILE OLDFILE YOURFILE\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Σύγκριση τριών αρχείων γραμμή προς γραμμή."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"είσοδο, αυτό είναι\n"
"σταθερότερο απο την χρήση του ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr "Σε επιτυχία η έξοδος είναι 0, σε σύγκρουση 1 και σε πρόβλημα 2."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "εσωτερικό σφάλμα: μπέρδεμα στις μορφές των μπλοκ diff"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: αποτυχία του diff: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "εσωτερικό σφάλμα: άκυρος τύπος diff στο process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "άκυρη μορφή diff· άκυρος οριοθέτης αλλαγής"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "άκυρη μορφή diff· ασυμπλήρωτη τελευταία γραμμή"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "το υποπρόγραμμα «%s» δεν ήταν δυνατόν να κληθεί"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "άκυρη μορφή diff· λάθος χαρακτήρες στη γραμμή αποτελεσμάτων"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "εσωτερικό σφάλμα: άκυρος τύπος diff πέρασε στην έξοδο"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "Το αρχείο εισόδου συρρικνώθηκε"
"v:\tΣυμπεριλαμβάνει τις ταυτόσημες γραμμές και το επισημαίνει.\n"
"q:\tΈξοδος.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: η επιλογή «--%s» δεν αναγνωρίζεται\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: GNU diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2013-10-31 13:16-0300\n"
"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
msgstr ""
"Ĝenerala helpo por uzi programaron GNU: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Dosieroj %s kaj %s estas malsamaj\n"
msgid "Binary files %s and %s differ\n"
msgstr "Ciferecaj dosieroj %s kaj %s estas malsamaj\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Mankas linifino ĉe fino de dosiero"
msgid "David MacKenzie"
msgstr "David MACKENZIE"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Provu '%s --help' por pli da informoj."
msgid "options -l and -s are incompatible"
msgstr "modifiloj -l kaj -s malakordas"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "skriberaro"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "normala eligo"
"La nedevigaj SALT1 kaj SALT2 indikas la nombron da bajtoj por salti\n"
"en la komenco de ĉiu dosiero (aprioras nulo)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Se DOSIERO estas '-' aŭ mankas, legi la normalan enigon."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Elig-valoro estas 0 se enigoj estas samaj, 1 se malsamaj, 2 se problemaj."
msgid "invalid --bytes value '%s'"
msgstr "malvalida valoro '%s' de --bytes"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "mankas argumento post '%s'"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "superflua argumento '%s'"
msgid "pagination not supported on this host"
msgstr "dispaĝigo ne eblas kun ĉi tiu sistemo"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "tro multe da dosier-etikedaj modifiloj"
msgid "conflicting tabsize options"
msgstr "malkongruaj modifiloj pri TAB-larĝo"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "--from-file kaj --to-file ambaŭ specifitaj"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal montri normalan malsamon (aprioras)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief montri nur kiam la dosieroj malsamas"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files montri kiam du dosieroj samas"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C NUM, --context[=NUM] montri NUM (aprioras 3) liniojn da kopiita "
"kunteksto"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U NUM, --unified[=NUM] montri NUM (aprioras 3) liniojn da unuigita "
"kunteksto"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed montri ed-skripton"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs montri malsamon laŭ RCS-formo"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side montri en du kolumnoj"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=NUM montri maksimume NUM (aprioras 130) kolumnojn"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column montri nur la maldekstran kolumnon de komunaj "
"linioj"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines ne montri komunajn liniojn"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr "-p, --show-c-function montri en kiu C-funkcio ĉiu ŝanĝo estas"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=RE montri la plej freŝa linio kongruanta al RE"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label ETIKEDO uzi ETIKEDOn anstataŭ dosiernomo\n"
" (povas esti ripetata)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t, --expand-tabs etendigi tabojn al spacoj en la eligo"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T, --initial-tab ĝustigi tabojn per antaŭmeto de tabo"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=NUM tab-lokoj estas post ĉiuj NUM (aprioras 8) "
"kolumnoj"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty forkaŝi spacon aŭ tabon antaŭ malplenaj "
"eligitaj linioj"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate pasigi la eligon tra 'pr' por enpaĝigi ĝin"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive rikure kompari trovitajn subdosierujojn"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference ne sekvi simbolajn ligojn"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr ""
"-N, --new-file trakti mankantajn dosierojn kiel malplenajn"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file trakti mankantajn unuajn dosierojn kiel "
"malplenajn"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case preteratenti usklecon dum komparo de "
"dosiernomoj"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case konsideri usklecon dum komparo de dosiernomoj"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x, --exclude=ŜABLONO forigi dosierojn, kiuj kongruas kun ŜABLONO"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=DOSIERO forigi dosierojn, kiuj kongruas kun iu "
"ŝablono en DOSIERO"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=DOSIERO komenci per DOSIERO, komparante dosierujojn"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=DOSIERO1 kompari DOSIERO1 kun ĉiuj argumentoj;\n"
" DOSIERO1 povas esti dosierujo"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=DOSIERO2 kompari ĉiujn argumentojn kun DOSIERO2;\n"
" DOSIERO2 povas esti dosierujo"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case preteratenti malsamojn en uskleco en "
"dosierenhavo"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion preteratenti ŝanĝojn kaŭzatajn de tab-"
"etendigo"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space preteratenti blank-spacon ĉe linifino"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b, --ignore-space-change preteratenti ŝanĝojn en kvanto da blank-spaco"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space preteratenti ĉiun blankan spacon"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines preteratenti ŝanĝojn, kie linioj estas ĉiuj "
"malplenaj"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE preteratenti ŝanĝojn, kie ĉiuj linioj "
"kongruas al RE"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text trakti ĉiujn dosierojn kiel tekstajn"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr forigi linifinan CR ĉe enigo"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary legi kaj skribi datumaron ciferece"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NOMO montri kunfanditan dosieron kun malsamoj "
"'#ifdef NOMO'"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr " --GTYPE-group-format=GFMT enformigi enig-grupojn GTYPE per GFMT"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr " --line-format=LFMT enformigi ĉiujn enigliniojn per LFMT"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr " --LTYPE-line-format=LFMT enformigi enig-grupojn LTYPE per LFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Tiuj enformigaj modifiloj provizas rafinitan regadon pri la eligo\n"
" de diff, ĝeneraliganta -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE estas 'old', 'new' aŭ 'unchanged'. GTYPE estas LTYPE aŭ 'changed'."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) se A egalas al B, do T, male E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %l enhavo linio, sen eventuala linifino\n"
" %[-][LARĜO][.[PREC]]{doxX}n printf-stila indiko de lininumero"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\000' la signo kun okuma kodo OOO\n"
" C la signo C (aliaj signoj reprezentas ili mem)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d, --minimal strebe serĉi pli etan aron da ŝanĝoj"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=NUM teni NUM liniojn de la komuna prefikso kaj sufikso"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files atendi grandajn dosierojn kaj multajn disajn "
"ŝanĝetojn"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal montri normalan malsamon (aprioras)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help montri ĉi tiun helpon kaj eliri"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version montri informon pri versio kaj eliri"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"DOSIEROJ estas 'DOSIERO1 DOSIERO2' aŭ 'UJO1 UJO2' aŭ 'UJO DOSIERO...' aŭ "
"'DOSIERO... UJO'."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Se --from-file aŭ --to-file estas donita, ne estas limigoj por DOSIERO(j)."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Se DOSIERO estas '-', legi la ĉefenigujon."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Uzmaniero: %s [MODIFILO]... DOSIEROJ\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Kompari DOSIEROJn linion post linio."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "malakorda valoro de opcio %s: '%s'"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "malakordaj modifiloj pri elig-stilo"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "malvalida larĝo '%s'"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Nur en %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "ne eblas kompari '-' al dosierujo"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "modifilo -D ne estas subtenata kun dosierujoj"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Komunaj subdosierujoj: %s kaj %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Dosiero %s estas %s, dum dosiero %s estas %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Simbolaj ligoj %s kaj %s malsamas\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Dosieroj %s kaj %s samas\n"
msgid "Randy Smith"
msgstr "Randy SMITH"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "malkongruaj modifiloj"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "'-' indikita por pli ol unu enigdosiero"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "lego fiaskis"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all montri ĉiujn ŝanĝojn, kun konfliktoj inter "
"krampoj"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e, --ed montri ed-skripton enkorpigantan ŝanĝojn\n"
" de PRADOSIERO al VIADOSIERO en MIADOSIEROn"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr "-E, --show-overlap kiel -e, sed kun konfliktoj inter krampoj"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only kiel -e, sed enkorpigi nur ne-interkovriĝantajn "
"ŝanĝojn"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only kiel -e, sed enkorpigi nur interkovriĝantajn "
"ŝanĝojn"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X kiel -x, sed kun konfliktoj inter krampoj"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i aldoni la komandojn 'w' kaj 'q' al ed-skriptoj"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge montri veran kunfanditan dosieron, akorde al\n"
" -A se neniu alia modifilo ĉeestas"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text trakti ĉiujn dosierojn kiel tekstajn"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr forigi linifinan CR ĉe enigo"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T, --initial-tab ĝustigi tabojn per antaŭmeto de tabo"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr " --diff-program=PROGRAMO uzi PROGRAMOn por kompari dosierojn"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=ETIKEDO uzi ETIKEDOn anstataŭ dosiernomo\n"
" (povas esti ripetata ĝis 3 fojoj)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help montri ĉi tiun helpon kaj eliri"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version eligi informon pri versio kaj eliri"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Uzmaniero: %s [MODIFILO]... MIADOSIERO PRADOSIERO VIADOSIERO\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Kompari tri dosierojn linion post linio."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"eligu la veran kunfanditan dosieron. Por ne-ordinara enigo, tio ĉi estas\n"
"pli fortika ol la uzo de ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr "Elig-valoro estas 0 por sukceso, 1 por konfliktoj, 2 por problemo."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "interna eraro: fuŝo en formato de diff-blokoj"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff malsukcesis: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "interna eraro: malvalida diff-speco en process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "malvalida diff-formato; malvalida ŝanĝ-apartigilo"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "malvalida diff-formato; malkompleta lasta linio"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "ne eblis alvoki la subprogramon '%s'"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "malvalida diff-formato; malĝusta signo en antaŭa linio"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "interna eraro: malvalida diff-speco donita al eligo"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "enigdosiero ŝrumpis"
"v:\tlaŭte transpreni komunajn liniojn.\n"
"q:\tĉesi.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: nerekonata modifilo '--%s'\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: GNU diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2013-02-19 00:30+0100\n"
"Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
"Language-Team: Spanish <es@li.org>\n"
"Ayuda general sobre el uso de software de GNU: <http://www.gnu.org/gethelp/"
">\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Los ficheros %s y %s son distintos\n"
msgid "Binary files %s and %s differ\n"
msgstr "Los ficheros binarios %s y %s son distintos\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "No hay ningún carácter de nueva línea al final del fichero"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Pruebe '%s --help' para más información."
msgid "options -l and -s are incompatible"
msgstr "las opciones -l y -s son incompatibles"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "la escritura falló"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "salida estándar"
"Los parámetros opcionales SALTO1 y SALTO2 especifican el número de\n"
"bytes que se saltan en cada fichero (cero por omisión)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Si un FICHERO es '-' o no se especifica, lee la entrada estándar."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"El estado de salida es 0 si las entradas son iguales, 1 si son diferentes,\n"
msgid "invalid --bytes value '%s'"
msgstr "valor --bytes inválido '%s'"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "falta un operando después de '%s'"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "operando extra '%s'"
# se refiere. la opción de etiqueta de fichero se ha especificado demasiadas
# veces. O más cortito, dejarlo como está :) em+
# Me parece que así está bien ...
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "demasiadas opciones de etiqueta de fichero"
msgid "conflicting tabsize options"
msgstr "opciones de tamaño de tab conflictivas"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "se ha especificado tanto --from-file como --to-file"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal produce un diff normal (predeterminado)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr ""
"-q --brief indica sólo si los ficheros son diferentes o no"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr ""
"-s --report-identical-files notifica cuándo dos ficheros son idénticos"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C NÚM, --context[=NÚM] muestra NÚM (por omisión 3) líneas de contexto"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U NÚM, --unified[=NÚM] muestra NÚM (por omisión 3) línea de contexto\n"
" unificado"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e --ed produce un script ed"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs produce un diff en formato RCS"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side muestra en dos columnas"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"impresión\n"
" (por omisión 130)"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column muestra sólo en la columna izquierda las líneas "
"comunes"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines no muestra las líneas comunes"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function muestra en qué función C está cada cambio"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=ER muestra la línea más reciente que encaje con ER"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" (se puede repetir)"
# Aquí a lo mejor también: la salida -> el resultado. sv
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t --expand-tabs expande los tabuladores a espacios en la salida"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab hace que los tabuladores se alineen\n"
" anteponiendo uno"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
"columnas\n"
" de impresión (por omisión, 8)"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
# Te mandaré el gettext, para que veas lo que vale un peine... sv
# X'D ... no soy tan malo ... ipg
# Medita de nuevo si no usas resultado em
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate pasa la salida a través de 'pr' para paginarla"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive compara recursivamente todos los "
"subdirectorios"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference no sigue los enlaces simbólicos"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr ""
"-N, --new-file trata los ficheros que no existan como vacíos"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file trata los ficheros originales que no "
"existan\n"
" como vacíos"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case descarta las diferencias entre mayúsculas y\n"
" minúsculas al comparar los nombres de los "
"ficheros"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
"--no-ignore-file-name-case considera distintas mayúsculas y minúsculas\n"
" cuando compara los nombres de los ficheros"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x, --exclude=PAT excluye los ficheros que coincidan con PAT"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"alguna\n"
" expresión regular de FICHERO"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=FICHERO comienza por FICHERO cuando se comparan\n"
" directorios"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=FICHERO1 compara FICHERO1 con todos los operandos;\n"
" FICHERO1 puede ser un directorio"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=FICHERO2 compara todos los operandos con FICHERO2\n"
" FICHERO2 puede ser un directorio"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"minúsculas\n"
" en el contenido de los ficheros"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion descarta cambios debidos a expansiones de "
"tabs"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr ""
"-Z, --ignore-trailing-space descarta espacio en blanco al final de línea"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b, --ignore-space-change descarta las diferencias en la cantidad de\n"
" espacio en blanco"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space descarta los espacios en blanco"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines descarta los cambios en líneas completamente "
"vacías"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=EXPR-REG descarta las líneas que coincidan con "
"EXPR-REG"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr ""
"-a, --text trata todos los ficheros como de tipo texto"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr elimina los retornos de carro finales en la "
"entrada"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr ""
" --binary lee y escribe los datos en modo binario"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
# Propongo similar -> parecida. Ver gettext. sv
# Hmmm ... prefiero similar. Antes estaba puesto `parecida' y la verdad,
# no quedaba tan bien. ipg
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
" --GTYPE-group-format=GFMT formatea los grupos de entrada GTYPE con GFMT"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
" --line-format=LFMT formatea todas las líneas de entrada con LFMT"
# ídem. sv
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
" --LTYPE-line-format=LFMT formatea las líneas de entrada LTYPE con LFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
"resultado\n"
" de diff, generalizando -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE es 'old' (antiguo), 'new' (nuevo) o 'unchanged' (sin cambios).\n"
" GTYPE es como LTYPE o 'changed' (cambiado)."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) si A es igual a B entonces T en caso contrario E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
"el\n"
" número de línea de entrada"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' el carácter con código octal OOO\n"
" C el carácter C (los otros caracteres se representan a sí mismos)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
"-d, --minimal se esfuerza en encontrar un grupo de cambios menor"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=NÚM mantiene NÚM líneas de prefijos y sufijos comunes"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
"son\n"
" numerosos, pequeños y dispersos"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal produce un diff normal (predeterminado)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help muestra esta ayuda y finaliza"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version informa de la versión y finaliza"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FICHEROS puede ser 'FICHERO1 FICHERO2' o 'DIRECTORIO1 DIRECTORIO2'\n"
" o 'DIRECTORIO FICHERO...' o 'FICHERO... DIRECTORIO'."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr "Si se da --from-file o --to-file, no hay restricciones en FICHERO(s)."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Si un FICHERO es '-', lee la entrada estándar."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Modo de empleo: %s [OPCIÓN]... FICHEROS\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Compara FICHEROS línea por línea."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "la opción %s tiene el valor conflictivo '%s'"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "las especificaciones del estilo de salida son conflictivas"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "ancho inválido '%s'"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Sólo en %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "no se puede comparar '-' con un directorio"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "la opción -D no se puede usar con directorios"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Subdirectorios comunes: %s y %s\n"
# Nota: El segundo y el cuarto `%s' son tipos de fichero.
# Por ejemplo, "texto C", "texto FORTRAN", etc.
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "El fichero %s es un %s mientras que el %s es un %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Los enlaces simbólicos %s y %s son distintos\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Los ficheros %s y %s son idénticos\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "opciones incompatibles"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "se ha especificado '-' para más de un fichero de entrada"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "la lectura falló"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all muestra todos los cambios, encerrando los "
# MYFILE MI-FICHERO
#
# Pongo eso por ahora, pero espero una sugerencia mejor ;)
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e, --ed muestra un `script' ed incorporando los cambios entre\n"
" FICHERO-ANTIGUO y TU-FICHERO a MI-FICHERO"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E, --show-overlap como -e, pero encerrando los conflictos\n"
" entre corchetes"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"que\n"
" no se superponen"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"se\n"
" solapan"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
"-X como -x, pero encierra conflictos entre corchetes"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i añade las órdenes 'w' y 'q' a los scripts ed"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"si\n"
" no se especifica ninguna otra opción"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr ""
"-a, --text trata todos los ficheros como de tipo texto"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr elimina los retornos de carro finales en la "
"entrada"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab hace que los tabuladores se alineen anteponiendo "
"uno"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
" --diff-program=PROGRAMA utiliza PROGRAMA para comparar los ficheros"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"fichero\n"
" (se puede reperir hasta tres veces)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help muestra esta ayuda y finaliza"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v --version informa de la versión y finaliza"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Modo de empleo: %s [OPCIÓN]... MI-FICHERO FICHERO-ANTIGUO TU-FICHERO\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Compara tres ficheros línea por línea."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"es\n"
"más robusto que usar ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"El estado de salida es 0 en caso de éxito, 1 si hay conflictos, 2 en caso "
"de\n"
"problema."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "error interno: fallo en el formato de los bloques diff"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff falló: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "error interno: tipo de diff inválido en process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "formato de diff inválido; separador de cambio inválido"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "formato de diff inválido; línea final incompleta"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "no se ha podido invocar al programa subsidiario '%s'"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr ""
"formato de diff inválido; caracteres incorrectos al comienzo de la línea"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "error interno: tipo de diff inválido pasado a la salida"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "el fichero de entrada ha menguado"
"v: Incluye líneas comunes verbosamente.\n"
"q: Salir.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: opción no reconocida '--%s'\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2016-05-26 21:28+0300\n"
"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
msgstr ""
"Yleisohjeita GNU-ohjelmistojen käyttöön: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Tiedostot %s ja %s eroavat\n"
msgid "Binary files %s and %s differ\n"
msgstr "Binääritiedostot %s ja %s eroavat\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Ei rivinvaihtoa tiedoston lopussa"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Komento ”%s --help” antaa lisää tietoa."
msgid "options -l and -s are incompatible"
msgstr "valitsimet -l ja -s eivät ole yhteensopivia"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "kirjoitus epäonnistui"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "vakiotuloste"
"OHITA1 ja OHITA2 ovat jokaisen tiedostn alusta ohitettavien tavujen\n"
"määrä (oletusarvo on nolla)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Paluuarvo on 0, jos syötteet ovat samoja, 1 jos erilaisia, "
msgid "invalid --bytes value '%s'"
msgstr "virheellinen arvo ”%s” valitsimelle --bytes"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "puuttuva operandi argumentin ”%s” jälkeen"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "ylimääräinen operandi ”%s”"
msgid "pagination not supported on this host"
msgstr "tämä isäntä ei tue sivunumerointia"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "liian monta tiedostonimivalitsinta"
msgid "conflicting tabsize options"
msgstr "ristiriitaiset sarkaimen kokovalinnat"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "sekä valitsin --from-file että --to-file on määritetty"
-#: src/diff.c:883
+#: src/diff.c:890
#, fuzzy
msgid " --normal output a normal diff (the default)"
msgstr "--normal Tulosta normaali diff."
-#: src/diff.c:884
+#: src/diff.c:891
#, fuzzy
msgid "-q, --brief report only when files differ"
msgstr "-q --brief Kertoo vain, eroavatko tiedostot."
-#: src/diff.c:885
+#: src/diff.c:892
#, fuzzy
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s --report-identical-files Ilmoita, jos kaksi tiedostoa ovat samat."
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
-#: src/diff.c:887
+#: src/diff.c:894
#, fuzzy
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-w MÄÄRÄ --width=MÄÄRÄ Tulosta enintään MÄÄRÄ (oletus 130) merkkiä riville."
-#: src/diff.c:888
+#: src/diff.c:895
#, fuzzy
msgid "-e, --ed output an ed script"
msgstr "-e --ed Tulosta ed-skripti."
-#: src/diff.c:889
+#: src/diff.c:896
#, fuzzy
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs Tulosta RCS-muotoinen diff."
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr ""
-#: src/diff.c:891
+#: src/diff.c:898
#, fuzzy
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-w MÄÄRÄ --width=MÄÄRÄ Tulosta enintään MÄÄRÄ (oletus 130) merkkiä riville."
-#: src/diff.c:892
+#: src/diff.c:899
#, fuzzy
msgid ""
" --left-column output only the left column of common lines"
msgstr "-l --left-column Tulosta vain yhteisten rivien vasen palsta"
-#: src/diff.c:893
+#: src/diff.c:900
#, fuzzy
msgid " --suppress-common-lines do not output common lines"
msgstr "-s --suppress-common-lines Älä tulosta yhteisiä rivejä."
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
"--from-file=TIEDOSTO1 Vertaa TIEDOSTO1:ä kaikkiin operandeihin. TIEDOSTO1 "
"voi olla hakemisto."
-#: src/diff.c:900
+#: src/diff.c:907
#, fuzzy
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t --expand-tabs Laajentaa sarkaimet välilyönneiksi tulosteessa."
-#: src/diff.c:901
+#: src/diff.c:908
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T --initial-tab Lisää sarkain rivien alkuun."
-#: src/diff.c:902
+#: src/diff.c:909
#, fuzzy
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr "--tabsize=KOKO Sarkaimen koko on KOKO (oletus 8) merkkiä."
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l --paginate Ohjaa tuloste ohjelman \"pr\" läpi sivunumerointia varten."
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive vertaa löytyneitä alihakemistoja "
"rekursiivisesti"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
-#: src/diff.c:908
+#: src/diff.c:915
#, fuzzy
msgid "-N, --new-file treat absent files as empty"
msgstr "-N --new-file Käsittele puuttuvia tiedostoja tyhjinä."
-#: src/diff.c:909
+#: src/diff.c:916
#, fuzzy
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr "--unidirectional-new-file Käsittele puuttuvia tiedostoja tyhjinä."
-#: src/diff.c:910
+#: src/diff.c:917
#, fuzzy
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
"--ignore-file-name-case Älä huomioi kirjainkokoa tiedostojen nimiä "
"verrattaessa."
-#: src/diff.c:911
+#: src/diff.c:918
#, fuzzy
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
"--no-ignore-file-name-case Kirjainkoko huomioidaan tiedostonimiä "
"verrattaessa."
-#: src/diff.c:912
+#: src/diff.c:919
#, fuzzy
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x HAHMO --exclude=HAHMO Jätä pois tiedostot, jotka vastaavat HAHMOa."
-#: src/diff.c:913
+#: src/diff.c:920
#, fuzzy
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
"-X TIEDOSTO --exclude-from=TIEDOSTO Jätä pois TIEDOSTOssa listatut "
"tiedostot."
-#: src/diff.c:914
+#: src/diff.c:921
#, fuzzy
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
"-S TIEDOSTO --starting-file=TIEDOSTO Aloita TIEDOSTOlla verrattaessa "
"hakemistoja."
-#: src/diff.c:915
+#: src/diff.c:922
#, fuzzy
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
"--from-file=TIEDOSTO1 Vertaa TIEDOSTO1:ä kaikkiin operandeihin. TIEDOSTO1 "
"voi olla hakemisto."
-#: src/diff.c:917
+#: src/diff.c:924
#, fuzzy
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
"--to-file=TIEDOSTO2 Vertaa kaikkia operandeja TIEDOSTO2:een. TIEDOSTO2 voi "
"olla hakemisto."
-#: src/diff.c:920
+#: src/diff.c:927
#, fuzzy
msgid ""
"-i, --ignore-case ignore case differences in file contents"
"-i --ignore-case Älä huomioi kirjainkokoa tiedostojen sisältöä "
"verrattaessa."
-#: src/diff.c:921
+#: src/diff.c:928
#, fuzzy
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E --ignore-tab-expansion Älä huomioi sarkainten laajennuksesta johtuvia "
"eroja."
-#: src/diff.c:922
+#: src/diff.c:929
#, fuzzy
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-w --ignore-all-white-space Älä huomioi tyhjiä merkkejä."
-#: src/diff.c:923
+#: src/diff.c:930
#, fuzzy
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b --ignore-space-change Älä huomioi tyhjistä merkeistä johtuvia eroja."
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w --ignore-all-white-space älä huomioi tyhjiä merkkejä"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr "-B --ignore-blank-lines älä huomioi tyhjistä riveistä johtuvia eroja"
-#: src/diff.c:926
+#: src/diff.c:933
#, fuzzy
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I SI --ignore-matching-lines=SI Älä huomioi eroavia rivejä, jotka "
"vastaavat säännöllistä lauseketta."
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a --text käsittelee kaikki tiedostot tekstinä"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr poista vaununpalautus syötteen lopusta"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary lue ja kirjoita dataa binääritilassa"
-#: src/diff.c:934
+#: src/diff.c:941
#, fuzzy
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
"-D NIMI --ifdef=NIMI Tulosta yhdistetty tiedosto näyttämään \"#ifdef NIMI"
"\"-erot."
-#: src/diff.c:935
+#: src/diff.c:942
#, fuzzy
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
"--GTYYPPI-group-format=GMUOTO Sama, muotoile GTYYPPIset syöteryhmät "
"GMUOTOon."
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr " --line-format=LMUOTO muotoile kaikki syöterivit LMUOTOon"
-#: src/diff.c:937
+#: src/diff.c:944
#, fuzzy
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr " --line-format=LMUOTO muotoile kaikki syöterivit LMUOTOon"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYYPPI on \"old\", \"new\" tai \"unchanged\". GTYYPPI on LTYYPPI tai "
"\"changed\"."
-#: src/diff.c:941
+#: src/diff.c:948
#, fuzzy
msgid ""
" GFMT (only) may contain:\n"
" E F-1\n"
" M L+1"
-#: src/diff.c:953
+#: src/diff.c:960
#, fuzzy
msgid ""
" LFMT (only) may contain:\n"
" %l rivin sisältö, mahdollinen edeltävä rivinvaihto poislukien\n"
" %[-][LEVEYS][.[TARKK]]{doxX}n syöterivin numero printf-tyylillä"
-#: src/diff.c:957
+#: src/diff.c:964
#, fuzzy
msgid ""
" Both GFMT and LFMT may contain:\n"
" %c'C' yksittäinen merkki C\n"
" %c'\\OOO' yksittäinen merkki oktaalikoodilla OOO"
-#: src/diff.c:963
+#: src/diff.c:970
#, fuzzy
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d --minimal Yrittää löytää pienemmän määrän muutoksia."
-#: src/diff.c:964
+#: src/diff.c:971
#, fuzzy
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
"--horizon-lines=MÄÄRÄ Säilytä MÄÄRÄ riviä yhteisestä etu- ja "
"jälkiliitteestä."
-#: src/diff.c:965
+#: src/diff.c:972
#, fuzzy
msgid ""
" --speed-large-files assume large files and many scattered small changes"
"-H --speed-large-files Oleta suuret tiedostot, joissa pieniä muutoksia "
"ympäri tiedoston."
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr "--normal Tulosta normaali diff."
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
#, fuzzy
msgid " --help display this help and exit"
msgstr " --help näytä tämä ohje ja poistu"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version näytä versiotiedot ja poistu"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"TIEDOSTOT ovat \"TIEDOSTO1 TIEDOSTO2\" tai \"HAK1 HAK2\" tai \"HAK "
"TIEDOSTO...\" tai \"TIEDOSTO... HAK\"."
-#: src/diff.c:975
+#: src/diff.c:982
#, fuzzy
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr "Tiedoston lisääminen hakemiston %s ulkopuolelta epäonnistui"
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
#, fuzzy
msgid "If a FILE is '-', read standard input."
msgstr ""
"\n"
"Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n"
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Käyttö: %s [VALITSIN]... TIEDOSTOT\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Vertaa TIEDOSTOja rivi riviltä."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, fuzzy, c-format
msgid "conflicting %s option value '%s'"
msgstr "ristiriitaiset tyypit kohteelle %<%c%s%>:lle"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "ristiriitaiset tulostustyylin valinnat"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "virheellinen leveys \"%s\""
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Vain hakemistossa %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
#, fuzzy
msgid "cannot compare '-' to a directory"
msgstr "hakemiston %s luominen ei onnistu"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "valitsin -D ei toimi hakemistojen kanssa"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Yhteiset alihakemistot: %s ja %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Tiedosto %s on %s, kun taas tiedosto %s on %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, fuzzy, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Tiedostot %s ja %s eroavat\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Tiedostot %s ja %s ovat identtiset\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "yhteensopimattomat valitsimet"
-#: src/diff3.c:353
+#: src/diff3.c:388
#, fuzzy
msgid "'-' specified for more than one input file"
msgstr "Voidaan antaa vain yksi syötetiedosto!\n"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "lukeminen epäonnistui"
-#: src/diff3.c:428
+#: src/diff3.c:473
#, fuzzy
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr "-A --show-all Tulosta kaikki muutokset, ristiriidat merkiten."
-#: src/diff3.c:430
+#: src/diff3.c:475
#, fuzzy
msgid ""
"-e, --ed output ed script incorporating changes\n"
"-e --ed Tulosta VANHANTIEDOSTON yhdistämättömät muutokset TIEDOSTOOSI "
"verrattuna TIEDOSTOONI."
-#: src/diff3.c:432
+#: src/diff3.c:477
#, fuzzy
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E --show-overlap Tulosta yhdistämättömät muutokset, ristiriidat merkiten."
-#: src/diff3.c:433
+#: src/diff3.c:478
#, fuzzy
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr "-3 --easy-only Tulosta yhdistämättömät ei-päällekkäiset muutokset."
-#: src/diff3.c:434
+#: src/diff3.c:479
#, fuzzy
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x --overlap-only Tulosta päällekkäiset muutokset."
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
-#: src/diff3.c:436
+#: src/diff3.c:481
#, fuzzy
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i Lisää komennot \"w\" ja \"q\" ed-skripteihin."
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text käsittele kaikki tiedostot tekstinä"
-#: src/diff3.c:442
+#: src/diff3.c:487
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr poista vaununpalautus syötteen lopusta"
-#: src/diff3.c:443
+#: src/diff3.c:488
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T --initial-tab Lisää sarkain rivien alkuun."
-#: src/diff3.c:444
+#: src/diff3.c:489
#, fuzzy
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr "--diff-program=OHJELMA Käytä OHJELMAa tiedostojen vertaamiseen."
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help näytä tämä ohje ja poistu"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version näytä versiotiedot ja poistu"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Käyttö: %s [VALITSIN]... TIEDOSTONI VANHATIEDOSTO TIEDOSTOSI\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Vertaa kolmea tiedostoa rivi riviltä."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Paluuarvo on onnistuessa 0, ristiriitatilanteissa 1, ja ongelmatilanteissa 2."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "sisäinen virhe: virhe diff-lohkojen muodossa"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff epäonnistui: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "sisäinen virhe: virheellinen diff-tyyppi funktiossa process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "virheellinen diff-muoto; virheellinen muutoserotin"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "virheellinen diff-muoto; viimeinen rivi vajaa"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, fuzzy, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "apuohjelmaa \"%s\" ei voitu käynnistää"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "virheellinen diff-muoto; väärät rivin alkumerkit"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "sisäinen virhe: virheellinen diff-muoto välitetty tulosteeseen"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "syötetiedosto kutistui"
"v:\tSisällytä yhteiset rivit automaattisesti, ilmoittaen.\n"
"q:\tLopeta.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: tunnistamaton valitsin ”--%s”\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: GNU diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2012-10-31 08:16+0100\n"
"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
"Language-Team: French <traduc@traduc.org>\n"
"Aide générale sur l'utilisation des logiciels GNU: <http://www.gnu.org/"
"gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Les fichiers %s et %s sont différents\n"
msgid "Binary files %s and %s differ\n"
msgstr "Les fichiers binaires %s et %s sont différents\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Pas de fin de ligne à la fin du fichier"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Utilisez « %s --help » pour en savoir d'avantage."
msgid "options -l and -s are incompatible"
msgstr "options -l et -s sont incompatibles"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "échec d'écriture"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "sortie standard"
"escamoter\n"
"au début de chaque fichier (zéro par défaut)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Si un FICHIER est « - » ou manquant, lire sur l'entrée standard."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Le statut de fin d'exécution est 0 si les entrées sont les mêmes, 1 si "
msgid "invalid --bytes value '%s'"
msgstr "valeur invalide pour --bytes: « %s »"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "opérande manquante après « %s »"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "opérande supplémentaire « %s »"
msgid "pagination not supported on this host"
msgstr "La pagination n'est pas supporté sur cette machine"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "Trop de noms de fichiers dans les options"
msgid "conflicting tabsize options"
msgstr "options conflictuelles de taille de tabulation"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "--from-file et --to-file ont été spécifiés ensemble"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr ""
" --normal Produire un « diff » en format normal (par "
"défaut)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr ""
"-q, --brief Indiquer seulement si les fichiers diffèrent"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr ""
"-s, --report-identical-files Indiquer si les deux fichiers sont identiques"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C N, --context[=N] Afficher N (3 par défaut) lignes du "
"contexte copié"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U N, --unified[=N] Afficher N (3 par défaut) lignes dans "
"le context unifié"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed Générer un script pour « ed »"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr ""
"-n, --rcs Générer un fichier « diff » au format RCS"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side Affichage sur deux colonnes"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-w, --width=N Limiter la sortie à au plus N colonnes "
"imprimées (130 par défaut)"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column Afficher les lignes identiques uniquement dans "
"la colonne de gauche"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines Ne pas afficher les lignes identiques"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function Afficher dans quelle fonction C le changement "
"se trouve"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=RE Montrer la ligne la plus récente correspondant "
"à RE"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label ÉTIQUETTE Utiliser ÉTIQUETTE au lieu du nom de fichier\n"
" (peut être répété)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t, --expand-tabs Étaler les tabulateurs en espaces dans la "
"sortie"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab Aligner les tabulateurs en préfixant un "
"tabulateur"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=N Les balises de tabulation sont à chaque N (8 "
"par défaut) colonnes"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty Supprimer les espaces et les tabulations avant "
"les lignes vides"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate Relayer la sortie à « pr » afin de la paginer"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive Comparer récursivement les sous-répertoires "
"trouvés"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference Ne pas suivre les liens symboliques"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr ""
"-N, --new-file Traiter les fichiers absents comme des "
"fichiers vides"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file Traiter les premiers fichiers absents comme "
"vides"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case Ignorer la casse lors de la comparaison des "
"noms de fichiers"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case Tenir compte de la casse lors de la "
"comparaison des noms de fichiers"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x, --exclude=PAT Exclure les fichiers dont les noms concordent "
"avec le PATron"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=FICHIER Exclure les fichiers dont les noms\n"
" concordent avec ceux contenus dans le FICHIER"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=FICHIER Débuter la comparaison des répertoires par le "
"FICHIER"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=FICHIER1 Comparer le FICHIER1 à toutes les opérandes.\n"
" FICHIER1 peut être un répertoire"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=FICHIER2 Comparer toutes les opérandes à FICHIER2.\n"
" FICHIER2 peut être un répertoire"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case Ignorer les différences de casses dans le "
"contenu des fichiers"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion Ignorer les changements liés à l'expansion des "
"tabulations"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr ""
"-Z, --ignore-trailing-space Ignorer les blancs d'espacement à la fin "
"de la ligne"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b, --ignore-space-change Ignorer les changements dans le nombre "
"d'espaces"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space Ignorer tout blanc d'espacement"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines Ignorer les changements dont toutes les lignes "
"sont blanches"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE Ignorer les différences dont toutes les\n"
" lignes concordent avec l'expression régulière RE"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr ""
"-a, --text Traiter tous les fichiers comme des textes"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr Éliminer les retours de chariot de l'entrée"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary Lire et écrire les données en binaire"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NOM Afficher les fichiers fusionnés en marquant les "
"différences par des « #ifdef NOM »"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
" --GTYPE-group-format=GFMT Formater les groupes d'entrée GTYPE avec GFMT"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
" --line-format=LFMT Formater toutes les lignes d'entrée avec LFMT"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
" --LTYPE-line-format=LFMT Formater les lignes d'entrée LTYPE avec LFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Ces options de formatage fournissent un contrôle fin sur la sortie\n"
" de diff et généralise -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE peut être soit « old », « new », ou « unchanged ». GTYPE prend une "
"des valeurs de LTYPE ou « changed »."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" E F-1\n"
" M L+1 %(A=B?T:E) si A égal B alors T sinon E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %[-][LARGEUR][.[PREC]]{doxX}n la spécification du numéro de ligne\n"
" d'entrée selon le format de printf"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO» le caractère dont le code octal est OOO C le "
"caractère C (les autres caractères se représentent eux-mêmes)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
"-d, --minimal Rechercher assidûment le plus petit ensemble de "
"différences"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=N Retenir N lignes ayant des préfixes et suffixes "
"identiques"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files Suppose de grands fichiers et de nombreux "
"petits changements éparpillés"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr ""
" --normal Produire un « diff » en format normal (par "
"défaut)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help Afficher cette aide et terminer"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr ""
"-v, --version Afficher le nom et la version du logiciel et "
"terminer"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FICHIERS sont « FICHIER1 FICHIER2 » ou « RÉP1 RÉP2 » ou « RÉP FICHIER... » "
"ou « FICHIER... RÉP »."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Si --from-file ou --to-file sont fournis, il n'y a pas de restriction sur "
"les FICHIERS."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Si un FICHIER est « - » alors lire depuis l'entrée standard."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Usage: %s [OPTION]... FICHIERS\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Comparer les fichiers ligne par ligne."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "valeur conflictuelle de l'option %s: « %s »"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "options de style de sortie conflictuelles"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "largeur invalide « %s »"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Seulement dans %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "ne peut comparer « - » avec un répertoire"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "L'option -D ne traite pas les répertoires"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Les sous-répertoires %s et %s sont identiques\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Le fichier %s est un %s alors que le fichier %s est un %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Les liens symboliques %s et %s sont différents\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Les fichiers %s et %s sont identiques\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "options incompatibles"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "« - » fourni pour plus d'un fichier d'entrée"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "lecture non-réussie"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all Afficher toutes les différences avec les "
"conflits entre crochets"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
" du fichier ORIGINAL vers le fichier MODIFIÉ\n"
" vers le fichier de SORTIE"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E, --show-overlap Comme -e mais les conflits sont entre crochets"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only Comme -e mais n'inclut que les changements qui "
"ne se recoupent pas"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only Comme -e mais inclut les changements qui se recoupent"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
"-X Comme -x mais le conflits sont entre crochets"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i Ajouter les commandes « w » et « q » au script "
"« ed »"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"autre\n"
" option n'est spécifiée"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr ""
"-a, --text Traiter tous les fichiers comme des textes"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr Éliminer les retours de chariot de l'entrée"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab Aligner les tabulateurs en préfixant un "
"tabulateur"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
" --diff-program=PROG Utiliser le PROGramme pour comparer les "
"fichiers"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"fichier\n"
" (peut être répété jusqu'à trois fois)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help Afficher cette aide et terminer"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr ""
"-v, --version Afficher le nom et la version du logiciel et "
"terminer"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Comparer trois fichiers ligne par ligne."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"plus\n"
"robuste que d'utiliser ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Le statut de fin d'exécution est 0 si réussite, 1 si en conflit et 2 si "
"problématique."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "erreur interne: mélange dans le format des blocs « diff »"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: échec de « diff » : "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "erreur interne: type de « diff » invalide dans process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "format de « diff » invalide ; séparateur de changement invalide"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "format de « diff » invalide ; dernière ligne incomplète"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "programme subsidiaire « %s » n'a pu être invoqué"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr ""
"format de « diff » invalide ; caractères incorrects au début de la ligne"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "erreur interne : type de « diff » invalide fourni en sortie"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "le fichier d'entrée a rétréci"
"v:\tInclure les lignes identiques et le signaler.\n"
"q:\tQuitter.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: l'option « --%s » n'est pas reconnue\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 2.8.7\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2004-12-03 13:47-0500\n"
"Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
"Language-Team: Irish <ga@li.org>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr ""
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Tá difríocht idir na comhaid %s agus %s\n"
msgid "Binary files %s and %s differ\n"
msgstr "Tá difríocht idir na comhaid %s agus %s\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Gan líne nua ag an chomhadchríoch"
msgid "David MacKenzie"
msgstr ""
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, fuzzy, c-format
msgid "Try '%s --help' for more information."
msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fháil."
msgid "options -l and -s are incompatible"
msgstr "Níl na roghanna -l agus -s comhoiriúnach"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "teipeadh ag scríobh"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "aschur caighdeánach"
msgstr ""
"Is éard atá i SCIP1 agus SCIP2 ná líonta na mbeart a scipeáil i ngach comhad."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Mura bhfuil COMHAD ann, nó más `-' é, léigh ón ionchur caighdeánach."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr "Stádas scortha: 0 más ionann iad, 1 más difriúil, 2 má tá fadhb ann."
msgid "invalid --bytes value '%s'"
msgstr "luach neamhbhailí --bytes `%s'"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, fuzzy, c-format
msgid "missing operand after '%s'"
msgstr "ní foláir argóint i ndiaidh `%s'"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, fuzzy, c-format
msgid "extra operand '%s'"
msgstr "oibreann breise `%s'"
msgid "pagination not supported on this host"
msgstr "Ní thacaítear leis an uimhriú leathanach ar an óstríomhaire seo"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "an iomarca argóintí do lipéid chomhaid"
msgid "conflicting tabsize options"
msgstr "Roghanna tábmhéid contrártha"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "tugadh --from-file agus --to-file lena chéile"
-#: src/diff.c:883
+#: src/diff.c:890
#, fuzzy
msgid " --normal output a normal diff (the default)"
msgstr "--normal Aschuir diff coitianta."
-#: src/diff.c:884
+#: src/diff.c:891
#, fuzzy
msgid "-q, --brief report only when files differ"
msgstr "-q --brief Ná taispeáin ach difriúil nó nach ea."
-#: src/diff.c:885
+#: src/diff.c:892
#, fuzzy
msgid "-s, --report-identical-files report when two files are the same"
msgstr ""
"-s --report-identical-files Tuairiscigh nuair atá dhá chomhad comhionanna."
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
-#: src/diff.c:887
+#: src/diff.c:894
#, fuzzy
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-w UIMH --width=UIMH UIMH colún priontála ar a mhéad (réamhshocrú=130)."
-#: src/diff.c:888
+#: src/diff.c:895
#, fuzzy
msgid "-e, --ed output an ed script"
msgstr "-e --ed Aschuir script `ed'."
-#: src/diff.c:889
+#: src/diff.c:896
#, fuzzy
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs Aschuir diff i gcruth RCS."
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr ""
-#: src/diff.c:891
+#: src/diff.c:898
#, fuzzy
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-w UIMH --width=UIMH UIMH colún priontála ar a mhéad (réamhshocrú=130)."
-#: src/diff.c:892
+#: src/diff.c:899
#, fuzzy
msgid ""
" --left-column output only the left column of common lines"
msgstr "-l --left-column Ná taispeáin an colún ar dheis más ionann iad."
-#: src/diff.c:893
+#: src/diff.c:900
#, fuzzy
msgid " --suppress-common-lines do not output common lines"
msgstr "-s --suppress-common-lines Ná taispeáin línte atá i bpáirt acu."
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
msgstr ""
"--from-file=COMHAD Cuir COMHAD (nó comhadlann) i gcomparáid le gach oibreann."
-#: src/diff.c:900
+#: src/diff.c:907
#, fuzzy
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t --expand-tabs leathnaigh táib go spásanna san aschur."
-#: src/diff.c:901
+#: src/diff.c:908
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab Ailínigh táib trí tháb a chur in ionad spás tosaigh."
-#: src/diff.c:902
+#: src/diff.c:909
#, fuzzy
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr "--tabsize=UIMH Tábstop gach UIMH colún (réamhshocrú=8)."
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
-#: src/diff.c:904
+#: src/diff.c:911
#, fuzzy
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr "-l --paginate uimhrigh leathanaigh le `pr'."
-#: src/diff.c:906
+#: src/diff.c:913
#, fuzzy
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr "-r --recursive Cuir fochomhadlanna i gcomparáid go hathchúrsach."
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
-#: src/diff.c:908
+#: src/diff.c:915
#, fuzzy
msgid "-N, --new-file treat absent files as empty"
msgstr "-N --new-file Caith le comhad ar iarraidh mar chomhad folamh."
-#: src/diff.c:909
+#: src/diff.c:916
#, fuzzy
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
"--unidirectional-new-file Más ar iarraidh, caith leis an chéad chomhad\n"
" mar chomhad folamh."
-#: src/diff.c:910
+#: src/diff.c:917
#, fuzzy
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr "--ignore-file-name-case Ná bí cásíogair le hainmneacha comhaid."
-#: src/diff.c:911
+#: src/diff.c:918
#, fuzzy
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
"--no-ignore-file-name-case Bí cásíogair maidir le hainmneacha comhaid."
-#: src/diff.c:912
+#: src/diff.c:919
#, fuzzy
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-X SLONN --exclude=SLONN Fág comhaid as má tá siad comhoiriúnacha le SLONN."
-#: src/diff.c:913
+#: src/diff.c:920
#, fuzzy
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
"haon\n"
" slonn ionadaíochta as an CHOMHAD."
-#: src/diff.c:914
+#: src/diff.c:921
#, fuzzy
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
"-S COMHAD --starting-file=COMHAD Tosaigh le COMHAD agus comhadlanna á "
"gcóimheas."
-#: src/diff.c:915
+#: src/diff.c:922
#, fuzzy
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
msgstr ""
"--from-file=COMHAD Cuir COMHAD (nó comhadlann) i gcomparáid le gach oibreann."
-#: src/diff.c:917
+#: src/diff.c:924
#, fuzzy
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
msgstr ""
"--to-file=COMHAD Cuir gach oibreann i gcomparáid le COMHAD (nó comhadlann)."
-#: src/diff.c:920
+#: src/diff.c:927
#, fuzzy
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr "-i --ignore-case Ná bí cásíogair le hinneachar na gcomhad."
-#: src/diff.c:921
+#: src/diff.c:928
#, fuzzy
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E --ignore-tab-expansion Déan neamhshuim ar athruithe ó leathnú na dtáib."
-#: src/diff.c:922
+#: src/diff.c:929
#, fuzzy
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-w --ignore-all-space Déan neamhshuim ar spás bán go hiomlán."
-#: src/diff.c:923
+#: src/diff.c:930
#, fuzzy
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b --ignore-space-change Déan neamhshuim ar mhéid an spáis bán."
-#: src/diff.c:924
+#: src/diff.c:931
#, fuzzy
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w --ignore-all-space Déan neamhshuim ar spás bán go hiomlán."
-#: src/diff.c:925
+#: src/diff.c:932
#, fuzzy
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr "-B --ignore-blank-lines Déan neamhshuim ar línte folmha."
-#: src/diff.c:926
+#: src/diff.c:933
#, fuzzy
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"comhoiriúnach\n"
" leis an slonn SI."
-#: src/diff.c:928
+#: src/diff.c:935
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text Caith le gach comhad mar théacschomhad."
-#: src/diff.c:929
+#: src/diff.c:936
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
"--strip-trailing-cr Dealaigh aisfhilleadh carráiste ó gach líne ionchurtha."
-#: src/diff.c:931
+#: src/diff.c:938
#, fuzzy
msgid " --binary read and write data in binary mode"
msgstr "--binary Léigh agus scríobh sonraí sa mhód dénártha."
-#: src/diff.c:934
+#: src/diff.c:941
#, fuzzy
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
"-D AINM --ifdef=AINM Taispeáin comhad cumaiscthe chun na diff-aí\n"
" `#ifdef AINM' a léiriú"
-#: src/diff.c:935
+#: src/diff.c:942
#, fuzzy
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
"--GCINL-group-format=GFMD Taispeáin grúpaí GCINL ionchuir de réir GFMD."
-#: src/diff.c:936
+#: src/diff.c:943
#, fuzzy
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr "--line-format=LFMD Taispeáin gach líne ionchuir de réir LFMD."
-#: src/diff.c:937
+#: src/diff.c:944
#, fuzzy
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
"--LCINL-line-format=LFMD Taispeáin línte LCINL ionchuir de réir LFMD."
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
#, fuzzy
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr " LCINL = `old', `new', nó `unchanged'. GCINL = LCINL nó `changed'."
-#: src/diff.c:941
+#: src/diff.c:948
#, fuzzy
msgid ""
" GFMT (only) may contain:\n"
" E F-1\n"
" M L+1"
-#: src/diff.c:953
+#: src/diff.c:960
#, fuzzy
msgid ""
" LFMT (only) may contain:\n"
" %l ábhar na líne, gan aon líne nua\n"
" %[-][LEITHEAD][.[SONRÚ]]{doxX}n sonrú do líne-uimhir mar C `printf'"
-#: src/diff.c:957
+#: src/diff.c:964
#, fuzzy
msgid ""
" Both GFMT and LFMT may contain:\n"
" %c'C' an carachtar litriúil C\n"
" %c'\\OOO' an carachtar le cód ochtnártha OOO"
-#: src/diff.c:963
+#: src/diff.c:970
#, fuzzy
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d --minimal Obair go crua le haghaidh níos lú athruithe."
-#: src/diff.c:964
+#: src/diff.c:971
#, fuzzy
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr "--horizon-lines=UIMH Coinnigh UIMH líne den réimír/iarmhír choiteann."
-#: src/diff.c:965
+#: src/diff.c:972
#, fuzzy
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
"-H --speed-large-files Comhaid móra agus go leor mionathruithe forleata."
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr "--normal Aschuir diff coitianta."
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr ""
-#: src/diff.c:972
+#: src/diff.c:979
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "-v --version Taispeáin eolas faoin leagan."
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"COMHAID = `COMHAD1 COMHAD2' nó `COMHADLANN1 COMHADLANN2' nó `COMHADLANN "
"COMHAD...' nó `COMHAD... COMHADLANN'."
-#: src/diff.c:975
+#: src/diff.c:982
#, fuzzy
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Má tá --from-file nó --to-file tugtha, níl a leithéid de shrian ar COMHAID."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
#, fuzzy
msgid "If a FILE is '-', read standard input."
msgstr "Más '-' é an COMHAD, léigh ón ionchur caighdeánach."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Úsáid: %s [ROGHA]... COMHAID\n"
-#: src/diff.c:987
+#: src/diff.c:994
#, fuzzy
msgid "Compare FILES line by line."
msgstr "Déan comparáid idir na comhaid, líne ar líne."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, fuzzy, c-format
msgid "conflicting %s option value '%s'"
msgstr "luach contrártha don rogha %s: `%s'"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "roghanna contrártha le haghaidh na stíle aschuir"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "leithead neamhbhailí `%s'"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "I %s amháin: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
#, fuzzy
msgid "cannot compare '-' to a directory"
msgstr "ní féidir `-' a chur i gcomparáid le comhadlann"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "Níl an rogha -D ar fáil do chomhadlanna"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Fochomhadlanna i gcoitianta: %s agus %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Tá comhad %s ina %s ach tá comhad %s ina %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, fuzzy, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Tá difríocht idir na comhaid %s agus %s\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Is comhionann iad na comhaid %s agus %s\n"
msgid "Randy Smith"
msgstr ""
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "roghanna neamh-chomhoiriúnacha"
-#: src/diff3.c:353
+#: src/diff3.c:388
#, fuzzy
msgid "'-' specified for more than one input file"
msgstr "bhí `-' tugtha le haghaidh níos mó ná inchomhad amháin"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "theip ar léamh"
-#: src/diff3.c:428
+#: src/diff3.c:473
#, fuzzy
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A --show-all Taispeáin gach athrú agus cuir coinbhleachtaí idir lúibíní."
-#: src/diff3.c:430
+#: src/diff3.c:475
#, fuzzy
msgid ""
"-e, --ed output ed script incorporating changes\n"
"-e --ed Scríobh i MOCHOMHAD na hathruithe neamhchumaiscthe ó SEANCHOMHAD "
"go DOCHOMHAD."
-#: src/diff3.c:432
+#: src/diff3.c:477
#, fuzzy
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E --show-overlap Taispeáin na hathruithe neamhchumaiscthe agus cuir "
"coinbhleachtaí idir lúibíní."
-#: src/diff3.c:433
+#: src/diff3.c:478
#, fuzzy
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr "-3 --easy-only Taispeáin athruithe neamhchumaiscthe forluiteacha."
-#: src/diff3.c:434
+#: src/diff3.c:479
#, fuzzy
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x --overlap-only Taispeáin na hathruithe forluiteacha."
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
-#: src/diff3.c:436
+#: src/diff3.c:481
#, fuzzy
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i Cuir na horduithe `w' agus `q' le scripteanna `ed'."
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text Caith le gach comhad mar théacschomhad."
-#: src/diff3.c:442
+#: src/diff3.c:487
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
"--strip-trailing-cr Dealaigh aisfhilleadh carráiste ó gach líne ionchurtha."
-#: src/diff3.c:443
+#: src/diff3.c:488
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab Ailínigh táib trí tháb a chur in ionad spás tosaigh."
-#: src/diff3.c:444
+#: src/diff3.c:489
#, fuzzy
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
"--diff-program=CLÁR Bain úsáid as an CLÁR chun comhaid a chur i "
"gcomparáid."
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr ""
-#: src/diff3.c:449
+#: src/diff3.c:494
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "-v --version Taispeáin eolas faoin leagan."
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Úsáid: %s [ROGHA]... MOCHOMHAD SEANCHOMHAD DOCHOMHAD\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Cuir trí chomhad i gcomparáid, líne ar líne."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr "Stádas scortha = 0 (rathúil), 1 (coinbhleachtaí), 2 (trioblóid)."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "earráid inmheánach: formáid de na bloic diff trína chéile"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: theip ar diff: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "earráid inmheánach: cineál neamhbhailí diff san fheidhm process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "formáid diff neamhbhailí; teorantóir neamhbhailí idir athruithe"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "formáid neamhbhailí diff; líne deiridh neamhiomlán"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, fuzzy, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "níorbh fhéidir an fochlár `%s' a rith"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "formáid neamhbhailí diff; carachtair mhíchearta ag tosach na líne"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr ""
"earráid inmheánach: seachadadh cineál neamhbhailí diff go dtí an aschur"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "crapadh an t-inchomhad"
"v:\tCuir comhlínte san áireamh go foclach.\n"
"q:\tScoir.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: rogha anaithnid `--%s'\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: GNU diffutils 3.2\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2011-10-17 12:43+0100\n"
"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr "Axuda xeral ao usar software GNU: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Os ficheiros %s e %s son diferentes\n"
msgid "Binary files %s and %s differ\n"
msgstr "Os ficheiros binarios %s e %s son diferentes\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Non hai un salto de liña na fin da liña"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, fuzzy, c-format
msgid "Try '%s --help' for more information."
msgstr "Probe «%s --help» para obter máis información."
msgid "options -l and -s are incompatible"
msgstr "as opcións -l e -s son incompatíbeis"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "fallou a escritura"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "saída estándar"
"at the beginning of each file (zero by default)."
msgstr "N1 e N2 son o número de bytes a omitir en cada ficheiro."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Se un FICHEIRO é «-» ou non se indica, lese da entrada estándar."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"O estado de saída é 0 se as entradas son iguais, 1 se son diferentes, 2 en "
msgid "invalid --bytes value '%s'"
msgstr "valor de --bytes «%s» non válido"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, fuzzy, c-format
msgid "missing operand after '%s'"
msgstr "falta un operando despois de «%s»"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, fuzzy, c-format
msgid "extra operand '%s'"
msgstr "operando «%s» sobrante"
msgid "pagination not supported on this host"
msgstr "a paxinación non está admitida nesta máquina"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "demasiadas opcións de etiquetas de ficheiro"
msgid "conflicting tabsize options"
msgstr "opcións de tamaño de tabulación conflitivas"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "Especificáronse --from-file e --to-file ao mesmo tempo"
-#: src/diff.c:883
+#: src/diff.c:890
#, fuzzy
msgid " --normal output a normal diff (the default)"
msgstr "Aparencia predefinida no modo normal"
-#: src/diff.c:884
+#: src/diff.c:891
#, fuzzy
msgid "-q, --brief report only when files differ"
msgstr "-q --brief Producir unha saída só se os ficheiros teñen diferencias."
-#: src/diff.c:885
+#: src/diff.c:892
#, fuzzy
msgid "-s, --report-identical-files report when two files are the same"
msgstr ""
"-s --report-identical-files Informar cando dous ficheiros son o mesmo."
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
-#: src/diff.c:887
+#: src/diff.c:894
#, fuzzy
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr "-w NÚM --width=NÚM Amosar como moito NÚM columnas (130 por omisión)."
-#: src/diff.c:888
+#: src/diff.c:895
#, fuzzy
msgid "-e, --ed output an ed script"
msgstr "Gardar a saída da consola de Script-Fu"
-#: src/diff.c:889
+#: src/diff.c:896
#, fuzzy
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs Producir un diff en formato RCS."
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr ""
-#: src/diff.c:891
+#: src/diff.c:898
#, fuzzy
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr "-w NÚM --width=NÚM Amosar como moito NÚM columnas (130 por omisión)."
-#: src/diff.c:892
+#: src/diff.c:899
#, fuzzy
msgid ""
" --left-column output only the left column of common lines"
msgstr "-l --left-column Amosar só a columna da esquerda nas liñas comúns."
-#: src/diff.c:893
+#: src/diff.c:900
#, fuzzy
msgid " --suppress-common-lines do not output common lines"
msgstr "-s --suppress-common-lines Non amosar as liñas comúns."
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
"--from-file=FICH1 Comparar FICH1 con todos os operandos. Pode ser "
"directorio."
-#: src/diff.c:900
+#: src/diff.c:907
#, fuzzy
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t --expand-tabs Expandir as tabulacións a espazos na saída."
-#: src/diff.c:901
+#: src/diff.c:908
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab Facer que as tabulacións queden aliñadas poñendo outra\n"
" tabulación ao principio da liña."
-#: src/diff.c:902
+#: src/diff.c:909
#, fuzzy
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr "--tabsize=NÚM Tabulacións de NÚM columnas (8 por omisión)."
-#: src/diff.c:903
+#: src/diff.c:910
#, fuzzy
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
"--suppress-blank-empty Suprime espazos ou tabuladores antes dunha liña "
"baleira."
-#: src/diff.c:904
+#: src/diff.c:911
#, fuzzy
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr "-l --paginate Pasar a saída por «pr» para paxinala."
-#: src/diff.c:906
+#: src/diff.c:913
#, fuzzy
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r --recursive Comparar recursivamente os subdirectorios que se atopen."
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
-#: src/diff.c:908
+#: src/diff.c:915
#, fuzzy
msgid "-N, --new-file treat absent files as empty"
msgstr "-N --new-file Tratar os ficheiros ausentes como baleiros."
-#: src/diff.c:909
+#: src/diff.c:916
#, fuzzy
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
"--unidirectional-new-file Tratar os ficheiros antigos ausentes como\r\n"
"a baleiros."
-#: src/diff.c:910
+#: src/diff.c:917
#, fuzzy
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
"--ignore-file-name-case Ignorar maiúsculas/minúsculas no nome do ficheiro."
-#: src/diff.c:911
+#: src/diff.c:918
#, fuzzy
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
"--no-ignore-file-name-case Ter en conta as maiúsculas/minúsculas\r\n"
" ao comparar os nomes dos ficheiros."
-#: src/diff.c:912
+#: src/diff.c:919
#, fuzzy
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x MOD --exclude=MOD Excluír os ficheiros que coinciden co MODelo."
-#: src/diff.c:913
+#: src/diff.c:920
#, fuzzy
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
"-X FICH --exclude-from=FICH Excluír ficheiros que coinciden con algún\r\n"
" modelo do FICHeiro."
-#: src/diff.c:914
+#: src/diff.c:921
#, fuzzy
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S FICH --starting-file=FICH Comezar no FICHeiro ao comparar directorios."
-#: src/diff.c:915
+#: src/diff.c:922
#, fuzzy
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
"--from-file=FICH1 Comparar FICH1 con todos os operandos. Pode ser "
"directorio."
-#: src/diff.c:917
+#: src/diff.c:924
#, fuzzy
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
"--to-file=FICH2 Comparar todos os operandos con FICH2. Pode ser un "
"directorio."
-#: src/diff.c:920
+#: src/diff.c:927
#, fuzzy
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i --ignore-case Ignorar maiúsculas/minúsculas no contido do ficheiro."
-#: src/diff.c:921
+#: src/diff.c:928
#, fuzzy
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E --ignore-tab-expansion Ignorar os cambios pola expansión de tabulacións."
-#: src/diff.c:922
+#: src/diff.c:929
#, fuzzy
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-w --ignore-all-space Ignorar todos os espazos en branco."
-#: src/diff.c:923
+#: src/diff.c:930
#, fuzzy
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b --ignore-space-change Ignorar os cambios na cantidade de espazos."
-#: src/diff.c:924
+#: src/diff.c:931
#, fuzzy
msgid "-w, --ignore-all-space ignore all white space"
msgstr "Todo visíbel (ignorar patrón)"
-#: src/diff.c:925
+#: src/diff.c:932
#, fuzzy
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
"-B --ignore-blank-lines Ignorar os cambios que teñan todas as liñas en "
"branco"
-#: src/diff.c:926
+#: src/diff.c:933
#, fuzzy
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"todas as liñas\r\n"
" conteñan EXPR-REG."
-#: src/diff.c:928
+#: src/diff.c:935
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text Tratar todos os ficheiros como texto"
-#: src/diff.c:929
+#: src/diff.c:936
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
"--strip-trailing-cr Eliminar os retornos de carro á fin das liñas de "
"entrada."
-#: src/diff.c:931
+#: src/diff.c:938
#, fuzzy
msgid " --binary read and write data in binary mode"
msgstr "--binary Ler e escribir datos en modo binario."
-#: src/diff.c:934
+#: src/diff.c:941
#, fuzzy
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D NOME -ifdef=NOME Amosar o ficheiro mesturado con diffs «#ifdef NOME»."
-#: src/diff.c:935
+#: src/diff.c:942
#, fuzzy
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
"\r\n"
" con GFMT."
-#: src/diff.c:936
+#: src/diff.c:943
#, fuzzy
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
"--line-format=LFMT Similar, mais formatar todas as liñas de entrada con "
"LFMT."
-#: src/diff.c:937
+#: src/diff.c:944
#, fuzzy
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
"\r\n"
" con LFMT."
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
#, fuzzy
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE é «old» (antigo), «new» (novo) ou «unchanged» (sen cambios).\r\n"
" GTYPE é LTYPE ou «changed» (con cambios)."
-#: src/diff.c:941
+#: src/diff.c:948
#, fuzzy
msgid ""
" GFMT (only) may contain:\n"
" E F-1\n"
" M L+1"
-#: src/diff.c:953
+#: src/diff.c:960
#, fuzzy
msgid ""
" LFMT (only) may contain:\n"
" %l contido da liña, excluíndo os saltos de liña finais\n"
" %[-][ANCHO][.[PREC]]{doxX}n especif. estilo printf do número da liña"
-#: src/diff.c:957
+#: src/diff.c:964
#, fuzzy
msgid ""
" Both GFMT and LFMT may contain:\n"
" %c«C» o carácter C\n"
" %c«\\OOO» o carácter de código octal OOO"
-#: src/diff.c:963
+#: src/diff.c:970
#, fuzzy
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d --minimal Procurar atopar o conxunto de cambios máis pequeno."
-#: src/diff.c:964
+#: src/diff.c:971
#, fuzzy
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr "--horizon-lines=NUM Manter NUM liñas do prefixo e sufixo comúns."
-#: src/diff.c:965
+#: src/diff.c:972
#, fuzzy
msgid ""
" --speed-large-files assume large files and many scattered small changes"
"-H --speed-large-files Asumir ficheiros longos e pequenos cambios "
"dispersos."
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr "Aparencia predefinida no modo normal"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr ""
-#: src/diff.c:972
+#: src/diff.c:979
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "Mostrar información da versión e saír"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"Os FICHEIROS son «FICH1 FICH2», «DIR1 DIR2», «DIR FICH...» ou «FICH... DIR»."
-#: src/diff.c:975
+#: src/diff.c:982
#, fuzzy
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Se se indica --from-file ou --to-file, non hai restricións nos FICHEIROS."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
#, fuzzy
msgid "If a FILE is '-', read standard input."
msgstr "Se un FICHEIRO é «-», lese da entrada estándar."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Uso: %s [OPCIÓN]... FICHEIROS\n"
-#: src/diff.c:987
+#: src/diff.c:994
#, fuzzy
msgid "Compare FILES line by line."
msgstr "Comparar os ficheiros liña a liña."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, fuzzy, c-format
msgid "conflicting %s option value '%s'"
msgstr "valor «%1$s» da opción %2$s conflitivo"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "opcións de estilo da saída conflitivas"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "largo «%s» non válido"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Só en %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
#, fuzzy
msgid "cannot compare '-' to a directory"
msgstr "non se pode comparar «-» cun directorio"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "A opción -D non está admitida con directorios"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Subdirectorios comúns: %s e %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "O ficheiro %s é un %s mentres que o ficheiro %s é un %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, fuzzy, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Os ficheiros %s e %s son diferentes\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Os ficheiros %s e %s son idénticos\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "opcións incompatíbeis"
-#: src/diff3.c:353
+#: src/diff3.c:388
#, fuzzy
msgid "'-' specified for more than one input file"
msgstr "Especificouse «-» para máis dun ficheiro de entrada"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "fallou a lectura"
-#: src/diff3.c:428
+#: src/diff3.c:473
#, fuzzy
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-a --show-all Amosar todos os cambios, cos conflitos entre parénteses."
-#: src/diff3.c:430
+#: src/diff3.c:475
#, fuzzy
msgid ""
"-e, --ed output ed script incorporating changes\n"
msgstr ""
"-e --ed Produce cambios sen mesturar de FICH-ANTIGO a TEU-FICH en MEU-FICH."
-#: src/diff3.c:432
+#: src/diff3.c:477
#, fuzzy
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E --show-overlap Amosar cambios sen mesturar cos conflitos entre "
"parénteses."
-#: src/diff3.c:433
+#: src/diff3.c:478
#, fuzzy
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr "-3 --easy-only Amosar cambios non sobrepostos e non mesturados."
-#: src/diff3.c:434
+#: src/diff3.c:479
#, fuzzy
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x --overlap-only Amosar los cambios que se superpoñen."
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
-#: src/diff3.c:436
+#: src/diff3.c:481
#, fuzzy
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i Engadir as ordes «w» e «q» aos scripts en ed."
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text Tratar todos os ficheiros como texto"
-#: src/diff3.c:442
+#: src/diff3.c:487
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
"--strip-trailing-cr Eliminar os retornos de carro á fin das liñas de "
"entrada."
-#: src/diff3.c:443
+#: src/diff3.c:488
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab Facer que as tabulacións queden aliñadas poñendo outra\n"
" tabulación ao principio da liña."
-#: src/diff3.c:444
+#: src/diff3.c:489
#, fuzzy
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
"--diff-program=PROGRAMA Empregar o PROGRAMA para comparar os ficheiros."
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr ""
-#: src/diff3.c:449
+#: src/diff3.c:494
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "Mostrar información da versión e saír"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Uso: %s [OPCIÓN]... MEU-FICH ANTIGO-FICH TEU-FICH\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Comparar tres ficheiros liña a liña."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"O estado de saída é 0 se é correcto, 1 se hai conflitos, 2 en caso de "
"problema."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "erro interno: fallo no formato dos bloques diff"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff fallou: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "erro interno: tipo de diff non válido en process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "formato de diff non válido; separador de cambios non válido"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "formato de diff non válido: última liña incompleta"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, fuzzy, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "non foi posíbel invocar o programa subsidiario «%s»"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "formato de diff non válido: caracteres a principio de liña incorrectos"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "erro interno_ tipo de diff non válido pasado á saída"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "o ficheiro de entrada minguou"
"v: Inclúe liñas comúns de xeito detallado.\n"
"q: Saír.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: non se recoñece a opción «--%s»\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 2.8.3\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2002-06-17 13:03+0300\n"
"Last-Translator: Eli Zaretskii <eliz@gnu.org>\n"
"Language-Team: Hebrew <eliz@gnu.org>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr ""
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "äæî äæ íéðåù `%s'-å `%s' íéöá÷ä\n"
msgid "Binary files %s and %s differ\n"
msgstr "äæî äæ íéðåù `%s'-å `%s' íééøðéá íéöá÷\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "õáå÷ä óåñá äùãç-äøåù åú øñç"
msgid "David MacKenzie"
msgstr ""
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, fuzzy, c-format
msgid "Try '%s --help' for more information."
msgstr ".øúåé áø òãéî úâöäì `%s --help' ùé÷äì äñð"
msgid "options -l and -s are incompatible"
msgstr "äæ úà äæ íéøúåñ -s-å -l íéðééôàîä"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "äáéúëá äì÷ú"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "éð÷ú èìô õåøòì"
"at the beginning of each file (zero by default)."
msgstr " .íéöá÷äî ãçà ìëá âìãì ùé íäéìò íéúáä éøôñî íä SKIP2-å SKIP1"
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr " .éð÷ú èì÷ õåøòî àø÷ ,ïééåöî åðéà åà `-' åðéä FILE íà"
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
msgid "invalid --bytes value '%s'"
msgstr "--bytes ïééôàî øåáò `%s' éåâù êøò"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, fuzzy, c-format
msgid "missing operand after '%s'"
msgstr "`%s' éøçà øñç èðîåâøà"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, fuzzy, c-format
msgid "extra operand '%s'"
msgstr "`%s' éøçà øúåéî èðîåâøà"
msgid "pagination not supported on this host"
msgstr "åæ úëøòîá èìôä ãåîéòá äëéîú ïéà"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "íéöá÷ úéååú øåáò -L éðééôàî éãî øúåé"
msgid "conflicting tabsize options"
msgstr "íéøúåñ Tab áçåø éðééôàî"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "--to-file ïäå --from-file ïä úðééö"
-#: src/diff.c:883
+#: src/diff.c:890
#, fuzzy
msgid " --normal output a normal diff (the default)"
msgstr " .ìéâø èîøåôá íééåðéù ÷ôä --normal"
-#: src/diff.c:884
+#: src/diff.c:891
#, fuzzy
msgid "-q, --brief report only when files differ"
msgstr " .íéðåù íéöá÷ä íà øåîà ÷ø -q --brief"
-#: src/diff.c:885
+#: src/diff.c:892
#, fuzzy
msgid "-s, --report-identical-files report when two files are the same"
msgstr ""
" .íéäæ íéöá÷ ìò çååã -s --report-identical-files"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
-#: src/diff.c:887
+#: src/diff.c:894
#, fuzzy
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ".äøåùì (130 ç\"îøá) íéååú NUM øúåéä ìëì âöä -w NUM --width=NUM"
-#: src/diff.c:888
+#: src/diff.c:895
#, fuzzy
msgid "-e, --ed output an ed script"
msgstr " .ed êøåò øåáò úåàøåä úîéùø ÷ôä -e --ed"
-#: src/diff.c:889
+#: src/diff.c:896
#, fuzzy
msgid "-n, --rcs output an RCS format diff"
msgstr " .RCS èîøåôá íééåðéù ÷ôä -n --rcs"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr ""
-#: src/diff.c:891
+#: src/diff.c:898
#, fuzzy
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ".äøåùì (130 ç\"îøá) íéååú NUM øúåéä ìëì âöä -w NUM --width=NUM"
-#: src/diff.c:892
+#: src/diff.c:899
#, fuzzy
msgid ""
" --left-column output only the left column of common lines"
msgstr " .úéìàîùä úà ÷ø âöä ,úåäæ úåøåùä íà -l --left-column"
-#: src/diff.c:893
+#: src/diff.c:900
#, fuzzy
msgid " --suppress-common-lines do not output common lines"
msgstr ""
" .úåäæ úåøåù ììë âéöú ìà -s --suppress-common-lines"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
msgstr ""
".äé÷éú úåéäì ìåëé FILE1 .íéèðîåâøàä øàù ìëì FILE1 äååùä --from-file=FILE1"
-#: src/diff.c:900
+#: src/diff.c:907
#, fuzzy
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr " .èìôá íéçååøì TAB éååú êåôä -t --expand-tabs"
-#: src/diff.c:901
+#: src/diff.c:908
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr " .äøåùä éðôì TAB \"ò íé-TAB øùé -T --initial-tab"
-#: src/diff.c:902
+#: src/diff.c:909
#, fuzzy
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr " .(8 ç\"îøá) úåãåîò NUM ìë Tab --tabsize=NUM"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
-#: src/diff.c:904
+#: src/diff.c:911
#, fuzzy
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr " .ãåîéò íùì `pr' êøã èìô áúð -l --paginate"
-#: src/diff.c:906
+#: src/diff.c:913
#, fuzzy
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr " .éáéñøå÷ø ïôåàá úåé÷éú-úú äååùä -r --recursive"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
-#: src/diff.c:908
+#: src/diff.c:915
#, fuzzy
msgid "-N, --new-file treat absent files as empty"
msgstr " .íé÷éø åéä åìéàë íéøñç íéöá÷á ìôè -N --new-file"
-#: src/diff.c:909
+#: src/diff.c:916
#, fuzzy
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" .íé÷éø åéä åìéàë íéøñç íéðåùàø íéöá÷á ìôè --unidirectional-new-file"
-#: src/diff.c:910
+#: src/diff.c:917
#, fuzzy
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ".íéöá÷ä úåîùá úåðè÷î úåìåãâ úåéúåà ìéãáú ìà --ignore-file-name-case"
-#: src/diff.c:911
+#: src/diff.c:918
#, fuzzy
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" .íéöá÷ä úåîùá úåðè÷î úåìåãâ úåéúåà ìéãáú --no-ignore-file-name-case"
-#: src/diff.c:912
+#: src/diff.c:919
#, fuzzy
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr " .PAT úéðáúì íéîéàúî íäéúåîùù íéöá÷ ìò âìã -x PAT --exclude=PAT"
-#: src/diff.c:913
+#: src/diff.c:920
#, fuzzy
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"FILE-á úåéðáúì íéîéàúî íäéúåîùù íéöá÷ ìò âìã -X FILE --exclude-from=FILE"
-#: src/diff.c:914
+#: src/diff.c:921
#, fuzzy
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
" .FILE õáå÷á úåé÷éú úàååùä ìçúä -S FILE --starting-file=FILE"
-#: src/diff.c:915
+#: src/diff.c:922
#, fuzzy
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
msgstr ""
".äé÷éú úåéäì ìåëé FILE1 .íéèðîåâøàä øàù ìëì FILE1 äååùä --from-file=FILE1"
-#: src/diff.c:917
+#: src/diff.c:924
#, fuzzy
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
msgstr ""
" .äé÷éú úåéäì ìåëé FILE2 .FILE2-ì íéèðîåâøàä ìë äååùä --to-file=FILE2"
-#: src/diff.c:920
+#: src/diff.c:927
#, fuzzy
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ".íéöá÷ä ïëåúá úåðè÷î úåìåãâ úåéúåà ìéãáú ìà -i --ignore-case"
-#: src/diff.c:921
+#: src/diff.c:928
#, fuzzy
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
" .íéçååøì TAB ïéá íéìãáäî íìòúä -E --ignore-tab-expansion"
-#: src/diff.c:922
+#: src/diff.c:929
#, fuzzy
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr " .íéçååøä ìëî íìòúä -w --ignore-all-space"
-#: src/diff.c:923
+#: src/diff.c:930
#, fuzzy
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr " .íéçååø úåîëá íéìãáäî íìòúä -b --ignore-space-change"
-#: src/diff.c:924
+#: src/diff.c:931
#, fuzzy
msgid "-w, --ignore-all-space ignore all white space"
msgstr " .íéçååøä ìëî íìòúä -w --ignore-all-space"
-#: src/diff.c:925
+#: src/diff.c:932
#, fuzzy
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr " .úå÷éø íäéúåøåùù íééåðéùî íìòúä -B --ignore-blank-lines"
-#: src/diff.c:926
+#: src/diff.c:933
#, fuzzy
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
".RE úéðáúì úåîéàúî íäéúåøåùù íééåðéùî íìòúä -I RE --ignore-matching-lines=RE"
-#: src/diff.c:928
+#: src/diff.c:935
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr " .èñ÷è éöá÷áë íéöá÷ä ìëá ìôè -a --text"
-#: src/diff.c:929
+#: src/diff.c:936
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " .èì÷ úøåù ìë óåñî CR éååú ÷ìñ --strip-trailing-cr"
-#: src/diff.c:931
+#: src/diff.c:938
#, fuzzy
msgid " --binary read and write data in binary mode"
msgstr " .éøàðéá ïôåàá áåúëå àø÷ --binary"
-#: src/diff.c:934
+#: src/diff.c:941
#, fuzzy
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr "`#ifdef NAME'-á íééåðéù ãøôä ,áìåùî õáå÷ ÷ôä -D NAME --ifdef=NAME"
-#: src/diff.c:935
+#: src/diff.c:942
#, fuzzy
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
"GFMT úøæòá GTYPE âåñî èì÷ úåöåá÷ èîøô êà ,ì\"ðë --GTYPE-group-format=GFMT"
-#: src/diff.c:936
+#: src/diff.c:943
#, fuzzy
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr " .LFMT úøæòá úåøåù èîøô êà ,ì\"ðë --line-format=LFMT"
-#: src/diff.c:937
+#: src/diff.c:944
#, fuzzy
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
".LFMT úøæòá LTYPE âåñî èì÷ úåøåù èîøô êà ,ì\"ðë --LTYPE-group-format=LFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
#, fuzzy
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr " .`changed' åà LTYPE åîë GTYPE .`unchanged' åà `new' ,`old' àåä LTYPE"
-#: src/diff.c:941
+#: src/diff.c:948
#, fuzzy
msgid ""
" GFMT (only) may contain:\n"
" F-1 E\n"
" M+1 M"
-#: src/diff.c:953
+#: src/diff.c:960
#, fuzzy
msgid ""
" LFMT (only) may contain:\n"
" äøåùä óåñ åú èòîì äøåù ïëåú %l\n"
"èì÷ úøåù øåáò printf ïåðâñá úæåøçî %[-][WIDTH][.[PREC]]{doxX}n"
-#: src/diff.c:957
+#: src/diff.c:964
#, fuzzy
msgid ""
" Both GFMT and LFMT may contain:\n"
" C ããåá åú %c'C'\n"
" OOO éìè÷åà ãå÷ ìòá åú %c'\\OOO'"
-#: src/diff.c:963
+#: src/diff.c:970
#, fuzzy
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr " .íééåðéùä úöåá÷ úà ïéè÷äì ìãúùä -d --minimal"
-#: src/diff.c:964
+#: src/diff.c:971
#, fuzzy
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
".íéöá÷ä íåéñå äìéçúá úåôúåùî úåøåù NUM øàùä --horizon-lines=NUM"
-#: src/diff.c:965
+#: src/diff.c:972
#, fuzzy
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr " .íé÷çåøîå íéðè÷ íééåðéùå íéìåãâ íéöá÷ çðä -H --speed-large-files"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " .ìéâø èîøåôá íééåðéù ÷ôä --normal"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr ""
-#: src/diff.c:972
+#: src/diff.c:979
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr " .úéðëúä úñøéâ úà âöä -v --version"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
".`FILE... DIR' åà `DIR FILE...' åà `DIR1 DIR2' åà `FILE1 FILE2' íä FILES"
-#: src/diff.c:975
+#: src/diff.c:982
#, fuzzy
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
" .FILES ìò úåìáâî ïéà éæà ,--to-file åà --from-file ïééôàî ïåúð íà"
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
#, fuzzy
msgid "If a FILE is '-', read standard input."
msgstr ""
" .éð÷úä èì÷ä õøòî àø÷ ,`-' àåä FILE íà"
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "%s [OPTION]... FILES :ùåîéù ïôåà\n"
-#: src/diff.c:987
+#: src/diff.c:994
#, fuzzy
msgid "Compare FILES line by line."
msgstr ".äøåù äøåù íéöá÷ éðù äååùä"
-#: src/diff.c:1021
+#: src/diff.c:1028
#, fuzzy, c-format
msgid "conflicting %s option value '%s'"
msgstr "%s ïééôàî ìù íãå÷ êøò øúåñ `%s' êøò"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "èìô ïåðâñ ìù íéøúåñ íéðééôàî"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "`%s' éåâù äøåù áçåø"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "%s-á ÷ø àöîð %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
#, fuzzy
msgid "cannot compare '-' to a directory"
msgstr "äé÷éúì `-' úååùäì úåøùôà ïéà"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "úåé÷éú øåáò -D ïééôàîá äëéîú ïéà"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "%s-å %s :úåäæ úåé÷éú-úú\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "%s %s-ì %s %s úååùäì ïúéð àì\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, fuzzy, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "äæî äæ íéðåù `%s'-å `%s' íéöá÷ä\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "íéäæ íðéä %s-å %s íéöá÷ä\n"
msgid "Randy Smith"
msgstr ".Randy Smith é\"ò áúëð"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "íéøúåñ íéðééôàî"
-#: src/diff3.c:353
+#: src/diff3.c:388
#, fuzzy
msgid "'-' specified for more than one input file"
msgstr "ãçà èì÷ õáå÷î øúåé øåáò `-' úðééö"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "äàéø÷á äì÷ú"
-#: src/diff3.c:428
+#: src/diff3.c:473
#, fuzzy
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr " .íéè÷éìôðå÷ ïîñ ,íééåðéùä ìë úà âöä -A --show-all"
-#: src/diff3.c:430
+#: src/diff3.c:475
#, fuzzy
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
msgstr "MYFILE êåú ìà YOURFILE-ì OLDFILE-î âåæéî àìì íééåðéù -e --ed"
-#: src/diff3.c:432
+#: src/diff3.c:477
#, fuzzy
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
" .íéè÷éìôðå÷ ïîñ ,âåæéî àìì íééåðéù âöä -E --show-overlap"
-#: src/diff3.c:433
+#: src/diff3.c:478
#, fuzzy
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr " .âåæéî àììå íéôôåç íðéàù íééåðéù âöä -3 --easy-only"
-#: src/diff3.c:434
+#: src/diff3.c:479
#, fuzzy
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
" .íéôôåç íééåðéù âöä -x --overlap-only"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
-#: src/diff3.c:436
+#: src/diff3.c:481
#, fuzzy
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr " .ed úåãå÷ô íåéñá `q'-å `w' úåãå÷ô áåúë -i"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr " .èñ÷è éöá÷áë íéöá÷ä ìëá ìôè -a --text"
-#: src/diff3.c:442
+#: src/diff3.c:487
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " .èì÷ úøåù ìë óåñî CR éååú ÷ìñ --strip-trailing-cr"
-#: src/diff3.c:443
+#: src/diff3.c:488
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr " .äøåùä éðôì TAB \"ò íé-TAB øùé -T --initial-tab"
-#: src/diff3.c:444
+#: src/diff3.c:489
#, fuzzy
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
" .íéöá÷ úàåùäì PROGRAM úéðëúá ùîúùä --diff-program=PROGRAM"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr ""
-#: src/diff3.c:449
+#: src/diff3.c:494
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr " .úéðëúä úñøéâ úà âöä -v --version"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "%s [OPTION]... MYFILE OLDFILE YOURFILE :ùåîéù ïôåà\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr ".úéáì úéá íéöá÷ äùìù äååùä"
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "diff éòè÷ èîøåôá äçéøî :úéîéðô äðëú úàéâù"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s é\"ò diff úìòôäá äì÷ú :"
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "process_diff úééö÷ðåôá éåðéù ìù éåâù âåñ :úéîéðô äðëú úàéâù"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "äéåâù íééåðéù úãøôä úæåøçî :éåðéù ìù éåâù èîøåô"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "äîìù äðéà äðåøçà äøåù :éåðéù ìù éåâù èîøåô"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, fuzzy, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "äàöîð àì `%s' úéðëú-úú"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "äøåù úìéçúá íééåâù íéååú :éåðéù ìù éåâù èîøåô"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "èìô éëøöì éåðéù ìù éåâù âåñ :úéîéðô äðëú úàéâù"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "÷îèöä èì÷ õáå÷"
"v -- ïúâöä êåú úåôúåùî úåøåù ÷úòä\n"
"q -- äàéöé\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: GNU diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2012-12-21 00:37+0100\n"
"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
msgstr ""
"Općenita pomoć za korištenje GNU softvera: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Datoteke %s i %s se razlikuju\n"
msgid "Binary files %s and %s differ\n"
msgstr "Binarne datoteke %s i %s se razlikuju\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Nema novog retka na kraju datoteke"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Pokušajte „%s --help” za više informacija."
msgid "options -l and -s are incompatible"
msgstr "opcije -l i -s nisu kompatibilne"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "pisanje nije uspjelo"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "standardni izlaz"
"at the beginning of each file (zero by default)."
msgstr ""
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Izlazno stanje je 0 ako su ulazi jednaki, 1 ako se razlikuju, 2 u slučaju "
msgid "invalid --bytes value '%s'"
msgstr "neispravna --bytes vrijednost „%s”"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "nedostaje operand nakon „%s”"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "operand viška „%s”"
msgid "pagination not supported on this host"
msgstr "straničenje nije podržano na ovom računalu"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "previše opcija oznaka datoteka"
msgid "conflicting tabsize options"
msgstr "konfliktne opcije širine"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr ""
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal ispiši normalnu razliku (zadano)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief izvještaj samo kad se datoteke razlikuju"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files izvještaj samo kad su datoteke jednake"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed ispiši ed skriptu"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs ispiši razliku u RCS obliku"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side ispiši u dva stupca"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr ""
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
-#: src/diff.c:897
+#: src/diff.c:904
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" (can be repeated)"
msgstr ""
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t, --expand-tabs pretvori tabulatore u praznine u izlazu"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference ne slijedi simboličke veze"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr ""
"-N, --new-file postupaj s odsutnim datotekama kao s praznim"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case zanemari veličinu slova pri uspoređivanju "
"imena datoteka"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case ne zanemaruj veličinu slova pri "
"uspoređivanju imena datoteka"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
msgstr ""
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
msgstr ""
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr ""
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr ""
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr ""
"-a, --text postupaj sa svim datotekama kao s tekstualnim"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary čitaj i piši podatke u binarnom načinu"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" %(A=B?T:E) if A equals B then T else E"
msgstr ""
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number"
msgstr ""
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" C the character C (other characters represent themselves)"
msgstr ""
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal ispiši normalnu razliku (zadano)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help prikaži ovu pomoć i izađi"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version ispiši informacije o inačici i izađi"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"DATOTEKE su „DATOTEKA1 DATOTEKA2”, „DIR1 DIR2”, „DIR DATOTEKA...” ili "
"„DATOTEKA... DIR”."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Ako je DATOTEKA „-”, čitaj standardni ulaz."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Uporaba: %s [OPCIJA]... DATOTEKE\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Usporedi DATOTEKE redak po redak."
# Ovdje trebam zamijeniti poredak... Pogledati kako se to radi.
-#: src/diff.c:1021
+#: src/diff.c:1028
#, fuzzy, c-format
msgid "conflicting %s option value '%s'"
msgstr "konfliktna vrijednost „%s” opcije „%s”"
#
# Format:
# C
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "konfliktne opcije izlaznog stila"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "neispravna širina „%s”"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Samo u %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "ne mogu usporediti „-” s direktorijem"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "opcija -D nije podržana s direktorijima"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Uobičajeni poddirektoriji: %s i %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Datoteka %s je %s, a datoteka %s je %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Simboličke veze %s i %s se razlikuju\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Datoteke %s i %s su identične\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "nekompatibilne opcije"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "„-” je navedeno za više od jedne ulazne datoteke"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "čitanje nije uspjelo"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
msgstr ""
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr ""
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr ""
"-a, --text postupaj sa svim datotekama kao s tekstualnim"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help prikaži ovu pomoć i izađi"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version ispiši informacije o inačici i izađi"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr ""
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Usporedi tri datoteke redak po redak."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr "Izlazno stanje je 0 za uspjeh, 1 za neuspjeh, 2 u slučaju greške."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr ""
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff nije uspio: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "interna greška: neispravna diff vrsta u process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr ""
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "neispravan diff oblik, nepotpun posljednji redak"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "podređeni program „%s” se ne može pozvati"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr ""
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr ""
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "ulazna datoteka se smanjila"
"q:\tQuit.\n"
msgstr ""
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: neprepoznata opcija „--%s”\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2014-07-13 22:01+0200\n"
"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
"Általános segítség a GNU szoftverek használatához: <http://www.gnu.org/"
"gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "A(z) %s és a(z) %s fájlok különböznek\n"
msgid "Binary files %s and %s differ\n"
msgstr "A(z) %s és a(z) %s bináris fájlok különböznek\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Nincs új sor a fájl végén"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "További információkért próbálja a(z) „%s --help” parancsot."
msgid "options -l and -s are incompatible"
msgstr "a -l és a -s kapcsolók összeférhetetlenek"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "az írás sikertelen"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "szabványos kimenet"
"Az opcionális UGRÁS1 és UGRÁS2 megadja a minden egyes fájl elejéről "
"kihagyandó bájtok számát (alapértelmezetten nulla)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Ha a FÁJL a „-” vagy hiányzik, akkor a szabványos bemenetről olvas."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"A kilépési állapotkód 0, ha a bemenetek azonosak; 1, ha különbözők; 2, ha\n"
msgid "invalid --bytes value '%s'"
msgstr "érvénytelen --bytes érték: „%s”"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "hiányzó operandus a(z) „%s” után"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "extra operandus: „%s”"
msgid "pagination not supported on this host"
msgstr "a tördelés nem támogatott ezen a gépen"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "túl sok fájlcímke-beállítás"
msgid "conflicting tabsize options"
msgstr "ütköző tabulátorméret beállítások"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "a --from-file és a --to-file is meg van adva"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr ""
" --normal egy normál diff kimenet (az alapértelmezett)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief csak akkor jelent, ha a fájlok eltérnek"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files jelentés, ha a két fájl ugyanaz"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"3)\n"
" sorának kiírása"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U SZÁM, --unified[=SZÁM] a egységesített környezet SZÁM\n"
" (alapértelmezetten 3) sorának kiírása"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed egy ed parancsfájl kiírása"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs egy RCS formátumú diff kiírása"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side kimenet két oszlopban"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=SZÁM legfeljebb SZÁM (alapértelmezetten 130)\n"
" nyomtatási oszlop kiírása"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column a közös soroknak csak a bal oszlopának kiírása"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines ne írja ki a közös sorokat"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function jelenítse meg, mely C függvényben van változás"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=RK a legutóbbi RK-ra illeszkedő sor megjelenítése"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
msgstr ""
" --label CÍMKE CÍMKE használata fájlnév helyett (ismételhető)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t, --expand-tabs tabulátorok bővítése szóközökké a kimeneten"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab beigazítja a tabulátorokat egy tabulátor\n"
" hozzáfűzésével"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=SZÁM a tabulátor megáll minden SZÁMADIK\n"
" (alapértelmezetten 8) nyomtatási oszlopnál"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
"kimeneti\n"
" sorok előtt"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate kimenet átadása a „pr” parancsnak "
"lapszámozáshoz"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive a talált alkönyvtár rekurzív összehasonlítása"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference ne kövesse a szimbolikus linkeket"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file a hiányzó fájlokat üresként kezelje"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file a hiányzó első fájlokat üresként kezelje"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case kis- és nagybetűk figyelmen kívül hagyása\n"
" fájlnevek összehasonlításakor"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case kis- és nagybetűk figyelembe vétele\n"
" fájlnevek összehasonlításakor"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=MINTA a MINTÁRA illeszkedő fájlok kizárása"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=FÁJL a FÁJLBAN lévő bármely mintára illeszkedő\n"
" fájlok kizárása"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=FÁJL a FÁJLLAL kezdjen könyvtárak "
"összehasonlítását"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=FÁJL1 FÁJL1 összehasonlítása minden operandussal;\n"
" FÁJL1 lehet könyvtár is"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
"vel;\n"
" FÁJL2 lehet könyvtár is"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case kis- és nagybetű eltérések figyelmen kívül\n"
" hagyása a fájlok tartalmában"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion a tabulátorbővítés miatti változások "
"mellőzése"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space a sorvégi üres helyek mellőzése"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b, --ignore-space-change üres helyek számában lévő változások "
"mellőzése"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space minden üres hely mellőzése"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines változások mellőzése, ahol a sorok üresek"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RK változások mellőzése, ahol minden sor\n"
" illeszkedik az RK-ra"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text az összes fájl szövegként kezelése"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr a záró kocsi vissza levágása a bemenetről"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary adatok olvasása és írása bináris módon"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NÉV egyesített fájlkiírás a „#ifdef NÉV” diffs\n"
" használatával"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
" --GTYPE-group-format=GFMT a GTYPE bemeneti csoportok formázása GFMT-vel"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr " --line-format=LFMT minden bemeneti sor formázása LFMT-vel"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
" --LTYPE-line-format=LFMT az LTYPE bemeneti sorok formázása LFMT-vel"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Ezek a formázási lehetőségek részletes vezérlést biztosítanak a diff\n"
" kimenetén, általánosítva: -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" Az LTYPE „old”, „new” vagy „unchanged”. A GTYPE értéke LTYPE vagy "
"„changed”."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) ha A egyenlő B, akkor T, egyébként E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %[-][SZÉLESSÉG][.[PONTOSSÁG]]{doxX}n printf-stílusú megadás a bemeneti\n"
" sor számához"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' a OOO oktális kódú karakter\n"
" C a C karakter (más karakterek saját magukat ábrázolják)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
"-d, --minimal igyekszik egy kisebb változási halmazt megtalálni"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=SZÁM a közös előtag és utótag SZÁM sorának megtartása"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files nagy fájlokat és sok apró kis változást tételez fel"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr ""
" --normal egy normál diff kimenet (az alapértelmezett)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help ezen súgó megjelenítése és kilépés"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version verzióinformációk kiírása és kilépés"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"A FÁJLOK az alábbiak lehetnek „FÁJL1 FÁJL2” vagy „KÖNYVTÁR1 KÖNYVTÁR2” vagy\n"
"„KÖNYVTÁR FÁJL…” vagy „FÁJL… KÖNYVTÁR”."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"megszorítások\n"
"a FÁJLOKRA."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Ha a FÁJL a „-”, akkor a szabványos bemenetről olvas."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Használat: %s [KAPCSOLÓ]… FÁJLOK\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "FÁJLOK összehasonlítása sorról sorra."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "ütköző %s kapcsoló érték: „%s”"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "ütköző kimeneti stílus kapcsolók"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "érvénytelen szélesség: „%s”"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Csak ebben: %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "a „-” nem hasonlítható össze egy könyvtárral"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "A -D kapcsoló könyvtáraknál nem támogatott"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Közös alkönyvtárak: %s és %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "A(z) %s fájl egy %s, viszont a(z) %s fájl egy %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "A(z) %s és a(z) %s szimbolikus linkek különböznek\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "A(z) %s és a(z) %s fájlok azonosak\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "összeférhetetlen kapcsolók"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "a „-” több mint egy bemeneti fájlhoz lett megadva"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "olvasás sikertelen"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all minden változás kiírása, zárójelbe téve az\n"
" ütközéseket"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
" tartalmazza a RÉGIFÁJL és ÖNFÁJLJA "
"változásait"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E, --show-overlap mint a -e, de zárójelbe teszi az ütközéseket"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only mint a -e, de csak a nem átfedő változásokat\n"
" tartalmazza"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only mint a -e, de csak az átfedő változásokat\n"
" tartalmazza"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
"-X mint a -x, de zárójelbe teszi az ütközéseket"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i „w” és „q” parancsok hozzáfűzése az ed\n"
" parancsfájlokhoz"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"szerint,\n"
" ha más kapcsoló nincs megadva"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text az összes fájl szövegként kezelése"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr a záró kocsi vissza levágása a bemenetről"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab beigazítja a tabulátorokat egy tabulátor\n"
" hozzáfűzésével"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
" --diff-program=PROGRAM a PROGRAM használata fájlok összehasonlításához"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=CÍMKE CÍMKE használata fájlnév helyett\n"
" (legfeljebb háromszor ismételhető)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help ezen súgó megjelenítése és kilépés"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version verzióinformációk kiírása és kilépés"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Használat: %s [KAPCSOLÓ]… SAJÁTFÁJL RÉGIFÁJL ÖNFÁJLJA\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Három fájl összehasonlítása sorról sorra."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"belsőleg történő elvégzéséhez, és az aktuális egyesített fájlt írja ki.\n"
"Szokatlan bemenethez ez sokkal erőteljesebb az ed használatánál.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"A kilépési állapotkód 0, ha sikeres; 1, ha ütközés van; 2, ha hiba történt."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "belső hiba: zűrzavar az összehasonlítási blokkok formátumában"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: összehasonlítás sikertelen: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr ""
"belső hiba: érvénytelen összehasonlítási típus a process_diff függvényben"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "érvénytelen összehasonlítási formátum; érvénytelen változáselválasztó"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "érvénytelen összehasonlítási formátum; befejezetlen utolsó sor"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "a(z) „%s” kisegítő programot nem sikerült meghívni"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "érvénytelen összehasonlítási formátum; helytelen sor eleji karakterek"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "belső hiba: érvénytelen összehasonlítási típus lett átadva kimenetnek"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "a bementi fájl összement"
"v:\tA közös sorok felvétele bőbeszédűen.\n"
"q:\tKilépés.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: ismeretlen „--%s” kapcsoló\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2014-08-03 08:00+0700\n"
"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
msgstr ""
"Bantuan umum menggunakan perangkat lunak GNU: <http://www.gnu.org/gethelp>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Berkas %s dan %s berbeda\n"
msgid "Binary files %s and %s differ\n"
msgstr "File biner %s dan %s berbeda\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Tidak ada baris-baru di akhir dari berkas"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Coba '%s --help' untuk informasi lebih lanjut."
msgid "options -l and -s are incompatible"
msgstr "pilihan -l dan -s tidak kompatibel"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "gagal menulis"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "standar keluaran"
"SKIP1 dan SKIP2 adalah jumlah byte yang harus dilewati di tiap file.\n"
"at the beginning of each file (zero by default)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Jika sebuah FILE adalah '-' atau tidak ada, baca input standar"
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Status keluar adalah 0 jika masukan sama, 1 jika berbeda, 2 jika bermasalah."
msgid "invalid --bytes value '%s'"
msgstr "nilai --byte tidak valid '%s'"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "tidak ada operand setelah '%s'"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "operand ekstra '%s'"
msgid "pagination not supported on this host"
msgstr "paginasi tidak didukung pada host ini"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "terlalu banyak option label file"
msgid "conflicting tabsize options"
msgstr "option tabsize konflik"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "--from-file dan --to-file keduanya disebutkan"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr "--normal Output normal diff."
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief Tampilkan hanya apakah file berbeda."
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files Laporkan ketika dua file sama."
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-w, NUM --width=NUM Output paling banyak NUM (baku 130) kolom cetakan."
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed Output adalah script ed."
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs Output dalam format RCS diff."
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side output in two columns"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr "-W, --width=NUM Output paling banyak NUM (baku 130) kolom cetakan."
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr " --left-column Hanya tampilkan kolom kiri baris yang sama."
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines Jangan tampilkan baris yang sama."
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr "-p, --show-c-function show which C function each change is in"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr "-F, --show-function-line=RE show the most recent line matching RE"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label LABEL use LABEL instead of file name\n"
" (can be repeated)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t, --expand-tabs Ekspansi tab ke spasi dalam output."
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T, --initial-tab Buat tab beraturan dg menambahkan sebuah tab."
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr "--tabsize=NUM Tab stop adalah setiap NUM (default 8) kolom cetakan."
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
"--suppress-blank-empty Tekan spasi atau tab sebelum mengeluarkan baris "
"kosong."
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr "-l, --paginate Berikan output ke `pr' untuk di-paginate."
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr "-r, --recursive Membandingkan subdirektori secara rekursif."
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference don't follow symbolic links"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file Perlakukan tiada file sebagai kosong."
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
"--unidirectional-new-file Anggap file tidak ada pertama sebagai kosong."
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr "--ignore-file-name-case Abaikan case saat membandingkan nama file."
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
"--no-ignore-file-name-case Pertimbangkan case saat membandingkan nama file."
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=PAT Tanpa file yang cocok dengan PAT."
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=FILE Abaikan file yang cocok dengan pola dalam FILE"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=FILE Mulai dengan FILE ketika membandingkan direktori."
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
"direktori.\n"
" FILE1 can be a directory"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
"direktori.\n"
" FILE2 can be a directory"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr "-i, --ignore-case Abaikan beda case dalam isi file."
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr "-E, --ignore-tab-expansion Abaikan perubahan akibat ekspansi tab."
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-all-space Abaikan seluruh white space."
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b, --ignore-space-change Abaikan perubahan sejumlah white space."
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space Abaikan seluruh white space."
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr "-B, --ignore-blank-lines Abaikan perubahan baris kosong."
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE Abaikan perubahan baris yang cocok dg RE."
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text Perlakukan seluruh file sebagai teks."
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr Hapus trailing carriage return pada input."
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr "--binary Baca dan tulis data dalam mode biner."
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NAME Output file merge untuk tampilkan `#ifdef NAME' diffs."
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
"--GTYPE-group-format=GFMT Serupa, tapi format input kelompok GTYPE dg GFMT. "
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr "--line-format=LFMT Serupa, tapi format seluruh baris input dg LFMT."
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
"--LTYPE-line-format=LFMT Serupa, tapi format baris input LTYPE dg LFMT."
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE adalah 'old', 'new', atau 'unchanged'. GTYPE adalah LTYPE atau "
"'changed'."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) if A equals B then T else E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %l isi baris, tanpa baris baru\n"
" %[-][WIDTH][.[PREC]]{doxX}n printf-style spec untuk nomor baris input"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'C' karakter tunggal C\n"
" %c'\\OOO' karakter dengan kode oktal OOO"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d, --minimal Usahakan mencari perubahan terkecil."
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr "--horizon-lines=NUM Pertahankan NUM baris prefiks dan suffiks umum."
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files Asumsikan file besar dan banyak sebaran perubahan "
"kecil."
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr "--normal Output normal diff."
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help display this help and exit"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version Tampilkan informasi versi."
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FILES adalah 'FILE1 FILE2' atau 'DIR1 DIR2' atau 'DIR FILE...' atau 'FILE... "
"DIR'."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Bila --from-file atau --to-file diberikan, tidak ada batasan untuk FILES."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Jika sebuah file FILE adalah '-', baca standard input."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Penggunaan: %s [OPTION]... FILES\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Bandingkan file baris per baris"
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "Nilai option %s konflik dengan '%s'"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "option gaya output konflik"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "lebar tidak valid '%s'"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Hanya dalam %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "tidak dapat membandingkan '-' dg direktori"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "-D option tidak didukung dg direktori"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Subdirektori sama: %s dan %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "File %s adalah %s sementara file %s adalah %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Berkas %s dan %s berbeda\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "File %s dan %s identik\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "option tidak kompatibel"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "'-' dispesifikasikan lebih dari satu file input"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "gagal membaca"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr "-A, --show-all Output seluruh perubahan, konflik dalam tanda kurung."
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e --ed Output perubahan tanpa dimerge dari OLDFILE ke YOURFILE ke dl "
"MYFILE."
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E, --show-overlap Output perubahan unmerge, konflik dl tanda kurung."
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr "-3, --easy-only Output unmerged perubahan nonoverlap."
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x, --overlap-only Tampilkan perubahan yang overlap."
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X like -x, but bracket conflicts"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i Tambah perintah 'w' dan 'q' ke script ed."
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text Perlakukan seluruh file sebagai teks."
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr Hapus trailing carriage return pada input."
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T, --initial-tab Buat tab beraturan dg menambahkan sebuah tab."
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr "--diff-program=PROGRAM Gunakan PROGRAM untuk membandingkan file."
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help display this help and exit"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version Tampilkan informasi versi."
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Pemakaian: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Bandingkan tiga file baris per baris."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"and output the actual merged file. For unusual input, this is more\n"
"robust than using ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Status keluaran adalah 0 jika sukses, 1 jika konflik, 2 jika bermasalah."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "kesalahan internal: kacau dalam format blok diff"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff gagal: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "kesalahan internal: tipe diff tidak valid dalam process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "format diff tidak valid; separator perubahan tidak valid"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "format diff tidak valid; baris akhir tidak lengkap"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "program subsider '%s' tidak dipanggil"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "format diff tidak valid; karakter leading line tidak tepat"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "kesalahan internal: tipe diff tidak valid dimasukkan ke output"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "file input mengecil"
"v:\tSertakan baris bersama secara verbose.\n"
"q:\tKeluar.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: pilihan '--%s' tidak dikenal\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2015-08-05 14:57+0100\n"
"Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr "Aiuto sull'uso di software GNU: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "I file %s e %s sono diversi\n"
msgid "Binary files %s and %s differ\n"
msgstr "I file binari %s e %s sono diversi\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Manca newline alla fine del file"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Usare '%s --help' per maggiori informazioni."
msgid "options -l and -s are incompatible"
msgstr "le opzioni -l e -s sono incompatibili"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "scrittura non riuscita"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "standard output"
"I valori opzionali SKIP1 e SKIP2 indicano il numero di byte da saltare\n"
"all'inizio di ogni file (zero se non indicato)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Se un FILE è '-' o è mancante, legge lo standard input."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Il codice d'uscita è 0 se gli input sono identici, 1 se sono differenti, 2 "
msgid "invalid --bytes value '%s'"
msgstr "valore '%s' non valido per --bytes"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "operando mancante dopo '%s'"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "extra operando '%s'"
msgid "pagination not supported on this host"
msgstr "paginazione non supportata su questo host"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "troppe opzioni di etichetta"
msgid "conflicting tabsize options"
msgstr "opzioni di lunghezza di tabulazione in conflitto"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "--from-file e --to-file specificati entrambi"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal Mostra una diff normale (predefinito)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief Segnala solo se i file sono diversi"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files Segnala quando due file sono identici"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C NUM, --context[=NUM] Mostra NUM righe di contesto copiato\n"
" (predefinito 3)"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U NUM, --unified[=NUM] Mostra NUM righe di contesto unificato\n"
" (predefinito 3)"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed Mostra uno script per ed"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs Mostra una diff in formato RCS"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side Output in due colonne"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=NUM Mostra al massimo NUM colonne (predefinito 130)"
# Lo strano allineamento della seconda riga è corretto.
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
"righe\n"
" in comune"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines Non mostra le righe in comune"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function Mostra in quale funzione C si trova ogni\n"
" differenza"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=ER Mostra la riga più recente che corrisponde\n"
" all'espressione regolare ER"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label ETICHETTA Usa ETHICHETTA invece del nome del file\n"
" (può essere ripetuta)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t, --expand-tabs Espande le tabulazioni in spazi nell'output"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab Allinea le tabulazioni usando una tabulazione"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=NUM Stop di tabulazione ogni NUM colonne\n"
" (predefinito 8)"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty Rimuove spazi e tabulazioni prima di righe\n"
" di output vuote"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate Passa l'output attraverso 'pr' per impaginarlo"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive Confronta ricorsivamente ogni sottodirectory\n"
" incontrata"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference Non segue i collegamenti simbolici"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file Considera i file mancanti come vuoti"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file Considera i file mancanti in prima posizione\n"
" come vuoti"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case Ignora differenze in maiuscole e minuscole\n"
" confrontando nomi di file"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case Considera differenze in maiuscole e "
"minuscole\n"
" confrontando nomi di file"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x, --exclude=MODELLO Esclude i file che corrispondono al MODELLO"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=FILE Esclude i file che corrispondono a qualsiasi\n"
" modello in FILE"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=FILE Comincia da FILE quando si confrontano "
"directory"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=FILE1 Confronta FILE1 con tutti gli operandi;\n"
" FILE1 può essere una directory"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=FILE2 Confronta tutti gli operandi con FILE2;\n"
" FILE2 può essere una directory"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"nel\n"
" contenuto del file"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion Ignora differenze causate dall'espansione\n"
" delle tabulazioni"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space Ignora gli spazi a fine riga"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b, --ignore-space-change Ignora differenze nel numero di spazi"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space Ignora tutti gli spazi"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr "-B, --ignore-blank-lines Ignora differenze in righe vuote"
# Lo strano allineamento della seconda riga è corretto
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=ER Ignora differenze che corrispondono\n"
" all'espressione regolare ER"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text Considera tutti i file come testo"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr Elimina i ritorni a capo a fine riga in input"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary Legge e scrive in modalità binaria"
# #endif /* NOME */
# Testo comune.
#
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NOME Mostra le differenze in un unico file usando\n"
" '#ifdef NOME'"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
" --GTYPE-group-format=GFMT Simile, ma formatta i gruppi di input GTYPE\n"
" con GFMT"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
" --line-format=LFMT Formatta tutte le righe di input con LFMT"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
" --LTYPE-line-format=LFMT Formatta le righe di input LTYPE con LFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Queste opzioni di formato forniscono un controllo preciso dell'output di\n"
" diff, generalizzando -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr " LTYPE è 'old', 'new', o 'unchanged'. GTYPE è LTYPE o 'changed'."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) se A è uguale a B allora T, altrimenti E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %[-][LARGHEZZA][.[PREC]]{doxX}n formato in stile printf del numero\n"
" di riga di input"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' il carattere con codice ottale OOO\n"
" C il carattere C (altri caratteri rappresentano se stessi)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d, --minimal Minimizza il numero di differenze"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=NUM Mantiene NUM righe di prefisso e suffisso comune"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files Assume file grandi e tante piccole differenze"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal Mostra una diff normale (predefinito)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help Mostra questo aiuto ed esce"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr ""
"-v, --version Stampa le informazioni sulla versione ed esce"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FILES sono 'FILE1 FILE2' o 'DIR1 DIR2' o 'DIR FILE...' o 'FILE... DIR'."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Se --from-file o --to-file sono usati, non ci sono restrizioni per FILES."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Se un FILE è '-', legge lo standard input."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Uso: %s [OPZIONE]... FILES\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Confronta i file riga per riga."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "conflitto nell'opzione %s: valore '%s'"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "opzioni di stile di output in conflitto"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "larghezza '%s' non valida"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Solo in %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "impossibile confrontare '-' con una directory"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "opzione -D non supportata con directory"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Sottodirectory in comune: %s e %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "File %s è un %s mentre file %s è un %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "I collegamenti simbolici %s e %s sono diversi\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "I file %s e %s sono identici\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "opzioni incompatibili"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "'-' specificato per più di un file di input"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "lettura fallita"
# .
#
# Lo strano allineamento della seconda riga è corretto.
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all Mostra tutte le differenze, tenendo separati\n"
# 'differenze'.
#
# Lo strano allineamento della seconda riga è corretto.
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
# <<<<<<< file1
# .
#
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr "-E, --show-overlap Come -e, tenendo separati i conflitti"
# Questa opzione, per i 3 file considerati, non produce niente.
#
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
# Questo è il file 3.
# .
#
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only Come -e, ma mostra solo i cambiamenti che si\n"
" sovrappongono"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X Come -x, ma tiene separati i conflitti"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i Aggiunge i comandi 'w' e 'q' agli script per ed"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge Mostra il file combinato risultante, secondo -A\n"
" se non è indicata nessun'altra opzione"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text Considera tutti i file come testo"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr Elimina i ritorni a capo a fine riga in input"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab Allinea le tabulazioni usando una tabulazione"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr " --diff-program=PROGRAMMA Usa PROGRAMMA per confrontare i file"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=ETICHETTA Usa ETICHETTA invece del nome del file\n"
" (può essere repetuta fino a tre volte)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help Mostra questo aiuto ed esce"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr ""
"-v, --version Stampa le informazioni sulla versione ed esce"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Uso: %s [OPZIONE]... MIOFILE VECCHIOFILE TUOFILE\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Confronta tre file riga per riga."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robusto\n"
"di ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Il codice d'uscita è 0 in caso di successo, 1 in caso di conflitto, 2 se "
"sono\n"
"stati riscontrati dei problemi."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "errore interno: problema nel formato dei blocchi di diff"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff fallita: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "errore interno: tipo di diff non valido in process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "formato di diff non valido; separatore di modifica non valido"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "formato di diff non valido; ultima riga incompleta"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "programma accessorio '%s' non può essere chiamato"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "formato di diff non valido; caratteri incorretti a inizio riga"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "errore interno: il tipo di diff passato all'output non è valido"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "il file di input è rimpicciolito"
"v:\tInclude prolissamente le righe in comune.\n"
"q:\tEsce.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: opzione '--%s' non riconosciuta\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: GNU diffutils 3.2\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2011-09-08 14:13+0900\n"
"Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
msgstr ""
"GNU ソフトウェアを使用する際の一般的なヘルプ: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "ファイル %s と %s は異なります\n"
msgid "Binary files %s and %s differ\n"
msgstr "バイナリーファイル %s と%s は異なります\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "ファイル末尾に改行がありません"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, fuzzy, c-format
msgid "Try '%s --help' for more information."
msgstr "詳しくは`%s --help'を実行してください。"
msgid "options -l and -s are incompatible"
msgstr "オプション -l と -s は同時に指定できません"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "書き込みに失敗しました"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "標準出力"
"オプションの SKIP1 と SKIP2 はそれぞれのファイルの先頭からスキップする\n"
"バイト数を指定します(デフォルトは 0)。"
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "FILE が `-' または指定しない場合、標準入力から読み込みます。"
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"終了コードは、入力ファイルが同じ場合は 0、入力ファイルが異なる場合は 1、\n"
msgid "invalid --bytes value '%s'"
msgstr "無効な --bytes の値 `%s' です。"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, fuzzy, c-format
msgid "missing operand after '%s'"
msgstr "`%s' の後に被演算子がありません"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, fuzzy, c-format
msgid "extra operand '%s'"
msgstr "余分な被演算子 `%s' です。"
msgid "pagination not supported on this host"
msgstr "このホストではページ割付けをサポートしません"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "ファイル・ラベル・オプションが多すぎます"
msgid "conflicting tabsize options"
msgstr "タブ幅のオプションが競合しています"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "--from-file および --to-file の両方が指定されています"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal 通常の diff を出力する (デフォルト)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief ファイルが異なるかどうかのみ表示する"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr ""
"-s, --report-identical-files 両方のファイルが同一であるかどうかのみ表示する"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C NUM, --context[=NUM] コンテキスト diff 形式で前後 NUM (デフォルト: "
"3) 行を表示する"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U NUM, --unified[=NUM] ユニファイド diff 形式で前後 NUM (デフォルト: "
"3) 行を表示する"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed ed スクリプトを出力する"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs RCS 形式の diff を出力する"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side 出力を2列にする"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=NUM 表示する列を最大 NUM (デフォルト: 130) 列にする"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr " --left-column 共通行は左側の列のみ表示する"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines 共通行の出力を抑止する"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr "-p, --show-c-function 変更がある C 関数を表示する"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr "-F, --show-function-line=RE RE に一致する最も近い行を表示する"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label LABEL ファイル名の代わりに LABEL を使用する\n"
" (繰り返し指定できます)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t, --expand-tabs 出力時にタブをスペースに展開する"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab タブで始まる行は、前にタブを置いてそろえる"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=NUM タブ幅を NUM (デフォルト: 8) 列に設定する"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty 空の出力行の前後ではスペースまたはタブを抑止す"
"る"
-#: src/diff.c:904
+#: src/diff.c:911
#, fuzzy
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate ページ割り付けを行うために `pr' を通して出力す"
"る"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr "-r, --recursive サブディレクトリーを再帰的に比較する"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr ""
"-N, --new-file 存在しないファイルを空ファイルとして扱う"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file 存在しない最初のファイルを空ファイルとして扱"
"う"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr " --ignore-file-name-case ファイル名の大文字と小文字を区別しない"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr " --no-ignore-file-name-case ファイル名の大文字と小文字を区別する"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=PAT PAT に一致するファイルを除外する"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=FILE FILE 内のパターンに一致するファイルを除外する"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=FILE ディレクトリーを比較する時に FILE から始める"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=FILE1 すべての被演算子と FILE1 を比較する\n"
" FILE1 はディレクトリーでもよい"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=FILE2 すべての被演算子を FILE2 を比較する\n"
" FILE2 はディレクトリーでもよい"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case ファイル内容の比較時に大文字と小文字を区別し"
"ない"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr "-E, --ignore-tab-expansion タブ展開によって発生する違いを無視する"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space 行末にあるスペースを無視する"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b, --ignore-space-change スペース数により生じる違いを無視する"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space すべてのスペースを無視する"
-#: src/diff.c:925
+#: src/diff.c:932
#, fuzzy
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines 空白類文字だけの行により生じる違いを無視する"
-#: src/diff.c:926
+#: src/diff.c:933
#, fuzzy
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE RE と一致するすべての行の違いを無視する"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text すべてのファイルをテキストとして扱う"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr 入力から CR (キャリッジリターン) を除去する"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary バイナリーモードでデータを読み書きする"
-#: src/diff.c:934
+#: src/diff.c:941
#, fuzzy
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
"-D, --ifdef=NAME パッチ適用時に `#ifdef NAME' で併合されるよう"
"に差分を出力する"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr " --GTYPE-group-format=GFMT GTYPE の入力グループを GFMT で整形する"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr " --line-format=LFMT すべての入力行を LFMT で整形する"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr " --LTYPE-line-format=LFMT LTYPE 入力行を LFMT で整形する"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
"に\n"
" 見えるように制御するために提供されます。"
-#: src/diff.c:940
+#: src/diff.c:947
#, fuzzy
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE は `old'、`new'、または`unchanged'です。GTYPE は LTYPE または "
"`changed' です。"
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) A と B が等しい場合は T、等しくない場合は E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %l 行末にあるすべての種類の改行文字を除いた行の内容\n"
" %[-][WIDTH][.[PREC]]{doxX}n printf 書式の入力行"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' 八進数コード OOO\n"
" C 文字 C (他の文字も同様に表す)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d, --minimal 差分の大きさが最小となるように違いを検出する"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr " --horizon-lines=NUM 差分の前後にある共通部分を NUM 行保持する"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files 巨大なファイルに小さな差分が分散していると仮定する"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal 通常の diff を出力する (デフォルト)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help このヘルプを表示して終了する"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version バージョン情報を表示して終了する"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FILES は `FILE1 FILE2'、`DIR1 DIR2' 、`DIR FILE...'、または `FILE... DIR' で"
"す。"
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"--from-file または --to-file が与えられた場合、FILE に制限はありません。"
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
#, fuzzy
msgid "If a FILE is '-', read standard input."
msgstr "FILE が `-' の場合、標準入力から読み込みます。"
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "使用法: %s [OPTION]... FILES\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "FILES を行ごとに比較します。"
-#: src/diff.c:1021
+#: src/diff.c:1028
#, fuzzy, c-format
msgid "conflicting %s option value '%s'"
msgstr "%s オプションの値 `%s' が競合しています"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "出力形式オプションが競合しています"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "無効な幅 `%s' です"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "%s のみに存在: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
#, fuzzy
msgid "cannot compare '-' to a directory"
msgstr "`-' とディレクトリーは比較できません"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "-D オプションはディレクトリーにはサポートされません"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "共通のサブディレクトリー: %s と %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "ファイル %s は %s です。一方、ファイル %s は %s です\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, fuzzy, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "ファイル %s と %s は異なります\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "ファイル %s と %s は同一です\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "同時に指定できないオプションです"
-#: src/diff3.c:353
+#: src/diff3.c:388
#, fuzzy
msgid "'-' specified for more than one input file"
msgstr "入力ファイルとして `-' が複数回指定されています"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "読み込みに失敗しました"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all 競合をすべて括弧でくくり、変更をすべて出力する"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
" スクリプトとして出力する\n"
" "
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr "-E, --show-overlap -e と同様だが、競合を括弧でくくる"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only -e と同様だが、3ファイル競合で無い部分のみ出力す"
"る"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only -e と同様だが、3ファイル競合の部分のみ出力する"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X -x と同様だが、競合を括弧でくくる"
-#: src/diff3.c:436
+#: src/diff3.c:481
#, fuzzy
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i ed スクリプトの後に `w' と `q' コマンドを追加する"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge 他のオプションを指定していない場合、-A 従って\n"
" 実際に併合されたファイルを出力する"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text すべてのファイルをテキストとして扱う"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr 入力から末尾のキャリッジリターンを除去する"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T, --initial-tab タブで始まる行は、前にタブを置いてそろえる"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr " --diff-program=PROGRAM ファイル比較に PROGRAM を使用する"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=LABEL ファイル名の代わりに LABEL を使用する\n"
" (3回まで繰り返し指定できる)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help このヘルプを表示して終了する"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version バージョン情報を表示して終了する"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "3つのファイルを行ごとに比較します。"
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"併合されたファイルを出力します。通常の入力としては、これは ed を使用す\n"
"るより強固です。\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"終了コードは、成功した場合は 0、競合がある場合は 1、\n"
"問題が発生したときは 2 になります。"
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "内部エラー: 差分ブロックの形式をうまく処理できませんでした"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff に失敗しました: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "内部エラー: process_diff 内に無効な差分型があります"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "無効な差分形式です。無効な変更区切りです"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "無効な差分形式です。最後の行が不完全です"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, fuzzy, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "下位プログラム `%s' が起動できません"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "無効な差分形式です。行の先頭文字が誤っています"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "内部エラー: 無効な差分型が出力に渡されました"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "入力ファイルが小さくなりました"
"v: 共通行を明示して含める。\n"
"q: 終了する。\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: オプション '--%s' を認識できません\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils-3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2014-04-20 15:28+0300\n"
"Last-Translator: Rihards Prieditis <rprieditis@gmail.com>\n"
"Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
"Vispārēja palīdzība, izmantojot GNU programmatūru: <http://www.gnu.org/"
"gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Datnes %s un %s atšķiras\n"
msgid "Binary files %s and %s differ\n"
msgstr "Binārās datnes %s un %s atšķiras\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Nav jaunu rindu datnes beigās"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Lietojiet “%s --help”, lai uzzinātu vairāk."
msgid "options -l and -s are incompatible"
msgstr "opcijas -l un -s nav savstarpēji saderīgas"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "rakstīšana neizdevās"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "standarta izvade"
"Neobligātie IZLAIST1 un IZLAIST2 norāda, cik baitus izlaist\n"
"katras datnes sākumā (pēc noklusējuma nulle)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Ja DATNEI ir “-” vai tā nav, tad lasīt standarta ievadi."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Izejas status ir 0, ja ievads ir tāds pats, 1, ja tas ir atšķirīgs, 2, ja ir "
msgid "invalid --bytes value '%s'"
msgstr "nederīga --bytes vērtība “%s”"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "trūkst operands pēc “%s”"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "papildu operands “%s”"
msgid "pagination not supported on this host"
msgstr "lapošana netiek atbalstīta uz šī resursdatora"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "pārāk daudz datnes etiķešu opciju"
msgid "conflicting tabsize options"
msgstr "konfliktējošas tabulācijas izmēru opcijas"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "--from-file un --to-file abi norādīti"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal izvada parastu diff (noklusējuma)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief ziņot tikai, ja datnes atšķiras"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files ziņot, ja divas datnes ir vienādas"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C NUM, --context[=NUM] izvadīt NUM (noklus. 3) kopētā konteksta rindas"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U NUM, --unified[=NUM] izvadīt NUM (noklus. 3) vienotā konteksta "
"rindas"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed izvada ed skriptu"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs izvada RCS formāta diff"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side izvade divās kolonnās"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=NUM izvada līdz NUM (noklusējuma 130) drukas "
"kolonas"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column izvadīt tikai kreiso kolonu no kopējām rindām"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines neizvadīt kopējās rindas"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr "-p, --show-c-function rādīt, kurās C funkcijās ir izmaiņas"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr "-F, --show-function-line=RE rādīt visnesenāko rindu, kas atbilst RE"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label ETIĶETE izmantot ETIĶETI nevis datnes nosaukumu\n"
" (var atkārtot)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t, --expand-tabs pārveidot tabulācijas par atstarpēm izvadē"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab pacelt tabulācijas rindu pirms tabulācijas"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=NUM tabulāciju pietura ik NUM drukas "
"kolonas (noklusējuma ir 8)"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
"tukšām\n"
" izvades rindām."
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr "-l, --paginate izlaist izvadi caur “pr”, lai to lapotu"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive rekursīvi salīdzina atrastās "
"apakšdirektorijas"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference nerādīt simboliskās saites"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file trūkstošas datnes uzskatīt par tukšām"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file trūkstošas pirmās datnes uzskatīt par tukšām"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case ignorēt reģistru, salīdzinot datņu nosaukumus"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case neignorēt reģistru, salīdzinot datņu "
"nosaukumus"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=ŠABLONS izslēgt datnes, kuras atbilst ŠABLONAM"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=DATNE izslēgt datnes, kuras atbilst jebkuram\n"
" šablonam DATNĒ"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=DATNE sākt ar DATNI, kad salīdzina direktorijas"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=DATNE1 salīdzina DANTE1 ar visiem operandiem;\n"
" DATNE1 var būt direktorija"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=FILE2 salīdzina visus operandus ar DANTE2;\n"
" DATNE2 var būt direktorija"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case ignorē reģistra atšķirības datnes saturā"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion ignorēt izmaiņas dēļ tabulācijas izplešanās"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space ignorēt visas atstarpes rindu beigās"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b, --ignore-space-change ignorēt izmaiņas dēļ atstarpēm"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space ignorēt visas atstarpes"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr "-B, --ignore-blank-lines ignorēt izmaiņas tukšajās rindās"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE ignorēt izmaiņas rindās, kuras sakrīt ar RE"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text uztvert visas datnes kā teksta datnes"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr noņemt atkārtojošos rakstatgriezi ievadē"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary lasīt un rakstīt datus binārajā režīmā"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NOSAUKUMS izvadīt sapludināto datni ar\n"
" “#ifdef NOSAUKUMS” diff"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr " --GTYPE-group-format=GFMT formatēt GTYPE ievades grupas ar GFMT"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr " --line-format=LFMT formatēt visas ievades rindas ar LFMT"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr " --LTYPE-line-format=LFMT formatēt LTYPE ievades rindām ar LFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Šīs formāta opcijas sniedz detalizētu kontroli pār diff izvadi,\n"
" vispārinot -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE ir “old”, “new” vai “unchanged”. GTYPE ir LTYPE vai “changed”."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" E F-1\n"
" M L+1 %(A=B?T:E) ja A vienāds ar B tad T citādi E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %[-][PLATUMS][.[PREC]]{doxX}n printf-style specifikācija ievades rindu\n"
" numuriem"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' rakstzīmi ar oktālo kodu OOO\n"
" C rakstzīme C (vai citas rakstzīmes, kas attēlo pašas sevi)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d, --minimal ļoti censties atrast mazāku izmaiņu kopu"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=NUM uzturēt NUM rindas kopējiem prefiksiem un sufiksiem"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files pieņemt, ka datnes ir lielas ar daudz mazām izmaiņām"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal izvada parastu diff (noklusējuma)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help parādīt šo palīdzību un iziet"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version izvada informāciju par versiju un iziet"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"DATNES ir “DATNE1 DATNE2” vai “DIREKTORIJA1 DIREKTORIJA2” vai\n"
"“DIREKTORIJA DATNE...” vai “DATNE... DIREKTORIJA”"
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Ja ir doti --from-file vai --to-file, nav nekādu ierobežojumu uz DATNĒM."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Ja DATNE ir “-”, lasīt standarta ievadi."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Lietošana: %s [OPCIJAS]... DATNES\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Salīdzina DATNES rindu pa rindai."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "konfliktējoša %s opcijas vērtība “%s”"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "konfliktējoša izvades stila opcijas"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "nederīgs platums “%s”"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Tikai iekš %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "nevar salīdzināt “-” ar direktoriju"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "-D opcija nav atbalstīta ar direktorijām"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Kopējās apakšdirektorijas: %s un %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Datne %s ir %s kamēr datne %s ir %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Simboliskās saites %s un %s atšķiras\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Datnes %s un %s ir identiskas\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "savstarpēji nesaderīgas opcijas"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "“-” norādīts vairāk par vienu ievades datni"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "lasīšana neizdevās"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all izvada visas izmaņas, ieliekot iekavās konfliktus"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e, --ed izvada ed skirpta iekļautās izmaiņas\n"
" no VECĀSDATNES uz JŪSUDATNI iekš MANUDATNI."
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E, --show-overlap tāpat kā -e, bet ieliekot iekavās konfliktus"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only līdzīgs -e, bet iekļauj tikai nepārklājošās "
"izmaiņas"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only līdzīgs -e, bet iekļauj tikai pārklājošās "
"izmaiņas"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
"-X līdzīgs -x, bet ieliekot iekavās konfliktus"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i pievieno “w” un “q” komandas ed skriptā"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge izvada pašu sapludināto datni, vadoties pēc -A,\n"
" ja nav dotu citu opciju"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text uztvert visas datnes kā teksta datnes"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr noņemt atkārtojošos rakstatgriezi ievadē"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T, --initial-tab pacelt tabulācijas rindu pirms tabulācijas"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
" --diff-program=PROGRAMMA izmantot PROGRAMMU, lai salīdzinātu divas datnes"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=ETIĶETE izmantot ETIĶETI nevis datnes nosaukumu\n"
" (var atkārtot)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help parādīt šo palīdzību un iziet"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version izvada informāciju par versiju un iziet"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Izmantošana: %s [OPCIJAS]... MANADATNE VECĀDATNE JŪSUDATNE\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Salīdzināt trīs datnes rindiņu pa rindiņai."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"sapludināto datni. Netipiskām ievadēm, šis ir vēl spēcīgāks paņēmiens, nekā\n"
"ed izmantošana.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Izejas statuss ir 0, ja tas ir veiksmīgs, 1, ja ir konflikts, 2, ja ir "
"nepatikšanas."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "iekšējā kļūda: sagāja grīstē diff bloku formāts"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff neizdevās:"
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "iekšējā kļūda: nederīgs diff veids iekš process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "nederīgs diff formāts; nederīgs izmaiņu atdalītājs"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "nederīgs diff formāts; nepilnīga pēdējā rinda"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "nevarēja izsaukt palīgprogrammu “%s”"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "nederīgs diff formāts; nederīgas rindas ievades rakstzīmes"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "iekšējā kļūda: nederīgs uz izvadi padotais diff veids"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "ievades datne saruka"
"v:\tDetalizēti iekļaut kopējās rindas.\n"
"q:\tIziet.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: neatpazīta opcija “--%s”\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2015-09-24 17:50+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@gmail.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
msgstr ""
"Bantuan umum menggunakan perisian GNU: <http://www.gnu.org/gethelp/>.\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Fail %s dan %s berbeza\n"
msgid "Binary files %s and %s differ\n"
msgstr "Fail %s dan %s berbeza\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Tiada baris baru pada penghujung fail"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, fuzzy, c-format
msgid "Try '%s --help' for more information."
msgstr "Cuba `%s --help' untuk maklumat lanjut."
msgid "options -l and -s are incompatible"
msgstr "pilihan -l dan -s tidak sepadan"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "gagal menulis"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "keluaran piawai"
msgstr ""
"LANGKAU1 dan LANGKAU2 adalah jumlah byte untuk dilangkau dalam setiap fail."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
#, fuzzy
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Jika FAIL adalah `-' atau tiada, baca masukan piawai."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Status keluar adalah 0 jika masukan adalah sama, 1 jika berbeza, 2 jika "
msgid "invalid --bytes value '%s'"
msgstr "nilai --bytes `%s' tidak sah"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, fuzzy, c-format
msgid "missing operand after '%s'"
msgstr "operan hilang selepas `%s'"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, fuzzy, c-format
msgid "extra operand '%s'"
msgstr "operan tambahan `%s'"
msgid "pagination not supported on this host"
msgstr "pagination tidak disokong pada hos ini"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "terlalu banyak pilihan label fail"
msgid "conflicting tabsize options"
msgstr "pilihan saiz tab berkonflik"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "--from-file dan --to-file kedua-duanya dinyatakan"
-#: src/diff.c:883
+#: src/diff.c:890
#, fuzzy
msgid " --normal output a normal diff (the default)"
msgstr "--normal Keluarkan diff normal."
-#: src/diff.c:884
+#: src/diff.c:891
#, fuzzy
msgid "-q, --brief report only when files differ"
msgstr "-q --brief Keluaran hanya jika fail berbeza."
-#: src/diff.c:885
+#: src/diff.c:892
#, fuzzy
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s --report-identical-files Lapor apabila dua fail adalah sama."
-#: src/diff.c:886
+#: src/diff.c:893
#, fuzzy
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
" -p --show-c-function Papar fungsi C yang mana dalam setiap perubahan.\n"
" -F RE --show-function-line=RE Papar baris terbaru sepadan RE."
-#: src/diff.c:887
+#: src/diff.c:894
#, fuzzy
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
" -p --show-c-function Papar fungsi C yang mana dalam setiap perubahan.\n"
" -F RE --show-function-line=RE Papar baris terbaru sepadan RE."
-#: src/diff.c:888
+#: src/diff.c:895
#, fuzzy
msgid "-e, --ed output an ed script"
msgstr "-e --ed Keluarkan skrip ed."
-#: src/diff.c:889
+#: src/diff.c:896
#, fuzzy
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs Keluarkan diff format RCS."
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side keluaran dalam dua lajur"
-#: src/diff.c:891
+#: src/diff.c:898
#, fuzzy
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-w NOM --width=NOM Keluarkan paling banyak NOM (default 130) lajur cetakan."
-#: src/diff.c:892
+#: src/diff.c:899
#, fuzzy
msgid ""
" --left-column output only the left column of common lines"
msgstr "-l --left-column Keluarkan hanya lajur kiri baris yang sama."
-#: src/diff.c:893
+#: src/diff.c:900
#, fuzzy
msgid " --suppress-common-lines do not output common lines"
msgstr "-s --suppress-common-lines Jangan keluarkan baris sama."
-#: src/diff.c:895
+#: src/diff.c:902
#, fuzzy
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
" -p --show-c-function Papar fungsi C yang mana dalam setiap perubahan.\n"
" -F RE --show-function-line=RE Papar baris terbaru sepadan RE."
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr "-F, --show-function-line=RE papar baris paling terkini sepadan RE"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" (can be repeated)"
msgstr "-L LABEL --label=LABEL Guna LABEL selain daripada nama fail."
-#: src/diff.c:900
+#: src/diff.c:907
#, fuzzy
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t --expand-tabs Kembang tab kepada ruang dalam keluaran."
-#: src/diff.c:901
+#: src/diff.c:908
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T --initial-tab Jadikan tab sebaris dengan menambah awalan tab."
-#: src/diff.c:902
+#: src/diff.c:909
#, fuzzy
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr "--tabsize=NOM Hentian tab setial NOM (default 8) lajur cetakan."
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty sekat ruang atau tab sebelum baris keluaran "
"kosong"
-#: src/diff.c:904
+#: src/diff.c:911
#, fuzzy
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr "-l --paginate Salur keluaran menerusi `pr' untuk paginate."
-#: src/diff.c:906
+#: src/diff.c:913
#, fuzzy
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r --recursive Banding berulang-ulang sebarang subdirektori yang dijumpai."
-#: src/diff.c:907
+#: src/diff.c:914
#, fuzzy
msgid " --no-dereference don't follow symbolic links"
msgstr "Jangan ikut pautan simbolik, tulisemula"
-#: src/diff.c:908
+#: src/diff.c:915
#, fuzzy
msgid "-N, --new-file treat absent files as empty"
msgstr "-N --new-file Anggap fail tidak wujud sebagai kosong."
-#: src/diff.c:909
+#: src/diff.c:916
#, fuzzy
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr "--unidirectional-new-file Anggap fail tidak wujud sebagai kosong."
-#: src/diff.c:910
+#: src/diff.c:917
#, fuzzy
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr "--ignore-file-name-case Abai case apabila membanding nama fail."
-#: src/diff.c:911
+#: src/diff.c:918
#, fuzzy
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
"--no-ignore-file-name-case Ambil kira case ketika membanding nama fail."
-#: src/diff.c:912
+#: src/diff.c:919
#, fuzzy
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x PAT --exclude=PAT Asing fail yang sepadan PAT."
-#: src/diff.c:913
+#: src/diff.c:920
#, fuzzy
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
"-X FAIL --exclude-from=FAIL Asing fail yang sepadan sebarang corak dalam "
"FAIL."
-#: src/diff.c:914
+#: src/diff.c:921
#, fuzzy
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S FAIL --starting-file=FAIL Mula dengan FAIL apabila membanding direktori."
-#: src/diff.c:915
+#: src/diff.c:922
#, fuzzy
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
"--from-file=FAIL1 Banding FAIL1 kepada semua operan. FAIL1 boleh jadi "
"direktori."
-#: src/diff.c:917
+#: src/diff.c:924
#, fuzzy
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
"--to-file=FAIL2 Banding semua operan kepada FAIL2. FAIL2 boleh jadi "
"direktori."
-#: src/diff.c:920
+#: src/diff.c:927
#, fuzzy
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr "-i --ignore-case Abai perbezaan case dalam kandungan fail."
-#: src/diff.c:921
+#: src/diff.c:928
#, fuzzy
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E --ignore-tab-expansion Abai perubahan diakibatkan oleh pengembangan tab."
-#: src/diff.c:922
+#: src/diff.c:929
#, fuzzy
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-w --ignore-all-space Abai semua ruang putih."
-#: src/diff.c:923
+#: src/diff.c:930
#, fuzzy
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b --ignore-space-change Abai perubahan dalam jumlah ruang putih."
-#: src/diff.c:924
+#: src/diff.c:931
#, fuzzy
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w --ignore-all-space Abai semua ruang putih."
-#: src/diff.c:925
+#: src/diff.c:932
#, fuzzy
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
"-B --ignore-blank-lines Abai perubahan dimana baris adalah kesemuanya "
"kosong."
-#: src/diff.c:926
+#: src/diff.c:933
#, fuzzy
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I RE --ignore-matching-lines=RE Abai perubahan dimana baris semua sepadan "
"RE."
-#: src/diff.c:928
+#: src/diff.c:935
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text Layan semua fail sebagai teks."
-#: src/diff.c:929
+#: src/diff.c:936
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr Buang enter penghujung pada masukan."
-#: src/diff.c:931
+#: src/diff.c:938
#, fuzzy
msgid " --binary read and write data in binary mode"
msgstr "--binary Baca dan tulis data dalam mod binari."
-#: src/diff.c:934
+#: src/diff.c:941
#, fuzzy
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
"-D NAMA --ifdef=NAMA Keluarkan fail tergabung untuk menunjukkan perbezaa "
"`#ifdef NAMA'."
-#: src/diff.c:935
+#: src/diff.c:942
#, fuzzy
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
"--GTYPE-group-format=GFMT Hampir sama, tetapi format masukan GTYPE "
"dikumpulkan dengan GFMT."
-#: src/diff.c:936
+#: src/diff.c:943
#, fuzzy
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
"--line-format=LFMT Hampir sama, tetapi format semua baris masukan dengan "
"LFMT."
-#: src/diff.c:937
+#: src/diff.c:944
#, fuzzy
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
"--LTYPE-line-format=LFMT Hampir sama, tetapi format baris masukan LTYPE "
"dengan LFMT."
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
#, fuzzy
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE adalah `old', `new', atau `unchanged'. GTYPE adalah LTYPE atau "
"`changed'."
-#: src/diff.c:941
+#: src/diff.c:948
#, fuzzy
msgid ""
" GFMT (only) may contain:\n"
" E F-1\n"
" M L+1"
-#: src/diff.c:953
+#: src/diff.c:960
#, fuzzy
msgid ""
" LFMT (only) may contain:\n"
" %l kandungan baris, tidak termasuk baris baru dipenghujung\n"
" %[-][WIDTH][.[PREC]]{doxX}n spec gaya-printf untuk nombor baris masukan"
-#: src/diff.c:957
+#: src/diff.c:964
#, fuzzy
msgid ""
" Both GFMT and LFMT may contain:\n"
" %c'C' satu aksara C\n"
" %c'\\OOO' aksara dengan kod oktal OOO"
-#: src/diff.c:963
+#: src/diff.c:970
#, fuzzy
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d --minimal Cuba cari dengan tekun set perbezaan yang kecil."
-#: src/diff.c:964
+#: src/diff.c:971
#, fuzzy
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr "--horizon-lines=NOM Pastikan NOM baris prefix dan suffix sama."
-#: src/diff.c:965
+#: src/diff.c:972
#, fuzzy
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
"--speed-large-files Anggap fail besar dan banyak perubahan kecil tersebar."
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr "--normal Keluarkan diff normal."
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
#, fuzzy
msgid " --help display this help and exit"
msgstr "Papar teks bantuan ini"
-#: src/diff.c:972
+#: src/diff.c:979
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "Papar maklumat versi dan keluar"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FAIL-FAIL adalah `FAIL1 FAIL2' atau `DIR1 DIR2' atau `DIR FAIL...' atau "
"`FAIL... DIR'."
-#: src/diff.c:975
+#: src/diff.c:982
#, fuzzy
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr "Jika --from-file atau --to-file diberi, tiada sekatan pada FAIL."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
#, fuzzy
msgid "If a FILE is '-', read standard input."
msgstr "Jika FAIL adalah `-', baca masukan piawai."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Penggunaan: %s [PILIHAN]... FAIL\n"
-#: src/diff.c:987
+#: src/diff.c:994
#, fuzzy
msgid "Compare FILES line by line."
msgstr "Banding fail setiap baris."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, fuzzy, c-format
msgid "conflicting %s option value '%s'"
msgstr "nilai pilihan %s berkonflik `%s'"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "pilihan gaya keluaran berkonflik"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "lebar `%s' tidak sah"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Hanya dalam %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
#, fuzzy
msgid "cannot compare '-' to a directory"
msgstr "tidak dapat membandingkan `-' kepada direktori"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "pilihan -D tidak disokong dengan direktori"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Subdirektori umum: %s dan %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Fail %s adalah %s manakala fail %s adalah %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, fuzzy, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "%s bukan fail biasa atau pautan simbolik."
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Fail %s dan %s adalah serupa\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "pilihan tidak sepadan"
-#: src/diff3.c:353
+#: src/diff3.c:388
#, fuzzy
msgid "'-' specified for more than one input file"
msgstr "`-' dinyatakan untuk lebih daripada satu fail masukan"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "gagal membaca"
-#: src/diff3.c:428
+#: src/diff3.c:473
#, fuzzy
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr "-A --show-all Keluarkan semua perubahan, kurungkan konflik."
-#: src/diff3.c:430
+#: src/diff3.c:475
#, fuzzy
msgid ""
"-e, --ed output ed script incorporating changes\n"
"-e --ed Keluarkan perubahan tidak digabung daripada OLDFILE ke YOURFILE "
"kedalam MYFILE."
-#: src/diff3.c:432
+#: src/diff3.c:477
#, fuzzy
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E --show-overlap Keluarkan perubahan tidak digabung, kurungkan konflik."
-#: src/diff3.c:433
+#: src/diff3.c:478
#, fuzzy
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
msgstr ""
"-3 --easy-only Keluarkan perubahan tidak digabung dan tidak bertindih."
-#: src/diff3.c:434
+#: src/diff3.c:479
#, fuzzy
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x --overlap-only Keluarkan perubahan bertindih."
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
-#: src/diff3.c:436
+#: src/diff3.c:481
#, fuzzy
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i Tambah arahan `w' dan `q' kepada skrip ed."
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text Layan semua fail sebagai teks."
-#: src/diff3.c:442
+#: src/diff3.c:487
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr Buang enter penghujung pada masukan."
-#: src/diff3.c:443
+#: src/diff3.c:488
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T --initial-tab Jadikan tab sebaris dengan menambah awalan tab."
-#: src/diff3.c:444
+#: src/diff3.c:489
#, fuzzy
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr "--diff-program=PROGRAM Guna PROGRAM untuk membanding fail."
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
#, fuzzy
msgid " --help display this help and exit"
msgstr "Papar teks bantuan ini"
-#: src/diff3.c:449
+#: src/diff3.c:494
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "Papar maklumat versi dan keluar"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Penggunaan: %s [PILIHAN]... MYFILE OLDFILE YOURFILE\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Banding tiga fail tiap-tiap baris."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Status keluar adalah 0 jika berjaya, 1 jika konflik, 2 jika bermasalah."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "ralat dalaman: kerosakan dalam format blok diff"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff gagal: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "ralat dalaman: jenis diff tidak sah dalam process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "format diff tidak sah; pengasing perbezaan tidak sah"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "format diff tidak sah; baris akhir tidak lengkap"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, fuzzy, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "program subsidiari `%s' tidak dapat dilaksanakan"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "format diff tidak sah; aksara awal baris tidak betul"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "ralat dalaman: jenis diff tidak sah diberikan kepada keluaran"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "fail masukan mengecil"
"v:\tSertakan baris sama dengan berjela.\n"
"q:\tKeluar.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: pilihan '%s' adalah kabur; kemungkinan:"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils-3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2015-01-23 18:51+0100\n"
"Last-Translator: Åka Sikrom <a4@hush.com>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
msgstr ""
"Generell hjelp til å bruke GNU-programmer: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Filene %s og %s er ulike\n"
msgid "Binary files %s and %s differ\n"
msgstr "Binærfilene %s og %s er ulike\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Intet linjeskift i slutten av fila"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Prøv «%s --help» for ytterligere informasjon."
msgid "options -l and -s are incompatible"
msgstr "valgene «-l» og «-s» kan ikke brukes samtidig"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "skriving mislyktes"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "standardutdata"
"Du kan hoppe over valgfritt ANT1 og ANT2 byte i begynnelsen\n"
"av henholdsvis første og andre fil (standard er null)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Hvis FIL er tom eller «-», leser programmet standard inndata."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Avsluttende status er 0 hvis inndata er like, 1 hvis ulike og 2 hvis det "
msgid "invalid --bytes value '%s'"
msgstr "«%s» er en ugyldig verdi for «--bytes»"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "operand mangler etter «%s»"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "ekstra operand «%s»"
msgid "pagination not supported on this host"
msgstr "sidedeling støttes ikke på denne verten"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "for mange filetikett-valg"
msgid "conflicting tabsize options"
msgstr "tabulatorvalg i konflikt"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "du har valgt både «--from-file» og «--to-file»"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr ""
" --normal skriv ut en normal diff (dette er standard)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief bare rapporter når filer er ulike"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files rapporter når to filer er like"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C ANT, --context[=ANT] skriv ut valgt ANTall linjer med kopiert "
"kontekst (standard: 3)"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U ANT, --unified[=ANT] skriv ut valgt ANTall linjer med sammenslått "
"kontekst (standard: 3)"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed skriv ut et ed-skript"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs skriv ut diff i RCS-format"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side skriv ut i to kolonner"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=ANT skriv ut maks valgt ANTall kolonner (standard: "
"130)"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column bare skriv ut venstre kolonne med vanlige "
"linjer"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines ikke skriv ut vanlige linjer"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function vis hvilken C-funksjon hver endring ligger i"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr "-F, --show-function-line=RE vis nyeste linje som samsvarer med RE"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label ETIK bruk valgt ETIKett i stedet for filnavn\n"
" (dette kan gjentas)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t, --expand-tabs utvid tabulatorer til mellomrom på utskrift"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab still opp tabulatorer ved å legge til en "
"tabulator først"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=NUM tabulatorer stopper for hvert valgte "
"utskriftskolonne-NUMmer (standard: 8)"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty ikke skriv ut mellomrom eller tabulator før "
"tomme linjer"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr "-l, --paginate del utdata i sider via «pr»"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr "-r, --recursive sammenlikn evt. undermapper rekursivt"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference ikke følg symbolske lenker"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file behandle fraværende filer som tomme"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr " --unidirectional-new-file behandle fraværende førstefil som tom"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case skill mellom store og små bokstaver ved "
"sammenlikning av filnavn"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case skill mellom store og små bokstaver ved "
"sammenlikning av filnavn"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x, --exclude=MØN utelat filer som samsvarer med valgt MØNster"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=FIL utelat filer som samsvarer med mønster(e) i "
"valgt FIL"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=FIL begynn med valgt FIL ved sammenlikning av "
"mapper"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=FIL1 sammenlikn FIL1 med alle operand-er\n"
" (FIL1 kan være en mappe)"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=FIL2 sammenlikn alle operand-er med FIL2\n"
" (FIL2 kan være en mappe)"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case ikke skill mellom små og store bokstaver i "
"fil-innhold"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion ignorer endringer som skyldes tabulator-"
"utvidelse"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space ignorer blanktegn i slutten av linjer"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b, --ignore-space-change ignorer endringer i antall blanktegn"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space ignorer alle blanktegn"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines ignorer endringer når alle linjer er tomme"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE ignorer endringer når alle linjer samsvarer "
"med RE"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text behandle filer som tekst"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr fjern etterfølgende linjeskift-tegn fra "
"inndata"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary les og skriv data i binærmodus"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NAVN skriv ut sammenslått fil med ulikheter i "
"«#ifdef NAVN»"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr " --GTYPE-group-format=GFMT formater GTYPE-inndatagrupper med GFMT"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr " --line-format=LFMT formater inndatalinjer med LFMT"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr " --LTYPE-line-format=LFMT formater LTYPE-inndatalinjer med LFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Disse formatvalgene gjør det mulig å detaljstyre utdata\n"
" fra diff, og generaliserer -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE er enten «old», «new» eller «unchanged». GTYPE er enten LTYPE eller "
"«changed»."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) hvis A er lik B, så T eller E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %[-][BREDDE][.[PREC]]{doxX}n spesifikasjon av inndata-linjenummer i "
"printf-stil"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' tegnet med oktalkode OOO\n"
" C tegnet C (andre tegn representerer seg selv)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d, --minimal prøv hardt å finne en mindre rekke endringer"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=ANT behold valgt ANTall linjer av vanlig pre- og suffiks"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr " --speed-large-files forvent store filer og små, spredte endringer"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr ""
" --normal skriv ut en normal diff (dette er standard)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help vis denne hjelpeteksten og avslutt"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version vis versjonsinformasjon og avslutt"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FILER er «FIL1 FIL2», «MAPPE1 MAPPE2», «MAPPE FIL …» eller «FIL… MAPPE»."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Programmet bruker ingen restriksjoner på FIL(er) hvis «--from-file» eller «--"
"to-file» er valgt."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Programmet leser fra standard inndata hvis FIL er «-»."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Bruk: %s [VALG] … FILER\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Sammenlikn FILER linje for linje."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "valget %s er i konflikt med verdien «%s»"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "utdata-stilvalg er i konflikt med hverandre"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "«%s» er en ugyldig bredde"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Bare i %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "du kan ikke sammenlikne «-» med en mappe"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "valget «-D» støttes ikke for mapper"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Vanlige undermapper: %s og %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Fila %s er en %s, og fila %s er en %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "De symbolske lenkene %s og %s er ulike\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Filene %s og %s er identiske\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "gjeldende valg kan ikke brukes samtidig"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "«-» er valgt for flere enn én inndatafil"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "lesing mislyktes"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all skriv ut alle endringer, med konflikter i "
"parentes"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e, --ed skriv ut ed-skript med endringer\n"
" mellom GAMMELFIL og NYFIL til FIL"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E, --show-overlap likner «-e», men viser konflikter i parentes"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only likner «-e», men tar ikke med endringer som "
"overlapper hverandre"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only likner «-e», men tar bare med endringer som "
"overlapper hverandre"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
"-X likner «-x», men viser også konflikter i parentes"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i legg til kommandoene «w» og «q» i ed-skript"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge skriv ut sammenslått fil ihht. «-A»,\n"
" med mindre noe annet er valgt"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text behandle filer som tekst"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr fjern etterfølgende linjeskift-tegn fra inndata"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab still opp tabulatorer på rekke ved å legge til "
"en ekstra tab foran"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr " --diff-program=PROGRAM bruk valgt PROGRAM til å sammenlikne filer"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=ETIKETT bruk valgt ETIKETT i stedet for filnavn\n"
" (dette kan gjentas opptil tre ganger)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help vis denne hjelpeteksten og avslutt"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version vis versjonsinformasjon og avslutt"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Usage: %s [VALG] … FIL GAMMELFIL NYFIL\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Sammenlikn tre filer, linje for linje."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"og skrive ut sammenslått fil. Dette er sikrere for behandling av\n"
"uvanlig inndata enn å bruke ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Avsluttende status er 0 hvis alt er i orden, 1 ved konflikter og 2 ved "
"problemer."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "intern feil: rot i diff-blokkformat"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff mislyktes: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "intern feil: ugyldig diff-type i process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "ugyldig diff-format. Ugyldig endringsskilletegn"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "ugyldig diff-format. Siste linje er ufullstendig"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "klarte ikke å starte hjelpeprogrammet «%s»"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "ugyldig diff-format. Feil ledende linjetegn"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "intern feil: ugyldig diff-type sendt til utdata"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "inndata-fila er krympet"
"v:\tInkluder kommandolinjer i detaljert modus.\n"
"q:\tAvslutt.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: «--%s» er et ukjent valg\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils-3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2012-10-31 21:04+0100\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
msgstr ""
"Algemene hulp bij gebruik van GNU-software: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Bestanden %s en %s zijn verschillend\n"
msgid "Binary files %s and %s differ\n"
msgstr "Binaire bestanden %s en %s zijn verschillend\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Geen regeleindeteken (LF) aan einde van bestand"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Typ '%s --help' voor meer informatie."
msgid "options -l and -s are incompatible"
msgstr "opties '-l' en '-s' gaan niet samen"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "schrijven is mislukt"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "standaarduitvoer"
"dat\n"
"aan het begin van elk bestand moet worden overgeslagen (standaard nul)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgstr ""
"Als een BESTAND ontbreekt of '-' is, wordt er van standaardinvoer gelezen."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"De afsluitwaarde is 0 als de invoeren gelijk zijn, 1 als ze verschillen,\n"
msgid "invalid --bytes value '%s'"
msgstr "ongeldige waarde '%s' voor '--bytes'"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "ontbrekend argument na '%s'"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "overtollig argument '%s'"
msgid "pagination not supported on this host"
msgstr "het in pagina's indelen is op deze computer niet mogelijk"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "te veel bestandslabel-opties"
msgid "conflicting tabsize options"
msgstr "conflicterende tabgrootte-opties"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "zowel '--from-file' als '--to-file' zijn opgegeven"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal een gewone diff produceren (standaard)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief alleen aangeven of bestanden verschillen"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr ""
"-s, --report-identical-files vermelden of twee bestanden hetzelfde zijn"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C AANTAL, --context[=AANTAL] dit AANTAL regels (standaard 3) van\n"
" gekopieerde context tonen"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U AANTAL, --unified[=AANTAL] dit AANTAL regels (standaard 3) van\n"
" geünificeerde context tonen"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed een ed-script produceren"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs een diff in RCS-opmaak produceren"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side het resultaat weergeven in twee kolommen"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-w, --width=AANTAL maximaal dit AANTAL kolommen tonen (standaard 130)"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column bij gelijke regels alleen de linkerkolom tonen"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines de gelijke regels onderdrukken"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function vermelden in welke C-functie elke wijziging is"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=RE recentste regel overeenkomend met RE tonen"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label LABEL dit LABEL gebruiken in plaats van bestandsnaam\n"
" (mag herhaald worden)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t, --expand-tabs tabs uitschrijven naar spaties in uitvoer"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab tabs uitlijnen door invoegen van tab aan het begin"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=AANTAL tab-stops op elke AANTAL posities (standaard 8)"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty spatie of tab onderdrukken voor lege uitregels"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate de uitvoer door 'pr' halen om deze in pagina's\n"
" in te delen"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr "-r, --recursive recursief elke gevonden submap vergelijken"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference symbolische koppelingen niet volgen"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file afwezige bestanden als leeg behandelen"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file alleen bestanden die afwezig zijn in de\n"
" eerste map als leeg behandelen"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case verschil tussen hoofd- en kleine letters "
"negeren\n"
" bij vergelijken van bestandsnamen"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case onderscheid maken tussen hoofd- en kleine\n"
" letters bij vergelijken van bestandsnamen"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x, --exclude=PATROON bestanden uitsluiten als ze overeenkomen met "
"PATROON"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=BESTAND bestanden uitsluiten die overeenkomen met\n"
" een patroon in BESTAND"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=BESTAND beginnen met BESTAND bij vergelijken van "
"mappen"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=BESTAND1 BESTAND1 met alle argumenten vergelijken;\n"
" BESTAND1 mag een map zijn"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=BESTAND2 alle argumenten met BESTAND2 vergelijken;\n"
" BESTAND2 mag een map zijn"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case verschil tussen hoofd- en kleine letters\n"
" negeren in bestandsinhoud"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr "-E, --ignore-tab-expansion omzettingen van tabs in spaties negeren"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space witruimte aan einde van regel negeren"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b, --ignore-space-change wijzigingen in hoeveelheid witruimte negeren"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space alle witruimte negeren"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines wijzigingen waarvan alle regels leeg zijn "
"negeren"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE wijzigingen waarvan alle regels "
"overeenkomen\n"
" met reguliere expressie RE negeren"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text alle bestanden als tekst behandelen"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr Enter-tekens (CR's) aan einde van regels weglaten"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr ""
" --binary gegevens in binaire modus lezen en schrijven"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NAAM samengevoegd bestand tonen om verschillen in\n"
" '#ifdef NAAM' te laten zien"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
" --GSOORT-group-format=GOPMAAK iets dergelijks, maar dan invoergroepen "
"van\n"
" soort GSOORT opmaken met GOPMAAK"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
" --line-format=LOPMAAK iets dergelijks, maar dan alle invoerregels "
"opmaken\n"
" met LOPMAAK"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
" --LSOORT-line-format=LOPMAAK iets dergelijks, maar dan invoerregels "
"van\n"
" soort LSOORT opmaken met LOPMAAK"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Deze opmaakopties bieden een fijnafregeling van de uitvoer aan,\n"
" een generalisatie van de optie '-d/--ifdef'."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LSOORT is 'old' (oud), 'new' (nieuw), of 'unchanged' (ongewijzigd);\n"
" GSOORT is LSOORT of 'changed' (gewijzigd)."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?Z:V) als A gelijk is aan B, dan Z anders V"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %[-][BREEDTE][.[PREC]]{doxX}n specificatie in printf-stijl voor\n"
" invoerregelnummer"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' het teken met octaalcode OOO\n"
" C het teken C (andere tekens representeren zichzelf)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
"-d, --minimal moeite doen om een kleinere verzameling "
"wijzigingen\n"
" te vinden"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=AANTAL dit AANTAL regels met identieke kop en staart\n"
" bij vergelijkingsproces meenemen"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
"verspreide\n"
" kleine wijzigingen"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal een gewone diff produceren (standaard)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help deze hulptekst tonen en stoppen"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version programmaversie tonen en stoppen"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"BESTANDEN is 'BESTAND1 BESTAND2' of 'MAP1 MAP2' of\n"
" 'MAP BESTAND...' of 'BESTAND... MAP'."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Als '--from-file' of '--to-file' gegeven is, mag BESTANDEN van alles zijn."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Als een BESTAND '-' is, wordt er van standaardinvoer gelezen."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr ""
"Gebruik: %s [OPTIE...] BESTANDEN\n"
"\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Bestanden regel-voor-regel vergelijken."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "conflicterende waarde '%2$s' van optie %1$s"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "conflicterende uitvoerstijl-opties"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "ongeldige breedte '%s'"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Alleen in %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "kan '-' niet met een map vergelijken"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "optie '-D' is niet mogelijk bij mappen"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Gemeenschappelijke submappen: %s en %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Bestand %s is een %s terwijl bestand %s een %s is\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Symbolische koppelingen %s en %s zijn verschillend\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Bestanden %s en %s zijn identiek\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "niet-samengaande opties"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "'-' opgegeven voor meer dan één invoerbestand"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "lezen is mislukt"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all alle wijzigingen tonen, met rechte haken om de "
"conflicten"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e, --ed een ed-script produceren die de wijzigingen van\n"
" OUDBESTAND naar UWBESTAND in MIJNBESTAND maakt"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E, --show-overlap als '-e' maar met rechte haken om de conflicten"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only als '-e' maar alleen met niet-overlappende "
"wijzigingen"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only als '-e' maar met alleen de overlappende "
"wijzigingen"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
"-X als '-x' maar met rechte haken om de conflicten"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i opdrachten 'w' en 'q' toevoegen aan einde van ed-"
"scripts"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge het feitelijk samengevoegde bestand tonen\n"
" volgens '-A' zonder andere opties"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text alle bestanden als tekst behandelen"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr Enter-tekens (CR's) aan einde van regels weglaten"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab tabs uitlijnen door invoegen van tab aan het begin"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
" --diff-program=PROG dit programma gebruiken om bestanden te "
"vergelijken"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=LABEL dit LABEL gebruiken in plaats van bestandsnaam\n"
" (mag maximaal driemaal herhaald worden)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help deze hulptekst tonen en stoppen"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version programmaversie tonen en stoppen"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr ""
"Gebruik: %s [OPTIE]... MIJNBESTAND OUDBESTAND UWBESTAND\n"
"\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Drie bestanden regel-voor-regel vergelijken."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robuuster\n"
"dan het gebruik van 'ed'.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"De afsluitwaarde is 0 bij succes, 1 bij conflicten, en 2 bij problemen."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "*interne programmafout*: opmaak van diff-blokken is verhaspeld"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff is mislukt: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "*interne programmmafout*: ongeldig soort diff in process_diff()"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "ongeldige diff-opmaak: ongeldig scheidingsteken voor veranderingen"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "ongeldige diff-opmaak: incomplete laatste regel"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "hulpprogramma '%s' kan niet worden aangeroepen"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "ongeldige diff-opmaak: onjuiste tekens aan begin van regel"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "*interne programmafout*: ongeldig soort diff naar uitvoer gestuurd"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "invoerbestand is gekrompen"
"v: Overeenkomende regels invoegen en tonen.\n"
"q: Afsluiten.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: onbekende optie '--%s'\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: GNU diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2012-10-31 17:30+0100\n"
"Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr "Pomoc w używaniu oprogramowania GNU: http://www.gnu.org/gethelp/\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Pliki %s i %s różnią się\n"
msgid "Binary files %s and %s differ\n"
msgstr "Binarne pliki %s i %s różnią się\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Brak znaku nowej linii na końcu pliku"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Napisz '%s --help' żeby dowiedzieć się więcej."
msgid "options -l and -s are incompatible"
msgstr "sprzeczne opcje -l i -s"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "zapis nieudany"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "standardowe wyjście"
"Opcjonalne argumenty OMIŃ1 i OMIŃ2 to liczby bajtów do pominięcia na\n"
"początku każdego z plików (domyślnie zero)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "Obowiązkowe argumenty długich opcji są obowiązkowe też dla krótkich.\n"
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Jeżeli PLIK to '-' lub go brak, czytane jest standardowe wejście."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Status wyjściowy ma wartość 0 gdy pliki wejściowe są takie same, 1 - jeżeli\n"
msgid "invalid --bytes value '%s'"
msgstr "błędna wartość --bytes '%s'"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "brakujący argument po '%s'"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "nadmiarowy argument '%s'"
msgid "pagination not supported on this host"
msgstr "stronicowanie nie jest możliwe na tej maszynie"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "za dużo opcji etykietowania plików"
msgid "conflicting tabsize options"
msgstr "sprzeczne opcje rozmiarów TAB-a"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "równocześnie podane --from-file i --to-file"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr ""
"--normal wynik w postaci zwykłego diff-a (domyślnie)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr ""
"-q --brief wypisanie wyniku tylko gdy pliki się różnią"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s --report-identical-files informowanie gdy dwa pliki są takie same"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C NUM, --context[=ILE] wypisanie ILU (domyślnie 3) linii kontekstu"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"--u, -U ILE, --unified=ILE wypisanie najwyżej ILE (domyślnie 3)\n"
" linii kontekstu w trybie unified"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e --ed wynik w postaci poleceń ed-a"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs wynik w postaci diff-a z RCS"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side wyniki w dwóch kolumnach"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=ILE wypisanie najwyżej ILE (domyślnie 130) kolumn"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column wypisanie tylko lewej kolumny dla wspólnych "
"linii"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines bez wypisania wspólnych linii"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr "-p, --show-c-function podanie w jakiej funkcji C są zmiany"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=WYRREG wypisanie ostatniej linii pasującej do "
"WYRREG"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label ETYKIETA użycie ETYKIETY zamiast nazwy pliku\n"
" (może być powtarzane)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t --expand-tabs rozwinięcie TAB-ów w spacje w wyniku"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T --initial-tab wyrównanie linii przez użycie TAB-ów"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr " --tabsize=ILE TAB-y co ILE (domyślnie 8) kolumn"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty bez wypisywania spacji i znaków TAB przed\n"
" pustymi liniami"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-I --paginate przepuszczenie wyniku przez 'pr' żeby go "
"stronnicować"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr "-r --recursive porównanie podkatalogów rekurencyjnie"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
" --no-dereference bez podążania za dowiązaniami symbolicznymi"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr ""
"-N --new-file traktowanie brakujących plików jak pustych"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file traktowanie brakujących pierwszych plików\n"
" w pierwszym zestawie jako pustych"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-space-change zignorowanie wielkości liter przy\n"
" porównywaniu nazw plików"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case uwzględnianie wielkości liter przy\n"
" porównywaniu nazw plików"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=WZÓR wykluczenie plików pasujących do WZORU"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=PLIK pominięcie plików pasujących do wzorców w "
"PLIKU"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=PLIK zacznij od PLIKU przy porównywaniu katalogów"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=PLIK1 porównanie PLIKU1 z wszystkimi\n"
" argumentami; PLIK1 może być katalogiem"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=PLIK2 porównanie wszystkich argumentów\n"
" z PLIKIEM2; PLIK2 może być katalogiem"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i --ignore-case ignorowanie różnic między wielkimi i małymi "
"literami"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E --ignore-tab-expansion zignorowanie zmian spowodowanych\n"
" rozwinięciem TAB-ów"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr ""
"-Z --ignore-trailing-space ignorowanie znaków odstępu na końcu linii"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b --ignore-space-change Zignorowanie zmian ilości znaków odstępu"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w --ignore-all-space zignorowanie znaków odstępu"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B --ignore-blank-lines zignorowanie zmian liczby pustych linii"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE zignorowanie zmian w liniach pasujących\n"
" do RE"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a --text traktowanie plików jako tekstowych"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
"--strip-trailing-cr pominięcie znaków nowej linii na wejściu"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr "--binary czytanie i zapisywanie danych binarnie"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NAZWA wypisanie połączonego pliku dla pokazania\n"
" różnic w '#ifdef NAZWA'"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
" --GTYPE-group-format=FMTG użyciem FMTF do sformatowania grup\n"
" wejściowych typu GTYPE"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
" --line-format=LFMT podobnie, ale z użyciem LFMT do\n"
" sformatowania linii wejściowych"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
" --LTYPE-line-format=FMTL użycie FMTL do sformatowania linii\n"
" wejściowych typu LTYPE"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Te opcje formatowania dają dokładną kontrolę nad wynikami diff-a,\n"
" są uogólnieniem -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr "TYPL to 'old', 'new' albo 'unchanged'. TYPG to TYPL albo 'changed'."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" E F-1\n"
" M L+1 %(A=B?T:E) jeżeli A równa się B, to T, jeżeli nie, to E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %l zawartość linii z wyłączeniem znaku nowej linii\n"
" %[-][SZER][.[DOKŁ]]{doxX}n specyfikację numeru linii w stylu printf"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' znak o kodzie ósemkowym OOO Z znak Z (inne znaki "
"reprezentują same siebie)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
"-d --minimal usiłowanie znalezienia mniejszego zbioru zmian"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=ILE zostawienie ILE linii wspólnego przedrostka i "
"przyrostka"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files założenie: duże pliki i rozrzucone małe zmiany"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr ""
"--normal wynik w postaci zwykłego diff-a (domyślnie)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help wypisanie tej pomocy i zakończenie"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v --version wypisanie informacji o wersji i zakończenie"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"PLIKI to 'PLIK1 PLIK2' albo 'KATALOG1 KATALOG2' albo 'KATALOG PLIK...' albo\n"
"'PLIK... KATALOG'."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Jeżeli użyta jest opcja --from-file albo --to-file, nie ma ograniczeń co do\n"
"PLIKU/ÓW."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Jeżeli PLIK to '-', czytane jest standardowe wejście."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Składnia: %s [OPCJA]... PLIKI\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Porównanie PLIKÓW kolejnymi liniami."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "sprzeczna wartość opcji %s: '%s'"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "sprzeczne opcje stylu wyniku"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "błędna szerokość '%s'"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Tylko w %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "nie można porównać '-' z katalogiem"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "opcja -D nie działa dla katalogów"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Wspólne podkatalogi: %s i %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Plik %s jest %s, podczas gdy plik %s jest %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Dowiązania symboliczne %s i %s różnią się\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Pliki %s i %s są identyczne\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "niezgodne opcje"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "'-' podany dla więcej niż jednego pliku wejściowego"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "nieudany odczyt"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A --show-all wypisanie wszystkich zmian, konflikty w nawiasach"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e --ed wypisanie niezłączonych zmian między\n"
" STARY_PLIK a NOWY_PLIK do MÓJ_PLIK"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr "-E --show-overlap jak -e, ale z konfliktami w nawiasach"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr ""
"-3 --easy-only jak -e, ale z tylko z nienachodzącymi zmianami"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x --overlap-only jak -e, ale tylko z nachodzącymi zmianami"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X jak -x, ale z konfliktami w nawiasach"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i dodanie poleceń 'w' i 'q' do skryptu ed-a"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge wypisanie połączonego pliku zgodnie z -A,\n"
" jeżeli nie było innych opcji"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a --text traktowanie plików jako tekstowych"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr pominięcie znaków nowej linii na wejściu"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T --initial-tab wyrównanie linii przez użycie TAB-ów"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr "--diff-program=PROGRAM użycie PROGRAMU do porównania plików"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=ETYKIETA użycie ETYKIETY zamiast nazwy pliku\n"
" (może być powtarzane do trzech razy)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help wypisanie tej pomocy i zakończenie"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr ""
"-v --version wypisanie informacji o wersji i zakończenie"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Składnia: %s [OPCJA]... MÓJ_PLIK STARY_PLIK TWÓJ_PLIK\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Porównanie trzech plików linia po linii."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"różnice i wypisuje połączony plik. Przy nietypowych danych wejściowych\n"
"jest to bardziej elastyczne niż użycie ed-a.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Status wyjściowy ma wartość 0 gdy polecenie wykonało się z prawidłowym\n"
"wynikiem, 1 - jeżeli są konflikty, 2 - jeżeli są problemy."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "bład wewnętrzny: spieprzony format bloków diff"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff nie zadziałał: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "błąd wewnętrzny: błędny typ diff w process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "błędny format diff; błędny separator zmian"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "błędny format diff; niekompletna ostatnia linia"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "nie mógł być wywołany program pomocniczy '%s'"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "błędny format diff; nieprawidłowe znaki na początku linii"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "błąd wenwętrzny: błędny typ diff-a przekazany na wyjście"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "plik wejściowy się zmniejszył"
"v:\tDołączenie wspólnych linii z podaniem informacji.\n"
"q:\tZakończenie.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: nierozpoznana opcja '--%s'\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2016-05-06 21:25-0200\n"
"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr "Ajuda geral sobre uso de software GNU: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Os arquivos %s e %s são diferentes\n"
msgid "Binary files %s and %s differ\n"
msgstr "Os arquivos binários %s e %s são diferentes\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Nenhum caractere de nova linha no final do arquivo"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Tente \"%s --help\" para mais informações."
msgid "options -l and -s are incompatible"
msgstr "as opções -l e -s são incompatíveis"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "erro de escrita"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "saída padrão"
"Os argumentos opcionais SALTO1 e SALTO2 especificam o número de\n"
"bytes para ignorar no começo de cada arquivo (zero por padrão)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Se ARQUIVO for igual a \"-\" ou for omitido, ler da entrada padrão."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Status de saída é 0 se as entradas forem iguais, 1 se diferente e 2 se "
msgid "invalid --bytes value '%s'"
msgstr "valor inválido --bytes \"%s\""
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "faltando operando após \"%s\""
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "operando extra \"%s\""
msgid "pagination not supported on this host"
msgstr "sem suporte a paginação neste computador"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "número excessivo de opções de rótulo de arquivo"
msgid "conflicting tabsize options"
msgstr "opções de tamanho de tabulação conflitantes"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "ambos --from-file e --to-file especificados"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal cria um diff no formato normal (padrão)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr ""
"-q, --brief indica apenas se os arquivos forem diferentes"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr ""
"-s, --report-identical-files indica quando dois arquivos forem o idênticos"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C NÚM, --context[=NÚM] cria em NÚM linhas (padrão 3) de contexto "
"copiado"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U NÚM, --unified[=NÚM] cria em NÚM linhas (padrão 3) de contexto "
"unificado"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed cria um script para o editor ed"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs cria um diff no formato RCS"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side cria em duas colunas"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=NÚM limita a saída a NÚM colunas por linha (padrão "
"130)"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column emite apenas a coluna da esquerda das linhas\n"
" idênticas"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines não exibe as linhas idênticas"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function mostra em qual função C está cada alteração"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=ER mostra a linha mais recente correspondendo à ER"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label RÓTULO usa RÓTULO ao invés do nome do arquivo\n"
" (pode ser repetido)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t, --expand-tabs expande as tabulações para espaços na saída"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab alinha tabulações introduzindo uma\n"
" tabulação no início"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=NÚM paradas de tabulação a cada NÚM colunas\n"
" (padrão=8)"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty suprime espaço ou tabulação antes de linhas\n"
" vazias na saída"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate passa a saída por meio de \"pr\" para paginá-la"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive compara recursivamente os subdiretórios\n"
" encontrados"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference não interpreta links simbólicos"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr ""
"-N, --new-file considera os arquivos ausentes como vazios"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file considera os primeiros arquivos ausentes\n"
" como vazios"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case não faz distinção entre letras maiúsculas e\n"
" minúsculas nos nomes dos arquivos"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case faz distinção entre letras maiúsculas e\n"
" minúsculas nos nomes dos arquivos"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x, --exclude=PADRÃO exclui arquivos correspondendo a PADRÃO"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=ARQUIVO exclui arquivos com correspondam a qualquer\n"
" padrão contido em ARQUIVO"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=ARQUIVO inicia por ARQUIVO ao comparar diretórios"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=ARQUIVO1 compara ARQUIVO1 com todos os operandos;\n"
" ARQUIVO1 pode ser um diretório"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=ARQUIVO2 compara todos os operandos com ARQUIVO2;\n"
" ARQUIVO2 pode ser um diretório"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case não faz distinção entre letras maiúsculas e\n"
" minúsculas no conteúdo do arquivo"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion ignora as diferenças causadas pela expansão\n"
" da tabulação"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr ""
"-Z, --ignore-trailing-space ignora espaços em branco no fim das linhas"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"espaços\n"
" em branco"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space ignora todos os espaços em branco"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines ignora diferenças onde as linhas estão vazias"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=ER ignora as diferenças nas linhas que "
"correspondem\n"
" à Expressão Regular"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text trata todos os arquivos como texto"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr remove o caractere de retorno de carro\n"
" (CR) ao final da linha na entrada"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary lê e escreve os dados em modo binário"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NOME exibe o arquivo mesclado incluindo\n"
" \"#ifndef NOME\" nas diferenças"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
" --GTYPE-group-format=GFMT formata grupos de entrada GTYPE com GFMT"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
" --line-format=LFMT formata todas as linhas de entrada com LFMT"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
" --LTYPE-line-format=LFMT formata todas as linhas de entrada LTYPE com "
"LFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Essa opções de formatação fornece um controle refinado sobre a saída\n"
" das diferenças, generalizando -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE pode ser \"old\", \"new\" ou \"unchanged\". GTYPE é LTYPE ou "
"\"changed\"."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) se A igual B, então T; senão E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %[-][LARGURA][.[PREC]]{doxX}n especificação estilo printf() do número\n"
" da linha da utilizando"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' o caractere com código octal OOO\n"
" C o caractere C (outros caracteres representam a si próprios)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
"-d, --minimal se esforça para localizar o menor conjunto\n"
" de diferenças"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=NÚM mantém NÚM linhas de prefixo e sufixo idênticos"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files assume arquivos grandes e muitas alterações\n"
" pequenas espalhadas"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal cria um diff no formato normal (padrão)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help mostra esta ajuda e sai"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version mostra as informações da versão e sai"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"ou\n"
"\"ARQUIVO... DIR\"."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Se --from-file ou --to-file for especificado, não há restrição em ARQUIVO(s)."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Se um ARQUIVO for igual a \"-\", lê da entrada padrão."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Uso: %s [OPÇÃO]... ARQUIVOS\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Compara ARQUIVOS linha por linha."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "opção %s com valor conflitante \"%s\""
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "opções conflitantes de estilo de saída"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "largura inválida \"%s\""
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Somente em %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "não é possível comparar \"-\" com um diretório"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "Sem suporte à opção -D com diretórios"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Subdiretórios idênticos: %s e %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "O arquivo %s é %s, enquanto o arquivo %s é %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Os links simbólicos %s e %s são diferentes\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Os aquivos %s e %s são idênticos\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "opções incompatíveis"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "\"-\" especificado para mais de um arquivo de entrada"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "falha de leitura"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all exibe todas as diferenças, com os conflitos\n"
" entre parênteses"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
" diferenças entre ARQUIVO1 e ARQUIVO2\n"
" em ARQUIVO3"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E, --show-overlap similar a -e, mas exibe conflitos entre "
"parênteses"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"alterações\n"
" que não se sobreponham"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"alterações\n"
" que se sobrepõem"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
"-X similar a -x, mas exibe conflitos entre parentes"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i anexa os comandos \"w\" e \"q\" aos scripts de ed"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge emite arquivo mesclado atual, conforme\n"
" -A se nenhuma outra opções for fornecida"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text trata todos os arquivos como texto"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr remove o caractere de retorno de carro\n"
" (CR) ao final da linha na entrada"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab alinha tabulações introduzindo uma\n"
" tabulação no início."
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr " --diff-program=PROGRAMA usa o PROGRAMA para comparar os arquivos"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label RÓTULO usa RÓTULO ao invés do nome do arquivo\n"
" (pode ser repetido até três vezes)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help mostra esta ajuda e sai"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version mostra informação da versão e sai"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Uso: %s [OPÇÃO]... ARQUIVO1 ARQUIVO2 ARQUIVO3\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Compara três arquivos linha por linha."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"internalmente e emite o arquivo mesclado atual. Para entradas incomuns,\n"
"isto é mais robusto do que usar o ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr "Status de saída é 0 se houver sucesso, 1 se conflitos e 2 se problema."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "erro interno: confusão no formato dos blocos diff"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff falhou: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "erro interno: tipo de diff inválido em process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "formato de diff inválido; separador de diferença inválido"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "formato de diff inválido; última linha incompleta"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "o programa subsidiário \"%s\" não pôde ser invocado"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "formato de diff inválido; caracteres incorretos na linha de início"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "erro interno: tipo de diff inválido passado para a saída"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "o arquivo de entrada diminuiu"
"v:\tInclui verbosamente as linhas idênticas.\n"
"q:\tSai.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: opção não reconhecida \"--%s\"\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 2.8.3\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2003-08-22 08:43+0300\n"
"Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr ""
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Fiºierele %s ºi %s diferã\n"
msgid "Binary files %s and %s differ\n"
msgstr "Fiºierele binare %s ºi %s diferã\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Nici un element de linie nouã la sfârºitul fiºierului"
msgid "David MacKenzie"
msgstr ""
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, fuzzy, c-format
msgid "Try '%s --help' for more information."
msgstr "Încercaþi `%s --help' pentru mai multe informaþii."
msgid "options -l and -s are incompatible"
msgstr "opþiunile -l ºi -s sunt incompatibile"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "scriere eºuatã"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "ieºire(output) standard"
msgstr ""
"OMIS1 ºi OMIS2 sunt numerele de octeþi care sã fie omiºi din fiecare fiºier."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgstr ""
"Dacã un FIªIER este `-' sau lipseºte, se citeºte intrarea(input) standard."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
msgid "invalid --bytes value '%s'"
msgstr "valoare --bytes invalidã `%s'"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, fuzzy, c-format
msgid "missing operand after '%s'"
msgstr "lipseºte operandul dupã `%s'"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, fuzzy, c-format
msgid "extra operand '%s'"
msgstr "operand în plus(extra) `%s'"
msgid "pagination not supported on this host"
msgstr "paginaþie nesuportatã de acest host"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "prea multe opþiuni de etichete fiºier"
msgid "conflicting tabsize options"
msgstr "opþiuni mãrime tab în conflict"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr " --from-file ºi --to-file sunt specificate împreunã"
-#: src/diff.c:883
+#: src/diff.c:890
#, fuzzy
msgid " --normal output a normal diff (the default)"
msgstr "--normal Afiºeazã un diff normal."
-#: src/diff.c:884
+#: src/diff.c:891
#, fuzzy
msgid "-q, --brief report only when files differ"
msgstr "-q --brief Afiºeazã doar dacã fiºierele diferã."
-#: src/diff.c:885
+#: src/diff.c:892
#, fuzzy
msgid "-s, --report-identical-files report when two files are the same"
msgstr ""
"-s --report-identical-files Raporteazã când douã fiºiere sunt asemãnãtoare."
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
-#: src/diff.c:887
+#: src/diff.c:894
#, fuzzy
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-w NUM --width=NUM Afiºeazã cel mult NUM (implicit 130) coloane tipãrite."
-#: src/diff.c:888
+#: src/diff.c:895
#, fuzzy
msgid "-e, --ed output an ed script"
msgstr "-e --ed Afiºeazã un script ed."
-#: src/diff.c:889
+#: src/diff.c:896
#, fuzzy
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs Afiºeazã un diff în format RCS."
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr ""
-#: src/diff.c:891
+#: src/diff.c:898
#, fuzzy
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-w NUM --width=NUM Afiºeazã cel mult NUM (implicit 130) coloane tipãrite."
-#: src/diff.c:892
+#: src/diff.c:899
#, fuzzy
msgid ""
" --left-column output only the left column of common lines"
msgstr "-l --left-column Afiºeazã doar coloana din stânga a liniilor comune."
-#: src/diff.c:893
+#: src/diff.c:900
#, fuzzy
msgid " --suppress-common-lines do not output common lines"
msgstr "-s --suppress-common-lines Nu afiºa liniile comune."
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
"--from-file=FIªIER1 Comparã FIªIER1 cu toþi operanzii. FIªIER1 poate fi "
"director."
-#: src/diff.c:900
+#: src/diff.c:907
#, fuzzy
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t --expand-tabs Schimbã tab-urile în spaþii la ieºire(output)."
-#: src/diff.c:901
+#: src/diff.c:908
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T --initial-tab Aliniazã tab-urile adãugând în faþã un tab."
-#: src/diff.c:902
+#: src/diff.c:909
#, fuzzy
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
"--tabsize=NUM Opririle tab-ului vor fi la fiecare NUM (implicit 8) coloane "
"tipãrite."
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
-#: src/diff.c:904
+#: src/diff.c:911
#, fuzzy
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l --paginate Trimite ieºirea(output) prin `pr' pentru a fi paginatã."
-#: src/diff.c:906
+#: src/diff.c:913
#, fuzzy
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr "-r --recursive Comparã recursiv orice subdirector întâlnit."
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
-#: src/diff.c:908
+#: src/diff.c:915
#, fuzzy
msgid "-N, --new-file treat absent files as empty"
msgstr "-N --new-file Trateazã fiºierele lipsã ca vide."
-#: src/diff.c:909
+#: src/diff.c:916
#, fuzzy
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr "--unidirectional-new-file Trateazã primele fiºiere lipsã ca vide."
-#: src/diff.c:910
+#: src/diff.c:917
#, fuzzy
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
"--ignore-file-name-case Ignorã cazul când se comparã numele de fiºiere."
-#: src/diff.c:911
+#: src/diff.c:918
#, fuzzy
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
"--no-ignore-file-name-case Ia în calcul cazul atunci când se comparã numele "
"de fiºiere."
-#: src/diff.c:912
+#: src/diff.c:919
#, fuzzy
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x TIP --exclude=TIP Exclude fiºierele care se potrivesc TIParului."
-#: src/diff.c:913
+#: src/diff.c:920
#, fuzzy
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
"-X FIªIER --exclude-from=FIªIER Exclude fiºierele care se potrivesc "
"oricãrui tipar din FIªIER."
-#: src/diff.c:914
+#: src/diff.c:921
#, fuzzy
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
"-S FIªIER --starting-file=FIªIER Începe cu FIªIER în compararea "
"directoarelor."
-#: src/diff.c:915
+#: src/diff.c:922
#, fuzzy
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
"--from-file=FIªIER1 Comparã FIªIER1 cu toþi operanzii. FIªIER1 poate fi "
"director."
-#: src/diff.c:917
+#: src/diff.c:924
#, fuzzy
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
"--to-file=FIªIER2 Comparã toþi operanzii cu FIªIER2. FIªIER2 poate fi "
"director."
-#: src/diff.c:920
+#: src/diff.c:927
#, fuzzy
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i --ignore-case Ignorã diferenþele de caz din conþinutul fiºierului."
-#: src/diff.c:921
+#: src/diff.c:928
#, fuzzy
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E --ignore-tab-expansion Ignorã schimbãrile produse de modificarea tab-"
"ului."
-#: src/diff.c:922
+#: src/diff.c:929
#, fuzzy
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-w --ignore-all-space Ignorã tot spaþiul vid."
-#: src/diff.c:923
+#: src/diff.c:930
#, fuzzy
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b --ignore-space-change Ignorã schimbãrile din spaþiul vid."
-#: src/diff.c:924
+#: src/diff.c:931
#, fuzzy
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w --ignore-all-space Ignorã tot spaþiul vid."
-#: src/diff.c:925
+#: src/diff.c:932
#, fuzzy
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
"-B --ignore-blank-lines Ignorã schimbãrile unde toate liniile sunt "
"goale(blank)."
-#: src/diff.c:926
+#: src/diff.c:933
#, fuzzy
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I RE --ignore-matching-lines=RE Ignorã schimbãrile la toate liniile care "
"se potrivesc RE-ului."
-#: src/diff.c:928
+#: src/diff.c:935
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text Trateazã toate fiºierele ca text."
-#: src/diff.c:929
+#: src/diff.c:936
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
"--strip-trailing-cr Eliminã returul de car(carriage return) final la "
"intrare(input)."
-#: src/diff.c:931
+#: src/diff.c:938
#, fuzzy
msgid " --binary read and write data in binary mode"
msgstr "--binary Citeºte ºi scrie date în mod binar."
-#: src/diff.c:934
+#: src/diff.c:941
#, fuzzy
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
"-D NUME --ifdef=NUME Afiºeazã fiºierul rezultat(merged) pentru a arãta "
"diff-urile`#ifdef NAME'."
-#: src/diff.c:935
+#: src/diff.c:942
#, fuzzy
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
"--GTYPE-group-format=GFMT Similar, dar formatul de intrare GTYPE se "
"grupeazã cu GFMT."
-#: src/diff.c:936
+#: src/diff.c:943
#, fuzzy
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr "--line-format=LFMT Similar, dar formateazã toate liniile cu LFMT."
-#: src/diff.c:937
+#: src/diff.c:944
#, fuzzy
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
"--LTYPE-line-format=LFMT Similar, dar formateazã liniile de intrare LTYPE "
"cu LFMT."
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
#, fuzzy
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE este `old', `new', sau `unchanged'. GTYPE este LTYPE sau `changed'."
-#: src/diff.c:941
+#: src/diff.c:948
#, fuzzy
msgid ""
" GFMT (only) may contain:\n"
" E F-1\n"
" M L+1"
-#: src/diff.c:953
+#: src/diff.c:960
#, fuzzy
msgid ""
" LFMT (only) may contain:\n"
" %[-][WIDTH][.[PREC]]{doxX}n specificaþii stil printf-pentru "
"introducerea numãrului de linie"
-#: src/diff.c:957
+#: src/diff.c:964
#, fuzzy
msgid ""
" Both GFMT and LFMT may contain:\n"
" %c'C' caracterul singular C\n"
" %c'\\OOO' caracterul cu codul octal OOO"
-#: src/diff.c:963
+#: src/diff.c:970
#, fuzzy
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
"-d --minimal Încearcã din greu sã gãseºti un set mai mic de schimbãri"
-#: src/diff.c:964
+#: src/diff.c:971
#, fuzzy
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr "--horizon-lines=NUM Reþine NUM linii de prefix ºi sufix comun."
-#: src/diff.c:965
+#: src/diff.c:972
#, fuzzy
msgid ""
" --speed-large-files assume large files and many scattered small changes"
"-H --speed-large-files Presupune fiºiere mari ºi multe modificãri mici "
"împrãºtiate."
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr "--normal Afiºeazã un diff normal."
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr ""
-#: src/diff.c:972
+#: src/diff.c:979
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "-v --version Tipãreºte informaþii despre versiune."
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FIªIEREle sunt `FIªIER1 FIªIER2' sau `DIR1 DIR2' sau `DIR FIªIER...' or "
"`FIªIER... DIR'."
-#: src/diff.c:975
+#: src/diff.c:982
#, fuzzy
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
"Dacã --from-file sau --to-file sunt precizate, nu existã restricþii pe "
"FIªIERE."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
#, fuzzy
msgid "If a FILE is '-', read standard input."
msgstr "Dacã FIªIER este `-', se citeºte intrarea(input) standard."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Folosire: %s [OPÞIUNE]... FIªIERE\n"
-#: src/diff.c:987
+#: src/diff.c:994
#, fuzzy
msgid "Compare FILES line by line."
msgstr "Comparã fiºierele linie cu linie."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, fuzzy, c-format
msgid "conflicting %s option value '%s'"
msgstr "Existã un conflict cu %s în valoarea opþiunii `%s'"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "Conflict în opþiunile stilului de afiºare(output)"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "lungime invalidã `%s'"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Doar în %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
#, fuzzy
msgid "cannot compare '-' to a directory"
msgstr "nu se poate compara `-' cu un director"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "opþiunea -D nu este compatibilã cu directoarele"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Subdirectoare comune: %s ºi %s.\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Fiºierul %s este un %s pe când fiºierul %s este un %s.\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, fuzzy, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Fiºierele %s ºi %s diferã\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Fiºierele %s ºi %s sunt identice\n"
msgid "Randy Smith"
msgstr "Scris de Randy Smith."
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "opþiuni incompatibile"
-#: src/diff3.c:353
+#: src/diff3.c:388
#, fuzzy
msgid "'-' specified for more than one input file"
msgstr "`-' specificat pentru mai mult de un fiºier de intrare(input)"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "citire eºuatã"
-#: src/diff3.c:428
+#: src/diff3.c:473
#, fuzzy
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr "-A --show-all Afiºeazã toate modificãrile, conflictele de paranteze."
-#: src/diff3.c:430
+#: src/diff3.c:475
#, fuzzy
msgid ""
"-e, --ed output ed script incorporating changes\n"
"-e --ed Trimite(output) modificãrile nerezultate(unmerged) de la "
"FIªIER_VECHI la FIªIERUL_VOSTRU în FIªIERUL_MEU.."
-#: src/diff3.c:432
+#: src/diff3.c:477
#, fuzzy
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E --show-overlap Afiºeazã modificãrile nerezultate(unmerged), conflictele "
"de paranteze."
-#: src/diff3.c:433
+#: src/diff3.c:478
#, fuzzy
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"-3 --easy-only Afiºeazã schimbãrile nesuprapuse(nonoverlapping) ºi "
"nerezultate(unmerged)."
-#: src/diff3.c:434
+#: src/diff3.c:479
#, fuzzy
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x --overlap-only Afiºeazã toate schimbãrile de suprapunere."
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
-#: src/diff3.c:436
+#: src/diff3.c:481
#, fuzzy
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i Adaugã comenzile `w' ºi `q' la scripturile ed."
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text Trateazã toate fiºierele ca text."
-#: src/diff3.c:442
+#: src/diff3.c:487
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
"--strip-trailing-cr Eliminã returul de car(carriage return) final la "
"intrare(input)."
-#: src/diff3.c:443
+#: src/diff3.c:488
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T --initial-tab Aliniazã tab-urile adãugând în faþã un tab."
-#: src/diff3.c:444
+#: src/diff3.c:489
#, fuzzy
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr "--diff-program=PROGRAM Foloseºte PROGRAM pentru a compara fiºierele."
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr ""
-#: src/diff3.c:449
+#: src/diff3.c:494
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "-v --version Tipãreºte informaþii despre versiune."
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Folosire: %s [OPÞIUNE]... FIªIERUL_MEU FIªIER_VECHI FIªIERUL_TÃU\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Comparã trei fiºiere linie cu linie"
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "eroare internã: zãpãcealã în formatul blocurilor diff"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff eºuat: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "eroare internã: tip diff invalid în process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "format diff invalid; separator de modificare invalid"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "format diff invalid; ultimã-linie incompletã"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, fuzzy, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "programul subsidiar `%s' nu a fost gãsit"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "format diff invalid; caractere precedente liniei incorecte"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "eroare internã: tip invalid de diff trimis spre ieºire(output)"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "fiºier de intrare(input) micºorat"
"v:\tInclude detaliat liniile comune.\n"
"q:\tIeºire.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: opþiune necunoscutã `--%s'\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 2.8.7\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2007-02-13 07:13+0300\n"
"Last-Translator: Oleg S. Tihonov <ost@tatnipi.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr ""
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "æÁÊÌÙ %s É %s ÒÁÚÌÉÞÁÀÔÓÑ\n"
msgid "Binary files %s and %s differ\n"
msgstr "æÁÊÌÙ %s É %s ÒÁÚÌÉÞÁÀÔÓÑ\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "÷ ËÏÎÃÅ ÆÁÊÌÁ ÎÅÔ ÎÏ×ÏÊ ÓÔÒÏËÉ"
msgid "David MacKenzie"
msgstr ""
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, fuzzy, c-format
msgid "Try '%s --help' for more information."
msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ."
msgid "options -l and -s are incompatible"
msgstr "ËÌÀÞÉ -l É -s ÎÅÓÏ×ÍÅÓÔÉÍÙ"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "ÚÁÐÉÓØ ÎÅÕÓÐÅÛÎÁ"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
"at the beginning of each file (zero by default)."
msgstr "î1 É î2 -- ÜÔÏ ÞÉÓÌÏ ÂÁÊÔ, ËÏÔÏÒÙÅ ÓÌÅÄÕÅÔ ÐÒÏÐÕÓÔÉÔØ × ËÁÖÄÏÍ ÆÁÊÌÅ."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "åÓÌÉ æáêì ÎÅ ÚÁÄÁÎ ÉÌÉ ÚÁÄÁÎ ËÁË `-', ÞÉÔÁÅÔ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"÷ÙÈÏÄÎÏÊ ÓÔÁÔÕÓ ÒÁ×ÅÎ 0, ÅÓÌÉ ×ÈÏÄÎÙÅ ÆÁÊÌÙ ÉÄÅÎÔÉÞÎÙ, 1 -- ÅÓÌÉ\n"
msgid "invalid --bytes value '%s'"
msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ --bytes `%s'"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, fuzzy, c-format
msgid "missing operand after '%s'"
msgstr "ÐÒÏÐÕÝÅÎ ÏÐÅÒÁÎÄ ÐÏÓÌÅ `%s'"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, fuzzy, c-format
msgid "extra operand '%s'"
msgstr "ÉÚÌÉÛÎÉÊ ÏÐÅÒÁÎÄ `%s'"
msgid "pagination not supported on this host"
msgstr "ÒÁÚÂÉÅÎÉÅ ÎÁ ÓÔÒÁÎÉÃÙ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÎÁ ÄÁÎÎÏÊ ÍÁÛÉÎÅ"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ËÌÀÞÅÊ ÚÁÄÁÀÝÉÈ ÍÅÔËÉ ÆÁÊÌÏ×"
msgid "conflicting tabsize options"
msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ËÌÀÞÉ ÚÁÄÁÎÉÑ ÛÉÒÉÎÙ ÔÁÂÕÌÑÃÉÉ"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ËÁË --from-file, ÔÁË É --to-file"
-#: src/diff.c:883
+#: src/diff.c:890
#, fuzzy
msgid " --normal output a normal diff (the default)"
msgstr "--normal ÷Ù×ÏÄÉÔØ × ÏÂÙÞÎÏÍ ÆÏÒÍÁÔÅ diff."
-#: src/diff.c:884
+#: src/diff.c:891
#, fuzzy
msgid "-q, --brief report only when files differ"
msgstr "-q --brief îÁÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÒÁÚÌÉÞÁÀÔÓÑ ÌÉ ÆÁÊÌÙ."
-#: src/diff.c:885
+#: src/diff.c:892
#, fuzzy
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s --report-identical-files óÏÏÂÝÁÔØ Ï ÏÄÉÎÁËÏ×ÙÈ ÆÁÊÌÁÈ."
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
-#: src/diff.c:887
+#: src/diff.c:894
#, fuzzy
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
"-w þéóìï --width=þéóìï ÷Ù×ÏÄÉÔØ ÍÁËÓÉÍÕÍ ÚÁÄÁÎÎÏÅ þéóìï ÚÎÁËÏ× × ÓÔÒÏËÅ.\n"
" (ÐÏ ÕÍÏÌÞÁÎÉÀ 130)"
-#: src/diff.c:888
+#: src/diff.c:895
#, fuzzy
msgid "-e, --ed output an ed script"
msgstr "-e --ed ÷Ù×ÏÄÉÔØ ÓÃÅÎÁÒÉÊ ed."
-#: src/diff.c:889
+#: src/diff.c:896
#, fuzzy
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs ÷Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ RCS."
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr ""
-#: src/diff.c:891
+#: src/diff.c:898
#, fuzzy
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
"-w þéóìï --width=þéóìï ÷Ù×ÏÄÉÔØ ÍÁËÓÉÍÕÍ ÚÁÄÁÎÎÏÅ þéóìï ÚÎÁËÏ× × ÓÔÒÏËÅ.\n"
" (ÐÏ ÕÍÏÌÞÁÎÉÀ 130)"
-#: src/diff.c:892
+#: src/diff.c:899
#, fuzzy
msgid ""
" --left-column output only the left column of common lines"
msgstr "-l --left-column ÷Ù×ÏÄÉÔØ ÔÏÌØËÏ ÌÅ×ÕÀ ËÏÌÏÎËÕ ÏÂÝÉÈ ÓÔÒÏË."
-#: src/diff.c:893
+#: src/diff.c:900
#, fuzzy
msgid " --suppress-common-lines do not output common lines"
msgstr "-s --suppress-common-lines îÅ ×Ù×ÏÄÉÔØ ÏÂÝÉÅ ÓÔÒÏËÉ."
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
"--from-file=æáêì1 óÒÁ×ÎÉÔØ æáêì1 ÓÏ ×ÓÅÍÉ ÏÐÅÒÁÎÄÁÍÉ.\n"
" æáêì1 ÍÏÖÅÔ ÂÙÔØ ËÁÔÁÌÏÇÏÍ."
-#: src/diff.c:900
+#: src/diff.c:907
#, fuzzy
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t --expand-tabs òÁÓËÒÙ×ÁÔØ ÐÒÉ ×Ù×ÏÄÅ ÓÉÍ×ÏÌÙ ÔÁÂÕÌÑÃÉÉ × ÐÒÏÂÅÌÙ."
-#: src/diff.c:901
+#: src/diff.c:908
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab ÷ÙÒÁ×ÎÉ×ÁÔØ ÔÁÂÕÌÑÃÉÀ ÄÏÂÁ×ÌÑÑ × ÎÁÞÁÌÏ ÓÉÍ×ÏÌ ÔÁÂÕÌÑÃÉÉ."
-#: src/diff.c:902
+#: src/diff.c:909
#, fuzzy
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
"--tabsize=þéóìï ôÁÂÕÌÑÃÉÑ ÞÅÒÅÚ ÚÁÄÁÎÎÏÅ þéóìï ÚÎÁËÏ× (ÐÏ ÕÍÏÌÞÁÎÉÀ 8)."
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
-#: src/diff.c:904
+#: src/diff.c:911
#, fuzzy
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l --paginate îÁÐÒÁ×ÉÔØ ×Ù×ÏÄ ÐÒÏÇÒÁÍÍÅ `pr' ÄÌÑ ÒÁÚÂÉÅÎÉÑ ÎÁ ÓÔÒÁÎÉÃÙ."
-#: src/diff.c:906
+#: src/diff.c:913
#, fuzzy
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr "-r --recursive òÅËÕÒÓÉ×ÎÏ ÓÒÁ×ÎÉ×ÁÔØ ÐÏÄËÁÔÁÌÏÇÉ."
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
-#: src/diff.c:908
+#: src/diff.c:915
#, fuzzy
msgid "-N, --new-file treat absent files as empty"
msgstr "-N --new-file ÷ÏÓÐÒÉÎÉÍÁÔØ ÎÅÓÕÝÅÓÔ×ÕÀÝÉÅ ÆÁÊÌÙ ËÁË ÐÕÓÔÙÅ."
-#: src/diff.c:909
+#: src/diff.c:916
#, fuzzy
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
"--unidirectional-new-file ÷ÏÓÐÒÉÎÉÍÁÔØ ÎÅÓÕÝÅÓÔ×ÕÀÝÉÅ ÐÅÒ×ÙÅ ÆÁÊÌÙ ËÁË "
"ÐÕÓÔÙÅ."
-#: src/diff.c:910
+#: src/diff.c:917
#, fuzzy
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr "--ignore-file-name-case éÇÎÏÒÉÒÏ×ÁÔØ ÒÅÇÉÓÔÒ ÂÕË× × ÉÍÅÎÁÈ ÆÁÊÌÏ×."
-#: src/diff.c:911
+#: src/diff.c:918
#, fuzzy
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr "--no-ignore-file-name-case õÞÉÔÙ×ÁÔØ ÒÅÇÉÓÔÒ ÂÕË× × ÉÍÅÎÁÈ ÆÁÊÌÏ×."
-#: src/diff.c:912
+#: src/diff.c:919
#, fuzzy
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x ïâòáúåã --exclude=ïâòáúåã éÓËÌÀÞÉÔØ ÆÁÊÌÙ, ÞØÉ ÉÍÅÎÁ ÓÏ×ÐÁÄÁÀÔ Ó "
"ïâòáúãïí."
-#: src/diff.c:913
+#: src/diff.c:920
#, fuzzy
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
"ÌÉÂÏ\n"
" ÏÂÒÁÚÃÏÍ ÉÚ ÚÁÐÉÓÁÎÎÙÈ × æáêìå."
-#: src/diff.c:914
+#: src/diff.c:921
#, fuzzy
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr "-S æáêì --starting-file=æáêì ðÒÉ ÓÒÁ×ÎÅÎÉÉ ËÁÔÁÌÏÇÏ× ÎÁÞÁÔØ Ó æáêìá."
-#: src/diff.c:915
+#: src/diff.c:922
#, fuzzy
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
"--from-file=æáêì1 óÒÁ×ÎÉÔØ æáêì1 ÓÏ ×ÓÅÍÉ ÏÐÅÒÁÎÄÁÍÉ.\n"
" æáêì1 ÍÏÖÅÔ ÂÙÔØ ËÁÔÁÌÏÇÏÍ."
-#: src/diff.c:917
+#: src/diff.c:924
#, fuzzy
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
"--to-file=æáêì2 óÒÁ×ÎÉÔØ ×ÓÅ ÏÐÅÒÁÎÄÙ Ó æáêìïí2. æáêì2 ÍÏÖÅÔ ÂÙÔØ "
"ËÁÔÁÌÏÇÏÍ."
-#: src/diff.c:920
+#: src/diff.c:927
#, fuzzy
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr "-i --ignore-case éÇÎÏÒÉÒÏ×ÁÔØ ÒÅÇÉÓÔÒ ÂÕË× × ÓÏÄÅÒÖÉÍÏÍ ÆÁÊÌÏ×."
-#: src/diff.c:921
+#: src/diff.c:928
#, fuzzy
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E --ignore-tab-expansion éÇÎÏÒÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ, ×ÙÚ×ÁÎÎÙÅ ÒÁÓËÒÙÔÉÅÍ "
"ÔÁÂÕÌÑÃÉÉ."
-#: src/diff.c:922
+#: src/diff.c:929
#, fuzzy
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-w --ignore-all-space éÇÎÏÒÉÒÏ×ÁÔØ ×ÓÅ ÐÒÏÂÅÌØÎÙÅ ÓÉÍ×ÏÌÙ."
-#: src/diff.c:923
+#: src/diff.c:930
#, fuzzy
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b --ignore-space-change éÇÎÏÒÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ ÞÉÓÌÁ ÐÒÏÂÅÌØÎÙÈ ÓÉÍ×ÏÌÏ×."
-#: src/diff.c:924
+#: src/diff.c:931
#, fuzzy
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w --ignore-all-space éÇÎÏÒÉÒÏ×ÁÔØ ×ÓÅ ÐÒÏÂÅÌØÎÙÅ ÓÉÍ×ÏÌÙ."
-#: src/diff.c:925
+#: src/diff.c:932
#, fuzzy
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr "-B --ignore-blank-lines éÇÎÏÒÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ ÞÉÓÌÁ ÐÕÓÔÙÈ ÓÔÒÏË."
-#: src/diff.c:926
+#: src/diff.c:933
#, fuzzy
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
" ÐÏÌÎÏÓÔØÀ ÓÏÏÔ×ÅÔÓÔ×ÕÀÔ ÚÁÄÁÎÎÏÍÕ ÒÅÇÕÌÑÒÎÏÍÕ "
"×ÙÒÁÖÅÎÉÀ"
-#: src/diff.c:928
+#: src/diff.c:935
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text óÞÉÔÁÔØ ×ÓÅ ÆÁÊÌÙ ÔÅËÓÔÏ×ÙÍÉ."
-#: src/diff.c:929
+#: src/diff.c:936
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr õÄÁÌÉÔØ ÎÁ ×Ù×ÏÄÅ ÚÁ×ÅÒÛÁÀÝÉÊ ×ÏÚ×ÒÁÔ ËÁÒÅÔËÉ."
-#: src/diff.c:931
+#: src/diff.c:938
#, fuzzy
msgid " --binary read and write data in binary mode"
msgstr "--binary þÉÔÁÔØ É ÚÁÐÉÓÙ×ÁÔØ ÆÁÊÌÙ × Ä×ÏÉÞÎÏÊ ÆÏÒÍÅ."
-#: src/diff.c:934
+#: src/diff.c:941
#, fuzzy
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D éíñ --ifdef=éíñ ÷Ù×ÏÄÉÔØ ÚÁÐÌÁÔÙ, ÉÓÐÏÌØÚÕÀÝÉÅ ËÏÎÓÔÒÕËÃÉÀ `#ifdef éíñ'."
-#: src/diff.c:935
+#: src/diff.c:942
#, fuzzy
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
"çôéð\n"
" × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÆÏÒÍÁÔÏÍ çæíô."
-#: src/diff.c:936
+#: src/diff.c:943
#, fuzzy
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
"--line-format=óæíô áÎÁÌÏÇÉÞÎÏ, ÎÏ ÆÏÒÍÁÔÉÒÏ×ÁÔØ ×ÓÅ ×ÈÏÄÎÙÅ ÓÔÒÏËÉ Ó óæíô."
-#: src/diff.c:937
+#: src/diff.c:944
#, fuzzy
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
"óôéð\n"
" × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÆÏÒÍÁÔÏÍ óæíô."
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
#, fuzzy
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" óôéð ÍÏÖÅÔ ÂÙÔØ `old', `new', ÉÌÉ `unchanged', çôéð -- ÔÏ ÖÅ É `changed'."
-#: src/diff.c:941
+#: src/diff.c:948
#, fuzzy
msgid ""
" GFMT (only) may contain:\n"
" E F-1\n"
" M L+1"
-#: src/diff.c:953
+#: src/diff.c:960
#, fuzzy
msgid ""
" LFMT (only) may contain:\n"
" %l ÓÏÄÅÒÖÉÍÏÅ ÓÔÒÏËÉ, ÉÓËÌÀÞÁÑ ×ÓÅ ÎÏ×ÙÅ ÓÔÒÏËÉ × ËÏÎÃÅ\n"
" %[-][ûéòéîá][.[ôïþî]]{doxX}n ÆÏÒÍÁÔ ÎÏÍÅÒÁ ×ÈÏÄÎÏÊ ÓÔÒÏËÉ × ÓÔÉÌÅ printf"
-#: src/diff.c:957
+#: src/diff.c:964
#, fuzzy
msgid ""
" Both GFMT and LFMT may contain:\n"
" %c'ó' ÏÄÉÎ ÓÉÍ×ÏÌ ó\n"
" %c'\\OOO' ÏÄÉÎ ÓÉÍ×ÏÌ Ó ×ÏÓØÍÅÒÉÞÎÙÍ ËÏÄÏÍ OOO"
-#: src/diff.c:963
+#: src/diff.c:970
#, fuzzy
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d --minimal ðÙÔÁÔØÓÑ ÎÁÊÔÉ ÎÁÉÍÅÎØÛÉÊ ÎÁÂÏÒ ÉÚÍÅÎÅÎÉÊ."
-#: src/diff.c:964
+#: src/diff.c:971
#, fuzzy
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
"--horizon-lines=þéóìï ÷Ù×ÏÄÉÔØ þéóìï ÏÂÝÉÈ ÓÔÒÏË ÄÏ É ÐÏÓÌÅ ÒÁÚÌÉÞÁÀÝÉÈÓÑ."
-#: src/diff.c:965
+#: src/diff.c:972
#, fuzzy
msgid ""
" --speed-large-files assume large files and many scattered small changes"
"-H --speed-large-files ðÒÅÄÐÏÌÁÇÁÔØ, ÞÔÏ ÆÁÊÌÙ ÂÏÌØÛÉÅ ÓÏ ÍÎÏÇÉÍÉ\n"
" ÒÁÚÂÒÏÓÁÎÎÙÍÉ ÍÅÌËÉÍÉ ÉÚÍÅÎÅÎÉÑÍÉ."
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr "--normal ÷Ù×ÏÄÉÔØ × ÏÂÙÞÎÏÍ ÆÏÒÍÁÔÅ diff."
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr ""
-#: src/diff.c:972
+#: src/diff.c:979
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "-v --version ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ."
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"æáêìù ÜÔÏ `æáêì1 æáêì2', ÉÌÉ `ëáôáìïç1 ëáôáìïç2', ÉÌÉ `ëáôáìïç æáêì...',\n"
"ÉÌÉ `æáêì... ëáôáìïç'."
-#: src/diff.c:975
+#: src/diff.c:982
#, fuzzy
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr "åÓÌÉ ÚÁÄÁÎ --from-file ÉÌÉ --to-file, ÎÁ æáêìù ÎÅÔ ÏÇÒÁÎÉÞÅÎÉÊ."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
#, fuzzy
msgid "If a FILE is '-', read standard input."
msgstr "åÓÌÉ æáêì ÚÁÄÁÎ ËÁË `-', ÞÉÔÁÅÔ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... æáêìù\n"
-#: src/diff.c:987
+#: src/diff.c:994
#, fuzzy
msgid "Compare FILES line by line."
msgstr "ðÏÓÔÒÏÞÎÏ ÓÒÁ×ÎÉ×ÁÅÔ Ä×Á ÆÁÊÌÁ."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, fuzzy, c-format
msgid "conflicting %s option value '%s'"
msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÏÅ ÚÎÁÞÅÎÉÅ %s ÄÌÑ ËÌÀÞÁ `%s'"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ËÌÀÞÉ ÚÁÄÁÎÉÑ ÓÔÉÌÑ ×Ù×ÏÄÁ"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÛÉÒÉÎÁ `%s'"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "ôÏÌØËÏ × %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
#, fuzzy
msgid "cannot compare '-' to a directory"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÒÁ×ÎÉÔØ `-' Ó ËÁÔÁÌÏÇÏÍ"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "-D option not supported with directories"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "ïÂÝÉÅ ÐÏÄËÁÔÁÌÏÇÉ: %s É %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "æÁÊÌ %s ÜÔÏ %s, ÔÏÇÄÁ ËÁË ÆÁÊÌ %s -- %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, fuzzy, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "æÁÊÌÙ %s É %s ÒÁÚÌÉÞÁÀÔÓÑ\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "æÁÊÌÙ %s É %s ÉÄÅÎÔÉÞÎÙ\n"
msgid "Randy Smith"
msgstr ""
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "ÎÅÓÏ×ÍÅÓÔÉÍÙÅ ËÌÀÞÉ"
-#: src/diff3.c:353
+#: src/diff3.c:388
#, fuzzy
msgid "'-' specified for more than one input file"
msgstr "`-' ÚÁÄÁÎ ÄÌÑ ÂÏÌÅÅ ÏÄÎÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "ÞÔÅÎÉÅ ÎÅÕÓÐÅÛÎÏ"
-#: src/diff3.c:428
+#: src/diff3.c:473
#, fuzzy
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A --show-all ÷Ù×ÏÄÉÔØ ×ÓÅ ÉÚÍÅÎÅÎÉÑ, ÚÁËÌÀÞÁÑ ËÏÎÆÌÉËÔÎÙÅ ÍÅÓÔÁ × ÓËÏÂËÉ."
-#: src/diff3.c:430
+#: src/diff3.c:475
#, fuzzy
msgid ""
"-e, --ed output ed script incorporating changes\n"
"-e --ed ÷Ù×ÏÄÉÔØ ÎÅ ÏÂßÅÄÉÎÅÎÎÙÅ ÉÚÍÅÎÅÎÉÑ × óôïòïí-æáêìå ÉÚ ÷áûåçï-æáêìá\n"
" × íïê-æáêì."
-#: src/diff3.c:432
+#: src/diff3.c:477
#, fuzzy
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E --show-overlap ÷Ù×ÏÄÉÔØ ÎÅ ÏÂßÅÄÉÎÅÎÎÙÅ ÉÚÍÅÎÅÎÉÑ,\n"
" ÚÁËÌÀÞÁÑ ËÏÎÆÌÉËÔÎÙÅ ÍÅÓÔÁ × ÓËÏÂËÉ."
-#: src/diff3.c:433
+#: src/diff3.c:478
#, fuzzy
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr "-3 --easy-only ÷Ù×ÏÄÉÔØ ÎÅ ÏÂßÅÄÉÎÅÎÎÙÅ ÎÅÐÅÒÅÓÅËÁÀÝÉÅÓÑ ÉÚÍÅÎÅÎÉÑ."
-#: src/diff3.c:434
+#: src/diff3.c:479
#, fuzzy
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x --overlap-only ÷Ù×ÏÄÉÔØ ÐÅÒÅËÒÙ×ÁÀÝÉÅÓÑ ÉÚÍÅÎÅÎÉÑ."
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
-#: src/diff3.c:436
+#: src/diff3.c:481
#, fuzzy
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i äÏÂÁ×ÉÔØ ËÏÍÁÎÄÙ `w' É `q' × ËÏÎÅà ÓÃÅÎÁÒÉÑ ed."
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text óÞÉÔÁÔØ ×ÓÅ ÆÁÊÌÙ ÔÅËÓÔÏ×ÙÍÉ."
-#: src/diff3.c:442
+#: src/diff3.c:487
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr õÄÁÌÉÔØ ÎÁ ×Ù×ÏÄÅ ÚÁ×ÅÒÛÁÀÝÉÊ ×ÏÚ×ÒÁÔ ËÁÒÅÔËÉ."
-#: src/diff3.c:443
+#: src/diff3.c:488
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab ÷ÙÒÁ×ÎÉ×ÁÔØ ÔÁÂÕÌÑÃÉÀ ÄÏÂÁ×ÌÑÑ × ÎÁÞÁÌÏ ÓÉÍ×ÏÌ ÔÁÂÕÌÑÃÉÉ."
-#: src/diff3.c:444
+#: src/diff3.c:489
#, fuzzy
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
"--diff-program=ðòïçòáííá éÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÓÒÁ×ÎÉÑ ÆÁÊÌÏ× ÕËÁÚÁÎÎÕÀ "
"ðòïçòáííõ."
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr ""
-#: src/diff3.c:449
+#: src/diff3.c:494
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "-v --version ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ."
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... íïê-æáêì óôáòùê-æáêì ÷áû-æáêì\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "ðÏÓÔÒÏÞÎÏ ÓÒÁ×ÎÉ×ÁÅÔ ÔÒÉ ÆÁÊÌÁ."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"÷ÙÈÏÄÎÏÊ ÓÔÁÔÕÓ ÒÁ×ÅÎ 0 × ÓÌÕÞÁÅ ÕÓÐÅÈÁ, 1 × ÓÌÕÞÁÅ ËÏÎÆÌÉËÔÏ× É 2 ×\n"
"ÓÌÕÞÁÅ ÎÅÐÏÌÁÄÏË."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: ÐÏ×ÒÅÖÄÅÎÎÙÊ ÆÏÒÍÁÔ ÂÌÏËÏ× ÚÁÐÌÁÔÙ"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: ÐÏÉÓË ÒÁÚÌÉÞÉÊ ÎÅÕÓÐÅÛÅÎ: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: ÎÅ×ÅÒÎÙÊ ÔÉÐ ÚÁÐÌÁÔÙ × ÆÕÎËÃÉÉ `process_diff'"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "ÎÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÚÁÐÌÁÔÙ; ÎÅ×ÅÒÎÙÊ ÒÁÚÄÅÌÉÔÅÌØ ÉÚÍÅÎÅÎÉÑ"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "ÎÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÚÁÐÌÁÔÙ; ÎÅÐÏÌÎÁÑ ÐÏÓÌÅÄÎÑÑ ÓÔÒÏËÁ"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, fuzzy, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "ÎÅ ÕÄÁÌÏÓØ ÚÁÐÕÓÔÉÔØ ×ÓÐÏÍÏÇÁÔÅÌØÎÕÀ ÐÒÏÇÒÁÍÍÕ `%s'"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "ÎÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÚÁÐÌÁÔÙ; ÎÅÐÒÁ×ÌØÎÙÅ ÐÅÒ×ÙÅ ÓÉÍ×ÏÌÙ ÓÔÒÏËÉ"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: ÎÁ ×ÙÈÏÄ ÐÅÒÅÄÁÎ ÎÅ×ÅÒÎÙÊ ÔÉÐ ÚÁÐÌÁÔÙ"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "×ÈÏÄÎÏÊ ÆÁÊÌ ÕÍÅÎØÛÉÌÓÑ"
"v:\t÷ËÌÀÞÁÔØ ÏÂÝÉÅ ÓÔÒÏËÉ, ×ÙÄÁ×ÁÑ ÓÏÏÂÝÅÎÉÅ.\n"
"q:\t÷ÙÊÔÉ.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2013-10-07 11:40+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr "Општа помоћ користећи ГНУ софтвер: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Датотеке „%s“ и „%s“ су различите\n"
msgid "Binary files %s and %s differ\n"
msgstr "Бинарне датотеке %s и %s различите\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Без новог реда на крају датотеке"
msgid "David MacKenzie"
msgstr "Дејвид Мек Кензи"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Покушајте „%s --help“ за више информација."
msgid "options -l and -s are incompatible"
msgstr "опције -l и -s не иду заједно"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "записивање није успело"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "стандардни излаз"
"Изборни БРОЈ1 и БРОЈ2 су бројеви бајтова за изостављање на почетку\n"
"сваке датотеке (подразумева се нула)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Чита стандардни улаз ако ДАТОТЕКА недостаје или је „-“."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr "Излазно стање је 0 ако су улази исти, 1 за различите, 2 за грешку."
msgid "invalid --bytes value '%s'"
msgstr "неисправна --bytes вредност „%s“"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "недостаје оператор после „%s“"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "вишак оператор „%s“"
msgid "pagination not supported on this host"
msgstr "прелом страна није подржан на овом рачунару"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "исувише опција за ознаку датотеке"
msgid "conflicting tabsize options"
msgstr "сукобљене опције величине табулатора"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "„--from-file“ и „--to-file“ су наведени оба"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal исписује обичне разлике (основно)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q --brief исписује само када се датотеке разликују"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s --report-identical-files извештава када су две датотеке исте"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C БРОЈ, --context[=БРОЈ] исписује БРОЈ (почетно 3) редова умноженог "
"склопа"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-w БРОЈ --width=БРОЈ исписује БРОЈ (почетно 3) редова обједињеног "
"склопа"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e --ed исписује ед спис"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs исписује РЦС запис разлика"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side исписује у две колоне"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-w БРЈ --width=БРЈ исписује на највише БРЈ (почетно 130) колона"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
"-l --left-column исписује само леву колону заједничких редова"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr "-s --suppress-common-lines не приказује заједничке редове"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function приказује у којој Ц функцији је свака промена"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=РИ приказује најскорији ред који одговара РИ"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label ОЗНАКА користи ОЗНАКУ уместо назива датотеке\n"
" (може да се понавља)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t --expand-tabs развија табулаторе у размаке за излаз"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab поравнава табулаторе додајући један табулатор."
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
"--tabsize=БРЈ величина табулатора је БРЈ (почетно 8) колона"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
"--suppress-blank-empty потискује размак или табулатор пре празних "
"редова излаза"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr "-l --paginate пропушта излаз кроз „pr“ за прелом"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r --recursive дубински упоређује све пронађене "
"поддиректоријуме"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference не прати симболичке везе"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N --new-file сматра празним недостајуће датотеке"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file сматра празним прве недостајуће датотеке"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case занемарује словну величину поређујући назива "
"датотека"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case урачунава словну величину поређујући називе "
"датотека"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=ОБР искључује датотеке које поклапају ОБР"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=ТЕКА искључује датотеке које поклапа било који "
"образац у ТЕКА"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=ТЕКА почиње од ТЕКА при поређењу директоријума"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=ТЕКА1 упоређује ТЕКУ1 са свим оперантима. ТЕКА1 "
"може бити директоријум"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=ТЕКА2 упоређује све операнте са ТЕКОМ2. ТЕКА2 може "
"бити директоријум"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i --ignore-case занемарује словну величину у склопу датотека"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E --ignore-tab-expansion занемарује промене услед развијања табулатора"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space занемарује размак на крају реда"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b --ignore-space-change занемарује промене због количине празног "
"простора"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w --ignore-all-space занемарује све празне просторе"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B --ignore-blank-lines занемарује промене услед празних редова"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=РИ занемарује промене чији редови поклапају РИ"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a --text сматра све датотеке као текст"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr огољава пратеће <CR> на улазу"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary чита и пише податке у бинарном режиму"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=НАЗИВ исписује стопљену датотеку да прикаже "
"„#ifdef НАЗИВ“ разлике"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr " --GTYPE-group-format=ГОБЛ обликује GTYPE улазне групе са ГОБЛ"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr " --line-format=РОБЛ обликује све улазне редове са РОБЛ"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr " --LTYPE-line-format=РОБЛ обликује LTYPE улазне редове са РОБЛ"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Ове опције записа обезбеђује фино подешено управљање преко излаза\n"
" различника, генерализујући -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE је „old“, „new“, или „unchanged“. GTYPE је LTYPE или „changed“."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) ако је А исто као Б онда Т супротно Е"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %l садржај реда, изузев пратећих знакова за нови ред\n"
" %[-][ШИРН][.[ТАЧН]]{doxX}n printf-стил за улазни број реда"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' знак са окталним кодом OOO\n"
" З знак З (други знаци представљају сами себе)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d --minimal труди се да нађе мањи скуп промена"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=БРЈ чува БРЈ редова заједничког префикса и суфикса"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files за велике датотеке са много раштрканих малих измена"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal исписује обичне разлике (основно)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help приказује ову помоћ и излази"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v --version исписује податке о издању"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"ДАТОТЕКЕ су „ТЕКА1 ТЕКА2“ или „ДИР1 ДИР2“ или „ДИР ТЕКА...“ или „ТЕКА... "
"ДИР“."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Нема ограничења за ДАТОТЕКЕ ако је задато „--from-file“ или „--to-file“."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Ако је ДАТОТЕКА „-“, чита стандардни улаз."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Употреба: %s [ОПЦИЈА]... ДАТОТЕКЕ\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Поредите ДАТОТЕКЕ ред по ред."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "сукоб вредности „%s“ опције „%s“"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "сукобљене опције излазног стила"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "неисправна дужина „%s“"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Само у %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "не могу поредити „-“ са директоријумом"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "опција „-D“ није подржана за директоријуме"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Заједнички поддиректоријуми: %s и %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Датотека „%s“ је „%s“ док је датотека „%s“ „%s“\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Симболичке везе „%s“ и „%s“ су различите\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Датотеке „%s“ и „%s“ се истоветне\n"
msgid "Randy Smith"
msgstr "Ренди Смит"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "несагласне опције"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "„-“ је наведено за више од једне улазне датотеке"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "читање није успело"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A --show-all исписује све промене, означавајући сукобе "
"заградама"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e --ed исписује неспојене промене између СТАРАТЕКА и "
"ТВОЈАТЕКА у МОЈАТЕКА"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr "-E --show-overlap као -e, означавајући сукобе заградама"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr ""
"-3 --easy-only као -e, али обједињује непреклопљене промене"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x, --overlap-only као -e, али обједињује преклопљене промене"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X као -x, означавајући сукобе заградама"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i придодаје „w“ и „q“ наредбе ед списима"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge исписује тренутну стопљену датотеку, у складу\n"
" са -A ако нису дате друге опције"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a --text сматра све датотеке као текст"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr огољава пратеће <CR> на улазу"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab поравнава табулаторе додајући један табулатор"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr " --diff-program=ПРОГРАМ користи ПРОГРАМ за поређење датотека"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=ОЗНАКА користи ОЗНАКУ уместо назива датотеке\n"
" (може да се понови до три пута)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help приказује ову помоћ и излази"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version исписује податке о издању и излази"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Употреба: %s [ОПЦИЈА]... МОЈАТЕКА СТАРАТЕКА ТВОЈАТЕКА\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Поредите три датотеке ред по ред."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"и да испише тренутно стопљену датотеку. За необичан улаз, ово је много\n"
"рогпадније него употреба еда.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr "Излазно стање је 0 за успех, 1 за сукобе, 2 за грешку."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "унутрашња грешка: зез у запису блокова разлика"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: разлике нису успеле: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "унутрашња грешка: неисправна врста разлика у „process_diff“"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "неисправан запис разлика; неисправан раздвојник измена"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "неисправан облик разлика; непотпун задњи ред"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "помоћни програм „%s“ не може бити покренут"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "неисправан запис разлика; нетачни водећи знакови реда"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "унутрашња грешка: неисправна врста разлика прослеђена излазу"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "улазна датотека се скупила"
"v: Умеће заједничке редове бучно.\n"
"q: Завршава.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: непозната опција „--%s“\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2012-10-31 21:15+0100\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
msgstr ""
"Allmän hjälp med att använda GNU-program: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Filerna %s och %s skiljer\n"
msgid "Binary files %s and %s differ\n"
msgstr "De binära filerna %s och %s skiljer\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Ingen nyrad vid filslut"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Försök med ”%s --help” för mer information."
msgid "options -l and -s are incompatible"
msgstr "flaggorna -l och -s är motstridiga"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "skrivning misslyckades"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "standard ut"
"De valfria HOPP1 och HOPP2 anger antalet antalet byte att hoppa över\n"
"i början varje fil (noll som standard)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Om FIL är ”-” eller utelämnats, läs standard in."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr "Slutsstatus är 0 om indata är lika, 1 om olika, 2 vid problem."
msgid "invalid --bytes value '%s'"
msgstr "ogiltigt --bytes-värde ”%s”"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "saknad operand efter ”%s”"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "extra operand ”%s”"
msgid "pagination not supported on this host"
msgstr "sidvisning stödjs ej på denna värd"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "för många etikettflaggor"
msgid "conflicting tabsize options"
msgstr "konflikt mellan tabulatorflaggor"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "både --from-file och --to-file angavs"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal skriv ut en normal diff (standard)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief rapportera endast när filer skiljer sig"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s --report-identical-files rapportera om två filer är lika"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C ANT, --context[=ANT] skriv ANT (3 som standard) rader kopia av "
"sammanhang"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U ANT, --unified[=ANT] skriv ut ANT (3 som standard) rader med\n"
" sammanslagen omgivning"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed skriv ut ett ed-skript"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs skriv ut skillnader i RCS-format"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side skriv ut i två kolumner"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=ANT skriv ut högst ANT (130 som standard) kolumner"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column skriv ut endast vänstra kolumnen av gemensamma "
"rader"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines skriv inte ut gemensamma rader"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr "-p, --show-c-function visa vilken C-funktion varje rad finns i"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr "-F, --show-function-line=RU visa dn senaste raden som matchar RU"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label ETIKETT använd ETIKETT istället för filnamn\n"
" (kan upprepas)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t, --expand-tabs expandera tabulatorer till blanksteg i utdata"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab justera tabulatorer genom att skjuta in en"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=N tabulatorstopp var N:e (8 som standard) kolumn"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
"tomma\n"
" utrader"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr "-l, --paginate skicka utdata till ”pr” för paginering"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive jämför underkataloger som hittas rekursivt"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference följ inte symboliska länkar"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file behandla saknade filer som tomma"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr " --unidirectional-new-file behandla saknade förstafiler som tomma"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case bortse från skiftläge när filnamn jämförs"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case ta hänsyn till skiftläge när filnamn jämförs"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=MNS ta inte med filer som matchar MNS"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=FIL uteslut filer som matchar något mönster i FIL"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr "-S, --starting-file=FIL börja med FIL när kataloger jämförs"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=FIL1 jämför FIL1 med alla operander;\n"
" FIL1 kan vara en katalog"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=FIL2 jämför alla operander med FIL2;\n"
" FIL2 kan vara en katalog"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case bortse från skillnader i skiftläge i "
"filinnehåll"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion bortse från ändringar på grund av tab-"
"expansion"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr ""
"-Z, --ignore-trailing-space ignorera alla blanktecken i slutet av raden"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b, --ignore-space-change bortse från ändringar i antalet blanka"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space bortse från alla blanktecken"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines bortse från ändringar där raderna är helt "
"blanka"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RU bortse från ändringar där alla rader matchar "
"RU"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text behandla alla filer som text"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr tag bort avslutande vagnreturer i indata"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary läs och skriv data binärt"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=NAMN skriv sammanslagen fil med skillnader inom\n"
" ”#ifdef NAMN”"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr " --GTYP-group-format=GFMT formatera GTYP-ingrupper med GFMT"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr " --line-format=RFMT formatera alla inrader med RFMT"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr " --RTYP-line-format=RFMT formatera RTYP-inrader med RFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Dessa formatflagger gör det möjligt att finjustera utskriften från\n"
" diff, generaliserande -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYP är ”old”, ”new” eller ”unchanged”. GTYP är LTYP eller ”changed”."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) om A är lika med B då T annars E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %l radinnehåll exklusive avslutande nyrad\n"
" %[-][BREDD][.[PREC]]{doxX}n printf-stil spec. för inradnummer"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' tecknet med oktalkod OOO\n"
" T tecknet T (övriga tecken representerar sig själva)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr ""
"-d, --minimal arbeta hårt för att hitta en mindre mängd av "
"ändringar"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=ANT spara ANT rader av gemensamt prefix och suffix"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr " --speed-large-files antag stora filer och små spridda ändringar"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal skriv ut en normal diff (standard)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help visa denna hjälp och avsluta"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version visa versionsinformation och avsluta"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FILER är ”FIL1 FIL2” eller ”KAT1 KAT2” eller \"KAT FIL…” eller ”FIL… KAT”."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Om --from-file eller --to-file är angivet finns det inga begränsningar\n"
"på FILER."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Om en FIL är ”-”, läs standard in."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Användning: %s [FLAGGA]... FILER\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Jämför FILER rad för rad."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "motstridigt %s-flaggsvärde ”%s”"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "motstridig utmatningsstilsflagga"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "ogiltig bredd ”%s”"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Endast i %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "kan inte jämföra ”-” med en katalog"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "-D flaggan stödjs ej för kataloger"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Lika underkataloger: %s och %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Filen %s är %s medan filen %s är %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "De symboliska länkarna %s och %s skiljer\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Filerna %s och %s är lika\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "oförenliga flaggor"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "”-” angivet för mer än en infil"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "läsning misslyckades"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all skriv alla ändringar med markering runt "
"konflikter"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e, --ed skriv ut ett ed-skript som innehåller ändringar\n"
" från GAMMALFIL till DINFIL i MINFIL"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E, --show-overlap som -e, men med markeringar runt konflikter"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only som -e, men tag endast med ej överlappande "
"ändringar"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only som -e, men tag endast med överlappande ändringar"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X som -x, men skriv klamrar om konflikter"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i lägg till ”w”- och ”q”-kommandon till ed-skript"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge skriv ut en faktiskt sammanslagen fil, enligt\n"
" -A om inga andra flaggor ges"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text betrakta alla filer som text"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr tag bort avslutande vagnreturer i indata"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab justera tabulatorer genom att skjuta in en "
"tabulator"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr " --diff-program=PROGRAM använd PROGRAM för att jämföra filer"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=ETIKETT använd ETIKETT istället för filnamn\n"
" (kan upprepas upp till tre gånger)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help visa denna hjälp och avsluta"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version visa versionsinformation och avsluta"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Användning: %s [FLAGGA]... MINFIL GAMMALFIL DINFIL\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Jämför tre filer rad för rad."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"och skriva ut den faktiskt sammanslagna filen. För ovanlig indata är detta\n"
"mer robust än att använda ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr "Slutstatus är 0 om allt bra, 1 vid konflikt, 2 vid problem."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "internt fel: trasigt format i diff-block"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff misslyckades: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "internt fel: ogiltig diff-typ i process_diff"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "ogiltigt diff-format; ogiltig ändringsseparator"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "ogiltigt diff-format; ofullständig sista rad"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "underprogram ”%s” kunde inte startas"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "ogiltigt diff-format; felaktiga starttecken på rad"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "internt fel: ogiltig diff-typ utskickad"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "infilen krympte"
"v:\tInkludera och tillkännage gemensamma rader.\n"
"q:\tAvsluta.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: okänd flagga \"--%s\"\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2013-03-09 15:49+0100\n"
"Last-Translator: Volkan Gezer <vlkngzr@gmail.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
msgstr ""
"GNU yazılımı kullanımı hakkında genel yardım: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "%s ve %s dosyaları birbirinden farklı\n"
msgid "Binary files %s and %s differ\n"
msgstr "İkili %s ve %s birbirinden farklı\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Dosya sonunda yenisatır yok."
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Daha fazla bilgi için `%s --help' komutunu deneyin."
msgid "options -l and -s are incompatible"
msgstr "-l ve -s seçenekleri beraber kullanılamaz"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "yazma başarısız oldu"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "standart çıktı"
"İsteğe bağlı ATLA1 ve ATLA2, her dosyanın başından atlanacak\n"
"(öntanımlı olarak sıfır) bayt sayısını belirtir."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Eğer DOSYA `-' ise veya yoksa, standart girdi okunur."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr "Girdiler aynı ise çıkış durumu 0, farklı ise 1, sorun var ise 2 olur."
msgid "invalid --bytes value '%s'"
msgstr "geçersiz --bytes değeri `%s'"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "`%s'den sonra işlenen eksik"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "fazla işlenen `%s'"
msgid "pagination not supported on this host"
msgstr "sayfalama bu makina üzerinde desteklenmiyor"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "çok fazla dosya etiket seçeneği"
msgid "conflicting tabsize options"
msgstr "çelişkili genişlik seçenekleri"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "hem --from-file hem de --to-file belirtilmiş"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal normal bir diff çıktılar (öntanımlı)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief yalnızca dosyalar farklı ise göster"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr ""
"-s, --report-identical-files iki dosyanın birbirinin aynısı ise göster"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C SAYI, --context[=SAYI] kopyalanan bağlamı SAYI satırınca (öntanımlı "
"3) bastırır"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U SAYI, --unified[=SAYI] birleşik bağlamın SAYI (öntanımlı 3) "
"satırınca çıktı gösterir"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed bir ed betiği çıktılar"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs RCS biçeminde diff çıktılar"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side iki sütunda çıktı göster"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=SAYI satır başına en fazla SAYI kadar karakter "
"çıktılar (öntanımlı 130)"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column ortak satırları yalnızca sol sütunda çıktılar"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines ortak satırlayı gösterme"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr "-p, --show-c-function içinde değişen her C işlevini göster"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=DÜZİF DÜZİF ile eşleşen en yakın satırı göster"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label ETİKET dosya adı yerine ETİKET kullan\n"
" (tekrarlanabilir)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t, --expand-tabs çıktıda sekmeleri boşluk haline getir"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab başlarına bir sekme ilave ederek sekmelerin "
"hizalanmasını sağla"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=SAYI sekmeler SAYI sütun genişliğine (öntanımlı 8) "
"ayarlanır."
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty boş çıktı satırlarından önce boşluk veya "
"sekmeyi gözardı et"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate çıktıyı 'pr' komutundan geçirerek sayfala"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive çevrimli olarak bulunan bütün alt dizinleri "
"karşılaştır"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference sembolik bağlantıları takip etme"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file var olmayan dosyaları boş varsay"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr " --unidirectional-new-file var olmayan birinci dosyayı boş varsay"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case dosya isimlerinde büyük/küçük harf "
"farklarını yoksay"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case dosya isimlerinde büyük/küçük harf farkını "
"göz önüne al"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x, --exclude=KALIP KALIP'a uyan dosyaları işleme dahil etme"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=DOSYA DOSYA'da bulunan kalıplara uyan dosyaları "
"işlem dışı tut"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=DOSYA dizinleri karşılaştırırken DOSYA'dan başla"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=DOSYA1 DOSYA1'i bütün işlenenlerle karşılaştır;\n"
" DOSYA1 bir dizin olabilir"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=DOSYA2 DOSYA2'yi bütün işlenenlerle karşılaştır;\n"
" DOSYA2 bir dizin olabilir"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case dosya içeriğinde büyük/küçük harf farklarını "
"yoksay"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E, --ignore-tab-expansion sekmelerin açılmasından doğan farkları yoksay"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space bütün satır sonu boşluklarını yoksay"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b, --ignore-space-change boşluk miktarındaki değişiklikleri yoksay"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space bütün boşlukları yoksay"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B, --ignore-blank-lines satırları boş olan değişiklikleri dikkate "
"alma"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=DÜZİF satırları DÜZİF kalıbına uyan farkları "
"yok say"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text bütün dosyaları metin olarak işle"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr girdiden en sonda sarkan satır başını soy"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary veriyi ikilik kipte yaz ve oku"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=İSİM '#ifdef İSİM' farklarını gösteren "
"harmanlanmış dosya çıktıla."
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
" --GTYPE-group-format=GFMT GTYPE girdi gruplarını GFMT ile biçimlendir"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
" --line-format=LFMT tüm girdi satırlarını LFMT ile biçimlendir"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
" --LTYPE-line-format=LFMT tüm LTYPE girdi satırlarını LFMT ile "
"biçimlendir"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
"grained control over the output\n"
" tanecik denetimi sağlar. -D/--ifdef genelleştirmesi yapar."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE 'old', 'new' veya 'unchanged' olabilir. GTYPE, LTYPE veya "
"'changed'dir."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) eğer A eşittir B ise T değilse E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %[-][GENİŞLİK][.[KESİNLİK]]{doxX}n girdi satır sayısı için printf tarzı "
"biçem"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' Sekizlik kodu OOO olan karakter\n"
" C C karakteri (diğer karakterler kendilerini temsil eder)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d, --minimal daha küçük bir fark kümesi bulmaya çalış"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr " --horizon-lines=SAYI ortak ön ek ve son eklerin SAYI satırını tut"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files büyük dosyalar ve çok sayıda dağınık küçük farklar "
"olduğunu varsay"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal normal bir diff çıktılar (öntanımlı)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help bu yardım metnini göster ve çık"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version sürüm bilgisini göster ve çık"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"DOSYAlar: `DOSYA1 DOSYA2' veya `DİZİN1 DİZİN2' veya `DİZİN DOSYA...' veya "
"`DOSYA...DİZİN' olabilir."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Eğer --from-file veya --to-file kullanılmışsa, DOSYAlar üzerinde kısıtlama "
"yoktur."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Eğer bir DOSYA `-' ise, standart girdi okunur."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Kullanım: %s [SEÇENEK]... DOSYAlar\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "DOSYAları satır satır karşılaştırır."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "çelişkili %s seçeneği değeri: '%s'"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "çelişkili çıktı tarz seçenekleri"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "geçersiz genişlik `%s'"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Yalnızca %s'da: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "'-', bir dizinle karşılaştırılamaz"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "-D seçenek dizinler için kullanılamaz."
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Ortak alt dizinler: %s ve %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "%s dosyası, bir %s, halbuki %s dosyası bir %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "%s ve %s sembolik bağlantıları birbirinden farklı\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "%s ve %s dosyaları birbirinin aynı\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "uyumsuz seçenekler"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "'-' birden fazla girdi dosyası için belirtilmiş"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "okuma başarısız oldu"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all bütün değişiklikleri çıktıla, çakışmaları köşeli "
"parantez içine al"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"harmanlanmamış\n"
" ed betiklerini BENİMDOSYA'ya çıktıla"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E, --show-overlap -e'ye benzer, fakat çakışmaları parantez içine "
"alır"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only -e gibi, fakat sadece örtüşmeyen değişiklikleri "
"birleştir"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only -e gibi, fakat sadece örtüşen değişiklikleri "
"birleştir"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
"-X -x gibi ancak çakışmaları parantez içine alır"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i ed betiklerinin sonuna `w' ve `q' komutlarını "
"ekle"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"-m, --merge asıl birleştirilmiş dosyayı, başka bir seçenek\n"
" verilmediyse -A ya göre gösterir"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text bütün dosyaları metin olarak işle"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr girdiden en sonda sarkan satır başını soy"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab başlarına bir sekme ilave ederek sekmelerin "
"hizalanmasını sağla"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
" --diff-program=YAZILIM dosyaları karşılaştırmak için YAZILIM'ı kullan"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=ETİKET dosya adı yerine ETİKET kullan\n"
" (üç defaya kadar tekrarlanabilir)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help bu yardım metnini göster ve çık"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version sürüm bilgisini göster ve çık"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Kullanım: %s [SEÇENEK]... BENİMDOSYA ESKİDOSYA SİZİNDOSYA\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Üç dosyayı satır satır karşılaştırır."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"yapmasına neden olur ve asıl birleştirilen dosya çıkarılır. Alışılmadık\n"
"girdiler için, bu ed kullanımından daha dayanıklıdır.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Eğer işleme başarılı ise çıkış durumu 0, çelişkiler var ise 1,\n"
"sorun var ise 2 olur."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "iç hata: diff blokları biçemlemesinde hata oluştu"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff başarısız oldu: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "iç hata: process_diff işlevi içinde geçersiz diff türü"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "geçersiz diff biçemi; geçersiz fark ayracı"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "geçersiz diff biçemi; tamamlanmamış son satır"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "alt yazılım '%s' çalıştırılamadı"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "geçersiz diff biçemi; geçersiz satır başı karakterleri"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "iç hata: çıktıya geçersiz diff türü geçirildi"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "girdi dosyası küçüldü"
"v:\tOrtak satırları bilgi vererek dahil eder.\n"
"q:\tÇıkar.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: `--%s' seçeneği bilinmiyor\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2012-10-31 08:58+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
"Загальна довідка з програмного забезпечення GNU: <http://www.gnu.org/gethelp/"
">\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Файли %s та %s відрізняються\n"
msgid "Binary files %s and %s differ\n"
msgstr "Двійкові файли %s та %s відрізняються\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Наприкінці файлу немає нового рядка"
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Спробуйте «%s --help» для отримання докладнішого опису."
msgid "options -l and -s are incompatible"
msgstr "параметри -l та -s несумісні"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "запис невдалий"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "стандартний вивід"
"Додаткові аргументи Н1 та Н2 визначають кількість байтів, які слід\n"
"пропустити на початку кожного файла (типово байти не пропускаються)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
"Якщо ФАЙЛ не вказано або вказано як «-», дані буде прочитано зі стандартного "
"потоку введення."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Код завершення дорівнює 0, якщо вхідні файли ідентичні, 1 -- якщо\n"
msgid "invalid --bytes value '%s'"
msgstr "некоректне значення --bytes «%s»"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "пропущено операнд після «%s»"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "зайвий операнд «%s»"
msgid "pagination not supported on this host"
msgstr "розбиття на сторінки не підтримується на цій машині"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "надто багато параметрів, що вказують позначки файлів"
msgid "conflicting tabsize options"
msgstr "суперечливі параметри визначення ширини табуляції"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "необхідно вказати як --from-file, так і --to-file"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr ""
" --normal вивести дані у форматі звичайного diff (типово)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief сповіщати лише про різні файли"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s --report-identical-files сповіщати про однакові файли"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C КТЬ, --context[=КТЬ] вивести КТЬ (типово 3) рядки скопійованого "
"контексту"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U ЧИСЛО, --unified[=ЧИСЛО] вивести ЧИСЛО (типово 3) рядків спільного "
"контексту"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed вивести дані у форматі запису ed"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr ""
"-n, --rcs виводити у форматі diff систем керування "
"версіями"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side вивести дані у два стовпчики"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=ЧИСЛО виводити текст не більше ніж у ЧИСЛО (типово "
"130) позицій у рядок"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column виводити спільні рядки лише у ліву колонку"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines не виводити однакові рядки"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function показати дані щодо функцій C у яких виявлено "
"кожну зі змін"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
"-F, --show-function-line=RE показати останній рядок, що відповідає "
"формальному виразу RE"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label МІТКА використати МІТКУ замість назви файла\n"
" (можна використовувати декілька разів)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t --expand-tabs замінювати символи табуляції пробілами у виводі"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab вирівнювати табуляцію символами табуляції"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=ЧИСЛО табуляція кожні ЧИСЛО позицій виведення "
"(типово 8)"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty не показувати пробіли або табуляції перед "
"порожніми рядками"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l --paginate спрямувати дані до «pr» для розбиття на "
"сторінки."
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive рекурсивно порівняти всі знайдені підкаталоги"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
" --no-dereference не переходити за символічними посиланнями"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file вважати незнайдені файли порожніми"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr ""
" --unidirectional-new-file вважати незнайдені у першому джерелі файли "
"порожніми"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case ігнорувати регістр назв файлів під час "
"порівняння"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case враховувати регістр символів назв файлів"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr ""
"-x --exclude=ЗРАЗОК виключити файли, назви яких відповідають "
"ЗРАЗКУ"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"зразкам\n"
" з файла."
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=ФАЙЛ починати порівняння каталогів на файлі ФАЙЛ"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=ФАЙЛ1 порівняти ФАЙЛ1 з усіма операндами;\n"
" ФАЙЛ1 може бути каталогом"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=ФАЙЛ2 порівняти всі операнди з ФАЙЛОМ "
"2; ФАЙЛ2 може бути каталогом."
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i --ignore-case ігнорувати регістр літер у вмісті файлів"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr ""
"-E --ignore-tab-expansion ігнорувати зміни, викликані заміною "
"табуляції пробілами"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space ігнорувати пробіли наприкінці рядка"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b --ignore-space-change ігнорувати зміни у кількості пробілів"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w --ignore-all-space ігнорувати усі пробіли"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr ""
"-B --ignore-blank-lines ігнорувати зміни кількості порожніх рядків"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE ігнорувати зміни, які відповідають "
"формальному виразу RE"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text вважати всі файли текстовими"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr вилучити з виведених даних всі завершальні "
"символи нового рядка"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr ""
" --binary читати та записувати файли у двійковій формі"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=НАЗВА виводити diff-блоки, що використовують "
"конструкцію «#ifdef НАЗВА»."
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
" --ГТИП-group-format=ГФМТ форматувати вхідні групи типу ГТИП\n"
" у відповідності до формату ГФМТ."
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
" --line-format=СФМТ форматувати всі вхідні рядки за допомогою "
"СФМТ."
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
" --CТИП-group-format=СФМТ форматувати вхідні рядки типу СТИП\n"
" у відповідності до формату СФМТ"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" За допомогою цих параметрів форматування можна точно налаштувати\n"
" вивід diff, з узагальненням -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" СТИП може бути «old», «new» чи «unchanged», ГТИП — те саме або «changed»."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) якщо A дорівнює B, T, інакше E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %l вміст рядка без символу нового рядка наприкінці\n"
" %[-][ШИРИНА][.[ТОЧН]]{doxX}n формат номеру вхідного рядка у стилі printf"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' один символ з вісімковим кодом OOO\n"
" C символ C (інші символи не оброблятимуться)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d --minimal намагатись знайти найменший набір змін"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr ""
" --horizon-lines=ЧИСЛО зберегти ЧИСЛО спільних рядків, до та після різних"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files вважати файли великими з багатьма розкиданими\n"
" дрібними змінами."
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr ""
" --normal вивести дані у форматі звичайного diff (типово)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr ""
" --help показати це довідкове повідомлення і завершити "
"роботу"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version показати дані щодо версії і завершити роботу"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"ФАЙЛИ — це «ФАЙЛ1 ФАЙЛ2», чи «КАТАЛОГ1 КАТАЛОГ2», чи «КАТАЛОГ ФАЙЛ...»,\n"
"чи «ФАЙЛ... КАТАЛОГ»."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr "Якщо вказано --from-file чи --to-file, на ФАЙЛИ обмежень немає."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr ""
"Якщо ФАЙЛ вказано як «-», дані буде прочитано зі стандартного потоку "
"введення."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Використання: %s [КЛЮЧ]... ФАЙЛИ\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "Порівнює два файли за рядками."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "суперечливі значення %s для ключа «%s»"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "суперечливі ключі визначення стилю виводу"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "некоректна ширина «%s»"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Лише у %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "не можна порівнювати «-» з каталогом"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "-D параметр не підтримується для каталогів"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Спільні підкаталоги: %s та %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Файл %s це %s, тоді як файл %s -- %s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Символічні посилання %s і %s є різними\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Файли %s та %s ідентичні\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "несумісні ключі"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "«-» вказано для більш ніж одного вхідного файла"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "помилка читання"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A --show-all вивести всі зміни, беручи конфліктні місця у "
"дужки."
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"-e --ed вивести необ'єднані зміни у СТАРОМУ-ФАЙЛІ\n"
" порівняно з ВАШИМ-ФАЙЛОМ до МОГО-ФАЙЛА."
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E --show-overlap подібно до -e, але з взяттям конфліктних місць у "
"дужки"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only подібно до -e, але включити лише зміни без "
"перекриття"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only подібно до -e, але включати лише зміни з "
"перекриттям"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
"-X подібно до -x, але з взяттям розбіжностей у дужки"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i дописувати команди «w» і «q» в кінець сценарію "
"ed."
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
"до\n"
" -A, якщо не вказано інших параметрів"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text вважати всі файли текстовими"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr вилучити з виведених даних всі завершальні "
"символи нового рядка"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T --initial-tab вирівнювати табуляцію додаючи на початок символ "
"табуляції"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
" --diff-program=ПРОГРАМА використовувати для порівняння вказану ПРОГРАМУ"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=МІТКА використовувати МІТКУ замість назви файла\n"
" (можна використовувати не більше трьох разів)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr ""
" --help показати це довідкове повідомлення і завершити "
"роботу"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr ""
"-v, --version показати дані щодо версії і завершити роботу"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Використання: %s [КЛЮЧ]... МІЙ-ФАЙЛ СТАРИЙ-ФАЙЛ ВАШ-ФАЙЛ\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "Порівняння трьох файлів рядками."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"diff3 з виводом їх до об’єднаного файла. Для нетипових вхідних даних\n"
"такий варіант працює краще за варіант з використанням ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Код завершення дорівнює 0 при нормальному завершенні, 1 при конфліктах\n"
" та 2 при несправностях."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "внутрішня помилка: пошкоджений формат diff-блоків"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: помилка при пошуку відмінностей: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr ""
"внутрішня помилка: неправильний тип diff-блоку у функції `process_diff'"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "неправильний формат diff-файлу; неправильний розділювач змін"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "неправильний формат diff-файлу; неповний останній рядок"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "не вдається запустити допоміжну програму «%s»"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "неправильний diff-формат; неправильні перші символи рядка"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "внутрішня помилка: на вхід подано неправильний тип diff-файлу"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "вхідний файл зменшився"
"v:\tВключати спільні рядки, виводячи повідомлення.\n"
"q:\tВийти.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: невідомий параметр «--%s»\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils-3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2012-11-01 13:51+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
msgstr ""
"Trợ giúp chung về cách sử dụng phần mềm GNU: <http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "Hai tập tin %s và %s là khác nhau.\n"
msgid "Binary files %s and %s differ\n"
msgstr "Hai tập tin nhị phân %s và %s khác nhau\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "Không có ký tự dòng mới tại kêt thức tập tin."
msgid "David MacKenzie"
msgstr "David MacKenzie"
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "Hãy chạy lệnh “%s --help” để xem thông tin thêm."
msgid "options -l and -s are incompatible"
msgstr "hai tùy chọn -l và -s không tương thích với nhau"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "không ghi được"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "thiết bị xuất chuẩn"
"Tùy chọn SKIP1 và SKIP2 chỉ định số byte sẽ được bỏ qua\n"
"tại vị trí bắt đầu của mỗi tập tin (số không là mặc định)."
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "Tùy chọn dài yêu cầu đối số thì tùy chọn ngắn cũng vậy.\n"
msgid "If a FILE is '-' or missing, read standard input."
msgstr "Nếu TẬP-TIN là “-”, hay bỏ trống, thì đọc từ đầu vào tiêu chuẩn."
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Trạng thái thoát là số 0 nếu hai đầu vào bằng nhau, số 1 nếu là khác nhau và "
msgid "invalid --bytes value '%s'"
msgstr "giá trị cho tùy chọn --bytes “%s” không hợp lệ"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "thiếu toán hạng sau “%s”"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "toán hạng bổ xung “%s”"
msgid "pagination not supported on this host"
msgstr "máy chủ này không hỗ trợ dàn trang"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "quá nhiều tùy chọn nhãn tập tin"
msgid "conflicting tabsize options"
msgstr "nhiều tùy chọn cỡ ký tự tab xung đột với nhau"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr ""
"ghi rõ cả hai tùy chọn --from-file (từ tập tin) và --to-file (vào tập tin) "
"đều"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr ""
" --normal xuất ra định dạng diff thông thường (mặc định)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr ""
"-q, --brief chỉ báo cáo nếu những tập tin khác với nhau"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files báo cáo khi có hai tập tin bằng nhau"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
"-c, -C SỐ, --context[=SỐ] xuất ra SỐ (mặc định là 3) dòng của ngữ cảnh"
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr ""
"-u, -U SỐ, --unified[=SỐ] xuất ra SỐ (mặc định là 3) dòng của ngữ cảnh "
"hợp nhất"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed xuất tập lệnh loại ed"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr ""
"-n, --rcs xuất dữ liệu khác biệt sử dụng định dạng RCS"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr "-y, --side-by-side xuất ra theo đinh dạng hai cột"
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr ""
"-W, --width=SỐ xuất tối đa SỐ cột đã in ra (mặc định là 130)"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr ""
" --left-column kết xuất chỉ cột bên trái của các dòng chung "
"nhau"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines không kết xuất các dòng chung nhau"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
"-p, --show-c-function hiển thị cái mà từng hàm C thay đổi ở trong"
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr "-F, --show-function-line=RE hiển thị những dòng gần nhất khớp với RE"
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --label NHÃN sử dụng NHÃN thay vì tên tập tin\n"
" (có thể được lặp lại)"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr ""
"-t, --expand-tabs mở rộng ký tự tab ra ký tự khoảng cách khi kết "
"xuất"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab sắp xếp tất cả ký tự tab bằng cách thêm\n"
" một tab vào trước"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr ""
" --tabsize=SỐ định khoảng cách tab sau mỗi SỐ cột đã in ra\n"
" (mặc định là 8)"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
" --suppress-blank-empty thu hồi khoảng cách hay cột tab đằng trước "
"dòng kết xuất trống"
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr ""
"-l, --paginate chuyển dữ liệu kết xuất qua “pr” để dàn trang "
"nó"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr ""
"-r, --recursive so sánh đệ qui mọi thư mục con đã tìm thấy"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr " --no-dereference không theo liên kết mềm"
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N --new-file coi tập tin vắng mặt là trống"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr " --unidirectional-new-file coi tập tin đầu mà vắng mặt là trống"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr ""
" --ignore-file-name-case bỏ qua chữ HOA/thường khi so sánh nhiều tên tập "
"tin"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr ""
" --no-ignore-file-name-case so sánh chữ HOA/thường khi so sánh tên tập "
"tin"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=MẪU loại trừ các tập tin khớp với MẪU ấy"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr ""
"-X, --exclude-from=TẬP_TIN loại trừ mọi tập tin khớp với bất cứ mẫu nào "
"trong TẬP TIN ấy"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr ""
"-S, --starting-file=TẬP_TIN bắt đầu với TẬP TIN khi so sánh nhiều thư mục"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=TẬP_TIN1 so TẬP TIN 1 với tất cả toán hạng;\n"
" TẬP TIN 1 có thể là thư mục"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=TẬP_TIN2 So tất cả toán hạng với TẬP TIN 2;\n"
" TẬP TIN 2 có thể là thư mục"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr ""
"-i, --ignore-case không phân biệt chữ HOA/thường trong nội "
"dung tập tin"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr "-E, --ignore-tab-expansion bỏ qua mọi thay đổi do mở rộng tab"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space bỏ qua tất cả dấu cách ở cuối dòng"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr ""
"-b, --ignore-space-change bỏ qua thay đổi gây ra bởi nhóm dấu cách"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space bỏ qua tất cả dấu cách"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr "-B, --ignore-blank-lines bỏ qua thay đổi do dòng trống"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=RE bỏ qua thay đổi do mà mọi dòng khớp với RE"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text xử lý mọi tập tin là văn bản thường"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr cắt bỏ ký tự về đầu dòng (cr) theo sau khi gõ"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr ""
" --binary đọc và ghi dữ liệu trong chế độ nhị phân"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=TÊN kết xuất tập tin đã trộn với khác biệt "
"“#ifdef TÊN”"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr " --GTYPE-group-format=GFMT định dạng nhập GTYPE với GFMT "
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr ""
" --line-format=LFMT định dạng tất cảc các dòng vào với LFMT"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr " --LTYPE-line-format=LFMT định dạng nhập LTYPE với LFMT"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
" Nhưng tùy chọn đó điểu khiển kết xuất ra định dạng diff\n"
" đẹp hơn, khái quát hóa -D/--ifdef."
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE là “cũ”, “mới”, hoặc “chưa thay đổi”. GTYPE là LTYPE hoặc “thay đổi "
"rồi”."
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" E F-1\n"
" M L+1 %(A=B?T:E) nếu A bằng B thì T nếu không thì E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %l nội dung của dòng, loại trừ ký tự dòng mới nào đi theo\n"
" %[-][Đ_RỘNG][.[PREC]]{doxX}n đặc tả dạng printf cho số dòng đầu vào"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' ký tự có mã bát phân OOO\n"
" C ký tự C (các ký tự khác đại diện cho chính chúng)"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d, --minimal cố tìm một thay đổi nhỏ"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr " --horizon-lines=SỐ giữ SỐ dòng của tiền tố và hậu tố chung"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr ""
" --speed-large-files giả định tập tin lớn và nhiều thay đổi nhỏ rải rác"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr ""
" --normal xuất ra định dạng diff thông thường (mặc định)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help hiển thị trợ giúp này rồi thoát"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version đưa ra thông tin phiên bản rồi thoát"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"(CÁC) TẬP TIN là “TẬP_TIN1 TẬP_TIN2” hoặc “THƯ_MỤC1 THƯ_MỤC2” hoặc “THƯ_MỤC "
"TẬP_TIN...” hay “TẬP_TIN... THƯ_MỤC”."
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr ""
"Nếu đưa ra tùy chọn --from-file (từ tập tin) hay --to-file (vào tập tin) thì "
"không có giới hạn TẬP TIN."
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "Nếu TẬP-TIN là “-”, thì đọc từ đầu vào tiêu chuẩn."
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "Cách dùng: %s [TÙY_CHỌN]... CÁC_TẬP_TIN\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "So sánh các TẬP-TIN theo từng dòng."
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "tùy chọn %s xung đột, giá trị “%s”"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "nhiều tùy chọn điều khiển định dạng xuất xung đột với nhau"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "độ rộng không hợp lệ “%s”"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "Chỉ trong %s: %s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "không thể so sánh “-” với một thư mục"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "không hỗ trợ tùy chọn -D với thư mục"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "Thư mục con chung: %s và %s\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "Tập tin %s là một %s trong khi tập tin %s là một %s.\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "Hai liên kết mềm %s và %s là khác nhau\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "Cả %s và %s là cùng một tập tin\n"
msgid "Randy Smith"
msgstr "Randy Smith"
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "nhiều tùy chọn không tương thích với nhau"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "đã chỉ ra “-” cho nhiều hơn một tập tin đầu vào"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "đọc gặp lỗi"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr ""
"-A, --show-all kết xuất tất cả thay đổi, đặt mọi xung đột trong "
"ngoặc đơn"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
" từ TẬP_TIN_CŨ thành TẬP_TIN_CỦA_BẠN vào "
"TẬP_TIN_TÔI."
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr ""
"-E, --show-overlap giống -e, nhưng đặt xung đột trong ngoặc đơn"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
"-3, --easy-only giống -e, nhưng chỉ sát nhập những thay đổi "
"không chồng lấp"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr ""
"-x, --overlap-only giống -e, nhưng chỉ sát nhập những thay đổi bị "
"chồng lấp"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
"-X giống -x, nhưng đặt xung đột trong ngoặc đơn"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr ""
"-i nối thêm hai lệnh “w” và “q” vào văn lệnh ed"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
" tùy chọn -A nếu như không có tùy chọn khác "
"được chỉ ra"
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a, --text coi mọi tập tin là văn bản thường"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr ""
" --strip-trailing-cr cắt bỏ ký tự về đầu dòng (cr) theo sau khi nhập"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr ""
"-T, --initial-tab tạo khoảng tab cho dòng bằng cách thêm một tab "
"vào trước"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr ""
" --diff-program=CHƯƠNG_TRÌNH dùng CHƯƠNG_TRÌNH để so sánh các tập tin"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
"-L, --label=NHÃN sử dụng NHÃN thay vì tên tập tin\n"
" (có thể lặp lại đến ba lần)"
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help hiển thị trợ giúp này rồi thoát"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version đưa ra thông tin phiên bản rồi thoát"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN_TÔI TẬP_TIN_CŨ TẬP_TIN_BẠN\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "So sánh ba tập tin từng dòng một."
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"và kết xuất là tập tin đã được trộn. Với kiểu đầu vào ít dùng, đây là cách\n"
"hợp lý hơn sử dụng ed.\n"
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr ""
"Trạng thái thoát là số 0 nếu thành công, số 1 nếu có xung đột nào và số 2 "
"nếu gặp lỗi."
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "gặp lỗi nội bộ: không định dạng khối khác biệt được."
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s: diff gặp lỗi: "
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr ""
"gặp lỗi nội bộ: loại khác biệt không hợp lệ trong process_diff (xử lý khác "
"biệt)"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "khuôn dạng diff không hợp lệ; ký tự ngăn cách thay đổi không hợp lê"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "khuôn dạng diff không hợp lệ; chưa xong dòng cuối cùng"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "không gọi được chương trình phụ trợ “%s”"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "khuôn dạng khác biệt không hợp lệ; ký tự đi trước dòng là không đúng"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "gặp lỗi nội bộ: kiểu diff không hợp lệ được chuyển qua cho kết xuất"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "tập tin đầu vào co lại"
"v:\tBao gồm dòng chung xuất một cách chi tiết.\n"
"q:\tThoát.\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s: không nhận ra tùy chọn “--%s”\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 3.3-pre1\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2016-02-17 19:23+0100\n"
"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr "使用 GNU 软件的通用帮助：<http://www.gnu.org/gethelp/>\n"
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "文件 %s 和 %s 不同\n"
msgid "Binary files %s and %s differ\n"
msgstr "二进制文件 %s 和 %s 不同\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "文件尾没有换行符"
msgid "David MacKenzie"
msgstr ""
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, c-format
msgid "Try '%s --help' for more information."
msgstr "请尝试 “%s --help”，以获得更多信息。"
msgid "options -l and -s are incompatible"
msgstr "选项 -l 和 -s 不兼容"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "写入失败"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "标准输出"
"at the beginning of each file (zero by default)."
msgstr "<跳1> 和 <跳2> 分别是每个文件要略过的字节数。"
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "长选项的必需参数也是相应短选项的必需参数。\n"
msgid "If a FILE is '-' or missing, read standard input."
msgstr "如果文件是 “-” 或没给出，则从标准输入读入内容。"
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr "如果输入相同，则退出状态为 0；1 表示输入不同；2 表示有错误产生。"
msgid "invalid --bytes value '%s'"
msgstr "无效的 --bytes 值 `%s'"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, c-format
msgid "missing operand after '%s'"
msgstr "操作数 “%s” 后缺少参数"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, c-format
msgid "extra operand '%s'"
msgstr "多余的操作数 “%s”"
msgid "pagination not supported on this host"
msgstr "此系统不支持分页"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "过多的文件标号选项"
msgid "conflicting tabsize options"
msgstr "的制表符选项冲突"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "同时指定了选项 --from-file 和 --to-file"
-#: src/diff.c:883
+#: src/diff.c:890
msgid " --normal output a normal diff (the default)"
msgstr " --normal 以正常的 diff 方式输出 (默认)"
-#: src/diff.c:884
+#: src/diff.c:891
msgid "-q, --brief report only when files differ"
msgstr "-q, --brief 只有在文件不同时报告"
-#: src/diff.c:885
+#: src/diff.c:892
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s, --report-identical-files 当两个一样时仍然显示结果"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
-#: src/diff.c:887
+#: src/diff.c:894
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr "-u, -U 数量, --unified[=数量] 输出 <数量>（默认为 3）行一致化上下文"
-#: src/diff.c:888
+#: src/diff.c:895
msgid "-e, --ed output an ed script"
msgstr "-e, --ed 以 ed script 方式输出"
-#: src/diff.c:889
+#: src/diff.c:896
msgid "-n, --rcs output an RCS format diff"
msgstr "-n, --rcs 以 RCS diff 格式输出"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr ""
-#: src/diff.c:891
+#: src/diff.c:898
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr "-W, --width=数量 每行显示最多 <数量>（默认 130）个字符"
-#: src/diff.c:892
+#: src/diff.c:899
msgid ""
" --left-column output only the left column of common lines"
msgstr " --left-column 当有两行相同时只显示左边栏的一行"
-#: src/diff.c:893
+#: src/diff.c:900
msgid " --suppress-common-lines do not output common lines"
msgstr " --suppress-common-lines 当有两行相同时不显示"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
" --from-file=文件1 将<文件1>和操作数中的所有文件/目录作比较；\n"
" <文件1>可以是目录"
-#: src/diff.c:900
+#: src/diff.c:907
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t, --expand-tabs 将输出中的 tab 转换成空格"
-#: src/diff.c:901
+#: src/diff.c:908
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T, --initial-tab 每行先加上 tab 字符，使 tab 字符可以对齐"
-#: src/diff.c:902
+#: src/diff.c:909
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr " --tabsize=数字 TAB 格的宽度，默认为 8 个打印列宽"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
-#: src/diff.c:904
+#: src/diff.c:911
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr "-l, --paginate 将输出送至 “pr” 指令来分页"
-#: src/diff.c:906
+#: src/diff.c:913
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr "-r, --recursive 连同所有子目录一起比较"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
-#: src/diff.c:908
+#: src/diff.c:915
msgid "-N, --new-file treat absent files as empty"
msgstr "-N, --new-file 不存在的文件以空文件方式处理"
-#: src/diff.c:909
+#: src/diff.c:916
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr " --unidirectional-new-file 若第一文件不存在，以空文件处理"
-#: src/diff.c:910
+#: src/diff.c:917
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr " --ignore-file-name-case 忽略文件名大小写的区别"
-#: src/diff.c:911
+#: src/diff.c:918
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr " --no-ignore-file-name-case 不忽略文件名大小写的区别"
-#: src/diff.c:912
+#: src/diff.c:919
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x, --exclude=模式 排除匹配 <模式> 的文件"
-#: src/diff.c:913
+#: src/diff.c:920
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr "-X, --exclude-from=文件 排除所有匹配在<文件>中列出的模式的文件"
-#: src/diff.c:914
+#: src/diff.c:921
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr "-S, --starting-file=文件 当比较目录時，由<文件>开始比较"
-#: src/diff.c:915
+#: src/diff.c:922
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
" FILE1 can be a directory"
" --from-file=文件1 将<文件1>和操作数中的所有文件/目录作比较；\n"
" <文件1>可以是目录"
-#: src/diff.c:917
+#: src/diff.c:924
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
" FILE2 can be a directory"
" --to-file=文件2 将操作数中的所有文件/目录和<文件2>作比较；\n"
" <文件2>可以是目录"
-#: src/diff.c:920
+#: src/diff.c:927
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr "-i, --ignore-case 忽略文件内容大小写的区别"
-#: src/diff.c:921
+#: src/diff.c:928
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr "-E, --ignore-tab-expansion 忽略由制表符宽度造成的差异"
-#: src/diff.c:922
+#: src/diff.c:929
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-Z, --ignore-trailing-space 忽略每行末端的空格"
-#: src/diff.c:923
+#: src/diff.c:930
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b, --ignore-space-change 忽略由空格数不同造成的差异"
-#: src/diff.c:924
+#: src/diff.c:931
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w, --ignore-all-space 忽略所有空格"
-#: src/diff.c:925
+#: src/diff.c:932
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr "-B, --ignore-blank-lines 忽略任何因空行而造成的差异"
-#: src/diff.c:926
+#: src/diff.c:933
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I, --ignore-matching-lines=正则 若某行完全匹配 <正则>，则忽略由该行造成的差"
"异"
-#: src/diff.c:928
+#: src/diff.c:935
msgid "-a, --text treat all files as text"
msgstr "-a, --text 所有文件都以文本方式处理"
-#: src/diff.c:929
+#: src/diff.c:936
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr 去除输入内容每行末端的回车（CR）字符"
-#: src/diff.c:931
+#: src/diff.c:938
msgid " --binary read and write data in binary mode"
msgstr " --binary 以二进制方式读写数据"
-#: src/diff.c:934
+#: src/diff.c:941
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr ""
"-D, --ifdef=名称 输出的内容以 ‘#ifdef <名称>’ 方式标明差异"
-#: src/diff.c:935
+#: src/diff.c:942
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr " --GTYPE-group-format=GFMT 以 GFMT 格式处理 GTYPE 输入行组"
-#: src/diff.c:936
+#: src/diff.c:943
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr " --line-format=LFMT 以 LFMT 格式处理每一行资料"
-#: src/diff.c:937
+#: src/diff.c:944
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr " --LTYPE-line-format=LFMT 以 LFMT 格式处理 LTYPE 输入的行"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE 可以是 “old”、“new” 或 “unchanged”。GTYPE 可以是 LTYPE 的选择\n"
" 或是 “changed”。"
-#: src/diff.c:941
+#: src/diff.c:948
msgid ""
" GFMT (only) may contain:\n"
" %< lines from FILE1\n"
" M L+1\n"
" %(A=B?T:E) 如果 A 等于 B 那么 T 否则 E"
-#: src/diff.c:953
+#: src/diff.c:960
msgid ""
" LFMT (only) may contain:\n"
" %L contents of line\n"
" %l 该行的内容，但不包括结束的换行符\n"
" %[-][宽度][.[精确度]]{doxX}n 以 printf 格式表示的输入行号"
-#: src/diff.c:957
+#: src/diff.c:964
msgid ""
" Both GFMT and LFMT may contain:\n"
" %% %\n"
" %c'\\OOO' 八进制码 OOO 所代表的字符\n"
" C 字符 C（处上述转义外的其他字符代表它们自身）"
-#: src/diff.c:963
+#: src/diff.c:970
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d, --minimal 尽可能找出最小的差异。"
-#: src/diff.c:964
+#: src/diff.c:971
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr " --horizon-lines=数量 保持<数量>行的一致前后缀"
-#: src/diff.c:965
+#: src/diff.c:972
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr " --speed-large-files 假设文件十分大而且文件中含有许多微小的差异"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr " --normal 以正常的 diff 方式输出 (默认)"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr " --help 显示此帮助信息并退出"
-#: src/diff.c:972
+#: src/diff.c:979
msgid "-v, --version output version information and exit"
msgstr "-v, --version 输出版本信息并退出"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"<文件们> 的格式可以是‘文件1 文件2’、‘目录1 目录2’、‘目录 文件...’或\n"
" ‘文件... 目录’。"
-#: src/diff.c:975
+#: src/diff.c:982
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr "如果使用 --from-file 或 --to-file 选项，<文件名> 的格式则不受限制。"
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
msgid "If a FILE is '-', read standard input."
msgstr "如果 FILE 是 “-”，则由标准输入读取内容。"
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "用法：%s [选项]... 文件们\n"
-#: src/diff.c:987
+#: src/diff.c:994
msgid "Compare FILES line by line."
msgstr "逐行比较<文件们>。"
-#: src/diff.c:1021
+#: src/diff.c:1028
#, c-format
msgid "conflicting %s option value '%s'"
msgstr "互相冲突的 %s 选项，参数值为 “%s”"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "互相冲突的输出风格选项。"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "无效的宽度 “%s”"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "只在 %s 存在：%s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
msgid "cannot compare '-' to a directory"
msgstr "“-” 无法与目录作比较"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "-D 选项不支持目录使用"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "%s 和 %s 有共同的子目录\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "文件 %s 是%s而文件 %s 是%s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "软链接 %s 和 %s 不同\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "檔案 %s 和 %s 相同\n"
msgid "Randy Smith"
msgstr ""
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "不兼容的选项"
-#: src/diff3.c:353
+#: src/diff3.c:388
msgid "'-' specified for more than one input file"
msgstr "“-”作输入文件不可多于一处"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "读取时失败"
-#: src/diff3.c:428
+#: src/diff3.c:473
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr "-A, --show-all 输出所有要更改的部份，并括上互相冲突的地方"
-#: src/diff3.c:430
+#: src/diff3.c:475
msgid ""
"-e, --ed output ed script incorporating changes\n"
" from OLDFILE to YOURFILE into MYFILE"
"可将此\n"
" 改变应用至 <我的文件> 的 ed 脚本"
-#: src/diff3.c:432
+#: src/diff3.c:477
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr "-E, --show-overlap 类似 -e，但括上互相冲突的地方"
-#: src/diff3.c:433
+#: src/diff3.c:478
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr ""
"-3, --easy-only 类似 -e，但只输出未合并而且不重叠的更改部份"
-#: src/diff3.c:434
+#: src/diff3.c:479
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x, --overlap-only 类似 -e，但只输出重叠的更改部份"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr "-X 类似 -x，但括上互相冲突的地方"
-#: src/diff3.c:436
+#: src/diff3.c:481
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i 在 ed script 中附加‘w’和‘q’命令"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
msgid "-a, --text treat all files as text"
msgstr "-a --text 所有文件都以文本方式处理"
-#: src/diff3.c:442
+#: src/diff3.c:487
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr " --strip-trailing-cr 去除输入内容每行末端的回车（CR）字符"
-#: src/diff3.c:443
+#: src/diff3.c:488
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T --initial-tab 每行先加上 tab 字符，使 tab 字符可以对齐"
-#: src/diff3.c:444
+#: src/diff3.c:489
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr " --diff-program=程序 用<程序>来比较文件"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr " --help 显示此帮助信息并退出"
-#: src/diff3.c:449
+#: src/diff3.c:494
msgid "-v, --version output version information and exit"
msgstr "-v, --version 输出版本信息并退出"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "用法：%s [选项]... 我的文件 旧文件 你的文件\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "逐行比较三个文件。"
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr "退出状态为 0 表示成功，1 表示冲突，2 表示有错误发生。"
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "内部错误：diff 区段的格式出错"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s：diff 失败："
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "内部错误：process_diff 中的 diff 类型无效"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "无效的 diff 格式；表示内容改变的分隔字符串无效"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "无效的 diff 格式；最后一行不完整"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "无法调用辅助程序 “%s”"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "无效的 diff 格式；错误的行前导字符"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "内部错误：传递给输出的 diff 类型无效"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "输入文件缩小"
"v ：加上两边一样的行时会在输出上显示。\n"
"q ：退出。\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s：选项 “--%s” 无法识别\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
msgstr ""
"Project-Id-Version: diffutils 2.8.7\n"
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
-"POT-Creation-Date: 2016-08-08 10:12-0700\n"
+"POT-Creation-Date: 2016-08-20 22:22-0700\n"
"PO-Revision-Date: 2005-04-01 14:31+0800\n"
"Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
msgstr ""
-#: src/analyze.c:454 src/diff.c:1393
+#: src/analyze.c:454 src/diff.c:1400
#, c-format
msgid "Files %s and %s differ\n"
msgstr "檔案 %s 與 %s 不同\n"
msgid "Binary files %s and %s differ\n"
msgstr "二元碼檔 %s 與 %s 不同\n"
-#: src/analyze.c:697 src/diff3.c:1417 src/util.c:1257
+#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255
msgid "No newline at end of file"
msgstr "檔案末沒有 newline 字元"
msgid "David MacKenzie"
msgstr ""
-#: src/cmp.c:118 src/diff.c:868 src/diff3.c:414 src/sdiff.c:158
+#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158
#, fuzzy, c-format
msgid "Try '%s --help' for more information."
msgstr "請嘗試‘%s --help’來獲取更多資訊。"
msgid "options -l and -s are incompatible"
msgstr "-l 和 -s 選項不兼容"
-#: src/cmp.c:155 src/diff.c:877 src/diff3.c:422 src/sdiff.c:167 src/sdiff.c:315
-#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:855 src/util.c:955 src/util.c:962
+#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315
+#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960
msgid "write failed"
msgstr "寫入失敗"
-#: src/cmp.c:157 src/diff.c:879 src/diff.c:1458 src/diff3.c:424 src/sdiff.c:169
+#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169
msgid "standard output"
msgstr "標準輸出"
"at the beginning of each file (zero by default)."
msgstr "SKIP1 和 SKIP2 是每個檔案會略過的位元組數目。"
-#: src/cmp.c:185 src/diff.c:989 src/diff3.c:462 src/sdiff.c:210
+#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
msgid "If a FILE is '-' or missing, read standard input."
msgstr "如果檔案是‘-’或沒有指定，則由標準輸入讀入資料。"
-#: src/cmp.c:195 src/diff.c:977 src/sdiff.c:220
+#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
msgstr "如果兩邊內容一樣，回傳值是 0；1 代表兩邊內容不相同，2 代表有錯誤。"
msgid "invalid --bytes value '%s'"
msgstr "無效的 --bytes 值 ‘%s’"
-#: src/cmp.c:266 src/diff.c:786 src/diff3.c:318 src/sdiff.c:565
+#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565
#, fuzzy, c-format
msgid "missing operand after '%s'"
msgstr "‘%s’後缺少了參數"
-#: src/cmp.c:278 src/diff.c:788 src/diff3.c:320 src/sdiff.c:567
+#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567
#, fuzzy, c-format
msgid "extra operand '%s'"
msgstr "多餘的參數‘%s’"
msgid "pagination not supported on this host"
msgstr "此系統不支援分頁"
-#: src/diff.c:449 src/diff3.c:300
+#: src/diff.c:449 src/diff3.c:335
#, c-format
msgid "too many file label options"
msgstr "太多有關檔案標籤的選項"
msgid "conflicting tabsize options"
msgstr "出現互相抵觸的定位字元寬度選項"
-#: src/diff.c:763
+#: src/diff.c:770
msgid "--from-file and --to-file both specified"
msgstr "同時指定了 --from-file 及 --to-file 選項"
-#: src/diff.c:883
+#: src/diff.c:890
#, fuzzy
msgid " --normal output a normal diff (the default)"
msgstr "--normal 以正常的 diff 方式輸出。"
-#: src/diff.c:884
+#: src/diff.c:891
#, fuzzy
msgid "-q, --brief report only when files differ"
msgstr "-q --brief 只顯示檔案是否不同。"
-#: src/diff.c:885
+#: src/diff.c:892
#, fuzzy
msgid "-s, --report-identical-files report when two files are the same"
msgstr "-s --report-identical-files 當兩個檔案一樣時仍然顯示結果。"
-#: src/diff.c:886
+#: src/diff.c:893
msgid ""
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
msgstr ""
-#: src/diff.c:887
+#: src/diff.c:894
#, fuzzy
msgid ""
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
msgstr "-w NUM --width=NUM 每行顯示最多 NUM（預設 130）個字元。"
-#: src/diff.c:888
+#: src/diff.c:895
#, fuzzy
msgid "-e, --ed output an ed script"
msgstr "-e --ed 以 ed script 方式輸出。"
-#: src/diff.c:889
+#: src/diff.c:896
#, fuzzy
msgid "-n, --rcs output an RCS format diff"
msgstr "-n --rcs 以 RCS diff 格式輸出。"
-#: src/diff.c:890
+#: src/diff.c:897
msgid "-y, --side-by-side output in two columns"
msgstr ""
-#: src/diff.c:891
+#: src/diff.c:898
#, fuzzy
msgid ""
"-W, --width=NUM output at most NUM (default 130) print columns"
msgstr "-w NUM --width=NUM 每行顯示最多 NUM（預設 130）個字元。"
-#: src/diff.c:892
+#: src/diff.c:899
#, fuzzy
msgid ""
" --left-column output only the left column of common lines"
msgstr "-l --left-column 當有兩行相同時只顯示左邊的一行。"
-#: src/diff.c:893
+#: src/diff.c:900
#, fuzzy
msgid " --suppress-common-lines do not output common lines"
msgstr "-s --suppress-common-lines 當有兩行相同時不會顯示。"
-#: src/diff.c:895
+#: src/diff.c:902
msgid "-p, --show-c-function show which C function each change is in"
msgstr ""
-#: src/diff.c:896
+#: src/diff.c:903
msgid "-F, --show-function-line=RE show the most recent line matching RE"
msgstr ""
-#: src/diff.c:897
+#: src/diff.c:904
#, fuzzy
msgid ""
" --label LABEL use LABEL instead of file name and timestamp\n"
msgstr ""
"--from-file=FILE1 將 FILE1 和參數中的所有檔案/目錄作比較。FILE1 可以是目錄。"
-#: src/diff.c:900
+#: src/diff.c:907
#, fuzzy
msgid "-t, --expand-tabs expand tabs to spaces in output"
msgstr "-t --expand-tabs 將輸出中的 tab 換成空格。"
-#: src/diff.c:901
+#: src/diff.c:908
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T --initial-tab 每行先加上 tab 字元，使 tab 字元可以對齊。"
-#: src/diff.c:902
+#: src/diff.c:909
#, fuzzy
msgid ""
" --tabsize=NUM tab stops every NUM (default 8) print columns"
msgstr "--tabsize=NUM 定位字元 (tab) 的寬度，預設為 8 個空格。"
-#: src/diff.c:903
+#: src/diff.c:910
msgid ""
" --suppress-blank-empty suppress space or tab before empty output lines"
msgstr ""
-#: src/diff.c:904
+#: src/diff.c:911
#, fuzzy
msgid "-l, --paginate pass output through 'pr' to paginate it"
msgstr "-l --paginate 將輸出送至‘pr’指令來分頁。"
-#: src/diff.c:906
+#: src/diff.c:913
#, fuzzy
msgid ""
"-r, --recursive recursively compare any subdirectories found"
msgstr "-r --recursive 連同所有副目錄一起比較。"
-#: src/diff.c:907
+#: src/diff.c:914
msgid " --no-dereference don't follow symbolic links"
msgstr ""
-#: src/diff.c:908
+#: src/diff.c:915
#, fuzzy
msgid "-N, --new-file treat absent files as empty"
msgstr "-N --new-file 不存在的檔案以空白檔案方式處理。"
-#: src/diff.c:909
+#: src/diff.c:916
#, fuzzy
msgid " --unidirectional-new-file treat absent first files as empty"
msgstr "--unidirectional-new-file 若第一個檔案不存在，以空白檔案處理。"
-#: src/diff.c:910
+#: src/diff.c:917
#, fuzzy
msgid " --ignore-file-name-case ignore case when comparing file names"
msgstr "--ignore-file-name-case 當比較檔案名稱時不分辨大小寫。"
-#: src/diff.c:911
+#: src/diff.c:918
#, fuzzy
msgid " --no-ignore-file-name-case consider case when comparing file names"
msgstr "--no-ignore-file-name-case 當比較檔案名稱時會分辨大小寫。"
-#: src/diff.c:912
+#: src/diff.c:919
#, fuzzy
msgid "-x, --exclude=PAT exclude files that match PAT"
msgstr "-x PAT --exclude=PAT 排除樣式為 PAT 的檔案。"
-#: src/diff.c:913
+#: src/diff.c:920
#, fuzzy
msgid ""
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
msgstr "-X FILE --exclude-from=FILE 排除所有在 FILE 中列出的樣式的檔案。"
-#: src/diff.c:914
+#: src/diff.c:921
#, fuzzy
msgid ""
"-S, --starting-file=FILE start with FILE when comparing directories"
msgstr "-S FILE --starting-file=FILE 當比較目錄時，由 FILE 開始比較。"
-#: src/diff.c:915
+#: src/diff.c:922
#, fuzzy
msgid ""
" --from-file=FILE1 compare FILE1 to all operands;\n"
msgstr ""
"--from-file=FILE1 將 FILE1 和參數中的所有檔案/目錄作比較。FILE1 可以是目錄。"
-#: src/diff.c:917
+#: src/diff.c:924
#, fuzzy
msgid ""
" --to-file=FILE2 compare all operands to FILE2;\n"
msgstr ""
"--to-file=FILE2 將參數中的所有檔案/目錄和 FILE2 作比較。FILE2 可以是目錄。"
-#: src/diff.c:920
+#: src/diff.c:927
#, fuzzy
msgid ""
"-i, --ignore-case ignore case differences in file contents"
msgstr "-i --ignore-case 不分辨檔案內容中的大小寫。"
-#: src/diff.c:921
+#: src/diff.c:928
#, fuzzy
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
msgstr "-E --ignore-tab-expansion 忽略因將 tab 轉換為空格而造成的差異。"
-#: src/diff.c:922
+#: src/diff.c:929
#, fuzzy
msgid "-Z, --ignore-trailing-space ignore white space at line end"
msgstr "-w --ignore-all-space 忽略所有空白字元。"
-#: src/diff.c:923
+#: src/diff.c:930
#, fuzzy
msgid ""
"-b, --ignore-space-change ignore changes in the amount of white space"
msgstr "-b --ignore-space-change 忽略因空白字元數目不同而造成的差異。"
-#: src/diff.c:924
+#: src/diff.c:931
#, fuzzy
msgid "-w, --ignore-all-space ignore all white space"
msgstr "-w --ignore-all-space 忽略所有空白字元。"
-#: src/diff.c:925
+#: src/diff.c:932
#, fuzzy
msgid ""
"-B, --ignore-blank-lines ignore changes where lines are all blank"
msgstr "-B --ignore-blank-lines 忽略任何因空行而造成的差異。"
-#: src/diff.c:926
+#: src/diff.c:933
#, fuzzy
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
msgstr ""
"-I RE --ignore-matching-lines=RE 忽略任何符合指定的<正規表示式>的地方。"
-#: src/diff.c:928
+#: src/diff.c:935
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text 所有檔案都以文字檔方式處理。"
-#: src/diff.c:929
+#: src/diff.c:936
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr 去除輸入資料每行末端的 carriage return 字元。"
-#: src/diff.c:931
+#: src/diff.c:938
#, fuzzy
msgid " --binary read and write data in binary mode"
msgstr "--binary 以二元碼檔模式讀寫資料。"
-#: src/diff.c:934
+#: src/diff.c:941
#, fuzzy
msgid ""
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
msgstr "-D NAME --ifdef=NAME 輸出的資料以‘#ifdef NAME’方式標明差異。"
-#: src/diff.c:935
+#: src/diff.c:942
#, fuzzy
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
msgstr ""
"--GTYPE-group-format=GFMT 效果類似，但會以 GFMT 格式處理 GTYPE 輸入行組。"
-#: src/diff.c:936
+#: src/diff.c:943
#, fuzzy
msgid " --line-format=LFMT format all input lines with LFMT"
msgstr "--line-format=LFMT 效果類似，但會以 LFMT 格式處理每一行資料。"
-#: src/diff.c:937
+#: src/diff.c:944
#, fuzzy
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
msgstr ""
"--LTYPE-line-format=LFMT 效果類似，但會以 LFMT 格式處理 LTYPE 輸入行組。"
-#: src/diff.c:938
+#: src/diff.c:945
msgid ""
" These format options provide fine-grained control over the output\n"
" of diff, generalizing -D/--ifdef."
msgstr ""
-#: src/diff.c:940
+#: src/diff.c:947
#, fuzzy
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
msgstr ""
" LTYPE 可以是‘old’、‘new’或‘unchanged’。GTYPE 可以是 LTYPE 的選擇\n"
" 或是‘changed’。"
-#: src/diff.c:941
+#: src/diff.c:948
#, fuzzy
msgid ""
" GFMT (only) may contain:\n"
" E F-1\n"
" M L+1"
-#: src/diff.c:953
+#: src/diff.c:960
#, fuzzy
msgid ""
" LFMT (only) may contain:\n"
" %l 該行的內容，但不包括結束的 newline 字元\n"
" %[-][寬度][.[精確度]]{doxX}n 以 printf 格式表示的輸入資料行號"
-#: src/diff.c:957
+#: src/diff.c:964
#, fuzzy
msgid ""
" Both GFMT and LFMT may contain:\n"
" %c'C' 字元 C\n"
" %c'\\OOO' 八進位數字 OOO 所代表的字元"
-#: src/diff.c:963
+#: src/diff.c:970
#, fuzzy
msgid "-d, --minimal try hard to find a smaller set of changes"
msgstr "-d --minimal 盡可能找出最小的差異。"
-#: src/diff.c:964
+#: src/diff.c:971
#, fuzzy
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
msgstr "--horizon-lines=NUM (此選項不作處理)"
-#: src/diff.c:965
+#: src/diff.c:972
#, fuzzy
msgid ""
" --speed-large-files assume large files and many scattered small changes"
msgstr "-H --speed-large-files 假設檔案十分大而且當中含有許多些微的差異。"
-#: src/diff.c:966
+#: src/diff.c:973
msgid ""
" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"
msgstr ""
-#: src/diff.c:967
+#: src/diff.c:974
#, fuzzy
msgid " or 'auto' (the default)"
msgstr "--normal 以正常的 diff 方式輸出。"
-#: src/diff.c:968
+#: src/diff.c:975
msgid ""
" --palette=PALETTE specify the colors to use when --color is active"
msgstr ""
-#: src/diff.c:969
+#: src/diff.c:976
msgid ""
" PALETTE is a colon-separated list terminfo "
"capabilities"
msgstr ""
-#: src/diff.c:971
+#: src/diff.c:978
msgid " --help display this help and exit"
msgstr ""
-#: src/diff.c:972
+#: src/diff.c:979
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "-v --version 顯示版本資訊。"
-#: src/diff.c:974
+#: src/diff.c:981
#, fuzzy
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
msgstr ""
"FILES 的格式可以是‘FILE1 FILE2’、‘DIR1 DIR2’、‘DIR FILE...’或\n"
" ‘FILE... DIR’。"
-#: src/diff.c:975
+#: src/diff.c:982
#, fuzzy
msgid ""
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
msgstr "如果使用 --from-file 或 --to-file 選項，FILES 的格式則不受限制。"
-#: src/diff.c:976 src/diff3.c:481 src/sdiff.c:219
+#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219
#, fuzzy
msgid "If a FILE is '-', read standard input."
msgstr "如果 FILE 是‘-’，則由標準輸入讀取資料。"
# It is intentional *not* to translate FILES -- maddog
-#: src/diff.c:986
+#: src/diff.c:993
#, c-format
msgid "Usage: %s [OPTION]... FILES\n"
msgstr "用法：%s [選項]... FILES\n"
-#: src/diff.c:987
+#: src/diff.c:994
#, fuzzy
msgid "Compare FILES line by line."
msgstr "比較兩個檔案的每一行。"
-#: src/diff.c:1021
+#: src/diff.c:1028
#, fuzzy, c-format
msgid "conflicting %s option value '%s'"
msgstr "互相矛盾的 %s 選項，參數值為‘%s’"
-#: src/diff.c:1034
+#: src/diff.c:1041
#, c-format
msgid "conflicting output style options"
msgstr "互相矛盾的輸出模式選項"
-#: src/diff.c:1050
+#: src/diff.c:1057
#, fuzzy, c-format
msgid "invalid color '%s'"
msgstr "無效的寬度‘%s’"
-#: src/diff.c:1106 src/diff.c:1316
+#: src/diff.c:1113 src/diff.c:1323
#, c-format
msgid "Only in %s: %s\n"
msgstr "只在 %s 存在：%s\n"
-#: src/diff.c:1240
+#: src/diff.c:1247
#, fuzzy
msgid "cannot compare '-' to a directory"
msgstr "‘-’無法與目錄作比較"
-#: src/diff.c:1275
+#: src/diff.c:1282
msgid "-D option not supported with directories"
msgstr "-D 選項不可配合目錄使用"
-#: src/diff.c:1284
+#: src/diff.c:1291
#, c-format
msgid "Common subdirectories: %s and %s\n"
msgstr "%s 和 %s 有共同的副目錄\n"
-#: src/diff.c:1326 src/diff.c:1376
+#: src/diff.c:1333 src/diff.c:1383
#, c-format
msgid "File %s is a %s while file %s is a %s\n"
msgstr "檔案 %s 是%s而檔案 %s 是%s\n"
-#: src/diff.c:1362
+#: src/diff.c:1369
#, fuzzy, c-format
msgid "Symbolic links %s and %s differ\n"
msgstr "檔案 %s 與 %s 不同\n"
-#: src/diff.c:1449
+#: src/diff.c:1456
#, c-format
msgid "Files %s and %s are identical\n"
msgstr "檔案 %s 和 %s 相同\n"
msgid "Randy Smith"
msgstr ""
-#: src/diff3.c:313
+#: src/diff3.c:348
#, c-format
msgid "incompatible options"
msgstr "不兼容的選項"
-#: src/diff3.c:353
+#: src/diff3.c:388
#, fuzzy
msgid "'-' specified for more than one input file"
msgstr "輸入檔‘-’不可多於一個"
-#: src/diff3.c:395 src/diff3.c:1242 src/diff3.c:1646 src/diff3.c:1701
+#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747
#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855
msgid "read failed"
msgstr "讀取資料失敗"
-#: src/diff3.c:428
+#: src/diff3.c:473
#, fuzzy
msgid "-A, --show-all output all changes, bracketing conflicts"
msgstr "-A --show-all 顯示所有要更改的部份，並括上互相抵觸的地方。"
-#: src/diff3.c:430
+#: src/diff3.c:475
#, fuzzy
msgid ""
"-e, --ed output ed script incorporating changes\n"
"-e --ed 取出由 OLDFILE 至 YOURFILE 的更改部份，並顯示可將此\n"
" 部份套用至 MYFILE 的 ed script。"
-#: src/diff3.c:432
+#: src/diff3.c:477
#, fuzzy
msgid "-E, --show-overlap like -e, but bracket conflicts"
msgstr "-E --show-overlap 顯示未合併的更改部份，並括上互相抵觸的地方。"
-#: src/diff3.c:433
+#: src/diff3.c:478
#, fuzzy
msgid ""
"-3, --easy-only like -e, but incorporate only nonoverlapping "
"changes"
msgstr "-3 --easy-only 顯示未合併而且不重疊的更改部份。"
-#: src/diff3.c:434
+#: src/diff3.c:479
#, fuzzy
msgid ""
"-x, --overlap-only like -e, but incorporate only overlapping changes"
msgstr "-x --overlap-only 只顯示重疊的更改部份。"
-#: src/diff3.c:435
+#: src/diff3.c:480
msgid "-X like -x, but bracket conflicts"
msgstr ""
-#: src/diff3.c:436
+#: src/diff3.c:481
#, fuzzy
msgid "-i append 'w' and 'q' commands to ed scripts"
msgstr "-i 在 ed script 中附加‘w’和‘q’指令。"
-#: src/diff3.c:438
+#: src/diff3.c:483
msgid ""
"-m, --merge output actual merged file, according to\n"
" -A if no other options are given"
msgstr ""
-#: src/diff3.c:441
+#: src/diff3.c:486
#, fuzzy
msgid "-a, --text treat all files as text"
msgstr "-a --text 所有檔案都以文字檔方式處理。"
-#: src/diff3.c:442
+#: src/diff3.c:487
#, fuzzy
msgid " --strip-trailing-cr strip trailing carriage return on input"
msgstr "--strip-trailing-cr 去除輸入資料每行末端的 carriage return 字元。"
-#: src/diff3.c:443
+#: src/diff3.c:488
#, fuzzy
msgid "-T, --initial-tab make tabs line up by prepending a tab"
msgstr "-T --initial-tab 每行先加上 tab 字元，使 tab 字元可以對齊。"
-#: src/diff3.c:444
+#: src/diff3.c:489
#, fuzzy
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
msgstr "--diff-program=程式 使用<程式>來比較檔案。"
-#: src/diff3.c:445
+#: src/diff3.c:490
msgid ""
"-L, --label=LABEL use LABEL instead of file name\n"
" (can be repeated up to three times)"
msgstr ""
-#: src/diff3.c:448
+#: src/diff3.c:493
msgid " --help display this help and exit"
msgstr ""
-#: src/diff3.c:449
+#: src/diff3.c:494
#, fuzzy
msgid "-v, --version output version information and exit"
msgstr "-v --version 顯示版本資訊。"
-#: src/diff3.c:458
+#: src/diff3.c:503
#, c-format
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
msgstr "用法：%s [選項]... MYFILE OLDFILE YOURFILE\n"
-#: src/diff3.c:460
+#: src/diff3.c:505
msgid "Compare three files line by line."
msgstr "比較三個檔案的每一行。"
-#: src/diff3.c:470
+#: src/diff3.c:515
msgid ""
"\n"
"The default output format is a somewhat human-readable representation of\n"
"robust than using ed.\n"
msgstr ""
-#: src/diff3.c:482
+#: src/diff3.c:527
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
msgstr "回傳值是 0 的話代表指令成功執行，1 代表內容有衝突，2 代表有錯誤。"
-#: src/diff3.c:675
+#: src/diff3.c:720
msgid "internal error: screwup in format of diff blocks"
msgstr "內部錯誤：diff 區段的格式出錯"
-#: src/diff3.c:968
+#: src/diff3.c:1015
#, c-format
msgid "%s: diff failed: "
msgstr "%s：diff 失敗："
-#: src/diff3.c:990
+#: src/diff3.c:1037
msgid "internal error: invalid diff type in process_diff"
msgstr "內部錯誤：process_diff 中的 diff 類型無效"
-#: src/diff3.c:1015
+#: src/diff3.c:1062
msgid "invalid diff format; invalid change separator"
msgstr "無效的 diff 格式；表示資料變更的分隔字串無效"
-#: src/diff3.c:1252
+#: src/diff3.c:1298
msgid "invalid diff format; incomplete last line"
msgstr "無效的 diff 格式；最後一行不完整"
-#: src/diff3.c:1276 src/sdiff.c:275 src/util.c:972
+#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970
#, fuzzy, c-format
msgid "subsidiary program '%s' could not be invoked"
msgstr "子程式 ‘%s’ 無法執行"
-#: src/diff3.c:1301
+#: src/diff3.c:1347
msgid "invalid diff format; incorrect leading line chars"
msgstr "diff 格式無效；某行的第一個字元不正確"
-#: src/diff3.c:1374
+#: src/diff3.c:1420
msgid "internal error: invalid diff type passed to output"
msgstr "內部錯誤：準備輸出的 diff 資料類型無效"
-#: src/diff3.c:1648 src/diff3.c:1705
+#: src/diff3.c:1694 src/diff3.c:1751
msgid "input file shrank"
msgstr "輸入檔縮小"
"v ：\t加上兩邊一樣的行組時會在畫面顯示。\n"
"q ：\t離開。\n"
-#: src/util.c:665
+#: src/util.c:663
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "%s：無法識別的選項‘--%s’\n"
-#: src/util.c:695
+#: src/util.c:693
#, c-format
msgid "unparsable value for --palette"
msgstr ""
prev = c;
}
+ if (colors_style == AUTO)
+ {
+ char const *t = getenv ("TERM");
+ if (t && STREQ (t, "dumb"))
+ colors_style = NEVER;
+ }
+
if (output_style == OUTPUT_UNSPECIFIED)
{
if (show_c_function)
char **lines[2]; /* The actual lines (may contain nulls) */
size_t *lengths[2]; /* Line lengths (including newlines, if any) */
struct diff_block *next;
+#ifdef lint
+ struct diff_block *n2; /* Used only when freeing. */
+#endif
};
/* Three way diff */
static struct diff3_block *make_3way_diff (struct diff_block *, struct diff_block *);
static struct diff3_block *reverse_diff3_blocklist (struct diff3_block *);
static struct diff3_block *using_to_diff3_block (struct diff_block *[2], struct diff_block *[2], int, int, struct diff3_block const *);
-static struct diff_block *process_diff (char const *, char const *, struct diff_block **);
+static struct diff_block *process_diff (char const *, char const *, struct diff_block **, char **);
static void check_stdout (void);
static void fatal (char const *) __attribute__((noreturn));
static void output_diff3 (FILE *, struct diff3_block *, int const[3], int const[3]);
{0, 0, 0, 0}
};
+static void
+free_diff_block (struct diff_block *p)
+{
+#ifndef lint
+ (void)p;
+#else
+ while (p)
+ {
+ free (p->lines[0]);
+ free (p->lines[1]);
+ free (p->lengths[0]);
+ free (p->lengths[1]);
+ struct diff_block *next = p->n2;
+ free (p);
+ p = next;
+ }
+#endif
+}
+
+/* Copy each next pointer to n2, since make_3way_diff would clobber the former,
+ yet we will still need something to free these buffers. */
+static void
+next_to_n2 (struct diff_block *p)
+{
+#ifndef lint
+ (void)p;
+#else
+ while (p)
+ p = p->n2 = p->next;
+#endif
+}
+
int
main (int argc, char **argv)
{
/* Invoke diff twice on two pairs of input files, combine the two
diffs, and output them. */
+ char *b0, *b1;
commonname = file[rev_mapping[FILEC]];
- thread1 = process_diff (file[rev_mapping[FILE1]], commonname, &last_block);
- thread0 = process_diff (file[rev_mapping[FILE0]], commonname, &last_block);
+ thread1 = process_diff (file[rev_mapping[FILE1]], commonname, &last_block, &b1);
+ thread0 = process_diff (file[rev_mapping[FILE0]], commonname, &last_block, &b0);
+
+ next_to_n2 (thread0);
+ next_to_n2 (thread1);
+
diff3 = make_3way_diff (thread0, thread1);
+
+ free_diff_block (thread0);
+ free_diff_block (thread1);
+
if (edscript)
conflicts_found
= output_diff3_edscript (stdout, diff3, mapping, rev_mapping,
conflicts_found = false;
}
+ free (b0);
+ free (b1);
check_stdout ();
exit (conflicts_found);
- return conflicts_found;
}
static void
static struct diff_block *
process_diff (char const *filea,
char const *fileb,
- struct diff_block **last_block)
+ struct diff_block **last_block,
+ char **buf_to_free)
{
char *diff_contents;
char *diff_limit;
sizeof *bptr->lengths[1]));
diff_limit = read_diff (filea, fileb, &diff_contents);
+ *buf_to_free = diff_contents;
scan_diff = diff_contents;
while (scan_diff < diff_limit)
*block_list_end = NULL;
*last_block = bptr;
- free (diff_contents);
return block_list;
}
char const pr_program[] = PR_PROGRAM;
-bool presume_output_tty;
-
/* Queue up one-line messages to be printed at the end,
when -l is specified. Each message is recorded with a 'struct msg'. */
binary \
brief-vs-stat-zero-kernel-lies \
colliding-file-names \
+ diff3 \
excess-slash \
help-version \
function-line-vs-leading-space \
binary \
brief-vs-stat-zero-kernel-lies \
colliding-file-names \
+ diff3 \
excess-slash \
help-version \
function-line-vs-leading-space \
--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)
+diff3.log: diff3
+ @p='diff3'; \
+ b='diff3'; \
+ $(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)
excess-slash.log: excess-slash
@p='excess-slash'; \
b='excess-slash'; \
gen_exp_default > exp || framework_failure_
compare exp out || fail=1
+TERM=dumb diff ---presume-output-tty --color=auto a b > out
+test $? = 1 || fail=1
+gen_exp_default > exp || framework_failure_
+compare exp out || fail=1
+
diff --color=never a b > out
test $? = 1 || fail=1
gen_exp_default > exp || framework_failure_
--- /dev/null
+#!/bin/sh
+# This would malfunction in diff-3.4
+
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+# Some systems lack seq.
+# A limited replacement for seq: handle 1 or 2 args; increment must be 1
+seq()
+{
+ case $# in
+ 1) start=1 final=$1;;
+ 2) start=$1 final=$2;;
+ *) echo you lose 1>&2; exit 1;;
+ esac
+ awk 'BEGIN{for(i='$start';i<='$final';i++) print i}' < /dev/null
+}
+
+echo a > a || framework_failure_
+echo b > b || framework_failure_
+echo c > c || framework_failure_
+cat <<'EOF' > exp || framework_failure_
+====
+1:1c
+ a
+2:1c
+ b
+3:1c
+ c
+EOF
+
+fail=0
+
+diff3 a b c > out 2> err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Repeat, but with all three files the same:
+diff3 a a a > out 2> err || fail=1
+compare /dev/null out || fail=1
+compare /dev/null err || fail=1
+
+# This would have provoked a nontrivial leak prior to diffutils-3.5,
+# due to the nontrivial list of diff_block structs.
+seq 10 40|sed 's/1$/x/' > d || framework_failure_
+seq 10 40|sed 's/5$/y/' > e || framework_failure_
+seq 10 40|sed 's/8$/z/' > f || framework_failure_
+cat <<'EOF' > exp40 || framework_failure_
+====1
+1:2c
+ 1x
+2:2c
+3:2c
+ 11
+====2
+1:6c
+3:6c
+ 15
+2:6c
+ 1y
+====3
+1:9c
+2:9c
+ 18
+3:9c
+ 1z
+====1
+1:12c
+ 2x
+2:12c
+3:12c
+ 21
+====2
+1:16c
+3:16c
+ 25
+2:16c
+ 2y
+====3
+1:19c
+2:19c
+ 28
+3:19c
+ 2z
+====1
+1:22c
+ 3x
+2:22c
+3:22c
+ 31
+====2
+1:26c
+3:26c
+ 35
+2:26c
+ 3y
+====3
+1:29c
+2:29c
+ 38
+3:29c
+ 3z
+EOF
+
+diff3 d e f > out 2> err
+compare exp40 out || fail=1
+compare /dev/null err || fail=1
+
+Exit $fail
projects / platform / upstream / diffutils.git / commitdiff