diff --git a/PowerEditor/bin/NppShell.dll b/PowerEditor/bin/NppShell.dll
index 6d945e177..9c1ece20c 100644
Binary files a/PowerEditor/bin/NppShell.dll and b/PowerEditor/bin/NppShell.dll differ
diff --git a/PowerEditor/bin/NppShell64.dll b/PowerEditor/bin/NppShell64.dll
index 57731eb49..03d8463ef 100644
Binary files a/PowerEditor/bin/NppShell64.dll and b/PowerEditor/bin/NppShell64.dll differ
diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 238c970be..0f7177442 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,11 +1,9 @@
-Notepad++ v6.1.3 enhancement and fixed bugs:
+Notepad++ v6.1.4 fixed bugs:
-1. Enhance the performance issue for xml matching tags highlighting and for displaying clickable links.
-2. While the amount of file to open is larger than 200, a dialog will be shown to warn user.
-3. Fix Notepad++ close bug while move one cloned new empty document into another view, in the destination contained only this new empty document.
-4. Fix hanging problem while double-click on a project folder then (immediately) drag it.
-5. Fix a bug while command argument contain an empty string ("").
-6. Fix mouse cursor disappearing bug on right click while a project item is dragging.
+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.
Included plugins:
diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb
index 4b0694d48..a7810ddf1 100644
Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ
diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml
index 71a41c14f..645ce19a8 100644
--- a/PowerEditor/installer/nativeLang/german.xml
+++ b/PowerEditor/installer/nativeLang/german.xml
@@ -1,7 +1,7 @@
@@ -671,15 +671,16 @@
-
+
-
-
-
-
+
+
+
+
+
diff --git a/PowerEditor/installer/nativeLang/romanian.xml b/PowerEditor/installer/nativeLang/romanian.xml
index 35e1abb00..d32cc7e0b 100644
--- a/PowerEditor/installer/nativeLang/romanian.xml
+++ b/PowerEditor/installer/nativeLang/romanian.xml
@@ -14,7 +14,7 @@
-
+
@@ -34,9 +34,9 @@
-
+
-
+
@@ -75,9 +75,9 @@
-
+
-
+
@@ -140,8 +140,8 @@
-
-
+
+
@@ -183,28 +183,29 @@
-
+
-
-
+
+
-
+
+
@@ -236,12 +237,12 @@
-
+
-
-
+
+
@@ -254,8 +255,8 @@
-
-
+
+
@@ -286,14 +287,14 @@
-
+
-
+
@@ -590,7 +591,7 @@
-
+
@@ -648,5 +649,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 7e0e223cc..6f69ee34e 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.3"
+!define APPVERSION "6.1.4"
!define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
!define VERSION_MAJOR 6
-!define VERSION_MINOR 13
+!define VERSION_MINOR 14
!define APPWEBSITE "http://notepad-plus-plus.org/"
@@ -254,7 +254,7 @@ Function ExtraOptions
Pop $NoUserDataCheckboxHandle
${NSD_OnClick} $NoUserDataCheckboxHandle OnChange_NoUserDataCheckBox
- ${NSD_CreateCheckbox} 0 50 100% 30u "Allow plugins to be loaded from %APPDATA%\\notepad++\\plugins$\nIt could cause the security issue. Turn it on if you know what you are doing."
+ ${NSD_CreateCheckbox} 0 50 100% 30u "Allow plugins to be loaded from %APPDATA%\\notepad++\\plugins$\nIt could cause a security issue. Turn it on if you know what you are doing."
Pop $PluginLoadFromUserDataCheckboxHandle
${NSD_OnClick} $PluginLoadFromUserDataCheckboxHandle OnChange_PluginLoadFromUserDataCheckBox
@@ -567,6 +567,10 @@ Section -"Notepad++" mainSection
Exec 'regsvr32 /u /s "$INSTDIR\NppShell_03.dll"'
Delete "$INSTDIR\NppShell_03.dll"
+ IfFileExists "$INSTDIR\NppShell_04.dll" 0 +3
+ Exec 'regsvr32 /u /s "$INSTDIR\NppShell_04.dll"'
+ Delete "$INSTDIR\NppShell_04.dll"
+
; detect the right of
UserInfo::GetAccountType
Pop $1
@@ -596,12 +600,12 @@ Section "Context Menu Entry" explorerContextMenu
SetOverwrite try
SetOutPath "$INSTDIR\"
${If} ${RunningX64}
- File /oname=$INSTDIR\NppShell_04.dll "..\bin\NppShell64_04.dll"
+ File /oname=$INSTDIR\NppShell_05.dll "..\bin\NppShell64_05.dll"
${Else}
- File "..\bin\NppShell_04.dll"
+ File "..\bin\NppShell_05.dll"
${EndIf}
- Exec 'regsvr32 /s "$INSTDIR\NppShell_04.dll"'
+ Exec 'regsvr32 /s "$INSTDIR\NppShell_05.dll"'
SectionEnd
SectionGroup "Auto-completion Files" autoCompletionComponent
@@ -986,6 +990,7 @@ SectionGroup "Localization" localization
Section /o "Uyghur" uyghur
CopyFiles "$TEMP\nppLocalization\uyghur.xml" "$INSTDIR\localization\uyghur.xml"
SectionEnd
+
SectionGroupEnd
SectionGroup "Themes" Themes
@@ -1070,6 +1075,26 @@ SectionGroup "Themes" Themes
File ".\themes\Solarized-light.xml"
SectionEnd
+ Section "Hot Fudge Sundae" HotFudgeSundae
+ SetOutPath "$INSTDIR\themes"
+ File ".\themes\HotFudgeSundae.xml"
+ SectionEnd
+
+ Section "khaki" khaki
+ SetOutPath "$INSTDIR\themes"
+ File ".\themes\khaki.xml"
+ SectionEnd
+
+ Section "Mossy Lawn" MossyLawn
+ SetOutPath "$INSTDIR\themes"
+ File ".\themes\MossyLawn.xml"
+ SectionEnd
+
+ Section "Navajo" Navajo
+ SetOutPath "$INSTDIR\themes"
+ File ".\themes\Navajo.xml"
+ SectionEnd
+
SectionGroupEnd
Section /o "As default html viewer" htmlViewer
@@ -1409,7 +1434,23 @@ SectionGroup un.Themes
Section un.Solarized-light
Delete "$INSTDIR\themes\Solarized-light.xml"
SectionEnd
+
+ Section un.HotFudgeSundae
+ Delete "$INSTDIR\themes\HotFudgeSundae.xml"
+ SectionEnd
+
+ Section un.khaki
+ Delete "$INSTDIR\themes\khaki.xml"
+ SectionEnd
+
+ Section un.MossyLawn
+ Delete "$INSTDIR\themes\MossyLawn.xml"
+ SectionEnd
+ Section un.Navajo
+ Delete "$INSTDIR\themes\Navajo.xml"
+ SectionEnd
+
SectionGroupEnd
SectionGroup un.localization
@@ -1603,6 +1644,9 @@ SectionGroup un.localization
Section un.tamil
Delete "$INSTDIR\localization\tamil.xml"
SectionEnd
+ Section un.telugu
+ Delete "$INSTDIR\localization\telugu.xml"
+ SectionEnd
Section un.thai
Delete "$INSTDIR\localization\thai.xml"
SectionEnd
@@ -1618,6 +1662,9 @@ SectionGroup un.localization
Section un.uzbekCyrillic
Delete "$INSTDIR\localization\uzbekCyrillic.xml"
SectionEnd
+ Section un.uyghur
+ Delete "$INSTDIR\localization\uyghur.xml"
+ SectionEnd
SectionGroupEnd
diff --git a/PowerEditor/installer/themes/HotFudgeSundae.xml b/PowerEditor/installer/themes/HotFudgeSundae.xml
new file mode 100644
index 000000000..014257254
--- /dev/null
+++ b/PowerEditor/installer/themes/HotFudgeSundae.xml
@@ -0,0 +1,874 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ param @projectDescription projectDescription @param
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PowerEditor/installer/themes/MossyLawn.xml b/PowerEditor/installer/themes/MossyLawn.xml
new file mode 100644
index 000000000..0a7565823
--- /dev/null
+++ b/PowerEditor/installer/themes/MossyLawn.xml
@@ -0,0 +1,875 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ param @projectDescription projectDescription @param
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PowerEditor/installer/themes/Navajo.xml b/PowerEditor/installer/themes/Navajo.xml
new file mode 100644
index 000000000..a0275bb32
--- /dev/null
+++ b/PowerEditor/installer/themes/Navajo.xml
@@ -0,0 +1,873 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ param @projectDescription projectDescription @param
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PowerEditor/installer/themes/Solarized-light.xml b/PowerEditor/installer/themes/Solarized-light.xml
index 16d9bf334..457476bb6 100644
--- a/PowerEditor/installer/themes/Solarized-light.xml
+++ b/PowerEditor/installer/themes/Solarized-light.xml
@@ -8,7 +8,7 @@ Description: Solarized theme for Notepad++.
Commpliance: Nearly complete (see README.txt for exceptions).
Supported languages: All the languages supported by release 5.9.8
Created by: Paul Neubauer (PaulRNeubauer at gmail dot com)
-Last Modified: 12:19 PM 3/29/2012
+Last Modified: 7:04 AM 5/29/2012
Released: 3/7/2012
License: Feel free to modify this theme.
This theme is available under the terms of the Creative Commons
@@ -30,7 +30,7 @@ Requirements:
However, that font may be replaced in the "GlobalStyles" section of this
file, where it is found in only the "Global override" and "Default Style" lines.
Fonts are not separately specified anywhere else in this version of the style file.
- Note 3/29/2012: I have replaced Inconsola-dz with Consolas, since LC is
+ Note 3/29/2012: I have replaced Inconsola-dz with Consolas, since Consolas is
installed by default in recent versions of Windows.
* Notepad++, of course.
@@ -57,12 +57,12 @@ Installation:
-
-
-
-
-
-
+
+
+
+
+
+
@@ -75,12 +75,12 @@ Installation:
-
+
-
+
@@ -90,7 +90,7 @@ Installation:
-
+
@@ -106,8 +106,8 @@ Installation:
-
-
+
+
@@ -131,7 +131,7 @@ Installation:
-
+
@@ -139,7 +139,7 @@ Installation:
-
+
@@ -158,12 +158,12 @@ Installation:
-
-
-
-
-
-
+
+
+
+
+
+
@@ -177,14 +177,14 @@ Installation:
-
-
-
-
+
+
+
+
-
+
@@ -214,7 +214,7 @@ Installation:
-
+
@@ -227,12 +227,12 @@ Installation:
-
-
-
-
-
-
+
+
+
+
+
+
@@ -245,12 +245,12 @@ Installation:
-
-
-
-
-
-
+
+
+
+
+
+
@@ -262,7 +262,7 @@ Installation:
-
+
@@ -289,11 +289,11 @@ Installation:
-
+
-
+
@@ -379,7 +379,7 @@ Installation:
-
+
@@ -402,7 +402,7 @@ Installation:
-
+
@@ -418,7 +418,7 @@ Installation:
param @projectDescription projectDescription @param
-
+
@@ -504,7 +504,7 @@ Installation:
-
+
@@ -559,8 +559,8 @@ Installation:
-
-
+
+
@@ -677,7 +677,7 @@ Installation:
-
+
@@ -799,7 +799,7 @@ Installation:
-
+
@@ -852,13 +852,13 @@ Installation:
-
-
+
+
-
+
diff --git a/PowerEditor/installer/themes/Solarized.xml b/PowerEditor/installer/themes/Solarized.xml
index c51373237..f31aea462 100644
--- a/PowerEditor/installer/themes/Solarized.xml
+++ b/PowerEditor/installer/themes/Solarized.xml
@@ -8,7 +8,7 @@ Description: Solarized theme for Notepad++.
Commpliance: Nearly complete (see README.txt for exceptions).
Supported languages: All the languages supported by release 5.9.8
Created by: Paul Neubauer (PaulRNeubauer at gmail dot com)
-Last Modified: 12:19 PM 3/29/2012
+Last Modified: 7:04 AM 5/29/2012
Released: 3/7/2012
License: Feel free to modify this theme.
This theme is available under the terms of the Creative Commons
@@ -30,7 +30,7 @@ Requirements:
However, that font may be replaced in the "GlobalStyles" section of this
file, where it is found in only the "Global override" and "Default Style" lines.
Fonts are not separately specified anywhere else in this version of the style file.
- Note 3/29/2012: I have replaced Inconsola-dz with Consolas, since LC is
+ Note 3/29/2012: I have replaced Inconsola-dz with Consolas, since Consolas is
installed by default in recent versions of Windows.
* Notepad++, of course.
@@ -57,12 +57,12 @@ Installation:
-
-
-
-
-
-
+
+
+
+
+
+
@@ -75,12 +75,12 @@ Installation:
-
+
-
+
@@ -90,7 +90,7 @@ Installation:
-
+
@@ -106,8 +106,8 @@ Installation:
-
-
+
+
@@ -131,7 +131,7 @@ Installation:
-
+
@@ -139,7 +139,7 @@ Installation:
-
+
@@ -158,12 +158,12 @@ Installation:
-
-
-
-
-
-
+
+
+
+
+
+
@@ -177,14 +177,14 @@ Installation:
-
-
-
-
+
+
+
+
-
+
@@ -214,7 +214,7 @@ Installation:
-
+
@@ -227,12 +227,12 @@ Installation:
-
-
-
-
-
-
+
+
+
+
+
+
@@ -245,12 +245,12 @@ Installation:
-
-
-
-
-
-
+
+
+
+
+
+
@@ -262,7 +262,7 @@ Installation:
-
+
@@ -289,11 +289,11 @@ Installation:
-
+
-
+
@@ -379,7 +379,7 @@ Installation:
-
+
@@ -402,7 +402,7 @@ Installation:
-
+
@@ -418,7 +418,7 @@ Installation:
param @projectDescription projectDescription @param
-
+
@@ -504,7 +504,7 @@ Installation:
-
+
@@ -559,8 +559,8 @@ Installation:
-
-
+
+
@@ -677,7 +677,7 @@ Installation:
-
+
@@ -799,7 +799,7 @@ Installation:
-
+
@@ -852,13 +852,13 @@ Installation:
-
-
+
+
-
+
diff --git a/PowerEditor/installer/themes/khaki.xml b/PowerEditor/installer/themes/khaki.xml
new file mode 100644
index 000000000..c4eedee90
--- /dev/null
+++ b/PowerEditor/installer/themes/khaki.xml
@@ -0,0 +1,874 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ param @projectDescription projectDescription @param
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h
index 293d384de..f8da4ce5f 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 04c33f4b4..e79979149 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.3")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1.4")
// 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.13\0")
-#define VERSION_DIGITALVALUE 6, 1, 3, 0
+#define VERSION_VALUE TEXT("6.14\0")
+#define VERSION_DIGITALVALUE 6, 1, 4, 0
#ifdef UNICODE
#define UNICODE_ANSI_MODE TEXT("(UNICODE)")
diff --git a/PowerEditor/src/shortcuts.xml b/PowerEditor/src/shortcuts.xml
index 9e542861f..605014e75 100644
--- a/PowerEditor/src/shortcuts.xml
+++ b/PowerEditor/src/shortcuts.xml
@@ -17,7 +17,7 @@
$(NPP_DIRECTORY)\notepad++.exe $(CURRENT_WORD)
$(NPP_DIRECTORY)\notepad++.exe $(CURRENT_WORD) -nosession -multiInst
explorer $(CURRENT_DIRECTORY)
- cmd /K cd $(CURRENT_DIRECTORY)
+ cmd /K cd /d $(CURRENT_DIRECTORY)
outlook /a "$(FULL_CURRENT_PATH)"