diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index a076046de..4f281edaf 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,7 +1,7 @@
-Notepad++ v5.9.6.1 new features and fixed bugs:
+Notepad++ v5.9.6.2 new features and fixed bugs:
 
-1.  Fix the crash issue while execute "Add Files from Directory" command (Project Manager).
-2.  Enhance "Add files from Directory" command in Project Manager - sorted result: first all folders, then all files, both of them alphabetically.
+1.  Fix a crash issue while right-clicking on the doc switcher's column control ("Name" and "Ext.").
+2.  Reduce the margin of edit zone.
 
 
 
diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb
index b59b4dd4b..fd828250a 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 4c3d12c41..bc447e0bd 100644
--- a/PowerEditor/installer/nativeLang/chineseSimplified.xml
+++ b/PowerEditor/installer/nativeLang/chineseSimplified.xml
@@ -23,11 +23,12 @@
 					<Item posX="1" posY="9" name="¸´ÖƵ½¼ôÇаå"/>
 					<Item posX="1" posY="10" name="Ëõ½ø"/>
 					<Item posX="1" posY="11" name="ת»»ÊÓͼ"/>
-					<Item posX="1" posY="12" name="Ö´ÐÐÐÐ"/>
+					<Item posX="1" posY="12" name="ÐвÙ×÷"/>
 					<Item posX="1" posY="13" name="×¢ÊÍ/È¡Ïû×¢ÊÍ"/>
 					<Item posX="1" posY="14" name="×Ô¶¯Íê³É"/>
                     <Item posX="1" posY="15" name="µµ°¸¸ñʽת»»"/>
-					<Item posX="2" posY="16" name="ÑÕÉ«±ê¼Ç"/>
+					<Item posX="1" posY="16" name="¿Õ°×²Ù×÷"/>
+					<Item posX="2" posY="16" name="±ê¼ÇËùÓÐ"/>
                     <Item posX="2" posY="17" name="Çå³ýÑÕÉ«±ê¼Ç"/>
                     <Item posX="2" posY="18" name="µ½ÉÏÒ»¸öÑÕÉ«±ê¼Ç"/>
                     <Item posX="2" posY="19" name="µ½ÏÂÒ»¸öÑÕÉ«±ê¼Ç"/>
@@ -56,7 +57,7 @@
                     <Item posX="4" posY="5"  posZ="15" name="Ô½ÄÏÎÄ"/>
                     <Item posX="6" posY="4"  name="µ¼Èë"/>
 				</SubEntries>
-									
+
 				<!-- all menu item -->
 				<Commands>
 					<Item id="41001" name="н¨(&amp;N)"/>
@@ -89,8 +90,8 @@
 					<Item id="42010" name="¸´ÖƵ±Ç°ÐÐ"/>
 					<Item id="42012" name="·Ö¸îÐÐ"/>
 					<Item id="42013" name="ºÏ²¢ÐÐ"/>
-					<Item id="42014" name="ÉÏÒƵ±Ç°ÐÐ"/>   
-					<Item id="42015" name="ÏÂÒƵ±Ç°ÐÐ"/>   
+					<Item id="42014" name="ÉÏÒƵ±Ç°ÐÐ"/>
+					<Item id="42015" name="ÏÂÒƵ±Ç°ÐÐ"/>
 					<Item id="42016" name="ת³É´óд"/>
 					<Item id="42017" name="ת³ÉСд"/>
 					<Item id="42018" name="¿ªÊ¼Â¼ÖÆ(&amp;S)"/>
@@ -98,7 +99,13 @@
 					<Item id="42021" name="»Ø·Å(&amp;P)"/>
 					<Item id="42022" name="Ìí¼Ó/ɾ³ýµ¥ÐÐ×¢ÊÍ"/>
 					<Item id="42023" name="Çø¿é×¢ÊÍ"/>
-					<Item id="42024" name="ÒƳýÐÐβ¿Õ°×"/>
+					<Item id="42042" name="ÒƳýÐÐÊ׿ոñ"/>
+					<Item id="42043" name="ÒƳýÐÐÊ׺ÍÐÐβ¿Õ¸ñ"/>
+					<Item id="42044" name="EOLת¿Õ¸ñ"/>
+					<Item id="42045" name="ÒƳý·Ç±ØÐèµÄ¿Õ°×ºÍ EOL"/>
+					<Item id="42046" name="TAB ת¿Õ¸ñ"/>
+					<Item id="42047" name="¿Õ¸ñת TAB"/>
+					<Item id="42024" name="ÒƳýÐÐβ¿Õ¸ñ"/>
 					<Item id="42025" name="±£´æ¼Öƺê"/>
 					<Item id="42026" name="ÎÄ×Ö·½Ïò´ÓÓÒµ½×ó"/>
 					<Item id="42027" name="ÎÄ×Ö·½Ïò´Ó×óµ½ÓÒ"/>
