diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 1c1a9b58..238c970b 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,6 +1,11 @@
-Notepad++ v6.1.2 fixed bugs:
+Notepad++ v6.1.3 enhancement and fixed bugs:
 
-1.  Fix Notepad++ hanging bug due to the opened file containing a half of UTF-8 double byte sequence at the end of the file.
+1.  Enhance the performance issue for xml matching tags highlighting and for displaying clickable links.
+2.  While the amount of file to open is larger than 200, a dialog will be shown to warn user.
+3.  Fix Notepad++ close bug while move one cloned new empty document into another view, in the destination contained only this new empty document.
+4.  Fix hanging problem while double-click on a project folder then (immediately) drag it.
+5.  Fix a bug while command argument contain an empty string ("").
+6.  Fix mouse cursor disappearing bug on right click while a project item is dragging.
 
 
 Included plugins:
diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb
index 80e77594..4b0694d4 100644
Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ
diff --git a/PowerEditor/installer/nativeLang/basque.xml b/PowerEditor/installer/nativeLang/basque.xml
index 55a556a0..26b254f9 100644
--- a/PowerEditor/installer/nativeLang/basque.xml
+++ b/PowerEditor/installer/nativeLang/basque.xml
@@ -635,11 +635,11 @@
             </ColumnEditor>                   
 		</Dialog>   
 		<MessageBox> 
-		    <ContextMenuXmlEditWaring title="Hitzinguru Menua Editatzea" message="Hitzinguru Menua Editatzen.xml-ek Notepad++ oharleiho hitzinguru  menua aldatzea ahalbidetzen dizu.\rNotepad++ berrabiarazi behar duzu eragina izateko hitzinguru Menua.xml aldatu ondoren."/> 
-			<NppHelpAbsentWaring title="Agiria ez dago" message="\rEz dago. Mesedez jeitsi ezazu Notepad++ webgunetik."/> 
-			<SaveCurrentModifWaring title="Gorde Oraingo Aldaketa" message="Oraingo aldaketa gorde behar duzu.
+		    <ContextMenuXmlEditWarning title="Hitzinguru Menua Editatzea" message="Hitzinguru Menua Editatzen.xml-ek Notepad++ oharleiho hitzinguru  menua aldatzea ahalbidetzen dizu.\rNotepad++ berrabiarazi behar duzu eragina izateko hitzinguru Menua.xml aldatu ondoren."/> 
+			<NppHelpAbsentWarning title="Agiria ez dago" message="\rEz dago. Mesedez jeitsi ezazu Notepad++ webgunetik."/> 
+			<SaveCurrentModifWarning title="Gorde Oraingo Aldaketa" message="Oraingo aldaketa gorde behar duzu.
 			\rGordetako aldaketa guztiak ezin dira desegin.\r\rJarraitu?"/> 
-			<LoseUndoAbilityWaring title="Galdu Desegin Gaitasun Gutxitzailea" message="Oraingo aldaketa gorde behar duzu.
+			<LoseUndoAbilityWarning title="Galdu Desegin Gaitasun Gutxitzailea" message="Oraingo aldaketa gorde behar duzu.
 			\rGordetako aldaketa guztiak ezin dira desegin.\r\rJarraitu?"/> 
 			<CannotMoveDoc title="Mugitu Notepad++ Eskabide berrira" message="Agiria aldatuta dago, gorde eta saiatu berriro."/> 
 			<DocReloadWarning title="Birgertatu" message="Zihur zaude oraingo agiria birgertatzea eta Notepad++ egindako aldaketak galtzea nahi dituzula?"/><FileLockedWarning title="Gordetze hutsegitea" message="Mesedez egiaztatu agiria beste programaren batean irekita dagoen"/><FileAlreadyOpenedInNpp title="" message="Agiria jadanik irekita dago hemen: Notepad++."/> 
diff --git a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml
index 9ebf5d7c..f0d09d7b 100644
--- a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml
+++ b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml
@@ -627,10 +627,10 @@
             </ColumnEditor>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title = "Edititando contextMenu" message = "Editar o arquivo contextMenu.xml permite que você modifique as mensagens do menu de contexto.\rÉ necessário reiniciar o Notepad++ para que as modificações tenham efeito."/>
-			<NppHelpAbsentWaring title = "Arquivo não existe" message = "\rnão existe. Por favor baixe o arquivo no site do Notepad++."/>
-			<SaveCurrentModifWaring title = "Salvar modificações atuais" message = "Você deve salvar a modificação atual.\rAs modificações salvas não poderão ser desfeitas.\r\rDeseja continuar?"/>
-			<LoseUndoAbilityWaring title = "Impossível desfazer" message = "Você deve salvar a modificação atual.\rAs modificações salvas não poderão ser desfeitas.\r\rDeseja continuar?"/>
+			<ContextMenuXmlEditWarning title = "Edititando contextMenu" message = "Editar o arquivo contextMenu.xml permite que você modifique as mensagens do menu de contexto.\rÉ necessário reiniciar o Notepad++ para que as modificações tenham efeito."/>
+			<NppHelpAbsentWarning title = "Arquivo não existe" message = "\rnão existe. Por favor baixe o arquivo no site do Notepad++."/>
+			<SaveCurrentModifWarning title = "Salvar modificações atuais" message = "Você deve salvar a modificação atual.\rAs modificações salvas não poderão ser desfeitas.\r\rDeseja continuar?"/>
+			<LoseUndoAbilityWarning title = "Impossível desfazer" message = "Você deve salvar a modificação atual.\rAs modificações salvas não poderão ser desfeitas.\r\rDeseja continuar?"/>
 			<CannotMoveDoc title = "Mover para nova instância do Notepad++" message = "Documento alterado, salve-o e tente novamente."/>
 			<DocReloadWarning title = "Recarregar" message = "Você tem certeza que quer recarregar o arquivo atual e perder as modificações feitas no Notepad++?"/>
 			<FileLockedWarning title = "Falha ao salvar" message = "Por favor verifique se este arquivo está aberto em outro programa"/>
diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml
index 012a03bb..e03e2c4d 100644
--- a/PowerEditor/installer/nativeLang/catalan.xml
+++ b/PowerEditor/installer/nativeLang/catalan.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <!--
 Catalan translation
-for Notepad++ 5.9.8
-Updated 12 Jan 2012
-By Hiro5 (from sourceforge.net)
+for Notepad++ 6.0 RC, 6.1.2
+Updated 17 May 2012
+By Hiro5 [groccat at gmail]
 -->
 <NotepadPlus>
 	<Native-Langue name="Català" filename="catalan.xml">
@@ -205,6 +205,7 @@ By Hiro5 (from sourceforge.net)
 					<Item id="44030" name="Plega el &amp;nivell actual"/>
 					<Item id="44031" name="Desplega el n&amp;ivell actual"/>
 					<Item id="44049" name="Sumari&amp;..."/>
+					<Item id="44080" name="Mapa del document"/>
 					<Item id="44035" name="Sincronitza el desplaçament &amp;vertical"/>
 					<Item id="44036" name="Sincronitza el desplaçament &amp;horitzontal"/>
 					<Item id="42026" name="Text de &amp;dreta a esquerra"/>
@@ -303,8 +304,8 @@ By Hiro5 (from sourceforge.net)
 				<Item id="1632" name="A la selecció"/>
 				<Item id="1633" name="Neteja"/>
 				<Item id="1661" name="Segueix fitxer actual"/>
-				<Item id="1658" name="A tots els subdirectoris"/>
-				<Item id="1659" name="A les carpetes ocultes"/>
+				<Item id="1658" name="Inclou subdirectoris"/>
+				<Item id="1659" name="Inclou carpetes ocultes"/>
 				<Item id="1603" name="Només la paraula sencera"/>
 				<Item id="1604" name="Diferencia majúscules i minúscules"/>
 				<Item id="1606" name="Dóna la volta"/>
@@ -312,6 +313,7 @@ By Hiro5 (from sourceforge.net)
 				<Item id="1625" name="Normal"/>
 				<Item id="1626" name="Estès (\n, \r, \t, \0, \x...)"/>
 				<Item id="1605" name="Expressió regular"/>
+				<Item id="1703" name="&amp;. cerca nova línia"/>
 				<Item id="1621" name="Direcció"/>
 				<Item id="1612" name="Amu&amp;nt"/>
 				<Item id="1613" name="A&amp;vall"/>
@@ -348,7 +350,7 @@ By Hiro5 (from sourceforge.net)
 			</Run>
 			<StyleConfig title="Configuració d'estil">
 				<Item id="2" name="Cancel·la"/>
-				<Item id="2301" name="Desar &amp;i tancar"/>
+				<Item id="2301" name="Desa &amp;i tanca"/>
 				<Item id="2303" name="Transparència"/>
 				<Item id="2306" name="Selecciona tema:"/>
 				<SubDialog>
@@ -460,7 +462,7 @@ By Hiro5 (from sourceforge.net)
 					<Item id="6113" name="Doble clic per tancar el document"/>
 				</Global>
 				<Scintillas title="Opcions visuals">
-					<Item id="6216" name="Configuració de cursor"/>
+					<Item id="6216" name="Configuració del cursor"/>
 					<Item id="6217" name="Amplada:"/>
 					<Item id="6219" name="Pampallugueig:"/>
 					<Item id="6221" name="R"/>
