From 41a9d6854b79da64e0980435042b33964fd3904f Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Sat, 25 Feb 2012 00:41:10 +0000
Subject: [PATCH] [MODIF] Installer: Don't override contextMenu.xml.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@869 f5eea248-9336-0410-98b8-ebc06183d4e3
---
 PowerEditor/installer/nppSetup.nsi                     | 4 ++--
 PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index c7e0fe268..32ac07632 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -414,11 +414,11 @@ Section -"Notepad++" mainSection
 	; This line is added due to the bug of xmlUpdater, to be removed in the future
 	nsExec::ExecToStack '"$TEMP\xmlUpdater.exe" "$TEMP\stylesLexerModel.xml" "$TEMP\stylers.model.xml" "$UPDATE_PATH\stylers.xml"'
 	
-	Delete "$UPDATE_PATH\contextMenu.backup.xml"
-	Rename "$UPDATE_PATH\contextMenu.xml" "$INSTDIR\contextMenu.backup.xml"
+	SetOverwrite off
 	SetOutPath "$UPDATE_PATH\"
 	File "..\bin\contextMenu.xml"
 	
+	SetOverwrite on
 	SetOutPath "$INSTDIR\"
 	File "..\bin\langs.model.xml"
 	File "..\bin\config.model.xml"
diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
index f74e7cbe4..718432eb8 100644
--- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
+++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
@@ -201,7 +201,7 @@ int PluginsManager::loadPlugin(const TCHAR *pluginFilePath, vector<generic_strin
 		delete pi;
         return -1;
 	} catch(...) {
-		generic_string msg = TEXT("Fail loaded");
+		generic_string msg = TEXT("Failed to load");
 		msg += TEXT("\n\n");
 		msg += USERMSG;
 		if (::MessageBox(NULL, msg.c_str(), pluginFilePath, MB_YESNO) == IDYES)