Merge branch 'master' into new-merge
[idea/community.git] / platform / platform-resources-en / src / messages / ActionsBundle.properties
index 258e096321bee9610adac08687576937eefa1a49..d0723d9d1cfbd9d6760a07083a3bf4692b9544e1 100644 (file)
@@ -1235,6 +1235,12 @@ action.Diff.FocusOppositePaneAndScroll.description=Select the same position in o
 action.Diff.PrevChange.text=Compare Previous File
 action.Diff.NextChange.text=Compare Next File
 action.Diff.SelectedChange.text=Choose File To Compare
+action.Diff.ApplyLeftSide.text=Apply Left Side
+action.Diff.ApplyRightSide.text=Apply Right Side
+action.Diff.AppendLeftSide.text=Append Left Side
+action.Diff.AppendRightSide.text=Append Right Side
+action.Diff.IgnoreLeftSide.text=Ignore Left Side
+action.Diff.IgnoreRightSide.text=Ignore Right Side
 
 action.FileChooser.ShowHiddens.text=Show Hidden Files and Directories
 action.FileChooser.ShowHiddens.description=Show hidden files and directories