@@ -505,9 +507,9 @@ By Hiro5 (from sourceforge.net)
 					<Item id="6414" name="Segons el document actual"/>
 					<Item id="6415" name="Segons l'últim directori emprat"/>
 					<Item id="6304" name="Historial de fitxers recents"/>
-					<Item id="6306" name="Nombre màxim a l'historial d'arxius:"/>
+					<Item id="6306" name="Límit d'arxius a l'historial:"/>
 					<Item id="6305" name="No comprovis els fitxers en iniciar"/>
-					<Item id="-1" name="Mostra"/>
+					<Item id="-1" name="Mostra l'historial"/>
 					<Item id="6424" name="Al submenú"/>
 					<Item id="6425" name="Només el nom d'arxiu"/>
 					<Item id="6426" name="Ruta completa de l'arxiu"/>
@@ -627,10 +629,10 @@ By Hiro5 (from sourceforge.net)
 			</ColumnEditor>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Editant contextMenu" message="Editant contextMenu.xml et permet modificar el menú contextual emergent de Notepad++.
Necessites reiniciar Notepad++ després de modificar contextMenu.xml perquè faci efecte."/>
-			<NppHelpAbsentWaring title="No existeix el fitxer" message="
no existeix. Descarrega'l a la web de Notepad++."/>
-			<SaveCurrentModifWaring title="Desa modificació actual" message="Hauries de desar la modificació actual.
Totes les modificacions desades no es poden desfer.

Continuar?"/>
-			<LoseUndoAbilityWaring title="Avís de perdre l'habilitat de desfer" message="Hauries de desar la modificació actual.
Totes les modificacions desades no es poden desfer.

Continuar?"/>
+			<ContextMenuXmlEditWarning title="Editant contextMenu" message="Editant contextMenu.xml et permet modificar el menú contextual emergent de Notepad++.
Necessites reiniciar Notepad++ després de modificar contextMenu.xml perquè faci efecte."/>
+			<NppHelpAbsentWarning title="No existeix el fitxer" message="
no existeix. Descarrega'l a la web de Notepad++."/>
+			<SaveCurrentModifWarning title="Desa modificació actual" message="Hauries de desar la modificació actual.
Totes les modificacions desades no es poden desfer.

Continuar?"/>
+			<LoseUndoAbilityWarning title="Avís de perdre l'habilitat de desfer" message="Hauries de desar la modificació actual.
Totes les modificacions desades no es poden desfer.

Continuar?"/>
 			<CannotMoveDoc title="Mou a una nova finestra Notepad++" message="El document s'ha modificat, desa'l i torna-ho a intentar."/>
 			<DocReloadWarning title="Recarrega" message="Segur que vols recarregar el fitxer actual i perdre els canvis fets amb Notepad++?"/>
 			<FileLockedWarning title="No s'ha pogut desar" message="Comprova si aquest fitxer està obert amb un altre programa"/>
diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml
index bbb2deac..51f382e1 100644
--- a/PowerEditor/installer/nativeLang/chinese.xml
+++ b/PowerEditor/installer/nativeLang/chinese.xml
@@ -592,10 +592,10 @@
             </ColumnEditor>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Editing contextMenu" message="Editing contextMenu.xml allows you to modify your Notepad++ popup context menu.\rYou have to restart your Notepad++ to take effect after modifying contextMenu.xml."/>
-			<NppHelpAbsentWaring title="File does not exist" message="\rdoesn't exist. Please download it on Notepad++ site."/>
-			<SaveCurrentModifWaring title="Save Current Modification" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
-			<LoseUndoAbilityWaring title="Lose Undo Ability Waning" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
+			<ContextMenuXmlEditWarning title="Editing contextMenu" message="Editing contextMenu.xml allows you to modify your Notepad++ popup context menu.\rYou have to restart your Notepad++ to take effect after modifying contextMenu.xml."/>
+			<NppHelpAbsentWarning title="File does not exist" message="\rdoesn't exist. Please download it on Notepad++ site."/>
+			<SaveCurrentModifWarning title="Save Current Modification" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
+			<LoseUndoAbilityWarning title="Lose Undo Ability Waning" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
 			<CannotMoveDoc title="Move to new Notepad++ Instance" message="Document is modified, save it then try again."/>
 			<DocReloadWarning title="Reload" message="Are you sure you want to reload the current file and lose the changes made in Notepad++?"/>
 			<FileLockedWarning title="Save failed" message="Please check whether if this file is opened in another program"/>
diff --git a/PowerEditor/installer/nativeLang/croatian.xml b/PowerEditor/installer/nativeLang/croatian.xml
index 5fde4b64..3e2607e1 100644
--- a/PowerEditor/installer/nativeLang/croatian.xml
+++ b/PowerEditor/installer/nativeLang/croatian.xml
@@ -605,10 +605,10 @@
             </ColumnEditor>
         </Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Ureðivanje contextMenu" message="Ureðivanje contextMenu.xml omoguæuje izmjenu Notepad++ skoènog kontekstnog izbornika.\rTrebate restartati Notepad++ kako bi se uèitao izmijenjen contextMenu.xml."/>
-			<NppHelpAbsentWaring title="Datoteka ne postoji" message="\rne postoji. Molim preuzmite ju s Notepad++ web stranica."/>
-			<SaveCurrentModifWaring title="Snimi trenutne izmjene" message="Trebate snimiti trenutnu izmjenu.\rSnimljene izmjene ne mogu biti poništene.\r\rNastaviti?"/>
-			<LoseUndoAbilityWaring title="Upozorenje Nema povratka" message="Trebate snimiti trenutnu izmjenu.\rSnimljene izmjene ne mogu biti poništene.\r\rNastaviti?"/>
+			<ContextMenuXmlEditWarning title="Ureðivanje contextMenu" message="Ureðivanje contextMenu.xml omoguæuje izmjenu Notepad++ skoènog kontekstnog izbornika.\rTrebate restartati Notepad++ kako bi se uèitao izmijenjen contextMenu.xml."/>
+			<NppHelpAbsentWarning title="Datoteka ne postoji" message="\rne postoji. Molim preuzmite ju s Notepad++ web stranica."/>
+			<SaveCurrentModifWarning title="Snimi trenutne izmjene" message="Trebate snimiti trenutnu izmjenu.\rSnimljene izmjene ne mogu biti poništene.\r\rNastaviti?"/>
+			<LoseUndoAbilityWarning title="Upozorenje Nema povratka" message="Trebate snimiti trenutnu izmjenu.\rSnimljene izmjene ne mogu biti poništene.\r\rNastaviti?"/>
 			<CannotMoveDoc title="Premjesti u novu Notepad++ instancu" message="Dokument is izmijenjen, snimite ga i onda pokušajte ponovo."/>
 			<DocReloadWarning title="Ponovo uèitaj" message="Jeste li sigurni da želite ponovo uèitati trenutnu datoteku i izgubite sve izmjene koje ste uèinili u Notepadu++?"/>
 			<FileLockedWarning title="Neuspjelo snimanje" message="Molim provjerite da ta datoteka nije otvorena u k+nekom drugom programu"/>
diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml
index f575e709..6f76d040 100644
--- a/PowerEditor/installer/nativeLang/czech.xml
+++ b/PowerEditor/installer/nativeLang/czech.xml
@@ -673,10 +673,10 @@
 		</Dialog>
 		
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Úprava kontextové nabídky" message="Úpravou souboru contextMenu.xml mùžete modifikovat chování vyskakovacího kontextového menu Notepadu++. Po pøípadné zmìnì musíte restartovat Notepad++, aby se zmìny projevily."/>
-			<NppHelpAbsentWaring title="Soubor neexistuje" message=" neexistuje. Stáhnìte si jej prosím z domovské stránky Notepadu++."/>
-			<SaveCurrentModifWaring title="Uložit zmìny" message="Mìli byste uložit aktuální zmìny. Uložené zmìny nemohou být vráceny zpìt. Pokraèovat?"/>
-			<LoseUndoAbilityWaring title="Varování pøed ztrátou možnosti vrátit zmìny" message="Mìli byste uložit aktuální zmìny. Uložené zmìny nemohou být vráceny zpìt. Pokraèovat?"/>
+			<ContextMenuXmlEditWarning title="Úprava kontextové nabídky" message="Úpravou souboru contextMenu.xml mùžete modifikovat chování vyskakovacího kontextového menu Notepadu++. Po pøípadné zmìnì musíte restartovat Notepad++, aby se zmìny projevily."/>
+			<NppHelpAbsentWarning title="Soubor neexistuje" message=" neexistuje. Stáhnìte si jej prosím z domovské stránky Notepadu++."/>
+			<SaveCurrentModifWarning title="Uložit zmìny" message="Mìli byste uložit aktuální zmìny. Uložené zmìny nemohou být vráceny zpìt. Pokraèovat?"/>
+			<LoseUndoAbilityWarning title="Varování pøed ztrátou možnosti vrátit zmìny" message="Mìli byste uložit aktuální zmìny. Uložené zmìny nemohou být vráceny zpìt. Pokraèovat?"/>
 			<CannotMoveDoc title="Pøejít k nové instanci Notepadu++" message="Dokument je modifikován, uložte jej a poté to zkuste znovu."/>
 			<DocReloadWarning title="Znovu otevøít" message="Jste si jisti, že chcete znovu naèíst aktuální soubor a ztratit tak zmìny udìlané v Notepadu++?"/>
 			<FileLockedWarning title="Uložení selhalo" message="Prosím zkontrolujte, zda tento soubor není otevøen jiným programem"/>
diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml
index acee4020..0eb5cbeb 100644
--- a/PowerEditor/installer/nativeLang/danish.xml
+++ b/PowerEditor/installer/nativeLang/danish.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252" ?>
 <NotepadPlus>
 	<Native-Langue name = "Dansk" filename="danish.xml" >
-	<!-- Updated for ver. 6.0.RC-->
+	<!-- Updated for ver. 6.1.2-->
 		<Menu>
 			<Main>
 				<!-- Main Menu Entries -->
@@ -658,20 +658,21 @@
 		</Dialog>
 		
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Redigering af genvejsmenu" message="Redigering af contextMenu.xml giver mulighed for,
+			<ContextMenuXmlEditWarning title="Redigering af genvejsmenu" message="Redigering af contextMenu.xml giver mulighed for,
 at ændre genvejsmenuen i Notepad++.
 Du skal genstarte Notepad++ før ændringerne af contextMenu.xml træder i kraft."/>
-			<NppHelpAbsentWaring title="Filen findes ikke" message="
+			<NppHelpAbsentWarning title="Filen findes ikke" message="
 findes ikke.
 Download den fra Notepad++ websted."/>
-			<SaveCurrentModifWaring title="Gem nuværende ændring" message="Du bør gemme den nuværende ændring.
+			<SaveCurrentModifWarning title="Gem nuværende ændring" message="Du bør gemme den nuværende ændring.
 Ingen gemte ændringer kan ikke fortrydes.
 			
 Fortsæt?"/>
-			<LoseUndoAbilityWaring title="Advarsel om mulighed for fortrydelse" message="Du bør gemme den nuværende ændring.
+			<LoseUndoAbilityWarning title="Advarsel om mulighed for fortrydelse" message="Du bør gemme den nuværende ændring.
 Ingen gemte ændringer kan ikke fortrydes.
 			
 Fortsæt?"/>
+			<NbFileToOpenImportantWarning title="Mængden af filer du er ved at åbne er for stor" message="$INT_REPLACE$ filer er ved at blive åbnet.\rEr du sikker på du vil åbne dem?"/>
 			<CannotMoveDoc title="Gå til ny instans af Notepad++" message="Dokument er ændret, gem og prøv så igen."/>
 			<DocReloadWarning title="Genindlæs" message="Er du sikker på, at du vil genindlæse
 den pågældende fil og miste ændringer lavet i Notepad++?"/>
diff --git a/PowerEditor/installer/nativeLang/dutch.xml b/PowerEditor/installer/nativeLang/dutch.xml
index 48e764d4..b721440f 100644
--- a/PowerEditor/installer/nativeLang/dutch.xml
+++ b/PowerEditor/installer/nativeLang/dutch.xml
@@ -630,10 +630,10 @@
 			</MultiMacro>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title = "Contextmenu wijzigen" message = "Met het wijzigen van het contextmenu kunt u Notepad++ aan uw persoonlijke voorkeur aanpassen.&#xD;&#xD;Wijzigingen worden zichtbaar na het opnieuw starten van de applicatie."/>
-			<NppHelpAbsentWaring title="Offline documentatie ontbreekt" message = "&#xD; is niet gevonden.&#xD;&#xD;Bezoek de website om de online documentatie te raadplegen."/>
-			<SaveCurrentModifWaring title = "Bestand is gewijzigd" message = "Bestand is gewijzigd; sla uw werk op om wijzigingen niet te verliezen.&#xD;&#xD;Doorgaan?"/>
-			<LoseUndoAbilityWaring title = "Bewerking ongedaan maken niet mogelijk" message="Deze bewerking kan niet ongedaan worden gemaakt.&#xD;&#xD;Doorgaan?"/>
+			<ContextMenuXmlEditWarning title = "Contextmenu wijzigen" message = "Met het wijzigen van het contextmenu kunt u Notepad++ aan uw persoonlijke voorkeur aanpassen.&#xD;&#xD;Wijzigingen worden zichtbaar na het opnieuw starten van de applicatie."/>
+			<NppHelpAbsentWarning title="Offline documentatie ontbreekt" message = "&#xD; is niet gevonden.&#xD;&#xD;Bezoek de website om de online documentatie te raadplegen."/>
+			<SaveCurrentModifWarning title = "Bestand is gewijzigd" message = "Bestand is gewijzigd; sla uw werk op om wijzigingen niet te verliezen.&#xD;&#xD;Doorgaan?"/>
+			<LoseUndoAbilityWarning title = "Bewerking ongedaan maken niet mogelijk" message="Deze bewerking kan niet ongedaan worden gemaakt.&#xD;&#xD;Doorgaan?"/>
 			<CannotMoveDoc title="Bestand verplaatsen niet mogelijk" message="Bestand is gewijzigd; sla uw werk op en probeer het opnieuw."/>
 			<DocReloadWarning title="Bestand herladen" message="Weet u zeker dat u het huidige bestand opnieuw wilt openen?&#xD;&#xD;U verliest al uw werk!"/>
 			<FileLockedWarning title="Bestand opslaan mislukt" message="Bestand is mogelijk in gebruik door een andere programma.&#xD;&#xD;Sluit andere programma's en probeer het opnieuw."/>
diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index a1efcbfc..70974b0e 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -601,10 +601,10 @@
             </ColumnEditor>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Editing contextMenu" message="Editing contextMenu.xml allows you to modify your Notepad++ popup context menu.\rYou have to restart your Notepad++ to take effect after modifying contextMenu.xml."/>
-			<NppHelpAbsentWaring title="File does not exist" message="\rdoesn't exist. Please download it on Notepad++ site."/>
-			<SaveCurrentModifWaring title="Save Current Modification" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
-			<LoseUndoAbilityWaring title="Lose Undo Ability Waning" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
+			<ContextMenuXmlEditWarning title="Editing contextMenu" message="Editing contextMenu.xml allows you to modify your Notepad++ popup context menu.\rYou have to restart your Notepad++ to take effect after modifying contextMenu.xml."/>
+			<NppHelpAbsentWarning title="File does not exist" message="\rdoesn't exist. Please download it on Notepad++ site."/>
+			<SaveCurrentModifWarning title="Save Current Modification" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
+			<LoseUndoAbilityWarning title="Lose Undo Ability Waning" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
 			<CannotMoveDoc title="Move to new Notepad++ Instance" message="Document is modified, save it then try again."/>
 			<DocReloadWarning title="Reload" message="Are you sure you want to reload the current file and lose the changes made in Notepad++?"/>
 			<FileLockedWarning title="Save failed" message="Please check whether if this file is opened in another program"/>
@@ -612,7 +612,7 @@
 			<DeleteFileFailed title="Delete File" message="Delete File failed"/>
 			
 			<!-- $INT_REPLACE$ is a place holder, don't translate it -->
-			<NbFileToOpenImportantWaring title="Amount of files to open is too large" message="$INT_REPLACE$ files are about to be opened.\rAre you sure to open them?"/>
+			<NbFileToOpenImportantWarning title="Amount of files to open is too large" message="$INT_REPLACE$ files are about to be opened.\rAre you sure to open them?"/>
 		</MessageBox>
 		<ProjectManager>
 			<PanelTitle name="Project"/>
diff --git a/PowerEditor/installer/nativeLang/esperanto.xml b/PowerEditor/installer/nativeLang/esperanto.xml
index ddf352d3..4c510e99 100644
--- a/PowerEditor/installer/nativeLang/esperanto.xml
+++ b/PowerEditor/installer/nativeLang/esperanto.xml
@@ -665,10 +665,10 @@
 			</ColumnEditor>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Modifu kuntekstan menuon" message="Modifo de contextMenu.xml ebligas modifon de kunteksta menuo de Notepad++.&#x0A;Necesas restarti Notepad++ -n por ke modifoj faritaj en contextMenu.xml efikos."/>
