dm: Spell checked & capitalization fixed

12 files changed, 232 insertions, 246 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
index 847ab5eda..9571ad9a1 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
@@ -7,38 +7,38 @@
 # Resource strings for TextMergeViewer.java

 

 tooComplexError.title= Error

-tooComplexError.format= Can''t reasonably determine the differences within {0} seconds. Either the inputs are too large or they differ too much. Try to turn on the ''Ignore Whitespace'' option or do a structure compare first.

+tooComplexError.format= Can''t reasonably determine the differences within {0} seconds. Either the inputs are too large or they differ too much. Try to turn on the ''Ignore White Space'' option or do a structure compare first.

 

 #####################################################

 # Toolbar actions

 #####################################################

 

 action.CopyLeftToRight.label=Copy Left to Right

-action.CopyLeftToRight.tooltip=Copy whole document from left to right

+action.CopyLeftToRight.tooltip=Copy Whole Document from Left to Right

 action.CopyLeftToRight.image=copy_r_co.gif

 

 action.CopyRightToLeft.label=Copy Right to Left

-action.CopyRightToLeft.tooltip=Copy whole document from right to left

+action.CopyRightToLeft.tooltip=Copy Whole Document from Right to Left

 action.CopyRightToLeft.image=copy_l_co.gif

 

 action.CopyDiffLeftToRight.label=Copy Current Diff

-action.CopyDiffLeftToRight.tooltip=Copy current change from left to right

+action.CopyDiffLeftToRight.tooltip=Copy Current Change from Left to Right

 action.CopyDiffLeftToRight.image=copycont_r_co.gif

 

 action.CopyDiffRightToLeft.label=Copy Current Diff

-action.CopyDiffRightToLeft.tooltip=Copy current change from right to left

+action.CopyDiffRightToLeft.tooltip=Copy Current Change from Right to Left

 action.CopyDiffRightToLeft.image=copycont_l_co.gif

 

 action.NextDiff.label=Next

-action.NextDiff.tooltip=Select next change

+action.NextDiff.tooltip=Select Next Change

 action.NextDiff.image=next_nav.gif

 

 action.PrevDiff.label=Previous

-action.PrevDiff.tooltip=Select previous change

+action.PrevDiff.tooltip=Select Previous Change

 action.PrevDiff.image=prev_nav.gif

 

 action.EnableAncestor.label=Enable Ancestor Pane

-action.EnableAncestor.tooltip=Control visibility of ancestor pane

+action.EnableAncestor.tooltip=Control Visibility of Ancestor Pane

 action.EnableAncestor.image=ancestorpane_co.gif

 

 #####################################################

@@ -46,10 +46,10 @@ action.EnableAncestor.image=ancestorpane_co.gif
 #####################################################

 

 action.undo.label=Undo@Ctrl+Z

-action.undo.tooltip=Undo last Operation

+action.undo.tooltip=Undo Last Operation

 

 action.redo.label=Redo@Ctrl+Y

-action.redo.tooltip=Redo last Operation

+action.redo.tooltip=Redo Last Operation

 

 action.cut.label=Cut@Ctrl+X

 action.cut.tooltip=Cut Text Selection to Clipboard

@@ -61,16 +61,13 @@ action.paste.label=Paste@Ctrl+V
 action.paste.tooltip=Replace Text Selection with Clipboard

 

 action.delete.label=Delete

-action.delete.tooltip=Delete current Text Selection

+action.delete.tooltip=Delete Current Text Selection

 

 action.find.label=Find...@Ctrl+F

-action.find.tooltip=Find Occurance

+action.find.tooltip=Find Occurrence

 

 action.selectAll.label=Select All@Ctrl+A

-action.selectAll.tooltip=Select all Changes

+action.selectAll.tooltip=Select All Changes

 

 action.save.label=Save@Ctrl+S

 action.save.tooltip=Save Changes

-

-

-

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
index 33a9e408a..65921dbee 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
@@ -1,23 +1,23 @@
-# =====================================
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-# ====================================
-
-# @(#)CompareWithEditionAction.properties
-#
-# Resources for CompareWithEditionAction.java
-
-title= Compare with Local History
+# =====================================

