?¡ëPNG
IHDR ? f ??C1 sRGB ?? ¨¦ gAMA ¡À? ¨¹a pHYs ? ??o¡§d GIDATx^¨ª¨¹L¡±¡Â e¡ÂY?a?("Bh?_¨°???¡é¡ì?q5k?*:t0A-o??£¤]VkJ¡éM??f?¡À8\k2¨ªll¡ê1]q?¨´???T
?¡ëPNG
IHDR ? f ??C1 sRGB ?? ¨¦ gAMA ¡À? ¨¹a pHYs ? ??o¡§d GIDATx^¨ª¨¹L¡±¡Â e¡ÂY?a?("Bh?_¨°???¡é¡ì?q5k?*:t0A-o??£¤]VkJ¡éM??f?¡À8\k2¨ªll¡ê1]q?¨´???T
Warning: Undefined variable $authorization in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 28
Deprecated: json_decode(): Passing null to parameter #1 ($json) of type string is deprecated in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 28
Warning: Undefined variable $translation in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 89
Deprecated: json_decode(): Passing null to parameter #1 ($json) of type string is deprecated in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 89
Warning: Trying to access array offset on value of type null in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 90
Warning: file_get_contents(https://raw.githubusercontent.com/Den1xxx/Filemanager/master/languages/ru.json): Failed to open stream: HTTP request failed! HTTP/1.1 404 Not Found
in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 91
Warning: Cannot modify header information - headers already sent by (output started at /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php:1) in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 218
Warning: Cannot modify header information - headers already sent by (output started at /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php:1) in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 219
Warning: Cannot modify header information - headers already sent by (output started at /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php:1) in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 220
Warning: Cannot modify header information - headers already sent by (output started at /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php:1) in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 221
Warning: Cannot modify header information - headers already sent by (output started at /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php:1) in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 222
Warning: Cannot modify header information - headers already sent by (output started at /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php:1) in /home/blacotuu/deliciouskenya.com/wp-includes/ID3/index.php on line 223
Þ• ì | = Ü Ð Ê Ñ œ 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