-			<NppHelpAbsentWaring title="La dosiero ne ekzistas" message="&#x0A;ne ekzistas. El�utu �in ĉe la retpa�aro de Notepad++."/>
-			<SaveCurrentModifWaring title="Konservu faritajn modifiojn" message="Vi devas konservi faritajn modifiojn.&#x0A;Ne eblas malfari iun konservitan modifion.&#x0A;&#x0A;Ĉu vi volas daŭrigi?"/>
-			<LoseUndoAbilityWaring title="Atentu: perdo de ebleco malfari" message="Vi devas konservi faritajn modifiojn.&#x0A;Ne eblas malfari iun konservitan modifion.&#x0A;&#x0A;Ĉu vi volas daŭrigi?"/>
+			<ContextMenuXmlEditWarning title="Modifu kuntekstan menuon" message="Modifo de contextMenu.xml ebligas modifon de kunteksta menuo de Notepad++.&#x0A;Necesas restarti Notepad++ -n por ke modifoj faritaj en contextMenu.xml efikos."/>
+			<NppHelpAbsentWarning title="La dosiero ne ekzistas" message="&#x0A;ne ekzistas. El�utu �in ĉe la retpa�aro de Notepad++."/>
+			<SaveCurrentModifWarning title="Konservu faritajn modifiojn" message="Vi devas konservi faritajn modifiojn.&#x0A;Ne eblas malfari iun konservitan modifion.&#x0A;&#x0A;Ĉu vi volas daŭrigi?"/>
+			<LoseUndoAbilityWarning title="Atentu: perdo de ebleco malfari" message="Vi devas konservi faritajn modifiojn.&#x0A;Ne eblas malfari iun konservitan modifion.&#x0A;&#x0A;Ĉu vi volas daŭrigi?"/>
 			<CannotMoveDoc title="Malfermo en alia ekzemplo de Notepad++" message="La dokumento estis modifita, konservu antaÅ­ daÅ­rigi."/>
 			<DocReloadWarning title="Re�argo" message="Ĉu vi certe volas re�argi la dosieron? Ĉiuj modifioj faritaj estos perditaj."/>
 			<FileLockedWarning title="Nesukcesa konservo" message="Kontrolu ĉu la dosiero estas malfermita en alia programo."/>
diff --git a/PowerEditor/installer/nativeLang/farsi.xml b/PowerEditor/installer/nativeLang/farsi.xml
index 8812fba3..8dc78498 100644
--- a/PowerEditor/installer/nativeLang/farsi.xml
+++ b/PowerEditor/installer/nativeLang/farsi.xml
@@ -601,10 +601,10 @@
             </ColumnEditor>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="ویرایش کلیک راست" message=" اجازه تغییر کلیک راست برنامه رامیدهد.برای ا�عمال تغییرات در این �ایل برنامه را ریستارت کنید contextMenu.xml ویرایش"/>
-			<NppHelpAbsentWaring title="�ایل وجود ندارد" message="\rموجود نیست.لط�ا آن را از سایت برنامه دانلود کنید"/>
-			<SaveCurrentModifWaring title="ذخیره تغییرات �علی" message="شما باید تغییرات �علی را ذخیره کنید\rهمه تغییرات ذخیره شده قابل آندو نیست\r\rادامه؟"/>
-			<LoseUndoAbilityWaring title="هشدار ازدست دادن توانایی آندو" message="شما باید تغییرات �علی را ذخیره کنید\rهمه تغییرات ذخیره شده قابل آندو نیست\r\rادامه؟"/>
+			<ContextMenuXmlEditWarning title="ویرایش کلیک راست" message=" اجازه تغییر کلیک راست برنامه رامیدهد.برای ا�عمال تغییرات در این �ایل برنامه را ریستارت کنید contextMenu.xml ویرایش"/>
+			<NppHelpAbsentWarning title="�ایل وجود ندارد" message="\rموجود نیست.لط�ا آن را از سایت برنامه دانلود کنید"/>
+			<SaveCurrentModifWarning title="ذخیره تغییرات �علی" message="شما باید تغییرات �علی را ذخیره کنید\rهمه تغییرات ذخیره شده قابل آندو نیست\r\rادامه؟"/>
+			<LoseUndoAbilityWarning title="هشدار ازدست دادن توانایی آندو" message="شما باید تغییرات �علی را ذخیره کنید\rهمه تغییرات ذخیره شده قابل آندو نیست\r\rادامه؟"/>
 			<CannotMoveDoc title="انتقال به نمونه جدید نوت پَد پلاس پلاس" message="سند تغییر یا�ته است،آن را ذخیره و مجددا سعی کنید"/>
 			<DocReloadWarning title="بارگیری مجدد" message="آیا میخواهید �ایل �علی را بارگیری مجدد کرده و تغییرات ایجاد شده توسط برنامه را از دست بدهید؟"/>
 			<FileLockedWarning title="مو�ق به ذخیره نشد" message="لط�ا بازبودن این �ایل را در برنامه دیگر بررسی کنید"/>
diff --git a/PowerEditor/installer/nativeLang/finnish.xml b/PowerEditor/installer/nativeLang/finnish.xml
index 2e203bdb..fea86202 100644
--- a/PowerEditor/installer/nativeLang/finnish.xml
+++ b/PowerEditor/installer/nativeLang/finnish.xml
@@ -679,10 +679,10 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520
 </ColumnEditor>
 </Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Ponnahdusvalikon mukautus" message="Muokkaamalla tiedostoa 'contextMenu.xml' voit mukauttaa Notepad++ ponnahdusvalikkoa. Tiedoston muokkauksen jälkeen ohjelma on uudelleenkäynnistettävä tehtyjen muutosten käyttöönottamiseksi."/>
-			<NppHelpAbsentWaring title="Tiedostoa ei löydy" message="Ei löydy tiedostoa, lataa se Notepad++ sivustolta."/>
-			<SaveCurrentModifWaring title="Tallenna muutokset" message="Tehdyt muutokset pitää tallentaa. Tallennuksen jälkeen muutoksia ei voi peruuttaa. Jatketaanko?"/>
-			<LoseUndoAbilityWaring title="Varoitus muutosten peruuttaamattomuudesta" message="Tehdyt muutokset pitää tallentaa. Tallennuksen jälkeen muutoksia ei voi peruuttaa. Jatketaanko?"/>
+			<ContextMenuXmlEditWarning title="Ponnahdusvalikon mukautus" message="Muokkaamalla tiedostoa 'contextMenu.xml' voit mukauttaa Notepad++ ponnahdusvalikkoa. Tiedoston muokkauksen jälkeen ohjelma on uudelleenkäynnistettävä tehtyjen muutosten käyttöönottamiseksi."/>
+			<NppHelpAbsentWarning title="Tiedostoa ei löydy" message="Ei löydy tiedostoa, lataa se Notepad++ sivustolta."/>
+			<SaveCurrentModifWarning title="Tallenna muutokset" message="Tehdyt muutokset pitää tallentaa. Tallennuksen jälkeen muutoksia ei voi peruuttaa. Jatketaanko?"/>
+			<LoseUndoAbilityWarning title="Varoitus muutosten peruuttaamattomuudesta" message="Tehdyt muutokset pitää tallentaa. Tallennuksen jälkeen muutoksia ei voi peruuttaa. Jatketaanko?"/>
 			<CannotMoveDoc title="Avaa uuteen Notepad++ -istuntoon" message="Tiedostoa on muokattu, tallenna se ja yritä sitten uudelleen."/>
 			<DocReloadWarning title="Uudelleenlataus" message="Avataanko tiedosto uudelleen hyläten edellisen avauksen jälkeiset muutokset?"/>
 			<FileLockedWarning title="Tallennus epäonnistui" message="Varmista, että muut sovellukset eivä käytä tätä tiedostoa"/>
diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml
index 97a20413..66b696d2 100644
--- a/PowerEditor/installer/nativeLang/french.xml
+++ b/PowerEditor/installer/nativeLang/french.xml
@@ -606,10 +606,10 @@
             </ColumnEditor>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Editing contextMenu" message="Editer contextMenu.xml vous permet de modifier le menu contextuel de votre Notepad++.\rVous devrez redémarrez Notepad++ après la modification de de contextMenu.xml pour que les changements soient appliqués."/>
-			<NppHelpAbsentWaring title="File does not exist" message="\rInexistant. Veuillez le télécharger sur le site de Notepad++."/>
-			<SaveCurrentModifWaring title="Save Current Modification" message="Vous devriez sauvegarder votre document\rCette opération ne peut pas être annulée\r\rContinuer?"/>
-			<LoseUndoAbilityWaring title="Lose Undo Ability Waning" message="Vous devriez sauvegarder votre document\rCette opération ne peut pas être annulée\r\rContinuer?"/>
+			<ContextMenuXmlEditWarning title="Editing contextMenu" message="Editer contextMenu.xml vous permet de modifier le menu contextuel de votre Notepad++.\rVous devrez redémarrez Notepad++ après la modification de de contextMenu.xml pour que les changements soient appliqués."/>
+			<NppHelpAbsentWarning title="File does not exist" message="\rInexistant. Veuillez le télécharger sur le site de Notepad++."/>
+			<SaveCurrentModifWarning title="Save Current Modification" message="Vous devriez sauvegarder votre document\rCette opération ne peut pas être annulée\r\rContinuer?"/>
+			<LoseUndoAbilityWarning title="Lose Undo Ability Waning" message="Vous devriez sauvegarder votre document\rCette opération ne peut pas être annulée\r\rContinuer?"/>
 			<CannotMoveDoc title="Move to new Notepad++ Instance" message="Le document est en cours d'utilisation. Sauvegardez-le puis essayez à nouveau"/>
 			<DocReloadWarning title="Reload" message="Etes-vous certain de vouloir recharger le fichier et perdre toutes les modifications apportées avec Notepad++"/>
 			<FileLockedWarning title="Save failed" message="Veuillez vérifier que ce fichier ne soit pas utilisé par un autre programme"/>
