diff: fix action name

This commit is contained in:
Aleksey Pivovarov
2014-02-21 12:45:56 +04:00
parent 8c6f416580
commit 8111501a4e
@@ -63,7 +63,7 @@ merge.dialog.all.conflicts.resolved.message.text=All conflicts resolved
#0 - changes count, 1 - conflicts count
merge.statistics.message={0, choice, 0#No changes|1#One change|2#{0, number} changes}. {1, choice, 0#No conflicts|1#One conflict|2#{0, number} conflicts}
merge.partial.diff.action.name=Compare left and right panel contents
merge.partial.diff.action.name.0.1=Compare middle and left panel contents
merge.partial.diff.action.name.0.1=Compare left and middle panel contents
merge.partial.diff.action.name.1.2=Compare middle and right panel contents
merge.dialog.exit.without.applying.changes.confirmation.message=Are you sure you want to exit without applying changes?
cancel.visual.merge.dialog.title=Cancel Visual Merge