From 0f803255bf0b77fdcb4b1fdd3f74cbb866788e5a Mon Sep 17 00:00:00 2001 From: Pairi Daiza <34211772+hpwamr@users.noreply.github.com> Date: Mon, 29 Oct 2018 22:27:05 +0100 Subject: [PATCH 1/5] + Minor correction of text alignment of 2 sub-menus --- language/np3_de_de/menu_de_de.rc | Bin 49522 -> 49452 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 1d7cfff2135dac7beaff1e823f9adb028abc21e3..eb336d7f253be820fe81ce1fcbee7b1299e49e0d 100644 GIT binary patch delta 140 zcmey=#Jr}7c|$-KD<=aGPCm#ZI$5EbXL3VV4qQZha@KCE$qri;COdS9@rE!sG4L{Q rfmB1)uj_7rtA*%}>$!#`($~i|IjI+6p6Fzd$e-RkgqqELeNT)4|92?! delta 99 zcmZ3}#Qdp=c|$i zAejlBJd<1Y$V{HV%Q5-G0;$OtdThX&)q2Y&SM5@pyaPzDkQJD$ut#jOSKlKe09gbp AF8}}l From 4aa24cd58c434073a256fbb0687cead339ed0c04 Mon Sep 17 00:00:00 2001 From: Pairi Daiza <34211772+hpwamr@users.noreply.github.com> Date: Mon, 29 Oct 2018 22:42:00 +0100 Subject: [PATCH 2/5] + Minor correction of text alignment of 2 sub-menus --- language/np3_de_de/menu_de_de.rc | Bin 49452 -> 49578 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index eb336d7f253be820fe81ce1fcbee7b1299e49e0d..a1ee0751f494c57dec1a86ea633b4fe5afd8da0b 100644 GIT binary patch delta 112 zcmZ3}#JsARc|$P5#$aF?pGY&g2Q* z4U+}-2mr-oz)BtVfR#?@qRAoia9k_`6 UfM*si- From baf6834b814b521385bc73cd8321827d397ebed1 Mon Sep 17 00:00:00 2001 From: Liu Hao Date: Tue, 30 Oct 2018 10:34:53 +0800 Subject: [PATCH 3/5] menu_zh_cn.rc: Update translation for zh_CN. Signed-off-by: Liu Hao --- language/np3_zh_cn/menu_zh_cn.rc | Bin 43812 -> 43706 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index c49ff536494c0b1e28b19445c14147f5c9d0f6ae..dae71e487180fb85a552e36f54b72b93930c4c89 100644 GIT binary patch delta 153 zcmZ2-jcM0arVS}Eyz?R!1Qn#(1ZXg*F=$UN)E1ts5X&`rPD~i@`9Q%K6q(Hmv1ZDW zcl{%xt^97xThcwf>T$5Ie_lOEYZ!y(=GKNtHrZE=D}quxG6LUrU(G2F)SDU}4U+a| u&}2|z(3z}QAUZjrm1DD2`wHpFODcsXPg^1~`M?sf$#&Hon{5`qU48=fFfx(ZVlp&WP3CJ#*yirAba#u{0tP7Bb zSJh^&SOaDKV4xvoU_(HLDKLPvr2)lC8FCm(fcyZ4e4uzHkevx+C<1be50IQzD!$1dmT+vowCDvp0Hj?) A3jhEB From 2c71c2f56220001574699f2d79f6f1750ccfeb1b Mon Sep 17 00:00:00 2001 From: Pairi Daiza <34211772+hpwamr@users.noreply.github.com> Date: Tue, 30 Oct 2018 06:31:16 +0100 Subject: [PATCH 4/5] + Minor correction of text alignment of 1 sub-menu --- language/np3_af_za/menu_af_za.rc | Bin 49686 -> 49688 bytes language/np3_be_by/menu_be_by.rc | Bin 49672 -> 49674 bytes language/np3_en_gb/menu_en_gb.rc | Bin 49692 -> 49694 bytes language/np3_en_us/menu_en_us.rc | Bin 49684 -> 49686 bytes language/np3_ru_ru/menu_ru_ru.rc | Bin 49650 -> 49652 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 264fea3652ac50222d92ddf07c9c9a789575d63a..f73bafeda6b04b7b8ad159b1ccbf5deab5540639 100644 GIT binary patch delta 18 acmbQ%!aSpedBeZOli#TbZRT6TAqN0aH3!fD delta 13 VcmbQy!aS{odBeZOo0dq(0RStb1{weW diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index e8d380310139cc5a47256022c7500a2f72421e72..2a8e73d71996b1f94461b72f13891db824941f45 100644 GIT binary patch delta 17 ZcmeBZVeV>S-tc4bWQVmvi#e9a0RTm>2WtQT delta 17 YcmeBbVeV*Q-tc4bWPvz=#av6|078cb>;M1& diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 0ffb061483316dc109a51c87451dbaf81db1192b..0775c6776351de1bab12f107c6443286cba6bf9d 100644 GIT binary patch delta 18 acmbQ!!aT2qc>~Lm$$rj4n?;sz$N>ODI0k3{ delta 18 acmbQ&!aS#ic>~Lm$pOv+o5hxJ$N>ODN(O2G diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 2715e63445f0a277bc46e77d05d93ce95d482a03..a145ac57c16076fe8e254c9ddb1196a9859f0513 100644 GIT binary patch delta 18 acmbQz!aS{odBeZOli#TbZRT6TCIl0RSs;1{44Q diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 22716aafacf65688c1a882627ce9cb9648753e33..c2d9337d104412fedb6ce4edd224d9986e899e3d 100644 GIT binary patch delta 17 Zcmey=%>1R9dBdy4lj4Ln|62S*764WK36}r> delta 18 acmey;%>1dDdBdy4lM@^THvd`tLlyvC{|Vaw From a9056abc391b5637276251e4a865b69f68c164f2 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Tue, 30 Oct 2018 09:09:12 +0100 Subject: [PATCH 5/5] + (re-)fix issue #166 --- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 4 ++-- src/Notepad3.c | 4 ++-- src/VersionEx.h | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index 6f0c51cf6..85ce1508b 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1310 +1332 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index f8a8b9dc7..0ccb2be95 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 RC + Notepad3 RC_NewMenu diff --git a/src/Notepad3.c b/src/Notepad3.c index 57852855c..a11d05585 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -3611,9 +3611,9 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) case CMD_DELETEBACK: { - _BEGIN_UNDO_ACTION_; + ///~_BEGIN_UNDO_ACTION_; SendMessage(Globals.hwndEdit, SCI_DELETEBACK, 0, 0); - _END_UNDO_ACTION_; + ///~_END_UNDO_ACTION_; } break; diff --git a/src/VersionEx.h b/src/VersionEx.h index 4567d1e27..dcd52c9c4 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -6,8 +6,8 @@ #define APPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 18 -#define VERSION_REV 1009 -#define VERSION_BUILD 1310 +#define VERSION_REV 1030 +#define VERSION_BUILD 1332 #define SCINTILLA_VER 412 #define ONIGMO_REGEX_VER 6.1.3 -#define VERSION_PATCH " RC" +#define VERSION_PATCH " RC_NewMenu"