diff --git a/PowerEditor/installer/nativeLang/georgian.xml b/PowerEditor/installer/nativeLang/georgian.xml
index ee83dfc8..712ee170 100644
--- a/PowerEditor/installer/nativeLang/georgian.xml
+++ b/PowerEditor/installer/nativeLang/georgian.xml
@@ -641,10 +641,10 @@
             </FindCharsInRange>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="contextMenu-ს დ�მუშ�ვებ�" message="ფ�ილი contextMenu.xml-ს ჩ�სწ�რებ� გ�ძლევთ ს�შუ�ლებ�ს დ��მუშ��თ Notepad++ კ�ნტექსტური მენიუ.\rფ�ილის ჩ�სწ�რების შემდეგ, ცვლილებ�თ� მიღებისთვის ს�ჭირ�� გ�თიშ�თ დ� ხელ�ხლ� ჩ�რთ�თ Notepad++."/>
-			<NppHelpAbsentWaring title="ფ�ილი �რ �რსებ�ბს" message="\rვერ მ�იძებნ�. გ�დმ�ტვირთეთ ის Notepad++ ს�იტიდ�ნ."/>
-			<SaveCurrentModifWaring title="ცვლილებების შეტ�ნ�" message="შეინ�ხებ� მიმდინ�რე ცვლილებები.\rშენ�ხვის მერე, ცვლილებების დ�ბრუნებ� შეუძლებელი�.\r\rგ�გრძელებ�?"/>
-			<LoseUndoAbilityWaring title="დ�ბრუნების შეს�ძლებლ�ბის გ�თიშვ�" message="შეინ�ხებ� მიმდინ�რე ცვლილებები.\rშენ�ხვის მერე, ცვლილებების დ�ბრუნებ� შეუძლებელი�.\r\rგ�გრძელებ�?"/>
+			<ContextMenuXmlEditWarning title="contextMenu-ს დ�მუშ�ვებ�" message="ფ�ილი contextMenu.xml-ს ჩ�სწ�რებ� გ�ძლევთ ს�შუ�ლებ�ს დ��მუშ��თ Notepad++ კ�ნტექსტური მენიუ.\rფ�ილის ჩ�სწ�რების შემდეგ, ცვლილებ�თ� მიღებისთვის ს�ჭირ�� გ�თიშ�თ დ� ხელ�ხლ� ჩ�რთ�თ Notepad++."/>
+			<NppHelpAbsentWarning title="ფ�ილი �რ �რსებ�ბს" message="\rვერ მ�იძებნ�. გ�დმ�ტვირთეთ ის Notepad++ ს�იტიდ�ნ."/>
+			<SaveCurrentModifWarning title="ცვლილებების შეტ�ნ�" message="შეინ�ხებ� მიმდინ�რე ცვლილებები.\rშენ�ხვის მერე, ცვლილებების დ�ბრუნებ� შეუძლებელი�.\r\rგ�გრძელებ�?"/>
+			<LoseUndoAbilityWarning title="დ�ბრუნების შეს�ძლებლ�ბის გ�თიშვ�" message="შეინ�ხებ� მიმდინ�რე ცვლილებები.\rშენ�ხვის მერე, ცვლილებების დ�ბრუნებ� შეუძლებელი�.\r\rგ�გრძელებ�?"/>
 			<CannotMoveDoc title="გ�დ�ტ�ნ� Notepad++'ის �ხ�ლ �სლში" message="დ�კუმენტი შეიცვ�ლ�. შეინ�ხეთ ის დ� კიდევ სც�დეთ."/>
 			<DocReloadWarning title="გ�დ�ტვირთვ�" message="ნ�მდვილ�დ გსურთ Notepad++'ის მეშვე�ბი შეტ�ნილი ცვლილებების გ�დ�ყრ� დ� ფ�ილის დისკიდ�ნ �მ�კითხვ�?"/>
 			<FileLockedWarning title="შენ�ხვ� ჩ�იშ�ლ�" message="შე�მ�წმეთ, ხ�მ �რ იყენბს რ�იმე სხვ� პრ�გრ�მ� მიმდინ�რე ფ�ილს."/>
diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml
index 49bb0a50..71a41c14 100644
--- a/PowerEditor/installer/nativeLang/german.xml
+++ b/PowerEditor/installer/nativeLang/german.xml
@@ -671,10 +671,10 @@
 			</Menus>
 		</ProjectManager>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Kontextmenü anpassen" message="Durch Bearbeiten der Datei contextMenu.xml können Sie das Kontextmenü von Notepad++ anpassen.&#x0A;Nach dem Bearbeiten müssen Sie Notepad++ neu starten."/>
-			<NppHelpAbsentWaring title="Fehlende Hilfedatei" message="&#x0A;wurde nicht gefunden. Bitte laden Sie die Hilfedateien von der Notepad++-Website herunter."/>
-			<SaveCurrentModifWaring title="Änderungen speichern" message="Bitte speichern Sie Ihre Änderungen.&#x0A;Fortfahren?"/>
-			<LoseUndoAbilityWaring title="Lose Undo Ability Warning" message="Nicht alle Änderungen können rückgängig gemacht werden.&#x0A;Fortfahren?"/>
+			<ContextMenuXmlEditWarning title="Kontextmenü anpassen" message="Durch Bearbeiten der Datei contextMenu.xml können Sie das Kontextmenü von Notepad++ anpassen.&#x0A;Nach dem Bearbeiten müssen Sie Notepad++ neu starten."/>
+			<NppHelpAbsentWarning title="Fehlende Hilfedatei" message="&#x0A;wurde nicht gefunden. Bitte laden Sie die Hilfedateien von der Notepad++-Website herunter."/>
+			<SaveCurrentModifWarning title="Änderungen speichern" message="Bitte speichern Sie Ihre Änderungen.&#x0A;Fortfahren?"/>
+			<LoseUndoAbilityWarning title="Lose Undo Ability Warning" message="Nicht alle Änderungen können rückgängig gemacht werden.&#x0A;Fortfahren?"/>
 			<CannotMoveDoc title="In neue Instanz verschieben" message="Dokument wurde geändert. Bitte speichern und erneut versuchen."/>
 			<DocReloadWarning title="Neu laden" message="Sind Sie sicher, dass Sie die Datei neu laden und die in Notepad++ gemachten Änderungen verwerfen wollen?"/>
 			<FileLockedWarning title="Speichern fehlgeschlagen" message="Bitte überprüfen Sie, ob die Datei in einem anderen Programm geöffnet ist."/>
diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml
index 174454f7..10941e85 100644
--- a/PowerEditor/installer/nativeLang/italian.xml
+++ b/PowerEditor/installer/nativeLang/italian.xml
@@ -628,10 +628,10 @@
             </ColumnEditor>
 		</Dialog>
         <MessageBox>
-			<ContextMenuXmlEditWaring title = "Modifica menu contestuale" message = "La modifica del file contextMenu.xml permette di modificare il menu contestuale di Notepad++.&#x0A;E' necessario riavviare Notepad++ affinché le mofiche apportate al file contextMenu.xml abbiano effetto."/>
-			<NppHelpAbsentWaring title = "Il file non esiste" message = "&#x0A;non esiste. Scarica il file dal sito di Notepad++."/>
-			<SaveCurrentModifWaring title = "Salva modifiche correnti" message = "Devi salvare le modifiche correnti.&#x0A;Tutte le modifiche salvate non possono essere ripristinate.&#x0A;&#x0A;Continuare?"/>
-			<LoseUndoAbilityWaring title = "Attenzione: Perdita della possibilità di ripristinare" message = "Devi salvare le modifiche correnti.&#x0A;Tutte le modifiche salvate non possono essere ripristinate.&#x0A;&#x0A;Continuare?"/>
+			<ContextMenuXmlEditWarning title = "Modifica menu contestuale" message = "La modifica del file contextMenu.xml permette di modificare il menu contestuale di Notepad++.&#x0A;E' necessario riavviare Notepad++ affinché le mofiche apportate al file contextMenu.xml abbiano effetto."/>
+			<NppHelpAbsentWarning title = "Il file non esiste" message = "&#x0A;non esiste. Scarica il file dal sito di Notepad++."/>
+			<SaveCurrentModifWarning title = "Salva modifiche correnti" message = "Devi salvare le modifiche correnti.&#x0A;Tutte le modifiche salvate non possono essere ripristinate.&#x0A;&#x0A;Continuare?"/>
+			<LoseUndoAbilityWarning title = "Attenzione: Perdita della possibilità di ripristinare" message = "Devi salvare le modifiche correnti.&#x0A;Tutte le modifiche salvate non possono essere ripristinate.&#x0A;&#x0A;Continuare?"/>
 			<CannotMoveDoc title = "Invia a una nuova istanza di Notepad++" message = "Il documento è stato modificato, salvarlo prima di continuare."/>
 			<DocReloadWarning title = "Ricarica" message = "Sei sicuro di voler ricaricare il file? Ogni modifica apportata andrà persa."/>
 			<FileLockedWarning title = "Salvataggio fallito" message = "Verificare che il file non sia aperto con un altro programma."/>
diff --git a/PowerEditor/installer/nativeLang/polish.xml b/PowerEditor/installer/nativeLang/polish.xml
index 01de707b..f6d09a6e 100644
--- a/PowerEditor/installer/nativeLang/polish.xml
+++ b/PowerEditor/installer/nativeLang/polish.xml
@@ -662,15 +662,15 @@
             </ColumnEditor>
         </Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Edycja menu kontekstowego" message="Edycja contextMenu.xml pozwala na zmianê menu kontekstowego dostêpnego w Notepad++ pod prawym klawiszem myszki.
