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

Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_Lexilla

Browse Source
This commit is contained in:
Rainer Kottenhoff 2020-10-04 08:03:59 +02:00
commit ac2828d244
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Build/Changes.txt
View File

@ -34,7 +34,7 @@ SUP - (S)et(UP) / Installer Package
========================================================
Current BETA/RC Version 5.20.930.(build_#) (2020-09-30)
Current BETA/RC Version 5.20.1001.(build_#) (2020-10-01)
========================================================
--------------------------------------------------------
@ -60,6 +60,7 @@ NEW:
CHANGES:
--------------------------------------------------------
[.xxx.x]-
[1001.1]- Rebase DarkMode module on delay load version branch of win32-darkmode project.
[.930.1]- Update the KeyWordList of lexers "C# Source Code" and "SQL Query".
[.930.1]- Bookmark Occurrences Colors changed to get perceptually distinct colors.
[.929.1]- Migration from CreateLexer() by ID to CreateLexer() by Name (Lexilla IFace5 conform) (GRE).
@ -88,6 +89,7 @@ CHANGES:
FIXES:
--------------------------------------------------------
[.xxx.x]-
[1001.1]- TOML Lexer performance leak.
[.928.2]- Freezing of main window caused by mixed usage of Lexer Interfaces.
[.928.1]- Setting new IFace5 Lexer (should fix line/stream comment toggle issue #2912).
[.927.1]- Lexer file extensions maintained in standard config.

2
Versions/day.txt
View File

@ -1 +1 @@
930
1001

6
language/np3_ja_jp/dialogs_ja_jp.rc
View File

@ -653,7 +653,7 @@ END
IDD_MUI_RECODE DIALOGEX 0, 0, 165, 200
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Revert as"
CAPTION "指定して読み直し"
FONT 9, "Segoe UI", 400, 0, 0x1
BEGIN
LTEXT "指定した文字コードでファイルを再読み込み(&E):",IDC_STATIC,7,7,150,8
@ -665,10 +665,10 @@ END
IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 200
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Set Encoding"
CAPTION "文字コードの指定"
FONT 9, "Segoe UI", 400, 0, 0x1
BEGIN
LTEXT "Select current document encoding(&E):",IDC_STATIC,7,7,90,8
LTEXT "現在の文書に適用する文字コードを選択(&E):",IDC_STATIC,7,7,90,8
CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,152
DEFPUSHBUTTON "OK",IDOK,53,179,50,14,WS_DISABLED
PUSHBUTTON "キャンセル",IDCANCEL,108,179,50,14

10
language/np3_ko_kr/dialogs_ko_kr.rc
View File

@ -98,9 +98,9 @@ BEGIN
CONTROL "정규 표현식 검색(&E)",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,96,10
CONTROL "점 모두 일치(&M)",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,65,10
CONTROL "중복 검색(&O)",IDC_FIND_OVERLAPPING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10
CONTROL "반복 찾기 안함(&D)",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,75,10
CONTROL "반복하지 않음(&D)",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,75,10
CONTROL "찾은 후 닫기(&L)",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,65,10
CONTROL "표시 강조(&K)",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,85,73,10
CONTROL "발생 표시(&K)",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,85,73,10
CONTROL "와일드카드 검색(&I)",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,97,68,10
CONTROL "초점을 잃으면 투명 모드",IDC_TRANSPARENT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,124,10
@ -133,9 +133,9 @@ BEGIN
CONTROL "정규 표현식 검색(&E)",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,97,10
CONTROL "점 모두 일치(&M)",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,65,10
CONTROL "중복 검색(&O)",IDC_FIND_OVERLAPPING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10
CONTROL "반복 찾기 안함(&D)",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,75,10
CONTROL "찾은 후 닫기(&L)",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,77,10
CONTROL "표시 강조(&K)",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,73,10
CONTROL "반복하지 않음(&D)",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,75,10
CONTROL "교체 후 닫기(&L)",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,77,10
CONTROL "발생 표시(&K)",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,73,10
CONTROL "와일드카드 검색(&I)",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,126,68,10
CONTROL "초점을 잃으면 투명 모드",IDC_TRANSPARENT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,156,124,10

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

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

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 930
#define VERSION_REV 1001
#define VERSION_BUILD 1
#define SCINTILLA_VER 445
#define ONIGURUMA_REGEX_VER 6.9.5