+# (c) Copyright IBM Corp. 2000, 2001.

+# All Rights Reserved.

+# ====================================

+

+# @(#)CompareWithEditionAction.properties

+#

+# Resources for CompareWithEditionAction.java

+

+title= Compare with Local History

 

 targetSide= left

-
-treeTitleFormat= Local History of ''{0}''
-dateIcon= obj16/day_obj.gif
-timeIcon= obj16/resource_obj.gif
-
-editionLabel= Local History ({0})
-targetLabel= Workbench
-
-todayFormat= Today ({0})
-yesterdayFormat= Yesterday ({0})
-dayFormat= {0}
+

+treeTitleFormat= Local History of ''{0}''

+dateIcon= obj16/day_obj.gif

+timeIcon= obj16/resource_obj.gif

+

+editionLabel= Local History ({0})

+targetLabel= Workbench

+

+todayFormat= Today ({0})

+yesterdayFormat= Yesterday ({0})

+dayFormat= {0}

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties
index 5cff5d39b..b150dda86 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties
@@ -14,16 +14,13 @@ title= Image Compare
 #####################################################

 

 action.CopyLeftToRight.label= Copy Left to Right

-action.CopyLeftToRight.tooltip= Copy image from left to right

+action.CopyLeftToRight.tooltip= Copy Image from Left to Right

 action.CopyLeftToRight.image= elcl16/copy_r_co.gif

 

 action.CopyRightToLeft.label= Copy Right to Left

-action.CopyRightToLeft.tooltip= Copy image from right to left

+action.CopyRightToLeft.tooltip= Copy Image from Right to Left

 action.CopyRightToLeft.image= elcl16/copy_l_co.gif

 

 action.EnableAncestor.label= Enable Ancestor Pane

-action.EnableAncestor.tooltip= Control visibility of ancestor pane

+action.EnableAncestor.tooltip= Control Visibility of Ancestor Pane

 action.EnableAncestor.image= elcl16/ancestorpane_co.gif

-

-

-

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties
index 98233c12f..f9f6012d3 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties
@@ -1,28 +1,28 @@
-# =====================================
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-# =====================================
-
-# @(#)ReplaceWithEditionAction.properties
-#
-# Resources for ReplaceWithEditionAction.java
-
-title= Replace from Local History
+# =====================================

+# (c) Copyright IBM Corp. 2000, 2001.

+# All Rights Reserved.

+# =====================================

+

+# @(#)ReplaceWithEditionAction.properties

+#

+# Resources for ReplaceWithEditionAction.java

+

+title= Replace from Local History

 

 mode= replace

 targetSide= left

-
-treeTitleFormat= Local History of ''{0}''
-dateIcon= obj16/day_obj.gif
-timeIcon= obj16/resource_obj.gif
-
-editionLabel= Local History ({0})
-targetLabel= Workbench
-
-todayFormat= Today ({0})
-yesterdayFormat= Yesterday ({0})
-dayFormat= {0}
-
-buttonLabel= Replace
-
+

+treeTitleFormat= Local History of ''{0}''

+dateIcon= obj16/day_obj.gif

+timeIcon= obj16/resource_obj.gif

+

+editionLabel= Local History ({0})

+targetLabel= Workbench

+

+todayFormat= Today ({0})

+yesterdayFormat= Yesterday ({0})

+dayFormat= {0}

+

+buttonLabel= Replace

+

 noLocalHistoryError= No local history available for selected resource.