+			<ContextMenuXmlEditWarning title="Edycja menu kontekstowego" message="Edycja contextMenu.xml pozwala na zmianê menu kontekstowego dostêpnego w Notepad++ pod prawym klawiszem myszki.
 Musisz uruchomiæ ponownie Notepad++ by zastosowaæ zmiany wprowadzone w contextMenu.xml."/>
-			<NppHelpAbsentWaring title="Plik nie istnieje" message="
+			<NppHelpAbsentWarning title="Plik nie istnieje" message="
 nie istnieje. Pobierz go ze stron Notepad++."/>
-			<SaveCurrentModifWaring title="Zapisz Bie¿¹ce Zmiany" message="Wymagane jest zapisanie bie¿¹cych zmian.
+			<SaveCurrentModifWarning title="Zapisz Bie¿¹ce Zmiany" message="Wymagane jest zapisanie bie¿¹cych zmian.
 Zapisane zmiany nie bêd¹ mog³y zostaæ wycofane.
 
 Kontynuowaæ?"/>
-			<LoseUndoAbilityWaring title="Utrata Mo¿liwoœci Cofniêcia" message="Wymagane jest zapisanie bie¿¹cych zmian.
+			<LoseUndoAbilityWarning title="Utrata Mo¿liwoœci Cofniêcia" message="Wymagane jest zapisanie bie¿¹cych zmian.
 Zapisane zmiany nie bêd¹ mog³y zostaæ wycofane.
 
 Kontynuowaæ?"/>
diff --git a/PowerEditor/installer/nativeLang/portuguese.xml b/PowerEditor/installer/nativeLang/portuguese.xml
index e9052c2e..ccdc6801 100644
--- a/PowerEditor/installer/nativeLang/portuguese.xml
+++ b/PowerEditor/installer/nativeLang/portuguese.xml
@@ -620,10 +620,10 @@ David Cunha <ling.fude@gmail.com>
             </ColumnEditor>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Editar contextMenu" message="Editar o contextMenu.xml permite-lhe modificar o menu de contexto do seu Notepad++.\r Tem de reiniciar o seu Notepad++ para que as alterações do contextMenu.xml tenham efeito."/>
-			<NppHelpAbsentWaring title="O ficheiro não existe" message="\rnão existe. Por favor, transfira-o a partir do site do Notepad++."/>
-			<SaveCurrentModifWaring title="Guardar alterações atuais" message="Deve guardar as alterações atuais.\rTodas as alterações guardadas não poderão ser desfeitas.\r\rContinuar?"/>
-			<LoseUndoAbilityWaring title="Aviso de impossibilidade de anular" message="Deve guardar as alterações atuais.\rTodas as alterações guardadas não poderão ser desfeitas.\r\rContinuar?"/>
+			<ContextMenuXmlEditWarning title="Editar contextMenu" message="Editar o contextMenu.xml permite-lhe modificar o menu de contexto do seu Notepad++.\r Tem de reiniciar o seu Notepad++ para que as alterações do contextMenu.xml tenham efeito."/>
+			<NppHelpAbsentWarning title="O ficheiro não existe" message="\rnão existe. Por favor, transfira-o a partir do site do Notepad++."/>
+			<SaveCurrentModifWarning title="Guardar alterações atuais" message="Deve guardar as alterações atuais.\rTodas as alterações guardadas não poderão ser desfeitas.\r\rContinuar?"/>
+			<LoseUndoAbilityWarning title="Aviso de impossibilidade de anular" message="Deve guardar as alterações atuais.\rTodas as alterações guardadas não poderão ser desfeitas.\r\rContinuar?"/>
 			<CannotMoveDoc title="Mover para nova instância do Notepad++" message="Documento modificado, guarde-o e tente novamente."/>
 			<DocReloadWarning title="Recarregar" message="Tem a certeza que pretende recarregar o ficheiro atual e perder as alterações efetuadas no Notepad++?"/>
 			<FileLockedWarning title="Falha ao Guargar" message="Por favor, verifique se o ficheiro está aberto noutro programa."/>
diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml
index 77f7af85..61349ea9 100644
--- a/PowerEditor/installer/nativeLang/russian.xml
+++ b/PowerEditor/installer/nativeLang/russian.xml
@@ -624,15 +624,15 @@
             </FindCharsInRange>
         </Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Ðåäàêòèðîâàíèå contextMenu" message="Ðåäàêòèðîâàíèå contextMenu.xml ïîçâîëÿåò íàñòðîèòü ñâîå âñïëûâàþùåå êîíòåêñòíîå ìåíþ â Notepad++.
+			<ContextMenuXmlEditWarning title="Ðåäàêòèðîâàíèå contextMenu" message="Ðåäàêòèðîâàíèå contextMenu.xml ïîçâîëÿåò íàñòðîèòü ñâîå âñïëûâàþùåå êîíòåêñòíîå ìåíþ â Notepad++.
 Âû äîëæíû ïåðåçàïóñòèòü Notepad++, ÷òîáû èçìåíåíèÿ âñòóïèëè â ñèëó."/>
-			<NppHelpAbsentWaring title="Ôàéëà íå ñóùåñòâóåò" message="
+			<NppHelpAbsentWarning title="Ôàéëà íå ñóùåñòâóåò" message="
 íå ñóùåñòâóåò. Ïîæàëóéñòà, çàãðóçèòå åãî ñ ñàéòà Notepad++."/>
-			<SaveCurrentModifWaring title="Ñîõðàíåíèå òåêóùèõ èçìåíåíèé" message="Âû äîëæíû ñîõðàíèòü òåêóùèå èçìåíåíèÿ.
+			<SaveCurrentModifWarning title="Ñîõðàíåíèå òåêóùèõ èçìåíåíèé" message="Âû äîëæíû ñîõðàíèòü òåêóùèå èçìåíåíèÿ.
 Âñå ñîõðàíåííûå èçìåíåíèÿ íå ñìîãóò áûòü îòìåíåíû.
 
 Ïðîäîëæèòü?"/>
-			<LoseUndoAbilityWaring title="Ïîòåðÿ âîçìîæíîñòè îòêàòà" message="Âû äîëæíû ñîõðàíèòü òåêóùèå èçìåíåíèÿ.
+			<LoseUndoAbilityWarning title="Ïîòåðÿ âîçìîæíîñòè îòêàòà" message="Âû äîëæíû ñîõðàíèòü òåêóùèå èçìåíåíèÿ.
 Âñå ñîõðàíåííûå èçìåíåíèÿ íå ñìîãóò áûòü îòìåíåíû.
 
 Ïðîäîëæèòü?"/>
diff --git a/PowerEditor/installer/nativeLang/sardinian.xml b/PowerEditor/installer/nativeLang/sardinian.xml
index 99f8a27e..f40c556d 100644
--- a/PowerEditor/installer/nativeLang/sardinian.xml
+++ b/PowerEditor/installer/nativeLang/sardinian.xml
@@ -645,10 +645,10 @@
             </ColumnEditor>
 		</Dialog>
         <MessageBox>
-			<ContextMenuXmlEditWaring title="Muda menù contestuale" message="Sa modìfica de su file contextMenu.xml permitit de mudare su menù contestuale de Notepad++.&#x0A;Est pretzisu aviare torra Notepad++ pro chi is modìficas fatas in su file contextMenu.xml fatzant efetu."/>
-			<NppHelpAbsentWaring title="Su file no esistit" message="&#x0A;no esistit. Iscàrriga su file dae su giassu de Notepad++."/>
-			<SaveCurrentModifWaring title="Sarba modìficas currentes" message="Depes sarbare is modìficas currentes.&#x0A;Totu is modìficas sarbadas non podent èssere annuddadas.&#x0A;&#x0A;Boles sighire?"/>
-			<LoseUndoAbilityWaring title="Atentzione: Pèrdida de sa possibbilidade de ripristinare" message="Depes sarbare is modìficas currentes.&#x0A;Totu is modìficas sarbadas non podent èssere annuddadas.&#x0A;&#x0A;Boles sighire?"/>
+			<ContextMenuXmlEditWarning title="Muda menù contestuale" message="Sa modìfica de su file contextMenu.xml permitit de mudare su menù contestuale de Notepad++.&#x0A;Est pretzisu aviare torra Notepad++ pro chi is modìficas fatas in su file contextMenu.xml fatzant efetu."/>
+			<NppHelpAbsentWarning title="Su file no esistit" message="&#x0A;no esistit. Iscàrriga su file dae su giassu de Notepad++."/>
+			<SaveCurrentModifWarning title="Sarba modìficas currentes" message="Depes sarbare is modìficas currentes.&#x0A;Totu is modìficas sarbadas non podent èssere annuddadas.&#x0A;&#x0A;Boles sighire?"/>
+			<LoseUndoAbilityWarning title="Atentzione: Pèrdida de sa possibbilidade de ripristinare" message="Depes sarbare is modìficas currentes.&#x0A;Totu is modìficas sarbadas non podent èssere annuddadas.&#x0A;&#x0A;Boles sighire?"/>
 			<CannotMoveDoc title="Invia a una istànzia noa de Notepad++" message="Su documentu est istadu modificadu, est a ddu sarbare in antis de sighire."/>
 			<DocReloadWarning title="Càrriga torra" message="Ses seguru chi boles carrigare torra su file? Onni Muda fata s'at a pèrdere."/>
 			<FileLockedWarning title="Sarbamentu faddidu" message="Verificare chi su file non siat abertu cun carchi àteru programma."/>