@@ -176,9 +183,10 @@
 					<Item id="44032" name="È«ÆÁģʽ"/>
 					<Item id="44033" name="³·ÏûËõ·Å"/>
 					<Item id="44034" name="Öö¥Ä£Ê½"/>
+					<Item id="44049" name="ÕªÒª..."/>
 					<Item id="44035" name="´¹Ö±Í¬²½¹ö¶¯"/>
 					<Item id="44036" name="ˮƽͬ²½¹ö¶¯"/>
-					<Item id="44041" name="ÏÔʾ»»Ðзû"/>					
+					<Item id="44041" name="ÏÔʾ»»Ðзû"/>
 					<Item id="44072" name="¼¤»î´ÓÊÓͼ"/>
 
 					<Item id="45001" name="ת»»Îª Windows ¸ñʽ"/>
@@ -199,6 +207,7 @@
 					<Item id="10002" name="¸´ÖƵ½ÁíÒ»ÊÓͼ"/>
 					<Item id="10003" name="Òƶ¯µ½Ð´°¿Ú"/>
 					<Item id="10004" name="ÔÚд°¿ÚÖдò¿ª"/>
+					
 
 					<Item id="46001" name="ÓïÑÔ¸ñʽÉèÖÃ..."/>
 					<Item id="46080" name="Óû§×Ô¶¨Òå"/>
@@ -223,8 +232,9 @@
 					<Item id="44042" name="Òþ²ØÐÐ"/>
 					<Item id="42040" name="´ò¿ªÎļþÁбí"/>
 					<Item id="42041" name="Çå³ýÎļþÁбí"/>
-					<Item id="48016" name="±ä¸ü»òÇå³ýºê..."/>
-					<Item id="48017" name="±ä¸ü»òÇå³ýÔËÐÐÑ¡Ïî..."/>
+					<Item id="48016" name="¹ÜÀí¿ì½Ý¼ü..."/>
+					<Item id="48017" name="¹ÜÀí¿ì½Ý¼ü..."/>
+					<Item id="48018" name="±à¼­µ¯³ö²Ëµ¥"/>
 				</Commands>
 			</Main>
 			<Splitter>
@@ -310,7 +320,7 @@
 			<StyleConfig title="ÓïÑÔ¸ñʽÉèÖÃ">
 				<Item id="2" name="È¡Ïû"/>
 				<Item id="2301" name="±£´æ²¢¹Ø±Õ"/>
-				<Item id="2303" name="͸Ã÷¶È"/>		
+				<Item id="2303" name="͸Ã÷¶È"/>
 				<Item id="2306" name="Ñ¡ÔñÖ÷Ìâ"/>
 				<SubDialog>
 					<Item id="2204" name="´ÖÌå"/>
@@ -319,7 +329,6 @@
 					<Item id="2207" name="±³¾°É«"/>
 					<Item id="2208" name="×ÖÌåÃû³Æ :"/>
 					<Item id="2209" name="×ÖÌå´óС :"/>
-					<Item id="2211" name="¸ñʽÃû³Æ :"/>
 					<Item id="2212" name="É«²Ê¸ñʽ"/>
 					<Item id="2213" name="×ÖÌå¸ñʽ"/>
 					<Item id="2214" name="ĬÈÏÀ©Õ¹Ãû :"/>
@@ -336,6 +345,7 @@
 					<Item id="2231" name="ʹÓÃÈ«¾ÖбÌåÑùʽ"/>
 					<Item id="2232" name="ʹÓÃÈ«¾ÖÏ»®ÏßÑùʽ"/>
 				</SubDialog>
+				
 			</StyleConfig>
 
 			<UserDefine title="×Ô¶¨ÒåÓïÑÔ¸ñʽ">