\ No newline at end of file
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 c287c3835..3f4cceff9 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
@@ -1,49 +1,48 @@
-# =====================================
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-# =====================================
-
-# @(#)DiffTreeViewerResources.properties
-#
-# Resource strings for DiffTreeViewer.java
-
-#####################################################
-# Images
-#####################################################
-
-#####################################################
-# Status messages
-#####################################################
-
-#####################################################
-# Dialogs
-#####################################################
-
-#####################################################
-# Actions
-#####################################################
-
-action.Smart.label=Smart
-action.Smart.tooltip=Try to guess corresponding elements
-action.Smart.image=smartmode_co.gif
-
-#action.FilterSame.label=Show pseudo conflicts
-#action.FilterSame.tooltip=Show pseudo conflicts
-#action.FilterSame.image=showpseudoconflicts.gif
-
-action.NextDiff.label=Next
-action.NextDiff.tooltip=Select next change
-action.NextDiff.image=next_nav.gif
-
-action.PrevDiff.label=Previous
-action.PrevDiff.tooltip=Select previous change
-action.PrevDiff.image=prev_nav.gif
-
-action.TakeLeft.label=Copy Left to Right
-action.TakeLeft.tooltip=Copy selected nodes from left to right
-action.TakeLeft.image=copycont_r_co.gif
-
-action.TakeRight.label=Copy Right to Left
-action.TakeRight.tooltip=Copy selected nodes from right to left
-action.TakeRight.image=copycont_l_co.gif
-
+# =====================================

+# (c) Copyright IBM Corp. 2000, 2001.

+# All Rights Reserved.

+# =====================================

+

+# @(#)DiffTreeViewerResources.properties

+#

+# Resource strings for DiffTreeViewer.java

+

+#####################################################

+# Images

+#####################################################

+

+#####################################################

+# Status messages

+#####################################################

+

+#####################################################

+# Dialogs

+#####################################################

+

+#####################################################

+# Actions

+#####################################################

+

+action.Smart.label=Smart

+action.Smart.tooltip=Try to Guess Corresponding Elements

+action.Smart.image=smartmode_co.gif

+

+#action.FilterSame.label=Show Pseudo Conflicts

+#action.FilterSame.tooltip=Show Pseudo Conflicts

+#action.FilterSame.image=showpseudoconflicts.gif

+

+action.NextDiff.label=Next

+action.NextDiff.tooltip=Select Next Change

+action.NextDiff.image=next_nav.gif

+

+action.PrevDiff.label=Previous

+action.PrevDiff.tooltip=Select Previous Change

+action.PrevDiff.image=prev_nav.gif

+

+action.TakeLeft.label=Copy Left to Right

+action.TakeLeft.tooltip=Copy Selected Nodes from Left to Right

+action.TakeLeft.image=copycont_r_co.gif

+

+action.TakeRight.label=Copy Right to Left

+action.TakeRight.tooltip=Copy selected Nodes from Right to Left

+action.TakeRight.image=copycont_l_co.gif

diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties
index f25e40633..394662d02 100644
--- a/bundles/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugin.properties
@@ -5,7 +5,7 @@
 # =====================================

 # @(#)plugin.properties

 #

-# Resource strings for Compare Plugin

+# Resource strings for Compare Plug-in

 

 #

 # Context menu & actions

@@ -13,23 +13,23 @@
 CompareWithMenu.label= Compare With

 

 CompareWithEachOtherAction.label= Each Other

-CompareWithEachOtherAction.tooltip= Compare the selected resources

+CompareWithEachOtherAction.tooltip= Compare the Selected Resources

 

 CompareWithHistoryAction.label= Local History...

-CompareWithHistoryAction.tooltip= Compare the selected resource with local history

+CompareWithHistoryAction.tooltip= Compare the Selected Resource with Local History

 

 ReplaceWithMenu.label= Replace With

 

 ReplaceFromHistoryAction.label= Local History...

-ReplaceFromHistoryAction.tooltip= Replace the selected resource with local history

+ReplaceFromHistoryAction.tooltip= Replace the Selected Resource with Local History

 

 #

 # Preference Page

 #

 ComparePreferencePage.name= Compare Viewers

-SynchronizeScrolling.label= Synchronize scrolling between panes in compare/merge viewers

-ShowPseudoConflicts.label= Show pseudo conflicts

-InitiallyShowAncestorPane.label= Show ancestor pane initially

+SynchronizeScrolling.label= Synchronize Scrolling Between Panes in Compare/Merge Viewers

+ShowPseudoConflicts.label= Show Pseudo Conflicts

