|
|
261.
|
|
|
Side-by-side merge of differences between FILE1 and FILE2.
|
|
|
|
|
Sānu-pie-sāna datņu DATNE1 un DATNE2 atšķirību sapludināšana.
|
|
Translated by
Rihards Prieditis
|
|
|
|
Located in
src/sdiff.c:208
|
|
|
262.
|
|
|
cannot interactively merge standard input
|
|
|
|
|
nevar interaktīvi sapludināt standarta ievadi
|
|
Translated by
Rihards Prieditis
|
|
|
|
Located in
src/sdiff.c:328
|
|
|
263.
|
|
|
both files to be compared are directories
|
|
|
|
|
abas salīdzināmās datnes ir direktorijas
|
|
Translated by
Rihards Prieditis
|
|
|
|
Located in
src/sdiff.c:594
|
|
|
264.
|
|
|
ed: [tab]Edit then use both versions, each decorated with a header. 
eb: [tab]Edit then use both versions.
el or e1: [tab]Edit then use the left version.
er or e2: [tab]Edit then use the right version.
e: [tab]Discard both versions then edit a new one.
l or 1: [tab]Use the left version.
r or 2: [tab]Use the right version.
s: [tab]Silently include common lines.
v: [tab]Verbosely include common lines.
q: [tab]Quit.
|
|
|
[tab] represents a tab character.
Please write it exactly the same way, [tab], in your
translation.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
ed: [tab]Rediģēt tad izmantot abas versijas, katra izrotāta ar virsrakstu.
eb: [tab]Rediģēt un tad izmantot abas versijas.
el vai e1: [tab]Rediģēt un tad izmantot kreiso versiju.
er vai e2: [tab]Rediģēt un tad izmantot labo versiju.
e: [tab]Ignorēt abas versijas, tad rediģēt jauno.
l vai 1: [tab]Izmantot kreiso versiju.
r vai 2: [tab]Izmantot labo versiju.
s: [tab]Klusi iekļaut kopējās rindas.
v: [tab]Detalizēti iekļaut kopējās rindas.
q: [tab]Iziet.
|
|
Translated by
Rihards Prieditis
|
|
|
|
Located in
src/sdiff.c:817
|
|
|
265.
|
|
|
unrecognized prefix: %s
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/util.c:755
|
|
|
266.
|
|
|
unparsable value for --palette
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/util.c:785
|
