Substitute "Mark" for "Style" in the menu entries

In order to avoid users' confusion, all "Mark" occurrences of menu entries are substituted for "Style", so users won't confuse with "Mark" fonction in Find dialog.

Ref: https://github.com/notepad-plus-plus/notepad-plus-plus/issues/10195#issuecomment-893481499

Close #10351
This commit is contained in:
Don Ho 2021-08-07 23:28:15 +02:00
parent 686bf4fba1
commit 2576bf884b
5 changed files with 91 additions and 90 deletions

View File

@ -36,9 +36,9 @@ The comments are here for explanation, it's not necessary to translate them.
<Item subMenuId="edit-blankOperations" name="&amp;Blank Operations"/>
<Item subMenuId="edit-pasteSpecial" name="&amp;Paste Special"/>
<Item subMenuId="edit-onSelection" name="&amp;On Selection"/>
<Item subMenuId="search-markAll" name="Mark &amp;All"/>
<Item subMenuId="search-markOne" name="Mark &amp;One"/>
<Item subMenuId="search-unmarkAll" name="&amp;Unmark All"/>
<Item subMenuId="search-markAll" name="Style &amp;All Occurrences of Token"/>
<Item subMenuId="search-markOne" name="Style &amp;One Token"/>
<Item subMenuId="search-unmarkAll" name="Clear Style"/>
<Item subMenuId="search-jumpUp" name="&amp;Jump Up"/>
<Item subMenuId="search-jumpDown" name="Jump &amp;Down"/>
<Item subMenuId="search-copyStyledText" name="&amp;Copy Styled Text"/>
@ -220,20 +220,20 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="43035" name="3rd style"/>
<Item id="43036" name="4th style"/>
<Item id="43037" name="5th style"/>
<Item id="43038" name="Find style"/>
<Item id="43038" name="Find Mark Style"/>
<Item id="43039" name="1st style"/>
<Item id="43040" name="2nd style"/>
<Item id="43041" name="3rd style"/>
<Item id="43042" name="4th style"/>
<Item id="43043" name="5th style"/>
<Item id="43044" name="Find style"/>
<Item id="43044" name="Find Mark Style"/>
<Item id="43055" name="1st Style"/>
<Item id="43056" name="2nd Style"/>
<Item id="43057" name="3rd Style"/>
<Item id="43058" name="4th Style"/>
<Item id="43059" name="5th Style"/>
<Item id="43060" name="All Styles"/>
<Item id="43061" name="Find Style (Marked)"/>
<Item id="43061" name="Find Mark Style"/>
<Item id="43062" name="Using 1st Style"/>
<Item id="43063" name="Using 2nd Style"/>
<Item id="43064" name="Using 3rd Style"/>
@ -547,41 +547,41 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="45001" name="EOL Conversion to Windows (CR LF)"/>
<Item id="45002" name="EOL Conversion to Unix (LF)"/>
<Item id="45003" name="EOL Conversion to Macintosh (CR)"/>
<Item id="43022" name="Mark all using 1st style"/>
<Item id="43024" name="Mark all using 2nd style"/>
<Item id="43026" name="Mark all using 3rd style"/>
<Item id="43028" name="Mark all using 4th style"/>
<Item id="43030" name="Mark all using 5th style"/>
<Item id="43062" name="Mark one using 1st style"/>
<Item id="43063" name="Mark one using 2nd style"/>
<Item id="43064" name="Mark one using 3rd style"/>
<Item id="43065" name="Mark one using 4th style"/>
<Item id="43066" name="Mark one using 5th style"/>
<Item id="43023" name="Clear marks using 1st style"/>
<Item id="43025" name="Clear marks using 2nd style"/>
<Item id="43027" name="Clear marks using 3rd style"/>
<Item id="43029" name="Clear marks using 4th style"/>
<Item id="43031" name="Clear marks using 5th style"/>
<Item id="43032" name="Clear marks using any style"/>
<Item id="43033" name="Previous mark using 1st style"/>
<Item id="43034" name="Previous mark using 2nd style"/>
<Item id="43035" name="Previous mark using 3rd style"/>
<Item id="43036" name="Previous mark using 4th style"/>
<Item id="43037" name="Previous mark using 5th style"/>
<Item id="43038" name="Previous mark created with Mark"/>
<Item id="43039" name="Next mark using 1st style"/>
<Item id="43040" name="Next mark using 2nd style"/>
<Item id="43041" name="Next mark using 3rd style"/>
<Item id="43042" name="Next mark using 4th style"/>
<Item id="43043" name="Next mark using 5th style"/>
<Item id="43044" name="Next mark created with Mark"/>
<Item id="43055" name="Copy Styled Text - 1st Style"/>
<Item id="43056" name="Copy Styled Text - 2nd Style"/>
<Item id="43057" name="Copy Styled Text - 3rd Style"/>
<Item id="43058" name="Copy Styled Text - 4th Style"/>
<Item id="43059" name="Copy Styled Text - 5th Style"/>
<Item id="43060" name="Copy Styled Text - All Styles"/>
<Item id="43061" name="Copy Styled Text - Find Style (Marked)"/>
<Item id="43022" name="Style all using 1st style"/>
<Item id="43024" name="Style all using 2nd style"/>
<Item id="43026" name="Style all using 3rd style"/>
<Item id="43028" name="Style all using 4th style"/>
<Item id="43030" name="Style all using 5th style"/>
<Item id="43062" name="Style one using 1st style"/>
<Item id="43063" name="Style one using 2nd style"/>
<Item id="43064" name="Style one using 3rd style"/>
<Item id="43065" name="Style one using 4th style"/>
<Item id="43066" name="Style one using 5th style"/>
<Item id="43023" name="Clear 1st style"/>
<Item id="43025" name="Clear 2nd style"/>
<Item id="43027" name="Clear 3rd style"/>
<Item id="43029" name="Clear 4th style"/>
<Item id="43031" name="Clear 5th style"/>
<Item id="43032" name="Clear all styles"/>
<Item id="43033" name="Previous style of 1st style"/>
<Item id="43034" name="Previous style of 2nd style"/>
<Item id="43035" name="Previous style of 3rd style"/>
<Item id="43036" name="Previous style of 4th style"/>
<Item id="43037" name="Previous style of 5th style"/>
<Item id="43038" name="Previous style of Find Mark style"/>
<Item id="43039" name="Next style of 1st style"/>
<Item id="43040" name="Next style of 2nd style"/>
<Item id="43041" name="Next style of 3rd style"/>
<Item id="43042" name="Next style of 4th style"/>
<Item id="43043" name="Next style of 5th style"/>
<Item id="43044" name="Next style of Find Mark style"/>
<Item id="43055" name="Copy Styled Text of 1st Style"/>
<Item id="43056" name="Copy Styled Text of 2nd Style"/>
<Item id="43057" name="Copy Styled Text of 3rd Style"/>
<Item id="43058" name="Copy Styled Text of 4th Style"/>
<Item id="43059" name="Copy Styled Text of 5th Style"/>
<Item id="43060" name="Copy Styled Text of All Styles"/>
<Item id="43061" name="Copy Styled Text of Find Mark style"/>
<Item id="44100" name="View current file in Firefox"/>
<Item id="44101" name="View current file in Chrome"/>
<Item id="44103" name="View current file in IE"/>
@ -616,6 +616,7 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="44105" name="Switch to Project Panel 2"/>
<Item id="44106" name="Switch to Project Panel 3"/>
<Item id="44107" name="Switch to Folder as Workspace"/>
<Item id="44109" name="Switch to Document List"/>
<Item id="44108" name="Switch to Function List"/>
</MainCommandNames>
</ShortcutMapper>
@ -937,7 +938,7 @@ You can define several column markers by using white space to separate the diffe
</Language>
<Highlighting title="Highlighting">
<Item id="6351" name="Mark All"/>
<Item id="6351" name="Style All Occurrences of Token"/>
<Item id="6352" name="Match case"/>
<Item id="6353" name="Match whole word only"/>
<Item id="6333" name="Smart Highlighting"/>

