From 09a63bed81234af1ea869d9bcdc03900794447c5 Mon Sep 17 00:00:00 2001 From: "METANEOCORTEX\\Kotti" Date: Mon, 29 Aug 2022 12:30:35 +0200 Subject: [PATCH] +ren: renaming feature from obscure "Accelerated Word Navigation" to better name "Alternate Word Separators" --- language/common_res.h | 2 +- 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_el_gr/menu_el_gr.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_es_mx/menu_es_mx.rc | 4 ++-- language/np3_fr_fr/menu_fr_fr.rc | 2 +- language/np3_hi_in/menu_hi_in.rc | 20 ++++++++++---------- language/np3_hu_hu/menu_hu_hu.rc | 2 +- language/np3_id_id/menu_id_id.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 | 8 ++++---- 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_pt_pt/menu_pt_pt.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_vi_vn/menu_vi_vn.rc | 2 +- language/np3_zh_cn/menu_zh_cn.rc | 2 +- language/np3_zh_tw/menu_zh_tw.rc | 2 +- src/Edit.c | 10 +++++----- src/Edit.h | 2 +- src/Notepad3.c | 8 ++++---- src/Notepad3.rc | 2 +- 31 files changed, 51 insertions(+), 51 deletions(-) diff --git a/language/common_res.h b/language/common_res.h index 63d31c399..d45f2c72f 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -802,7 +802,7 @@ #define IDM_SET_SAVESETTINGSNOW 42034 #define IDM_SET_AUTOCOMPLETEWORDS 42035 #define IDM_SET_AUTOCLEXKEYWORDS 42036 -#define IDM_SET_ACCELWORDNAV 42037 +#define IDM_SET_ALTERNATE_WORD_SEPS 42037 #define IDM_SET_NOPRESERVECARET 42038 #define IDM_SET_MUTE_MESSAGEBEEP 42039 #define IDM_SET_EVALTINYEXPRONSEL 42040 diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 4778c77b7..9cf362835 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Outo-Sluit &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "O&uto-Voltooi Woorde", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Outo-Voltooi Le&xer-Sleutel-Woorde", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Versnelde Woord Navi&gasie\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Versnelde Woord Navi&gasie\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Slegs Een Keer per &Lêer", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Lêerverandering-&Kennisgewing...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 6b4d00132..c5672fa5c 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Аўтазакрыццё тэгаў &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Cамадавяр&шэнне слоў", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Cамадавяршэнне на аснове &лексемаў", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Паскораная навігацыя па слова&х\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Паскораная навігацыя па слова&х\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Толькі адзін &экземпляр на файл", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Паведамленне а&б змяненні файла...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 81ffb8f4c..3ca689fad 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Auto Tagabschluss &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Auto Wort &Vorschläge", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto &Lexer KeyWord Vorschläge", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "&Beschleunigte Wort Navigation\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "&Alternative Wort Seperatoren\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Nur eine &Instanz pro Datei", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Nachricht bei &Dateiänderung...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_el_gr/menu_el_gr.rc b/language/np3_el_gr/menu_el_gr.rc index 13fab4021..5fac07f63 100644 --- a/language/np3_el_gr/menu_el_gr.rc +++ b/language/np3_el_gr/menu_el_gr.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Αυτόματο κλείσιμο Η&ΤΜL/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Αυτόματη συμπλήρωση λέ&ξεων", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Α&υτόμ. συμπλήρωση λέ&ξεων-κλειδιών του Lexer", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Ταχεία &περιήγηση λέξεων\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Ταχεία &περιήγηση λέξεων\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Μόνο μία παρουσία ανά &αρχείο", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Ειδοποίηση μετα&βολής αρχείου...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index f06c5b690..f5ca5a817 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto Complete Words", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto Complete Lexer-&Key-Words", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Only One Instance per &File", IDM_SET_SINGLEFILEINSTANCE MENUITEM "File &Change Notification...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 0128dc884..880daf1e7 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto Complete Words", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto Complete Lexer-&Key-Words", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Alternate Word Separators\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Only One Instance per &File", IDM_SET_SINGLEFILEINSTANCE MENUITEM "File &Change Notification...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index 777f552ef..28808f5f7 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Auto Cierre &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto completar palabras", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto completar palabras clave 'Le&xer'", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "&Navegación por palabra acelerada\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "&Navegación por palabra acelerada\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Solo una instancia por &archivo", IDM_SET_SINGLEFILEINSTANCE MENUITEM "N&otificación de cambios en archivo...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_es_mx/menu_es_mx.rc b/language/np3_es_mx/menu_es_mx.rc index 4085925a9..92cd546f7 100644 --- a/language/np3_es_mx/menu_es_mx.rc +++ b/language/np3_es_mx/menu_es_mx.rc @@ -462,9 +462,9 @@ BEGIN MENUITEM "Auto Cierre &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto completar palabras", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto completar palabras clave 'Le&xer'", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "&Navegación por palabra acelerada\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "&Navegación por palabra acelerada\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR - MENUITEM "Solo una instancia por &archivo", IDM_SET_SINGLEFILEINSTANCE + MENUITEM "Solo una instancia por &archivo", IDM_SET_SINGLEFILEINSTANCE MENUITEM "N&otificación de cambios en archivo...\tAlt+F5", IDM_SET_CHANGENOTIFY ///MENUITEM "Auto guardar / Configuración guardando...", IDM_SET_AUTOSAVE_BACKUP MENUITEM "Silenciar sonidos de aviso", IDM_SET_MUTE_MESSAGEBEEP diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index fd151f492..44012ba80 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Fermeture Auto des Balises &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto-complétion des Mots", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto-complétion des &Mots-clés Lexer", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Navi&gation Accélérée par Mot\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Navi&gation Accélérée par Mot\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Seulement une instance par &fichier", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Notif&ication de Modification de Fichier...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc index f3d9f50a8..2a396e5ba 100644 --- a/language/np3_hi_in/menu_hi_in.rc +++ b/language/np3_hi_in/menu_hi_in.rc @@ -454,18 +454,18 @@ BEGIN END POPUP "सेटिंग (&S)" BEGIN - MENUITEM "टैब को खाली जगह के रूप में डालें (&S)", IDM_SET_TABSASSPACES - MENUITEM "टैब सेटिंग (&T)...\tCtrl+T", IDM_SET_TABSETTINGS - MENUITEM "शब्द लपेटने की सेटिंग (&W)...", IDM_SET_WORDWRAPSETTINGS - MENUITEM "लंबी रेखा की सेटिंग (&O)...", IDM_SET_LONGLINESETTINGS - MENUITEM "स्वत: टेक्स्ट को इंडेंट करें (&D)", IDM_SET_AUTOINDENTTEXT - MENUITEM "HTML/XML स्वत: बंद करें (&H)\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS - MENUITEM "शब्द स्वतः पूर्ण करें (&U)", IDM_SET_AUTOCOMPLETEWORDS + MENUITEM "टैब को खाली जगह के रूप में डालें (&S)", IDM_SET_TABSASSPACES + MENUITEM "टैब सेटिंग (&T)...\tCtrl+T", IDM_SET_TABSETTINGS + MENUITEM "शब्द लपेटने की सेटिंग (&W)...", IDM_SET_WORDWRAPSETTINGS + MENUITEM "लंबी रेखा की सेटिंग (&O)...", IDM_SET_LONGLINESETTINGS + MENUITEM "स्वत: टेक्स्ट को इंडेंट करें (&D)", IDM_SET_AUTOINDENTTEXT + MENUITEM "HTML/XML स्वत: बंद करें (&H)\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS + MENUITEM "शब्द स्वतः पूर्ण करें (&U)", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Lexer-Key-Words स्वतः पूर्ण करें (&K)", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "शब्द यात्रा त्वरित गति (&G)\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "शब्द यात्रा त्वरित गति (&G)\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR - MENUITEM "प्रति फ़ाइल केवल एक अवस्था (&F)", IDM_SET_SINGLEFILEINSTANCE - MENUITEM "फ़ाइल परिवर्तन अधिसूचना (&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY + MENUITEM "प्रति फ़ाइल केवल एक अवस्था (&F)", IDM_SET_SINGLEFILEINSTANCE + MENUITEM "फ़ाइल परिवर्तन अधिसूचना (&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY ///MENUITEM "AutoSave / Backup Settings...", IDM_SET_AUTOSAVE_BACKUP MENUITEM "संदेश आवाज़ बंद करें (&M)", IDM_SET_MUTE_MESSAGEBEEP POPUP "ESC कुंजी उपयोग (&E)" diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 7fcdd5bc6..e90c6ea9d 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "HTML/&XML aut. lezárás\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Szó kie&gészítés", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Lexer kul&csszavak kiegészítése", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "G&yorsított szó navigálás\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "G&yorsított szó navigálás\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Egy &példány fájlonként", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Figyel&meztetés fájl változásról...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc index 9d85e378f..277ceb941 100644 --- a/language/np3_id_id/menu_id_id.rc +++ b/language/np3_id_id/menu_id_id.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto Complete Words", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto Complete Lexer-&Key-Words", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Only One Instance per &File", IDM_SET_SINGLEFILEINSTANCE MENUITEM "File &Change Notification...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 438ac0059..50602ddab 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Chiusura automatica &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Completamento a&utomatico delle parole", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Completamento automatico &keywords lexer", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Navi&gazione accelerata delle parole\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Navi&gazione accelerata delle parole\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Solo una istanza per &File", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Notifica di modifi&che al file...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index dc6147320..4cb52dd5a 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "自動閉じHTML/XMLタグ(&H)\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "単語補完(&U)", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "予約語を自動補完(&K)", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "単語選択を広く(&G)\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "単語選択を広く(&G)\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "ファイルごとに単一インスタンス(&F)", IDM_SET_SINGLEFILEINSTANCE MENUITEM "ファイルの変更を通知(&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 119a0aa09..8eef830ca 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -457,12 +457,12 @@ BEGIN MENUITEM "탭을 공백으로 삽입(&S)", IDM_SET_TABSASSPACES MENUITEM "탭 설정(&T)...\tCtrl+T", IDM_SET_TABSETTINGS MENUITEM "줄 바꿈 설정(&W)...", IDM_SET_WORDWRAPSETTINGS - MENUITEM "긴 줄 설정(&O)...", IDM_SET_LONGLINESETTINGS - MENUITEM "텍스트 자동 들여쓰기(&D)", IDM_SET_AUTOINDENTTEXT + MENUITEM "긴 줄 설정(&O)...", IDM_SET_LONGLINESETTINGS + MENUITEM "텍스트 자동 들여쓰기(&D)", IDM_SET_AUTOINDENTTEXT MENUITEM "HTML/XML 자동 닫기(&H)\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "단어 자동 완성(&U)", IDM_SET_AUTOCOMPLETEWORDS - MENUITEM "어휘 자동 완성(&K)", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "가속화된 단어 탐색(&G)\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "어휘 자동 완성(&K)", IDM_SET_AUTOCLEXKEYWORDS + MENUITEM "가속화된 단어 탐색(&G)\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "파일당 하나의 인스턴스만(&F)", IDM_SET_SINGLEFILEINSTANCE MENUITEM "파일 변경 알림(&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 07c4b76d6..7d2c260d4 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "&HTML/XML tags automatisch sluiten\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Sleutelwoorden &automatisch aanvullen", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "'Lexer' sleutelwoorden auto&matisch aanvullen", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Versnelde woordnavi&gatie\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Versnelde woordnavi&gatie\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Slechts één instantie per &bestand", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Melding bij bestandswijziging...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index b481faa21..5cc87dccd 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Automatyczne zamykanie &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&utouzupełnianie wyrazów", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Autouzupełnianie Lekserem", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Przyspieszona nawigacja wyrazów\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Przyspieszona nawigacja wyrazów\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Tylko jedna istancja pliku", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Powiadomienie o zmianie pliku...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 839f83d46..175541e69 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Fechar Automaticamente &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Completa Palavras A&utomaticamente", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Completa Automaticamente Palavras-&Chaves-Léxicas", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Nave&gação de Palavra Acelerada\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Nave&gação de Palavra Acelerada\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Somente Uma &Instância por Arquivo", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Notificação de &Mudança de Arquivo...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc index c886dd94c..316502384 100644 --- a/language/np3_pt_pt/menu_pt_pt.rc +++ b/language/np3_pt_pt/menu_pt_pt.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Fechar automaticamente &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Conclusão a&utomática das palavras", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Conclusão automática palavras chave Lexer", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Nave&gação acelerada de palavras\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Nave&gação acelerada de palavras\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Só uma instância por &Ficheiro", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Notificação de alteração de fi&cheiro...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 0bf40dcd7..34c28adca 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Автозакрытие тегов &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Авто&завершение слов", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Автозавершение на основе &лексем", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Ускоренная нави&гация по словам\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Ускоренная нави&гация по словам\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Только один &экземпляр на файл", IDM_SET_SINGLEFILEINSTANCE MENUITEM "&Уведомление об изменении файла...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc index 742027cfe..f0184fff9 100644 --- a/language/np3_sk_sk/menu_sk_sk.rc +++ b/language/np3_sk_sk/menu_sk_sk.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Auto-zakončovanie &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&utomatické dokončovanie slov", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto-kompletizácia kľúčových slov &Lexer", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Zrýchlená navi&gácia slov\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Zrýchlená navi&gácia slov\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "&Iba jedna inštancia na súbor", IDM_SET_SINGLEFILEINSTANCE MENUITEM "&Oznámenie o zmene súboru...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc index 34469e9ea..1cf914ead 100644 --- a/language/np3_sv_se/menu_sv_se.rc +++ b/language/np3_sv_se/menu_sv_se.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Stäng HTML/XML automatiskt\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Kompletera ord automatiskt", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Komplettera Lexer-&Key-Words automatiskt", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Accelerad ordnavigering\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Accelerad ordnavigering\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Bara en instans per fil", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Notifiering vid filändring...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc index 6ad22a0ed..853da5b63 100644 --- a/language/np3_tr_tr/menu_tr_tr.rc +++ b/language/np3_tr_tr/menu_tr_tr.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "HTML/&XML kod imleri otomatik kapatılsın\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Sözcükler &otomatik tamamlansın", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "&Lexer-&anahtar sözcükleri otomatik tamamlansın", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "&Hızlandırılmış sözcük gezinmesi\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "&Hızlandırılmış sözcük gezinmesi\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "&Her dosya tek pencerede açılsın", IDM_SET_SINGLEFILEINSTANCE MENUITEM "Dosyadaki değişiklikler bildirilsin...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc index 83a188c44..42cec2016 100644 --- a/language/np3_vi_vn/menu_vi_vn.rc +++ b/language/np3_vi_vn/menu_vi_vn.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto Complete Words", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto Complete Lexer-&Key-Words", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "Only One Instance per &File", IDM_SET_SINGLEFILEINSTANCE MENUITEM "File &Change Notification...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 7b6fd73a8..049980db6 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "自动关闭 &HTML/XML 标记\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "自动补全单词(&U)", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "自动补全语法关键字(&K)", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "加速单词导航(&G)\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "加速单词导航(&G)\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "对每个文件仅允许单个实例(&F)", IDM_SET_SINGLEFILEINSTANCE MENUITEM "文件修改通知(&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc index 3a7af8ec0..66928e876 100644 --- a/language/np3_zh_tw/menu_zh_tw.rc +++ b/language/np3_zh_tw/menu_zh_tw.rc @@ -462,7 +462,7 @@ BEGIN MENUITEM "自動關閉 HTML/XML 標記(&H)\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "自動完成單詞(&U)", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "自動完成語法關鍵字(&K)", IDM_SET_AUTOCLEXKEYWORDS - MENUITEM "加速單詞導覽(&G)\tCtrl+Alt+A", IDM_SET_ACCELWORDNAV + MENUITEM "加速單詞導覽(&G)\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS MENUITEM SEPARATOR MENUITEM "每個檔案只有一個執行個體(&F)", IDM_SET_SINGLEFILEINSTANCE MENUITEM "檔案修改通知(&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY diff --git a/src/Edit.c b/src/Edit.c index eff2d441d..e8bc33b57 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -7821,7 +7821,7 @@ bool EditAutoCompleteWord(HWND hwnd, bool autoInsert) DocPos const iWordStartPos = SciCall_WordStartPosition(iPosBefore, true); if (((iPosBefore - iWordStartPos) < iMinWdChCnt) || (iCol < iMinWdChCnt) || ((iCurrentPos - iWordStartPos) < iMinWdChCnt)) { - EditSetAccelWordNav(hwnd, Settings.AccelWordNavigation); + EditReducedWordSeparatorSet(hwnd, Settings.AccelWordNavigation); return true; } @@ -7835,7 +7835,7 @@ bool EditAutoCompleteWord(HWND hwnd, bool autoInsert) iPos = SciCall_PositionAfter(iPos); } if (!autoInsert && bWordAllNumbers) { - EditSetAccelWordNav(hwnd, Settings.AccelWordNavigation); + EditReducedWordSeparatorSet(hwnd, Settings.AccelWordNavigation); return true; } @@ -7973,7 +7973,7 @@ bool EditAutoCompleteWord(HWND hwnd, bool autoInsert) } } - EditSetAccelWordNav(hwnd, Settings.AccelWordNavigation); + EditReducedWordSeparatorSet(hwnd, Settings.AccelWordNavigation); return true; } @@ -9319,9 +9319,9 @@ bool EditSortDlg(HWND hwnd,int* piSortFlags) //============================================================================= // -// EditSetAccelWordNav() +// EditReducedWordSeparatorSet() // -void EditSetAccelWordNav(HWND hwnd,bool bAccelWordNav) +void EditReducedWordSeparatorSet(HWND hwnd, bool bAccelWordNav) { UNREFERENCED_PARAMETER(hwnd); Settings.AccelWordNavigation = bAccelWordNav; diff --git a/src/Edit.h b/src/Edit.h index 952369abf..6b5966d7b 100644 --- a/src/Edit.h +++ b/src/Edit.h @@ -125,7 +125,7 @@ int EditAddSearchFlags(int flags, bool bRegEx, bool bWordStart, bool bMatchCase void EditMarkAll(LPCWSTR wchFind, int sFlags, DocPos rangeStart, DocPos rangeEnd, bool bMultiSel); void EditUpdateVisibleIndicators(); void EditUpdateIndicators(DocPos startPos, DocPos endPos, bool bClearOnly); -void EditSetAccelWordNav(HWND hwnd,bool); +void EditReducedWordSeparatorSet(HWND hwnd, bool); bool EditAutoCompleteWord(HWND hwnd, bool autoInsert); bool EditCheckNewLineInACFillUps(); void EditGetBookmarkList(HWND hwnd,LPWSTR pszBookMarks,int cchLength); diff --git a/src/Notepad3.c b/src/Notepad3.c index 0df18ae40..4088282df 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -2363,7 +2363,7 @@ static void _InitializeSciEditCtrl(HWND hwndEditCtrl) // word delimiter handling EditInitWordDelimiter(hwndEditCtrl); - EditSetAccelWordNav(hwndEditCtrl, Settings.AccelWordNavigation); + EditReducedWordSeparatorSet(hwndEditCtrl, Settings.AccelWordNavigation); SciCall_ClearRegisteredImages(); SciCall_AutoCSetOptions(SC_AUTOCOMPLETE_FIXED_SIZE); @@ -4256,7 +4256,7 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) CheckCmd(hmenu, IDM_SET_AUTOCOMPLETEWORDS, Settings.AutoCompleteWords && !ro); CheckCmd(hmenu, IDM_SET_AUTOCLEXKEYWORDS, Settings.AutoCLexerKeyWords && !ro); - CheckCmd(hmenu, IDM_SET_ACCELWORDNAV, Settings.AccelWordNavigation); + CheckCmd(hmenu, IDM_SET_ALTERNATE_WORD_SEPS, Settings.AccelWordNavigation); CheckCmd(hmenu, IDM_SET_AUTOSAVE_BACKUP, (Settings.AutoSaveOptions & (ASB_Periodic | ASB_Backup))); bool const dwr = (Settings.RenderingTechnology > SC_TECHNOLOGY_DEFAULT); @@ -5819,9 +5819,9 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) SciCall_AutoCCancel(); break; - case IDM_SET_ACCELWORDNAV: + case IDM_SET_ALTERNATE_WORD_SEPS: Settings.AccelWordNavigation = !Settings.AccelWordNavigation; - EditSetAccelWordNav(Globals.hwndEdit,Settings.AccelWordNavigation); + EditReducedWordSeparatorSet(Globals.hwndEdit, Settings.AccelWordNavigation); MarkAllOccurrences(-1, true); break; diff --git a/src/Notepad3.rc b/src/Notepad3.rc index a0db37028..5de82f3dc 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -228,7 +228,7 @@ BEGIN "A", IDM_EDIT_SELECTALL, VIRTKEY, CONTROL, NOINVERT "A", IDM_VIEW_MARKOCCUR_ONOFF, VIRTKEY, ALT, NOINVERT /// NO Menu "A", CMD_RECODEANSI, VIRTKEY, SHIFT, CONTROL, NOINVERT - "A", IDM_SET_ACCELWORDNAV, VIRTKEY, CONTROL, ALT, NOINVERT + "A", IDM_SET_ALTERNATE_WORD_SEPS, VIRTKEY, CONTROL, ALT, NOINVERT "B", IDM_EDIT_FINDMATCHINGBRACE, VIRTKEY, CONTROL, NOINVERT "B", IDM_EDIT_PADWITHSPACES, VIRTKEY, ALT, NOINVERT /// NO Menu "B", IDM_EDIT_SELTOMATCHINGBRACE, VIRTKEY, SHIFT, CONTROL, NOINVERT