@@ -347,6 +357,8 @@
 				<Item id="20009" name="À©Õ¹Ãû :"/>
 				<Item id="20012" name="ºöÂÔ´óСд"/>
 				<Item id="20011" name="͸Ã÷¶È"/>
+				<Item id="20016" name="µ¼Èë..."/>
+				<Item id="20015" name="µ¼³ö..."/>
 				<Item id="0" name="É«²Ê¸ñʽ"/>
 				<Item id="1" name="Ç°¾°É«"/>
 				<Item id="2" name="±³¾°É«"/>
@@ -391,6 +403,7 @@
 					<Item id="24311" name="½ç¶¨Æðʼ :"/>
 					<Item id="24314" name="½ç¶¨ÖÕÖ¹ :"/>
 				</Operator>
+                <Item id="24001" name="ÆôÓÃתÒå×Ö·û :"/>
 			</UserDefine>
 			<Preference title="Ê×Ñ¡Ïî">
 				<Item id="6001" name="¹Ø±Õ"/>
@@ -418,15 +431,14 @@
 					<Item id="6122" name="Òþ²Ø (°´Ï Alt »ò F10 ÏÔʾ)"/>
 					<Item id="6123" name="½çÃæÓïÑÔ"/>
 				</Global>
-
 				<Scintillas title="±à¼­">
 					<Item id="6216" name="²åÈë·ûÉèÖÃ"/>
 					<Item id="6217" name="¿í¶È :"/>
 					<Item id="6219" name="ÉÁ˸ƵÂÊ :"/>
 					<Item id="6221" name="¿ì"/>
 					<Item id="6222" name="Âý"/>
-					<Item id="6224" name="¶àÁб༭"/>  
-                    <Item id="6225" name="Æô¶¯ (Ctrl+Mouse click/selection)"/> 
+					<Item id="6224" name="¶àÁб༭"/>
+                    <Item id="6225" name="Æô¶¯ (Ctrl+Mouse click/selection)"/>
 					<Item id="6201" name="´úÂëÕÛµþ±êÖ¾"/>
 					<Item id="6202" name="¼ò½à"/>
 					<Item id="6203" name="¼ýÍ·"/>
@@ -438,7 +450,7 @@
                     <Item id="6228" name="ĬÈÏ"/>
                     <Item id="6229" name="¶ÔÆë"/>
                     <Item id="6230" name="ËõÅÅ"/>
-					
+
 					<Item id="6206" name="ÏÔʾÐкÅÀ¸"/>
 					<Item id="6207" name="ÏÔʾ±êÇ©À¸"/>
 					<Item id="6208" name="ÏÔʾÁб߽ç"/>
@@ -524,7 +536,7 @@
 					<Item id="6320" name="²»ÏÔʾÏ»®Ïß"/>
 					<Item id="6322" name="»á»°Îļþºó׺Ãû"/>
 					<Item id="6323" name="ÆôÓà Notepad++ ×Ô¶¯¸üÐÂ"/>
-					<Item id="6324" name="ÎĵµÇл» (Ctrl+TAB)"/>					
+					<Item id="6324" name="ÎĵµÇл» (Ctrl+TAB)"/>
 					<Item id="6326" name="ÆôÓÃÖÇÄܸßÁÁ"/>
 					<Item id="6327" name="ÆôÓÃ"/>
 					<Item id="6328" name="¸ßÁÁÏÔʾ±êÇ©ÊôÐÔ"/>
@@ -585,4 +597,4 @@
 			</ColumnEditor>
 		</Dialog>
 	</Native-Langue>
-</NotepadPlus>
\ No newline at end of file
+</NotepadPlus>
diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml
index 16ab090c7..560c4145f 100644
--- a/PowerEditor/installer/nativeLang/czech.xml
+++ b/PowerEditor/installer/nativeLang/czech.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1250" ?>
 <!--
-	- intended for version: 5.9.4 RC
-	- last change: 11 Oct 2011 by Ondøej Müller (mullero@email.cz)
+	- intended for version: 5.9.6
+	- last change: 2 Nov 2011 by Ondøej Müller (mullero@email.cz)
 	- all Czech translations at: http://sourceforge.net/projects/notepad-plus/forums/forum/558104/topic/3099029
 -->
 <NotepadPlus>
@@ -668,5 +668,57 @@
 				<Item id = "2" name = "Storno"/>
             </ColumnEditor>
 		</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?"/>
