Merge remote-tracking branch 'upstream/master' into dev_master

# Conflicts:
#	language/np3_nl_nl/menu_nl_nl.rc
This commit is contained in:
Rainer Kottenhoff 2026-04-23 18:57:16 +02:00
commit 4bc332689b
32 changed files with 41 additions and 41 deletions

View File

@ -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.

View File

@ -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.

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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);
}