From 8111501a4e8ae7fd760345be69ae49b19f42fc26 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Fri, 21 Feb 2014 12:45:56 +0400 Subject: [PATCH] diff: fix action name --- .../platform-resources-en/src/messages/DiffBundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-resources-en/src/messages/DiffBundle.properties b/platform/platform-resources-en/src/messages/DiffBundle.properties index 4b46af689579..66a7bab05489 100644 --- a/platform/platform-resources-en/src/messages/DiffBundle.properties +++ b/platform/platform-resources-en/src/messages/DiffBundle.properties @@ -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