diff --git a/PowerEditor/installer/nativeLang/bosnian.xml b/PowerEditor/installer/nativeLang/bosnian.xml
new file mode 100644
index 00000000..ba3a5341
--- /dev/null
+++ b/PowerEditor/installer/nativeLang/bosnian.xml
@@ -0,0 +1,513 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml
index b197ffb7..7a66fc24 100644
--- a/PowerEditor/installer/nativeLang/german.xml
+++ b/PowerEditor/installer/nativeLang/german.xml
@@ -1,7 +1,7 @@
@@ -182,6 +182,7 @@
+
@@ -221,6 +222,7 @@
+
@@ -404,7 +406,7 @@
-
+
@@ -435,14 +437,13 @@
-
-
+
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index dd060601..9a068a3e 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -145,13 +145,13 @@ FunctionEnd
!define MUI_ABORTWARNING
-
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "..\license.txt"
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_INSTFILES
+
!define MUI_FINISHPAGE_RUN
;!define MUI_FINISHPAGE_RUN_TEXT "Run Npp"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchNpp"
@@ -212,12 +212,12 @@ FunctionEnd
!insertmacro MUI_LANGUAGE "Uzbek"
!insertmacro MUI_LANGUAGE "Macedonian"
!insertmacro MUI_LANGUAGE "Latvian"
+ !insertmacro MUI_LANGUAGE "Bosnian"
;!insertmacro MUI_LANGUAGE "Estonian"
;!insertmacro MUI_LANGUAGE "Mongolian"
;!insertmacro MUI_LANGUAGE "Breton"
;!insertmacro MUI_LANGUAGE "Icelandic"
- ;!insertmacro MUI_LANGUAGE "Bosnian"
;!insertmacro MUI_LANGUAGE "Kurdish"
;!insertmacro MUI_LANGUAGE "Irish"
@@ -225,7 +225,6 @@ FunctionEnd
;Installer Functions
-
Function .onInit
;Test if window9x
@@ -305,6 +304,7 @@ LangString langFileName ${LANG_AFRIKAANS} "afrikaans.xml"
LangString langFileName ${LANG_UZBEK} "uzbek.xml"
LangString langFileName ${LANG_MACEDONIAN} "macedonian.xml"
LangString langFileName ${LANG_LATVIAN} "Latvian.xml"
+LangString langFileName ${LANG_BOSNIAN} "bosnian.xml"
;--------------------------------
@@ -350,8 +350,6 @@ GLOBAL_INST:
File "stylesGlobalModel.xml"
File "stylesLexerModel.xml"
File "stylers_remove.xml"
- ;File "contextMenuModel.xml"
- ;File "contextMenu_remove.xml"
File "..\bin\langs.model.xml"
File "..\bin\config.model.xml"
@@ -809,6 +807,13 @@ Section /o "Create Shortcut on Desktop" shortcutOnDesktop
CreateShortCut "$DESKTOP\Notepad++.lnk" "$INSTDIR\notepad++.exe"
SectionEnd
+Section /o "Use the old application icon" getOldIcon
+ SetOutPath "$TEMP\"
+ File "..\misc\vistaIconTool\changeIcon.exe"
+ File "..\src\icons\npp.ico"
+ nsExec::ExecToStack '"$TEMP\changeIcon.exe" "$TEMP\npp.ico" "$INSTDIR\notepad++.exe" 100 1033'
+SectionEnd
+
;--------------------------------
;Descriptions
@@ -823,6 +828,8 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${Themes} 'The eye-candy to change visual effects. Use Theme selector to switch among them.'
!insertmacro MUI_DESCRIPTION_TEXT ${htmlViewer} 'Open the html file in Notepad++ while you choose from IE.'
!insertmacro MUI_DESCRIPTION_TEXT ${AutoUpdater} 'Keep your Notepad++ update: Check this option to install an update module which searches Notepad++ update on Internet and install it for you.'
+ !insertmacro MUI_DESCRIPTION_TEXT ${shortcutOnDesktop} 'Check this option to add Notepad++ shortcut on your desktop.'
+ !insertmacro MUI_DESCRIPTION_TEXT ${getOldIcon} "I won't blame you if you want to get the old icon back."
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;--------------------------------
diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h
index 36950043..2769d75d 100644
Binary files a/PowerEditor/src/localizationString.h and b/PowerEditor/src/localizationString.h differ