mirror of
https://github.com/rizonesoft/Notepad3.git
synced 2026-06-14 21:09:05 +08:00
Merge remote-tracking branch 'upstream/master' into RC1
This commit is contained in:
RaiKoHoff
commit
fc9613413b
@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
|
||||
|
||||
|
||||
=====================================================
|
||||
Current RC1 Version 5.20.211.(build_#) (2020-02-11)
|
||||
Current RC1 Version 5.20.212.(build_#) (2020-02-12)
|
||||
=====================================================
|
||||
|
||||
-----------------------------------------------------
|
||||
@ -50,6 +50,7 @@ NEW:
|
||||
-----------------------------------------------------
|
||||
CHANGES:
|
||||
-----------------------------------------------------
|
||||
- Change version numbering of build_# (the build number is now daily based).
|
||||
- Remove AppVeyors build number, add build-of-the-day number, add short version of commit/local build ID.
|
||||
- Accelerator key remapping: move line up/down vs. jump folds.
|
||||
- Separate auto esc'd control chars from "transform backslashes" switch in find/replace dialog.
|
||||
@ -110,6 +111,7 @@ ENHANCEMENT:
|
||||
-----------------------------------------------------
|
||||
FIXES:
|
||||
-----------------------------------------------------
|
||||
- Word lists for LUA Lexer.
|
||||
- Line Comment (Toggle) for NIM Lexer.
|
||||
- Slow indentation (TAB/BACKTAB).
|
||||
- AutoCompletion box.
|
||||
|
||||
@ -196,24 +196,24 @@ BEGIN
|
||||
END
|
||||
POPUP "&Selección"
|
||||
BEGIN
|
||||
MENUITEM "&Aumentar la sangría", IDM_EDIT_INDENT
|
||||
MENUITEM "&Reducir la sangría", IDM_EDIT_UNINDENT
|
||||
MENUITEM "&Aumentar la sangría", IDM_EDIT_INDENT
|
||||
MENUITEM "&Reducir la sangría", IDM_EDIT_UNINDENT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART
|
||||
MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND
|
||||
MENUITEM "Ir al inicio de la selecci&ón\tCtrl+,", CMD_JUMP2SELSTART
|
||||
MENUITEM "Ir al final de la selecció&n\tCtrl+.", CMD_JUMP2SELEND
|
||||
MENUITEM SEPARATOR
|
||||
POPUP "&Incluir selección"
|
||||
BEGIN
|
||||
MENUITEM "Comillas simples\tCtrl+1", CMD_STRINGIFY
|
||||
MENUITEM "Comillas &dobles\tCtrl+2", CMD_STRINGIFY2
|
||||
MENUITEM "Comillas simples\tCtrl+1", CMD_STRINGIFY
|
||||
MENUITEM "Comillas &dobles\tCtrl+2", CMD_STRINGIFY2
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "( )\tCtrl+3", CMD_EMBRACE
|
||||
MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2
|
||||
MENUITEM "{ }\tCtrl+5", CMD_EMBRACE3
|
||||
MENUITEM "( )\tCtrl+3", CMD_EMBRACE
|
||||
MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2
|
||||
MENUITEM "{ }\tCtrl+5", CMD_EMBRACE3
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Backticks\tCtrl+6", CMD_EMBRACE4
|
||||
MENUITEM "&Backticks\tCtrl+6", CMD_EMBRACE4
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Con...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION
|
||||
MENUITEM "&Con...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION
|
||||
END
|
||||
MENUITEM "&Duplicar Selección/Línea\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
|
||||
MENUITEM SEPARATOR
|
||||
@ -221,10 +221,10 @@ BEGIN
|
||||
MENUITEM "Eliminar el &primer carácter\tAlt+Z", IDM_EDIT_STRIP1STCHAR
|
||||
MENUITEM "Eliminar el ú<imo carácter\tAlt+U", IDM_EDIT_STRIPLASTCHAR
|
||||
MENUITEM "Eliminar los blancos al &final de línea\tAlt+W", IDM_EDIT_TRIMLINES
|
||||
MENUITEM "Comprimir &blancos\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS
|
||||
MENUITEM "&Comprimir blancos\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Modificar líneas...\tAlt+M", IDM_EDIT_MODIFYLINES
|
||||
MENUITEM "&Alinear líneas...\tAlt+J", IDM_EDIT_ALIGN
|
||||
MENUITEM "Alinear l&íneas...\tAlt+J", IDM_EDIT_ALIGN
|
||||
MENUITEM "&Ordenar líneas...\tAlt+O", IDM_EDIT_SORTLINES
|
||||
END
|
||||
POPUP "Conve&rtir"
|
||||
|
||||
@ -196,24 +196,24 @@ BEGIN
|
||||
END
|
||||
POPUP "&Sélection"
|
||||
BEGIN
|
||||
MENUITEM "&Mettre en retrait", IDM_EDIT_INDENT
|
||||
MENUITEM "&Réduire le retrait", IDM_EDIT_UNINDENT
|
||||
MENUITEM "&Mettre en retrait", IDM_EDIT_INDENT
|
||||
MENUITEM "&Réduire le retrait", IDM_EDIT_UNINDENT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART
|
||||
MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND
|
||||
MENUITEM "Aller début de séle&ction\tCtrl+,", CMD_JUMP2SELSTART
|
||||
MENUITEM "Aller fin de sélectio&n End\tCtrl+.", CMD_JUMP2SELEND
|
||||
MENUITEM SEPARATOR
|
||||
POPUP "&Inclure sélection"
|
||||
BEGIN
|
||||
MENUITEM "&Simple guillemets\tCtrl+1", CMD_STRINGIFY
|
||||
MENUITEM "&Double guillemets\tCtrl+2", CMD_STRINGIFY2
|
||||
MENUITEM "&Simple guillemets\tCtrl+1", CMD_STRINGIFY
|
||||
MENUITEM "&Double guillemets\tCtrl+2", CMD_STRINGIFY2
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "( )\tCtrl+3", CMD_EMBRACE
|
||||
MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2
|
||||
MENUITEM "{ }\tCtrl+5", CMD_EMBRACE3
|
||||
MENUITEM "( )\tCtrl+3", CMD_EMBRACE
|
||||
MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2
|
||||
MENUITEM "{ }\tCtrl+5", CMD_EMBRACE3
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Backticks\tCtrl+6", CMD_EMBRACE4
|
||||
MENUITEM "&Backticks\tCtrl+6", CMD_EMBRACE4
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Avec...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION
|
||||
MENUITEM "&Avec...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION
|
||||
END
|
||||
MENUITEM "&Dupliquer la ligne/sélection\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
|
||||
MENUITEM SEPARATOR
|
||||
|
||||
@ -196,72 +196,72 @@ BEGIN
|
||||
END
|
||||
POPUP "&Selectie"
|
||||
BEGIN
|
||||
MENUITEM "&Inspringen", IDM_EDIT_INDENT
|
||||
MENUITEM "&Terugspringen", IDM_EDIT_UNINDENT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART
|
||||
MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND
|
||||
MENUITEM "&Inspringen", IDM_EDIT_INDENT
|
||||
MENUITEM "Teru&gspringen", IDM_EDIT_UNINDENT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Gaan naar begin van sele&ctie\tCtrl+,", CMD_JUMP2SELSTART
|
||||
MENUITEM "Gaan naar ei&nde van selectie\tCtrl+.", CMD_JUMP2SELEND
|
||||
MENUITEM SEPARATOR
|
||||
POPUP "&Omvatten selectie"
|
||||
BEGIN
|
||||
MENUITEM "&Enkele aanhalingstekens\tCtrl+1", CMD_STRINGIFY
|
||||
MENUITEM "&Dubbele aanhalingstekens\tCtrl+2", CMD_STRINGIFY2
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "( )\tCtrl+3", CMD_EMBRACE
|
||||
MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2
|
||||
MENUITEM "{ }\tCtrl+5", CMD_EMBRACE3
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Backticks\tCtrl+6", CMD_EMBRACE4
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Met...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION
|
||||
END
|
||||
MENUITEM "&Dupliceren selectie/lijn\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
|
||||
MENUITEM "En&kele aanhalingstekens\tCtrl+1", CMD_STRINGIFY
|
||||
MENUITEM "&Dubbele aanhalingstekens\tCtrl+2", CMD_STRINGIFY2
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "( )\tCtrl+3", CMD_EMBRACE
|
||||
MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2
|
||||
MENUITEM "{ }\tCtrl+5", CMD_EMBRACE3
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Backticks\tCtrl+6", CMD_EMBRACE4
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Met...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION
|
||||
END
|
||||
MENUITEM "Du&pliceren selectie/lijn\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Blok &met blancos\tAlt+B", IDM_EDIT_PADWITHSPACES
|
||||
MENUITEM "Strippen &eerste teken\tAlt+Z", IDM_EDIT_STRIP1STCHAR
|
||||
MENUITEM "Strippen &laatste teken\tAlt+U", IDM_EDIT_STRIPLASTCHAR
|
||||
MENUITEM "Strippen &achteraan blancos\tAlt+W", IDM_EDIT_TRIMLINES
|
||||
MENUITEM "Comp&rimeren blancos\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Wijzigen lijnen...\tAlt+M", IDM_EDIT_MODIFYLINES
|
||||
MENUITEM "Lijnen &uitlijnen...\tAlt+J", IDM_EDIT_ALIGN
|
||||
MENUITEM "Sorteren li&jnen...\tAlt+O", IDM_EDIT_SORTLINES
|
||||
END
|
||||
POPUP "Co&nverteren"
|
||||
BEGIN
|
||||
MENUITEM "&Hoofdletters\tCtrl+Shift+U", IDM_EDIT_CONVERTUPPERCASE
|
||||
MENUITEM "&kleine letters\tCtrl+U", IDM_EDIT_CONVERTLOWERCASE
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Hoofdletters &inverteer \tCtrl+Alt+U", IDM_EDIT_INVERTCASE
|
||||
MENUITEM "Titel &hoofdletters\tCtrl+Alt+I", IDM_EDIT_TITLECASE
|
||||
MENUITEM "&Zin hoofdletters\tCtrl+Alt+O", IDM_EDIT_SENTENCECASE
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Tab selectie\tCtrl+Shift+T", IDM_EDIT_CONVERTSPACES
|
||||
MENUITEM "U&ntab selectie\tCtrl+Shift+S", IDM_EDIT_CONVERTTABS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Ta&b inspringen\tCtrl+Alt+T", IDM_EDIT_CONVERTSPACES2
|
||||
MENUITEM "Untab ins&pringen\tCtrl+Alt+S", IDM_EDIT_CONVERTTABS2
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Blok met blancos\tAlt+B", IDM_EDIT_PADWITHSPACES
|
||||
MENUITEM "Strippen &eerste teken\tAlt+Z", IDM_EDIT_STRIP1STCHAR
|
||||
MENUITEM "Strippen &laatste teken\tAlt+U", IDM_EDIT_STRIPLASTCHAR
|
||||
MENUITEM "Strippen &achteraan blancos\tAlt+W", IDM_EDIT_TRIMLINES
|
||||
MENUITEM "Comprimeren &blancos\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS
|
||||
MENUITEM "&URL Encode\tCtrl+Shift+E", IDM_EDIT_URLENCODE
|
||||
MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Wijzigen lijnen...\tAlt+M", IDM_EDIT_MODIFYLINES
|
||||
MENUITEM "Lijnen &uitlijnen...\tAlt+J", IDM_EDIT_ALIGN
|
||||
MENUITEM "&Sorteren lijnen...\tAlt+O", IDM_EDIT_SORTLINES
|
||||
END
|
||||
POPUP "Co&nverteren"
|
||||
BEGIN
|
||||
MENUITEM "&Hoofdletters\tCtrl+Shift+U", IDM_EDIT_CONVERTUPPERCASE
|
||||
MENUITEM "&kleine letters\tCtrl+U", IDM_EDIT_CONVERTLOWERCASE
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Hoofdletters &inverteer \tCtrl+Alt+U", IDM_EDIT_INVERTCASE
|
||||
MENUITEM "Titel &hoofdletters\tCtrl+Alt+I", IDM_EDIT_TITLECASE
|
||||
MENUITEM "&Zin hoofdletters\tCtrl+Alt+O", IDM_EDIT_SENTENCECASE
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Tab selectie\tCtrl+Shift+T", IDM_EDIT_CONVERTSPACES
|
||||
MENUITEM "U&ntab selectie\tCtrl+Shift+S", IDM_EDIT_CONVERTTABS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Ta&b inspringen\tCtrl+Alt+T", IDM_EDIT_CONVERTSPACES2
|
||||
MENUITEM "Untab ins&pringen\tCtrl+Alt+S", IDM_EDIT_CONVERTTABS2
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&URL Encode\tCtrl+Shift+E", IDM_EDIT_URLENCODE
|
||||
MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Char naar Hex\tCtrl+Alt+X", IDM_EDIT_CHAR2HEX
|
||||
MENUITEM "&Hex naar Char\tCtrl+Alt+C", IDM_EDIT_HEX2CHAR
|
||||
MENUITEM "&Char naar Hex\tCtrl+Alt+X", IDM_EDIT_CHAR2HEX
|
||||
MENUITEM "&Hex naar Char\tCtrl+Alt+C", IDM_EDIT_HEX2CHAR
|
||||
END
|
||||
POPUP "&Invoegen"
|
||||
BEGIN
|
||||
MENUITEM "&Nieuwe lijn boven\tCtrl+Enter", CMD_INSERTNEWLINE
|
||||
MENUITEM "&Nieuwe lijn boven\tCtrl+Enter", CMD_INSERTNEWLINE
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG
|
||||
MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Codering identificator\tCtrl+F8", IDM_EDIT_INSERT_ENCODING
|
||||
MENUITEM "&Codering identificator\tCtrl+F8", IDM_EDIT_INSERT_ENCODING
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Tijd/Datum (Korte vorm)\tCtrl+F5", IDM_EDIT_INSERT_SHORTDATE
|
||||
MENUITEM "Tijd/Datum (&Lange vorm)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
|
||||
MENUITEM "&Tijdstempels bijwerken\tShift+F5", CMD_TIMESTAMPS
|
||||
MENUITEM "&Tijd/Datum (Korte vorm)\tCtrl+F5", IDM_EDIT_INSERT_SHORTDATE
|
||||
MENUITEM "Tijd/Datum (&Lange vorm)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
|
||||
MENUITEM "&Tijdstempels bijwerken\tShift+F5", CMD_TIMESTAMPS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Lijn commentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
|
||||
MENUITEM "&Multilijnen commentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
|
||||
MENUITEM "&Lijn commentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
|
||||
MENUITEM "&Multilijnen commentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
|
||||
END
|
||||
POPUP "&Overig"
|
||||
BEGIN
|
||||
|
||||
Loading…
Reference in New Issue
Block a user