Merge branch 'master' of https://github.com/donho/notepad-plus-plus

PowerEditor/bin/updater/gup.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" ?>
 <!--
     Copyright 2007 Don HO <don.h@free.fr>
 	
@@ -16,13 +17,12 @@
     You should have received a copy of the GNU Lesser General Public License
     along with GUP.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<?xml version="1.0" ?>
 <GUPInput>
 	<!-- optional.
 	It's the current version of your program. GUP will add "?version=versionNumber" at the end of InfoUrl.
 	This parameter will be ignored if you pass directly your version number to GUP 
 	-->
-	<Version>4.8.2</Version>
+	<Version>4.6</Version>
 
 	<!-- Mandatory.
 	This is the url (your web application) from where your GUP gets the update information.
@@ -32,6 +32,12 @@
 	<!--InfoUrl>http://notepad-plus.sourceforge.net/commun/update/getDownLoadUrl.php</InfoUrl-->
 	<InfoUrl>http://notepad-plus-plus.org/update/getDownloadUrl.php</InfoUrl>
 
+	<!-- optional. 
+	The User-Agent you want to use to download your binary.
+	If this node is absent or empty, then "Generic Updater for Win32" will be used by default.
+	-->
+	<User-agent>Notepad++ Generic Updater</User-agent>
+
 	<!-- optional. 
 	The window class name of program that you want to update.
 	GUP uses FindWindow routine to get the Handle of window, then send WM_CLOSE to the handle in order to quit the program.
@@ -44,8 +50,10 @@
 	
 	<!-- Optional.
 	This is the title to display on the messagebox title bar.
+	If extraCmd is set (parameter is presentand the value is not empty), the 3rd button will be appear.
+	extraCmd (with its wParam and lParam) will be sent to the handle of application indicated in ClassName2Close
 	-->
-	<MessageBoxTitle extraCmd="1034" ecWparam="" ecLparam="">Notepad++ update</MessageBoxTitle>
+	<MessageBoxTitle extraCmd="" ecWparam="" ecLparam="">Notepad++ update</MessageBoxTitle>
 
 	<!-- optional. YES by default.
 	This parameter can hide all the network error message. 

PowerEditor/installer/nativeLang/danish.xml

@@ -789,6 +789,15 @@
 					<Item id = "6258" name = "bla bla bla bla bla bla bla bla bla bla bla bla"/>
 				</Delimiter>
                 
+                <Cloud title = "Sky">
+                    <Item id = "6262" name = "Indstillinger i skyen"/>
+                    <Item id = "6263" name = "Ingen sky"/>
+                    <Item id = "6264" name = "Dropbox"/>
+                    <Item id = "6265" name = "OneDrive"/>
+                    <Item id = "6266" name = "Google Drive"/>
+                    <!--Item id="6261" name="Please restart Notepad++ to take effect."/-->
+                </Cloud>
+				
                 <Cloud title = "Sky">
                     <Item id = "6262" name = "Indstillinger i skyen"/>
                     <Item id = "6263" name = "Ingen sky"/>

PowerEditor/installer/nppSetup.nsi

@@ -36,10 +36,10 @@
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "6.7.5"
+!define APPVERSION "6.7.6"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 75
+!define VERSION_MINOR 76
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 

PowerEditor/src/resource.h

@@ -29,13 +29,12 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.7.5")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.7.6")
-//#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ Je suis Charlie edition")
 
 // 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.75\0")
+#define VERSION_VALUE TEXT("6.76\0")
-#define VERSION_DIGITALVALUE 6, 7, 5, 0
+#define VERSION_DIGITALVALUE 6, 7, 6, 0
 
 #ifndef IDC_STATIC
 #define IDC_STATIC	-1