From 75cd37ac0fa001e043ac207eaeedf6bf991a0939 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 10 Sep 2019 11:52:43 +0200 Subject: [PATCH] MUI - suppress "Ctrl+Shift+Alt+F" (Code Folding) - because no longer works from Windows 10 version 1903. --- Build/Changes.txt | 4 ++-- language/np3_af_za/menu_af_za.rc | 2 +- language/np3_be_by/menu_be_by.rc | 2 +- language/np3_de_de/menu_de_de.rc | 2 +- language/np3_en_gb/menu_en_gb.rc | 2 +- language/np3_en_us/menu_en_us.rc | 2 +- language/np3_es_es/menu_es_es.rc | 2 +- language/np3_fr_fr/menu_fr_fr.rc | 2 +- language/np3_hu_hu/menu_hu_hu.rc | 2 +- language/np3_it_it/menu_it_it.rc | 2 +- language/np3_ja_jp/menu_ja_jp.rc | 2 +- language/np3_ko_kr/menu_ko_kr.rc | 2 +- language/np3_nl_nl/menu_nl_nl.rc | 2 +- language/np3_pl_pl/menu_pl_pl.rc | 2 +- language/np3_pt_br/menu_pt_br.rc | 2 +- language/np3_ru_ru/menu_ru_ru.rc | 2 +- language/np3_sk_sk/menu_sk_sk.rc | 2 +- language/np3_sv_se/menu_sv_se.rc | 2 +- language/np3_tr_tr/menu_tr_tr.rc | 2 +- language/np3_zh_cn/menu_zh_cn.rc | 2 +- src/Notepad3.rc | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 41ee2306a..85293a1a5 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ================================================== -Current BETA Version 5.19.909.#(build) (2019-09-09) +Current BETA Version 5.19.910.#(build) (2019-09-10) ================================================== -------------------------------------------------- @@ -78,7 +78,7 @@ FIXES: -------------------------------------------------- REMOVED: -------------------------------------------------- -- +- "Ctrl+Shift+Alt+F" (Code Folding) because no longer works with Win10 1903. -------------------------------------------------- TRANSLATIONS (MUI): diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index e0440ee6b..f6713603b 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "Ver&toning" BEGIN - MENUITEM "Kode &Vou\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "Kode &Vou", IDM_VIEW_FOLDING MENUITEM "&Wissel Voue\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Gefokusde Aansig\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index c72970550..aaac45d16 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "& " BEGIN - MENUITEM "& \tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "& ", IDM_VIEW_FOLDING MENUITEM "/& \tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM " \tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM " &", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index d6e641ff0..11f626472 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Anzeigen" BEGIN - MENUITEM "&Code Faltung\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "&Code Faltung", IDM_VIEW_FOLDING MENUITEM "Code Faltung &Umschalten\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Fokussierte Ansicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "Logfile &Monitoring", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index e24e91dd3..525e82960 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Display" BEGIN - MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "Code &Folding", IDM_VIEW_FOLDING MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 25b7f4280..775ed91ad 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Display" BEGIN - MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "Code &Folding", IDM_VIEW_FOLDING MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index d3ab99c24..39488ba0c 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "Mos&trar" BEGIN - MENUITEM "&Cdigo plegable\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "&Cdigo plegable", IDM_VIEW_FOLDING MENUITEM "&Alternar pliegues\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Vista enfocada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Monitoreo de Log", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 4d3d7bb5d..56b4e5104 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Afficher" BEGIN - MENUITEM "&Code Pliages\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "&Code Pliages", IDM_VIEW_FOLDING MENUITEM "&Alterner Pliages\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Vue Focalise\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Surveillance de Log", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 779dead9b..0267eb2ed 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Megjelents" BEGIN - MENUITEM "&Kdblokk sszecsuks\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "&Kdblokk sszecsuks", IDM_VIEW_FOLDING MENUITEM "Kdblokk &vlts\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Fkuszlt nzet\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Naplfjl kvetse", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 63b1b2e46..4f9f03fc6 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Mostra" BEGIN - MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "Code &Folding", IDM_VIEW_FOLDING MENUITEM "&Attiva/Disattiva Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Visualizzazione focalizzata\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Monitoraggio log", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 632ee0002..0555c0923 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "܂肽݂\(&D)" BEGIN - MENUITEM "R[h܂肽݂\(&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "R[h܂肽݂\(&F)", IDM_VIEW_FOLDING MENUITEM "ׂĐ܂肽(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "P][h\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "ҏW[h(&M)", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index b2ffacaa9..0eb262555 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "(&D)" BEGIN - MENUITEM "ڵ (&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "ڵ (&F)", IDM_VIEW_FOLDING MENUITEM " ȯ(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "(&M)", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 6c600d7a7..a6dccb9af 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Tonen" BEGIN - MENUITEM "Sectie &samenvouwen\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "Sectie &samenvouwen", IDM_VIEW_FOLDING MENUITEM "&Toggle vouwen\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Gefocust zicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "Log &Monitoren", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index 3a63133eb..5edc37f3a 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Poka" BEGIN - MENUITEM "Skadanie kodu\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "Skadanie kodu", IDM_VIEW_FOLDING MENUITEM "&Przecz skadanie kodu\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Widok skupiony\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "Dziennik &monitorowania", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 6aceb6c82..a7044b403 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Display" BEGIN - MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "Code &Folding", IDM_VIEW_FOLDING MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 841131b79..9a2266ee8 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "& " BEGIN - MENUITEM "& \tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "& ", IDM_VIEW_FOLDING MENUITEM "/& \tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM " \tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM " &", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc index d7e55a152..19b366e14 100644 --- a/language/np3_sk_sk/menu_sk_sk.rc +++ b/language/np3_sk_sk/menu_sk_sk.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Display" BEGIN - MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "Code &Folding", IDM_VIEW_FOLDING MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc index 3b7f97165..324664b61 100644 --- a/language/np3_sv_se/menu_sv_se.rc +++ b/language/np3_sv_se/menu_sv_se.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Display" BEGIN - MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "Code &Folding", IDM_VIEW_FOLDING MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc index ee0c290ff..acc1bfd96 100644 --- a/language/np3_tr_tr/menu_tr_tr.rc +++ b/language/np3_tr_tr/menu_tr_tr.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Display" BEGIN - MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "Code &Folding", IDM_VIEW_FOLDING MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 6e755de1d..c15146ce8 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -338,7 +338,7 @@ BEGIN MENUITEM SEPARATOR POPUP "ʾ(&D)" BEGIN - MENUITEM "۵(&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "۵(&F)", IDM_VIEW_FOLDING MENUITEM "л۵(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "л۽\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "־(&M)", IDM_VIEW_CHASING_DOCTAIL diff --git a/src/Notepad3.rc b/src/Notepad3.rc index d00395777..82d581373 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -119,7 +119,7 @@ BEGIN //~"E", MMMMMMMMMMMMMMMMMM, VIRTKEY, ALT, NOINVERT /// Menu(Edit) "F", IDM_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT "F", CMD_RECODEDEFAULT, VIRTKEY, CONTROL, ALT, NOINVERT - "F", IDM_VIEW_FOLDING, VIRTKEY, SHIFT, CONTROL, ALT, NOINVERT + //"F", IDM_VIEW_FOLDING, (issue #1609) VIRTKEY, SHIFT, CONTROL, ALT, NOINVERT "F", IDM_VIEW_TOGGLEFOLDS, VIRTKEY, SHIFT, CONTROL, NOINVERT //~"F", MMMMMMMMMMMMMMMMMM, VIRTKEY, ALT, NOINVERT /// Menu(File) "G", IDM_EDIT_GOTOLINE, VIRTKEY, CONTROL, NOINVERT