diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index a1739297..49622ba9 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,11 +1,19 @@
-Notepad++ v6.6.9 new feature and bug fixes:
-
-1. Fix comment command bug that the comment symbols isn't set on the first column for Fortran.
-2. Add python parson for function List.
-3. Make icons' background colour transparent for functionList and projectManager.
-4. New feature: Apply new file default settings on created new file (opened via command line).
-5. Fix colour picker' chooser bug which does not work well.
+Notepad++ v6.7 new feature and bug fixes:
+1. Add Smart Indent feature for php/javascript/c/c++/java/c#/Objective-C.
+2. Enhance Auto-insert feature for {} [] (): typing and skipping }, ] and ).
+3. Add new feature of MRU: While current file is closed the previous activated file will be activated.
+4. Allow users to disable Easter eggs by adding noEasterEggs.xml in Notepad++ installed directory.
+5. Enhancement: Resize column Name filed correctly while hiding column Ext.
+6. Fix Global colours not applied to all text of the "Find result" pane.
+7. Add C# and enhance php parser in Function List.
+8. Fix document list panel has no selection while start up.
+9. Fix docSwitcher bug which shows new 0 after loading a session of files.
+10. Fix crash issue on quit Notepad++ while session snapshot period backup feature is on.
+11. Make "Text Direction RTL" command and "Text Direction LTR" command work without reloading file.
+12. Make document map matches the current text direction (RTL/LTR).
+13. Fix a crash issue while the opened document is deleted/moved from outside.
+14. Fix undo actions on unsaved snapshot file removing the dirty state bug.
Included plugins:
diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb
index 61120bce..1cfdf37a 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 cb9f38b9..00dd6722 100644
--- a/PowerEditor/installer/nativeLang/chineseSimplified.xml
+++ b/PowerEditor/installer/nativeLang/chineseSimplified.xml
@@ -1,6 +1,6 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PowerEditor/installer/nativeLang/urdu.xml b/PowerEditor/installer/nativeLang/urdu.xml
new file mode 100644
index 00000000..46722a10
--- /dev/null
+++ b/PowerEditor/installer/nativeLang/urdu.xml
@@ -0,0 +1,280 @@
+
+
+
+
+
+
+
+ /
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index dd3fe4dc..7d710f8e 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.6.9"
+!define APPVERSION "6.7"
!define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
!define VERSION_MAJOR 6
-!define VERSION_MINOR 69
+!define VERSION_MINOR 70
!define APPWEBSITE "http://notepad-plus-plus.org/"
@@ -186,6 +186,9 @@ page Custom ExtraOptions
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
+; TODO for optional arg
+;!insertmacro GetParameters
+
; Set languages (first is default language)
;!insertmacro MUI_LANGUAGE "English"
!define MUI_LANGDLL_ALLLANGUAGES
@@ -291,6 +294,9 @@ Var allowPluginLoadFromUserDataChecked
Var isOldIconChecked
Var createShortcutChecked
+; TODO for optional arg
+;Var params
+
; The definition of "OnChange" event for checkbox
Function OnChange_NoUserDataCheckBox
${NSD_GetState} $NoUserDataCheckboxHandle $noUserDataChecked
@@ -420,6 +426,17 @@ Section -"Notepad++" mainSection
Delete $INSTDIR\allowAppDataPlugins.xml
${EndIf}
+
+ ; TODO for optional arg
+ ;${GetParameters} $params
+ ;${GetOptions} $params "/noEasterEggs" $R0
+
+ ;IfErrors 0 +2
+ ;MessageBox MB_OK "Not found /noEasterEggs" IDOK +2
+ ;MessageBox MB_OK "Found /noEasterEggs"
+
+
+
SetOutPath "$TEMP\"
File "langsModel.xml"
File "configModel.xml"
@@ -959,6 +976,9 @@ SectionGroup "Localization" localization
Section /o "Malay" malay
CopyFiles "$TEMP\nppLocalization\malay.xml" "$INSTDIR\localization\malay.xml"
SectionEnd
+ Section /o "Marathi" marathi
+ CopyFiles "$TEMP\nppLocalization\marathi.xml" "$INSTDIR\localization\marathi.xml"
+ SectionEnd
Section /o "Mongolian" mongolian
CopyFiles "$TEMP\nppLocalization\mongolian.xml" "$INSTDIR\localization\mongolian.xml"
SectionEnd
@@ -977,6 +997,9 @@ SectionGroup "Localization" localization
Section /o "Portuguese" portuguese
CopyFiles "$TEMP\nppLocalization\portuguese.xml" "$INSTDIR\localization\portuguese.xml"
SectionEnd
+ Section /o "Kannada" kannada
+ CopyFiles "$TEMP\nppLocalization\kannada.xml" "$INSTDIR\localization\kannada.xml"
+ SectionEnd
Section /o "Romanian" romanian
CopyFiles "$TEMP\nppLocalization\romanian.xml" "$INSTDIR\localization\romanian.xml"
SectionEnd
@@ -1034,21 +1057,21 @@ SectionGroup "Localization" localization
Section /o "Ukrainian" ukrainian
CopyFiles "$TEMP\nppLocalization\ukrainian.xml" "$INSTDIR\localization\ukrainian.xml"
SectionEnd
+ Section /o "Urdu" urdu
+ CopyFiles "$TEMP\nppLocalization\urdu.xml" "$INSTDIR\localization\urdu.xml"
+ SectionEnd
+ Section /o "Uyghur" uyghur
+ CopyFiles "$TEMP\nppLocalization\uyghur.xml" "$INSTDIR\localization\uyghur.xml"
+ SectionEnd
Section /o "Uzbek" uzbek
CopyFiles "$TEMP\nppLocalization\uzbek.xml" "$INSTDIR\localization\uzbek.xml"
SectionEnd
Section /o "Uzbek (Cyrillic)" uzbekCyrillic
CopyFiles "$TEMP\nppLocalization\uzbekCyrillic.xml" "$INSTDIR\localization\uzbekCyrillic.xml"
SectionEnd
- Section /o "Uyghur" uyghur
- CopyFiles "$TEMP\nppLocalization\uyghur.xml" "$INSTDIR\localization\uyghur.xml"
- SectionEnd
Section /o "Vietnamese" vietnamese
CopyFiles "$TEMP\nppLocalization\vietnamese.xml" "$INSTDIR\localization\vietnamese.xml"
SectionEnd
- Section /o "Marathi" marathi
- CopyFiles "$TEMP\nppLocalization\marathi.xml" "$INSTDIR\localization\marathi.xml"
- SectionEnd
SectionGroupEnd
SectionGroup "Themes" Themes
@@ -1673,6 +1696,9 @@ SectionGroup un.localization
Section un.malay
Delete "$INSTDIR\localization\malay.xml"
SectionEnd
+ Section un.marathi
+ Delete "$INSTDIR\localization\marathi.xml"
+ SectionEnd
Section un.mongolian
Delete "$INSTDIR\localization\mongolian.xml"
SectionEnd
@@ -1688,6 +1714,9 @@ SectionGroup un.localization
Section un.polish
Delete "$INSTDIR\localization\polish.xml"
SectionEnd
+ Section un.kannada
+ Delete "$INSTDIR\localization\kannada.xml"
+ SectionEnd
Section un.portuguese
Delete "$INSTDIR\localization\portuguese.xml"
SectionEnd
@@ -1748,21 +1777,21 @@ SectionGroup un.localization
Section un.ukrainian
Delete "$INSTDIR\localization\ukrainian.xml"
SectionEnd
+ Section un.urdu
+ Delete "$INSTDIR\localization\urdu.xml"
+ SectionEnd
+ Section un.uyghur
+ Delete "$INSTDIR\localization\uyghur.xml"
+ SectionEnd
Section un.uzbek
Delete "$INSTDIR\localization\uzbek.xml"
SectionEnd
Section un.uzbekCyrillic
Delete "$INSTDIR\localization\uzbekCyrillic.xml"
SectionEnd
- Section un.uyghur
- Delete "$INSTDIR\localization\uyghur.xml"
- SectionEnd
Section un.vietnamese
Delete "$INSTDIR\localization\vietnamese.xml"
SectionEnd
- Section un.marathi
- Delete "$INSTDIR\localization\marathi.xml"
- SectionEnd
SectionGroupEnd
diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h
index aa8fcd3d..c757f456 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 bec49c0e..688d8922 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.6.9")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.7")
// 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.69\0")
-#define VERSION_DIGITALVALUE 6, 6, 9, 0
+#define VERSION_VALUE TEXT("6.7\0")
+#define VERSION_DIGITALVALUE 6, 7, 0, 0
#ifndef IDC_STATIC
#define IDC_STATIC -1