diff options
author | Laurent Goubet | 2014-03-13 13:06:19 +0000 |
---|---|---|
committer | Laurent Goubet | 2014-03-13 13:12:10 +0000 |
commit | dba2d4136d7a4e960e6056f09dbee2e42f2074fd (patch) | |
tree | a9831ed5784609ca9289832ad4f9f249396aa381 /plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties | |
parent | 286c8af9cd4992a33779149fef0c455e655af690 (diff) | |
download | org.eclipse.emf.compare-dba2d4136d7a4e960e6056f09dbee2e42f2074fd.tar.gz org.eclipse.emf.compare-dba2d4136d7a4e960e6056f09dbee2e42f2074fd.tar.xz org.eclipse.emf.compare-dba2d4136d7a4e960e6056f09dbee2e42f2074fd.zip |
normalize EOLs in the core (second pass)
Change-Id: Ia278274372f085046a602fa5d8254e16c746f031
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties')
-rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties | 220 |
1 files changed, 110 insertions, 110 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties index e4958fda3..4da357008 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties @@ -1,110 +1,110 @@ -###############################################################################
-# Copyright (c) 2012 Obeo.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Obeo - initial API and implementation
-###############################################################################
-
-title= Model Compare (Containment Features)
-
-saveDialog.title= Save Resource
-saveDialog.message= Resource has been modified. Save changes?
-
-compareProgressTask.title= Computing Differences...
-
-tooComplexError.title= Error
-tooComplexError.message= Too many differences. Turn on the 'Ignore White Space' option or do a structure compare first.
-
-UnkownResource = Unknown Resource
-
-#####################################################
-# Toolbar actions
-#####################################################
-
-action.CopyLeftToRight.label=Copy Left to Right
-action.CopyLeftToRight.tooltip=Copy All from Left to Right
-action.CopyLeftToRight.image=copy_r_co.gif
-
-action.CopyRightToLeft.label=Copy Right to Left
-action.CopyRightToLeft.tooltip=Copy All Non-Conflicting Changes from Right to Left
-action.CopyRightToLeft.image=copy_l_co.gif
-
-action.CopyDiffLeftToRight.label=Copy Current Change to Right
-action.CopyDiffLeToRight.tooltip=Copy Current Change from Left to Right
-action.CopyDiffLeftToRight.image=copycont_r_co.gif
-
-action.CopyDiffRightToLeft.label=Copy Current Change to Left
-action.CopyDiffRightToLeft.tooltip=Copy Current Change from Right to Left
-action.CopyDiffRightToLeft.image=copycont_l_co.gif
-
-action.NextDiff.label=Next Difference
-action.NextDiff.tooltip=Next Difference
-action.NextDiff.image=next_diff_nav.gif
-
-action.PrevDiff.label=Previous Difference
-action.PrevDiff.tooltip=Previous Difference
-action.PrevDiff.image=prev_diff_nav.gif
-
-action.NextChange.label=Next Change
-action.NextChange.tooltip=Next Change
-action.NextChange.image=next_change_nav.gif
-
-action.PrevChange.label=Previous Change
-action.PrevChange.tooltip=Previous Change
-action.PrevChange.image=prev_change_nav.gif
-
-action.EnableAncestor.label=Enable Ancestor Pane
-action.EnableAncestor.tooltip.unchecked=Show Ancestor Pane
-action.EnableAncestor.tooltip.checked=Hide Ancestor Pane
-action.EnableAncestor.description.unchecked=Show Ancestor Pane
-action.EnableAncestor.description.checked=Hide Ancestor Pane
-action.EnableAncestor.image=ancestorpane_co.gif
-
-action.IgnoreAncestor.label=Ignore Ancestor
-action.IgnoreAncestor.tooltip.unchecked=Two-Way Compare (Ignore Ancestor)
-action.IgnoreAncestor.tooltip.checked=Three-Way Compare
-action.IgnoreAncestor.description.unchecked=Two-Way Compare (Ignore Ancestor)
-action.IgnoreAncestor.description.checked=Three-Way Compare
-action.IgnoreAncestor.image=twowaycompare_co.gif
-
-
-#####################################################
-# Context menu actions
-#####################################################
-
-action.undo.label=&Undo
-action.undo.tooltip=Undo Last Operation
-
-action.redo.label=&Redo
-action.redo.tooltip=Redo Last Operation
-
-action.cut.label=Cu&t
-action.cut.tooltip=Cut Text Selection to Clipboard
-
-action.copy.label=&Copy
-action.copy.tooltip=Copy Text Selection to Clipboard
-
-action.paste.label=&Paste
-action.paste.tooltip=Replace Text Selection with Clipboard Contents
-
-action.delete.label=&Delete
-action.delete.tooltip=Delete Current Text Selection
-
-action.find.label=&Find...
-action.find.tooltip=Find Occurrence
-
-action.selectAll.label=Select &All
-action.selectAll.tooltip=Select All Changes
-
-Editor.FindReplace.label=&Find/Replace...
-Editor.FindReplace.tooltip=Find/Replace
-Editor.FindReplace.image=
-Editor.FindReplace.description=Find/Replace
-
-action.IgnoreWhiteSpace.label=&Ignore White Space
-action.IgnoreWhiteSpace.tooltip=Ignore White Space Where Applicable
-
+############################################################################### +# Copyright (c) 2012 Obeo. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Obeo - initial API and implementation +############################################################################### + +title= Model Compare (Containment Features) + +saveDialog.title= Save Resource +saveDialog.message= Resource has been modified. Save changes? + +compareProgressTask.title= Computing Differences... + +tooComplexError.title= Error +tooComplexError.message= Too many differences. Turn on the 'Ignore White Space' option or do a structure compare first. + +UnkownResource = Unknown Resource + +##################################################### +# Toolbar actions +##################################################### + +action.CopyLeftToRight.label=Copy Left to Right +action.CopyLeftToRight.tooltip=Copy All from Left to Right +action.CopyLeftToRight.image=copy_r_co.gif + +action.CopyRightToLeft.label=Copy Right to Left +action.CopyRightToLeft.tooltip=Copy All Non-Conflicting Changes from Right to Left +action.CopyRightToLeft.image=copy_l_co.gif + +action.CopyDiffLeftToRight.label=Copy Current Change to Right +action.CopyDiffLeToRight.tooltip=Copy Current Change from Left to Right +action.CopyDiffLeftToRight.image=copycont_r_co.gif + +action.CopyDiffRightToLeft.label=Copy Current Change to Left +action.CopyDiffRightToLeft.tooltip=Copy Current Change from Right to Left +action.CopyDiffRightToLeft.image=copycont_l_co.gif + +action.NextDiff.label=Next Difference +action.NextDiff.tooltip=Next Difference +action.NextDiff.image=next_diff_nav.gif + +action.PrevDiff.label=Previous Difference +action.PrevDiff.tooltip=Previous Difference +action.PrevDiff.image=prev_diff_nav.gif + +action.NextChange.label=Next Change +action.NextChange.tooltip=Next Change +action.NextChange.image=next_change_nav.gif + +action.PrevChange.label=Previous Change +action.PrevChange.tooltip=Previous Change +action.PrevChange.image=prev_change_nav.gif + +action.EnableAncestor.label=Enable Ancestor Pane +action.EnableAncestor.tooltip.unchecked=Show Ancestor Pane +action.EnableAncestor.tooltip.checked=Hide Ancestor Pane +action.EnableAncestor.description.unchecked=Show Ancestor Pane +action.EnableAncestor.description.checked=Hide Ancestor Pane +action.EnableAncestor.image=ancestorpane_co.gif + +action.IgnoreAncestor.label=Ignore Ancestor +action.IgnoreAncestor.tooltip.unchecked=Two-Way Compare (Ignore Ancestor) +action.IgnoreAncestor.tooltip.checked=Three-Way Compare +action.IgnoreAncestor.description.unchecked=Two-Way Compare (Ignore Ancestor) +action.IgnoreAncestor.description.checked=Three-Way Compare +action.IgnoreAncestor.image=twowaycompare_co.gif + + +##################################################### +# Context menu actions +##################################################### + +action.undo.label=&Undo +action.undo.tooltip=Undo Last Operation + +action.redo.label=&Redo +action.redo.tooltip=Redo Last Operation + +action.cut.label=Cu&t +action.cut.tooltip=Cut Text Selection to Clipboard + +action.copy.label=&Copy +action.copy.tooltip=Copy Text Selection to Clipboard + +action.paste.label=&Paste +action.paste.tooltip=Replace Text Selection with Clipboard Contents + +action.delete.label=&Delete +action.delete.tooltip=Delete Current Text Selection + +action.find.label=&Find... +action.find.tooltip=Find Occurrence + +action.selectAll.label=Select &All +action.selectAll.tooltip=Select All Changes + +Editor.FindReplace.label=&Find/Replace... +Editor.FindReplace.tooltip=Find/Replace +Editor.FindReplace.image= +Editor.FindReplace.description=Find/Replace + +action.IgnoreWhiteSpace.label=&Ignore White Space +action.IgnoreWhiteSpace.tooltip=Ignore White Space Where Applicable + |