|
241.
|
|
|
Usage: %s [OPTION]... FILE1 FILE2
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Användning: %s [FLAGGA]... FIL1 FIL2
|
|
Translated and reviewed by
Göran Uddeborg
|
|
|
|
Located in
src/sdiff.c:206
|
|
242.
|
|
|
Side-by-side merge of differences between FILE1 and FILE2.
|
|
|
|
Sammanslagning sida-vid-sida av skillnader mellan FIL1 och FIL2.
|
|
Translated by
Göran Uddeborg
|
|
|
|
Located in
src/sdiff.c:208
|
|
243.
|
|
|
cannot interactively merge standard input
|
|
|
|
kan inte slå samman standard in interaktivt
|
|
Translated and reviewed by
Göran Uddeborg
|
|
|
|
Located in
src/sdiff.c:328
|
|
244.
|
|
|
both files to be compared are directories
|
|
|
|
båda filerna som skall jämföras är kataloger
|
|
Translated and reviewed by
Göran Uddeborg
|
|
|
|
Located in
src/sdiff.c:594
|
|
245.
|
|
|
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] Redigera och använd sedan båda versioner, dekorerade med huvuden.
eb: [tab] Redigera och använd sedan båda versioner.
el eller e1: [tab] Redigera och använd sedan vänstra versionen.
er eller e2: [tab] Redigera och använd sedan högra versionen.
e: [tab] Kasta båda versionerna, och redigera sedan en ny.
l eller 1: [tab] Använd vänstra versionen.
r eller 2: [tab] Använd högra versionen.
s: [tab] Inkludera tyst gemensamma rader.
v: [tab] Inkludera och tillkännage gemensamma rader.
q: [tab] Avsluta.
|
|
Translated by
Göran Uddeborg
|
|
|
|
Located in
src/sdiff.c:817
|