+InitiallyShowAncestorPane.label= Show Ancestor Pane Initially

 TextFont.label=Text Font:

 

 #

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
index 847ab5eda..9571ad9a1 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties
@@ -7,38 +7,38 @@
 # Resource strings for TextMergeViewer.java

 

 tooComplexError.title= Error

-tooComplexError.format= Can''t reasonably determine the differences within {0} seconds. Either the inputs are too large or they differ too much. Try to turn on the ''Ignore Whitespace'' option or do a structure compare first.

+tooComplexError.format= Can''t reasonably determine the differences within {0} seconds. Either the inputs are too large or they differ too much. Try to turn on the ''Ignore White Space'' option or do a structure compare first.

 

 #####################################################

 # Toolbar actions

 #####################################################

 

 action.CopyLeftToRight.label=Copy Left to Right

-action.CopyLeftToRight.tooltip=Copy whole document from left to right

+action.CopyLeftToRight.tooltip=Copy Whole Document from Left to Right

 action.CopyLeftToRight.image=copy_r_co.gif

 

 action.CopyRightToLeft.label=Copy Right to Left

-action.CopyRightToLeft.tooltip=Copy whole document from right to left

+action.CopyRightToLeft.tooltip=Copy Whole Document from Right to Left

 action.CopyRightToLeft.image=copy_l_co.gif

 

 action.CopyDiffLeftToRight.label=Copy Current Diff

-action.CopyDiffLeftToRight.tooltip=Copy current change from left to right

+action.CopyDiffLeftToRight.tooltip=Copy Current Change from Left to Right

 action.CopyDiffLeftToRight.image=copycont_r_co.gif

 

 action.CopyDiffRightToLeft.label=Copy Current Diff

-action.CopyDiffRightToLeft.tooltip=Copy current change from right to left

+action.CopyDiffRightToLeft.tooltip=Copy Current Change from Right to Left

 action.CopyDiffRightToLeft.image=copycont_l_co.gif

 

 action.NextDiff.label=Next

-action.NextDiff.tooltip=Select next change

+action.NextDiff.tooltip=Select Next Change

 action.NextDiff.image=next_nav.gif

 

 action.PrevDiff.label=Previous

-action.PrevDiff.tooltip=Select previous change

+action.PrevDiff.tooltip=Select Previous Change

 action.PrevDiff.image=prev_nav.gif

 

 action.EnableAncestor.label=Enable Ancestor Pane

-action.EnableAncestor.tooltip=Control visibility of ancestor pane

+action.EnableAncestor.tooltip=Control Visibility of Ancestor Pane

 action.EnableAncestor.image=ancestorpane_co.gif

 

 #####################################################

@@ -46,10 +46,10 @@ action.EnableAncestor.image=ancestorpane_co.gif
 #####################################################

 

 action.undo.label=Undo@Ctrl+Z

-action.undo.tooltip=Undo last Operation

+action.undo.tooltip=Undo Last Operation

 

 action.redo.label=Redo@Ctrl+Y

-action.redo.tooltip=Redo last Operation

+action.redo.tooltip=Redo Last Operation

 

 action.cut.label=Cut@Ctrl+X

 action.cut.tooltip=Cut Text Selection to Clipboard

@@ -61,16 +61,13 @@ action.paste.label=Paste@Ctrl+V
 action.paste.tooltip=Replace Text Selection with Clipboard

 

 action.delete.label=Delete

-action.delete.tooltip=Delete current Text Selection

+action.delete.tooltip=Delete Current Text Selection

 

 action.find.label=Find...@Ctrl+F

-action.find.tooltip=Find Occurance

+action.find.tooltip=Find Occurrence

 

 action.selectAll.label=Select All@Ctrl+A

-action.selectAll.tooltip=Select all Changes

+action.selectAll.tooltip=Select All Changes

 

 action.save.label=Save@Ctrl+S

 action.save.tooltip=Save Changes

-

-

-

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
index 33a9e408a..65921dbee 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
@@ -1,23 +1,23 @@
-# =====================================
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-# ====================================
-
-# @(#)CompareWithEditionAction.properties
-#
-# Resources for CompareWithEditionAction.java
-
-title= Compare with Local History
+# =====================================