+			<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"/>
+			<FileAlreadyOpenedInNpp title="" message="Tento soubor je již otevøen v Notepadu++."/>
+			<DeleteFileFailed title="Odstranit Soubor" message="Odstranìní souboru selhalo"/>
+		</MessageBox>
+		
+		<ProjectManager>
+			<PanelTitle name="Projekt"/>
+			<WorkspaceRootName name="Pracovní plocha"/>
+			<Menus>
+				<Entries>
+					<Item id="0" name="Pracovní plocha"/>
+					<Item id="1" name="Úpravy"/>
+				</Entries>
+				<WorkspaceMenu>
+					<Item id="3122" name="Nová pracovní plocha"/>
+					<Item id="3123" name="Otevøít pracovní plochu"/>
+					<Item id="3124" name="Znovu otevøít pracovní plochu"/>
+					<Item id="3125" name="Uložit"/>
+					<Item id="3126" name="Uložit jako..."/>
+					<Item id="3127" name="Uložit kopii jako..."/>
+					<Item id="3121" name="Pøidat nový projekt"/>
+				</WorkspaceMenu>
+				<ProjectMenu>
+					<Item id="3111" name="Pøejmenovat"/>
+					<Item id="3112" name="Pøidat složku"/>
+					<Item id="3113" name="Pøidat soubory..."/>
+					<Item id="3114" name="Odstranit"/>
+					<Item id="3117" name="Pøidat soubory ze složky..." /> 
+				</ProjectMenu>
+				<FolderMenu>
+					<Item id="3111" name="Pøejmenovat"/>
+					<Item id="3112" name="Pøidat složku"/>
+					<Item id="3113" name="Pøidat soubory..."/>
+					<Item id="3114" name="Odstranit"/>
+					<Item id="3117" name="Pøidat soubory ze složky..." /> 
+				</FolderMenu>
+				<FileMenu>
+					<Item id="3111" name="Pøejmenovat"/>
+					<Item id="3115" name="Odstranit"/>
+					<Item id="3116" name="Zmìnit cestu k souboru"/>
+				</FileMenu>
+			</Menus>
+		</ProjectManager>
+
     </Native-Langue>
 </NotepadPlus>
\ No newline at end of file
diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml
index 0bae4e635..eeaf9e39d 100644
--- a/PowerEditor/installer/nativeLang/german.xml
+++ b/PowerEditor/installer/nativeLang/german.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252" ?>
 <!--
-	German localization for Notepad++ 5.9.4
-	Last modified Sun, 1 October 2011 by Jan Schreiber.
+	German localization for Notepad++ 5.9.6.1
+	Last modified Sun, 6 November 2011 by Jan Schreiber.
 	Please e-mail errors, suggestions etc. to janschreiber(at)users.sf.net.
 -->
 <NotepadPlus>
@@ -44,7 +44,7 @@
 					<Item posX = "3" posY = "6" name = "Datei &amp;verschieben/duplizieren"/>
 					<Item posX = "3" posY = "16" name = "Te&amp;xtblöcke schließen"/>
 					<Item posX = "3" posY = "17" name = "Te&amp;xtblöcke öffnen"/>
-					<Item posX = "3" posY = "21" name="Projektver&amp;waltung"/> 
+					<Item posX = "3" posY = "21" name="Projektver&amp;waltung"/>
 					<Item posX = "4" posY = "5" name = "Zeichensatz"/>
 					<Item posX = "4" posY = "5" posZ = "0" name = "Arabisch"/>
 					<Item posX = "4" posY = "5" posZ = "1" name = "Baltisch"/>
@@ -226,7 +226,7 @@
 					<Item id = "45013" name = "Konver&amp;tiere zu UCS-2 Little Endian"/>
 					<Item id = "46001" name = "&amp;Stile ..."/>
 					<Item id = "46015" name = "MS-DOS-Stil"/>
-					<Item id = "46016" name = "Normaler Text"/> 
+					<Item id = "46016" name = "Normaler Text"/>
 					<Item id = "46017" name = "Ressourcen-Datei"/>
 					<!-- <Item id = "46019" name = "MS-INI-Datei"/> -->
 					<Item id = "46080" name = "Benutzerdefiniert"/>
@@ -245,7 +245,7 @@
 					<Item id = "48011" name = "&amp;Optionen ..."/>
 					<Item id = "48016" name = "Shortcut &amp;ändern/Makro löschen ..."/>
 					<Item id = "48017" name = "Shortcut &amp;ändern/Befehl löschen ..."/>
