diff --git a/language/common_res.h b/language/common_res.h index f86af4cf0..df506011c 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -463,7 +463,7 @@ #define IDM_VIEW_SHOWEOLS 40408 #define IDM_VIEW_WORDWRAPSYMBOLS 40409 #define IDM_VIEW_MATCHBRACES 40410 -#define IDM_VIEW_HILITECURRENTLINE 40411 +#define IDM_VIEW_HIGHLIGHTCURRENTLINE 40411 #define IDM_VIEW_LINENUMBERS 40412 #define IDM_VIEW_MARGIN 40413 #define IDM_VIEW_ZOOMIN 40414 diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 13f36c5f2..f81da0694 100644 Binary files a/language/np3_af_za/menu_af_za.rc and b/language/np3_af_za/menu_af_za.rc differ diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 8532a5e34..a13496af9 100644 Binary files a/language/np3_de_de/menu_de_de.rc and b/language/np3_de_de/menu_de_de.rc differ diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 13988dbb7..234121ffa 100644 Binary files a/language/np3_en_gb/menu_en_gb.rc and b/language/np3_en_gb/menu_en_gb.rc differ diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index bc279db30..4a6303080 100644 Binary files a/language/np3_en_us/menu_en_us.rc and b/language/np3_en_us/menu_en_us.rc differ diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index 27db9db3d..45caacc12 100644 Binary files a/language/np3_es_es/menu_es_es.rc and b/language/np3_es_es/menu_es_es.rc differ diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 7a029cfd3..333d46d65 100644 Binary files a/language/np3_fr_fr/menu_fr_fr.rc and b/language/np3_fr_fr/menu_fr_fr.rc differ diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 28ab21638..1b909d368 100644 Binary files a/language/np3_ja_jp/menu_ja_jp.rc and b/language/np3_ja_jp/menu_ja_jp.rc differ diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index babe2b55a..b63d07aef 100644 Binary files a/language/np3_nl_nl/menu_nl_nl.rc and b/language/np3_nl_nl/menu_nl_nl.rc differ diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 0bc76bbbd..c99d92a22 100644 Binary files a/language/np3_zh_cn/menu_zh_cn.rc and b/language/np3_zh_cn/menu_zh_cn.rc differ diff --git a/src/Notepad3.c b/src/Notepad3.c index 9719ae88d..9d87cd43e 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -2892,7 +2892,7 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) i = SciCall_GetLexer(); //EnableCmd(hmenu,IDM_VIEW_AUTOCLOSETAGS,(i == SCLEX_HTML || i == SCLEX_XML)); CheckCmd(hmenu, IDM_VIEW_AUTOCLOSETAGS, Settings.AutoCloseTags /*&& (i == SCLEX_HTML || i == SCLEX_XML)*/); - CheckCmd(hmenu, IDM_VIEW_HILITECURRENTLINE, Settings.HighlightCurrentLine); + CheckCmd(hmenu, IDM_VIEW_HIGHLIGHTCURRENTLINE, Settings.HighlightCurrentLine); CheckCmd(hmenu, IDM_VIEW_HYPERLINKHOTSPOTS, Settings.HyperlinkHotspot); CheckCmd(hmenu, IDM_VIEW_SCROLLPASTEOF, Settings.ScrollPastEOF); @@ -4753,7 +4753,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) Settings.AutoCloseTags = !Settings.AutoCloseTags; break; - case IDM_VIEW_HILITECURRENTLINE: + case IDM_VIEW_HIGHLIGHTCURRENTLINE: Settings.HighlightCurrentLine = !Settings.HighlightCurrentLine; Style_SetCurrentLineBackground(Globals.hwndEdit, Settings.HighlightCurrentLine); break; diff --git a/src/Notepad3.rc b/src/Notepad3.rc index 43b3bc0fe..762705c06 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -130,7 +130,7 @@ BEGIN "I", IDM_EDIT_SPLITLINES, VIRTKEY, CONTROL, NOINVERT "I", IDM_FILE_OPENFAV, VIRTKEY, ALT, NOINVERT "I", IDM_EDIT_TITLECASE, VIRTKEY, CONTROL, ALT, NOINVERT - "I", IDM_VIEW_HILITECURRENTLINE, VIRTKEY, SHIFT, CONTROL, NOINVERT + "I", IDM_VIEW_HIGHLIGHTCURRENTLINE, VIRTKEY, SHIFT, CONTROL, NOINVERT "J", IDM_EDIT_JOINLINES, VIRTKEY, CONTROL, NOINVERT "J", IDM_EDIT_JOINLN_NOSP, VIRTKEY, CONTROL, ALT, NOINVERT "J", IDM_EDIT_JOINLINES_PARA, VIRTKEY, SHIFT, CONTROL, NOINVERT