+# (c) Copyright IBM Corp. 2000, 2001.

+# All Rights Reserved.

+# ====================================

+

+# @(#)CompareWithEditionAction.properties

+#

+# Resources for CompareWithEditionAction.java

+

+title= Compare with Local History

 

 targetSide= left

-
-treeTitleFormat= Local History of ''{0}''
-dateIcon= obj16/day_obj.gif
-timeIcon= obj16/resource_obj.gif
-
-editionLabel= Local History ({0})
-targetLabel= Workbench
-
-todayFormat= Today ({0})
-yesterdayFormat= Yesterday ({0})
-dayFormat= {0}
+

+treeTitleFormat= Local History of ''{0}''

+dateIcon= obj16/day_obj.gif

+timeIcon= obj16/resource_obj.gif

+

+editionLabel= Local History ({0})

+targetLabel= Workbench

+

+todayFormat= Today ({0})

+yesterdayFormat= Yesterday ({0})

+dayFormat= {0}

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties
index 5cff5d39b..b150dda86 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties
@@ -14,16 +14,13 @@ title= Image Compare
 #####################################################

 

 action.CopyLeftToRight.label= Copy Left to Right

-action.CopyLeftToRight.tooltip= Copy image from left to right

+action.CopyLeftToRight.tooltip= Copy Image from Left to Right

 action.CopyLeftToRight.image= elcl16/copy_r_co.gif

 

 action.CopyRightToLeft.label= Copy Right to Left

-action.CopyRightToLeft.tooltip= Copy image from right to left

+action.CopyRightToLeft.tooltip= Copy Image from Right to Left

 action.CopyRightToLeft.image= elcl16/copy_l_co.gif

 

 action.EnableAncestor.label= Enable Ancestor Pane

-action.EnableAncestor.tooltip= Control visibility of ancestor pane

+action.EnableAncestor.tooltip= Control Visibility of Ancestor Pane

 action.EnableAncestor.image= elcl16/ancestorpane_co.gif

-

-

-

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties
index 98233c12f..f9f6012d3 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties
@@ -1,28 +1,28 @@
-# =====================================
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-# =====================================
-
-# @(#)ReplaceWithEditionAction.properties
-#
-# Resources for ReplaceWithEditionAction.java
-
-title= Replace from Local History
+# =====================================

+# (c) Copyright IBM Corp. 2000, 2001.

+# All Rights Reserved.

+# =====================================

+

+# @(#)ReplaceWithEditionAction.properties

+#

+# Resources for ReplaceWithEditionAction.java

+

+title= Replace from Local History

 

 mode= replace

 targetSide= left

-
-treeTitleFormat= Local History of ''{0}''
-dateIcon= obj16/day_obj.gif
-timeIcon= obj16/resource_obj.gif
-
-editionLabel= Local History ({0})
-targetLabel= Workbench
-
-todayFormat= Today ({0})
-yesterdayFormat= Yesterday ({0})
-dayFormat= {0}
-
-buttonLabel= Replace
-
+

+treeTitleFormat= Local History of ''{0}''

+dateIcon= obj16/day_obj.gif

+timeIcon= obj16/resource_obj.gif

+

+editionLabel= Local History ({0})

+targetLabel= Workbench

+

+todayFormat= Today ({0})

+yesterdayFormat= Yesterday ({0})

+dayFormat= {0}

+

+buttonLabel= Replace

+

 noLocalHistoryError= No local history available for selected resource.