-					<Item id = "48018" name = "&amp;Kontextmenü editieren ..."/>
+					<Item id = "48018" name = "&amp;Kontextmenü anpassen ..."/>
 					<Item id = "49000" name = "&amp;Ausführen ..."/>
 					<Item id = "50000" name = "Funktionsvervollständigung"/>
 					<Item id = "50001" name = "Wortvervollständigung"/>
@@ -475,7 +475,7 @@
 					<Item id = "6222" name = "L"/>
 					<Item id = "6224" name = "Multi-Editing"/>
 					<Item id = "6225" name = "Aktivieren (Strg+Mausklick)"/>
-					<Item id = "6226" name = "Aus"/>			
+					<Item id = "6226" name = "Aus"/>
 					<Item id = "6227" name = "Umgebrochene Zeilen"/>
 					<Item id = "6228" name = "Standard"/>
 					<Item id = "6229" name = "Linksbündig"/>
@@ -566,9 +566,9 @@
 					<Item id = "6322" name = "Sitzungsdatei Erw.:"/>
 					<Item id = "6323" name = "Automatisches Update aktivieren"/>
 					<Item id = "6324" name = "Dokumentenumschalter (Strg+Tab)"/>
-					<Item id = "6325" name = "Nach Aktualisierung zum Ende scrollen"/> 
+					<Item id = "6325" name = "Nach Aktualisierung zum Ende scrollen"/>
 					<Item id = "6326" name = "Bei Doppelklick alle hervorheben"/>
-					<Item id = "6327" name = "Tags hervorheben"/> 
+					<Item id = "6327" name = "Tags hervorheben"/>
 					<Item id = "6328" name = "Attribute hervorheben"/>
 					<Item id = "6329" name = "HTML-Hervorhebung"/>
 					<Item id = "6330" name = "PHP/ASP-Bereiche hervorheben"/>
@@ -621,7 +621,55 @@
 				<Item id = "2" name = "A&amp;bbrechen"/>
 			</ColumnEditor>
 		</Dialog>
+		<ProjectManager>
+			<PanelTitle name="Projektverwaltung" />
+			<WorkspaceRootName name="Arbeitsbereich" />
+			<Menus>
+				<Entries>
+					<Item id="0" name="Arbeitsbereich" />
+					<Item id="1" name="Bearbeiten" />
+				</Entries>
+				<WorkspaceMenu>
+					<Item id="3122" name="Neuer Arbeitsbereich" />
+					<Item id="3123" name="Arbeitsbereich öffnen" />
+					<Item id="3124" name="Arbeitsbereich neu laden" />
+					<Item id="3125" name="Speichern" />
+					<Item id="3126" name="Speichern unter ..." />
+					<Item id="3127" name="Kopie speichern unter ..." />
+					<Item id="3121" name="Neues Projekt hinzufügen" />
+				</WorkspaceMenu>
+				<ProjectMenu>
+					<Item id="3111" name="Umbenennen" />
+					<Item id="3112" name="Projektordner hinzufügen" />
+					<Item id="3113" name="Dateien hinzufügen ..." />
+					<Item id="3114" name="Entfernen" />
+					<Item id="3117" name="Dateien aus Verzeichnis hinzufügen ..."/>
+				</ProjectMenu>
+				<FolderMenu>
+					<Item id="3111" name="Umbenennen" />
+					<Item id="3112" name="Projektordner hinzufügen" />
+					<Item id="3113" name="Dateien hinzufügen ..." />
+					<Item id="3114" name="Entfernen" />
+					<Item id="3117" name="Dateien aus Verzeichnis hinzufügen ..."/>
+				</FolderMenu>
+				<FileMenu>
+					<Item id="3111" name="Umbenennen" />
+					<Item id="3115" name="Entfernen" />
+					<Item id="3116" name="Dateipfad ändern" />
+				</FileMenu>
+			</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="Hilfedatei nicht gefunden" message="&#x0A;ist nicht vorhanden. 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?" />
+			<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." />
+			<FileAlreadyOpenedInNpp title="" message="Die Datei ist bereits in Notepad++ geöffnet." />
+			<DeleteFileFailed title="Datei löschen" message="Löschen der Datei fehlgeschlagen." />
+		</MessageBox>
 	</Native-Langue>
 </NotepadPlus>
 
