diff options
Diffstat (limited to 'bundles/org.eclipse.compare/plugin.properties')
| -rw-r--r-- | bundles/org.eclipse.compare/plugin.properties | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties index 041d5208a..8bb9f8039 100644 --- a/bundles/org.eclipse.compare/plugin.properties +++ b/bundles/org.eclipse.compare/plugin.properties @@ -137,18 +137,23 @@ ComparePreferencePage.highlightTokenChanges.label=&Highlight individual changes ComparePreferencePage.disableCapping.label=Disable &capping when comparing large documents ComparePreferencePage.swapped.label=S&wap left and right -ComparePreferencePage.preview.label= Pre&view: +ComparePreferencePage.preview.label= Pre&view 3-way compare: +ComparePreferencePage.preview-2way.label= Preview 2-w&ay compare: ComparePreferencePage.ancestor.label= Common Ancestor ComparePreferencePage.left.label= Local ComparePreferencePage.right.label= Remote ComparePreferencePage.backgroundColor1.label= Bac&kground Color: ComparePreferencePage.backgroundColor2.label= S&ystem Default ComparePreferencePage.backgroundColor3.label= C&ustom +ComparePreferencePage.workingCopy.label= Working Copy +ComparePreferencePage.baseline.label= Baseline # Compare editor contents for Compare preview page ComparePreferencePage.previewAncestor= 1\n2\n3\nconflicting change\n4\n5 ComparePreferencePage.previewLeft= 1\n2\noutgoing addition\n3\noutgoing change\n4\npseudo conflict\n5 ComparePreferencePage.previewRight= 1\nincoming addition\nincoming addition\n2\n3\nincoming change\n4\npseudo conflict\n5 +ComparePreferencePage.baseline= \nline 1\nline 2\nremoved line 2a\nremoved line 2b\nline 3\nline 4\nline 5\nline 6\nline to modify 7\nline 8\nremoved words in line 9\n +ComparePreferencePage.workingCopy= line 1\nline 2\nline 3\nadded words in line 4\nline 5\nadded line 5a\nadded line 6b\nline 6\nmodified line 7\nline 8\nline 9 ComparePreferencePage.colorAndFontLink=See <a>''{0}''</a> preferences for text compare colors and fonts. |