View File

@ -559,7 +559,7 @@ BEGIN
MENUITEM "Mar&k...", IDM_SEARCH_MARK
MENUITEM SEPARATOR
POPUP "Mark &All"
POPUP "Style &All Occurrences of Token"
BEGIN
MENUITEM "Using 1st Style", IDM_SEARCH_MARKALLEXT1
MENUITEM "Using 2nd Style", IDM_SEARCH_MARKALLEXT2
@ -567,7 +567,7 @@ BEGIN
MENUITEM "Using 4th Style", IDM_SEARCH_MARKALLEXT4
MENUITEM "Using 5th Style", IDM_SEARCH_MARKALLEXT5
END
POPUP "Mark &One"
POPUP "Style &One Token"
BEGIN
MENUITEM "Using 1st Style", IDM_SEARCH_MARKONEEXT1
MENUITEM "Using 2nd Style", IDM_SEARCH_MARKONEEXT2
@ -575,7 +575,7 @@ BEGIN
MENUITEM "Using 4th Style", IDM_SEARCH_MARKONEEXT4
MENUITEM "Using 5th Style", IDM_SEARCH_MARKONEEXT5
END
POPUP "&Unmark All"
POPUP "Clear Style"
BEGIN
MENUITEM "Clear 1st Style", IDM_SEARCH_UNMARKALLEXT1
MENUITEM "Clear 2nd Style", IDM_SEARCH_UNMARKALLEXT2
@ -591,7 +591,7 @@ BEGIN
MENUITEM "3rd Style", IDM_SEARCH_GOPREVMARKER3
MENUITEM "4th Style", IDM_SEARCH_GOPREVMARKER4
MENUITEM "5th Style", IDM_SEARCH_GOPREVMARKER5
MENUITEM "Find Style", IDM_SEARCH_GOPREVMARKER_DEF
MENUITEM "Find Mark Style", IDM_SEARCH_GOPREVMARKER_DEF
END
POPUP "Jump &Down"
BEGIN
@ -600,7 +600,7 @@ BEGIN
MENUITEM "3rd Style", IDM_SEARCH_GONEXTMARKER3
MENUITEM "4th Style", IDM_SEARCH_GONEXTMARKER4
MENUITEM "5th Style", IDM_SEARCH_GONEXTMARKER5
MENUITEM "Find Style", IDM_SEARCH_GONEXTMARKER_DEF
MENUITEM "Find Mark Style", IDM_SEARCH_GONEXTMARKER_DEF
END
POPUP "&Copy Styled Text"
BEGIN
@ -610,7 +610,7 @@ BEGIN
MENUITEM "4th Style", IDM_SEARCH_STYLE4TOCLIP
MENUITEM "5th Style", IDM_SEARCH_STYLE5TOCLIP
MENUITEM "All Styles", IDM_SEARCH_ALLSTYLESTOCLIP
MENUITEM "Find Style (Marked)", IDM_SEARCH_MARKEDTOCLIP
MENUITEM "Find Mark Style", IDM_SEARCH_MARKEDTOCLIP
END
MENUITEM SEPARATOR
POPUP "&Bookmark"

