diff --git a/Build/Changes.txt b/Build/Changes.txt index 8e330b842..703ec359d 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -33,7 +33,7 @@ SUP - (S)et(UP) / Installer Package ===================================================== -Current BETA Version 5.20.817.(build_#) (2020-08-17) +Current BETA Version 5.20.818.(build_#) (2020-08-18) ===================================================== ----------------------------------------------------- @@ -51,7 +51,7 @@ NEW: [.802.1]- Configuration ([Settings2]LargeIconScalePrecent) percent threshold to switch to bigger file types icons (lexer style selections). [.727.1]- DPI-Aware treeview/listview lexer type icons. [.727.1]- New string "Calculate Tiny-Expressions". -[branch]- ARM64_Build branch (Xperimental). +[.722.2]- ARM64_Build branch (Xperimental). ----------------------------------------------------- CHANGES: @@ -71,18 +71,19 @@ CHANGES: [.723.1]- Review document modified handler (dirty-flag). [.817.2]- Update grepWinNP3 (GRE) version 2.1.3.26 (2020-08-17). [.813.1]- Update Oniguruma Regex (ONI) engine version 6.9.6 (2020-07-31). -[.724.1]- Update Scintilla Library (SCI) version 4.4.4 (2020-07-21). +[.818.1]- Update Scintilla Library (SCI) version 4.4.4 (2020-08-18). ----------------------------------------------------- ENHANCEMENT: ----------------------------------------------------- [.###.#]- -[.###.#]- +[.722.2]- ----------------------------------------------------- FIXES: ----------------------------------------------------- [.###.#]- +[.818.1]- Scintilla bug fixes: SCICALL attribute (SCI). [.817.1]- Reload language resource for about-box on init (maybe language changed). [.815.1]- DPI Awarenes of window positions (default, sticky, ...). [.813.1]- Center dialo in parent (if parent is minimized). @@ -110,7 +111,7 @@ FIXES: REMOVED: ----------------------------------------------------- [.###.#]- -[.###.#]- +[.722.2]- ----------------------------------------------------- TRANSLATIONS (MUI): diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +1 diff --git a/Versions/day.txt b/Versions/day.txt index ae645ab7e..68c7a4170 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -817 +818 diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc index 87316ea20..8fb93eb16 100644 --- a/language/np3_fr_fr/dialogs_fr_fr.rc +++ b/language/np3_fr_fr/dialogs_fr_fr.rc @@ -99,11 +99,11 @@ BEGIN CONTROL "Po&int correspond à tous",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,85,10 CONTROL "Recherche superp&osée",IDC_FIND_OVERLAPPING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,85,10 CONTROL "Ne pas &boucler",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,75,10 - CONTROL "&Fermer après rechercher",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,75,10 + CONTROL "&Fermer après rechercher",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,85,10 CONTROL "Marquer &occurrences",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,85,73,10 CONTROL "Avec &Joker",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,97,63,10 CONTROL "Mode transparent quand perte de focus",IDC_TRANSPARENT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,124,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,134,10 DEFPUSHBUTTON "Chercher &suivant",IDOK,211,7,55,14 PUSHBUTTON "Chercher &précéd.",IDC_FINDPREV,211,24,55,14 PUSHBUTTON "Fermer",IDCANCEL,211,111,55,14 @@ -123,7 +123,7 @@ FONT 9, "Segoe UI", 0, 0, 0x0 BEGIN LTEXT "&Rechercher :",IDC_STATIC,7,7,46,8 COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - LTEXT "Remplacer par :",IDC_STATIC,7,36,44,8 + LTEXT "Remplacer par :",IDC_STATIC,7,36,48,8 COMBOBOX IDC_REPLACETEXT,7,47,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Respe&cter la casse",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,63,10 CONTROL "&Mot entier seulement",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10 @@ -138,13 +138,13 @@ BEGIN CONTROL "Marquer &occurrences",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,73,10 CONTROL "Avec &Joker",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,126,63,10 CONTROL "Mode transparent quand perte de focus",IDC_TRANSPARENT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,156,124,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,156,134,10 DEFPUSHBUTTON "Chercher &suivant",IDOK,211,7,55,14 PUSHBUTTON "Chercher &précéd.",IDC_FINDPREV,211,23,55,14 PUSHBUTTON "Remp&lacer",IDC_REPLACE,211,43,55,14 PUSHBUTTON "Dans sélectio&n",IDC_REPLACEINSEL,211,59,55,14 PUSHBUTTON "Rempl&acer tous",IDC_REPLACEALL,211,75,55,14 - PUSHBUTTON "Permuter te&xtes",IDC_SWAPSTRG,150,32,49,12 + PUSHBUTTON "Permuter te&xtes",IDC_SWAPSTRG,140,32,59,12 PUSHBUTTON "Fermer",IDCANCEL,211,126,55,14 CONTROL "Aller à Rechercher (Ctrl+F)",IDC_TOGGLEFINDREPLACE, "SysLink",0x0,120,142,84,10 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 809cbb85e..44703ed56 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 c8d0ac163..e8bc9e976 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,8 +8,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 817 -#define VERSION_BUILD 2 +#define VERSION_REV 818 +#define VERSION_BUILD 1 #define SCINTILLA_VER 444 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27