diff --git a/PowerEditor/bin/NppHelp.chm b/PowerEditor/bin/NppHelp.chm
index b6f75dc47..e4e56c8e6 100644
Binary files a/PowerEditor/bin/NppHelp.chm and b/PowerEditor/bin/NppHelp.chm differ
diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 656f774ab..5ed58242a 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,3 +1,11 @@
+Notepad++ v5.6.8 new features and fixed bugs (from v5.6.7) :
+
+1. Fix comment stream without selection bug.
+2. Fix Find in files results highlighting regression bug.
+3. Fix regression bug (include the correct SciLexer.dll) about insensible case search mode.
+
+
+
Notepad++ v5.6.7 new features and fixed bugs (from v5.6.6) :
1. Fix "Find in files" crash bug.
diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb
index bcb495213..3f4864303 100644
Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ
diff --git a/PowerEditor/installer/APIs/sql.xml b/PowerEditor/installer/APIs/sql.xml
index b0fad33d8..d1d518d34 100644
--- a/PowerEditor/installer/APIs/sql.xml
+++ b/PowerEditor/installer/APIs/sql.xml
@@ -1,576 +1,1731 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml
index c7a0195e7..9a50a1683 100644
--- a/PowerEditor/installer/nativeLang/czech.xml
+++ b/PowerEditor/installer/nativeLang/czech.xml
@@ -27,10 +27,10 @@
-
-
-
-
+
+
+
+
@@ -156,6 +156,8 @@
+
+
diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml
index a84622306..09ee37cfb 100644
--- a/PowerEditor/installer/nativeLang/russian.xml
+++ b/PowerEditor/installer/nativeLang/russian.xml
@@ -1,7 +1,4 @@
-
-
-
@@ -27,18 +24,18 @@
-
+
-
-
-
-
+
+
+
+
-
+
@@ -58,7 +55,7 @@
-
+
@@ -88,8 +85,8 @@
-
-
+
+
@@ -111,23 +108,23 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -135,16 +132,16 @@
-
+
-
+
-
+
-
+
-
-
+
+
@@ -160,17 +157,19 @@
-
+
+
+
-
-
+
+
-
+
-
+
@@ -178,8 +177,8 @@
-
-
+
+
@@ -188,15 +187,15 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -215,34 +214,34 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
@@ -252,18 +251,18 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -273,7 +272,7 @@
-
+
@@ -281,7 +280,7 @@
-
+
@@ -294,15 +293,15 @@
-
-
-
-
+
+
+
+
-
+
@@ -316,8 +315,8 @@
-
-
+
+
@@ -398,9 +397,9 @@
-
+
-
+
@@ -409,17 +408,17 @@
-
+
-
+
-
-
+
+
-
+
@@ -460,21 +459,21 @@
-
+
-
+
-
+
-
+
@@ -488,25 +487,25 @@
-
+
-
+
-
+
-
+
-
+
@@ -516,28 +515,28 @@
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 6e719dc98..57b728e7a 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.6.7"
-!define APPNAMEANDVERSION "Notepad++ v5.6.7"
+!define APPVERSION "5.6.8"
+!define APPNAMEANDVERSION "Notepad++ v5.6.8"
!define VERSION_MAJOR 5
-!define VERSION_MINOR 67
+!define VERSION_MINOR 68
!define APPWEBSITE "http://notepad-plus.sourceforge.net/"
@@ -29,7 +29,7 @@
Name "${APPNAMEANDVERSION}"
InstallDir "$PROGRAMFILES\Notepad++"
InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile ".\build\npp.5.6.7.Installer.exe"
+OutFile ".\build\npp.5.6.8.Installer.exe"
; GetWindowsVersion
;
diff --git a/PowerEditor/misc/npp.help/HTML/Continued search.html b/PowerEditor/misc/npp.help/HTML/Dialog free search.html
similarity index 50%
rename from PowerEditor/misc/npp.help/HTML/Continued search.html
rename to PowerEditor/misc/npp.help/HTML/Dialog free search.html
index aa5a7ad3f..a695758c2 100644
--- a/PowerEditor/misc/npp.help/HTML/Continued search.html
+++ b/PowerEditor/misc/npp.help/HTML/Dialog free search.html
@@ -2,13 +2,24 @@
Continued search
-Continued search
+
+Dialog-free search
+Continued search
After
a search inside a file, you can select or
to search for this query again. This allows
you to quickly perform the same search multiple times without the
need for any further input.
-
Likewise, select or
- to go find the next/previous word under the carat. Or or
+
Likewise, you can use or
to navigate through results shown on the Search result window
+
Volatile search
+Volatile search consists in searching for a word under the caret without the need to open the search dialog box. This has two flavours:
+
+
+ or
+ find the next/previous occurence of the selected text, without affecting continued search.
+
+ or
+ find the next/previous occurence of the word under the caret, and remember this search so that continued search applies to this same word.
+
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Display Shortcuts.html b/PowerEditor/misc/npp.help/HTML/Display Shortcuts.html
new file mode 100644
index 000000000..78e88ce2a
--- /dev/null
+++ b/PowerEditor/misc/npp.help/HTML/Display Shortcuts.html
@@ -0,0 +1,33 @@
+
+
+
+Display Shortcuts
+
+
+
+Shortcuts for the View menu
+
+ Default shortcuts
+Below is the list of predefined keyboard and mouse shortcuts for Notepad++.
+They can be freely configured using the shortcut mapper ,
+as well as all the commands which were not bound to shortcuts by default.
+This list does not include standard shortcuts provided by Notepad++-related plugins.
+
+
+ View menu
+ Shortcut Action
+ Ctrl-(Keypad-/Keypad+) or Ctrl + mouse wheel button (if any) Zoom in (+ or up) and Zoom out (- or down)
+ Ctrl-Keypad/ Restore the original size from zoom
+ F11 Toggle Full Screen Mode
+ F12 Toggle Post-It Mode
+ Ctrl-Alt-F Collapse the Current Level
+ Ctrl-Alt-Shift-F Uncollapse the Current Level
+ Alt-0 Fold All
+ Alt-(1~8) Collapse the Level (1~8)
+ Alt-Shift-0 Unfold All
+ Alt-Shift-(1~8) Uncollapse the Level (1~8)
+
+
+
+
+
\ No newline at end of file
diff --git a/PowerEditor/misc/npp.help/HTML/Edit Shortcuts.html b/PowerEditor/misc/npp.help/HTML/Edit Shortcuts.html
new file mode 100644
index 000000000..2f7b78394
--- /dev/null
+++ b/PowerEditor/misc/npp.help/HTML/Edit Shortcuts.html
@@ -0,0 +1,62 @@
+
+
+
+Edit Shortcuts
+
+
+
+Shortcuts for the Edit menu
+
+ Default shortcuts
+Below is the list of predefined keyboard and mouse shortcuts for Notepad++.
+They can be freely configured using the shortcut mapper ,
+as well as all the commands which were not bound to shortcuts by default.
+This list does not include standard shortcuts provided by Notepad++-related plugins.
+
+
+ Edit menu
+ Shortcut Action
+ Ctrl-C Copy
+ Ctrl-Insert Copy
+ Ctrl-Shift-T Copy current line to clipboard
+ Ctrl-X Cut
+ Shift-Delete Cut
+ Ctrl-V Paste
+ Shift-Insert Paste
+ Ctrl-Z Undo
+ Alt-Backspace Undo
+ Ctrl-Y Redo
+ Ctrl-A Select All
+ Alt-Shift-Arrow keys, or Alt + Left mouse click Column Mode Select
+ Ctrl + Left mouse click Start new selected area. Only multiple stream areas ca be selected this way.
+ ALT-C Column Editor
+ Ctrl-D Duplicate Current Line
+ Ctrl-T Switch the current line position with the previous line position
+ Ctrl-Shift-Up Move Current Line, or current selection if a single stream, Up
+ Ctrl-Shift-Down Move Current Line, or current selection if a single stream, Down
+ Ctrl-L Delete Current Line
+ Ctrl-I Split Lines
+ Ctrl-J Join Lines
+ Ctrl-G Launch GoToLine Dialog
+ Ctrl-Q Block comment/uncomment
+ Ctrl-Shift-Q Stream comment
+ Tab (selection of one or more full lines) Insert Tabulation or Space (Indent)
+ Shift-Tab (selection of one or more full lines) Remove Tabulation or Space (outdent)
+ Ctrl-BackSpace Delete to start of word
+ Ctrl-Delete Delete to end of word
+ Ctrl-Shift-BackSpace Delete to start of line
+ Ctrl-Shift-Delete Delete to end of line
+ Ctrl-U Convert to lower case
+ Ctrl-Shift-U Convert to UPPER CASE
+ Ctrl-B Go to matching brace
+ Ctrl-Space Launch CallTip ListBox
+ Ctrl-Shift-Space Launch Function Completion ListBox
+ Ctrl-Enter Launch Word Completion ListBox
+ Ctrl-Alt-R Text Direction RTL
+ Ctrl-Alt-L Text Direction LTR
+ Enter Split line downwards, or create new line
+ Shift-Enter Split line downwards, or create new line
+
+
+
+