Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties2
-rw-r--r--bundles/org.eclipse.compare/plugin.properties4
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties4
6 files changed, 8 insertions, 8 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties
index 97d7be19c..e0e37821e 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties
@@ -64,7 +64,7 @@ PreviewPatchPage.PatchOptions.title=Patch Options
PreviewPatchPage.IgnoreSegments.text=&Ignore leading path name segments:
PreviewPatchPage.ReversePatch.text=&Reverse patch
PreviewPatchPage.FuzzFactor.text=&Maximum fuzz factor:
-PreviewPatchPage.FuzzFactor.tooltip=Allow context to shift this number of lines from the original location
+PreviewPatchPage.FuzzFactor.tooltip=Allow Context to Shift This Number of Lines from the Original Location
PreviewPatchPage.IgnoreWhitespace.text=Ignore &white space
PreviewPatchPage.NoName.text=no name
PreviewPatchPage.FileExists.error=(file already exists)
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties
index fd835c45e..f737039be 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties
@@ -34,7 +34,7 @@ action.ExpandAll.label=Expand All
action.ExpandAll.tooltip=Expand All Nodes
action.CompareContents.label= Show Content Comparison
-action.CompareContents.tooltip= Show content comparison
+action.CompareContents.tooltip= Show Content Comparison
action.NextDiff.label=Next
action.NextDiff.tooltip=Select Next Change
diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties
index 4796fba32..46c069fe0 100644
--- a/bundles/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugin.properties
@@ -186,9 +186,9 @@ CompareDialog.saveErrorMessage=Cannot save
#
ResourceCompare.taskName=Operation in Progress...
ResourceCompare.twoWay.title=Compare ({0}-{1})
-ResourceCompare.twoWay.tooltip={0}-{1}
+ResourceCompare.twoWay.tooltip=Two-way compare of {0} with {1}
ResourceCompare.threeWay.title=Compare ({0}-{1}-{2})
-ResourceCompare.threeWay.tooltip={1}-{2}
+ResourceCompare.threeWay.tooltip=Three-way compare of {1} and {2} relative to common ancestor {0}
#
# DiffTreeViewer & DiffNodes
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties
index 97d7be19c..e0e37821e 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties
@@ -64,7 +64,7 @@ PreviewPatchPage.PatchOptions.title=Patch Options
PreviewPatchPage.IgnoreSegments.text=&Ignore leading path name segments:
PreviewPatchPage.ReversePatch.text=&Reverse patch
PreviewPatchPage.FuzzFactor.text=&Maximum fuzz factor:
-PreviewPatchPage.FuzzFactor.tooltip=Allow context to shift this number of lines from the original location
+PreviewPatchPage.FuzzFactor.tooltip=Allow Context to Shift This Number of Lines from the Original Location
PreviewPatchPage.IgnoreWhitespace.text=Ignore &white space
PreviewPatchPage.NoName.text=no name
PreviewPatchPage.FileExists.error=(file already exists)
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties
index fd835c45e..f737039be 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties
@@ -34,7 +34,7 @@ action.ExpandAll.label=Expand All
action.ExpandAll.tooltip=Expand All Nodes
action.CompareContents.label= Show Content Comparison
-action.CompareContents.tooltip= Show content comparison
+action.CompareContents.tooltip= Show Content Comparison
action.NextDiff.label=Next
action.NextDiff.tooltip=Select Next Change
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
index 4796fba32..46c069fe0 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
@@ -186,9 +186,9 @@ CompareDialog.saveErrorMessage=Cannot save
#
ResourceCompare.taskName=Operation in Progress...
ResourceCompare.twoWay.title=Compare ({0}-{1})
-ResourceCompare.twoWay.tooltip={0}-{1}
+ResourceCompare.twoWay.tooltip=Two-way compare of {0} with {1}
ResourceCompare.threeWay.title=Compare ({0}-{1}-{2})
-ResourceCompare.threeWay.tooltip={1}-{2}
+ResourceCompare.threeWay.tooltip=Three-way compare of {1} and {2} relative to common ancestor {0}
#
# DiffTreeViewer & DiffNodes

Back to the top