diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 80a6033af..7f8349517 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -57,7 +57,7 @@ Each language is one `styleLexXXX.c` defining an `EDITLEXER` struct (see existin Runtime-toggleable; external clipboard changes are pasted at the caret. -- Menu: `IDM_EDIT_STOP_PASTEBOARD` — "Toggle Clipboard Monitoring" (legacy identifier). Check mark reflects state. +- Menu: `IDM_EDIT_TOGGLE_PASTEBOARD` — "Toggle Clipboard Monitoring". Check mark reflects state. - Helpers `PasteBoard_Start(HWND)` / `PasteBoard_Stop(HWND)` wrap `AddClipboardFormatListener` + `ID_PASTEBOARDTIMER`. Used for `/B` startup and from the toggle handler. - **Not persisted**; always OFF at startup unless `/B`. - **Mutex with Tail** (`IDM_VIEW_CHASING_DOCTAIL` / `FileWatching.MonitoringLog`): each mode greys the other in `MsgInitMenu`; tail toolbar button (`IDT_VIEW_CHASING_DOCTAIL`) greyed; "Monitoring Log" checkbox in `ChangeNotifyDlgProc` greyed. `IsPasteBoardActive()` in `Notepad3.h` for cross-TU use. diff --git a/CLAUDE.md b/CLAUDE.md index ee281fcc2..81d15a1ba 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -60,7 +60,7 @@ Default configuration is Release. Runtime-toggleable; external clipboard changes are pasted at the caret. -- Menu: `IDM_EDIT_STOP_PASTEBOARD` — "Toggle Clipboard Monitoring" (legacy identifier kept). Check mark reflects state. +- Menu: `IDM_EDIT_TOGGLE_PASTEBOARD` — "Toggle Clipboard Monitoring". Check mark reflects state. - Helpers `PasteBoard_Start(HWND)` / `PasteBoard_Stop(HWND)` wrap `AddClipboardFormatListener` + `ID_PASTEBOARDTIMER`. Used at startup for `/B` and from the toggle handler. - **Not persisted** — always OFF at startup unless `/B`. - **Mutex with Tail** (`IDM_VIEW_CHASING_DOCTAIL` / `FileWatching.MonitoringLog`): each mode greys the other in `MsgInitMenu`; tail toolbar button (`IDT_VIEW_CHASING_DOCTAIL`) also greyed; "Monitoring Log" checkbox in `ChangeNotifyDlgProc` greyed while pasteboard active. `IsPasteBoardActive()` exposed in `Notepad3.h` for cross-TU use. diff --git a/grepWin/translations/Dutch.lang b/grepWin/translations/Dutch.lang index 5a466896c..14c6a797d 100644 --- a/grepWin/translations/Dutch.lang +++ b/grepWin/translations/Dutch.lang @@ -40,7 +40,7 @@ msgstr "%ld meer overeenkomsten" #. Resource IDs: (1069) msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %column% with in line offset" -msgstr "%path% wordt vervangen door het pad van het bestand, %line% met de lijn om naar te springen, %column% met regelverschuiving" +msgstr "%path% wordt vervangen door het pad van het bestand, %line% met de regel om naar te springen, %column% met positie in de regel" #. Resource IDs: (175) #, c-format diff --git a/grepWin/translations_v2.1.13/Dutch.lang b/grepWin/translations_v2.1.13/Dutch.lang index 88af2a46e..4c9a03523 100644 --- a/grepWin/translations_v2.1.13/Dutch.lang +++ b/grepWin/translations_v2.1.13/Dutch.lang @@ -40,7 +40,7 @@ msgstr "%ld meer overeenkomsten" #. Resource IDs: (1069) msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %column% with in line offset, %pattern% with the search pattern" -msgstr "%path% wordt vervangen door het pad van het bestand, %line% met de lijn om naar te springen, %column% met regelverschuiving, %pattern% met het zoekpatroon" +msgstr "%path% wordt vervangen door het pad van het bestand, %line% met de regel om naar te springen, %column% met positie in de regel, %pattern% met het zoekpatroon" #. Resource IDs: (175) #, c-format diff --git a/language/common_res.h b/language/common_res.h index 91c69cbba..6c0a61617 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -873,7 +873,7 @@ #define IDM_TRAY_EXIT 43701 #define IDM_SETPASS 43702 #define IDM_EDIT_INSERT_GUID 43705 -#define IDM_EDIT_STOP_PASTEBOARD 43706 +#define IDM_EDIT_TOGGLE_PASTEBOARD 43706 #define IDS_ENC_ANSI 61000 diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 05708dc68..c29767b21 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Verwyder\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Maak &Klipbord Skoon", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "W&oorde" BEGIN diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 50c90241e..39a9ac6ac 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "В&ыдаліць\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "А&чысціць буфер абмену", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "Словы" BEGIN diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 08730ad5f..a34dd9819 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Löschen\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "&Lösche Zwischenablage", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Zwischenablage &Überwachung umschalten", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Zwischenablage &Überwachung umschalten", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "&Wörter" BEGIN diff --git a/language/np3_el_gr/menu_el_gr.rc b/language/np3_el_gr/menu_el_gr.rc index 39affcc68..1153c3d3b 100644 --- a/language/np3_el_gr/menu_el_gr.rc +++ b/language/np3_el_gr/menu_el_gr.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Διαγραφή\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "&Απαλοιφή πρόχειρου", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "&Λέξεις" BEGIN diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index a8758c11c..e22af03e5 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Delete\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Cl&ear Clipboard", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "W&ords" BEGIN diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index e5d87147b..32414051a 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Delete\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Cl&ear Clipboard", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "W&ords" BEGIN diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index 6a9eaa520..d41215dd2 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "E&liminar\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "&Vaciar el portapapeles", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "P&alabras" BEGIN diff --git a/language/np3_fi_fi/menu_fi_fi.rc b/language/np3_fi_fi/menu_fi_fi.rc index ff995d0a7..67548fbe1 100644 --- a/language/np3_fi_fi/menu_fi_fi.rc +++ b/language/np3_fi_fi/menu_fi_fi.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Poista\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Tyhj&ennä leikepöytä", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "S&anat" BEGIN diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index c69f0e383..b421d87f0 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Supprimer\tSuppr", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Vi&der le presse-papiers", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "M&ots" BEGIN diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc index c1e398118..54785d730 100644 --- a/language/np3_hi_in/menu_hi_in.rc +++ b/language/np3_hi_in/menu_hi_in.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "हटाएं (&D)\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "क्लिपबोर्ड साफ़ करें (&E)", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "शब्द (&O)" BEGIN diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 4a94ca18f..1231fe251 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Törlés\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Vágólap t&örlése", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "&Vágólapfigyelés leállítása", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "&Vágólapfigyelés leállítása", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "Sza&vak" BEGIN diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc index b53d839b9..5e0202edf 100644 --- a/language/np3_id_id/menu_id_id.rc +++ b/language/np3_id_id/menu_id_id.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "Hap&us\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Bersi&hkan Papan Klip", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "Ka&ta" BEGIN diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 0a0ecfd75..8257e69bd 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Elimina\tCanc", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Svuota appunti", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Stop &monitoraggio appunti", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Stop &monitoraggio appunti", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "&Parole" BEGIN diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 99056611f..11e6935e3 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "削除(&D)\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "クリップボードをクリア(&E)", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "単語(&O)" BEGIN diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index a8ce1c796..e875a4b6d 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "삭제(&D)\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "클립보드 지우기(&E)", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "클립보드 모니터링 중지(&M)", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "클립보드 모니터링 중지(&M)", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "단어(&W)" BEGIN diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 95b21f832..43bead908 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Wissen\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "&Klembord wissen", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "&Bewaking van klembord omschakelen", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "W&oorden" BEGIN @@ -485,7 +485,7 @@ BEGIN MENUITEM "Melding bij bestandswijziging...\tAlt+F5", IDM_SET_CHANGENOTIFY ///MENUITEM "Automatisch opslaan / Back-up...", IDM_SET_AUTOSAVE_BACKUP MENUITEM "Meldingen dempen", IDM_SET_MUTE_MESSAGEBEEP - MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS + MENUITEM "Oplossen naar &UNC-paden", IDM_SET_RESOLVE_UNC_PATHS POPUP "Functie Esc-&toets" BEGIN MENUITEM "&Geen", IDM_SET_NOESCFUNC @@ -494,11 +494,11 @@ BEGIN END MENUITEM "O&pslaan voor uitvoeren", IDM_SET_SAVEBEFORERUNNINGTOOLS MENUITEM "Tiny-E&xpressies berekenen", IDM_SET_EVALTINYEXPRONSEL - MENUITEM "Enable Multiple Selection", IDM_SET_MULTIPLE_SELECTION - POPUP "Default &Directory" + MENUITEM "&Meervoudige selectie inschakelen", IDM_SET_MULTIPLE_SELECTION + POPUP "&Standaardmap" BEGIN - MENUITEM "Set to Current File's &Directory", IDM_SET_DEFAULTDIR - MENUITEM "&Reset to Default", IDM_SET_DEFAULTDIR_RESET + MENUITEM "Instellen naar huidige &bestandsmap", IDM_SET_DEFAULTDIR + MENUITEM "Herstellen naar &standaard", IDM_SET_DEFAULTDIR_RESET END MENUITEM SEPARATOR POPUP "&Onthouden" @@ -524,7 +524,7 @@ BEGIN END POPUP "Tech&nologie" BEGIN - POPUP "&Rendering" + POPUP "Wee&Meervoudigeoudige" BEGIN MENUITEM "DirectWrite (&Direct2D)", IDM_SET_RENDER_TECH_D2D MENUITEM "DirectWrite &behouden", IDM_SET_RENDER_TECH_D2DRETAIN diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index 0a72f0036..e4f6b254a 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Usuń\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Wyczyść schowek", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "W&yrazy" BEGIN diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 046106968..6aa467878 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Apagar\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "L&impar Área de Transferência", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Parar de &Monitorar Área de Transferência", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Parar de &Monitorar Área de Transferência", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "P&alavras" BEGIN diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc index 215c774be..39bc0757b 100644 --- a/language/np3_pt_pt/menu_pt_pt.rc +++ b/language/np3_pt_pt/menu_pt_pt.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Eliminar\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Limpar ár&ea de transferência", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "Pala&vras" BEGIN diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 468aacbd0..a064af7a3 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Удалить\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "О&чистить буфер обмена", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "Слова" BEGIN diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc index e49cdc324..069556204 100644 --- a/language/np3_sk_sk/menu_sk_sk.rc +++ b/language/np3_sk_sk/menu_sk_sk.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "Z&mazať\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Vyprázdniť &schránku", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "&Slová" BEGIN diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc index 659413f7e..a76caf5d8 100644 --- a/language/np3_sv_se/menu_sv_se.rc +++ b/language/np3_sv_se/menu_sv_se.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "Ta bort\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Rensa urklipp", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "Ord" BEGIN diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc index 616135d9a..b6160086a 100644 --- a/language/np3_tr_tr/menu_tr_tr.rc +++ b/language/np3_tr_tr/menu_tr_tr.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "&Sil\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "&Panoyu temizle", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "&Sözcükler" BEGIN diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc index e59ac8133..17e55e1c5 100644 --- a/language/np3_vi_vn/menu_vi_vn.rc +++ b/language/np3_vi_vn/menu_vi_vn.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "Xóa(&D)\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "Xóa bộ nhớ tạm(&E)", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "Toggle Clipboard &Monitoring", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "Từ(&W)" BEGIN diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 1b0d29d6f..babfed599 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "删除(&D)\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "清空剪贴板(&E)", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "停止监视剪贴板(&M)", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "停止监视剪贴板(&M)", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "单词(&O)" BEGIN diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc index a8b183e40..f2022d155 100644 --- a/language/np3_zh_tw/menu_zh_tw.rc +++ b/language/np3_zh_tw/menu_zh_tw.rc @@ -169,7 +169,7 @@ BEGIN MENUITEM "刪除(&D)\tDel", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "清空剪貼簿(&E)", IDM_EDIT_CLEARCLIPBOARD - MENUITEM "停止監視剪貼簿(&M)", IDM_EDIT_STOP_PASTEBOARD + MENUITEM "停止監視剪貼簿(&M)", IDM_EDIT_TOGGLE_PASTEBOARD MENUITEM SEPARATOR POPUP "單詞(&O)" BEGIN diff --git a/src/Notepad3.c b/src/Notepad3.c index 0d7b6a354..2eb83ec1e 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -4205,8 +4205,8 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) CloseClipboard(); // Clipboard Monitoring is a toggle; grey it out while Tail is active // (the two modes are mutually exclusive). - CheckCmd(hmenu, IDM_EDIT_STOP_PASTEBOARD, s_flagPasteBoard); - EnableCmd(hmenu, IDM_EDIT_STOP_PASTEBOARD, !FileWatching.MonitoringLog); + CheckCmd(hmenu, IDM_EDIT_TOGGLE_PASTEBOARD, s_flagPasteBoard); + EnableCmd(hmenu, IDM_EDIT_TOGGLE_PASTEBOARD, !FileWatching.MonitoringLog); EnableCmd(hmenu, IDM_EDIT_MOVELINEUP, !ro); EnableCmd(hmenu, IDM_EDIT_MOVELINEDOWN, !ro); @@ -5180,7 +5180,7 @@ static bool _HandleEditBasicCommands(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM break; - case IDM_EDIT_STOP_PASTEBOARD: + case IDM_EDIT_TOGGLE_PASTEBOARD: // Toggle Clipboard Monitoring. Mutually exclusive with Tail/Log-File // Monitoring: refuse if Tail is active (the menu item is also greyed). if (FileWatching.MonitoringLog) { @@ -9305,7 +9305,7 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam) case STATUS_OVRMODE: if (s_flagPasteBoard) { - PostWMCommand(hwnd, IDM_EDIT_STOP_PASTEBOARD); + PostWMCommand(hwnd, IDM_EDIT_TOGGLE_PASTEBOARD); } else { PostWMCommand(hwnd, CMD_VK_INSERT); }