diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 0f7177442..fe4303a12 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,9 +1,13 @@
-Notepad++ v6.1.4 fixed bugs:
+Notepad++ v6.1.5 fixed bugs:
-1. Fix a crash issue of Windows 8's Computer Manager due to Notepad++'s Shell Extension (Explorer's context menu).
-2. Walk around a crash issue of Windows 7/vista/xp Explorer due to the conflict among Symantec Antivirus, Net iD component and Notepad++'s Shell Extension (Explorer's context menu).
-3. Fix a regression in clickable link feature.
-4. Add "reload from disk" command entry in tab context menu.
+1. Fix a html tag match freezing issue.
+2. Fix the sidebar splitter failed in Windows 8 issue.
+3. Fix un regression: folding/unfolding performance issue.
+4. Fix tab context menu in the other localization regression due to adding new command "Reload".
+5. Fix lower/UPPER case on selected text which contains NULL characters.
+6. Fix wrap/unwrap line position not being kept bug.
+7. Fix xml syntax highlighting broken because of php preprocessor instruction inside.
+8. Fix a GUI bug which shows empty tab row while closing a last tab in a row (in the multi-line tab mode).
Included plugins:
diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb
index a7810ddf1..917ba30ff 100644
Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ
diff --git a/PowerEditor/installer/nativeLang/chineseSimplified.xml b/PowerEditor/installer/nativeLang/chineseSimplified.xml
index bc447e0bd..66cfed9c0 100644
--- a/PowerEditor/installer/nativeLang/chineseSimplified.xml
+++ b/PowerEditor/installer/nativeLang/chineseSimplified.xml
@@ -357,8 +357,8 @@
-
-
+
+
diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index 446cbbc69..f9d3395f6 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -362,8 +362,8 @@
-
-
+
+
diff --git a/PowerEditor/installer/nativeLang/esperanto.xml b/PowerEditor/installer/nativeLang/esperanto.xml
index 4c510e992..f6f93cb6d 100644
--- a/PowerEditor/installer/nativeLang/esperanto.xml
+++ b/PowerEditor/installer/nativeLang/esperanto.xml
@@ -2,7 +2,7 @@
@@ -222,9 +222,10 @@
-
+
+
@@ -252,7 +253,7 @@
-
+
@@ -279,8 +280,8 @@
-
-
+
+
@@ -343,6 +344,7 @@
+
@@ -520,6 +522,7 @@
+
@@ -544,9 +547,9 @@
-
-
-
+
+
+
diff --git a/PowerEditor/installer/nativeLang/farsi.xml b/PowerEditor/installer/nativeLang/farsi.xml
index 8dc784981..0c87d2aee 100644
--- a/PowerEditor/installer/nativeLang/farsi.xml
+++ b/PowerEditor/installer/nativeLang/farsi.xml
@@ -610,6 +610,9 @@
+
+
+
diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml
index 66b696d29..8988a6a83 100644
--- a/PowerEditor/installer/nativeLang/french.xml
+++ b/PowerEditor/installer/nativeLang/french.xml
@@ -360,8 +360,8 @@
-
-
+
+
diff --git a/PowerEditor/installer/nativeLang/serbianCyrillic.xml b/PowerEditor/installer/nativeLang/serbianCyrillic.xml
index d328b80aa..eace41016 100644
--- a/PowerEditor/installer/nativeLang/serbianCyrillic.xml
+++ b/PowerEditor/installer/nativeLang/serbianCyrillic.xml
@@ -6,7 +6,7 @@
-->
-
+
\ No newline at end of file
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 6f69ee34e..3cfa66705 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -28,10 +28,10 @@
; Define the application name
!define APPNAME "Notepad++"
-!define APPVERSION "6.1.4"
+!define APPVERSION "6.1.5"
!define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
!define VERSION_MAJOR 6
-!define VERSION_MINOR 14
+!define VERSION_MINOR 15
!define APPWEBSITE "http://notepad-plus-plus.org/"
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 0bed87f48..1bb6913e2 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -4845,7 +4845,7 @@ struct Quote{
const char *_quote;
};
-const int nbQuote = 65;
+const int nbQuote = 69;
Quote quotes[nbQuote] = {
{"Notepad++", "Notepad++ is written in C++ and uses pure Win32 API and STL which ensures a higher execution speed and smaller program size.\nBy optimizing as many routines as possible without losing user friendliness, Notepad++ is trying to reduce the world carbon dioxide emissions. When using less CPU power, the PC can throttle down and reduce power consumption, resulting in a greener environment."},
{"Martin Golding", "Always code as if the guy who ends up maintaining your code will be a violent psychopath who knows where you live."},
@@ -4911,6 +4911,10 @@ Quote quotes[nbQuote] = {
{"Anonymous #34", "It's not a bug - it's an undocumented feature."},
{"Anonymous #35", "Should array index start at 0 or 1?\nMy compromised solution is 0.5"},
{"Anonymous #36", "Every single time when I'm about to hug someone extremely sexy, I hit the miror."},
+{"Anonymous #37", "My software never has bugs. It just develops random features."},
+{"Anonymous #38", "LISP = Lots of Irritating Silly Parentheses."},
+{"Anonymous #39", "Perl, the only language that looks the same before and after RSA encryption."},
+{"Hustle Man", "Politicians are like sperm.\nOne in a million turn out to be an actual human being."},
{"Chewbacca", "Uuuuuuuuuur Ahhhhrrrrrr\nUhrrrr Ahhhhrrrrrr\nAaaarhg..."}
//{"", ""},
//{"", ""},
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index e79979149..72674bf59 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -29,12 +29,12 @@
#ifndef RESOURCE_H
#define RESOURCE_H
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1.4")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1.5")
// 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("6.14\0")
-#define VERSION_DIGITALVALUE 6, 1, 4, 0
+#define VERSION_VALUE TEXT("6.15\0")
+#define VERSION_DIGITALVALUE 6, 1, 5, 0
#ifdef UNICODE
#define UNICODE_ANSI_MODE TEXT("(UNICODE)")