\ No newline at end of file
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 c287c3835..3f4cceff9 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
@@ -1,49 +1,48 @@
-# =====================================
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-# =====================================
-
-# @(#)DiffTreeViewerResources.properties
-#
-# Resource strings for DiffTreeViewer.java
-
-#####################################################
-# Images
-#####################################################
-
-#####################################################
-# Status messages
-#####################################################
-
-#####################################################
-# Dialogs
-#####################################################
-
-#####################################################
-# Actions
-#####################################################
-
-action.Smart.label=Smart
-action.Smart.tooltip=Try to guess corresponding elements
-action.Smart.image=smartmode_co.gif
-
-#action.FilterSame.label=Show pseudo conflicts
-#action.FilterSame.tooltip=Show pseudo conflicts
-#action.FilterSame.image=showpseudoconflicts.gif
-
-action.NextDiff.label=Next
-action.NextDiff.tooltip=Select next change
-action.NextDiff.image=next_nav.gif
-
-action.PrevDiff.label=Previous
-action.PrevDiff.tooltip=Select previous change
-action.PrevDiff.image=prev_nav.gif
-
-action.TakeLeft.label=Copy Left to Right
-action.TakeLeft.tooltip=Copy selected nodes from left to right
-action.TakeLeft.image=copycont_r_co.gif
-
-action.TakeRight.label=Copy Right to Left
-action.TakeRight.tooltip=Copy selected nodes from right to left
-action.TakeRight.image=copycont_l_co.gif
-
+# =====================================

+# (c) Copyright IBM Corp. 2000, 2001.

+# All Rights Reserved.

+# =====================================

+

+# @(#)DiffTreeViewerResources.properties

+#

+# Resource strings for DiffTreeViewer.java

+

+#####################################################

+# Images

+#####################################################

+

+#####################################################

+# Status messages

+#####################################################

+

+#####################################################

+# Dialogs

+#####################################################

+

+#####################################################

+# Actions

+#####################################################

+

+action.Smart.label=Smart

+action.Smart.tooltip=Try to Guess Corresponding Elements

+action.Smart.image=smartmode_co.gif

+

+#action.FilterSame.label=Show Pseudo Conflicts

+#action.FilterSame.tooltip=Show Pseudo Conflicts

+#action.FilterSame.image=showpseudoconflicts.gif

+

+action.NextDiff.label=Next

+action.NextDiff.tooltip=Select Next Change

+action.NextDiff.image=next_nav.gif

+

+action.PrevDiff.label=Previous

+action.PrevDiff.tooltip=Select Previous Change

+action.PrevDiff.image=prev_nav.gif

+

+action.TakeLeft.label=Copy Left to Right

+action.TakeLeft.tooltip=Copy Selected Nodes from Left to Right

+action.TakeLeft.image=copycont_r_co.gif

+

+action.TakeRight.label=Copy Right to Left

+action.TakeRight.tooltip=Copy selected Nodes from Right to Left

+action.TakeRight.image=copycont_l_co.gif

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 f25e40633..394662d02 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
@@ -5,7 +5,7 @@
 # =====================================

 # @(#)plugin.properties

 #

-# Resource strings for Compare Plugin

+# Resource strings for Compare Plug-in

 

 #

 # Context menu & actions

@@ -13,23 +13,23 @@
 CompareWithMenu.label= Compare With

 

 CompareWithEachOtherAction.label= Each Other

-CompareWithEachOtherAction.tooltip= Compare the selected resources

+CompareWithEachOtherAction.tooltip= Compare the Selected Resources

 

 CompareWithHistoryAction.label= Local History...

-CompareWithHistoryAction.tooltip= Compare the selected resource with local history

+CompareWithHistoryAction.tooltip= Compare the Selected Resource with Local History

 

 ReplaceWithMenu.label= Replace With

 

 ReplaceFromHistoryAction.label= Local History...

-ReplaceFromHistoryAction.tooltip= Replace the selected resource with local history

+ReplaceFromHistoryAction.tooltip= Replace the Selected Resource with Local History

 

 #

 # Preference Page

 #

 ComparePreferencePage.name= Compare Viewers

-SynchronizeScrolling.label= Synchronize scrolling between panes in compare/merge viewers

-ShowPseudoConflicts.label= Show pseudo conflicts

-InitiallyShowAncestorPane.label= Show ancestor pane initially

+SynchronizeScrolling.label= Synchronize Scrolling Between Panes in Compare/Merge Viewers

+ShowPseudoConflicts.label= Show Pseudo Conflicts

+InitiallyShowAncestorPane.label= Show Ancestor Pane Initially

 TextFont.label=Text Font:

 

 #