ÿØÿà JFIF ÿÛ „ ( %!1!%*+... 983,7(-.-
usr/share/locale/ms/LC_MESSAGES/diffutils.mo 0000644 00000021373 15234561524 0014465 0 ustar 00 h \ M 0 7 0 h ( ( C
5 G
3 }
!
!
! F 1 = x & + H d $ |
8
H
# T
x
b j v " 4 9 . V ; 3 / + < ' h # ) ) ? i 1
2 ? 0 r ) 1 - -
> " L % o
!
( 6 R
f q ~ P g ! 6 0 B S U 1 Y * C 6 6 1 h " S G 7 - ! < # U y
% " + ? " K n z Z b n ( @ ! Y 4 { = 5 1 = - o ) % $ 0 B D 3 S 7
& 0 5 K 6 a = / 0 ! 4 7! 4 l! !
! ! & !
"
" #"
5" @" J" a" g" v" " " " " ! " "
"
" X E D . O 5 h K R H 3 % , @ ' - 0 A M N Z F ^ 6 2 d : W > I 4 Q ( ; +
Y C S \ a 8 " 9 = [ ] B ? U ) $ ! b T G L # / f V _ c P & 7 e J ` 1 *
g < --suppress-blank-empty suppress space or tab before empty output lines %s %s differ: byte %s, line %s
%s %s differ: byte %s, line %s is %3o %s %3o %s
%s home page:
%s: diff failed: ' (C) --from-file and --to-file both specified -D option not supported with directories -F, --show-function-line=RE show the most recent line matching RE -s, --quiet, --silent suppress all normal output -y, --side-by-side output in two columns Common subdirectories: %s and %s
Compare three files line by line. Compare two files byte by byte. David Hayes David MacKenzie Exit status is 0 if inputs are the same, 1 if different, 2 if trouble. Exit status is 0 if successful, 1 if conflicts, 2 if trouble. File %s is a %s while file %s is a %s
Files %s and %s are identical
Files %s and %s differ
Invalid back reference Invalid character class name Invalid collation character Invalid content of \{\} Invalid preceding regular expression Invalid range end Invalid regular expression Len Tower Memory exhausted Mike Haertel No match No newline at end of file No previous regular expression Only in %s: %s
Paul Eggert Premature end of regular expression Randy Smith Regular expression too big Richard Stallman SKIP values may be followed by the following multiplicative suffixes:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y. Success Thomas Lord Torbjorn Granlund Trailing backslash Unknown system error Unmatched ( or \( Unmatched ) or \) Unmatched \{ Usage: %s [OPTION]... FILE1 FILE2
Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]
Usage: %s [OPTION]... FILES
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
Written by %s and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, %s, %s, and %s.
Written by %s, %s, %s,
%s, %s, and %s.
Written by %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
and %s.
Written by %s, %s, and %s.
Written by %s.
` block special file both files to be compared are directories cannot interactively merge standard input character special file conflicting output style options conflicting tabsize options conflicting width options directory fifo incompatible options input file shrank internal error: invalid diff type in process_diff internal error: invalid diff type passed to output internal error: screwup in format of diff blocks invalid diff format; incomplete last line invalid diff format; incorrect leading line chars invalid diff format; invalid change separator memory exhausted message queue options -l and -s are incompatible pagination not supported on this host program error read failed regular empty file regular file semaphore shared memory object socket stack overflow standard output stderr stdin stdout symbolic link too many file label options typed memory object weird file write failed Project-Id-Version: diffutils 3.3-pre1
Report-Msgid-Bugs-To: bug-diffutils@gnu.org
POT-Creation-Date: 2017-05-21 13:26-0700
PO-Revision-Date: 2015-09-24 17:50+0800
Last-Translator: Sharuzzaman Ahmat Raslan
Language-Team: Malay
Language: ms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Bugs: Report translation errors to the Language-Team address.
X-Generator: Poedit 1.8.5
--suppress-blank-empty sekat ruang atau tab sebelum baris keluaran kosong %s %s berbeza: byte %s, baris %s
%s %s berbeza: byte %s, baris %s adalah %3o %s %3o %s
Laman web %s:
%s: diff gagal: ' (C) --from-file dan --to-file kedua-duanya dinyatakan pilihan -D tidak disokong dengan direktori -F, --show-function-line=RE papar baris paling terkini sepadan RE -s, --quiet, --silent sekat semua keluaran normal -y, --side-by-side keluaran dalam dua lajur Subdirektori umum: %s dan %s
Banding tiga fail tiap-tiap baris. Banding dua fail setiap byte. David Hayes David MacKenzie Status keluar adalah 0 jika masukan adalah sama, 1 jika berbeza, 2 jika bermasalah. Status keluar adalah 0 jika berjaya, 1 jika konflik, 2 jika bermasalah. Fail %s adalah %s manakala fail %s adalah %s
Fail %s dan %s adalah serupa
Fail %s dan %s berbeza
Rujukan belakang tidak sah Nama kelas aksara tidak sah Aksara pengumpulsemakan tidak sah Kandungan \{\} tidak sah Regular expression awalan tidak sah Julat akhir tidak sah Regular expression tidak sah Len Tower Kehabisan memori Mike Haertel Tiada padanan Tiada baris baru pada penghujung fail Tiada regular expression terdahulu Hanya dalam %s: %s
Paul Eggert Regular expression tamat tiba-tiba Randy Smith Regular expression terlalu besar Richard Stallman Nilai LANGKAU boleh diikuti dengan akhiran pekali berikut:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, dan seterusnya untuk T, P, E, Z, Y. Berjaya Thomas Lord Torbjorn Granlund Slash dibelakang Ralat sistem tidak diketahui ( atau \( tidak sepadan ) atau \) tidak sepadan \{ tidak sepadan Penggunaan: %s [PILIHAN]... FAIL1 FAIL2
Penggunaan: %s [PILIHAN]... FAIL1 [FAIL2 [LANGKAU1 [LANGKAU2]]]
Penggunaan: %s [PILIHAN]... FAIL
Penggunaan: %s [PILIHAN]... MYFILE OLDFILE YOURFILE
Ditulis oleh %s and %s.
Ditulis oleh %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Ditulis oleh %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
Ditulis oleh %s, %s, %s,
%s, %s, %s, %s,
and %s.
Ditulis oleh %s, %s, %s,
%s, %s, %s, and %s.
Ditulis oleh %s, %s, %s,
%s, %s, and %s.
Ditulis oleh %s, %s, %s,
%s, and %s.
Ditulis oleh by %s, %s, %s,
and %s.
Ditulis oleh %s, %s, and %s.
Ditulis oleh %s.
` fail khas blok kedua-dua fail yang akan dibanding adalah direktori tidak dapat menggabung masukan piawai secara interaktif fail khas aksara pilihan gaya keluaran berkonflik pilihan saiz tab berkonflik pilihan lebar berkonflik direktori fifo pilihan tidak sepadan fail masukan mengecil ralat dalaman: jenis diff tidak sah dalam process_diff ralat dalaman: jenis diff tidak sah diberikan kepada keluaran ralat dalaman: kerosakan dalam format blok diff format diff tidak sah; baris akhir tidak lengkap format diff tidak sah; aksara awal baris tidak betul format diff tidak sah; pengasing perbezaan tidak sah kehabisan memori barisan mesej pilihan -l dan -s tidak sepadan pagination tidak disokong pada hos ini ralat program gagal membaca fail kosong biasa fail biasa semaphore objek ingatan dikongsi soket stack melimpah keluaran piawai stderr stdin stdout pautan simbolik terlalu banyak pilihan label fail objek memori berjenis fail pelik gagal menulis usr/share/locale/el/LC_MESSAGES/diffutils.mo 0000644 00000125073 15235271266 0014452 0 ustar 00 t g h i 4 h I C B B 9 | 9 8 6 y o 7 6 ! 5 X 3 G E
| P I @ ; X G @ L G D K C M 8 " K [ M y A o! ! p" $ F $ i % {% 0 % % 0 % & .& @& , \& & . & ' & ( ' )' F' f' * h' ' ( ' P ' D ( H V( E ( ( ( K ) C Z) @ ) : ) C * M ^* G * G * ~ <+ ; + J + C B, A , 3 , L , : I- L - > - ; . 7 L. 4 . 3 . K . H 9/ 0 / L / F 0 B G0 1 0 0 E D1 H 1 J 1 F 2 e2 H 2 E 53 H {3 3 6 I4 7 4 J 4 E 5 ; I5 L 5 5 5 @ 6 7 I6 = 6 < 6 M 6 @ J7 ? 7 > 7 <
8 6 G8 K ~8 < 8 M 9 3 U9 9 ! 9 9 ! 9 : (: 4: F D: = : C : &
; 4; S; ? k; K ; 1 ; & )< P< g< < < $ < < <
= I = ^= o= |= = = = = = = # = #> /> J> a> r> : $? _? g? q ? ? @ @ % +@ Q@ f@ x@ @ @ " @ 4 @ A . +A ZA oA ; A 3 A / A + &B ' RB # zB B B B B B C ) C ! FC ' hC ) C C C ) C & D @D _D D D D D D D n D eF xF F F F 1 F 2 F 0 *G [G vG # G G G G ) G 1 )H - [H H $ H H H H
I I )I DI _I " ~I I
I I " I % I J
J .J :J MJ ZJ dJ yJ J J J J J , J
J J
K K -K LK
dK oK xK K ~M ZN oN ^ 3Q _ Q g Q ZR l S m xS S [ T i U g U e U ~ NV V W { IX k X d 1Y Y Z gZ ( Z | [ k h\ j \ k ?] ] f ;^ } ^ _ _ ` v` E ` F b de ^ g wg 3 )h L ]h h 0 h . h " i @ Ai F i 7 i K j ; Mj < j A j A k Jk ^ Mk k G k k R l t l r Qm R m | n m n m o [ po z o Gp | p ~ Gq q J r r r Gs s R Gt L t : t "u m u k gv G v E w G aw w 3x G x h y f ly h y . U S k R T 4 B ܤ : % Z $ ٥ 2 $ ' . L {
( @ o q % z # " ħ < W % ^ U ' H 4 } % ! ѩ j
q ^ I u
B l y 6 , K * A ' c J ) Q i P w T 4 1 3 = 0 [ M > x k ; { t O | L G /
f F ` H \ $ . % n C 5 2 7 & S 8 < ? z U - v ] o 9 r : D ( @ } Z ! e V s " a h d R N E X _ m Y + g b p # ~ W
License GPLv3+: GNU GPL version 3 or later .
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Report bugs to: %s
The default output format is a somewhat human-readable representation of
the changes.
The -e, -E, -x, -X (and corresponding long) options cause an ed script
to be output instead of the default.
Finally, the -m (--merge) option causes diff3 to do the merge internally
and output the actual merged file. For unusual input, this is more
robust than using ed.
--GTYPE-group-format=GFMT format GTYPE input groups with GFMT --LTYPE-line-format=LFMT format LTYPE input lines with LFMT --binary read and write data in binary mode --color[=WHEN] colorize the output; WHEN can be 'never', 'always',
or 'auto' (the default) --diff-program=PROGRAM use PROGRAM to compare files --diff-program=PROGRAM use PROGRAM to compare files --from-file=FILE1 compare FILE1 to all operands;
FILE1 can be a directory --help display this help and exit --help display this help and exit --help display this help and exit --help display this help and exit --horizon-lines=NUM keep NUM lines of the common prefix and suffix --ignore-file-name-case ignore case when comparing file names --label LABEL use LABEL instead of file name and timestamp
(can be repeated) --left-column output only the left column of common lines --line-format=LFMT format all input lines with LFMT --no-dereference don't follow symbolic links --no-ignore-file-name-case consider case when comparing file names --normal output a normal diff (the default) --palette=PALETTE the colors to use when --color is active; PALETTE is
a colon-separated list of terminfo capabilities --speed-large-files assume large files and many scattered small changes --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --suppress-blank-empty suppress space or tab before empty output lines --suppress-common-lines do not output common lines --tabsize=NUM tab stops every NUM (default 8) print columns --tabsize=NUM tab stops at every NUM (default 8) print columns --to-file=FILE2 compare all operands to FILE2;
FILE2 can be a directory --unidirectional-new-file treat absent first files as empty Both GFMT and LFMT may contain:
%% %
%c'C' the single character C
%c'\OOO' the character with octal code OOO
C the character C (other characters represent themselves) GFMT (only) may contain:
%< lines from FILE1
%> lines from FILE2
%= lines common to FILE1 and FILE2
%[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER
LETTERs are as follows for new group, lower case for old group:
F first line number
L last line number
N number of lines = L-F+1
E F-1
M L+1
%(A=B?T:E) if A equals B then T else E LFMT (only) may contain:
%L contents of line
%l contents of line, excluding any trailing newline
%[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'. These format options provide fine-grained control over the output
of diff, generalizing -D/--ifdef. %s %s differ: byte %s, line %s
%s %s differ: byte %s, line %s is %3o %s %3o %s
%s home page: <%s>
%s home page:
%s%s argument '%s' too large %s: diff failed: %s: invalid option -- '%c'
%s: option '%s%s' doesn't allow an argument
%s: option '%s%s' is ambiguous
%s: option '%s%s' is ambiguous; possibilities: %s: option '%s%s' requires an argument
%s: option requires an argument -- '%c'
%s: recursive directory loop %s: unrecognized option '%s%s'
' '-' specified for more than one input file (C) --from-file and --to-file both specified -3, --easy-only like -e, but incorporate only nonoverlapping changes -A, --show-all output all changes, bracketing conflicts -B, --ignore-blank-lines ignore changes where lines are all blank -B, --ignore-blank-lines ignore changes whose lines are all blank -D option not supported with directories -D, --ifdef=NAME output merged file with '#ifdef NAME' diffs -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --show-overlap like -e, but bracket conflicts -F, --show-function-line=RE show the most recent line matching RE -H, --speed-large-files assume large files, many scattered small changes -I, --ignore-matching-lines=RE ignore changes all whose lines match RE -I, --ignore-matching-lines=RE ignore changes where all lines match RE -L, --label=LABEL use LABEL instead of file name
(can be repeated up to three times) -N, --new-file treat absent files as empty -S, --starting-file=FILE start with FILE when comparing directories -T, --initial-tab make tabs line up by prepending a tab -T, --initial-tab make tabs line up by prepending a tab -W, --ignore-all-space ignore all white space -W, --width=NUM output at most NUM (default 130) print columns -X like -x, but bracket conflicts -X, --exclude-from=FILE exclude files that match any pattern in FILE -Z, --ignore-trailing-space ignore white space at line end -Z, --ignore-trailing-space ignore white space at line end -a, --text treat all files as text -a, --text treat all files as text -a, --text treat all files as text -b, --ignore-space-change ignore changes in the amount of white space -b, --ignore-space-change ignore changes in the amount of white space -b, --print-bytes print differing bytes -c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context -d, --minimal try hard to find a smaller set of changes -d, --minimal try hard to find a smaller set of changes -e, --ed output an ed script -e, --ed output ed script incorporating changes
from OLDFILE to YOURFILE into MYFILE -i append 'w' and 'q' commands to ed scripts -i, --ignore-case ignore case differences in file contents -i, --ignore-case consider upper- and lower-case to be the same -i, --ignore-initial=SKIP skip first SKIP bytes of both inputs -i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and
first SKIP2 bytes of FILE2 -l, --left-column output only the left column of common lines -l, --paginate pass output through 'pr' to paginate it -l, --verbose output byte numbers and differing byte values -m, --merge output actual merged file, according to
-A if no other options are given -n, --bytes=LIMIT compare at most LIMIT bytes -n, --rcs output an RCS format diff -o, --output=FILE operate interactively, sending output to FILE -p, --show-c-function show which C function each change is in -q, --brief report only when files differ -r, --recursive recursively compare any subdirectories found -s, --quiet, --silent suppress all normal output -s, --report-identical-files report when two files are the same -s, --suppress-common-lines do not output common lines -t, --expand-tabs expand tabs to spaces in output -t, --expand-tabs expand tabs to spaces in output -u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -w, --ignore-all-space ignore all white space -w, --width=NUM output at most NUM (default 130) print columns -x, --exclude=PAT exclude files that match PAT -x, --overlap-only like -e, but incorporate only overlapping changes -y, --side-by-side output in two columns Binary files %s and %s differ
Common subdirectories: %s and %s
Compare FILES line by line. Compare three files line by line. Compare two files byte by byte. David Hayes David MacKenzie Exit status is 0 if inputs are the same, 1 if different, 2 if trouble. Exit status is 0 if successful, 1 if conflicts, 2 if trouble. FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'. File %s is a %s while file %s is a %s
Files %s and %s are identical
Files %s and %s differ
General help using GNU software:
If --from-file or --to-file is given, there are no restrictions on FILE(s). If a FILE is '-' or missing, read standard input. If a FILE is '-', read standard input. Invalid back reference Invalid character class name Invalid collation character Invalid content of \{\} Invalid preceding regular expression Invalid range end Invalid regular expression Len Tower Mandatory arguments to long options are mandatory for short options too.
Memory exhausted Mike Haertel No match No newline at end of file No previous regular expression Only in %s: %s
Packaged by %s
Packaged by %s (%s)
Paul Eggert Premature end of regular expression Randy Smith Regular expression too big Report %s bugs to: %s
Richard Stallman SKIP values may be followed by the following multiplicative suffixes:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y. Side-by-side merge of differences between FILE1 and FILE2. Success Symbolic links %s and %s differ
The optional SKIP1 and SKIP2 specify the number of bytes to skip
at the beginning of each file (zero by default). Thomas Lord Torbjorn Granlund Trailing backslash Try '%s --help' for more information. Unknown system error Unmatched ( or \( Unmatched ) or \) Unmatched [, [^, [:, [., or [= Unmatched \{ Usage: %s [OPTION]... FILE1 FILE2
Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]
Usage: %s [OPTION]... FILES
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
Valid arguments are: Written by %s and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, %s, %s, and %s.
Written by %s, %s, %s,
%s, %s, and %s.
Written by %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
and %s.
Written by %s, %s, and %s.
Written by %s.
` ambiguous argument %s for %s block special file both files to be compared are directories cannot compare '-' to a directory cannot compare file names '%s' and '%s' cannot interactively merge standard input character special file cmp: EOF on %s after byte %s
cmp: EOF on %s after byte %s, in line %s
cmp: EOF on %s after byte %s, line %s
cmp: EOF on %s which is empty
conflicting %s option value '%s' conflicting output style options conflicting tabsize options conflicting width options contiguous data directory door ed: Edit then use both versions, each decorated with a header.
eb: Edit then use both versions.
el or e1: Edit then use the left version.
er or e2: Edit then use the right version.
e: Discard both versions then edit a new one.
l or 1: Use the left version.
r or 2: Use the right version.
s: Silently include common lines.
v: Verbosely include common lines.
q: Quit.
extra operand '%s' failed to reopen %s with mode %s fifo incompatible options input file shrank internal error: invalid diff type in process_diff internal error: invalid diff type passed to output internal error: screwup in format of diff blocks invalid %s%s argument '%s' invalid --bytes value '%s' invalid --ignore-initial value '%s' invalid argument %s for %s invalid color '%s' invalid context length '%s' invalid diff format; incomplete last line invalid diff format; incorrect leading line chars invalid diff format; invalid change separator invalid horizon length '%s' invalid suffix in %s%s argument '%s' invalid tabsize '%s' invalid width '%s' memory exhausted message queue migrated file with data migrated file without data missing operand after '%s' multiplexed block special file multiplexed character special file multiplexed file named file network special file options -l and -s are incompatible pagination not supported on this host port program error read failed regular empty file regular file semaphore shared memory object socket stack overflow standard output stderr stdin stdout subsidiary program '%s' could not be invoked symbolic link too many file label options typed memory object unknown stream unparsable value for --palette unrecognized prefix: %s weird file whiteout write failed Project-Id-Version: diffutils-3.5.25
Report-Msgid-Bugs-To: bug-diffutils@gnu.org
POT-Creation-Date: 2017-05-21 13:26-0700
PO-Revision-Date: 2017-05-13 01:10+0300
Last-Translator: Lefteris Dimitroulakis
Language-Team: Greek
Language: el
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Bugs: Report translation errors to the Language-Team address.
X-Generator: Lokalize 1.5
Plural-Forms: nplurals=2; plural=(n != 1);
Άδεια GPLv3+: GNU GPL έκδοση 3 ή νεότερη .
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Report bugs to: %s
Η προεπιλεγμένη μορφή εξόδου είναι η λίγο πολύ αναγνώσιμη αναπαράσταση των αλλαγών.
Οι -e, -E, -x, -X (και οι αντίστοιχες μακρές) επιλογές δημιουργούν ένα ed script
στην έξοδο αντί της προεπιλογής.
Τελικά, η επιλογή -m (--merge) υποχρεώνει το diff3 να κάνει τη συγχώνευση εσωτερικά
και να εμφανίσει στην έξοδο το συγχωνευμένο αρχείο. Για μη συνηθισμένη είσοδο, αυτό είναι
σταθερότερο απο την χρήση του ed.
--GTYPE-group-format=GFMT μορφοποίηση ομάδων εισόδου GTYPE με GFMT. --LTYPE-line-format=LFMT μορφοποίηση γραμμών εισόδου LTYPE με LFMT. --binary Ανάγνωση και εγγραφή πληροφορίας σε δυαδική μορφή. --color[=WHEN] χρωματίζει την έξοδο, WHEN μπορεί να είναι «ποτέ», «πάντα»,
ή «αυτόματο» (προεπιλογή) --diff-program=ΠΡΟΓΡ Χρήση του ΠΡΟΓΡάμματος στη σύγκριση αρχείων --diff-program=ΠΡΟΓΡ Χρήση του ΠΡΟΓΡάμματος στη σύγκριση αρχείων. --from-file=ΑΡΧΕΙΟ1 Σύγκριση ΑΡΧΕΙΟ1 με όλους τους τελεστέους·
ΑΡΧΕΙΟ1 μπορεί να είναι κατάλογος --help εμφάνιση αυτής εδώ της βοήθειας κι έξοδος --help εμφάνιση αυτής εδώ της βοήθειας κι έξοδος --help εμφάνιση αυτής εδώ της βοήθειας κι έξοδος --help εμφάνιση αυτής εδώ της βοήθειας κι έξοδος --horizon-lines=ΑΡ Διατηρεί ΑΡ γραμμές με ταυτόσημα προθέματα κι επιθέματα. --ignore-file-name-case Αγνοεί τις διαφορές λόγω πεζών-κεφαλαίων
κατά τη σύγκριση ονομάτων αρχείων. -L, --label=LABEL χρήση LABEL αντί ονόματος αρχείου και timestamp
(μπορεί να επαναληφθεί) --left-column Εμφάνιση μόνο της αριστερής στήλης των ταυτόσημων γραμμών. --line-format=LFMT μορφοποίηση όλων των γραμμών εισόδου με LFMT --no-dereference μην ακολουθείς συμβολικούς συνδέσμους --no-ignore-file-name-case Λαμβάνει υπ' όψιν τις διαφορές λόγω
πεζών-κεφαλαίων κατά τη σύγκριση ονομάτων αρχείων. --normal Δημιουργία ενός κανονικού `diff' (προεπιλογή) --palette=PALETTE τα προς χρήση χρώματα όταν η επιλογή --color έχει ενεργοποιηθεί, PALETTE είναι
μια λίστα ικανοτήτων terminfo που χωρίζονται από δίστιγμα. capabilities --speed-large-files Υποθέτει μεγάλα αρχεία με πολλές σκόρπιες μικροαλλαγές. --strip-trailing-cr Απαλειφή του χαρακτήρα επιστροφής στην είσοδο. --strip-trailing-cr Απαλειφή του χαρακτήρα επιστροφής στην είσοδο --strip-trailing-cr Απαλειφή του χαρακτήρα επιστροφής στην είσοδο. --suppress-blank-empty απάλειψη διαστήματος ή στ/θέτη πριν από κενές γραμμές στην έξοδο -s --suppress-common-lines Οι ταυτόσημες γραμμές δεν εμφανίζονται. --tabsize=ΑΡ Ο αριθμός διαστημάτων του στηλοθέτη είναι ΑΡ (προεπιλογή 8) --tabsize=ΑΡ Ο αριθμός διαστημάτων του στηλοθέτη είναι ΑΡ (προεπιλογή 8) στήλες --to-file=ΑΡΧΕΙΟ2 Σύγκριση όλων των τελεστέων στο ΑΡΧΕΙΟ2·
ΑΡΧΕΙΟ2 μπορεί να είναι κατάλογος --unidirectional-new-file Θεωρεί τα απόντα πρώτα αρχεία ως κενά. GFMT και LFMT μπορεί να περιέχουν:
%% %
%c'C' το μοναδικό χαρακτήρα C
%c'\OOO' το χαρακτήρα με οκταδικό κωδικό OOO
C το χαρακτήρα C (οι άλλοι χαρακτήρες αναπαριστούν τον εαυτόν τους) GFMT μπορεί να περιέχει:
%< για να δηλώνει γραμμές από το ΑΡΧΕΙΟ1
%> για να δηλώνει γραμμές από το ΑΡΧΕΙΟ2
%= για να δηλώνει ταυτόσημες γραμμές μεταξύ των ΑΡΧΕΙΟ1 και ΑΡΧΕΙΟ2
%[-][ΠΛΑΤΟΣ][.[PREC]]{doxX}ΓΡΑΜΜΑ, προδιαγραφές του ΓΡΑΜΜΑτος
στο στύλ της printf(), ως ακολούθως γιά τη νέα ομάδα
ενώ με πεζά για τη παλαιά ομάδα:
F αριθμός πρώτης γραμμής
L αριθμός τελευταίας γραμμής
N αριθμός γραμμών = L-F+1
E F-1
M L+1
%(A=B?T:E) αν A ίσον B τότε T αλλιώς E LFMT μπορεί να περιέχει:
%L για το περιεχόμενο της γραμμής
%l για το περιεχόμενο της γραμμής χωρίς το τέλος γραμμής
%[-][ΠΛΑΤΟΣ][.[PREC]]{doxX}n την προδιαγραφή του αριθμού γραμμής
εισόδου κατά τη μορφή της printf() LTYPE είναι «old», «new», ή «unchanged». GTYPE είναι LTYPE ή «changed». Αυτές οι επιλογές μορφής παρέχουν λεπτομερή έλεγχο πάνω στην έξοδο
του diff, γενικεύοντας -D/--ifdef. %s %s διαφέρουν: byte %s, γραμμή %s
%s %s διαφέρουν: byte %s, γραμμή %s είναι %3o %s %3o %s
%s home page: <%s>
%s home page:
%s%s όρισμα «%s» πολύ μεγάλο %s: αποτυχία του diff: %s: η επιλογή -- «%c» δεν είναι έγκυρη
%s: η επιλογή «%s%s» δεν επιτρέπει όρισμα
%s: η επιλογή «%s%s» είναι ασαφής
%s: η επιλογή «%s%s» είναι ασαφής· επιλογές: %s: η επιλογή «%s%s» απαιτεί όρισμα
%s: η επιλογή απαιτεί όρισμα -- «%c»
%s: αναδρομικός βρόχος στον κατάλογο %s: η επιλογή «%s%s» δεν αναγνωρίζεται
» «-» ορίστηκε για περισσότερα από ένα αρχεία εισόδου (C) --from-file και --to-file έχουν οριστεί αμφότερα -3, --easy-only όπως -e, αλλά περιλαμβάνει μόνο τις μη αλληλοεπικαλυπτόμενες αλλαγές -A --show-all Έξοδος όλων των διαφορών σε αγκύλες. -B, --ignore-blank-lines Αγνοεί αλλαγές οφειλόμενες στις λευκές γραμμές -B, --ignore-blank-lines Αγνοεί αλλαγές οφειλόμενες στις λευκές γραμμές Η επιλογή -D δεν υποστηρίζεται για καταλόγους -D, --ifdef=ΟΝΟΜΑ Έξοδος συγχωνευμένου αρχείου με τις διαφορές «#ifdef NAME». -E, --ignore-tab-expansion Αγνοεί αλλαγές οφειλόμενες στη στηλοθέτηση -E, --ignore-tab-expansion Αγνοεί αλλαγές οφειλόμενες στη στηλοθέτηση -E, --show-overlap όπως -e, αλλά οι διαφορές σε αγκύλες -F, --show-function-line=RE εμφάνιση του πιο πρόσφατου ταιριάσματος γραμμής RE -H, --speed-large-files Υποθέτει μεγάλα αρχεία με πολλές σκόρπιες μικροδιαφορές -I, --ignore-matching-lines=RE αγνοεί αλλαγές που οι γραμμές τους ταιριάζουν με RE -I, --ignore-matching-lines=RE Αγνοεί αλλαγές που οι γραμμές τους ταιριάζουν με RE. -L, --label=LABEL χρήση LABEL αντί ονόματος αρχείου
(μπορεί να επαναληφθεί μέχρι τρεις φορές) -N, --new-file Θεωρεί τα απόντα αρχεία ως κενά -S, --starting-file=ΑΡΧΕΙΟ Εκκίνηση σύγκρισης καταλόγων από το ΑΡΧΕΙΟ -T, --initial-tab Στοίχιση των στηλοθετών με την επιπρόσθεση ενός στην αρχή. -T, --initial-tab στοίχιση των στηλοθετών με την επιπρόσθεση ενός στην αρχή. -W, --ignore-all-space Αγνοεί όλα τα λευκά διαστήματα. -W, --width=NUM output at most NUM (default 130) print columns -X like -x, but bracket conflicts -X, --exclude-from=ΑΡΧΕΙΟ Εξαίρεση αρχείων με όνομα που ταιράζει
με τα ονόματα που βρίσκονται στο ΑΡΧΕΙΟ -Z, --ignore-trailing-space αγνοεί λευκά διαστήματα στο τέλος γραμμής -Z, --ignore-trailing-space αγνοεί το λευκό διάστημα στο τέλος γραμμής -a, --text Θεωρεί όλα τα αρχεία ως κείμενο. -a --text Θεωρεί όλα τα αρχεία ως κείμενο -a, --text Θεωρεί όλα τα αρχεία ως κείμενο. -b, --ignore-space-change Αγνοεί αλλαγές οφειλόμενες στον αριθμό λευκών διαστημάτων. -b --ignore-space-change αγνοεί αλλαγές οφειλόμενες στον αριθμό λευκών διαστημάτων -b, --print-bytes Εμφανίζει bytes που διαφέρουν. -c, -C NUM, --context[=NUM] έξοδος NUM (προεπιλογή 3) γραμμές of copied context -d, --minimal προσπάθεια εύρεσης μικρότερου συνόλου αλλαγών -d --minimal προσπάθεια εύρεσης μικρότερου συνόλου διαφορών. -e, --ed εμφανίζει ένα ed script -e, --ed έξοδος ενός ed script που περιλαμβάνει τις αλλαγές
από OLDFILE σε YOURFILE στο MYFILE -i προσάρτηση των εντολών «w» και «q» στα σενάρια του «ed» -i, --ignore-case Αγνοεί τις διαφορές λόγω πεζών-κεφαλαίων στα περιεχόμενα των αρχείων -i, --ignore-case Θεωρεί πεζά-κεφαλαία ίδια -i, --ignore-initial=SKIP Παράβλεψη των πρώτων SKIP bytes και των δύο εισόδων -i, --ignore-initial=SKIP1:SKIP2 παράβλεψη των πρώτων SKIP1 bytes του αρχείου FILE1 και
των πρώτων SKIP2 bytes του αρχείου FILE2 -l, --left-column Εμφάνιση στην αριστερή στήλη των κοινών γραμμών -l, --paginate Έξοδος δια μέσου του «pr» ώστε να αριθμιθούν οι σελίδες -l --verbose Έξοδος αριθμού και τιμής όλων των bytes που διαφέρουν. -m, --merge έξοδος του συγχωνευμένου αρχείου σύμφωνα με την
-A αν δεν δίνεται άλλη επιλογή -n, --bytes=ΟΡΙΟ Σύγκριση το πολύ ΟΡΙΟ bytes. -n --rcs Δημιουργία αρχείου «diff» σε μορφή RCS. -o, --output=ΑΡΧΕΙΟ Αλληλεπιδραστική λειτουργία με αποστολή εξόδου στο ΑΡΧΕΙΟ. -p, --show-c-function εμφάνιση σε ποιά συνάρτηση C βρίσκεται κάθε αλλαγή -q --brief αποτέλεσμα στην έξοδο μόνο αν τ' αρχεία διαφέρουν -r, --recursive Αναδρομική σύγκριση όσων υποκαταλόγων βρεθούν -s, --quiet, --silent απάλειψη κανονικής εξόδου -s, --report-identical-files Ειδοποιεί όταν δύο αρχεία είναι ίδια -s, --suppress-common-lines Οι ταυτόσημες γραμμές δεν εμφανίζονται -t, --expand-tabs Μετατροπή στηλοθετών σε διαστήματα στην έξοδο. -t, --expand-tabs Μετατροπή στηλοθετών σε διαστήματα στην έξοδο -u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context -v --version ονόμα, έκδοση κι έξοδος -v, --version εμφάνιση πληροφοριών έκδοσης κι έξοδος -v, --version εμφάνιση πληροφοριών έκδοσης κι έξοδος -v --version Εμφάνιση πληροφοριών έκδοσης κι έξοδος -w, --ignore-all-space Αγνοεί όλα τα λευκά διαστήματα. -w, --width=ΑΡ Έξοδος με το πολύ ΑΡ στήλες εκτύπωσης (προεπιλογή 130). -x, --exclude=PAT Εξαίρεση αρχείων με όνομα που ταιριάζει με PAT. -x, --overlap-only όπως -e, αλλά περιλαμβάνει μόνο τις αλληλοκαλυπτόμενες αλλαγές -y, --side-by-side έξοδος σε δυο στήλες Τα δυαδικά αρχεία %s και %s διαφέρουν
Οι υποκατάλογοι %s και %s είναι ταυτόσημοι
Σύγκριση αρχείων γραμμή προς γραμμή. Σύγκριση τριών αρχείων γραμμή προς γραμμή. Σύγκριση δύο αρχείων byte προς byte. David Hayes David MacKenzie Η έξοδος είναι 0 αν τα δεδομένα αρχεία είναι ίδια, 1 αν είναι διαφορετικά,
2 αν υπάρχει πρόβλημα. Σε επιτυχία η έξοδος είναι 0, σε σύγκρουση 1 και σε πρόβλημα 2. ΑΡΧΕΙΑ είναι «ΑΡΧΕΙΟ1 ΑΡΧΕΙΟ2» ή «ΚΑΤ1 ΚΑΤ2» ή «ΚΑΤ ΑΡΧΕΙΟ...» ή «ΑΡΧΕΙΟ...ΚΑΤ». Το αρχείο %s είναι %s ενώ το αρχείο %s είναι %s
Τα αρχεία %s καί %s είναι πανομοιότυπα
Τα αρχεία %s και %s διαφέρουν
Γενική βοήθεια στη χρήση λογισμικού GNU:
Αν δίδεται το --from-file ή το --to-file, τότε δεν υπάρχει περιορισμός στα ΑΡΧΕΙΑ. Αν ένα ΑΡΧΕΙΟ είναι «-» ή απών, τότε ανάγνωση από την κανονική είσοδο. Αν ένα ΑΡΧΕΙΟ είναι «-», τότε ανάγνωση από την τυπική είσοδο. Άκυρη πίσω παραπομπή Μη έγκυρο όνομα κλάσεως χαρακτήρων Μη έγκυρος χαρακτήρας διαταξινόμησης Το περιεχόμενο του \{\} είναι μη έγκυρο Η προηγούμενη κανονική έκφραση είναι άκυρη Μη έγκυρο πέρας διαστήματος Μη έγκυρη κανονική έκφραση Len Tower Υποχρεωτικά ορίσματα στις μακρές επιλογές είναι υποχρεωτικά και στις κοντές επιλογές επίσης.
Η μνήμη εξαντλήθηκε Mike Haertel Δεν υπάρχει ταίριασμα Δεν υπάρχει χαρακτήρας νέας γραμμής στο τέλος του αρχείου Δεν προηγήθηκε κανονική έκφραση Μόνο στο %s: %s
Packaged by %s
Packaged by %s (%s)
Paul Eggert Πρόωρο τέλος κανονικής έκφρασης Randy Smith Πολύ μεγάλη κανονική έκφραση Report %s bugs to: %s
Richard Stallman Οι τιμές SKIP μπορούν ν' ακολουθούνται
από τα παρακάτω πολαπλασιαστικά επιθέματα :
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, κτλ γιά T, P, E, Z, Y. Συγχώνευση δίπλα-δίπλα των διαφορών των ΑΡΧΕΙΟ1 και ΑΡΧΕΙΟ2. Επιτυχία Οι συμβολικοί σύνδεσμοι %s και %s διαφέρουν
Οι προαιρετικές παράμετροι SKIP1 και SKIP2 καθορίζουν τον αριθμό των bytes προς παράβλεψη
στην αρχή κάθε αρχείου (η προεπιλογή είναι μηδέν). Thomas Lord Torbjorn Granlund Αντιπλαγία στο τέλος Δοκιμάστε «%s --help» για περισσότερες πληροφορίες. Άγνωστο σφάλμα συστήματος Δε βρέθηκε ( ή \( Δε βρέθηκε ) ή \) Δεν βρέθηκε [, [^, [:, [., or [= Δε βρέθηκε \{ Χρήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΟ1 ΑΡΧΕΙΟ2
Χρήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΟ1 [ΑΡΧΕΙΟ2 [SKIP1 [SKIP2]]]
Χρήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΑ
Χρήση: %s [ΕΠΙΛΟΓΗ]... MYFILE OLDFILE YOURFILE
Έγκυρο ορίσματα είναι: Γράφτηκε από %s και %s.
Γράφτηκε από τους %s, %s, %s,
%s, %s, %s, %s,
%s, %s, και άλλους.
Γράφτηκε από τους %s, %s, %s,
%s, %s, %s, %s,
%s, και %s.
Γράφτηκε από τους %s, %s, %s,
%s, %s, %s, %s,
και %s.
Γράφτηκε από τους %s, %s, %s,
%s, %s, %s, και %s.
Γράφτηκε από τους %s, %s, %s,
%s, %s, και %s.
Γράφτηκε από τους %s, %s, %s,
%s, και %s.
Γράφτηκε από τους %s, %s, %s,
και %s.
Γράφτηκε από %s, %s,και %s.
Γράφτηκε από %s.
« ασαφές όρισμα %s για %s ειδικό αρχείο μπλοκ και τα δύο προς σύγκριση αρχεία είναι κατάλογοι Αδύνατη η σύγκριση του «-» με ένα κατάλογο αδύνατη η σύγκριση των ονομάτων αρχείων «%s» και «%s» αδυνατώ να συγχωνεύσω αλληλεπιδραστικά την πρότυπη είσοδο. ειδικό αρχείο χαρακτήρων cmp: EOF στο %s μετά το byte %s
cmp: EOF στο %s μετά το byte %s, στη γραμμή %s
cmp: EOF στο %s μετά το byte %s, γραμμή %s
cmp: EOF στο %s που είναι κενό
η επιλογή %s είναι αντικρουόμενη με την τιμή «%s» αντικρουόμενες επιλογές για τη μορφή εξόδου αντικρουόμενες επιλογές μήκους στηλοθέτησης αντικρουόμενες επιλογές πλάτους συνεχόμενα δεδομένα κατάλογος door ed: Διόρθωση και μετά χρήση και των δύο παραλλαγών,
εκάστη διακοσμημένη με επικεφαλίδα.
eb: Διόρθωση και μετά χρήση και των δύο παραλλαγών.
el: Διόρθωση και μετά χρήση της αριστερής παραλλαγής.
er: Διόρθωση και μετά χρήση της δεξιάς παραλλαγής.
e: Διόρθωση νέας παραλλαγής.
l: Χρήση αριστερής παραλλαγής.
r: Χρήση δεξιάς παραλλαγής.
s: Συμπεριλαμβάνει τις ταυτόσημες γραμμές σιωπηρά.
v: Συμπεριλαμβάνει τις ταυτόσημες γραμμές και το επισημαίνει.
q: Έξοδος.
συμπληρωματικός τελεστέος «%s» αποτυχία ξανανοίγματος %s σε κατάσταση %s fifo ασύμβατες επιλογές Το αρχείο εισόδου συρρικνώθηκε εσωτερικό σφάλμα: μη έγκυρος τύπος diff στο process_diff εσωτερικό σφάλμα: μη έγκυρος τύπος diff πέρασε στην έξοδο εσωτερικό σφάλμα: μπέρδεμα στις μορφές των μπλοκ diff μη έγκυρο %s%s όρισμα «%s» άκυρη τιμή «%s» για την επιλογή --bytes άκυρη τιμή --ignore-initial «%s» μη έγκυρο όρισμα %s για %s μη έγκυρο χρώμα «%s» μη έγκυρο μήκος συμφραζομένων «%s» άκυρη μορφή diff· ασυμπλήρωτη τελευταία γραμμή άκυρη μορφή diff· λάθος χαρακτήρες στη γραμμή αποτελεσμάτων άκυρη μορφή diff· μη έγκυρος οριοθέτης αλλαγής μη έγκυρο μήκος ορίζοντα «%s» μη έγκυρη κατάληξη «%s» στο όρισμα %s%s μη έγκυρο μήκος στηλοθέτησης `%s' μη έγκυρο πλάτος «%s» η μνήμη εξαντλήθηκε ουρά μηνύματος migrated file with data migrated file without data απών τελεστέος μετά από «%s» ειδικό αρχείο μπλοκ ειδικό αρχείο χαρακτήρων multiplexed file named file ειδικό αρχείο δικτύου οι επιλογές -l και -s είναι ασύμβατες Η αρίθμιση σελίδων δεν υποστηρίζεται σ' αυτόν τον υπολογιστή θύρα σφάλμα προγράμματος αποτυχία ανάγνωσης τυπικό κενό αρχείο τυπικό αρχείο σηματοφορέας αντικείμενο κοινόχρηστης μνήμης socket υπερχείλιση στοίβας κανονική έξοδος stderr stdin stdout το υποπρόγραμμα «%s» δεν ήταν δυνατόν να κληθεί συμβολικός σύνδεσμος πάρα πολλές επιλογές ετικέττας αρχείου typed memory object άγνωστο ρεύμα unparsable τιμή για --palette άγνωστο πρόθεμα: %s αλλόκοτο αρχείο whiteout η εγγραφή απέτυχε usr/share/locale/hr/LC_MESSAGES/diffutils.mo 0000644 00000036024 15235302365 0014453 0 ustar 00
B
7 < 6 t 5 3 E ; [ G @ 0 4 e ( * # ( ' ; P 7 4 3 0 - 1 ^ F H ^ 6 7 ; 5 R @ = < @ D ? > < 3 A u ! ! F 0 = w & ? 1 S & $ 9 K f I p * : O # [ % ( N c u " 4 ; 3 \ / + ' # 8 X t ) ! ' )
7 N o 1 A \ # w ) $ " 7 J
[ i " %
! ! &! -! 2 Y2 M c2 2 2 2 " 2 # 3 )3 83 D3 U3 ! a3 3 3 3 3 3 & 3 4 4 $4 0 ?4 p4 4 4 4 , 4 > 4 ! )5 K5 6 ^5 . 5 * 5 & 5 " 6 96 X6 s6 6 6 6 ) 6 ) 6 5
7 , @7 m7 7 7 7
7 7 ) 7 )8 .8 D8 5 `8 ! 8 & 8 / 8 % 9 0 59 % f9 + 9 9 9 9
: : 0: - Q: : : : : : : :
:
; ; :; J; / [; ; ; ; ; ; ; 5 k
g Y f ] e W s r d E } * , y H q . B V # | 0 " 4 L 9 t i z / =
j b & { U - h u J 2 o w ~ a R I ` ! ' K S p N 8 @ 7 < 6 F + O m v \ ? ( c X $ ; _ C ) 1 > x T [ n % P A D M 3 Z l ^ Q G :
License GPLv3+: GNU GPL version 3 or later .
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Report bugs to: %s
--binary read and write data in binary mode --help display this help and exit --help display this help and exit --help display this help and exit --help display this help and exit --ignore-file-name-case ignore case when comparing file names --no-dereference don't follow symbolic links --no-ignore-file-name-case consider case when comparing file names --normal output a normal diff (the default) %s home page: <%s>
%s home page:
%s%s argument '%s' too large %s: diff failed: %s: invalid option -- '%c'
%s: option requires an argument -- '%c'
%s: recursive directory loop ' '-' specified for more than one input file (C) -D option not supported with directories -N, --new-file treat absent files as empty -a, --text treat all files as text -a, --text treat all files as text -a, --text treat all files as text -b, --print-bytes print differing bytes -e, --ed output an ed script -i, --ignore-initial=SKIP skip first SKIP bytes of both inputs -i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and
first SKIP2 bytes of FILE2 -l, --verbose output byte numbers and differing byte values -n, --bytes=LIMIT compare at most LIMIT bytes -n, --rcs output an RCS format diff -q, --brief report only when files differ -s, --quiet, --silent suppress all normal output -s, --report-identical-files report when two files are the same -t, --expand-tabs expand tabs to spaces in output -t, --expand-tabs expand tabs to spaces in output -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -y, --side-by-side output in two columns Binary files %s and %s differ
Common subdirectories: %s and %s
Compare FILES line by line. Compare three files line by line. Compare two files byte by byte. David Hayes David MacKenzie Exit status is 0 if inputs are the same, 1 if different, 2 if trouble. Exit status is 0 if successful, 1 if conflicts, 2 if trouble. File %s is a %s while file %s is a %s
Files %s and %s are identical
Files %s and %s differ
General help using GNU software:
If a FILE is '-' or missing, read standard input. If a FILE is '-', read standard input. Invalid back reference Invalid character class name Invalid collation character Invalid content of \{\} Invalid preceding regular expression Invalid range end Invalid regular expression Len Tower Mandatory arguments to long options are mandatory for short options too.
Memory exhausted Mike Haertel No match No newline at end of file No previous regular expression Only in %s: %s
Packaged by %s
Packaged by %s (%s)
Paul Eggert Premature end of regular expression Randy Smith Regular expression too big Report %s bugs to: %s
Richard Stallman Success Symbolic links %s and %s differ
Thomas Lord Torbjorn Granlund Trailing backslash Try '%s --help' for more information. Unknown system error Unmatched ( or \( Unmatched ) or \) Unmatched \{ Usage: %s [OPTION]... FILE1 FILE2
Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]
Usage: %s [OPTION]... FILES
Written by %s and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, %s, %s, and %s.
Written by %s, %s, %s,
%s, %s, and %s.
Written by %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
and %s.
Written by %s, %s, and %s.
Written by %s.
` block special file both files to be compared are directories cannot compare '-' to a directory cannot compare file names '%s' and '%s' cannot interactively merge standard input character special file conflicting output style options conflicting tabsize options conflicting width options directory extra operand '%s' failed to reopen %s with mode %s fifo incompatible options input file shrank internal error: invalid diff type in process_diff invalid %s%s argument '%s' invalid --bytes value '%s' invalid --ignore-initial value '%s' invalid context length '%s' invalid diff format; incomplete last line invalid horizon length '%s' invalid suffix in %s%s argument '%s' invalid tabsize '%s' invalid width '%s' memory exhausted message queue missing operand after '%s' options -l and -s are incompatible pagination not supported on this host program error read failed regular empty file regular file semaphore shared memory object socket stack overflow standard output stderr stdin stdout subsidiary program '%s' could not be invoked symbolic link too many file label options typed memory object unknown stream weird file write failed Project-Id-Version: GNU diffutils 3.3-pre1
Report-Msgid-Bugs-To: bug-diffutils@gnu.org
POT-Creation-Date: 2017-05-21 13:26-0700
PO-Revision-Date: 2012-12-21 00:37+0100
Last-Translator: Tomislav Krznar
Language-Team: Croatian
Language: hr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Bugs: Report translation errors to the Language-Team address.
Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);
X-Generator: Gtranslator 2.91.5
Licenca GPLv3+: GNU GPL inačica 3 ili novija .
Ovo je slobodan softver: slobodno ga smijete mijenjati i dijeliti.
NEMA JAMSTAVA, do krajnje mjere dozvoljene zakonom.
Prijavite greške na %s.
Prijavite greške prijevoda na .
--binary čitaj i piši podatke u binarnom načinu --help prikaži ovu pomoć i izađi --help prikaži ovu pomoć i izađi --help prikaži ovu pomoć i izađi --help prikaži ovu pomoć i izađi --ignore-file-name-case zanemari veličinu slova pri uspoređivanju imena datoteka --no-dereference ne slijedi simboličke veze --no-ignore-file-name-case ne zanemaruj veličinu slova pri uspoređivanju imena datoteka --normal ispiši normalnu razliku (zadano) %s početna stranica: <%s>
%s početna stranica:
%s%s argument „%s” je prevelik %s: diff nije uspio: %s: neispravna opcija -- „%c”
%s: opcija zahtijeva argument -- „%c”
%s: rekurzivna petlja direktorija ” „-” je navedeno za više od jedne ulazne datoteke © opcija -D nije podržana s direktorijima -N, --new-file postupaj s odsutnim datotekama kao s praznim -a, --text postupaj sa svim datotekama kao s tekstualnim -a, --text postupaj sa svim datotekama kao s tekstualnim -a, --text postupaj sa svim datotekama kao s tekstualnim -b, --print-bytes ispiši bajtove koji se razlikuju -e, --ed ispiši ed skriptu -i, --ignore-initial=BROJ preskoči prvih BROJ bajtova oba ulaza -i, --ignore-initial=BROJ1:BROJ2 preskoči prvih BROJ1 bajtova DATOTEKE1
i prvih BROJ2 bajtova DATOTEKE2 -l, --verbose ispiši brojeve i vrijednosti bajtova koji se razlikuju -n, --bytes=BROJ usporedi najviše BROJ bajtova -n, --rcs ispiši razliku u RCS obliku -q, --brief izvještaj samo kad se datoteke razlikuju -s, --quiet, --silent izostavi sav normalan izlaz -s, --report-identical-files izvještaj samo kad su datoteke jednake -t, --expand-tabs pretvori tabulatore u praznine u izlazu -t, --expand-tabs pretvori tabulatore u praznine u izlazu -v, --version ispiši informacije o inačici i izađi -v, --version ispiši informacije o inačici i izađi -v, --version ispiši informacije o inačici i izađi -v, --version ispiši informacije o inačici i izađi -y, --side-by-side ispiši u dva stupca Binarne datoteke %s i %s se razlikuju
Uobičajeni poddirektoriji: %s i %s
Usporedi DATOTEKE redak po redak. Usporedi tri datoteke redak po redak. Usporedi dvije datoteke bajt po bajt. David Hayes David MacKenzie Izlazno stanje je 0 ako su ulazi jednaki, 1 ako se razlikuju, 2 u slučaju greške. Izlazno stanje je 0 za uspjeh, 1 za neuspjeh, 2 u slučaju greške. Datoteka %s je %s, a datoteka %s je %s
Datoteke %s i %s su identične
Datoteke %s i %s se razlikuju
Općenita pomoć za korištenje GNU softvera:
Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz. Ako je DATOTEKA „-”, čitaj standardni ulaz. Neispravna povratna referenca Neispravno ime razreda znakova Neispravan znak razvrstavanja Neispravan sadržaj \{\} Neispravan prethodni regularni izraz Neispravan kraj raspona Neispravan regularni izraz Len Tower Obavezni argumenti dugačkih opcija također su obavezni i za kratke opcije.
Memorija iscrpljena Mike Haertel Nema poklapanja Nema novog retka na kraju datoteke Nedostaje prethodni regularni izraz Samo u %s: %s
Pakirao %s
Pakirao %s (%s)
Paul Eggert Preuranjen kraj regularnog izraza Randy Smith Regularni izraz je prevelik Prijavite %s greške na %s
Richard Stallman Uspjeh Simboličke veze %s i %s se razlikuju
Thomas Lord Torbjorn Granlund Obrnuta kosa crta na kraju Pokušajte „%s --help” za više informacija. Nepoznata greška sustava Neuparena ( ili \( Neuparena ) ili \) Neuparena \{ Uporaba: %s [OPCIJA]... DATOTEKA1 DATOTEKA2
Uporaba: %s [OPCIJA]... DATOTEKA1 [DATOTEKA2 [BROJ1 [BROJ2]]]
Uporaba: %s [OPCIJA]... DATOTEKE
Napisali %s i %s.
Napisali %s, %s, %s,
%s, %s, %s, %s,
%s, %s i ostali.
Napisali %s, %s, %s,
%s, %s, %s, %s,
%s i %s.
Napisali %s, %s, %s,
%s, %s, %s, %s
i %s.
Napisali %s, %s, %s,
%s, %s, %s i %s.
Napisali %s, %s, %s,
%s, %s i %s.
Napisali %s, %s, %s,
%s i %s.
Napisali %s, %s, %s
i %s.
Napisali %s, %s i %s.
Napisao %s.
„ posebna blokovska datoteka obje datoteke za usporedbu su direktoriji ne mogu usporediti „-” s direktorijem ne mogu usporediti imena datoteka „%s” i „%s” ne mogu interaktivno spojiti standardni ulaz posebna znakovna datoteka konfliktne opcije izlaznog stila konfliktne opcije širine konfliktne opcije širine direktorij operand viška „%s” nisam uspio ponovo otvoriti %s s modom %s fifo nekompatibilne opcije ulazna datoteka se smanjila interna greška: neispravna diff vrsta u process_diff neispravan %s%s argument „%s” neispravna --bytes vrijednost „%s” neispravna --ignore-initial vrijednost „%s” neispravna duljina sadržaja „%s” neispravan diff oblik, nepotpun posljednji redak neispravna duljina sadržaja „%s” neispravan sufiks u %s%s argumentu „%s” neispravna širina „%s” neispravna širina „%s” memorija iscrpljena red poruka nedostaje operand nakon „%s” opcije -l i -s nisu kompatibilne straničenje nije podržano na ovom računalu programska greška čitanje nije uspjelo obična prazna datoteka obična datoteka semafor dijeljeni memorijski objekt utičnica preljev stoga standardni izlaz standardni izlaz za greške standardni ulaz standardni izlaz podređeni program „%s” se ne može pozvati simbolička veza previše opcija oznaka datoteka tipizirani memorijski objekt nepoznat tok podataka čudna datoteka pisanje nije uspjelo usr/share/locale/gl/LC_MESSAGES/diffutils.mo 0000644 00000025273 15235330264 0014447 0 ustar 00 r < |
0
0
' 9 ( U ~ ( ( ! ! 4 V v F = &
>
]
? u
$ B T o y # > J e | ? G S e x " 4 . 3 b ; y 3 / + ' E # m ) ) F ] ~ n - N S h 1 z 2 0 ) 1 : - l
" %
/ < F [ b q
# ( 9 2 $ W ! i - ! 7 / - I w & $ ^ R _ : $ $ @ 7 # x & # $ ( 5 O m w ) (
! : % F l # x " ! ! ! ! * ! ! " !" ! 4" - V" " 3 " " 8 " 0 '# - X# ) # $ # # # $ .$ ?$ B$ 8 _$ 9 $ $ ( $ . % J%
j% u% 0 ' 5' :' R' 6 p' 7 ' / ' 5 ( H E( = ( ( ( & ( / ) H) Y) j) ) ) ) ) ) ) ) * * &* , :* g* * * * @ U _ ; C \ n H Z S [ P 8 / - f ^ 2 A " W l Y
. ) 3 ! ? X 1 > 9
$ k i * G 5 j m p + # ] r < I 7 a B N ` O 6 E T F D Q : & ' 4 c V = J L % e o , q h ( R g M d b 0 K
License GPLv3+: GNU GPL version 3 or later .
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Report bugs to: %s
%s %s differ: byte %s, line %s
%s %s differ: byte %s, line %s is %3o %s %3o %s
%s home page: <%s>
%s home page:
%s: diff failed: %s: invalid option -- '%c'
%s: option requires an argument -- '%c'
%s: recursive directory loop ' (C) --from-file and --to-file both specified -D option not supported with directories Binary files %s and %s differ
Common subdirectories: %s and %s
Compare three files line by line. Compare two files byte by byte. David Hayes David MacKenzie Exit status is 0 if inputs are the same, 1 if different, 2 if trouble. Exit status is 0 if successful, 1 if conflicts, 2 if trouble. File %s is a %s while file %s is a %s
Files %s and %s are identical
Files %s and %s differ
General help using GNU software:
Invalid back reference Invalid character class name Invalid collation character Invalid content of \{\} Invalid preceding regular expression Invalid range end Invalid regular expression Len Tower Memory exhausted Mike Haertel No match No newline at end of file No previous regular expression Only in %s: %s
Packaged by %s
Packaged by %s (%s)
Paul Eggert Premature end of regular expression Randy Smith Regular expression too big Report %s bugs to: %s
Richard Stallman SKIP values may be followed by the following multiplicative suffixes:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y. Success Thomas Lord Torbjorn Granlund Trailing backslash Unknown system error Unmatched ( or \( Unmatched ) or \) Unmatched \{ Usage: %s [OPTION]... FILE1 FILE2
Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]
Usage: %s [OPTION]... FILES
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
Written by %s and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, %s, %s, and %s.
Written by %s, %s, %s,
%s, %s, and %s.
Written by %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
and %s.
Written by %s, %s, and %s.
Written by %s.
` block special file both files to be compared are directories cannot interactively merge standard input character special file conflicting output style options conflicting tabsize options conflicting width options directory ed: Edit then use both versions, each decorated with a header.
eb: Edit then use both versions.
el or e1: Edit then use the left version.
er or e2: Edit then use the right version.
e: Discard both versions then edit a new one.
l or 1: Use the left version.
r or 2: Use the right version.
s: Silently include common lines.
v: Verbosely include common lines.
q: Quit.
failed to reopen %s with mode %s fifo incompatible options input file shrank internal error: invalid diff type in process_diff internal error: invalid diff type passed to output internal error: screwup in format of diff blocks invalid diff format; incomplete last line invalid diff format; incorrect leading line chars invalid diff format; invalid change separator memory exhausted message queue options -l and -s are incompatible pagination not supported on this host program error read failed regular empty file regular file semaphore shared memory object socket stack overflow standard output stderr stdin stdout symbolic link too many file label options typed memory object unknown stream weird file write failed Project-Id-Version: GNU diffutils 3.2
Report-Msgid-Bugs-To: bug-diffutils@gnu.org
POT-Creation-Date: 2017-05-21 13:26-0700
PO-Revision-Date: 2011-10-17 12:43+0100
Last-Translator: Leandro Regueiro
Language-Team: Galician
Language: gl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Bugs: Report translation errors to the Language-Team address.
Licenza GPLv3+: GNU GPL versión 3 ou posterior .
Isto é software libre: vostede é libre para modificalo e redistribuílo.
NON HAI GARANTÍA, ata o punto permitido pola lei.
Envíe os informes de erros a: %s
%s %s son diferentes: byte %s, liña %s
%s %s son diferentes: byte %s, liña %s é %3o %s %3o %s
%s páxina web: <%s>
%s páxina web:
%s: diff fallou: %s: opción incorrecta -- «%c»
%s: a opción require un argumento -- «%c»
%s: bucle de directorio recursivo » © Especificáronse --from-file e --to-file ao mesmo tempo A opción -D non está admitida con directorios Os ficheiros binarios %s e %s son diferentes
Subdirectorios comúns: %s e %s
Comparar tres ficheiros liña a liña. Comparar dous ficheiros byte a byte. David Hayes David MacKenzie O estado de saída é 0 se as entradas son iguais, 1 se son diferentes, 2 en caso de problema. O estado de saída é 0 se é correcto, 1 se hai conflitos, 2 en caso de problema. O ficheiro %s é un %s mentres que o ficheiro %s é un %s
Os ficheiros %s e %s son idénticos
Os ficheiros %s e %s son diferentes
Axuda xeral ao usar software GNU:
Referencia cara a atrás incorrecta Nome da clase de caracteres incorrecto Carácter de ordenamento incorrecto O contido entre \{\} non é correcto Expresión regular precedente incorrecta Final do rango incorrecto Expresión regular incorrecta Len Tower Memoria esgotada Mike Haertel Non hai coincidencias Non hai un salto de liña na fin da liña Non hai unha expresión regular anterior Só en %s: %s
Empaquetado por %s
Empaquetado por %s (%s)
Paul Eggert Final prematura da expresión regular Randy Smith Expresión regular demasiado grande Envíe %s informes de erros a: %s
Richard Stallman Os valores N poden estar seguidos polos seguintes sufixos multiplicativos:
kB 1000, K 1024, MB 1.000.000, M 1.048.576,
GB 1.000.000.000, G 1.073.741.824, e así para T, P, E, Z e Y. Correcto Thomas Lord Torbjorn Granlund Barra invertida ao final Produciuse un erro descoñecido do sistema ( ou \( non emparellado ) ou \) non emparellado \{ non emparellado Uso: %s [OPCIÓN]... FICH1 FICH2
Uso: %s [OPCIÓN]... FICH1 [FICH2 [N1 [N2]]]
Uso: %s [OPCIÓN]... FICHEIROS
Uso: %s [OPCIÓN]... MEU-FICH ANTIGO-FICH TEU-FICH
Escrito por %s e %s.
Escrito por %s, %s, %s
%s, %s, %s, %s,
%s, %s e outros.
Escrito por %s, %s, %s
%s, %s, %s, %s,
%s e %s.
Escrito por %s, %s, %s
%s, %s, %s, %s,
e %s.
Escrito por %s, %s, %s
%s, %s, %s, e %s.
Escrito por %s, %s, %s
%s, %s e %s.
Escrito por %s, %s, %s
%s e %s.
Escrito por %s, %s, %s
e %s.
Escrito por %s, %s e %s.
Escrito por %s.
« ficheiro especial de bloques ámbolos dous ficheiros a ser comparados son directorios non se pode mesturar a entrada estándar interactivamente ficheiro especial de caracteres opcións de estilo da saída conflitivas opcións de tamaño de tabulación conflitivas opcións de largura conflitivas directorio ed: Edita e usa ambas versións, cada unha decorada cunha cabeceira.
eb: Edita e usa ambas versións.
el ou e1: Edita e usa a versión esquerda.
er ou e2: Edita e usa a versión dereita.
e: Edita unha nova versión.
l ou 1: Usa a versión esquerda.
r ou 2: Usa a versión dereita.
s: Inclúe liñas comúns silenciosamente.
v: Inclúe liñas comúns de xeito detallado.
q: Saír.
produciuse un erro ao volver abrir %s en modo %s fifo opcións incompatíbeis o ficheiro de entrada minguou erro interno: tipo de diff non válido en process_diff erro interno_ tipo de diff non válido pasado á saída erro interno: fallo no formato dos bloques diff formato de diff non válido: última liña incompleta formato de diff non válido: caracteres a principio de liña incorrectos formato de diff non válido; separador de cambios non válido esgotouse a memoria cola de mensaxes as opcións -l e -s son incompatíbeis a paxinación non está admitida nesta máquina erro do programa fallou a lectura ficheiro regular baleiro ficheiro regular semáforo obxecto de memoria compartida socket desbordamento da pila saída estándar saída estándar de erro entrada estándar saída estándar ligazón simbólica demasiadas opcións de etiquetas de ficheiro obxecto de memoria con tipo fluxo descoñecido ficheiro estraño fallou a escritura usr/share/locale/fr/LC_MESSAGES/diffutils.mo 0000644 00000110603 15237253070 0014445 0 ustar 00 t g h i 4 h I C B B 9 | 9 8 6 y o 7 6 ! 5 X 3 G E
| P I @ ; X G @ L G D K C M 8 " K [ M y A o! ! p" $ F $ i % {% 0 % % 0 % & .& @& , \& & . & ' & ( ' )' F' f' * h' ' ( ' P ' D ( H V( E ( ( ( K ) C Z) @ ) : ) C * M ^* G * G * ~ <+ ; + J + C B, A , 3 , L , : I- L - > - ; . 7 L. 4 . 3 . K . H 9/ 0 / L / F 0 B G0 1 0 0 E D1 H 1 J 1 F 2 e2 H 2 E 53 H {3 3 6 I4 7 4 J 4 E 5 ; I5 L 5 5 5 @ 6 7 I6 = 6 < 6 M 6 @ J7 ? 7 > 7 <
8 6 G8 K ~8 < 8 M 9 3 U9 9 ! 9 9 ! 9 : (: 4: F D: = : C : &
; 4; S; ? k; K ; 1 ; & )< P< g< < < $ < < <
= I = ^= o= |= = = = = = = # = #> /> J> a> r> : $? _? g? q ? ? @ @ % +@ Q@ f@ x@ @ @ " @ 4 @ A . +A ZA oA ; A 3 A / A + &B ' RB # zB B B B B B C ) C ! FC ' hC ) C C C ) C & D @D _D D D D D D D n D eF xF F F F 1 F 2 F 0 *G [G vG # G G G G ) G 1 )H - [H H $ H H H H
I I )I DI _I " ~I I
I I " I % I J
J .J :J MJ ZJ dJ yJ J J J J J , J
J J
K K -K LK
dK oK xK K `M JN gN L P J fP E P P M Q U Q ER < R = S ; QS 8 S T S Z T vT `
U K nU C U c U U bV V b gW K W J X K aX \ X C
Y ` NY ` Y Z O Z Z l [ ?^ O_ m _ + ?` 7 k` ` 7 ` $ ` a ( :a 3 ca ' a A a / b 0 1b ) bb - b b 1 b b 7 b _ -c ^ c Y c Y Fd * d u d Y Ae Y e K e S Af f f f g h S h T i P qi P i < j a Pj I j j W k W k H 8l G l H l N m F am > m Y m Z An V n A n 5o _ p \ dp ? p H q o Jq [ q P r l gr r : `s M s J s U 4t K t T t 7 +u K cu B u O u N Bv ^ v R v S Cw S w N w = :x a xx Y x K 4y 9 y 0 y / y & z ( Bz ' kz z z o z Y { o y{ : { & $| ' K| S s| W | E } A e} $ } 0 } * } (~ 2 H~ {~ % ~ ~ a ~ . A N ( a 1 , 6 " B X e π 4 ́ 0 Ձ 5 ɂ 1 # I m ( : . 3 P 7 f / , ΄ ( $ $ I j ҅ 3 . = L 4 3 ܆ = = N . / ) . ! D f z $ u + Ɗ ӊ ?
@ J > * ʋ ( 1 P p ( > O E D & 7 ( . A S t % , 2 / > # W 3 { ȏ ݏ
- < Q a h n 6 u ) , 5 N ^ p j
q ^ I u
B l y 6 , K * A ' c J ) Q i P w T 4 1 3 = 0 [ M > x k ; { t O | L G /
f F ` H \ $ . % n C 5 2 7 & S 8 < ? z U - v ] o 9 r : D ( @ } Z ! e V s " a h d R N E X _ m Y + g b p # ~ W
License GPLv3+: GNU GPL version 3 or later .
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Report bugs to: %s
The default output format is a somewhat human-readable representation of
the changes.
The -e, -E, -x, -X (and corresponding long) options cause an ed script
to be output instead of the default.
Finally, the -m (--merge) option causes diff3 to do the merge internally
and output the actual merged file. For unusual input, this is more
robust than using ed.
--GTYPE-group-format=GFMT format GTYPE input groups with GFMT --LTYPE-line-format=LFMT format LTYPE input lines with LFMT --binary read and write data in binary mode --color[=WHEN] colorize the output; WHEN can be 'never', 'always',
or 'auto' (the default) --diff-program=PROGRAM use PROGRAM to compare files --diff-program=PROGRAM use PROGRAM to compare files --from-file=FILE1 compare FILE1 to all operands;
FILE1 can be a directory --help display this help and exit --help display this help and exit --help display this help and exit --help display this help and exit --horizon-lines=NUM keep NUM lines of the common prefix and suffix --ignore-file-name-case ignore case when comparing file names --label LABEL use LABEL instead of file name and timestamp
(can be repeated) --left-column output only the left column of common lines --line-format=LFMT format all input lines with LFMT --no-dereference don't follow symbolic links --no-ignore-file-name-case consider case when comparing file names --normal output a normal diff (the default) --palette=PALETTE the colors to use when --color is active; PALETTE is
a colon-separated list of terminfo capabilities --speed-large-files assume large files and many scattered small changes --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --suppress-blank-empty suppress space or tab before empty output lines --suppress-common-lines do not output common lines --tabsize=NUM tab stops every NUM (default 8) print columns --tabsize=NUM tab stops at every NUM (default 8) print columns --to-file=FILE2 compare all operands to FILE2;
FILE2 can be a directory --unidirectional-new-file treat absent first files as empty Both GFMT and LFMT may contain:
%% %
%c'C' the single character C
%c'\OOO' the character with octal code OOO
C the character C (other characters represent themselves) GFMT (only) may contain:
%< lines from FILE1
%> lines from FILE2
%= lines common to FILE1 and FILE2
%[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER
LETTERs are as follows for new group, lower case for old group:
F first line number
L last line number
N number of lines = L-F+1
E F-1
M L+1
%(A=B?T:E) if A equals B then T else E LFMT (only) may contain:
%L contents of line
%l contents of line, excluding any trailing newline
%[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'. These format options provide fine-grained control over the output
of diff, generalizing -D/--ifdef. %s %s differ: byte %s, line %s
%s %s differ: byte %s, line %s is %3o %s %3o %s
%s home page: <%s>
%s home page:
%s%s argument '%s' too large %s: diff failed: %s: invalid option -- '%c'
%s: option '%s%s' doesn't allow an argument
%s: option '%s%s' is ambiguous
%s: option '%s%s' is ambiguous; possibilities: %s: option '%s%s' requires an argument
%s: option requires an argument -- '%c'
%s: recursive directory loop %s: unrecognized option '%s%s'
' '-' specified for more than one input file (C) --from-file and --to-file both specified -3, --easy-only like -e, but incorporate only nonoverlapping changes -A, --show-all output all changes, bracketing conflicts -B, --ignore-blank-lines ignore changes where lines are all blank -B, --ignore-blank-lines ignore changes whose lines are all blank -D option not supported with directories -D, --ifdef=NAME output merged file with '#ifdef NAME' diffs -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --show-overlap like -e, but bracket conflicts -F, --show-function-line=RE show the most recent line matching RE -H, --speed-large-files assume large files, many scattered small changes -I, --ignore-matching-lines=RE ignore changes all whose lines match RE -I, --ignore-matching-lines=RE ignore changes where all lines match RE -L, --label=LABEL use LABEL instead of file name
(can be repeated up to three times) -N, --new-file treat absent files as empty -S, --starting-file=FILE start with FILE when comparing directories -T, --initial-tab make tabs line up by prepending a tab -T, --initial-tab make tabs line up by prepending a tab -W, --ignore-all-space ignore all white space -W, --width=NUM output at most NUM (default 130) print columns -X like -x, but bracket conflicts -X, --exclude-from=FILE exclude files that match any pattern in FILE -Z, --ignore-trailing-space ignore white space at line end -Z, --ignore-trailing-space ignore white space at line end -a, --text treat all files as text -a, --text treat all files as text -a, --text treat all files as text -b, --ignore-space-change ignore changes in the amount of white space -b, --ignore-space-change ignore changes in the amount of white space -b, --print-bytes print differing bytes -c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context -d, --minimal try hard to find a smaller set of changes -d, --minimal try hard to find a smaller set of changes -e, --ed output an ed script -e, --ed output ed script incorporating changes
from OLDFILE to YOURFILE into MYFILE -i append 'w' and 'q' commands to ed scripts -i, --ignore-case ignore case differences in file contents -i, --ignore-case consider upper- and lower-case to be the same -i, --ignore-initial=SKIP skip first SKIP bytes of both inputs -i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and
first SKIP2 bytes of FILE2 -l, --left-column output only the left column of common lines -l, --paginate pass output through 'pr' to paginate it -l, --verbose output byte numbers and differing byte values -m, --merge output actual merged file, according to
-A if no other options are given -n, --bytes=LIMIT compare at most LIMIT bytes -n, --rcs output an RCS format diff -o, --output=FILE operate interactively, sending output to FILE -p, --show-c-function show which C function each change is in -q, --brief report only when files differ -r, --recursive recursively compare any subdirectories found -s, --quiet, --silent suppress all normal output -s, --report-identical-files report when two files are the same -s, --suppress-common-lines do not output common lines -t, --expand-tabs expand tabs to spaces in output -t, --expand-tabs expand tabs to spaces in output -u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -w, --ignore-all-space ignore all white space -w, --width=NUM output at most NUM (default 130) print columns -x, --exclude=PAT exclude files that match PAT -x, --overlap-only like -e, but incorporate only overlapping changes -y, --side-by-side output in two columns Binary files %s and %s differ
Common subdirectories: %s and %s
Compare FILES line by line. Compare three files line by line. Compare two files byte by byte. David Hayes David MacKenzie Exit status is 0 if inputs are the same, 1 if different, 2 if trouble. Exit status is 0 if successful, 1 if conflicts, 2 if trouble. FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'. File %s is a %s while file %s is a %s
Files %s and %s are identical
Files %s and %s differ
General help using GNU software:
If --from-file or --to-file is given, there are no restrictions on FILE(s). If a FILE is '-' or missing, read standard input. If a FILE is '-', read standard input. Invalid back reference Invalid character class name Invalid collation character Invalid content of \{\} Invalid preceding regular expression Invalid range end Invalid regular expression Len Tower Mandatory arguments to long options are mandatory for short options too.
Memory exhausted Mike Haertel No match No newline at end of file No previous regular expression Only in %s: %s
Packaged by %s
Packaged by %s (%s)
Paul Eggert Premature end of regular expression Randy Smith Regular expression too big Report %s bugs to: %s
Richard Stallman SKIP values may be followed by the following multiplicative suffixes:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y. Side-by-side merge of differences between FILE1 and FILE2. Success Symbolic links %s and %s differ
The optional SKIP1 and SKIP2 specify the number of bytes to skip
at the beginning of each file (zero by default). Thomas Lord Torbjorn Granlund Trailing backslash Try '%s --help' for more information. Unknown system error Unmatched ( or \( Unmatched ) or \) Unmatched [, [^, [:, [., or [= Unmatched \{ Usage: %s [OPTION]... FILE1 FILE2
Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]
Usage: %s [OPTION]... FILES
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
Valid arguments are: Written by %s and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, %s, %s, and %s.
Written by %s, %s, %s,
%s, %s, and %s.
Written by %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
and %s.
Written by %s, %s, and %s.
Written by %s.
` ambiguous argument %s for %s block special file both files to be compared are directories cannot compare '-' to a directory cannot compare file names '%s' and '%s' cannot interactively merge standard input character special file cmp: EOF on %s after byte %s
cmp: EOF on %s after byte %s, in line %s
cmp: EOF on %s after byte %s, line %s
cmp: EOF on %s which is empty
conflicting %s option value '%s' conflicting output style options conflicting tabsize options conflicting width options contiguous data directory door ed: Edit then use both versions, each decorated with a header.
eb: Edit then use both versions.
el or e1: Edit then use the left version.
er or e2: Edit then use the right version.
e: Discard both versions then edit a new one.
l or 1: Use the left version.
r or 2: Use the right version.
s: Silently include common lines.
v: Verbosely include common lines.
q: Quit.
extra operand '%s' failed to reopen %s with mode %s fifo incompatible options input file shrank internal error: invalid diff type in process_diff internal error: invalid diff type passed to output internal error: screwup in format of diff blocks invalid %s%s argument '%s' invalid --bytes value '%s' invalid --ignore-initial value '%s' invalid argument %s for %s invalid color '%s' invalid context length '%s' invalid diff format; incomplete last line invalid diff format; incorrect leading line chars invalid diff format; invalid change separator invalid horizon length '%s' invalid suffix in %s%s argument '%s' invalid tabsize '%s' invalid width '%s' memory exhausted message queue migrated file with data migrated file without data missing operand after '%s' multiplexed block special file multiplexed character special file multiplexed file named file network special file options -l and -s are incompatible pagination not supported on this host port program error read failed regular empty file regular file semaphore shared memory object socket stack overflow standard output stderr stdin stdout subsidiary program '%s' could not be invoked symbolic link too many file label options typed memory object unknown stream unparsable value for --palette unrecognized prefix: %s weird file whiteout write failed Project-Id-Version: GNU diffutils 3.5.25
Report-Msgid-Bugs-To: bug-diffutils@gnu.org
POT-Creation-Date: 2017-05-21 13:26-0700
PO-Revision-Date: 2017-05-11 17:26+0200
Last-Translator: Frédéric Marchal
Language-Team: French
Language: fr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8-bit
X-Bugs: Report translation errors to the Language-Team address.
Plural-Forms: nplurals=2; plural=(n > 1);
Licence GPLv3+: GNU GPL version 3 ou ultérieure .
Ceci est un logiciel libre: vous êtes libre de le changer et de le redistribuer.
Il n'y a PAS de GARANTIE, dans les limites permises par la loi.
Signalez les bogues à: %s
Le format de sortie par défaut est une représentation plus ou moins lisible
par un humain des changements.
Les options -e, -E, -x, -X (et les options longues correspondantes) provoquent
l'écriture d'un script ed au lieu de la sortie par défaut.
Finalement, l'option -m (--merge) demande à diff3 de fusionner en interne
et de sortir le fichier fusionné. Pour des entrées inhabituelles, c'est plus
robuste que d'utiliser ed.
--GTYPE-group-format=GFMT Formater les groupes d'entrée GTYPE avec GFMT --LTYPE-line-format=LFMT Formater les lignes d'entrée LTYPE avec LFMT --binary Lire et écrire les données en binaire --color[=QUAND] coloriser la sortie; QUAND peut être « never » (jamais),
« always » (toujours) ou « auto » (par défaut) --diff-program=PROG Utiliser le PROGramme pour comparer les fichiers --diff-program=PROG Utiliser le PROGramme pour comparer les fichiers --from-file=FICHIER1 Comparer le FICHIER1 à toutes les opérandes.
FICHIER1 peut être un répertoire --help Afficher cette aide et terminer --help Afficher cette aide et terminer --help Afficher cette aide et terminer --help afficher cette aide et terminer --horizon-lines=N retenir N lignes ayant des préfixes et suffixes identiques --ignore-file-name-case Ignorer la casse lors de la comparaison des noms de fichiers --label ÉTIQUETTE utiliser ÉTIQUETTE au lieu du nom de fichier et de l'horodatage
(peut être répété) --left-column Afficher les lignes identiques uniquement dans la colonne de gauche --line-format=LFMT Formater toutes les lignes d'entrée avec LFMT --no-dereference Ne pas suivre les liens symboliques --no-ignore-file-name-case Tenir compte de la casse lors de la comparaison des noms de fichiers --normal Produire un « diff » en format normal (par défaut) --palette=PALETTE les couleurs à utiliser quand --color est actif; PALETTE
est une liste de capacités terminfo séparées par des virgules --speed-large-files suppose de grands fichiers et de nombreux petits changements éparpillés --strip-trailing-cr Éliminer les retours de chariot de l'entrée --strip-trailing-cr Éliminer les retours de chariot de l'entrée --strip-trailing-cr Éliminer les retours de chariot de l'entrée --suppress-blank-empty Supprimer les espaces et les tabulations avant les lignes vides --suppress-common-lines Ne pas afficher les lignes identiques --tabsize=N Les balises de tabulation sont à chaque N (8 par défaut) colonnes --tabsize=N Les balises de tabulation sont à chaque N (8 par défaut) colonnes --to-file=FICHIER2 Comparer toutes les opérandes à FICHIER2.
FICHIER2 peut être un répertoire --unidirectional-new-file Traiter les premiers fichiers absents comme vides GFMT et LFMT peuvent contenir :
%% %
%c«C» le caractère «C» lui-même
%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) GFMT (uniquement) peut contenir :
%< pour marquer les lignes du FICHIER1
%> pour marquer les lignes du FICHIER2
%= pour marquer les lignes identiques entre FICHIER1 et FICHIER2
%[-][LARGEUR][.[PREC]]{doxX}LETTRE la spécification de LETTRE
est identique à la notation de printf()
dont les codes possibles de LETTRE sont
en majuscule pour le nouveau groupe,
en minuscules pour l'ancien groupe:
F numéro de la première ligne
L numéro de la dernière ligne
N nombre de lignes = L-F+1
E F-1
M L+1 %(A=B?T:E) si A égal B alors T sinon E LFMT (uniquement) peut contenir :
%L pour le contenu de la ligne
%l pour le contenu de la ligne sans fin de ligne
%[-][LARGEUR][.[PREC]]{doxX}n la spécification du numéro de ligne
d'entrée selon le format de printf LTYPE peut être soit « old », « new », ou « unchanged ». GTYPE prend une des valeurs de LTYPE ou « changed ». Ces options de formatage fournissent un contrôle fin sur la sortie
de diff et généralise -D/--ifdef. %s %s sont différents: octet %s, ligne %s
%s %s diffèrent: octet %s, ligne %s est %3o %s %3o %s
site internet de %s: <%s>
site internet de %s:
%s%s: argument « %s » trop grand %s: échec de « diff » : %s: l'option -- « %c » est invalide
%s: l'option « %s%s » n'accepte aucun argument
%s: l'option « %s%s » est ambiguë
%s: l'option « %s%s » est ambiguë ; les possibilités sont : %s: l'option « %s%s » requiert un argument
%s: l'option -- « %c » requiert un argument
%s: boucle récursive dans le répertoire %s: l'option « %s%s » n'est pas reconnue
» « - » fourni pour plus d'un fichier d'entrée (C) --from-file et --to-file ont été spécifiés ensemble -3, --easy-only Comme -e mais n'inclut que les changements qui ne se recoupent pas -A, --show-all Afficher toutes les différences avec les conflits entre crochets -B, --ignore-blank-lines Ignorer les changements dont toutes les lignes sont blanches -B, --ignore-blank-lines Ignorer les changements dont toutes les lignes sont blanches L'option -D ne traite pas les répertoires -D, --ifdef=NOM Afficher les fichiers fusionnés en marquant les différences par des « #ifdef NOM » -E, --ignore-tab-expansion Ignorer les changements liés à l'expansion des tabulations -E, --ignore-tab-expansion Ignorer les changements liés à l'expansion des tabulations -E, --show-overlap Comme -e mais les conflits sont entre crochets -F, --show-function-line=RE Montrer la ligne la plus récente correspondant à RE -H, --speed-large-files Suppose de grands fichiers et de nombreux petits changements éparpillés -I, --ignore-matching-lines=RE Ignorer les différences dont toutes les
lignes concordent avec l'expression régulière RE -I, --ignore-matching-lines=RE Ignorer les différences dont toutes les
lignes concordent avec l'expression régulière RE -L, --label=ÉTIQUETTE Utiliser l'ÉTIQUETTE au lieu du nom de fichier
(peut être répété jusqu'à trois fois) -N, --new-file Traiter les fichiers absents comme des fichiers vides -S, --starting-file=FICHIER Débuter la comparaison des répertoires par le FICHIER -T, --initial-tab Aligner les tabulateurs en préfixant un tabulateur -T, --initial-tab Aligner les tabulateurs en préfixant un tabulateur -W, --ignore-all-space Ignorer tout blanc d'espacement -w, --width=N Limiter la sortie à au plus N colonnes imprimées (130 par défaut) -X Comme -x mais le conflits sont entre crochets -X, --exclude-from=FICHIER Exclure les fichiers dont les noms
concordent avec ceux contenus dans le FICHIER -Z, --ignore-trailing-space Ignorer les blancs d'espacement à la fin de la ligne -Z, --ignore-trailing-space Ignorer les blancs d'espacement à la fin de la ligne -a, --text Traiter tous les fichiers comme des textes -a, --text Traiter tous les fichiers comme des textes -a, --text Traiter tous les fichiers comme des textes -b, --ignore-space-change Ignorer les changements dans le nombre d'espaces -b, --ignore-space-change Ignorer les changements dans l'espacement -b, --print-bytes Afficher les octets qui diffèrent -c, -C N, --context[=N] Afficher N (3 par défaut) lignes du contexte copié -d, --minimal Rechercher assidûment le plus petit ensemble de différences -d, --minimal rechercher assidûment le plus petit ensemble de différences -e, --ed Générer un script pour « ed » -e, --ed Écrire un script ed incorporant les changements
du fichier ORIGINAL vers le fichier MODIFIÉ
vers le fichier de SORTIE -i Ajouter les commandes « w » et « q » au script « ed » -i, --ignore-case Ignorer les différences de casses dans le contenu des fichiers -i, --ignore-case Banaliser majuscules et minuscules -i, --ignore-initial=N Escamoter les N premiers octets des entrées -i, --ignore-initial=N1:N2 Escamoter les N1 premiers octets de FICHIER1 et les N2 premiers octets de FICHIER2. -l, --left-column Afficher uniquement la colonne de gauche des lignes identiques -l, --paginate Relayer la sortie à « pr » afin de la paginer -l, --verbose Afficher les numéros d'octets et les valeurs de tous les octets qui diffèrent. -m, --merge Écrire le fichier fusionné selon -A si aucune autre
option n'est spécifiée -n, --bytes=LIMITE Comparer au plus LIMITE octets -n, --rcs Générer un fichier « diff » au format RCS -o, --output=FICHIER Agir interactivement, avec sortie sur FICHIER -p, --show-c-function Afficher dans quelle fonction C le changement se trouve -q, --brief Indiquer seulement si les fichiers diffèrent -r, --recursive Comparer récursivement les sous-répertoires trouvés -s, --quiet, --silent Supprimer la sortie normale -s, --report-identical-files Indiquer si les deux fichiers sont identiques -s, --suppress-common-lines Ne pas afficher les lignes identiques -t, --expand-tabs Étaler les tabulateurs en espaces dans la sortie -t, --expand-tabs Étaler les tabulateurs en espaces dans la sortie -u, -U N, --unified[=N] Afficher N (3 par défaut) lignes dans le context unifié -v, --version Afficher le nom et la version du logiciel et terminer -v, --version Afficher le nom et la version du logiciel et terminer -v, --version Afficher le nom et la version du logiciel puis terminer -v, --version afficher le nom et la version du logiciel et terminer -w, --ignore-all-space Ignorer tout blanc d'espacement -w, --width=N Limiter la sortie à au plus N colonnes imprimées (130 par défaut) -x, --exclude=PAT Exclure les fichiers dont les noms concordent avec le PATron -x, --overlap-only Comme -e mais inclut les changements qui se recoupent -y, --side-by-side Affichage sur deux colonnes Les fichiers binaires %s et %s sont différents
Les sous-répertoires %s et %s sont identiques
Comparer les fichiers ligne par ligne. Comparer trois fichiers ligne par ligne. Comparer deux fichiers octet par octet. David Hayes David MacKenzie Le statut de fin d'exécution est 0 si les entrées sont les mêmes, 1 si différentes et 2 si problématiques. Le statut de fin d'exécution est 0 si réussite, 1 si en conflit et 2 si problématique. FICHIERS sont « FICHIER1 FICHIER2 » ou « RÉP1 RÉP2 » ou « RÉP FICHIER » ou « FICHIER RÉP ». Le fichier %s est un %s alors que le fichier %s est un %s
Les fichiers %s et %s sont identiques
Les fichiers %s et %s sont différents
Aide générale sur l'utilisation des logiciels GNU:
Si --from-file ou --to-file sont fournis, il n'y a pas de restriction sur les FICHIERS. Si un FICHIER est « - » ou manquant, lire sur l'entrée standard. Si un FICHIER est « - » alors lire depuis l'entrée standard. La référence arrière est invalide Le nom d'un ensemble de caractères est invalide Le caractère de regroupement est invalide Le contenu de \{\} est invalide L'expression régulière précédente est invalide La fin d'intervalle est invalide L'expression régulière est invalide Len Tower Les paramètres requis pour les options longues sont également requis pour les options courtes.
Mémoire épuisée Mike Haertel Pas de concordance Pas de fin de ligne à la fin du fichier N'est pas précédé d'une expression régulière Seulement dans %s: %s
Empaqueté par %s
Empaqueté par %s(%s)
Paul Eggert Fin prématurée de l'expression régulière Randy Smith Expression régulière trop grande Signalez les bogues de %s à: %s
Signalez les bogues de traduction à traduc@traduc.org
Richard Stallman valeurs de SAUT peuvent être suivies par un des suffixes multiplicateurs suivants:
kB 1000, K 1024, MB 1.000.000, M 1.048.576,
GB 1.000.000.000, G 1.073.741.824, et ainsi de suite pour T, P, E, Z, Y. Fusion côte à côte des différences des fichiers. Succès Les liens symboliques %s et %s sont différents
Les paramètres optionnels SAUT1 et SAUT2 indiquent le nombre d'octets à escamoter
au début de chaque fichier (zéro par défaut). Thomas Lord Torbjorn Granlund Barre oblique inverse à la fin Utilisez « %s --help » pour en savoir d'avantage. Erreur système inconnue ( ou \( sans vis-à-vis ) or \) sans vis-à-vis [, [^, [:, [. ou [= sans vis-à-vis \{ sans vis-à-vis Usage: %s [OPTION]... FICHIER1 FICHIER2
Usage: %s [OPTION]... FICHIER1 [FICHIER2 [SAUT1 [SAUT2]]]
Usage: %s [OPTION]... FICHIERS
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
Les arguments valables sont: Écrit par %s et %s.
Écrit par %s, %s, %s
%s, %s, %s, %s
%s, %s et autres.
Écrit par %s, %s, %s
%s, %s, %s, %s
%s et %s.
Écrit par %s, %s, %s
%s, %s, %s, %s
et %s.
Écrit par %s, %s, %s
%s, %s, %s et %s.
Écrit par %s, %s, %s
%s, %s et %s.
Écrit par %s, %s, %s
%s et %s.
Écrit par %s, %s, %s
et %s.
Écrit par %s, %s et %s.
Écrit par %s.
« argument %s ambigu pour %s fichier spécial-blocs les deux fichiers à comparer sont des répertoires ne peut comparer « - » avec un répertoire ne peut comparer les noms de fichier « %s » et « %s » ne peut fusionner l'entrée standard interactivement fichier spécial-caractères cmp: Fin-de-fichier (EOF) sur %s après l'octet %s
cmp: Fin-de-fichier (EOF) sur %s après l'octet %s, ligne %s
cmp: Fin-de-fichier (EOF) sur %s après l'octet %s, ligne %s
cmp: Fin-de-fichier (EOF) sur %s qui est vide
valeur conflictuelle de l'option %s: « %s » options de style de sortie conflictuelles options conflictuelles de taille de tabulation options de largeur conflictuelles données contigües répertoire porte ed: Éditer puis utiliser les deux versions, chacune chapeautée d'une en-tête.
eb: Éditer puis utiliser les deux versions.
el ou e1: Éditer puis utiliser la version de gauche.
er ou e2: Éditer puis utiliser la version de droite.
e: Abandonne les deux version puis éditer une nouvelle version.
l ou 1: Utiliser la version de gauche.
r ou 2: Utiliser la version de droite.
s: Inclure les lignes identiques silencieusement.
v: Inclure les lignes identiques et le signaler.
q: Quitter.
opérande supplémentaire « %s » impossible de ré-ouvrir %s avec le mode %s « fifo » options incompatibles le fichier d'entrée a rétréci erreur interne: type de « diff » invalide dans process_diff erreur interne : type de « diff » invalide fourni en sortie erreur interne: mélange dans le format des blocs « diff » argument pour %s%s pas valable: « %s » valeur invalide pour --bytes: « %s » valeur invalide pour --ignore-initial: « %s » argument %s pas valable pour %s couleur « %s » invalide longueur du contexte invalide « %s » format de « diff » invalide ; dernière ligne incomplète format de « diff » invalide ; caractères incorrects au début de la ligne format de « diff » invalide ; séparateur de changement invalide longueur d'horizon invalide « %s » suffixe par valable dans l'argument de %s%s: « %s » taille de tabulation invalide « %s » largeur invalide « %s » mémoire épuisée queue de messages fichier migré avec les données fichier migré sans les données opérande manquante après « %s » fichier spécial avec des blocs multiplexés fichier spécial avec des caractères multiplexés fichier multiplexé fichier nommé fichier spécial réseau options -l et -s sont incompatibles La pagination n'est pas supporté sur cette machine port erreur du programme lecture non-réussie fichier régulier vide fichier régulier sémaphore objet en mémoire partagée « socket » débordement de pile sortie standard stderr stdin stdout programme subsidiaire « %s » n'a pu être invoqué lien symbolique Trop de noms de fichiers dans les options objet mémoire typé flux inconnu valeur impossible à analyser pour --palette préfixe non reconnu: %s fichier bizarre voilé (whiteout) échec d'écriture usr/share/locale/ga/LC_MESSAGES/diffutils.mo 0000644 00000017101 15237420325 0014423 0 ustar 00 U q l 0 1 0 Q ( ( ! ! * F J = & - D a } $
:
# J
n
; C U h } " 4 . # R ; i 3 / +
' 5
# ]
)
)
4 K l 1 2
0 = ) n 1 -
" % :
` n z
( 5 " 2 5 - I ' w ( , . D $ @ i , ( ( ) @ ^ ~ / ! & % H n * e j | % ? 3 5 Q B , ( $ 0 U v $ 1 @ ) a 0
$ D ; G 9 2 A 5 ? w ( ? C R a u & - J 2 =
P % + 3 U C > < ? & L - , K ; / A H 7 R @ T . * 8 E B I 1 O 5 ' ! 0 # S G ( " Q F
: D 4 9 6 M ) $ N %s %s differ: byte %s, line %s
%s %s differ: byte %s, line %s is %3o %s %3o %s
%s: diff failed: --from-file and --to-file both specified -D option not supported with directories Common subdirectories: %s and %s
Compare three files line by line. Compare two files byte by byte. Exit status is 0 if inputs are the same, 1 if different, 2 if trouble. Exit status is 0 if successful, 1 if conflicts, 2 if trouble. File %s is a %s while file %s is a %s
Files %s and %s are identical
Files %s and %s differ
Invalid back reference Invalid character class name Invalid collation character Invalid content of \{\} Invalid preceding regular expression Invalid range end Invalid regular expression Memory exhausted No match No newline at end of file No previous regular expression Only in %s: %s
Premature end of regular expression Regular expression too big SKIP values may be followed by the following multiplicative suffixes:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y. Success Torbjorn Granlund Trailing backslash Unknown system error Unmatched ( or \( Unmatched ) or \) Unmatched \{ Usage: %s [OPTION]... FILE1 FILE2
Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]
Usage: %s [OPTION]... FILES
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
Written by %s and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, %s, %s, and %s.
Written by %s, %s, %s,
%s, %s, and %s.
Written by %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
and %s.
Written by %s, %s, and %s.
Written by %s.
block special file both files to be compared are directories cannot interactively merge standard input character special file conflicting output style options conflicting tabsize options conflicting width options directory fifo incompatible options input file shrank internal error: invalid diff type in process_diff internal error: invalid diff type passed to output internal error: screwup in format of diff blocks invalid diff format; incomplete last line invalid diff format; incorrect leading line chars invalid diff format; invalid change separator memory exhausted message queue options -l and -s are incompatible pagination not supported on this host program error read failed regular empty file regular file semaphore shared memory object socket stack overflow standard output symbolic link too many file label options typed memory object weird file write failed Project-Id-Version: diffutils 2.8.7
Report-Msgid-Bugs-To: bug-diffutils@gnu.org
POT-Creation-Date: 2017-05-21 13:26-0700
PO-Revision-Date: 2004-12-03 13:47-0500
Last-Translator: Kevin Patrick Scannell
Language-Team: Irish
Language: ga
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
X-Bugs: Report translation errors to the Language-Team address.
%s %s difriil: beart %s, lne %s
%s %s difriil: beart %s, lne %s = %3o %s %3o %s
%s: theip ar diff: tugadh --from-file agus --to-file lena chile Nl an rogha -D ar fil do chomhadlanna Fochomhadlanna i gcoitianta: %s agus %s
Cuir tr chomhad i gcomparid, lne ar lne. Cuir dh chomhad i gcomparid, beart le beart. Stdas scortha: 0 ms ionann iad, 1 ms difriil, 2 m t fadhb ann. Stdas scortha = 0 (rathil), 1 (coinbhleachta), 2 (trioblid). T comhad %s ina %s ach t comhad %s ina %s
Is comhionann iad na comhaid %s agus %s
T difrocht idir na comhaid %s agus %s
Cltagairt neamhbhail Aicme charachtair neamhbhail Carachtar cimheasa neamhbhail bhar neamhbhail idir \{\} Is neamhbhail an slonn ionadaochta roimhe seo Deireadh raoin neamhbhail Slonn ionadaochta neamhbhail Cuimhne dithe Nl a leithid ann Gan lne nua ag an chomhadchroch Nl aon slonn ionadaochta roimhe seo I %s amhin: %s
Deireadh le slonn ionadaochta gan choinne Slonn ionadaochta rmhr Is fidir na hiarmhreanna a leanas a chur i ndiaidh SCIP:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, srl. do T, P, E, Z, Y. Bua! Torbjorn Granlund Clslais ag deireadh Earrid chrais anaithnid ( n \( corr ) n \) corr \{ corr sid: %s [ROGHA]... COMHAD1 COMHAD2
sid: %s [ROGHA]... COMHAD1 [COMHAD2 [SCIPEIL1 [SCIPEIL2]]]
sid: %s [ROGHA]... COMHAID
sid: %s [ROGHA]... MOCHOMHAD SEANCHOMHAD DOCHOMHAD
Le %s agus %s.
Le %s, %s, %s,
%s, %s, %s, %s,
%s, %s, agus daoine eile nach iad.
Le %s, %s, %s,
%s, %s, %s, %s,
%s, agus %s.
Le %s, %s, %s,
%s, %s, %s, %s,
agus %s.
Le %s, %s, %s,
%s, %s, %s, agus %s.
Le %s, %s, %s,
%s, %s, agus %s.
Le %s, %s, %s,
%s, agus %s.
Le %s, %s, %s,
agus %s.
Le %s, %s, agus %s.
Le %s.
comhad speisialta den chinel `bloc' is comhadlanna iad na comhaid le cur i gcomparid n fidir an t-ionchur caighdenach a chumasc go hidirghnomhach comhad speisialta den chinel `carachtar' roghanna contrrtha le haghaidh na stle aschuir Roghanna tbmhid contrrtha roghanna leithid contrrtha comhadlann fifo roghanna neamh-chomhoirinacha crapadh an t-inchomhad earrid inmhenach: cinel neamhbhail diff san fheidhm process_diff earrid inmhenach: seachadadh cinel neamhbhail diff go dt an aschur earrid inmhenach: formid de na bloic diff trna chile formid neamhbhail diff; lne deiridh neamhiomln formid neamhbhail diff; carachtair mhchearta ag tosach na lne formid diff neamhbhail; teorantir neamhbhail idir athruithe cuimhne dithe ci teachtaireachta Nl na roghanna -l agus -s comhoirinach N thacatear leis an uimhri leathanach ar an stromhaire seo earrid chlir theip ar lamh gnthchomhad folamh gnthchomhad samafr comhad comhchuimhne soicad cruach thar maoil aschur caighdenach nasc siombalach an iomarca argint do lipid chomhaid comhad cuimhne le cinel comhad aisteach teipeadh ag scrobh usr/share/locale/eo/LC_MESSAGES/diffutils.mo 0000644 00000075161 15237455053 0014457 0 ustar 00 | = h C B ^ B 9 8 y W 7 6 5 @ 3 v G E I 8 @ ; G @ G L G D C b M 8 K - M y y A A B F i M! 0 m! ! 0 ! ! " " ( ." W" t" * v" " ( " P " D # H d# E # ( # K $ C h$ @ $ : $ C (% M l% G % G & ~ J& ; & J ' C P' A ' 3 ' L
( : W( L ( > ( ; ) 7 Z) 4 ) 3 ) K ) H G* 0 * L * F + B U+ 1 + + E R, H , J , F ,- s- H - E C. H . . 6 W/ 7 / J / E 0 ; W0 L 0 5 0 @ 1 7 W1 = 1 < 1 M
2 @ X2 ? 2 > 2 < 3 6 U3 K 3 < 3 M 4 3 c4 4 ! 4 4 ! 4 5 65 B5 F R5 = 5 & 5 5 6 ? 56 K u6 1 6 & 6 7 17 N7 j7 $ 7 7 7 7 I 7 (8 98 F8 O8 i8 8 8 8 8 # 8 8 8 9 +9 <9 : 9 ): 1: q R: : : : % : ; 0; B; T; " a; 4 ; ; . ; < ; < 3 X< / < + < ' < # = 4= T= p= = = ) = ! = ' = ) > 3> J> k> > > > n > ;@ N@ o@ t@ @ 1 @ 2 @ 0 A 1A LA # gA A ) A 1 A - B 1B $ MB rB B B
B B " B % B
C +C 7C JC WC aC vC }C C C C C , C
C C D D
*D 5D BD #F i
G X tG E H E I B YI @ I ? I J = J < J ; K 9 [K K K P K R 2L E L 9 L M M A SM Q M = M : %N 9 `N Y N 8 N R -O Q O O R [P P WQ S M S k S # dT 7 T T 1 T U 'U >U , ^U U U ' U U + U V V Q XV Y V U W - ZW V W Q W N 1X E X J X U Y W gY W Y Z K Z K Z D 1[ B v[ < [ K [ E B\ Z \ F \ I *] D t] B ] A ] O >^ P ^ 2 ^ R _ D e_ @ _ 0 _ ` J ` Q ` L Ka T a a R b J c P Qc c 9 .d < hd I d H d B 8e G {e 9 e ; e 6 9f C pf B f S f A Kg ? g > g = h A Jh K h M h S &i 3 zi , i ! i $ i ( "j ' Kj sj j I j B j - k Jk " dk G k K k 9 l + Ul l l l l l m "m 9m G Cm m m m # m m m n n 0n N C \ G : z ; A 4 ! k 7 [ j W / & q g 6 ( v = ~ i F ^ ' @ S U
B Z ` H E 8 Q r V s I 3 5 O T R _ e P } l
0 { Y ] X d c D K w - % f " * m a
License GPLv3+: GNU GPL version 3 or later .
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Report bugs to: %s
The default output format is a somewhat human-readable representation of
the changes.
The -e, -E, -x, -X (and corresponding long) options cause an ed script
to be output instead of the default.
Finally, the -m (--merge) option causes diff3 to do the merge internally
and output the actual merged file. For unusual input, this is more
robust than using ed.
--GTYPE-group-format=GFMT format GTYPE input groups with GFMT --LTYPE-line-format=LFMT format LTYPE input lines with LFMT --binary read and write data in binary mode --diff-program=PROGRAM use PROGRAM to compare files --diff-program=PROGRAM use PROGRAM to compare files --from-file=FILE1 compare FILE1 to all operands;
FILE1 can be a directory --help display this help and exit --help display this help and exit --help display this help and exit --help display this help and exit --horizon-lines=NUM keep NUM lines of the common prefix and suffix --ignore-file-name-case ignore case when comparing file names --left-column output only the left column of common lines --line-format=LFMT format all input lines with LFMT --no-dereference don't follow symbolic links --no-ignore-file-name-case consider case when comparing file names --normal output a normal diff (the default) --speed-large-files assume large files and many scattered small changes --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --suppress-blank-empty suppress space or tab before empty output lines --suppress-common-lines do not output common lines --tabsize=NUM tab stops every NUM (default 8) print columns --tabsize=NUM tab stops at every NUM (default 8) print columns --to-file=FILE2 compare all operands to FILE2;
FILE2 can be a directory --unidirectional-new-file treat absent first files as empty Both GFMT and LFMT may contain:
%% %
%c'C' the single character C
%c'\OOO' the character with octal code OOO
C the character C (other characters represent themselves) GFMT (only) may contain:
%< lines from FILE1
%> lines from FILE2
%= lines common to FILE1 and FILE2
%[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER
LETTERs are as follows for new group, lower case for old group:
F first line number
L last line number
N number of lines = L-F+1
E F-1
M L+1
%(A=B?T:E) if A equals B then T else E LFMT (only) may contain:
%L contents of line
%l contents of line, excluding any trailing newline
%[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'. These format options provide fine-grained control over the output
of diff, generalizing -D/--ifdef. %s %s differ: byte %s, line %s
%s %s differ: byte %s, line %s is %3o %s %3o %s
%s home page: <%s>
%s home page:
%s%s argument '%s' too large %s: diff failed: %s: invalid option -- '%c'
%s: option requires an argument -- '%c'
%s: recursive directory loop ' '-' specified for more than one input file (C) --from-file and --to-file both specified -3, --easy-only like -e, but incorporate only nonoverlapping changes -A, --show-all output all changes, bracketing conflicts -B, --ignore-blank-lines ignore changes where lines are all blank -B, --ignore-blank-lines ignore changes whose lines are all blank -D option not supported with directories -D, --ifdef=NAME output merged file with '#ifdef NAME' diffs -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --show-overlap like -e, but bracket conflicts -F, --show-function-line=RE show the most recent line matching RE -H, --speed-large-files assume large files, many scattered small changes -I, --ignore-matching-lines=RE ignore changes all whose lines match RE -I, --ignore-matching-lines=RE ignore changes where all lines match RE -L, --label=LABEL use LABEL instead of file name
(can be repeated up to three times) -N, --new-file treat absent files as empty -S, --starting-file=FILE start with FILE when comparing directories -T, --initial-tab make tabs line up by prepending a tab -T, --initial-tab make tabs line up by prepending a tab -W, --ignore-all-space ignore all white space -W, --width=NUM output at most NUM (default 130) print columns -X like -x, but bracket conflicts -X, --exclude-from=FILE exclude files that match any pattern in FILE -Z, --ignore-trailing-space ignore white space at line end -Z, --ignore-trailing-space ignore white space at line end -a, --text treat all files as text -a, --text treat all files as text -a, --text treat all files as text -b, --ignore-space-change ignore changes in the amount of white space -b, --ignore-space-change ignore changes in the amount of white space -b, --print-bytes print differing bytes -c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context -d, --minimal try hard to find a smaller set of changes -d, --minimal try hard to find a smaller set of changes -e, --ed output an ed script -e, --ed output ed script incorporating changes
from OLDFILE to YOURFILE into MYFILE -i append 'w' and 'q' commands to ed scripts -i, --ignore-case ignore case differences in file contents -i, --ignore-case consider upper- and lower-case to be the same -i, --ignore-initial=SKIP skip first SKIP bytes of both inputs -i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and
first SKIP2 bytes of FILE2 -l, --left-column output only the left column of common lines -l, --paginate pass output through 'pr' to paginate it -l, --verbose output byte numbers and differing byte values -m, --merge output actual merged file, according to
-A if no other options are given -n, --bytes=LIMIT compare at most LIMIT bytes -n, --rcs output an RCS format diff -o, --output=FILE operate interactively, sending output to FILE -p, --show-c-function show which C function each change is in -q, --brief report only when files differ -r, --recursive recursively compare any subdirectories found -s, --quiet, --silent suppress all normal output -s, --report-identical-files report when two files are the same -s, --suppress-common-lines do not output common lines -t, --expand-tabs expand tabs to spaces in output -t, --expand-tabs expand tabs to spaces in output -u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -w, --ignore-all-space ignore all white space -w, --width=NUM output at most NUM (default 130) print columns -x, --exclude=PAT exclude files that match PAT -x, --overlap-only like -e, but incorporate only overlapping changes -y, --side-by-side output in two columns Binary files %s and %s differ
Common subdirectories: %s and %s
Compare FILES line by line. Compare three files line by line. Compare two files byte by byte. David Hayes David MacKenzie Exit status is 0 if inputs are the same, 1 if different, 2 if trouble. Exit status is 0 if successful, 1 if conflicts, 2 if trouble. File %s is a %s while file %s is a %s
Files %s and %s are identical
Files %s and %s differ
General help using GNU software:
If --from-file or --to-file is given, there are no restrictions on FILE(s). If a FILE is '-' or missing, read standard input. If a FILE is '-', read standard input. Invalid back reference Invalid character class name Invalid collation character Invalid content of \{\} Invalid preceding regular expression Invalid range end Invalid regular expression Len Tower Mandatory arguments to long options are mandatory for short options too.
Memory exhausted Mike Haertel No match No newline at end of file No previous regular expression Only in %s: %s
Packaged by %s
Packaged by %s (%s)
Paul Eggert Premature end of regular expression Randy Smith Regular expression too big Report %s bugs to: %s
Richard Stallman SKIP values may be followed by the following multiplicative suffixes:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y. Side-by-side merge of differences between FILE1 and FILE2. Success Symbolic links %s and %s differ
The optional SKIP1 and SKIP2 specify the number of bytes to skip
at the beginning of each file (zero by default). Thomas Lord Torbjorn Granlund Trailing backslash Try '%s --help' for more information. Unknown system error Unmatched ( or \( Unmatched ) or \) Unmatched \{ Usage: %s [OPTION]... FILE1 FILE2
Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]
Usage: %s [OPTION]... FILES
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
Written by %s and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, %s, %s, and %s.
Written by %s, %s, %s,
%s, %s, and %s.
Written by %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
and %s.
Written by %s, %s, and %s.
Written by %s.
` block special file both files to be compared are directories cannot compare '-' to a directory cannot compare file names '%s' and '%s' cannot interactively merge standard input character special file conflicting %s option value '%s' conflicting output style options conflicting tabsize options conflicting width options directory ed: Edit then use both versions, each decorated with a header.
eb: Edit then use both versions.
el or e1: Edit then use the left version.
er or e2: Edit then use the right version.
e: Discard both versions then edit a new one.
l or 1: Use the left version.
r or 2: Use the right version.
s: Silently include common lines.
v: Verbosely include common lines.
q: Quit.
extra operand '%s' failed to reopen %s with mode %s fifo incompatible options input file shrank internal error: invalid diff type in process_diff internal error: invalid diff type passed to output internal error: screwup in format of diff blocks invalid %s%s argument '%s' invalid --bytes value '%s' invalid --ignore-initial value '%s' invalid context length '%s' invalid diff format; incomplete last line invalid diff format; incorrect leading line chars invalid diff format; invalid change separator invalid horizon length '%s' invalid suffix in %s%s argument '%s' invalid tabsize '%s' invalid width '%s' memory exhausted message queue missing operand after '%s' options -l and -s are incompatible pagination not supported on this host program error read failed regular empty file regular file semaphore shared memory object socket stack overflow standard output stderr stdin stdout subsidiary program '%s' could not be invoked symbolic link too many file label options typed memory object unknown stream weird file write failed Project-Id-Version: GNU diffutils 3.3-pre1
Report-Msgid-Bugs-To: bug-diffutils@gnu.org
POT-Creation-Date: 2017-05-21 13:26-0700
PO-Revision-Date: 2013-10-31 13:16-0300
Last-Translator: Felipe Castro
Language-Team: Esperanto
Language: eo
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Bugs: Report translation errors to the Language-Team address.
X-Generator: Poedit 1.5.4
Permeso GPLv3+: GNU GPL versio 3 aŭ posta .
Tio ĉi estas libera programaro: vi estas libera por ŝanĝi kaj redisdoni ĝin.
Ekzistas NENIU GARANTIO, laŭ plej amplekse permesate de la leĝoj.
Raportu program-misojn al: %s
Raportu tradukajn misojn al:
La apriora elig-formo estas iom hom-legebla reprezento de la ŝanĝoj.
La modifiloj -e, -E, -x, -X (kaj korespondaj long-formoj) eligas ed-skripton
anstataŭ la aprioron.
Fine, la modifilo -m (--merge) igas ke diff3 kunfandu interne kaj
eligu la veran kunfanditan dosieron. Por ne-ordinara enigo, tio ĉi estas
pli fortika ol la uzo de ed.
--GTYPE-group-format=GFMT enformigi enig-grupojn GTYPE per GFMT --LTYPE-line-format=LFMT enformigi enig-grupojn LTYPE per LFMT --binary legi kaj skribi datumaron ciferece --diff-program=PROGRAMO uzi PROGRAMOn por kompari dosierojn --diff-program=PROGRAMO uzi PROGRAMOn por kompari dosierojn --from-file=DOSIERO1 kompari DOSIERO1 kun ĉiuj argumentoj;
DOSIERO1 povas esti dosierujo --help montri ĉi tiun helpon kaj eliri --help montri ĉi tiun helpon kaj eliri --help montri ĉi tiun helpon kaj eliri --help montri ĉi tiun helpon kaj eliri --horizon-lines=NUM teni NUM liniojn de la komuna prefikso kaj sufikso --ignore-file-name-case preteratenti usklecon dum komparo de dosiernomoj --left-column montri nur la maldekstran kolumnon de komunaj linioj --line-format=LFMT enformigi ĉiujn enigliniojn per LFMT --no-dereference ne sekvi simbolajn ligojn --no-ignore-file-name-case konsideri usklecon dum komparo de dosiernomoj --normal montri normalan malsamon (aprioras) --speed-large-files atendi grandajn dosierojn kaj multajn disajn ŝanĝetojn --strip-trailing-cr forigi linifinan CR ĉe enigo --strip-trailing-cr forigi linifinan CR ĉe enigo --strip-trailing-cr forigi linifinan CR ĉe enigo --suppress-blank-empty forkaŝi spacon aŭ tabon antaŭ malplenaj eligitaj linioj --suppress-common-lines ne montri komunajn liniojn --tabsize=NUM tab-lokoj estas post ĉiuj NUM (aprioras 8) kolumnoj --tabsize=NUM tab-lokoj estas post ĉiu NUM (aprioras 8) kolumnoj --to-file=DOSIERO2 kompari ĉiujn argumentojn kun DOSIERO2;
DOSIERO2 povas esti dosierujo --unidirectional-new-file trakti mankantajn unuajn dosierojn kiel malplenajn Kaj GFMT kaj LFMT povas enhavi:
%% %
%c'C' la unuopa signo C
%c'\000' la signo kun okuma kodo OOO
C la signo C (aliaj signoj reprezentas ili mem) GFMT (nur) povas enhavi:
%< linioj el DOSIERO1
%> linioj el DOSIERO2
%= linioj komunaj al DOSIERO1 kaj DOSIERO2
%[-][LARĜO][.[PREC]]{doxX}LITERO printf-stila indiko por LITERO
LITEROJ estas jenaj por nova grupo, minuskle por malnova grupo:
F unua lininumero
L lasta lininumero
N nombro de linioj = L-F+1
E F-1
M L+1
%(A=B?T:E) se A egalas al B, do T, male E LFMT (nur) povas enhavi:
%L enhavo de linio
%l enhavo linio, sen eventuala linifino
%[-][LARĜO][.[PREC]]{doxX}n printf-stila indiko de lininumero LTYPE estas 'old', 'new' aŭ 'unchanged'. GTYPE estas LTYPE aŭ 'changed'. Tiuj enformigaj modifiloj provizas rafinitan regadon pri la eligo
de diff, ĝeneraliganta -D/--ifdef. %s %s malsamas: bajto %s, linio %s
%s %s malsamas: bajto %s, linio %s estas %3o %s %3o %s
%s hejm-paĝo: <%s>
%s hejm-paĝo:
%s%s-argumento '%s' tro larĝas %s: diff malsukcesis: %s: malvalida modifilo -- '%c'
%s: la modifilo postulas argumenton -- '%c'
%s: rikura dosieruja ciklo ’ '-' indikita por pli ol unu enigdosiero © --from-file kaj --to-file ambaŭ specifitaj -3, --easy-only kiel -e, sed enkorpigi nur ne-interkovriĝantajn ŝanĝojn -A, --show-all montri ĉiujn ŝanĝojn, kun konfliktoj inter krampoj -B, --ignore-blank-lines preteratenti ŝanĝojn, kie linioj estas ĉiuj malplenaj -B, --ignore-blank-lines preteratenti ŝanĝojn, kie linioj estas ĉiuj malplenaj modifilo -D ne estas subtenata kun dosierujoj -D, --ifdef=NOMO montri kunfanditan dosieron kun malsamoj '#ifdef NOMO' -E, --ignore-tab-expansion preteratenti ŝanĝojn kaŭzatajn de tab-etendigo -E, --ignore-tab-expansion preteratenti ŝanĝojn kaŭzatajn de tab-etendigo -E, --show-overlap kiel -e, sed kun konfliktoj inter krampoj -F, --show-function-line=RE montri la plej freŝa linio kongruanta al RE -H, --speed-large-files atendi grandajn dosierojn kaj multajn disajn ŝanĝetojn -I, --ignore-matching-lines=RE preteratenti ŝanĝojn, kie ĉiuj linioj kongruas al RE -I, --ignore-matching-lines=RE preteratenti ŝanĝojn, kie ĉiuj linioj kongruas al RE -L, --label=ETIKEDO uzi ETIKEDOn anstataŭ dosiernomo
(povas esti ripetata ĝis 3 fojoj) -N, --new-file trakti mankantajn dosierojn kiel malplenajn -S, --starting-file=DOSIERO komenci per DOSIERO, komparante dosierujojn -T, --initial-tab ĝustigi tabojn per antaŭmeto de tabo -T, --initial-tab ĝustigi tabojn per antaŭmeto de tabo -W, --ignore-all-space preteratenti ĉiun blank-spacon -W, --width=NUM montri maksimume NUM (aprioras 130) kolumnojn -X kiel -x, sed kun konfliktoj inter krampoj -X, --exclude-from=DOSIERO forigi dosierojn, kiuj kongruas kun iu ŝablono en DOSIERO -Z, --ignore-trailing-space preteratenti blank-spacon ĉe linifino -Z, --ignore-trailing-space preteratenti ĉiun blank-spacon ĉe linifino -a, --text trakti ĉiujn dosierojn kiel tekstajn -a, --text trakti ĉiujn dosierojn kiel tekstajn -a, --text trakti ĉiujn dosierojn kiel tekstajn -b, --ignore-space-change preteratenti ŝanĝojn en kvanto da blank-spaco -b, --ignore-space-change preteratenti ŝanĝojn en la kvanto da blank-spaco -b, --print-bytes eligi malsamajn bajtojn -c, -C NUM, --context[=NUM] montri NUM (aprioras 3) liniojn da kopiita kunteksto -d, --minimal strebe serĉi pli etan aron da ŝanĝoj -d, --minimal strebe serĉi pli etan aron da ŝanĝoj -e, --ed montri ed-skripton -e, --ed montri ed-skripton enkorpigantan ŝanĝojn
de PRADOSIERO al VIADOSIERO en MIADOSIEROn -i aldoni la komandojn 'w' kaj 'q' al ed-skriptoj -i, --ignore-case preteratenti malsamojn en uskleco en dosierenhavo -i, --ignore-case konsideri majusklojn kaj minusklojn kiel samajn -i N --ignore-initial=SALTO preterpasi la unuajn SALTO bajtojn de ambaŭ enigoj -i, --ignore-initial=SALT1:SALT2 pretersalti la unuajn SALT1 bajtojn de
DOSIERO1 kaj la unuajn SALT2 bajtojn
de DOSIERO2 -l, --left-column montri nur la maldekstran kolumnon de komunaj linioj -l, --paginate pasigi la eligon tra 'pr' por enpaĝigi ĝin -l, --verbose montri numerojn kaj valorojn de ĉiuj malsamaj bajtoj -m, --merge montri veran kunfanditan dosieron, akorde al
-A se neniu alia modifilo ĉeestas -n, --bytes=LIMO kompari maksimume LIMO bajtojn -n, --rcs montri malsamon laŭ RCS-formo -o, --output=DOSIERO funkcii interage, sendante eligon al DOSIERO -p, --show-c-function montri en kiu C-funkcio ĉiu ŝanĝo estas -q, --brief montri nur kiam la dosieroj malsamas -r, --recursive rikure kompari trovitajn subdosierujojn -s, --quiet, --silent forkaŝi ĉiun normalan eligon -s, --report-identical-files montri kiam du dosieroj samas -s, --suppress-common-lines ne eligi komunajn liniojn -t, --expand-tabs etendigi tabojn al spacoj en la eligo -t, --expand-tabs etendigi tabojn al spacoj en la eligo -u, -U NUM, --unified[=NUM] montri NUM (aprioras 3) liniojn da unuigita kunteksto -v, --version montri informon pri versio kaj eliri -v, --version eligi informon pri versio kaj eliri -v, --version eligi informon pri versio kaj eliri -v, --version montri informon pri versio kaj eliri -w, --ignore-all-space preteratenti ĉiun blankan spacon -w, --width=NUM montri maksimume NUM (aprioras 130) kolumnojn -x, --exclude=ŜABLONO forigi dosierojn, kiuj kongruas kun ŜABLONO -x, --overlap-only kiel -e, sed enkorpigi nur interkovriĝantajn ŝanĝojn -y, --side-by-side montri en du kolumnoj Ciferecaj dosieroj %s kaj %s estas malsamaj
Komunaj subdosierujoj: %s kaj %s
Kompari DOSIEROJn linion post linio. Kompari tri dosierojn linion post linio. Kompari du dosierojn bajton post bajto. David HAYES David MACKENZIE Elig-valoro estas 0 se enigoj estas samaj, 1 se malsamaj, 2 se problemaj. Elig-valoro estas 0 por sukceso, 1 por konfliktoj, 2 por problemo. Dosiero %s estas %s, dum dosiero %s estas %s
Dosieroj %s kaj %s samas
Dosieroj %s kaj %s estas malsamaj
Ĝenerala helpo por uzi programaron GNU:
Se --from-file aŭ --to-file estas donita, ne estas limigoj por DOSIERO(j). Se DOSIERO estas '-' aŭ mankas, legi la normalan enigon. Se DOSIERO estas '-', legi la ĉefenigujon. Malvalida retroreferenco Malvalida nomo de signoklaso Malvalida ordiga signo Malvalida kunteksto de \{\} Malvalida antaŭa regulesprimo Malvalida intervalo-fino Malvalida regulesprimo Len TOWER Nepraj argumentoj por longaj modifiloj ankaŭ nepras por la mallongaj.
Memoro estas elĉerpita Mike HAERTEL Nenia trafo Mankas linifino ĉe fino de dosiero Mankas antaŭa regulesprimo Nur en %s: %s
Pakigita de %s
Pakigita de %s (%s)
Paul EGGERT Neatendita fino de regulesprimo Randy SMITH Regula esprimo tro grandas Raportu %s misojn al: %s
Richard STALLMANN Valoroj de SALTO povas esti sekvataj de la sekvaj multobligaj sufiksoj:
kB 1000, K 1024, MB 1 000 000, M 1 048 576,
GB 1 000 000 000, G 1 073 741 824, kaj tiel plu por T, P, E, Z, Y. Apuda kunfando de malsamoj inter DOSIERO1 kaj DOSIERO2. Sukceso Simbolaj ligoj %s kaj %s malsamas
La nedevigaj SALT1 kaj SALT2 indikas la nombron da bajtoj por salti
en la komenco de ĉiu dosiero (aprioras nulo). Thomas LORD Torbjorn GRANLUND Vosta retroklino Provu '%s --help' por pli da informoj. Nekonata sistemeraro Neparigita ( aŭ \( Neparigita ) aŭ \) Neparigita \{ Uzmaniero: %s [MODIFILO]... DOSIERO1 DOSIERO2
Uzmaniero: %s [MODIFILO]... DOSIERO1 [DOSIERO2 [SALT1 [SALT2]]]
Uzmaniero: %s [MODIFILO]... DOSIEROJ
Uzmaniero: %s [MODIFILO]... MIADOSIERO PRADOSIERO VIADOSIERO
Verkita de %s kaj %s.
Verkita de %s, %s, %s,
%s, %s, %s, %s,
%s, %s, kaj aliaj.
Verkita de %s, %s, %s,
%s, %s, %s, %s,
%s, kaj %s.
Verkita de %s, %s, %s,
%s, %s, %s, %s,
kaj %s.
Verkita de %s, %s, %s,
%s, %s, %s, kaj %s.
Verkita de %s, %s, %s,
%s, %s, kaj %s.
Verkita de %s, %s, %s,
%s, kaj %s.
Verkita de %s, %s, %s,
kaj %s.
Verkita de %s, %s, kaj %s.
Verkita de %s.
‘ blok-aparatdosiero ambaŭ komparendaj dosieroj estas dosierujoj ne eblas kompari '-' al dosierujo ne eblas kompari dosiernomojn '%s' kaj '%s' ne eblas interage kunfandi la ĉefenigujon sign-aparatdosiero malakorda valoro de opcio %s: '%s' malakordaj modifiloj pri elig-stilo malkongruaj modifiloj pri TAB-larĝo malakordaj modifiloj pri larĝo dosierujo ed: redakti kaj uzi ambaŭ versiojn, ĉiu kun kaplinioj.
eb: redakti kaj uzi ambaŭ versiojn.
el aŭ e1: redakti kaj uzi maldekstran version.
er aŭ e2: redakti kaj uzi dekstran version.
e: redakti novan version.
l aŭ 1: uzi maldekstran version.
r aŭ 2: uzi dekstran version.
s: silente transpreni komunajn liniojn.
v: laŭte transpreni komunajn liniojn.
q: ĉesi.
superflua argumento '%s' malsukcesis remalfermi %s per reĝimo %s fifo malkongruaj modifiloj enigdosiero ŝrumpis interna eraro: malvalida diff-speco en process_diff interna eraro: malvalida diff-speco donita al eligo interna eraro: fuŝo en formato de diff-blokoj malvalida %s%s-argumento '%s' malvalida valoro '%s' de --bytes malvalida valoro '%s' de --ignore-initial malvalida longo '%s' de kunteksto malvalida diff-formato; malkompleta lasta linio malvalida diff-formato; malĝusta signo en antaŭa linio malvalida diff-formato; malvalida ŝanĝ-apartigilo malvalida horizonta longo '%s' malvalida sufikso en %s%s-argumento '%s' malvalida TAB-larĝo '%s' malvalida larĝo '%s' memoro elĉerpiĝis mesaĝovico mankas argumento post '%s' modifiloj -l kaj -s malakordas dispaĝigo ne eblas kun ĉi tiu sistemo program-eraro lego fiaskis normala malplena dosiero normala dosiero semaforo komuna memoro konektilo stako tro granda normala eligo ĉeferar-eligujo ĉefenigujo ĉefeligujo ne eblis alvoki la subprogramon '%s' simbola ligo tro multe da dosier-etikedaj modifiloj tipita memora objekto nekonata fluo stranga dosiero skriberaro usr/share/locale/sv/LC_MESSAGES/diffutils.mo 0000644 00000103303 15237461111 0014462 0 ustar 00 t g h i 4 h I C B B 9 | 9 8 6 y o 7 6 ! 5 X 3 G E
| P I @ ; X G @ L G D K C M 8 " K [ M y A o! ! p" $ F $ i % {% 0 % % 0 % & .& @& , \& & . & ' & ( ' )' F' f' * h' ' ( ' P ' D ( H V( E ( ( ( K ) C Z) @ ) : ) C * M ^* G * G * ~ <+ ; + J + C B, A , 3 , L , : I- L - > - ; . 7 L. 4 . 3 . K . H 9/ 0 / L / F 0 B G0 1 0 0 E D1 H 1 J 1 F 2 e2 H 2 E 53 H {3 3 6 I4 7 4 J 4 E 5 ; I5 L 5 5 5 @ 6 7 I6 = 6 < 6 M 6 @ J7 ? 7 > 7 <
8 6 G8 K ~8 < 8 M 9 3 U9 9 ! 9 9 ! 9 : (: 4: F D: = : C : &
; 4; S; ? k; K ; 1 ; & )< P< g< < < $ < < <
= I = ^= o= |= = = = = = = # = #> /> J> a> r> : $? _? g? q ? ? @ @ % +@ Q@ f@ x@ @ @ " @ 4 @ A . +A ZA oA ; A 3 A / A + &B ' RB # zB B B B B B C ) C ! FC ' hC ) C C C ) C & D @D _D D D D D D D n D eF xF F F F 1 F 2 F 0 *G [G vG # G G G G ) G 1 )H - [H H $ H H H H
I I )I DI _I " ~I I
I I " I % I J
J .J :J MJ ZJ dJ yJ J J J J J , J
J J
K K -K LK
dK oK xK K 4M a N kN A P ? EP ; P P E NQ D Q | Q : VR 9 R 8 R 6 S G ;S N S S S WT ? T = T Q )U @ {U U F YV H V E V D /W u tW < W L 'X K tX | X G =Y Y ;Z [ Z \ m \ c] 1 ] ] . ] * ] !^ 9^ * Z^ $ ^ 2 ^ - ^ / _ ;_ V_ t_ % x_ _ & _ R _ O ` T k` N ` $ a ~ 4a R a P b G Wb C b J b R .c R c c @ [d F d H d P ,e 6 }e M e C f N Ff K f H f < *g 9 gg 8 g H g A #h 4 eh R h T h S Bi 4 i i T ^j S j B k I Jk k N (l I wl R l m 7 m > m B n F Un F n L n 9 0o ? jo ; o K o J 2p } }p A p @ =q ? ~q = q = q L :r A r O r 6 s % Ps vs s s # s s t @ t < Ut X t & t u .u K Iu S u 7 u ( !v Jv av v v & v v v w R w hw tw w w # w w w w x " x 1x =x Yx ux x @ 4y uy * ~y f y z z /z 2 Mz z z z z z & z 8 { " ={ 4 `{ { { 9 { 2 { . /| * ^| & | " | | |
} } !} ?} 0 R} ) } 2 } , }
~ !~ ( >~ $ g~ ~ $ ~ ~ ~ +
@ K T % " < _ g { , ' ( $ . ) O y ! - ς 3 0 1 b - Ѓ 7 U t # τ %
! , B
T
b m
ʅ ( օ -
G U u j
q ^ I u
B l y 6 , K * A ' c J ) Q i P w T 4 1 3 = 0 [ M > x k ; { t O | L G /
f F ` H \ $ . % n C 5 2 7 & S 8 < ? z U - v ] o 9 r : D ( @ } Z ! e V s " a h d R N E X _ m Y + g b p # ~ W
License GPLv3+: GNU GPL version 3 or later .
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Report bugs to: %s
The default output format is a somewhat human-readable representation of
the changes.
The -e, -E, -x, -X (and corresponding long) options cause an ed script
to be output instead of the default.
Finally, the -m (--merge) option causes diff3 to do the merge internally
and output the actual merged file. For unusual input, this is more
robust than using ed.
--GTYPE-group-format=GFMT format GTYPE input groups with GFMT --LTYPE-line-format=LFMT format LTYPE input lines with LFMT --binary read and write data in binary mode --color[=WHEN] colorize the output; WHEN can be 'never', 'always',
or 'auto' (the default) --diff-program=PROGRAM use PROGRAM to compare files --diff-program=PROGRAM use PROGRAM to compare files --from-file=FILE1 compare FILE1 to all operands;
FILE1 can be a directory --help display this help and exit --help display this help and exit --help display this help and exit --help display this help and exit --horizon-lines=NUM keep NUM lines of the common prefix and suffix --ignore-file-name-case ignore case when comparing file names --label LABEL use LABEL instead of file name and timestamp
(can be repeated) --left-column output only the left column of common lines --line-format=LFMT format all input lines with LFMT --no-dereference don't follow symbolic links --no-ignore-file-name-case consider case when comparing file names --normal output a normal diff (the default) --palette=PALETTE the colors to use when --color is active; PALETTE is
a colon-separated list of terminfo capabilities --speed-large-files assume large files and many scattered small changes --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --suppress-blank-empty suppress space or tab before empty output lines --suppress-common-lines do not output common lines --tabsize=NUM tab stops every NUM (default 8) print columns --tabsize=NUM tab stops at every NUM (default 8) print columns --to-file=FILE2 compare all operands to FILE2;
FILE2 can be a directory --unidirectional-new-file treat absent first files as empty Both GFMT and LFMT may contain:
%% %
%c'C' the single character C
%c'\OOO' the character with octal code OOO
C the character C (other characters represent themselves) GFMT (only) may contain:
%< lines from FILE1
%> lines from FILE2
%= lines common to FILE1 and FILE2
%[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER
LETTERs are as follows for new group, lower case for old group:
F first line number
L last line number
N number of lines = L-F+1
E F-1
M L+1
%(A=B?T:E) if A equals B then T else E LFMT (only) may contain:
%L contents of line
%l contents of line, excluding any trailing newline
%[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'. These format options provide fine-grained control over the output
of diff, generalizing -D/--ifdef. %s %s differ: byte %s, line %s
%s %s differ: byte %s, line %s is %3o %s %3o %s
%s home page: <%s>
%s home page:
%s%s argument '%s' too large %s: diff failed: %s: invalid option -- '%c'
%s: option '%s%s' doesn't allow an argument
%s: option '%s%s' is ambiguous
%s: option '%s%s' is ambiguous; possibilities: %s: option '%s%s' requires an argument
%s: option requires an argument -- '%c'
%s: recursive directory loop %s: unrecognized option '%s%s'
' '-' specified for more than one input file (C) --from-file and --to-file both specified -3, --easy-only like -e, but incorporate only nonoverlapping changes -A, --show-all output all changes, bracketing conflicts -B, --ignore-blank-lines ignore changes where lines are all blank -B, --ignore-blank-lines ignore changes whose lines are all blank -D option not supported with directories -D, --ifdef=NAME output merged file with '#ifdef NAME' diffs -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --show-overlap like -e, but bracket conflicts -F, --show-function-line=RE show the most recent line matching RE -H, --speed-large-files assume large files, many scattered small changes -I, --ignore-matching-lines=RE ignore changes all whose lines match RE -I, --ignore-matching-lines=RE ignore changes where all lines match RE -L, --label=LABEL use LABEL instead of file name
(can be repeated up to three times) -N, --new-file treat absent files as empty -S, --starting-file=FILE start with FILE when comparing directories -T, --initial-tab make tabs line up by prepending a tab -T, --initial-tab make tabs line up by prepending a tab -W, --ignore-all-space ignore all white space -W, --width=NUM output at most NUM (default 130) print columns -X like -x, but bracket conflicts -X, --exclude-from=FILE exclude files that match any pattern in FILE -Z, --ignore-trailing-space ignore white space at line end -Z, --ignore-trailing-space ignore white space at line end -a, --text treat all files as text -a, --text treat all files as text -a, --text treat all files as text -b, --ignore-space-change ignore changes in the amount of white space -b, --ignore-space-change ignore changes in the amount of white space -b, --print-bytes print differing bytes -c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context -d, --minimal try hard to find a smaller set of changes -d, --minimal try hard to find a smaller set of changes -e, --ed output an ed script -e, --ed output ed script incorporating changes
from OLDFILE to YOURFILE into MYFILE -i append 'w' and 'q' commands to ed scripts -i, --ignore-case ignore case differences in file contents -i, --ignore-case consider upper- and lower-case to be the same -i, --ignore-initial=SKIP skip first SKIP bytes of both inputs -i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and
first SKIP2 bytes of FILE2 -l, --left-column output only the left column of common lines -l, --paginate pass output through 'pr' to paginate it -l, --verbose output byte numbers and differing byte values -m, --merge output actual merged file, according to
-A if no other options are given -n, --bytes=LIMIT compare at most LIMIT bytes -n, --rcs output an RCS format diff -o, --output=FILE operate interactively, sending output to FILE -p, --show-c-function show which C function each change is in -q, --brief report only when files differ -r, --recursive recursively compare any subdirectories found -s, --quiet, --silent suppress all normal output -s, --report-identical-files report when two files are the same -s, --suppress-common-lines do not output common lines -t, --expand-tabs expand tabs to spaces in output -t, --expand-tabs expand tabs to spaces in output -u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -w, --ignore-all-space ignore all white space -w, --width=NUM output at most NUM (default 130) print columns -x, --exclude=PAT exclude files that match PAT -x, --overlap-only like -e, but incorporate only overlapping changes -y, --side-by-side output in two columns Binary files %s and %s differ
Common subdirectories: %s and %s
Compare FILES line by line. Compare three files line by line. Compare two files byte by byte. David Hayes David MacKenzie Exit status is 0 if inputs are the same, 1 if different, 2 if trouble. Exit status is 0 if successful, 1 if conflicts, 2 if trouble. FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'. File %s is a %s while file %s is a %s
Files %s and %s are identical
Files %s and %s differ
General help using GNU software:
If --from-file or --to-file is given, there are no restrictions on FILE(s). If a FILE is '-' or missing, read standard input. If a FILE is '-', read standard input. Invalid back reference Invalid character class name Invalid collation character Invalid content of \{\} Invalid preceding regular expression Invalid range end Invalid regular expression Len Tower Mandatory arguments to long options are mandatory for short options too.
Memory exhausted Mike Haertel No match No newline at end of file No previous regular expression Only in %s: %s
Packaged by %s
Packaged by %s (%s)
Paul Eggert Premature end of regular expression Randy Smith Regular expression too big Report %s bugs to: %s
Richard Stallman SKIP values may be followed by the following multiplicative suffixes:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y. Side-by-side merge of differences between FILE1 and FILE2. Success Symbolic links %s and %s differ
The optional SKIP1 and SKIP2 specify the number of bytes to skip
at the beginning of each file (zero by default). Thomas Lord Torbjorn Granlund Trailing backslash Try '%s --help' for more information. Unknown system error Unmatched ( or \( Unmatched ) or \) Unmatched [, [^, [:, [., or [= Unmatched \{ Usage: %s [OPTION]... FILE1 FILE2
Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]
Usage: %s [OPTION]... FILES
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
Valid arguments are: Written by %s and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, %s, %s, and %s.
Written by %s, %s, %s,
%s, %s, and %s.
Written by %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
and %s.
Written by %s, %s, and %s.
Written by %s.
` ambiguous argument %s for %s block special file both files to be compared are directories cannot compare '-' to a directory cannot compare file names '%s' and '%s' cannot interactively merge standard input character special file cmp: EOF on %s after byte %s
cmp: EOF on %s after byte %s, in line %s
cmp: EOF on %s after byte %s, line %s
cmp: EOF on %s which is empty
conflicting %s option value '%s' conflicting output style options conflicting tabsize options conflicting width options contiguous data directory door ed: Edit then use both versions, each decorated with a header.
eb: Edit then use both versions.
el or e1: Edit then use the left version.
er or e2: Edit then use the right version.
e: Discard both versions then edit a new one.
l or 1: Use the left version.
r or 2: Use the right version.
s: Silently include common lines.
v: Verbosely include common lines.
q: Quit.
extra operand '%s' failed to reopen %s with mode %s fifo incompatible options input file shrank internal error: invalid diff type in process_diff internal error: invalid diff type passed to output internal error: screwup in format of diff blocks invalid %s%s argument '%s' invalid --bytes value '%s' invalid --ignore-initial value '%s' invalid argument %s for %s invalid color '%s' invalid context length '%s' invalid diff format; incomplete last line invalid diff format; incorrect leading line chars invalid diff format; invalid change separator invalid horizon length '%s' invalid suffix in %s%s argument '%s' invalid tabsize '%s' invalid width '%s' memory exhausted message queue migrated file with data migrated file without data missing operand after '%s' multiplexed block special file multiplexed character special file multiplexed file named file network special file options -l and -s are incompatible pagination not supported on this host port program error read failed regular empty file regular file semaphore shared memory object socket stack overflow standard output stderr stdin stdout subsidiary program '%s' could not be invoked symbolic link too many file label options typed memory object unknown stream unparsable value for --palette unrecognized prefix: %s weird file whiteout write failed Project-Id-Version: diffutils 3.5.25
Report-Msgid-Bugs-To: bug-diffutils@gnu.org
POT-Creation-Date: 2017-05-21 13:26-0700
PO-Revision-Date: 2017-05-13 18:08+0200
Last-Translator: Göran Uddeborg
Language-Team: Swedish
Language: sv
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Bugs: Report translation errors to the Language-Team address.
Licens GPLv3+: GNU GPL version 3 eller senare .
Detta är fri programvara: du får fritt ändra och vidaredistribuera den.
Det finns INGEN GARANTI, så långt lagen tillåter.
Rapportera fel till %s
Rapportera synpunkter på översättningen till .
Standardformatet för utskrift är en något så när mänskligt läsbar representation
av ändringarna.
Flaggorna -e, -E, -x, -X (och motsvarande långa) gör att ett ed-skript skrivs
ut istället för standardtext.
Slutligen får flaggan -m (--merge) diff3 att göra sammanslagningen internt
och skriva ut den faktiskt sammanslagna filen. För ovanlig indata är detta
mer robust än att använda ed.
--GTYP-group-format=GFMT formatera GTYP-ingrupper med GFMT --RTYP-line-format=RFMT formatera RTYP-inrader med RFMT --binary läs och skriv data binärt --color[=NÄR] färglägg utdata; NÄR kan vara ”never”, ”always”,
eller ”auto” (standard) --diff-program=PROGRAM använd PROGRAM för att jämföra filer --diff-program=PROGRAM använd PROGRAM för att jämföra filer --from-file=FIL1 jämför FIL1 med alla operander;
FIL1 kan vara en katalog --help visa denna hjälp och avsluta --help visa denna hjälp och avsluta --help visa denna hjälp och avsluta --help visa denna hjälp och avsluta --horizon-lines=ANT spara ANT rader av gemensamt prefix och suffix --ignore-file-name-case bortse från skiftläge när filnamn jämförs --label ETIKETT använd ETIKETT istället för filnamn och
tidsstämpel (kan upprepas) --left-column skriv ut endast vänstra kolumnen av gemensamma rader --line-format=RFMT formatera alla inrader med RFMT --no-dereference följ inte symboliska länkar --no-ignore-file-name-case ta hänsyn till skiftläge när filnamn jämförs --normal skriv ut en normal diff (standard) --palette=PALETT färgerna att använda när --color är aktivt; PALETT är
en kolonseparerad lista av terminfoförmågor --speed-large-files antag stora filer och små spridda ändringar --strip-trailing-cr tag bort avslutande vagnreturer i indata --strip-trailing-cr tag bort avslutande vagnreturer i indata --strip-trailing-cr tag bort avslutande vagnreturer i indata --suppress-blank-empty undertryck blanka eller tabulatorer före tomma
utrader --suppress-common-lines skriv inte ut gemensamma rader --tabsize=N tabulatorstopp var N:e (8 som standard) kolumn --tabsize=N tabulatorstopp var N:e (8 som standard) kolumn --to-file=FIL2 jämför alla operander med FIL2;
FIL2 kan vara en katalog --unidirectional-new-file behandla saknade förstafiler som tomma Både GFMT och RFMT kan innehålla:
%% %
%c'T' det ensamma tecknet T
%c'\OOO' tecknet med oktalkod OOO
T tecknet T (övriga tecken representerar sig själva) GFMT (endast) kan innehålla:
%< rader från FIL1
%> rader från FIL2
%= gemensamma rader i FIL1 och FIL2
%[-][BREDD][.[PREC]]{doxX}BOKSTAV printf-lik spec. för BOKSTAV
BOKSTÄVER är enligt följande för ny grupp, gemen för gammal grupp:
F första radnumret
L sista radnumret
N antal rader = L-F+1
E F-1
M L+1
%(A=B?T:E) om A är lika med B då T annars E RFMT (endast) kan innehålla:
%L radinnehåll
%l radinnehåll exklusive avslutande nyrad
%[-][BREDD][.[PREC]]{doxX}n printf-stil spec. för inradnummer RTYP är ”old”, ”new” eller ”unchanged”. GTYP är RTYP eller ”changed”. Dessa formatflaggor gör det möjligt att finjustera utskriften från
diff, generaliserande -D/--ifdef. %s %s skiljer: byte %s, rad %s
%s %s skiljer: byte %s, rad %s är %3o %s %3o %s
%s hemsida: <%s>
%s hemsida:
argument till %s%s ”%s” är för stort %s: diff misslyckades: %s: ogiltig flagga – ”%c”
%s: flaggan ”%s%s” tar inget argument
%s: flaggan ”%s%s” är tvetydig
%s: flaggan ”%s%s” är tvetydig; möjligheter: %s: flaggan ”%s%s” behöver ett argument
%s: flaggan behöver ett argument – ”%c”
%s: rekursiv katalogslinga %s: okänd flagga ”%s%s”
” ”-” angivet för mer än en infil © både --from-file och --to-file angavs -3, --easy-only som -e, men tag endast med ej överlappande ändringar -A, --show-all skriv alla ändringar med markering runt konflikter -B, --ignore-blank-lines bortse från ändringar där raderna är helt blanka -B, --ignore-blank-lines ignorera ändringar i form av enbart blanka rader flaggan -D stödjs ej för kataloger -D, --ifdef=NAMN skriv sammanslagen fil med skillnader inom
”#ifdef NAMN” -E, --ignore-tab-expansion bortse från ändringar på grund av tab-expansion -E, --ignore-tab-expansion ignorera ändringar på grund av tabulatorexpansion -E, --show-overlap som -e, men med markeringar runt konflikter -F, --show-function-line=RU visa den senaste raden som matchar RU -H, --speed-large-files antag stora filer och små spridda ändringar -I, --ignore-matching-lines=RU bortse från ändringar vars alla rader matchar RU -I, --ignore-matching-lines=RU bortse från ändringar där alla rader matchar RU -L, --label=ETIKETT använd ETIKETT istället för filnamn
(kan upprepas upp till tre gånger) -N, --new-file behandla saknade filer som tomma -S, --starting-file=FIL börja med FIL när kataloger jämförs -T, --initial-tab justera tabulatorer genom att skjuta in en -T, --initial-tab justera tabulatorer genom att skjuta in en tabulator -W, --ignore-all-space ignorera alla blanktecken -W, --width=ANT skriv ut högst ANT (130 som standard) kolumner -X som -x, men skriv klamrar om konflikter -X, --exclude-from=FIL uteslut filer som matchar något mönster i FIL -Z, --ignore-trailing-space ignorera alla blanktecken i slutet av raden -Z, --ignore-trailing-space ignorera alla blanktecken i slutet av raden -a, --text behandla alla filer som text -a, --text behandla alla filer som text -a, --text betrakta alla filer som text -b, --ignore-space-change bortse från ändringar i antalet blanka -b, --ignore-space-change ignorera ändringar i antalet blanka -b --print-bytes skriv ut byte som skiljer -c, -C ANT, --context[=ANT] skriv ANT (3 som standard) rader kopia av sammanhang -d, --minimal arbeta hårt för att hitta en mindre mängd ändringar -d, --minimal arbeta hårt för att hitta en mindre mängd av ändringar -e, --ed skriv ut ett ed-skript -e, --ed skriv ut ett ed-skript som innehåller ändringar
från GAMMALFIL till DINFIL i MINFIL -i lägg till ”w”- och ”q”-kommandon till ed-skript -i, --ignore-case bortse från skillnader i skiftläge i filinnehåll -i, --ignore-case betrakta versaler och gemena som lika -i, --ignore-initial=HOPP hoppa över de första HOPP byte indata -i, --ignore-initial=HOPP1:HOPP2 hoppa över de HOPP1 första byten i FIL1 och
de HOPP2 första byten i FIL2 -l, --left-column skriv endast ut gemensamma raders vänstra kolumn -l, --paginate skicka utdata till ”pr” för paginering -l, --verbose skriv ut bytenummer och värde för alla skiljande byte -m, --merge skriv ut en faktiskt sammanslagen fil, enligt
-A om inga andra flaggor ges -n, --bytes=GRÄNS jämför högst GRÄNS byte -n, --rcs skriv ut skillnader i RCS-format -o, --output=FIL kör interaktivt, med utdata till FIL -p, --show-c-function visa vilken C-funktion varje rad finns i -q, --brief rapportera endast när filer skiljer sig -r, --recursive jämför underkataloger som hittas rekursivt -s, --quiet, --silent undertryck all normal utskrift -s --report-identical-files rapportera om två filer är lika -s, --suppress-common-lines skriv inte ut gemensamma rader -t, --expand-tabs expandera tabulatorer till blanksteg i utdata -t, --expand-tabs expandera tabulatorer till blanksteg i utdata -u, -U ANT, --unified[=ANT] skriv ut ANT (3 som standard) rader med
sammanslagen omgivning -v, --version visa versionsinformation och avsluta -v, --version visa versionsinformation och avsluta -v --version visa versionsinformation och avsluta -v, --version visa versionsinformation och avsluta -w, --ignore-all-space bortse från alla blanktecken -w, --width=ANT skriv ut högst ANT (130 som standard) kolumner -x, --exclude=MNS ta inte med filer som matchar MNS -x, --overlap-only som -e, men tag endast med överlappande ändringar -y, --side-by-side skriv ut i två kolumner De binära filerna %s och %s skiljer
Lika underkataloger: %s och %s
Jämför FILER rad för rad. Jämför tre filer rad för rad. Jämför två filer byte för byte. David Hayes David MacKenzie Slutsstatus är 0 om indata är lika, 1 om olika, 2 vid problem. Slutstatus är 0 om allt bra, 1 vid konflikt, 2 vid problem. FILER är ”FIL1 FIL2” eller ”KAT1 KAT2” eller ”KAT FIL” eller ”FIL KAT”. Filen %s är %s medan filen %s är %s
Filerna %s och %s är lika
Filerna %s och %s skiljer
Allmän hjälp med att använda GNU-program:
Om --from-file eller --to-file är angivet finns det inga begränsningar
på FILER. Om FIL är ”-” eller utelämnats, läs standard in. Om en FIL är ”-”, läs standard in. Ogiltig bakåtreferens Ogiltigt namn på teckenklass Ogiltigt sorteringstecken Ogiltigt innehåll i \{\} Föregående reguljäruttryck ogiltigt Ogiltigt intervallslut Ogiltigt reguljäruttryck Len Tower Obligatoriska argument till långa flaggor är obligatoriska även för de korta.
Minnet slut Mike Haertel Ingen träff Ingen nyrad vid filslut Inget föregående reguljäruttryck Endast i %s: %s
Paketerat av %s
Paketerat av %s (%s)
Paul Eggert Förtida slut på reguljäruttryck Randy Smith För stort reguljäruttryck Rapportera %s-fel till: %s
Richard Stallman HOPP-värden kan följas av följande multiplikativa suffix:
kB 1000, K 1024, MB 1 000 000, M 1 048 576
GB 1 000 000 000, G 1 073 741 824, och så vidare för T, P, E, Z, Y. Sammanslagning sida-vid-sida av skillnader mellan FIL1 och FIL2. Lyckades De symboliska länkarna %s och %s skiljer
De valfria HOPP1 och HOPP2 anger antalet byte att hoppa över
i början varje fil (noll som standard). Thomas Lord Torbjörn Granlund Avslutande omvänt snedstreck Försök med ”%s --help” för mer information. Okänt systemfel Oparad ( eller \( Oparad ) eller \) Oparad [, [^, [:, [. eller [= Oparad \{ Användning: %s [FLAGGA]... FIL1 FIL2
Användning: %s [FLAGGA]... FIL1 [FIL2 [HOPP1 [HOPP2]]]
Användning: %s [FLAGGA]... FILER
Användning: %s [FLAGGA]... MINFIL GAMMALFIL DINFIL
Giltiga argument är: Skrivet av %s och %s.
Skrivet av %s, %s, %s,
%s, %s, %s, %s,
%s, %s med flera.
Skrivet av %s, %s, %s,
%s, %s, %s, %s,
%s och %s.
Skrivet av %s, %s, %s,
%s, %s, %s, %s
och %s.
Skrivet av %s, %s, %s,
%s, %s, %s och %s.
Skrivet av %s, %s, %s,
%s, %s och %s.
Skrivet av %s, %s, %s,
%s och %s.
Skrivet av %s, %s, %s
och %s.
Skrivet av %s, %s och %s.
Skrivet av %s.
” tvetydigt argument %s till %s en blockspecialfil båda filerna som skall jämföras är kataloger kan inte jämföra ”-” med en katalog kan inte jämföra filnamnen ”%s” och ”%s” kan inte slå samman standard in interaktivt en teckenspecialfil cmp: EOF i %s efter byte %s
cmp: EOF i %s efter byte %s, på rad %s
cmp: EOF i %s efter byte %s, rad %s
cmp: EOF i %s som är tom
motstridigt %s-flaggsvärde ”%s” motstridig utmatningsstilsflagga konflikt mellan tabulatorflaggor konflikt mellan breddflaggor sammanhängande data en katalog en dörr ed: Redigera och använd sedan båda versioner, dekorerade med huvuden.
eb: Redigera och använd sedan båda versioner.
el eller e1: Redigera och använd sedan vänstra versionen.
er eller e2: Redigera och använd sedan högra versionen.
e: Kasta båda versionerna, och redigera sedan en ny.
l eller 1: Använd vänstra versionen.
r eller 2: Använd högra versionen.
s: Inkludera tyst gemensamma rader.
v: Inkludera och tillkännage gemensamma rader.
q: Avsluta.
extra operand ”%s” kunde inte öppna om %s i läge %s en fifo oförenliga flaggor infilen krympte internt fel: ogiltig diff-typ i process_diff internt fel: ogiltig diff-typ utskickad internt fel: trasigt format i diff-block ogiltigt argument till %s%s ”%s” ogiltigt --bytes-värde ”%s” ogiltigt --ignore-initial-värde ”%s” ogiltigt argument %s till %s ogiltig färg ”%s” ogiltig omgivningslängd ”%s” ogiltigt diff-format; ofullständig sista rad ogiltigt diff-format; felaktiga starttecken på rad ogiltigt diff-format; ogiltig ändringsseparator ogiltig horisontlängd ”%s” ogiltigt suffix i argument till %s%s ”%s” ogiltigt tabulatorsteg ”%s” ogiltig bredd ”%s” minnet slut en meddelandekö en migrerad fil med data en migrerad fil utan data saknad operand efter ”%s” en multiplexad blockspecialfil en multiplexad teckenspecialfil en multiplexad fil en namngiven fil en nätverksspecialfil flaggorna -l och -s är motstridiga sidvisning stödjs ej på denna värd en port programfel läsning misslyckades en tom normal fil en normal fil en semafor ett objekt av delat minne ett uttag (socket) stackspill standard ut standard fel standard in standard ut underprogram ”%s” kunde inte startas en symbolisk länk för många etikettflaggor ett objekt av typat minne okänd ström otolkbart värde för --palette okänt prefix: %s en konstig fil en övertäckningsfil skrivning misslyckades usr/share/locale/lv/LC_MESSAGES/diffutils.mo 0000644 00000076672 15237535452 0014507 0 ustar 00 | = h C B ^ B 9 8 y W 7 6 5 @ 3 v G E I 8 @ ; G @ G L G D C b M 8 K - M y y A A B F i M! 0 m! ! 0 ! ! " " ( ." W" t" * v" " ( " P " D # H d# E # ( # K $ C h$ @ $ : $ C (% M l% G % G & ~ J& ; & J ' C P' A ' 3 ' L
( : W( L ( > ( ; ) 7 Z) 4 ) 3 ) K ) H G* 0 * L * F + B U+ 1 + + E R, H , J , F ,- s- H - E C. H . . 6 W/ 7 / J / E 0 ; W0 L 0 5 0 @ 1 7 W1 = 1 < 1 M
2 @ X2 ? 2 > 2 < 3 6 U3 K 3 < 3 M 4 3 c4 4 ! 4 4 ! 4 5 65 B5 F R5 = 5 & 5 5 6 ? 56 K u6 1 6 & 6 7 17 N7 j7 $ 7 7 7 7 I 7 (8 98 F8 O8 i8 8 8 8 8 # 8 8 8 9 +9 <9 : 9 ): 1: q R: : : : % : ; 0; B; T; " a; 4 ; ; . ; < ; < 3 X< / < + < ' < # = 4= T= p= = = ) = ! = ' = ) > 3> J> k> > > > n > ;@ N@ o@ t@ @ 1 @ 2 @ 0 A 1A LA # gA A ) A 1 A - B 1B $ MB rB B B
B B " B % B
C +C 7C JC WC aC vC }C C C C C , C
C C D D
*D 5D 0 BD sF ?G m `G F H G I M ]I O I O I KJ ? J > K = PK ; K N K Q L O kL F L = M S @M @ M Q M L 'N H tN H N O 9 O O GP P R OQ Q aR T W T b KU % U 6 U V 2 !V ( TV }V ! V 0 V ! V W 2 W >W ' BW X jW O W E X B YX * X | X R DY O Y K Y H 3Z O |Z O Z O [ u l[ J [ K -\ J y\ H \ 5
] P C] J ] z ] F Z^ C ^ F ^ C ,_ B p_ C _ @ _ 7 8` P p` H ` D
a / Oa a L b N [b b L -c zc N d I ^d R d d ? e 6 e L e G Ff @ f R f 6 "g B Yg 8 g L g K "h P nh E h D i C Ji A i 8 i O j I Yj V j 5 j % 0k ' Vk " ~k 0 k * k k l _ l V yl % l l m V 1m K m > m - n An & \n # n n - n n o %o T /o o o o o ) o o
p p *p - 6p dp " pp p p p E aq
q ( q o q Kr Wr # ir 1 r r r r s * s D Gs # s > s s 7 t 1 >t . pt ) t % t ! t u /u Iu Zu ^u + ru ) u 9 u / v 2v - Lv % zv - v v v v x - x x ! x y ; (y ; dy 8 y ! y $ y - z # Nz 3 rz > z 8 z ( { - G{ ' u{ { { { { , { 1 %| W| j| |
| | | | | | | | } * } 3} % E} k} } } } 2 $ < ? h u ) J t , | 9 . M # n + o x 1 b y L p > N C \ G : z ; A 4 ! k 7 [ j W / & q g 6 ( v = ~ i F ^ ' @ S U
B Z ` H E 8 Q r V s I 3 5 O T R _ e P } l
0 { Y ] X d c D K w - % f " * m a
License GPLv3+: GNU GPL version 3 or later .
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Report bugs to: %s
The default output format is a somewhat human-readable representation of
the changes.
The -e, -E, -x, -X (and corresponding long) options cause an ed script
to be output instead of the default.
Finally, the -m (--merge) option causes diff3 to do the merge internally
and output the actual merged file. For unusual input, this is more
robust than using ed.
--GTYPE-group-format=GFMT format GTYPE input groups with GFMT --LTYPE-line-format=LFMT format LTYPE input lines with LFMT --binary read and write data in binary mode --diff-program=PROGRAM use PROGRAM to compare files --diff-program=PROGRAM use PROGRAM to compare files --from-file=FILE1 compare FILE1 to all operands;
FILE1 can be a directory --help display this help and exit --help display this help and exit --help display this help and exit --help display this help and exit --horizon-lines=NUM keep NUM lines of the common prefix and suffix --ignore-file-name-case ignore case when comparing file names --left-column output only the left column of common lines --line-format=LFMT format all input lines with LFMT --no-dereference don't follow symbolic links --no-ignore-file-name-case consider case when comparing file names --normal output a normal diff (the default) --speed-large-files assume large files and many scattered small changes --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --suppress-blank-empty suppress space or tab before empty output lines --suppress-common-lines do not output common lines --tabsize=NUM tab stops every NUM (default 8) print columns --tabsize=NUM tab stops at every NUM (default 8) print columns --to-file=FILE2 compare all operands to FILE2;
FILE2 can be a directory --unidirectional-new-file treat absent first files as empty Both GFMT and LFMT may contain:
%% %
%c'C' the single character C
%c'\OOO' the character with octal code OOO
C the character C (other characters represent themselves) GFMT (only) may contain:
%< lines from FILE1
%> lines from FILE2
%= lines common to FILE1 and FILE2
%[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER
LETTERs are as follows for new group, lower case for old group:
F first line number
L last line number
N number of lines = L-F+1
E F-1
M L+1
%(A=B?T:E) if A equals B then T else E LFMT (only) may contain:
%L contents of line
%l contents of line, excluding any trailing newline
%[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'. These format options provide fine-grained control over the output
of diff, generalizing -D/--ifdef. %s %s differ: byte %s, line %s
%s %s differ: byte %s, line %s is %3o %s %3o %s
%s home page: <%s>
%s home page:
%s%s argument '%s' too large %s: diff failed: %s: invalid option -- '%c'
%s: option requires an argument -- '%c'
%s: recursive directory loop ' '-' specified for more than one input file (C) --from-file and --to-file both specified -3, --easy-only like -e, but incorporate only nonoverlapping changes -A, --show-all output all changes, bracketing conflicts -B, --ignore-blank-lines ignore changes where lines are all blank -B, --ignore-blank-lines ignore changes whose lines are all blank -D option not supported with directories -D, --ifdef=NAME output merged file with '#ifdef NAME' diffs -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --show-overlap like -e, but bracket conflicts -F, --show-function-line=RE show the most recent line matching RE -H, --speed-large-files assume large files, many scattered small changes -I, --ignore-matching-lines=RE ignore changes all whose lines match RE -I, --ignore-matching-lines=RE ignore changes where all lines match RE -L, --label=LABEL use LABEL instead of file name
(can be repeated up to three times) -N, --new-file treat absent files as empty -S, --starting-file=FILE start with FILE when comparing directories -T, --initial-tab make tabs line up by prepending a tab -T, --initial-tab make tabs line up by prepending a tab -W, --ignore-all-space ignore all white space -W, --width=NUM output at most NUM (default 130) print columns -X like -x, but bracket conflicts -X, --exclude-from=FILE exclude files that match any pattern in FILE -Z, --ignore-trailing-space ignore white space at line end -Z, --ignore-trailing-space ignore white space at line end -a, --text treat all files as text -a, --text treat all files as text -a, --text treat all files as text -b, --ignore-space-change ignore changes in the amount of white space -b, --ignore-space-change ignore changes in the amount of white space -b, --print-bytes print differing bytes -c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context -d, --minimal try hard to find a smaller set of changes -d, --minimal try hard to find a smaller set of changes -e, --ed output an ed script -e, --ed output ed script incorporating changes
from OLDFILE to YOURFILE into MYFILE -i append 'w' and 'q' commands to ed scripts -i, --ignore-case ignore case differences in file contents -i, --ignore-case consider upper- and lower-case to be the same -i, --ignore-initial=SKIP skip first SKIP bytes of both inputs -i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and
first SKIP2 bytes of FILE2 -l, --left-column output only the left column of common lines -l, --paginate pass output through 'pr' to paginate it -l, --verbose output byte numbers and differing byte values -m, --merge output actual merged file, according to
-A if no other options are given -n, --bytes=LIMIT compare at most LIMIT bytes -n, --rcs output an RCS format diff -o, --output=FILE operate interactively, sending output to FILE -p, --show-c-function show which C function each change is in -q, --brief report only when files differ -r, --recursive recursively compare any subdirectories found -s, --quiet, --silent suppress all normal output -s, --report-identical-files report when two files are the same -s, --suppress-common-lines do not output common lines -t, --expand-tabs expand tabs to spaces in output -t, --expand-tabs expand tabs to spaces in output -u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -w, --ignore-all-space ignore all white space -w, --width=NUM output at most NUM (default 130) print columns -x, --exclude=PAT exclude files that match PAT -x, --overlap-only like -e, but incorporate only overlapping changes -y, --side-by-side output in two columns Binary files %s and %s differ
Common subdirectories: %s and %s
Compare FILES line by line. Compare three files line by line. Compare two files byte by byte. David Hayes David MacKenzie Exit status is 0 if inputs are the same, 1 if different, 2 if trouble. Exit status is 0 if successful, 1 if conflicts, 2 if trouble. File %s is a %s while file %s is a %s
Files %s and %s are identical
Files %s and %s differ
General help using GNU software:
If --from-file or --to-file is given, there are no restrictions on FILE(s). If a FILE is '-' or missing, read standard input. If a FILE is '-', read standard input. Invalid back reference Invalid character class name Invalid collation character Invalid content of \{\} Invalid preceding regular expression Invalid range end Invalid regular expression Len Tower Mandatory arguments to long options are mandatory for short options too.
Memory exhausted Mike Haertel No match No newline at end of file No previous regular expression Only in %s: %s
Packaged by %s
Packaged by %s (%s)
Paul Eggert Premature end of regular expression Randy Smith Regular expression too big Report %s bugs to: %s
Richard Stallman SKIP values may be followed by the following multiplicative suffixes:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y. Side-by-side merge of differences between FILE1 and FILE2. Success Symbolic links %s and %s differ
The optional SKIP1 and SKIP2 specify the number of bytes to skip
at the beginning of each file (zero by default). Thomas Lord Torbjorn Granlund Trailing backslash Try '%s --help' for more information. Unknown system error Unmatched ( or \( Unmatched ) or \) Unmatched \{ Usage: %s [OPTION]... FILE1 FILE2
Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]
Usage: %s [OPTION]... FILES
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
Written by %s and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, %s, %s, and %s.
Written by %s, %s, %s,
%s, %s, and %s.
Written by %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
and %s.
Written by %s, %s, and %s.
Written by %s.
` block special file both files to be compared are directories cannot compare '-' to a directory cannot compare file names '%s' and '%s' cannot interactively merge standard input character special file conflicting %s option value '%s' conflicting output style options conflicting tabsize options conflicting width options directory ed: Edit then use both versions, each decorated with a header.
eb: Edit then use both versions.
el or e1: Edit then use the left version.
er or e2: Edit then use the right version.
e: Discard both versions then edit a new one.
l or 1: Use the left version.
r or 2: Use the right version.
s: Silently include common lines.
v: Verbosely include common lines.
q: Quit.
extra operand '%s' failed to reopen %s with mode %s fifo incompatible options input file shrank internal error: invalid diff type in process_diff internal error: invalid diff type passed to output internal error: screwup in format of diff blocks invalid %s%s argument '%s' invalid --bytes value '%s' invalid --ignore-initial value '%s' invalid context length '%s' invalid diff format; incomplete last line invalid diff format; incorrect leading line chars invalid diff format; invalid change separator invalid horizon length '%s' invalid suffix in %s%s argument '%s' invalid tabsize '%s' invalid width '%s' memory exhausted message queue missing operand after '%s' options -l and -s are incompatible pagination not supported on this host program error read failed regular empty file regular file semaphore shared memory object socket stack overflow standard output stderr stdin stdout subsidiary program '%s' could not be invoked symbolic link too many file label options typed memory object unknown stream weird file write failed Project-Id-Version: diffutils-3.3-pre1
Report-Msgid-Bugs-To: bug-diffutils@gnu.org
POT-Creation-Date: 2017-05-21 13:26-0700
PO-Revision-Date: 2014-04-20 15:28+0300
Last-Translator: Rihards Prieditis
Language-Team: Latvian
Language: lv
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Bugs: Report translation errors to the Language-Team address.
Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);
X-Generator: Lokalize 1.5
Licence GPLv3+: GNU GPL versija 3 vai vēlāka .
Šī ir brīva programmatūra: jums ir brīvība to mainīt un izplatīt.
Tai NAV GARANTIJAS, cik to pieļauj likums.
Ziņojiet par kļūdām uz: %s
Noklusējuma izvades formāts ir daudz maz cilvēkam lasāma izmaiņu attēlojums.
Opcijas -e, -E, -x, -X (un to garie varianti) liek izvadīt ed skriptu, nevis
noklusējuma.
Visbeidzot, -m (--merge) opcija liek iekšēji sapludināt diff3 un izvadīt pašu
sapludināto datni. Netipiskām ievadēm, šis ir vēl spēcīgāks paņēmiens, nekā
ed izmantošana.
--GTYPE-group-format=GFMT formatēt GTYPE ievades grupas ar GFMT --LTYPE-line-format=LFMT formatēt LTYPE ievades rindām ar LFMT --binary lasīt un rakstīt datus binārajā režīmā --diff-program=PROGRAMMA izmantot PROGRAMMU, lai salīdzinātu divas datnes --diff-program=PROGRAMMA izmantot PROGRAMMU, lai salīdzinātu divas datnes --from-file=DATNE1 salīdzina DANTE1 ar visiem operandiem;
DATNE1 var būt direktorija --help parādīt šo palīdzību un iziet --help parādīt šo palīdzību un iziet --help parādīt šo palīdzību un iziet --help parādīt šo palīdzību un iziet --horizon-lines=NUM uzturēt NUM rindas kopējiem prefiksiem un sufiksiem --ignore-file-name-case ignorēt reģistru, salīdzinot datņu nosaukumus --left-column izvadīt tikai kreiso kolonu no kopējām rindām --line-format=LFMT formatēt visas ievades rindas ar LFMT --no-dereference nerādīt simboliskās saites --no-ignore-file-name-case neignorēt reģistru, salīdzinot datņu nosaukumus --normal izvada parastu diff (noklusējuma) --speed-large-files pieņemt, ka datnes ir lielas ar daudz mazām izmaiņām --strip-trailing-cr noņemt atkārtojošos rakstatgriezi ievadē --strip-trailing-cr noņemt atkārtojošos rakstatgriezi ievadē --strip-trailing-cr noņemt atkārtojošos rakstatgriezi ievadē --suppress-blank-empty apspiest atstarpes vai tabulācijas pirms tukšām
izvades rindām. --suppress-common-lines neizvadīt kopējās rindas --tabsize=NUM tabulāciju pietura ik NUM drukas kolonas (noklusējuma ir 8) --tabsize=NUM tabulāciju pietura ik NUM drukas kolonas (noklusējuma ir 8) --to-file=FILE2 salīdzina visus operandus ar DANTE2;
DATNE2 var būt direktorija --unidirectional-new-file trūkstošas pirmās datnes uzskatīt par tukšām Gan GFMT, gan LFMT var saturēt:
%% %
%c'C' vienu rakstzīmi C
%c'\OOO' rakstzīmi ar oktālo kodu OOO
C rakstzīme C (vai citas rakstzīmes, kas attēlo pašas sevi) GFMT (tikai) var saturēt:
%< rindas no DATNE1
%> rindas no DATNE2
%= rindas kopīgas DATNE1 un DATNE2
%[-][PLATUMS][.[PREC]]{doxX}BURTS printf-style specifikācija BURTAM
BURTS ir šāds jaunai grupai, mazais reģistrs vecais grupai:
F pirmās rindas numurs
L pēdējās rindas numurs
N rindu skaits = L-F+1
E F-1
M L+1 %(A=B?T:E) ja A vienāds ar B tad T citādi E LFMT (tikai) var saturēt:
%L rindas saturs
%l rindas saturs, izņemot sekojošās jaunās rindas rakstzīmes
%[-][PLATUMS][.[PREC]]{doxX}n printf-style specifikācija ievades rindu
numuriem LTYPE ir “old”, “new” vai “unchanged”. GTYPE ir LTYPE vai “changed”. Šīs formāta opcijas sniedz detalizētu kontroli pār diff izvadi,
vispārinot -D/--ifdef. %s %s atšķiras: baits %s, rinda %s
%s %s atšķiras: baits %s, rinda %s ir %3o %s %3o %s
%s mājas lapa: <%s>
%s mājas lapa:
%s%s arguments “%s” ir pārāk liels %s: diff neizdevās: %s: nederīga opcija -- “%c”
%s: opcijai nepieciešams arguments -- “%c”
%s: rekursīvs direktorijas cikls ” “-” norādīts vairāk par vienu ievades datni (C) --from-file un --to-file abi norādīti -3, --easy-only līdzīgs -e, bet iekļauj tikai nepārklājošās izmaiņas -A, --show-all izvada visas izmaņas, ieliekot iekavās konfliktus -B, --ignore-blank-lines ignorēt izmaiņas tukšajās rindās -B, --ignore-blank-lines ignorēt izmaiņas tukšajās rindās -D opcija nav atbalstīta ar direktorijām -D, --ifdef=NOSAUKUMS izvadīt sapludināto datni ar
“#ifdef NOSAUKUMS” diff -E, --ignore-tab-expansion ignorēt izmaiņas dēļ tabulācijas izplešanās -E, --ignore-tab-expansion ignorēt izmaiņas dēļ tabulācijas izplešanās -E, --show-overlap tāpat kā -e, bet ieliekot iekavās konfliktus -F, --show-function-line=RE rādīt visnesenāko rindu, kas atbilst RE -H, --speed-large-files pieņemt, ka datnes ir lielas, daudz mazu izmaiņu -I, --ignore-matching-lines=RE ignorēt izmaiņas rindās, kuras sakrīt ar RE -I, --ignore-matching-lines=RE ignorēt izmaiņas rindās, kuras sakrīt ar RE -L, --label=ETIĶETE izmantot ETIĶETI nevis datnes nosaukumu
(var atkārtot) -N, --new-file trūkstošas datnes uzskatīt par tukšām -S, --starting-file=DATNE sākt ar DATNI, kad salīdzina direktorijas -T, --initial-tab pacelt tabulācijas rindu pirms tabulācijas -T, --initial-tab pacelt tabulācijas rindu pirms tabulācijas -W, --ignore-all-space ignorēt visas atstarpes -W, --width=NUM izvada līdz NUM (noklusējuma 130) drukas kolonas -X līdzīgs -x, bet ieliekot iekavās konfliktus -X, --exclude-from=DATNE izslēgt datnes, kuras atbilst jebkuram
šablonam DATNĒ -Z, --ignore-trailing-space ignorēt visas atstarpes rindu beigās -Z, --ignore-trailing-space ignorēt visas atstarpes rindu beigās -a, --text uztvert visas datnes kā teksta datnes -a, --text uztvert visas datnes kā teksta datnes -a, --text uztvert visas datnes kā teksta datnes -b, --ignore-space-change ignorēt izmaiņas dēļ atstarpēm -b, --ignore-space-change ignorēt izmaiņas dēļ atstarpēm -b, --print-bytes drukāt atšķirīgos baitus -c, -C NUM, --context[=NUM] izvadīt NUM (noklus. 3) kopētā konteksta rindas -d, --minimal ļoti censties atrast mazāku izmaiņu kopu -d, --minimal ļoti censties atrast mazāku izmaiņu kopu -e, --ed izvada ed skriptu -e, --ed izvada ed skirpta iekļautās izmaiņas
no VECĀSDATNES uz JŪSUDATNI iekš MANUDATNI. -i pievieno “w” un “q” komandas ed skriptā -i, --ignore-case ignorē reģistra atšķirības datnes saturā -i, --ignore-case uzskatīt ka augšējais un apakšējais reģistrs ir
viens un tas pats -i, --ignore-initial=IZLAIST izlaists pirmos IZLAIŽAMOS baitus ievadē -i, --ignore-initial=IZLAIST1:IZLAIST2 izlaist pirmos IZLAIST1 DATNE1 baitus
un pirmos IZLAIST2 DATNE2 baitus -l, --left-column izvadīt tikai kreiso kolonu no kopējām rindām -l, --paginate izlaist izvadi caur “pr”, lai to lapotu -l, --verbose izvadīt baitu numurus un atšķirīgo baitu vērtības -m, --merge izvada pašu sapludināto datni, vadoties pēc -A,
ja nav dotu citu opciju -n, --bytes=ROBEŽA salīdzināt līdz ROBEŽAs baitiem -n, --rcs izvada RCS formāta diff -o, --output=DATNE darboties interaktīvi, izvadot izvadu uz DATNI -p, --show-c-function rādīt, kurās C funkcijās ir izmaiņas -q, --brief ziņot tikai, ja datnes atšķiras -r, --recursive rekursīvi salīdzina atrastās apakšdirektorijas -s, --quiet, --silent nomākt visu parasto izvadi -s, --report-identical-files ziņot, ja divas datnes ir vienādas -s, --suppress-common-lines neizvadīt kopējās rindas -t, --expand-tabs pārveidot tabulācijas par atstarpēm izvadē -t, --expand-tabs pārveidot tabulācijas par atstarpēm izvadē -u, -U NUM, --unified[=NUM] izvadīt NUM (noklus. 3) vienotā konteksta rindas -v, --version izvada informāciju par versiju un iziet -v, --version izvada informāciju par versiju un iziet -v, --version izvada informāciju par versiju un iziet -v, --version izvada informāciju par versiju un iziet -w, --ignore-all-space ignorēt visas atstarpes -w, --width=NUM izvada līdz NUM (noklusējuma 130) drukas kolonas -x, --exclude=ŠABLONS izslēgt datnes, kuras atbilst ŠABLONAM -x, --overlap-only līdzīgs -e, bet iekļauj tikai pārklājošās izmaiņas -y, --side-by-side izvade divās kolonnās Binārās datnes %s un %s atšķiras
Kopējās apakšdirektorijas: %s un %s
Salīdzina DATNES rindu pa rindai. Salīdzināt trīs datnes rindiņu pa rindiņai. Salīdzināt divas datnes baitu pa baitam. David Hayes David MacKenzie Izejas status ir 0, ja ievads ir tāds pats, 1, ja tas ir atšķirīgs, 2, ja ir nepatikšanas. Izejas statuss ir 0, ja tas ir veiksmīgs, 1, ja ir konflikts, 2, ja ir nepatikšanas. Datne %s ir %s kamēr datne %s ir %s
Datnes %s un %s ir identiskas
Datnes %s un %s atšķiras
Vispārēja palīdzība, izmantojot GNU programmatūru:
Ja ir doti --from-file vai --to-file, nav nekādu ierobežojumu uz DATNĒM. Ja DATNEI ir “-” vai tā nav, tad lasīt standarta ievadi. Ja DATNE ir “-”, lasīt standarta ievadi. Nederīga atpakaļ norāde Nederīgs rakstzīmju klases nosaukums Nederīga salīdzināmā rakstzīme Nederīgs \{\} saturs Nederīga iepriekšējā regulārā izteiksme Nederīgas apgabala beigas Nederīga regulārā izteiksme Len Tower Parametri, kas ir obligāti garajām opcijām, ir obligāti arī īsajām opcijām.
Atmiņa izsmelta Mike Haertel Nav atbilstību Nav jaunu rindu datnes beigās Nav iepriekšējas regulārās izteiksmes Tikai iekš %s: %s
Pakoja %s
Pakoja %s (%s)
Paul Eggert Priekšlaicīgas beigas regulārai izteiksmei Randy Smith Pārāk liela regulārā izteiksme Ziņojiet %s kļūdas uz: %s
Richard Stallman IZLAIST vērtības var sekot vairāki piedēkļi:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, un tā tālāk T, P, E, Z, Y. Sānu-pie-sāna datņu DATNE1 un DATNE2 atšķirību sapludināšana. Veiksmīgi Simboliskās saites %s un %s atšķiras
Neobligātie IZLAIST1 un IZLAIST2 norāda, cik baitus izlaist
katras datnes sākumā (pēc noklusējuma nulle). Thomas Lord Torbjorn Granlund Sekojošās otrādās slīpsvītras Lietojiet “%s --help”, lai uzzinātu vairāk. Nezināma sistēmas kļūda Nesakrītošs ( vai \( Nav atbilstoša ) vai \) Nesakrītošs \{ Lietošana: %s [OPCIJAS]... DATNE1 DATNE1
Izmantošana: %s [OPCIJAS]... DATNE1 [DATNE2 [IZLAIST1 [IZLAIST2]]]
Lietošana: %s [OPCIJAS]... DATNES
Izmantošana: %s [OPCIJAS]... MANADATNE VECĀDATNE JŪSUDATNE
Sarakstīja %s un %s.
Sarakstīja %s, %s, %s,
%s,%s, %s, %s,
%s, %s un citi.
Sarakstīja %s, %s, %s,
%s,%s, %s, %s,
%s un %s.
Sarakstīja %s, %s, %s,
%s,%s, %s, %s,
un %s.
Sarakstīja %s, %s, %s,
%s, %s, %s un %s
Sarakstīja %s, %s, %s,
%s, %s un %s
Sarakstīja %s, %s, %s,
%s un %s
Sarakstīja %s, %s, %s
un %s
Sarakstīja %s, %s un %s
Sarakstīja %s.
“ īpaša bloka datne abas salīdzināmās datnes ir direktorijas nevar salīdzināt “-” ar direktoriju nevar salīdzināt datņu nosaukumus “%s” un “%s” nevar interaktīvi sapludināt standarta ievadi īpaša rakstzīmes datne konfliktējoša %s opcijas vērtība “%s” konfliktējoša izvades stila opcijas konfliktējošas tabulācijas izmēru opcijas konfliktējošas platuma opcijas direktorija ed: Rediģēt tad izmantot abas versijas, katra izrotāta ar virsrakstu.
eb: Rediģēt un tad izmantot abas versijas.
el vai e1: Rediģēt un tad izmantot kreiso versiju.
er vai e2: Rediģēt un tad izmantot labo versiju.
e: Ignorēt abas versijas, tad rediģēt jauno.
l vai 1: Izmantot kreiso versiju.
r vai 2: Izmantot labo versiju.
s: Klusi iekļaut kopējās rindas.
v: Detalizēti iekļaut kopējās rindas.
q: Iziet.
papildu operands “%s” neizdevās atkārtoti atvērt %s režīmā %s fifo savstarpēji nesaderīgas opcijas ievades datne saruka iekšējā kļūda: nederīgs diff veids iekš process_diff iekšējā kļūda: nederīgs uz izvadi padotais diff veids iekšējā kļūda: sagāja grīstē diff bloku formāts nederīgs %s%s arguments “%s” nederīga --bytes vērtība “%s” nederīga --ignore-initial vērtība “%s” nederīgs konteksta garums “%s” nederīgs diff formāts; nepilnīga pēdējā rinda nederīgs diff formāts; nederīgas rindas ievades rakstzīmes nederīgs diff formāts; nederīgs izmaiņu atdalītājs nederīgs horizontālais garums “%s” nederīgs piedēklis %s%s argumentā “%s” nederīgs tabulācijas izmērs “%s” nederīgs platums “%s” atmiņa izsmelta ziņojumu rinda trūkst operands pēc “%s” opcijas -l un -s nav savstarpēji saderīgas lapošana netiek atbalstīta uz šī resursdatora programmas kļūda lasīšana neizdevās parasta tukša datne parasta datne semafors koplietots atmiņas objekts sokets steka pārplūšana standarta izvade stderr stdin stdout nevarēja izsaukt palīgprogrammu “%s” simboliskā saite pārāk daudz datnes etiķešu opciju tipa atmiņas objekts nezināma straume dīvaina datne rakstīšana neizdevās usr/share/locale/cs/LC_MESSAGES/diffutils.mo 0000644 00000103630 15237552436 0014455 0 ustar 00 [ T h i C B B Y 9 8 y 7 6 5 3 . G b E | I m @ ; G 4 @ | L G
D R C M 8 ) K b M y A v w " F " i # # 0 # # 0 # $ 5$ G$ ( c$ $ $ * $ $ ( $ P % D T% H % E % ( (& K Q& C & @ & : "' C ]' M ' G ' G 7( ~ ( ; ( J :) C ) A ) 3 * L ?* : * L * > + ; S+ 7 + 4 + 3 + K 0, H |, 0 , L , F C- B - 1 - - E . H . J / F a/ / H /0 E x0 H 0 1 6 1 7 1 J 1 E F2 ; 2 L 2 5 3 @ K3 7 3 = 3 < 4 M ?4 @ 4 ? 4 > 5 < M5 6 5 K 5 <
6 M J6 3 6 6 ! 6
7 ! )7 K7 k7 w7 F 7 = 7 C 8 & P8 w8 8 ? 8 K 8 1 :9 & l9 9 9 9 9 $ 9 : 2: M: I W: : : : : : ; ; !; 6; # B; f; r; ; ; ; : g< < < q < == I= [= % n= = = = = = " = 4 > Q> . n> > > ; > 3 ? / 9? + i? ' ? # ? ? @ @ -@ /@ L@ ) _@ ! @ ' @ ) @ @ A 5A VA rA A A A n A C -C NC SC hC 1 zC 2 C 0 C D +D # FD jD D D ) D 1 D - E >E $ ZE E E E
E E E E F " 3F VF
gF rF " F % F F
F F F G G G .G 5G DG TG [G aG , hG
G G G G G H
H $H -H :H I J rK L ,M L yM N M E N D [N N @ #O ? dO > O < O k P N P P P aQ O Q ? R S BR K R v R H YS E S D S -T 8 T T oU U zV V W Y MZ l Z % >[ 6 d[ [ B [ = [ 9\ ( K\ 1 t\ ! \ \ 4 \ ] 1 ] P 6] P ] R ] O +^ . {^ [ ^ I _ E P_ H _ J _ ~ *` y ` y #a } a M b O ib J b G c ; Lc } c G d Nd G d L e B ge ? e > e H )f E rf 4 f f E g A g 4 h Jh R h L 7i A i E i } j O j S j H .k wk : l > =l L |l M l G m U _m ? m 5 m : +n I fn G n n @ o ? o > p < Xp ? p { p F Qq N q 9 q * !r " Lr ' or . r & r r r Y s J cs z s ) )t St tt N t U t G 7u 8 u u u u v ( !v Jv bv v T v v v v * w ) 9w cw sw w w ( w w ' w x x x E hy y % y y _z kz }z 6 z z z z {
3{ / A{ ; q{ ' { F { | 4| 7 G| . | * | & | " } #} B} ]} t} } " } } ) } % } 2 ~ . F~ u~ 6 ~ * ~ ~ # 8 G Q X " 4 : W 5 s 2 . ܁ 3 / ? * o " " ւ > E 8 < ~ ! > ݃ & C _
s & ҄ & 2 F ) c : ȅ ͅ ܅ " ; A Z n u { 0 , ņ 1 K g
p ` t G q J c / a ! @ ) ' h N f . O 7 m T M ^ + j I (
* { r > D C P U k =
Y < Z s 4 z ? V u S n Q B ] : E - " 8 1 R 6 % # , K w y $ l i X L 5 [ e W A d v 9 F x } b H 3 0 ; ~ _ & \ | o 2 g
License GPLv3+: GNU GPL version 3 or later .
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Report bugs to: %s
The default output format is a somewhat human-readable representation of
the changes.
The -e, -E, -x, -X (and corresponding long) options cause an ed script
to be output instead of the default.
Finally, the -m (--merge) option causes diff3 to do the merge internally
and output the actual merged file. For unusual input, this is more
robust than using ed.
--GTYPE-group-format=GFMT format GTYPE input groups with GFMT --LTYPE-line-format=LFMT format LTYPE input lines with LFMT --binary read and write data in binary mode --diff-program=PROGRAM use PROGRAM to compare files --diff-program=PROGRAM use PROGRAM to compare files --from-file=FILE1 compare FILE1 to all operands;
FILE1 can be a directory --help display this help and exit --help display this help and exit --help display this help and exit --help display this help and exit --horizon-lines=NUM keep NUM lines of the common prefix and suffix --ignore-file-name-case ignore case when comparing file names --label LABEL use LABEL instead of file name and timestamp
(can be repeated) --left-column output only the left column of common lines --line-format=LFMT format all input lines with LFMT --no-dereference don't follow symbolic links --no-ignore-file-name-case consider case when comparing file names --normal output a normal diff (the default) --speed-large-files assume large files and many scattered small changes --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --suppress-blank-empty suppress space or tab before empty output lines --suppress-common-lines do not output common lines --tabsize=NUM tab stops every NUM (default 8) print columns --tabsize=NUM tab stops at every NUM (default 8) print columns --to-file=FILE2 compare all operands to FILE2;
FILE2 can be a directory --unidirectional-new-file treat absent first files as empty Both GFMT and LFMT may contain:
%% %
%c'C' the single character C
%c'\OOO' the character with octal code OOO
C the character C (other characters represent themselves) GFMT (only) may contain:
%< lines from FILE1
%> lines from FILE2
%= lines common to FILE1 and FILE2
%[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER
LETTERs are as follows for new group, lower case for old group:
F first line number
L last line number
N number of lines = L-F+1
E F-1
M L+1
%(A=B?T:E) if A equals B then T else E LFMT (only) may contain:
%L contents of line
%l contents of line, excluding any trailing newline
%[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'. These format options provide fine-grained control over the output
of diff, generalizing -D/--ifdef. %s %s differ: byte %s, line %s
%s %s differ: byte %s, line %s is %3o %s %3o %s
%s home page: <%s>
%s home page:
%s%s argument '%s' too large %s: diff failed: %s: invalid option -- '%c'
%s: option requires an argument -- '%c'
%s: recursive directory loop ' '-' specified for more than one input file (C) --from-file and --to-file both specified -3, --easy-only like -e, but incorporate only nonoverlapping changes -A, --show-all output all changes, bracketing conflicts -B, --ignore-blank-lines ignore changes where lines are all blank -B, --ignore-blank-lines ignore changes whose lines are all blank -D option not supported with directories -D, --ifdef=NAME output merged file with '#ifdef NAME' diffs -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --ignore-tab-expansion ignore changes due to tab expansion -E, --show-overlap like -e, but bracket conflicts -F, --show-function-line=RE show the most recent line matching RE -H, --speed-large-files assume large files, many scattered small changes -I, --ignore-matching-lines=RE ignore changes all whose lines match RE -I, --ignore-matching-lines=RE ignore changes where all lines match RE -L, --label=LABEL use LABEL instead of file name
(can be repeated up to three times) -N, --new-file treat absent files as empty -S, --starting-file=FILE start with FILE when comparing directories -T, --initial-tab make tabs line up by prepending a tab -T, --initial-tab make tabs line up by prepending a tab -W, --ignore-all-space ignore all white space -W, --width=NUM output at most NUM (default 130) print columns -X like -x, but bracket conflicts -X, --exclude-from=FILE exclude files that match any pattern in FILE -Z, --ignore-trailing-space ignore white space at line end -Z, --ignore-trailing-space ignore white space at line end -a, --text treat all files as text -a, --text treat all files as text -a, --text treat all files as text -b, --ignore-space-change ignore changes in the amount of white space -b, --ignore-space-change ignore changes in the amount of white space -b, --print-bytes print differing bytes -c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context -d, --minimal try hard to find a smaller set of changes -d, --minimal try hard to find a smaller set of changes -e, --ed output an ed script -e, --ed output ed script incorporating changes
from OLDFILE to YOURFILE into MYFILE -i append 'w' and 'q' commands to ed scripts -i, --ignore-case ignore case differences in file contents -i, --ignore-case consider upper- and lower-case to be the same -i, --ignore-initial=SKIP skip first SKIP bytes of both inputs -i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and
first SKIP2 bytes of FILE2 -l, --left-column output only the left column of common lines -l, --paginate pass output through 'pr' to paginate it -l, --verbose output byte numbers and differing byte values -m, --merge output actual merged file, according to
-A if no other options are given -n, --bytes=LIMIT compare at most LIMIT bytes -n, --rcs output an RCS format diff -o, --output=FILE operate interactively, sending output to FILE -p, --show-c-function show which C function each change is in -q, --brief report only when files differ -r, --recursive recursively compare any subdirectories found -s, --quiet, --silent suppress all normal output -s, --report-identical-files report when two files are the same -s, --suppress-common-lines do not output common lines -t, --expand-tabs expand tabs to spaces in output -t, --expand-tabs expand tabs to spaces in output -u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -v, --version output version information and exit -w, --ignore-all-space ignore all white space -w, --width=NUM output at most NUM (default 130) print columns -x, --exclude=PAT exclude files that match PAT -x, --overlap-only like -e, but incorporate only overlapping changes -y, --side-by-side output in two columns Binary files %s and %s differ
Common subdirectories: %s and %s
Compare FILES line by line. Compare three files line by line. Compare two files byte by byte. David Hayes David MacKenzie Exit status is 0 if inputs are the same, 1 if different, 2 if trouble. Exit status is 0 if successful, 1 if conflicts, 2 if trouble. FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'. File %s is a %s while file %s is a %s
Files %s and %s are identical
Files %s and %s differ
General help using GNU software:
If --from-file or --to-file is given, there are no restrictions on FILE(s). If a FILE is '-' or missing, read standard input. If a FILE is '-', read standard input. Invalid back reference Invalid character class name Invalid collation character Invalid content of \{\} Invalid preceding regular expression Invalid range end Invalid regular expression Len Tower Mandatory arguments to long options are mandatory for short options too.
Memory exhausted Mike Haertel No match No newline at end of file No previous regular expression Only in %s: %s
Packaged by %s
Packaged by %s (%s)
Paul Eggert Premature end of regular expression Randy Smith Regular expression too big Report %s bugs to: %s
Richard Stallman SKIP values may be followed by the following multiplicative suffixes:
kB 1000, K 1024, MB 1,000,000, M 1,048,576,
GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y. Side-by-side merge of differences between FILE1 and FILE2. Success Symbolic links %s and %s differ
The optional SKIP1 and SKIP2 specify the number of bytes to skip
at the beginning of each file (zero by default). Thomas Lord Torbjorn Granlund Trailing backslash Try '%s --help' for more information. Unknown system error Unmatched ( or \( Unmatched ) or \) Unmatched [, [^, [:, [., or [= Unmatched \{ Usage: %s [OPTION]... FILE1 FILE2
Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]
Usage: %s [OPTION]... FILES
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
Valid arguments are: Written by %s and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, %s, %s, and %s.
Written by %s, %s, %s,
%s, %s, and %s.
Written by %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
and %s.
Written by %s, %s, and %s.
Written by %s.
` ambiguous argument %s for %s block special file both files to be compared are directories cannot compare '-' to a directory cannot compare file names '%s' and '%s' cannot interactively merge standard input character special file conflicting %s option value '%s' conflicting output style options conflicting tabsize options conflicting width options contiguous data directory door ed: Edit then use both versions, each decorated with a header.
eb: Edit then use both versions.
el or e1: Edit then use the left version.
er or e2: Edit then use the right version.
e: Discard both versions then edit a new one.
l or 1: Use the left version.
r or 2: Use the right version.
s: Silently include common lines.
v: Verbosely include common lines.
q: Quit.
extra operand '%s' failed to reopen %s with mode %s fifo incompatible options input file shrank internal error: invalid diff type in process_diff internal error: invalid diff type passed to output internal error: screwup in format of diff blocks invalid %s%s argument '%s' invalid --bytes value '%s' invalid --ignore-initial value '%s' invalid argument %s for %s invalid color '%s' invalid context length '%s' invalid diff format; incomplete last line invalid diff format; incorrect leading line chars invalid diff format; invalid change separator invalid horizon length '%s' invalid suffix in %s%s argument '%s' invalid tabsize '%s' invalid width '%s' memory exhausted message queue migrated file with data migrated file without data missing operand after '%s' multiplexed block special file multiplexed character special file multiplexed file named file network special file options -l and -s are incompatible pagination not supported on this host port program error read failed regular empty file regular file semaphore shared memory object socket stack overflow standard output stderr stdin stdout subsidiary program '%s' could not be invoked symbolic link too many file label options typed memory object unknown stream unparsable value for --palette unrecognized prefix: %s weird file whiteout write failed Project-Id-Version: diffutils 3.5.14
Report-Msgid-Bugs-To: bug-diffutils@gnu.org
POT-Creation-Date: 2017-05-21 13:26-0700
PO-Revision-Date: 2017-02-03 13:03+01:00
Last-Translator: Petr Pisar
Language-Team: Czech
Language: cs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8-bit
X-Bugs: Report translation errors to the Language-Team address.
Licence GPLv3+: GNU GPL verze 3 nebo novější .
Toto je svobodné programové vybavení: máte právo měnit jej a dále šířit.
Není poskytována ŽÁDNÁ ZÁRUKA, jak jen zákon dovoluje.
Chyby v programu oznamujte na adrese %s (anglicky),
připomínky k překladu na adrese
(česky).
Výchozí výstupní formát je více méně člověkem čitelná reprezentace změn.
Přepínače -e, -E, -x, -X (a odpovídající dlouhé přepínače) způsobí vypsání
skriptu pro program ed namísto výchozího formátu.
Nakonec přepínač -m (--merge) způsobí, že diff3 provede spojení sám a vypíše
vlastní spojený soubor. V případě neobvyklého vstupu, je toto spolehlivější
způsob než použití programu ed.
--GTYPE-group-format=GFMT formátuje vstupní skupiny GTYPE podle FMTS --LTYPE-line-format=LFMT formátuje vstupní řádky LTYPE podle LFMT --binary data čte a zapisuje data v binárním režimu --diff-program=PROGRAM použije PROGRAM k porovnání souborů --diff-program=PROGRAM použije PROGRAM k porovnání souborů --from-file=SOUBOR1 porovná SOUBOR1 se všemi operandy,
SOUBOR1 může být adresář --help zobrazí tuto nápovědu a skončí --help zobrazí tuto nápovědu a skončí --help zobrazí tuto nápovědu a skončí --help zobrazí tuto nápovědu a skončí --horizon-lines=POČET
ponechá POČET shodných řádků předpony a přípony --ignore-file-name-case ignoruje velikost písmen v názvech souborů --label NÁZEV použije NÁZEV místo názvu souboru a časového údaje
(lze opakovat) --left-column vypíše pouze levý sloupec společných řádků --line-format=LFMT formátuje všechny vstupní řádky podle LFMT --no-dereference nenásleduje symbolické odkazy --no-ignore-file-name-case bere v potaz velikost písmen v názvech souborů --normal normálním formát výstupu diff (výchozí) --speed-large-files předpokládá velké soubory a mnoho rozptýlených
drobných změn --strip-trailing-cr odstraní ukončovací znak CR na vstupu --strip-trailing-cr odstraní ukončovací znak CR na vstupu --strip-trailing-cr odstraní ukončovací znak CR na vstupu --suppress-blank-empty potlačí mezeru nebo tabulátor před prázdnými
řádky výstupu --suppress-common-lines nevypisuje shodné řádky --tabsize=POČET tabulátor zastavuje každých POČET
(výchozí je 8) tiskových sloupců --tabsize=POČET tabulátor zastavuje každých POČET (výchozí je 8)
tiskových sloupců --to-file=SOUBOR2 porovná všechny operandy se SOUBOREM2,
SOUBOR2 může být adresář --unidirectional-new-file neexistující soubory z prvního adresáře
považuje za prázdné Jak GFMT, tak i LFMT smí obsahovat:
%% %
%c'C' jeden znak C
%c'\000' znak s osmičkovým kódem 000
C znak C (ostatní znaky zastupují samy sebe) GFMT může obsahovat:
%< řádky ze SOUBORU1
%> řádky ze SOUBORU2
%= řádky společné pro SOUBOR1 i SOUBOR2
%[-][DÉLKA][.[PŘESNOST]]{doxX}ZNAK formát stylu printf pro ZNAK
ZNAKy dále jsou pro novou skupinu, malými písmeny pro starou skupinu:
F číslo prvního řádku
L číslo posledního řádku
N počet řádků = L-F+1
E F-1
M L+1
%(A=B?T:E) pokud A se rovná B, tak T, jinak E LFMT (pouze) smí obsahovat:
%L obsah řádku
%l obsah řádku, bez znaku konce řádku
%[-][ŠÍŘKA][.[PŘESNOST]]{doxX}n formát stylu printf pro číslo vstupního
řádku LTYPE je „old“ (starý), „new“ (nový) nebo „unchanged“ (nezměněn). GTYPE
je LTYPE nebo „changed“ (změněn). Tyto formátovací přepínače poskytují jemnou kontrolu nad výstupem diffu
a zobecňují -D/--ifdef. %s %s se liší: bajt %s, řádek %s
%s %s se liší: bajt %s, řádek %s je %3o %s %3o %s
Domovská stránka %s: <%s>
Domovská stránka programu %s:
argument „%3$s“ přepínače %1$s%2$s je příliš velký %s: diff selhal: %s: neznámý přepínač – „%c“
%s: přepínač vyžaduje argument – „%c“
%s: smyčka v rekurzi adresářů “ „-“ zadáno pro více než jeden vstupní soubor © parametry --from-file i to-file použity najednou -3, --easy-only jako -e, ale zahrne jen nepřekrývající se změny -A, --show-all vypíše všechny rozdíly, konflikty v závorkách -B, --ignore-blank-lines ignoruje změny v případě prázdných řádků -B, --ignore-blank-lines ignoruje změny v případě prázdných řádků -D přepínač nepodporuje práci s adresáři -D, --ifdef=NÁZEV vypíše sloučený soubor s rozdíly „#ifdef NÁZEV“ -E, --ignore-tab-expansion ignoruje změny v odsazení tabulátorem -E, --ignore-tab-expansion ignoruje změny v odsazení tabulátorem -E, --show-overlap jako -e, ale konflikty umístí do závorek -F, --show-function-line=RV ukáže poslední řádek odpovídající RV -H, --speed-large-files předpokládá velké soubory a mnoho rozptýlených
drobných změn -I, --ignore-matching-lines=RV ignoruje změny na všech řádcích
odpovídajících RV -I, --ignore-matching-lines=RV ignoruje změny na všech řádcích
odpovídajících RV -L, --label=NÁZEV použije NÁZEV namísto názvu souboru
(lze opakovat až třikrát) -N, --new-file neexistující soubory považuje za prázdné -S, --starting-file=SOUBOR při porovnávání adresářů začne SOUBOREM -T, --initial-tab na začátek řádků se vloží tabulátor -T, --initial-tab na začátek řádků se vloží tabulátor -W, --ignore-all-space ignoruje všechny bílé znaky -W, --width=POČET vypíše nejvýše POČET (výchozí je 130)
tiskových sloupců -X jako -x, ale konflikty umístí do závorek -X, --exclude-from=SOUBOR vynechá soubory, které odpovídají
libovolnému vzoru ze SOUBORU -Z, --ignore-trailing-space ignoruje bílá místa na konci řádku -Z, --ignore-trailing-space ignoruje všechny bílé znaky na konci řádku -a, --text pokládá všechny soubory za text -a, --text pokládá všechny soubory za text -a, --text pokládá všechny soubory za text -b, --ignore-space-change ignoruje změny v počtu bílých míst -b, --ignore-space-change ignoruje změny v počtu bílých znaků -b --print-bytes vypíše rozdílné bajty -c, -C POČET, --context[=POČET]
vypíše POČET (výchozí je 3) řádků
kopírovaného kontextu -d, --minimal pokusí se nalézt nejmenší sadu změn -d, --minimal pokusí se nalézt nejmenší sadu změn -e --ed vypíše skript pro ed -e, --ed vypíše ed skript zahrnující změny mezi
STARÝM_SOUBOREM a VAŠÍM_SOUBOREM do MÉHO_SOUBORU -i přidá příkazy „w“ a „q“ do skriptů pro ed -i, --ignore-case ignoruje velikost písmen v obsahu souborů -i, --ignore-case nerozlišuje velká a malá písmena -i, --ignore-initial=N přeskočí prvních N bajtů obou vstupů -i, --ignore-initial=N1:N2 přeskočí prvních N1 bajtů SOUBORU1 a
prvních N2 bajtů SOUBORU2 -l, --left-column vypíše pouze levý sloupec společných řádků -l, --paginate výstup projde přes „pr“ pro přestránkování -l --verbose vypíše pozice a hodnoty rozdílných bajtů -m, --merge vypíše vlastní spojený soubor podle -A, nebyly-li
uvedeny další přepínače -n, --bytes=LIMIT porovná nejvýše LIMIT bajtů -n --rcs vypíše rozdíl ve formátu RCS -o, --output=SOUBOR interaktivní režim, výstup půjde do SOUBORU -p, --show-c-function ukáže, ve které funkci C se změna nachází -q --brief výstup pouze při rozdílných souborech -r --recursive rekurzivně porovná všechny nalezené podadresáře -s, --quiet, --silent potlačí veškerý běžný výstup -s --report-identical-files hlásí shodné soubory -s, --suppress-common-lines nevypisuje společné řádky -t, --expand-tabs ve výstupu převede tabulátory na mezery -t, --expand-tabs ve výstupu převede tabulátory na mezery -u, -U POČET, --unified[=POČET]
vypíše POČET (výchozí je 3) řádků
unifikovaného kontextu -v, --version vypíše údaje o verzi a skončí -v, --version vypíše údaje o verzi a skončí -v --version vypíše údaje o verzi a skončí -v, --version vypíše údaje o verzi a skončí -w, --ignore-all-space ignoruje všechna bílá místa -w, --width=POČET vypíše nejvýše POČET (výchozí je 130) tiskových
sloupců -x, --exclude=VZOR vynechá soubory odpovídající VZORU -x, --overlap-only jako -e, ale zahrne jen překrývající se změny -y, --side-by-side vypíše ve dvou sloupcích Binární soubory %s a %s jsou rozdílné
Společné podadresáře: %s a %s
Porovnává SOUBORY řádek po řádku. Porovnání tří souborů řádek po řádku. Porovnává dva soubory bajt po bajtu. David Hayes David MacKenzie Návratový kód je roven 0 pokud jsou vstupy shodné, 1 pokud se liší a 2 při chybě. Návratová hodnota je 0 při úspěchu, 1 při konfliktu a 2 při chybě. SOUBORY jsou „SOUBOR1 SOUBOR2“ nebo „ADRESÁŘ1 ADRESÁŘ2' nebo
„ADRESÁŘ SOUBOR“ nebo „SOUBOR ADRESÁŘ“. Soubor %s je %s zatímco soubor %s je %s
Soubory %s a %s jsou identické
Soubory %s a %s jsou různé
Obecná pomoc při používání softwaru GNU::
Pokud je uveden --from-file nebo --to-file, pak nejsou u SOUBORŮ žádná omezení. Pokud SOUBOR je „-“ nebo nebo chybí, bude čten standardní vstup. Pokud SOUBOR bude „-“, bude čten standardní vstup. Neplatný zpětný odkaz Neplatné jméno třídy znaků Neplatný znak porovnání Neplatný obsah \{\} Neplatný předchozí regulární výraz Neplatný konec rozsahu Neplatný regulární výraz Len Tower Povinné argumenty dlouhých přepínačů jsou též povinné u krátkých forem.
Paměť vyčerpána Mike Haertel Žádná shoda Chybí znak konce řádku na konci souboru Předchozí regulární výraz neexistuje Pouze v %s: %s
Balíček připravil %s
Balíček připravil %s (%s)
Paul Eggert Předčasný konec regulárního výrazu Randy Smith Regulární výraz je příliš dlouhý Chyby v programu %s oznamujte (anglicky) na: %s
Připomínky k překladu (česky) na:
Richard Stallman Hodnoty N1 a N2 mohou být doplněny následujícími násobnými příponami:
kB 1000, K 1024, MB 1 000 000, M 1 048 576,
GB 1 000 000 000, G 1 073 741 824 a stejně tak i pro T, P, E, Z, Y. Spojí změny mezi SOUBOREM1 a SOUBOREM2 v režimu „vedle sebe“. Hotovo Symbolické odkazy %s a %s se liší
Volitelné argumenty N1 a N2 udávají počet bajtů, které budou přeskočeny
na začátku každého souboru (výchozí je nula). Thomas Lord Torbjorn Granlund Koncové zpětné lomítko Více informací získáte příkazem „%s --help“. Neznámá chyba systému Nepárová ( nebo \( Nepárová ) nebo \) Nepárová [, [^, [:, [. nebo [= Nepárová \{ Použití: %s [PŘEPÍNAČ]… SOUBOR1 SOUBOR2
Použití: %s [PŘEPÍNAČ]… SOUBOR1 [SOUBOR2 [N1 [N2]]]
Použití: %s [PŘEPÍNAČ]… SOUBORY
Použití: %s [PŘEPÍNAČ]… MŮJ_SOUBOR STARÝ_SOUBOR VÁŠ_SOUBOR
Platné argumenty jsou: Autoři: %s a %s.
Autoři: %s, %s, %s,
%s, %s, %s, %s,
%s, %s a další.
Autoři: %s, %s, %s,
%s, %s, %s, %s,
%s a %s.
Autoři: %s, %s, %s,
%s, %s, %s, %s
a %s.
Autoři: %s, %s, %s,
%s, %s, %s a %s.
Autoři: %s, %s, %s,
%s, %s a %s.
Autoři: %s, %s, %s,
%s a %s.
Autoři: %s, %s, %s
a %s.
Autoři: %s, %s a %s.
Autor: %s.
„ nejednoznačný argument %s pro %s blokový speciální soubor oba soubory k porovnání jsou adresáři „-“ s adresářem nelze porovnat nelze porovnat názvy souborů „%s“ a „%s“ interaktivně nelze standardní vstup sloučit znakový speciální soubor konfliktní hodnota „%2$s“ přepínače „%1$s“ konfliktní přepínače pro styl výstupu konfliktní přepínače tabsize konfliktní volby šířky výstupu souvislá data adresář dveře ed: Editace - použije obě verze, každou obdaří hlavičkou.
eb: Editace - použije obě verze.
el nebo e1: Editace - použije levou verzi.
er nebo e2: Editace - použije pravou verzi.
e: Zahození obou verzí a editace nové verze.
l nebo 1: Použije levou verzi.
r nebo 2: Použije pravou verzi.
s: V tichosti vloží společné řádky.
v: Upozorní na vložení společných řádků.
q: Ukončení.
operand „%s“ je nadbytečný nelze znovuotevřít %s v módu %s roura nekompatibilní přepínače vstupní soubor se zmenšil vnitřní chyba: nesprávný typ diffu v process_diff vnitřní chyba: nesprávný typ diffu pro výstup vnitřní chyba: chyba ve formátu diff bloků neplatný argument „%3$s“ přepínače %1$s%2$s neplatná hodnota přepínače --bytes „%s“ neplatná hodnota --ignore-inital „%s“ neplatný argument „%s“ pro %s neplatná barva „%s“ neplatná délka kontextu „%s“ neplatný formát diff souboru; nekompletní poslední řádek neplatný formát diff souboru; nesprávné úvodní znaky na řádku neplatný formát diff souboru; neplatný oddělovač změny neplatná výška obzoru „%s“ neplatná přípona argumentu „%3$s“ přepínače %2$s%1$s nesprávná hodnota --tabsize „%s“ nesprávná délka „%s“ paměť vyčerpána fronta zpráv zmigrovaný soubor s daty zmigrovaný soubor bez dat po „%s“ chybí operand sdružený blokový speciální soubor sdružený znakový speciální soubor sdružený soubor pojmenovaný soubor síťový speciální soubor přepínače -l a -s nejsou kompatibilní přestránkování není na tomto počítači podporováno port chyba programu čtení selhalo obyčejný prázdný soubor obyčejný soubor semafor objekt sdílené paměti soket přetečení zásobníku standardní výstup stderr stdin stdout pomocný program „%s“ nebylo možné zavolat symbolický odkaz příliš mnoho přepínačů popisu souboru objekt typové paměti neznámý proud nerozebratelná hodnota pro přepínač --pellete nerozpoznaná předpona: %s soubor neznámého typu zabělení zápis selhal