View File

@ -189,41 +189,41 @@ static const WinMenuKeyDefinition winKeyDefs[] =
{ VK_B, IDM_SEARCH_GOTOMATCHINGBRACE, true, false, false, nullptr },
{ VK_B, IDM_SEARCH_SELECTMATCHINGBRACES, true, true, false, nullptr },
{ VK_M, IDM_SEARCH_MARK, true, false, false, nullptr },
{ VK_NULL, IDM_SEARCH_MARKALLEXT1, false, false, false, TEXT("Mark all using 1st style") },
{ VK_NULL, IDM_SEARCH_MARKALLEXT2, false, false, false, TEXT("Mark all using 2nd style") },
{ VK_NULL, IDM_SEARCH_MARKALLEXT3, false, false, false, TEXT("Mark all using 3rd style") },
{ VK_NULL, IDM_SEARCH_MARKALLEXT4, false, false, false, TEXT("Mark all using 4th style") },
{ VK_NULL, IDM_SEARCH_MARKALLEXT5, false, false, false, TEXT("Mark all using 5th style") },
{ VK_NULL, IDM_SEARCH_MARKONEEXT1, false, false, false, TEXT("Mark one using 1st style") },
{ VK_NULL, IDM_SEARCH_MARKONEEXT2, false, false, false, TEXT("Mark one using 2nd style") },
{ VK_NULL, IDM_SEARCH_MARKONEEXT3, false, false, false, TEXT("Mark one using 3rd style") },
{ VK_NULL, IDM_SEARCH_MARKONEEXT4, false, false, false, TEXT("Mark one using 4th style") },
{ VK_NULL, IDM_SEARCH_MARKONEEXT5, false, false, false, TEXT("Mark one using 5th style") },
{ VK_NULL, IDM_SEARCH_UNMARKALLEXT1, false, false, false, TEXT("Clear marks using 1st style") },
{ VK_NULL, IDM_SEARCH_UNMARKALLEXT2, false, false, false, TEXT("Clear marks using 2nd style") },
{ VK_NULL, IDM_SEARCH_UNMARKALLEXT3, false, false, false, TEXT("Clear marks using 3rd style") },
{ VK_NULL, IDM_SEARCH_UNMARKALLEXT4, false, false, false, TEXT("Clear marks using 4th style") },
{ VK_NULL, IDM_SEARCH_UNMARKALLEXT5, false, false, false, TEXT("Clear marks using 5th style") },
{ VK_NULL, IDM_SEARCH_CLEARALLMARKS, false, false, false, TEXT("Clear marks using any style") },
{ VK_1, IDM_SEARCH_GOPREVMARKER1, true, false, true, TEXT("Previous mark using 1st style") },
{ VK_2, IDM_SEARCH_GOPREVMARKER2, true, false, true, TEXT("Previous mark using 2nd style") },
{ VK_3, IDM_SEARCH_GOPREVMARKER3, true, false, true, TEXT("Previous mark using 3rd style") },
{ VK_4, IDM_SEARCH_GOPREVMARKER4, true, false, true, TEXT("Previous mark using 4th style") },
{ VK_5, IDM_SEARCH_GOPREVMARKER5, true, false, true, TEXT("Previous mark using 5th style") },
{ VK_0, IDM_SEARCH_GOPREVMARKER_DEF, true, false, true, TEXT("Previous mark created with Mark") },
{ VK_1, IDM_SEARCH_GONEXTMARKER1, true, false, false, TEXT("Next mark using 1st style") },
{ VK_2, IDM_SEARCH_GONEXTMARKER2, true, false, false, TEXT("Next mark using 2nd style") },
{ VK_3, IDM_SEARCH_GONEXTMARKER3, true, false, false, TEXT("Next mark using 3rd style") },
{ VK_4, IDM_SEARCH_GONEXTMARKER4, true, false, false, TEXT("Next mark using 4th style") },
{ VK_5, IDM_SEARCH_GONEXTMARKER5, true, false, false, TEXT("Next mark using 5th style") },
{ VK_0, IDM_SEARCH_GONEXTMARKER_DEF, true, false, false, TEXT("Next mark created with Mark") },
{ VK_NULL, IDM_SEARCH_STYLE1TOCLIP, false, false, false, TEXT("Copy Styled Text - 1st Style") },
{ VK_NULL, IDM_SEARCH_STYLE2TOCLIP, false, false, false, TEXT("Copy Styled Text - 2nd Style") },
{ VK_NULL, IDM_SEARCH_STYLE3TOCLIP, false, false, false, TEXT("Copy Styled Text - 3rd Style") },
{ VK_NULL, IDM_SEARCH_STYLE4TOCLIP, false, false, false, TEXT("Copy Styled Text - 4th Style") },
{ VK_NULL, IDM_SEARCH_STYLE5TOCLIP, false, false, false, TEXT("Copy Styled Text - 5th Style") },
{ VK_NULL, IDM_SEARCH_ALLSTYLESTOCLIP, false, false, false, TEXT("Copy Styled Text - All Styles") },
{ VK_NULL, IDM_SEARCH_MARKEDTOCLIP, false, false, false, TEXT("Copy Styled Text - Find Style (Marked)") },
{ VK_NULL, IDM_SEARCH_MARKALLEXT1, false, false, false, TEXT("Style all using 1st style") },
{ VK_NULL, IDM_SEARCH_MARKALLEXT2, false, false, false, TEXT("Style all using 2nd style") },
{ VK_NULL, IDM_SEARCH_MARKALLEXT3, false, false, false, TEXT("Style all using 3rd style") },
{ VK_NULL, IDM_SEARCH_MARKALLEXT4, false, false, false, TEXT("Style all using 4th style") },
{ VK_NULL, IDM_SEARCH_MARKALLEXT5, false, false, false, TEXT("Style all using 5th style") },
{ VK_NULL, IDM_SEARCH_MARKONEEXT1, false, false, false, TEXT("Style one using 1st style") },
{ VK_NULL, IDM_SEARCH_MARKONEEXT2, false, false, false, TEXT("Style one using 2nd style") },
{ VK_NULL, IDM_SEARCH_MARKONEEXT3, false, false, false, TEXT("Style one using 3rd style") },
{ VK_NULL, IDM_SEARCH_MARKONEEXT4, false, false, false, TEXT("Style one using 4th style") },
{ VK_NULL, IDM_SEARCH_MARKONEEXT5, false, false, false, TEXT("Style one using 5th style") },
{ VK_NULL, IDM_SEARCH_UNMARKALLEXT1, false, false, false, TEXT("Clear 1st style") },
{ VK_NULL, IDM_SEARCH_UNMARKALLEXT2, false, false, false, TEXT("Clear 2nd style") },
{ VK_NULL, IDM_SEARCH_UNMARKALLEXT3, false, false, false, TEXT("Clear 3rd style") },
{ VK_NULL, IDM_SEARCH_UNMARKALLEXT4, false, false, false, TEXT("Clear 4th style") },
{ VK_NULL, IDM_SEARCH_UNMARKALLEXT5, false, false, false, TEXT("Clear 5th style") },
{ VK_NULL, IDM_SEARCH_CLEARALLMARKS, false, false, false, TEXT("Clear all styles") },
{ VK_1, IDM_SEARCH_GOPREVMARKER1, true, false, true, TEXT("Previous style of 1st style") },
{ VK_2, IDM_SEARCH_GOPREVMARKER2, true, false, true, TEXT("Previous style of 2nd style") },
{ VK_3, IDM_SEARCH_GOPREVMARKER3, true, false, true, TEXT("Previous style of 3rd style") },
{ VK_4, IDM_SEARCH_GOPREVMARKER4, true, false, true, TEXT("Previous style of 4th style") },
{ VK_5, IDM_SEARCH_GOPREVMARKER5, true, false, true, TEXT("Previous style of 5th style") },
{ VK_0, IDM_SEARCH_GOPREVMARKER_DEF, true, false, true, TEXT("Previous style of Find Mark style") },
{ VK_1, IDM_SEARCH_GONEXTMARKER1, true, false, false, TEXT("Next style of 1st style") },
{ VK_2, IDM_SEARCH_GONEXTMARKER2, true, false, false, TEXT("Next style of 2nd style") },
{ VK_3, IDM_SEARCH_GONEXTMARKER3, true, false, false, TEXT("Next style of 3rd style") },
{ VK_4, IDM_SEARCH_GONEXTMARKER4, true, false, false, TEXT("Next style of 4th style") },
{ VK_5, IDM_SEARCH_GONEXTMARKER5, true, false, false, TEXT("Next style of 5th style") },
{ VK_0, IDM_SEARCH_GONEXTMARKER_DEF, true, false, false, TEXT("Next style of Find Mark style") },
{ VK_NULL, IDM_SEARCH_STYLE1TOCLIP, false, false, false, TEXT("Copy Styled Text of 1st Style") },
{ VK_NULL, IDM_SEARCH_STYLE2TOCLIP, false, false, false, TEXT("Copy Styled Text of 2nd Style") },
{ VK_NULL, IDM_SEARCH_STYLE3TOCLIP, false, false, false, TEXT("Copy Styled Text of 3rd Style") },
{ VK_NULL, IDM_SEARCH_STYLE4TOCLIP, false, false, false, TEXT("Copy Styled Text of 4th Style") },
{ VK_NULL, IDM_SEARCH_STYLE5TOCLIP, false, false, false, TEXT("Copy Styled Text of 5th Style") },
{ VK_NULL, IDM_SEARCH_ALLSTYLESTOCLIP, false, false, false, TEXT("Copy Styled Text of All Styles") },
{ VK_NULL, IDM_SEARCH_MARKEDTOCLIP, false, false, false, TEXT("Copy Styled Text of Find Mark style") },
{ VK_F2, IDM_SEARCH_TOGGLE_BOOKMARK, true, false, false, nullptr },
{ VK_F2, IDM_SEARCH_NEXT_BOOKMARK, false, false, false, nullptr },
{ VK_F2, IDM_SEARCH_PREV_BOOKMARK, false, false, true, nullptr },

