diff options
| author | Andre Weinand | 2004-03-18 13:44:53 +0000 |
|---|---|---|
| committer | Andre Weinand | 2004-03-18 13:44:53 +0000 |
| commit | 839eade41ced9be1261535ffe96d7d1fdffe9ddc (patch) | |
| tree | 12bca52acde18cd888ad12dfe8ff0e4db83e201f /bundles/org.eclipse.compare/plugin.properties | |
| parent | a6fa2e5b31b26aafc5212de67f1282bcf325d700 (diff) | |
| download | eclipse.platform.team-839eade41ced9be1261535ffe96d7d1fdffe9ddc.tar.gz eclipse.platform.team-839eade41ced9be1261535ffe96d7d1fdffe9ddc.tar.xz eclipse.platform.team-839eade41ced9be1261535ffe96d7d1fdffe9ddc.zip | |
fixed 20914
Diffstat (limited to 'bundles/org.eclipse.compare/plugin.properties')
| -rw-r--r-- | bundles/org.eclipse.compare/plugin.properties | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties index 10dcadb36..694484aa7 100644 --- a/bundles/org.eclipse.compare/plugin.properties +++ b/bundles/org.eclipse.compare/plugin.properties @@ -129,8 +129,19 @@ ComparePreferencePage.previewAncestor= 1\n2\n3\nconflict\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 -compareFontDefiniton.label= Compare Text Font -compareFontDefiniton.description= The compare text font is used by textual compare/merge editors. +textCompareAppearance.label=Text Compare Appearance + +compareIncomingColor.label= Incoming change color +compareIncomingColor.description= The color used to indicate an incoming change in compare and merge tools. +compareOutgoingColor.label= Outgoing change color +compareOutgoingColor.description= The color used to indicate an outgoing change in compare and merge tools. +compareConflictColor.label= Conflicting change color +compareConflictColor.description= The color used to indicate a conflicting change in compare and merge tools. +compareResolvedColor.label= Resolved change color +compareResolvedColor.description= The color used to indicate a resolved change in merge tools. + +compareFontDefiniton.label= Compare text font +compareFontDefiniton.description= The compare text font is used by textual compare/merge tools. # New UI #ComparePreferencePage.useSplines.label= Use splines in center panel |