diff --git a/Build/Changes.txt b/Build/Changes.txt index 5858dc7eb..bf80ef316 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -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. diff --git a/Versions/day.txt b/Versions/day.txt index a04e026f8..dd1172404 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -930 +1001 diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc index 361602a9a..4f1b80640 100644 --- a/language/np3_ja_jp/dialogs_ja_jp.rc +++ b/language/np3_ja_jp/dialogs_ja_jp.rc @@ -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 diff --git a/language/np3_ko_kr/dialogs_ko_kr.rc b/language/np3_ko_kr/dialogs_ko_kr.rc index d1a7e834a..51dcf60f7 100644 --- a/language/np3_ko_kr/dialogs_ko_kr.rc +++ b/language/np3_ko_kr/dialogs_ko_kr.rc @@ -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 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 3fa66d9ff..f951c4daf 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 beta diff --git a/src/VersionEx.h b/src/VersionEx.h index 9399db5f4..c72a867ad 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -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