CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
RaiKoHoff 2020-08-21 11:56:26 +02:00
commit f6e034c97c
29 changed files with 200 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Build/Changes.txt
View File

@ -33,13 +33,14 @@ SUP - (S)et(UP) / Installer Package
=====================================================
Current BETA Version 5.20.819.(build_#) (2020-08-19)
Current BETA Version 5.20.821.(build_#) (2020-08-21)
=====================================================
-----------------------------------------------------
NEW:
-----------------------------------------------------
[.###.#]-
[.821.1]- Bookmark margin context menu.
[.819.1]- 1st version of Occurrences Bookmarks on Focused-View.
[.816.1]- Controls to clear history (file and find/replace).
[.815.1]- Using dialog RTL option for Main window too.
@ -58,6 +59,7 @@ NEW:
CHANGES:
-----------------------------------------------------
[.###.#]-
[.821.1]- Convenient message box text for normalizing EOLs.
[.817.2]- grepWinNP3 and minipath: special dialog box UI fonts for Asian languages.
[.816.1]- Use optimized Asian UI fonts for Notepad3 dialog boxes.
[.815.1]- Focused View: scroll to current position on each toggle.
@ -84,6 +86,7 @@ ENHANCEMENT:
FIXES:
-----------------------------------------------------
[.###.#]-
[.821.1]- Context menu procedures for Occurrences Bookmarks on Focused-View.
[.819.3]- Single click in status bar's EOL segment will ask for consistent line-end change.
[.819.2]- Find any next/prev. bookmark (std or word).
[.818.1]- Scintilla bug fixes: SCICALL attribute (SCI).

2
Versions/build.txt
View File

@ -1 +1 @@
3
1

2
Versions/day.txt
View File

@ -1 +1 @@
819
821

8
language/np3_af_za/menu_af_za.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Lyn &Nommers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Seleksie &Kantlyne\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Vou"
BEGIN
@ -533,9 +533,13 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Kode Vou", IDM_VIEW_FOLDING
MENUITEM "Lyn Nommer", IDM_VIEW_LINENUMBERS
MENUITEM "Seleksie Kantlyne", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN

12
language/np3_be_by/menu_be_by.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Нумары радкоў\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Водступ для в&ылучэння\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Блокі коду"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Згортванне блокаў коду", IDM_VIEW_FOLDING
MENUITEM "Нумары радкоў", IDM_VIEW_LINENUMBERS
MENUITEM "Водступ для вылучэння", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Адкрыць Notepad3", IDM_TRAY_RESTORE
MENUITEM "Закрыць Notepad3", IDM_TRAY_EXIT
MENUITEM "Адкрыць Notepad3", IDM_TRAY_RESTORE
MENUITEM "Закрыць Notepad3", IDM_TRAY_EXIT
END
END

16
language/np3_en_gb/menu_en_gb.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
END
END

10
language/np3_en_us/menu_en_us.rc
View File

@ -537,14 +537,14 @@ BEGIN
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
END
END

12
language/np3_es_es/menu_es_es.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Números de línea\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selección de&l margen\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "&Margen de marcador\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Plegable"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cortar las líneas marcadas", IDM_EDIT_CUT_MARKED
MENUITEM "Copiar las líneas marcadas", IDM_EDIT_COPY_MARKED
MENUITEM "Eliminar las líneas marcadas", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Código plegable", IDM_VIEW_FOLDING
MENUITEM "Números de línea", IDM_VIEW_LINENUMBERS
MENUITEM "Selección del margen", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Margen de marcador", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Abrir Notepad3", IDM_TRAY_RESTORE
MENUITEM "Cerrar Notepad3", IDM_TRAY_EXIT
MENUITEM "Abrir Notepad3", IDM_TRAY_RESTORE
MENUITEM "Cerrar Notepad3", IDM_TRAY_EXIT
END
END

12
language/np3_es_mx/menu_es_mx.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Números de línea\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selección de&l margen\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "&Margen de marcador,\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Plegable"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cortar las líneas marcadas", IDM_EDIT_CUT_MARKED
MENUITEM "Copiar las líneas marcadas", IDM_EDIT_COPY_MARKED
MENUITEM "Eliminar las líneas marcadas", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Código plegable", IDM_VIEW_FOLDING
MENUITEM "Números de línea", IDM_VIEW_LINENUMBERS
MENUITEM "Selección del margen", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Margen de marcador", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Abrir Notepad3", IDM_TRAY_RESTORE
MENUITEM "Cerrar Notepad3", IDM_TRAY_EXIT
MENUITEM "Abrir Notepad3", IDM_TRAY_RESTORE
MENUITEM "Cerrar Notepad3", IDM_TRAY_EXIT
END
END

14
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Numéros de Ligne\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "&Marge de Sélection\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "&Marge de Signet\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Pliage"
BEGIN
@ -533,10 +533,14 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "&Pliage de code", IDM_VIEW_FOLDING
MENUITEM "&Numéros de ligne", IDM_VIEW_LINENUMBERS
MENUITEM "&Marge de Sélection", IDM_VIEW_BOOKMARK_MARGIN
END
MENUITEM "Couper les lignes marquées", IDM_EDIT_CUT_MARKED
MENUITEM "Copier les lignes marquées", IDM_EDIT_COPY_MARKED
MENUITEM "Supprimer les lignes marquées", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "&Pliage de Code", IDM_VIEW_FOLDING
MENUITEM "&Numéros de Ligne", IDM_VIEW_LINENUMBERS
MENUITEM "Marge de Signet", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Ouvrir Notepad3", IDM_TRAY_RESTORE

16
language/np3_hi_in/menu_hi_in.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
END
END

12
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Sorok s&záma\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Kijelölési mar&gó\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Behajtások"
BEGIN
@ -533,9 +533,13 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Kódblokk behajtások", IDM_VIEW_FOLDING
MENUITEM "Sorok száma", IDM_VIEW_LINENUMBERS
MENUITEM "Kijelölési margó", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Kódblokk behajtások", IDM_VIEW_FOLDING
MENUITEM "Sorok száma", IDM_VIEW_LINENUMBERS
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN

16
language/np3_id_id/menu_id_id.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
END
END

8
language/np3_it_it/menu_it_it.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Numeri di riga\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "&Margine di selezione\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -533,9 +533,13 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Code Folding", IDM_VIEW_FOLDING
MENUITEM "Numeri di riga", IDM_VIEW_LINENUMBERS
MENUITEM "Margine di selezione", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN

14
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "行番号(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "行番号の余白(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "折りたたみ(&F)"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "コード折りたたみを表示", IDM_VIEW_FOLDING
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "コード折りたたみを表示", IDM_VIEW_FOLDING
MENUITEM "行番号", IDM_VIEW_LINENUMBERS
MENUITEM "行番号の余白", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Notepad3 を開く(&O)", IDM_TRAY_RESTORE
MENUITEM "終了(&X)", IDM_TRAY_EXIT
MENUITEM "Notepad3 を開く(&O)", IDM_TRAY_RESTORE
MENUITEM "終了(&X)", IDM_TRAY_EXIT
END
END

16
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "줄 번호(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "선택 영역 여백(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "접기"
BEGIN
@ -528,14 +528,18 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "도구 모음 테마 변경...", IDM_VIEW_LOADTHEMETB
MENUITEM "도구 모음 사용자 지정...", IDM_VIEW_CUSTOMIZETB
MENUITEM "도구 모음 전환", IDM_VIEW_TOGGLETB
MENUITEM "&DPI 비율 툴바", IDM_VIEW_DPISCALETB
MENUITEM "도구 모음 전환", IDM_VIEW_TOGGLETB
MENUITEM "&DPI 비율 툴바", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "코드 접기", IDM_VIEW_FOLDING
MENUITEM "줄 번호", IDM_VIEW_LINENUMBERS
MENUITEM "선택 영역 여백", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "코드 접기", IDM_VIEW_FOLDING
MENUITEM "줄 번호", IDM_VIEW_LINENUMBERS
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN

8
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Lijn &nummers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selectie &marge\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "&Marge de bladwijzer\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Vouwen"
BEGIN
@ -533,9 +533,13 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Knippen de gemarkeerde lijnen", IDM_EDIT_CUT_MARKED
MENUITEM "Kopiëren de gemarkeerde lijnen", IDM_EDIT_COPY_MARKED
MENUITEM "Verwijderen de gemarkeerde lijnen", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Vouwcode", IDM_VIEW_FOLDING
MENUITEM "Lijn nummers", IDM_VIEW_LINENUMBERS
MENUITEM "Selectie marge", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Marge de bladwijzer", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN

8
language/np3_pl_pl/menu_pl_pl.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Numery wierszy\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Margines\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Składanie"
BEGIN
@ -533,9 +533,13 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Składanie kodu", IDM_VIEW_FOLDING
MENUITEM "Numery wierszy", IDM_VIEW_LINENUMBERS
MENUITEM "Margines", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN

12
language/np3_pt_br/menu_pt_br.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Números das Linhas\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "&Margem de Seleção\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Agrupador de Código", IDM_VIEW_FOLDING
MENUITEM "Números das Linhas", IDM_VIEW_LINENUMBERS
MENUITEM "Margem de Seleção", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Abrir o Notepad3", IDM_TRAY_RESTORE
MENUITEM "Sair do Notepad3", IDM_TRAY_EXIT
MENUITEM "Abrir o Notepad3", IDM_TRAY_RESTORE
MENUITEM "Sair do Notepad3", IDM_TRAY_EXIT
END
END

12
language/np3_pt_pt/menu_pt_pt.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Números de linha\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selecção da &margem\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Dobragem"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Dobragem de código", IDM_VIEW_FOLDING
MENUITEM "Números de linha", IDM_VIEW_LINENUMBERS
MENUITEM "Selecção da margem", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Abrir o Notepad3", IDM_TRAY_RESTORE
MENUITEM "Sair do Notepad3", IDM_TRAY_EXIT
MENUITEM "Abrir o Notepad3", IDM_TRAY_RESTORE
MENUITEM "Sair do Notepad3", IDM_TRAY_EXIT
END
END

16
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Номера строк\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Отступ в&ыделения\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "Блоки &кода"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Сворачивание блоков кода", IDM_VIEW_FOLDING
MENUITEM "Номера строк", IDM_VIEW_LINENUMBERS
MENUITEM "Отступ выделения", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Сворачивание блоков кода", IDM_VIEW_FOLDING
MENUITEM "Номера строк", IDM_VIEW_LINENUMBERS
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Открыть Notepad3", IDM_TRAY_RESTORE
MENUITEM "Закрыть Notepad3", IDM_TRAY_EXIT
MENUITEM "Открыть Notepad3", IDM_TRAY_RESTORE
MENUITEM "Закрыть Notepad3", IDM_TRAY_EXIT
END
END

12
language/np3_sk_sk/menu_sk_sk.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Číslovanie r&iadkov\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Označiť okra&j\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Skladanie"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Skladacia väzba", IDM_VIEW_FOLDING
MENUITEM "Číslovanie riadkov", IDM_VIEW_LINENUMBERS
MENUITEM "Označiť okraj", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Otvoriť Notepad3", IDM_TRAY_RESTORE
MENUITEM "Ukončiť Notepad3", IDM_TRAY_EXIT
MENUITEM "Otvoriť Notepad3", IDM_TRAY_RESTORE
MENUITEM "Ukončiť Notepad3", IDM_TRAY_EXIT
END
END

8
language/np3_sv_se/menu_sv_se.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Radnummer\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Markeringsmarginal\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "Vikning"
BEGIN
@ -533,9 +533,13 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Ihopvikning av kodsegment", IDM_VIEW_FOLDING
MENUITEM "Radnummer", IDM_VIEW_LINENUMBERS
MENUITEM "Markeringsmarginal", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN

16
language/np3_tr_tr/menu_tr_tr.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
END
END

16
language/np3_vi_vn/menu_vi_vn.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -533,14 +533,18 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT
END
END

8
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "行号(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "显示边界(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "折叠(&F)"
BEGIN
@ -533,9 +533,13 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "启用折叠", IDM_VIEW_FOLDING
MENUITEM "行号", IDM_VIEW_LINENUMBERS
MENUITEM "S显示边界", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN

8
language/np3_zh_tw/menu_zh_tw.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "行號(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "顯示邊界(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "摺疊(&F)"
BEGIN
@ -533,9 +533,13 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "啟用摺疊", IDM_VIEW_FOLDING
MENUITEM "行號", IDM_VIEW_LINENUMBERS
MENUITEM "顯示邊界", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.819.3"
version="5.20.821.1"
type="win32"
/>
<description>Notepad3 beta</description>

4
src/VersionEx.h
View File

@ -8,8 +8,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 819
#define VERSION_BUILD 3
#define VERSION_REV 821
#define VERSION_BUILD 1
#define SCINTILLA_VER 444
#define ONIGURUMA_REGEX_VER 6.9.5
#define UCHARDET_VER 2018.09.27