diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 861b484d..cb01007d 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,23 +1,27 @@
-Notepad++ v5.7.1 new features and fixed bugs (from v5.7) :
+Notepad++ v5.8 new features and fixed bugs (from v5.7) :
-1. Upgrade Scintilla to version 2.20.
-2. Fix Unicode file corrupted on saving bug (the buffer alignment issue).
-3. Fix DBCS encodings file saving corruption bug.
-4. Fix file containing NULL character loading bug.
-5. Fix php syntax highlighting bug.
-6. Fix dragging undocked window performance issue while using Vista Aero UI style.
-7. Fix a vulnerability: get full ScinLexer.dll path to avoid hijack.
-8. Fix Shortcut Mapper inconsistence issue after deleting a macro or an user command.
-9. Add 2 line wrap methods (default plus aligned and indent).
-10. Add 2 menu commands : "Modify Shortcut/Delete Macro" and "Modify Shortcut/Delete Command".
-11. Add "Modify" and "Delete" buttons on Shortcut mapper dialog.
-12. Add macro new ability to record search and replace actions.
-13. Fix SaveSession bug.
-14. Remove characters count feature from the status bar due to its performance issue with UTF8 file.
-15. Fix crash issue due to themes switching.
-16. Make folding margin hidable.
-17. Add NPPM_GETCURRENTNATIVELANGENCODING message (to get the current native language enconding).
-18. Change editing settings saving behaviour : one set of settings are applied in 2 scintilla controls (except zoom).
+1. Upgrade Scintilla to version 2.21.
+2. Fix a vulnerability issue: Load ScinLexer.dll with its full path to avoid hijack.
+3. Fix Unicode file corrupted on saving bug (the buffer alignment issue).
+4. Fix DBCS encodings file saving corruption bug.
+5. Fix file containing NULL character loading bug.
+6. Fix php syntax highlighting bug.
+7. Fix dragging undocked window performance issue while using Vista Aero UI style.
+8. Fix dragging undocked window performance issue while using Vista/Windows7 Aero UI style.
+9. Fix large file truncated after loading problem.
+10. Improve file loading performance.
+11. Fix Shortcut Mapper inconsistence issue after deleting a macro or an user command.
+12. Add 2 line wrap methods (default plus aligned and indent).
+13. Add 2 menu commands : "Modify Shortcut/Delete Macro" and "Modify Shortcut/Delete Command".
+14. Add "Modify" and "Delete" buttons on Shortcut mapper dialog.
+15. Add macro new ability to record search and replace actions.
+16. Fix SaveSession bug.
+17. Remove characters count feature from the status bar due to its performance issue with UTF8 file.
+18. Fix crash issue due to themes switching.
+19. Make folding margin hidable.
+20. Add NPPM_GETCURRENTNATIVELANGENCODING, NPPM_ALLOCATECMDID and NPPM_ALLOCATEMARKER message (to get the current native language enconding).
+21. Change editing settings saving behaviour : one set of settings are applied in 2 scintilla controls (except zoom).
+22. Add Statistics feature which is accessible from the menu command "Summary..." (under menu "View") and the 2nd zone of statusbar (double click).
@@ -36,12 +40,12 @@ Included plugins (Unicode):
Included plugins (ANSI):
1. TextFX v0.25
-2. NppExec v0.3.2
+2. NppExec v0.4.1
3. Spell Checker v1.3.3
4. MIME Tools v1.6
5. NppExport v0.2.8
6. Light Explorer v1.6
7. Compare Plugin 1.5.5
-8. Plugin Manager 0.9.3.0
+8. Plugin Manager 0.9.3.1
diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb
index 47aaf332..e8218506 100644
Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ
diff --git a/PowerEditor/installer/nativeLang/azerbaijani.xml b/PowerEditor/installer/nativeLang/azerbaijani.xml
new file mode 100644
index 00000000..377a2d27
--- /dev/null
+++ b/PowerEditor/installer/nativeLang/azerbaijani.xml
@@ -0,0 +1,617 @@
+
+
+
+
+
+
+
+
diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml
index b8b04b07..2201795f 100644
--- a/PowerEditor/installer/nativeLang/czech.xml
+++ b/PowerEditor/installer/nativeLang/czech.xml
@@ -31,6 +31,7 @@
+
@@ -224,7 +225,8 @@
-
+
+
@@ -449,7 +451,13 @@
+
+
+
+
+
+
diff --git a/PowerEditor/installer/nativeLang/finnish.xml b/PowerEditor/installer/nativeLang/finnish.xml
index c459578e..4736fc89 100644
--- a/PowerEditor/installer/nativeLang/finnish.xml
+++ b/PowerEditor/installer/nativeLang/finnish.xml
@@ -1,7 +1,7 @@
@@ -234,6 +234,9 @@
+
+
+
@@ -462,6 +465,13 @@
+
+
+
+
+
+
+
diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml
index e78351f8..79c58d73 100644
--- a/PowerEditor/installer/nativeLang/italian.xml
+++ b/PowerEditor/installer/nativeLang/italian.xml
@@ -1,7 +1,7 @@
@@ -36,6 +36,7 @@
+
@@ -220,6 +221,9 @@
+
+
+
@@ -439,6 +443,11 @@
+
+
+
+
+
diff --git a/PowerEditor/installer/nativeLang/romanian.xml b/PowerEditor/installer/nativeLang/romanian.xml
index 8e12327a..d467dd2c 100644
--- a/PowerEditor/installer/nativeLang/romanian.xml
+++ b/PowerEditor/installer/nativeLang/romanian.xml
@@ -227,6 +227,8 @@
+
+
@@ -436,6 +438,12 @@
+
+
+
+
+
+
diff --git a/PowerEditor/installer/nativeLang/thai.xml b/PowerEditor/installer/nativeLang/thai.xml
index 62223e7a..373e535e 100644
--- a/PowerEditor/installer/nativeLang/thai.xml
+++ b/PowerEditor/installer/nativeLang/thai.xml
@@ -120,10 +120,10 @@
-
-
-
-
+
+
+
+
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 2512ade3..2d372cf2 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.7"
-!define APPNAMEANDVERSION "Notepad++ v5.7.1"
+!define APPVERSION "5.8"
+!define APPNAMEANDVERSION "Notepad++ v5.8"
!define VERSION_MAJOR 5
-!define VERSION_MINOR 71
+!define VERSION_MINOR 8
!define APPWEBSITE "http://notepad-plus.sourceforge.net/"
@@ -29,7 +29,7 @@
Name "${APPNAMEANDVERSION}"
InstallDir "$PROGRAMFILES\Notepad++"
InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile ".\build\npp.5.7.1.Installer.exe"
+OutFile ".\build\npp.5.8.Installer.exe"
; GetWindowsVersion
;
@@ -644,17 +644,7 @@ SubSection "Plugins" Plugins
SetOutPath "$INSTDIR\plugins"
File "..\bin\plugins\SpellChecker.dll"
SectionEnd
-/*
- Section "NppExec" NppExec
- Delete "$INSTDIR\plugins\NppExec.dll"
- SetOutPath "$INSTDIR\plugins"
- File "..\bin\plugins\NppExec.dll"
- SetOutPath "$INSTDIR\plugins\doc"
- File "..\bin\plugins\doc\NppExec.txt"
- File "..\bin\plugins\doc\NppExec_Manual.chm"
- File "..\bin\plugins\doc\NppExec_TechInfo.txt"
- SectionEnd
-*/
+
Section "MIME Tools" MIMETools
Delete "$INSTDIR\plugins\NppTools.dll"
Delete "$INSTDIR\plugins\mimeTools.dll"
diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h
index db1235ca..2f53fac4 100644
Binary files a/PowerEditor/src/localizationString.h and b/PowerEditor/src/localizationString.h differ
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index c8883125..a4f76b29 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.7.1")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.8")
// 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.71\0")
-#define VERSION_DIGITALVALUE 5, 7, 1, 0
+#define VERSION_VALUE TEXT("5.8\0")
+#define VERSION_DIGITALVALUE 5, 8, 0, 0
#ifdef UNICODE
#define UNICODE_ANSI_MODE TEXT("(UNICODE)")