View File

@ -240,7 +240,7 @@ IDD_PREFERENCE_SUB_HIGHLIGHTING DIALOGEX 0, 0, 455, 185
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Mark All",IDC_MARKALL_STATIC,62,29,155,45,BS_CENTER
GROUPBOX "Style All Occurrences of Token",IDC_MARKALL_STATIC,62,29,155,45,BS_CENTER
CONTROL "Match case",IDC_CHECK_MARKALLCASESENSITIVE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,70,42,142,10
CONTROL "Match whole word only",IDC_CHECK_MARKALLWHOLEWORDONLY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,70,55,142,10
GROUPBOX "Smart Highlighting",IDC_SMARTHILITING_STATIC,226,29,172,108,BS_CENTER

View File

@ -42,12 +42,12 @@ https://npp-user-manual.org/docs/config-files/#the-context-menu-contextmenu-xml
<Item FolderName="Style one token" id="43065"/>
<Item FolderName="Style one token" id="43066"/>
<Item FolderName="Remove style" id="43023"/>
<Item FolderName="Remove style" id="43025"/>
<Item FolderName="Remove style" id="43027"/>
<Item FolderName="Remove style" id="43029"/>
<Item FolderName="Remove style" id="43031"/>
<Item FolderName="Remove style" id="43032"/>
<Item FolderName="Clear style" id="43023"/>
<Item FolderName="Clear style" id="43025"/>
<Item FolderName="Clear style" id="43027"/>
<Item FolderName="Clear style" id="43029"/>
<Item FolderName="Clear style" id="43031"/>
<Item FolderName="Clear style" id="43032"/>
<Item id="0"/>
<!--