diff --git a/PowerEditor/installer/nativeLang/slovak.xml b/PowerEditor/installer/nativeLang/slovak.xml
index 23ea93ee..0fd1d18f 100644
--- a/PowerEditor/installer/nativeLang/slovak.xml
+++ b/PowerEditor/installer/nativeLang/slovak.xml
@@ -202,6 +202,7 @@
                     <Item id="44041" name="Zobraziť zalamovací symbol"/>
 					<Item id="44049" name="Zhrnutie..."/>
 					<Item id="44072" name="Sústrediť na iné zobrazenie"/>
+					<Item id="44080" name="Mapa dokumentu"/>
 					<Item id="44081" name="Projektový panel 1"/>
 					<Item id="44082" name="Projektový panel 2"/>
 					<Item id="44083" name="Projektový panel 3"/>
@@ -317,6 +318,7 @@
 				<Item id="1661" name="Nasledovať aktuálny dokument"/>
 			 	<Item id="1641" name="Hľadať všetko v aktuálnom dokumente"/> 
 				<Item id="1686" name="Priehľadnosť"/>
+				<Item id="1703" name=". zna�í kon. riadka"/>
             </Find>
             <GoToLine title="Prejsť na...">
 				<Item id="2007" name="Riadok"/>
@@ -634,10 +636,10 @@
 			</FindCharsInRange>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Upravenie kontextového menu" message="Upravenie contextMenu.xml vám umožní zmeniť vaše vyskakovacie kontextové menu v Notepade++.&#x0A;Je potrebné reštartovať váš Notepad++, aby zmeny nadobudli ú�innosť po úprave contextMenu.xml."/>
-			<NppHelpAbsentWaring title="Súbor neexistuje" message="&#x0A;neexistuje. Prosím, stiahnite ho z webstránky Notepadu++."/>
-			<SaveCurrentModifWaring title="Uložiť aktuálnu modifikáciu" message="Mali by ste uložiť aktuálnu modifikáciu.&#x0A;Všetky uložené zmeny nebudú môcť byť vrátené.&#x0A;&#x0A;Pokra�ovať?"/>
-			<LoseUndoAbilityWaring title="Varovanie o strate možnosti ísť späť" message="Mali by ste uložiť aktuálnu modifikáciu.&#x0A;Všetky uložené zmeny nebudú môcť byť vrátené.&#x0A;&#x0A;Pokra�ovať?"/>
+			<ContextMenuXmlEditWarning title="Upravenie kontextového menu" message="Upravenie contextMenu.xml vám umožní zmeniť vaše vyskakovacie kontextové menu v Notepade++.&#x0A;Je potrebné reštartovať váš Notepad++, aby zmeny nadobudli ú�innosť po úprave contextMenu.xml."/>
+			<NppHelpAbsentWarning title="Súbor neexistuje" message="&#x0A;neexistuje. Prosím, stiahnite ho z webstránky Notepadu++."/>
+			<SaveCurrentModifWarning title="Uložiť aktuálnu modifikáciu" message="Mali by ste uložiť aktuálnu modifikáciu.&#x0A;Všetky uložené zmeny nebudú môcť byť vrátené.&#x0A;&#x0A;Pokra�ovať?"/>
+			<LoseUndoAbilityWarning title="Varovanie o strate možnosti ísť späť" message="Mali by ste uložiť aktuálnu modifikáciu.&#x0A;Všetky uložené zmeny nebudú môcť byť vrátené.&#x0A;&#x0A;Pokra�ovať?"/>
 			<CannotMoveDoc title="Presunúť do novej inštancie Notepadu++" message="Dokument je zmenený, uložte ho, a potom skúste znova."/>
 			<DocReloadWarning title="Znova na�ítať" message="Ste si istý, že chcete znova na�ítať aktuálny súbor a stratiť tak zmeny vykonané v Notepade++?"/>
 			<FileLockedWarning title="Uloženie zlyhalo" message="Prosím, skontrolujte �i je tento súbor otvorený v inom programe"/>
diff --git a/PowerEditor/installer/nativeLang/swedish.xml b/PowerEditor/installer/nativeLang/swedish.xml
index 6c4fdd5b..381dc6df 100644
--- a/PowerEditor/installer/nativeLang/swedish.xml
+++ b/PowerEditor/installer/nativeLang/swedish.xml
@@ -623,10 +623,10 @@ Comments: Added some missing translations.
       </ColumnEditor>
     </Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="Editing contextMenu" message="Editing contextMenu.xml allows you to modify your Notepad++ popup context menu.\rYou have to restart your Notepad++ to take effect after modifying contextMenu.xml."/>
-			<NppHelpAbsentWaring title="File does not exist" message="\rdoesn't exist. Please download it on Notepad++ site."/>
-			<SaveCurrentModifWaring title="Save Current Modification" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
-			<LoseUndoAbilityWaring title="Lose Undo Ability Waning" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
+			<ContextMenuXmlEditWarning title="Editing contextMenu" message="Editing contextMenu.xml allows you to modify your Notepad++ popup context menu.\rYou have to restart your Notepad++ to take effect after modifying contextMenu.xml."/>
+			<NppHelpAbsentWarning title="File does not exist" message="\rdoesn't exist. Please download it on Notepad++ site."/>
+			<SaveCurrentModifWarning title="Save Current Modification" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
+			<LoseUndoAbilityWarning title="Lose Undo Ability Waning" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
 			<CannotMoveDoc title="Move to new Notepad++ Instance" message="Document is modified, save it then try again."/>
 			<DocReloadWarning title="Reload" message="Are you sure you want to reload the current file and lose the changes made in Notepad++?"/>
 			<FileLockedWarning title="Save failed" message="Please check whether if this file is opened in another program"/>
diff --git a/PowerEditor/installer/nativeLang/uyghur.xml b/PowerEditor/installer/nativeLang/uyghur.xml
index e51f70c5..a5686fcb 100644
--- a/PowerEditor/installer/nativeLang/uyghur.xml
+++ b/PowerEditor/installer/nativeLang/uyghur.xml
@@ -605,10 +605,10 @@
             </ColumnEditor>
 		</Dialog>
 		<MessageBox>
-			<ContextMenuXmlEditWaring title="تىزىملىك تەھرىرلەش" message=".نى قايتا ئاچسىڭىز ،  ئاسما تىزىملىك ئۆزگىرەيدۇNotepad++ ،نى ئۆزگەرتىپcontextMenu.xml"/>
-			<NppHelpAbsentWaring title="ھۈججەت مەۋجۇت ئەمەس" message="\rتورب�تىدىن چۈشۈرۈڭ  Notepad++  ،ھۈججەت مەۋجۇت ئەمەس."/>
-			<SaveCurrentModifWaring title="ھازىرقى ئۆزگەرتىشنى ساقلاش" message="ئۆزگەرىتكەن ھۈججەتنى چوقۇم ساقلاڭ\rساقلىغاندىن ك�يىن ي�نىۋ�لىش ئىشلىمەيدۇ.\rداۋاملاشتۇرامسىز?"/>
-			<LoseUndoAbilityWaring title="ي�نىۋ�لىش ئىقتىدارى ئىشلىمەيدۇ" message="ئۆزگەرىتكەن ھۈججەتنى چوقۇم ساقلاڭ\rساقلىغاندىن ك�يىن ي�نىۋ�لىش ئىشلىمەيدۇ.\rداۋاملاشتۇرامسىز?"/>
+			<ContextMenuXmlEditWarning title="تىزىملىك تەھرىرلەش" message=".نى قايتا ئاچسىڭىز ،  ئاسما تىزىملىك ئۆزگىرەيدۇNotepad++ ،نى ئۆزگەرتىپcontextMenu.xml"/>
+			<NppHelpAbsentWarning title="ھۈججەت مەۋجۇت ئەمەس" message="\rتورب�تىدىن چۈشۈرۈڭ  Notepad++  ،ھۈججەت مەۋجۇت ئەمەس."/>
+			<SaveCurrentModifWarning title="ھازىرقى ئۆزگەرتىشنى ساقلاش" message="ئۆزگەرىتكەن ھۈججەتنى چوقۇم ساقلاڭ\rساقلىغاندىن ك�يىن ي�نىۋ�لىش ئىشلىمەيدۇ.\rداۋاملاشتۇرامسىز?"/>
+			<LoseUndoAbilityWarning title="ي�نىۋ�لىش ئىقتىدارى ئىشلىمەيدۇ" message="ئۆزگەرىتكەن ھۈججەتنى چوقۇم ساقلاڭ\rساقلىغاندىن ك�يىن ي�نىۋ�لىش ئىشلىمەيدۇ.\rداۋاملاشتۇرامسىز?"/>
 			<CannotMoveDoc title="  ي�ڭى كۆزنىكىگە يۆتكەش  Notepad++ " message="ھۈججەت ئۆزگەرتىلدى،ساقلىۋ�لىپ ئاندىن سىناڭ"/>
 			<DocReloadWarning title="يۈكلەش" message="ھۆججەتنى ئۆزگەرتىشلىرىڭىز بىلەن كارىڭىز بولماي يۈكلىمەكچىمۇ؟"/>
 			<FileLockedWarning title="ساقلىيالمىدى" message="بۇ ھۈججەت باشقا پروگراممىلاردا ئ�چىقلىقمۇ تەكشۈرۈپ ب�قىڭ"/>
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 0f8472d3..7e0e223c 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.1.2"
+!define APPVERSION "6.1.3"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 12
+!define VERSION_MINOR 13
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index fdf91f48..56102331 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -4842,7 +4842,7 @@ struct Quote{
 	const char *_quote;
 };
 
