diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 9c926ed2c..5c6ee61e7 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,9 +1,7 @@ -Notepad++ v5.9.5 new features and fixed bugs: +Notepad++ v5.9.6 new features and fixed bugs: -1. Fix Project Panel loading non-project file bug. -2. Fix saving project file bug while saving it on the root. -3. Fix adding/hidding Language Menue item problem in Preference dialog. -4. Make Project Panel translatable. +1. Add a new feature "Adding files recursively from a floder" in Project Manager. +2. Fix a bug in Project Manager regarding open and reload commands. diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index c0e7efdcc..9de2bc268 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/bosnian.xml b/PowerEditor/installer/nativeLang/bosnian.xml index ba3a5341b..aa5fab983 100644 --- a/PowerEditor/installer/nativeLang/bosnian.xml +++ b/PowerEditor/installer/nativeLang/bosnian.xml @@ -15,14 +15,48 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -31,7 +65,7 @@ - + @@ -72,7 +106,7 @@ - + @@ -100,6 +134,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -187,7 +269,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml index a06708fd3..9c5dd3c25 100644 --- a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml +++ b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml @@ -1,615 +1,651 @@ - +
- - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index bf5e368f3..40193d61c 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -614,6 +614,8 @@ + + @@ -632,12 +634,14 @@ + + diff --git a/PowerEditor/installer/nativeLang/finnish.xml b/PowerEditor/installer/nativeLang/finnish.xml index 2b7f086a3..0a98a29c5 100644 --- a/PowerEditor/installer/nativeLang/finnish.xml +++ b/PowerEditor/installer/nativeLang/finnish.xml @@ -1,8 +1,8 @@ @@ -26,6 +26,8 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 + + @@ -47,6 +49,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 + @@ -67,6 +70,9 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 + + + @@ -214,6 +220,9 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 + + + @@ -253,9 +262,9 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 - - - + + + @@ -276,7 +285,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 - + @@ -667,5 +676,52 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 8b78e187d..ac32fd523 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -621,6 +621,8 @@ + + @@ -639,12 +641,14 @@ + + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index aaad248f0..6f8c1112c 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -18,10 +18,10 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "5.9.5" +!define APPVERSION "5.9.6" !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}" !define VERSION_MAJOR 5 -!define VERSION_MINOR 95 +!define VERSION_MINOR 96 !define APPWEBSITE "http://notepad-plus-plus.org/" diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 6769f592b..e3936cc86 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -2136,6 +2136,12 @@ void Notepad_plus::setLanguage(LangType langType) { if (reset) { _mainEditView.getCurrentBuffer()->setLangType(langType); } else { + /* + int mode = _pEditView->execute(SCI_GETMODEVENTMASK, 0, 0); + _pEditView->execute(SCI_SETMODEVENTMASK, 0, 0); + _pEditView->getCurrentBuffer()->setLangType(langType); + _pEditView->execute(SCI_SETMODEVENTMASK, mode, 0); + */ _pEditView->getCurrentBuffer()->setLangType(langType); } diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 024743fec..757462821 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -18,12 +18,12 @@ #ifndef RESOURCE_H #define RESOURCE_H -#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.9.5") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.9.6") // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 // ex : #define VERSION_VALUE TEXT("5.63\0") -#define VERSION_VALUE TEXT("5.95\0") -#define VERSION_DIGITALVALUE 5, 9, 5, 0 +#define VERSION_VALUE TEXT("5.96\0") +#define VERSION_DIGITALVALUE 5, 9, 6, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)")