-
diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml
index deca0ec72..3159fc22f 100644
--- a/PowerEditor/installer/nativeLang/italian.xml
+++ b/PowerEditor/installer/nativeLang/italian.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252" ?>
 <!--
-	Italian translation for Notepad++ 5.9.4 RC
-	Last modified Tue, October 1st, 2011 12:00 GMT by Luca Leonardi.
+	Italian translation for Notepad++ 5.9.6.1
+	Last modified Tue, November 7th, 2011 12:00 GMT by Luca Leonardi.
 	Please e-mail errors, suggestions etc. to ices_eyes(at)users.sourceforge.net.
 	For updates, see https://sourceforge.net/projects/notepad-plus/forums/forum/558104/topic/1853765
 -->
@@ -626,5 +626,54 @@
                 <Item id = "2" name = "Annulla"/>
             </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?"/>
+			<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."/>
+			<FileAlreadyOpenedInNpp title="" message="Il file è già aperto in Notepad++."/>
+			<DeleteFileFailed title="Eliminazione file" message="Eliminazione del file fallita."/>
+		</MessageBox>
+		<ProjectManager>
+			<PanelTitle name="Progetti"/>
+			<WorkspaceRootName name="Workspace"/>
+			<Menus>
+				<Entries>
+					<Item id="0" name="Workspace"/>
+					<Item id="1" name="Modifica"/>
+				</Entries>
+				<WorkspaceMenu>
+					<Item id="3122" name="Nuovo workspace"/>
+					<Item id="3123" name="Apri workspace"/>
+					<Item id="3124" name="Ricarica Workspace"/>
+					<Item id="3125" name="Salva"/>
+					<Item id="3126" name="Salva come..."/>
+					<Item id="3127" name="Salva una copia come..."/>
+					<Item id="3121" name="Aggiungi nuovo progetto"/>
+				</WorkspaceMenu>
+				<ProjectMenu>
+					<Item id="3111" name="Rinomina"/>
+					<Item id="3112" name="Aggiungi cartella"/>
+					<Item id="3113" name="Aggiungi files..."/>
+					<Item id="3114" name="Rimuovi"/>
+					<Item id="3117" name="Aggiungi files da una cartella..."/>
+				</ProjectMenu>
+				<FolderMenu>
+					<Item id="3111" name="Rinomina"/>
+					<Item id="3112" name="Aggiungi cartella"/>
+					<Item id="3113" name="Aggiungi files..."/>
+					<Item id="3114" name="Rimuovi"/>
+                    <Item id="3117" name="Aggiungi files da una cartella..."/>
+				</FolderMenu>
+				<FileMenu>
+					<Item id="3111" name="Rinomina"/>
+					<Item id="3115" name="Rimuovi"/>
+					<Item id="3116" name="Modifica percorso file"/>
+				</FileMenu>
+			</Menus>
+		</ProjectManager>
     </Native-Langue>
 </NotepadPlus>
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 891f1e421..9d146a5ed 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -18,10 +18,10 @@
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "5.9.6.1"
+!define APPVERSION "5.9.6.2"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 5
-!define VERSION_MINOR 961
+!define VERSION_MINOR 962
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp b/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp
index a7ee36f69..2bf14f266 100644
--- a/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp
+++ b/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp
@@ -29,7 +29,7 @@ void TreeView::init(HINSTANCE hInst, HWND parent, int treeViewID)
                             WC_TREEVIEW,
                             TEXT("Tree View"),
                             WS_CHILD | WS_BORDER | WS_HSCROLL | WS_TABSTOP | TVS_LINESATROOT | TVS_HASLINES |
-							 TVS_HASBUTTONS | TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_INFOTIP, 
+							TVS_DISABLEDRAGDROP | TVS_HASBUTTONS | TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_INFOTIP, 
                             0,  0,  0, 0,
                             _hParent, 
                             NULL, 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 1c1c1870c..18199b357 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -18,12 +18,12 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.9.6.1")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.9.6.2")
 
 // 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("5.961\0")
-#define VERSION_DIGITALVALUE 5, 9, 6, 1
+#define VERSION_VALUE TEXT("5.962\0")
+#define VERSION_DIGITALVALUE 5, 9, 6, 2
 
 #ifdef UNICODE
 #define UNICODE_ANSI_MODE TEXT("(UNICODE)")