|
200.
|
|
|
conflicting output style options
|
|
|
|
pilihan gaya output berkonflik
|
|
Translated and reviewed by
abuyop
|
In upstream: |
|
pilihan gaya keluaran berkonflik
|
|
|
Suggested by
Sharuzzaman Ahmat Raslan
|
|
|
|
Located in
src/diff.c:1107
|
|
210.
|
|
|
incompatible options
|
|
|
|
pilihan tidak serasi
|
|
Translated and reviewed by
abuyop
|
In upstream: |
|
pilihan tidak sepadan
|
|
|
Suggested by
Sharuzzaman Ahmat Raslan
|
|
|
|
Located in
src/diff3.c:363
|
|
229.
|
|
|
Compare three files line by line.
|
|
|
|
Banding tiga fail baris setiap baris.
|
|
Translated and reviewed by
abuyop
|
In upstream: |
|
Banding tiga fail tiap-tiap baris.
|
|
|
Suggested by
Sharuzzaman Ahmat Raslan
|
|
|
|
Located in
src/diff3.c:510
|
|
235.
|
|
|
invalid diff format; invalid change separator
|
|
|
|
format diff tidak sah; pemisah ubah tidak sah
|
|
Translated and reviewed by
abuyop
|
In upstream: |
|
format diff tidak sah; pengasing perbezaan tidak sah
|
|
|
Suggested by
Sharuzzaman Ahmat Raslan
|
|
|
|
Located in
src/diff3.c:1060
|
|
239.
|
|
|
internal error: invalid diff type passed to output
|
|
|
|
ralat dalaman: jenis diff tidak sah diberikan ke output
|
|
Translated and reviewed by
abuyop
|
In upstream: |
|
ralat dalaman: jenis diff tidak sah diberikan kepada keluaran
|
|
|
Suggested by
Sharuzzaman Ahmat Raslan
|
|
|
|
Located in
src/diff3.c:1416
|
|
266.
|
|
|
cannot interactively merge standard input
|
|
|
|
tidak dapat menggabung output piawai secara interaktif
|
|
Translated and reviewed by
abuyop
|
In upstream: |
|
tidak dapat menggabung masukan piawai secara interaktif
|
|
|
Suggested by
Sharuzzaman Ahmat Raslan
|
|
|
|
Located in
src/sdiff.c:328
|