|
|
8.
|
|
|
&Blend URL with Diff...
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
kompare_shell.cpp:205
|
|
|
16.
|
|
|
Blend File/Folder with diff Output
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
kompare_shell.cpp:330
|
|
|
20.
|
|
|
Blend this file or folder with the diff output
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
kompare_shell.cpp:334
|
|
|
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
|
|
|
27.
|
|
|
If you have entered 2 filenames or 2 folders in the fields in this dialog then this button will be enabled and pressing it will start a comparison of the entered files or folders.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
kompare_shell.cpp:363 main.cpp:205
|
|
|
30.
|
|
|
You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
libdialogpages/diffpage.cpp:212
|
|
|
32.
|
|
|
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
|
|
|
37.
|
|
|
Lines of Context
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
libdialogpages/diffpage.cpp:252
|
|
|
38.
|
|
|
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
|
|
|
39.
|
|
|
Number of context lines:
|
|
|
i18n: file: komparepart/komparesaveoptionsbase.ui:257
i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
libdialogpages/diffpage.cpp:256 rc.cpp:83
|