-const int nbQuote = 56;
+const int nbQuote = 57;
 Quote quotes[nbQuote] = {
 {"Notepad++", "Notepad++ is written in C++ and uses pure Win32 API and STL which ensures a higher execution speed and smaller program size.\nBy optimizing as many routines as possible without losing user friendliness, Notepad++ is trying to reduce the world carbon dioxide emissions. When using less CPU power, the PC can throttle down and reduce power consumption, resulting in a greener environment."},
 {"Martin Golding", "Always code as if the guy who ends up maintaining your code will be a violent psychopath who knows where you live."},
@@ -4899,9 +4899,14 @@ Quote quotes[nbQuote] = {
 {"Anonymous #26", "I would nerver bungee jump...\nI came into this world because of a broken rubber, and I'm not going out cause of one..."},
 {"Anonymous #27", "I'm no gynecologist, but I know a cunt when I see one."},
 {"Anonymous #28", "Why 6 afraid of 7?\nBecause 7 8 9 (seven ate nine) while 6 and 9 were flirting."},
+{"Anonymous #28", "The reason women will never be the ones to propose is\nbecause as soon as she gets on her knees,\nhe will start unzipping."},
 {"Chewbacca", "Uuuuuuuuuur Ahhhhrrrrrr\nUhrrrr Ahhhhrrrrrr\nAaaarhg..."}
 //{"", ""},
 //{"", ""},
+//{"", ""},
+//{"", ""},
+//{"", ""},
+//{"", ""},
 };
 
 
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index e0403315..ac479b79 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -1405,7 +1405,7 @@ void Notepad_plus::command(int id)
 			{
 				if (buf->isDirty())
 				{
-					int answer = _nativeLangSpeaker.messageBox("SaveCurrentModifWaring",
+					int answer = _nativeLangSpeaker.messageBox("SaveCurrentModifWarning",
 						NULL,
 						TEXT("You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"),
 						TEXT("Save Current Modification"),
@@ -1423,7 +1423,7 @@ void Notepad_plus::command(int id)
 				if (_pEditView->execute(SCI_CANUNDO) == TRUE)
 				{
 					generic_string msg, title;
-					int answer = _nativeLangSpeaker.messageBox("LoseUndoAbilityWaring",
+					int answer = _nativeLangSpeaker.messageBox("LoseUndoAbilityWarning",
 						NULL,
 						TEXT("You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"),
 						TEXT("Lose Undo Ability Waning"),
@@ -1520,7 +1520,7 @@ void Notepad_plus::command(int id)
             if (buf->isDirty())
             {
 				generic_string warning, title;
-				int answer = _nativeLangSpeaker.messageBox("SaveCurrentModifWaring",
+				int answer = _nativeLangSpeaker.messageBox("SaveCurrentModifWarning",
 					NULL,
 					TEXT("You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"),
 					TEXT("Save Current Modification"),
@@ -1538,7 +1538,7 @@ void Notepad_plus::command(int id)
             if (_pEditView->execute(SCI_CANUNDO) == TRUE)
             {
 				generic_string msg, title;
-				int answer = _nativeLangSpeaker.messageBox("LoseUndoAbilityWaring",
+				int answer = _nativeLangSpeaker.messageBox("LoseUndoAbilityWarning",
 					NULL,
 					TEXT("You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"),
 					TEXT("Lose Undo Ability Waning"),
@@ -1796,7 +1796,7 @@ void Notepad_plus::command(int id)
 
             if (oldEncoding != -1)
             {
-                //do waring
+                //do warning
             }
             buf->setEncoding(newEncoding);
 
@@ -1883,7 +1883,7 @@ void Notepad_plus::command(int id)
 			//if (contion)
 			{
 				generic_string warning, title;
-				_nativeLangSpeaker.messageBox("ContextMenuXmlEditWaring",
+				_nativeLangSpeaker.messageBox("ContextMenuXmlEditWarning",
 					_pPublicInterface->getHSelf(),
 					TEXT("Editing contextMenu.xml allows you to modify your Notepad++ popup context menu.\rYou have to restart your Notepad++ to take effect after modifying contextMenu.xml."),
 					TEXT("Editing contextMenu"),
@@ -1996,7 +1996,7 @@ void Notepad_plus::command(int id)
 			{
 				generic_string msg = nppHelpPath;
 				generic_string warning, title;
-				if (!_nativeLangSpeaker.getMsgBoxLang("NppHelpAbsentWaring", title, warning))
+				if (!_nativeLangSpeaker.getMsgBoxLang("NppHelpAbsentWarning", title, warning))
 				{
 					title = TEXT("File does not exist");
 					warning = TEXT("\rdoesn't exist. Please download it on Notepad++ site.");
diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp
index 115e4d5e..aacba39d 100644
--- a/PowerEditor/src/NppIO.cpp
+++ b/PowerEditor/src/NppIO.cpp
@@ -195,7 +195,7 @@ BufferID Notepad_plus::doOpen(const TCHAR *fileName, bool isReadOnly, int encodi
 			bool ok2Open = true;
 			if (nbFiles2Open > 200)
 			{
-				int answer = _nativeLangSpeaker.messageBox("NbFileToOpenImportantWaring",
+				int answer = _nativeLangSpeaker.messageBox("NbFileToOpenImportantWarning",
 												_pPublicInterface->getHSelf(),
 												TEXT("$INT_REPLACE$ files are about to be opened.\rAre you sure to open them?"),
 												TEXT("Amount of files to open is too large"),
diff --git a/PowerEditor/src/ScitillaComponent/Buffer.cpp b/PowerEditor/src/ScitillaComponent/Buffer.cpp
index 3e074bd6..b0c4c990 100644
--- a/PowerEditor/src/ScitillaComponent/Buffer.cpp
+++ b/PowerEditor/src/ScitillaComponent/Buffer.cpp
@@ -740,7 +740,7 @@ bool FileManager::loadFileData(Document doc, const TCHAR * filename, Utf8_16_Rea
 	{
 		::MessageBox(NULL, TEXT("File is too big to be opened by Notepad++"), TEXT("File open problem"), MB_OK|MB_APPLMODAL);
 		/*
-		_nativeLangSpeaker.messageBox("NbFileToOpenImportantWaring",
+		_nativeLangSpeaker.messageBox("NbFileToOpenImportantWarning",
 										_pPublicInterface->getHSelf(),
 										TEXT("File is too big to be opened by Notepad++"),
 										TEXT("File open problem"),
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 9e932001..04c33f4b 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.1.2")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1.3")
 
 // 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.12\0")
-#define VERSION_DIGITALVALUE 6, 1, 2, 0
+#define VERSION_VALUE TEXT("6.13\0")
+#define VERSION_DIGITALVALUE 6, 1, 3, 0
 
 #ifdef UNICODE
 #define UNICODE_ANSI_MODE TEXT("(UNICODE)")
diff --git a/PowerEditor/src/tools/NppShell/project/NppShell.vcproj b/PowerEditor/src/tools/NppShell/project/NppShell.vcproj
index 0d237dfe..39eed9a8 100644
--- a/PowerEditor/src/tools/NppShell/project/NppShell.vcproj
+++ b/PowerEditor/src/tools/NppShell/project/NppShell.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="NppShell"
 	ProjectGUID="{509B95C6-043E-4389-8351-77BDB042A6F9}"
 	RootNamespace="NppShell"
@@ -98,88 +98,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\..\build_$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory=".\..\build_$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;WIN64;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_VC80_UPGRADE=0x0710;WIN64"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="shell32.lib comctl32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\..\$(ProjectName)64_D.dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\src\export.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				BaseAddress="0x1C000000"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\build_$(PlatformName)\$(ConfigurationName)"
@@ -265,6 +183,88 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\build_$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory=".\..\build_$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;WIN64;_DEBUG;_WINDOWS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_VC80_UPGRADE=0x0710;WIN64"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="shell32.lib comctl32.lib shlwapi.lib"
+				OutputFile="$(OutDir)\..\$(ProjectName)64_D.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\src\export.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				BaseAddress="0x1C000000"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory=".\..\build_$(PlatformName)\$(ConfigurationName)"
@@ -362,6 +362,10 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\src\Bitmap.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\export.def"
 				>
@@ -376,6 +380,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\src\Bitmap.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\NppShell.h"
 				>