|
|
21.
|
|
|
If you have entered a file or folder name and a file that contains diff output in the fields in this dialog then this button will be enabled and pressing it will open kompare's main view where the output of the entered file or files from the folder are mixed with the diff output so you can then apply the difference(s) to a file or to the files.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
kompare_shell.cpp:334
|
|
|
35.
|
|
|
This will open URL1 and expect it to be diff output. URL1 can also be a '-' and then it will read from standard input. Can be used for instance for cvs diff | kompare -o -. Kompare will do a check to see if it can find the original file(s) and then blend the original file(s) into the diffoutput and show that in the viewer. -n disables the check.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
main.cpp:74
|
|
|
36.
|
|
|
This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the file or folder that the diffoutput needs to be blended into.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
main.cpp:75
|
|
|
38.
|
|
|
Use this to specify the encoding when calling it from the command line. It will default to the local encoding if not specified.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
main.cpp:77
|
|
|
91.
|
|
|
Applied: Insertion of %n line undone
|
|
|
|
Applied: Insertion of %n lines undone
|
|
|
|
|
(no translation yet)
|
|
|
|
(no translation yet)
|
|
|
|
(no translation yet)
|
|
|
|
Located in
komparenavtreepart/komparenavtreepart.cpp:434
|
|
|
93.
|
|
|
Applied: Deletion of %n line undone
|
|
|
|
Applied: Deletion of %n lines undone
|
|
|
|
|
(no translation yet)
|
|
|
|
(no translation yet)
|
|
|
|
(no translation yet)
|
|
|
|
Located in
komparenavtreepart/komparenavtreepart.cpp:442
|
|
|
115.
|
|
|
Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
libdialogpages/diffpage.cpp:231
|
|
|
118.
|
|
|
The number of context lines is normally 2 or 3. This makes the diff readable and applicable in most cases. More than 3 lines will only bloat the diff unnecessarily.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
libdialogpages/diffpage.cpp:253 libdialogpages/diffpage.cpp:258
libdialogpages/diffpage.cpp:262
|
|
|
129.
|
|
|
Add the regular expression here that you want to use 
to ignore lines that match it. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
libdialogpages/diffpage.cpp:315
|
|
|
131.
|
|
|
Clicking this will open a regular expression dialog where
you can graphically create regular expressions. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
libdialogpages/diffpage.cpp:323
|
