From a6fc2c2e15bbc1defe6374e9774d9794997e7a4e Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 4 May 2020 19:57:48 +0300 Subject: [PATCH] diff: fix ampersand escaping in Keymap group Fix regression after 3f87a3512dd673192035e5e7082cc927ed2e82ad Follow-up: e0bb49d564a100512e890c1adbbf33fe9a9549ab GitOrigin-RevId: 14d50fa6fad7eacd5de039973f56bb4164cc6ec9 --- .../platform-resources-en/src/messages/ActionsBundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties index 349c86bd5ff9..7181307bbf90 100644 --- a/platform/platform-resources-en/src/messages/ActionsBundle.properties +++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties @@ -2155,7 +2155,7 @@ group.TreeActions.text=Tree Actions group.PopupMenuActions.text=Popup Menu Actions group.NavBarActions.text=Navigation Bar Actions group.ScrollPaneActions.text=Scroll -group.Diff.KeymapGroup.text=Diff \\& Merge +group.Diff.KeymapGroup.text=Diff \\&\\& Merge group.TabsActions.text=Tabs group.TWViewModes.text=Tool Windows View Modes group.TWViewModesLegacy.text=Tool Windows Legacy View Modes (deprecated)