From e770aff94d75ba16ee3c39b7899841148c826443 Mon Sep 17 00:00:00 2001
From: gszo123 <gszo123@gmail.com>
Date: Mon, 4 Jul 2016 17:10:29 +0200
Subject: [PATCH 1/4] translation: fixes for polish.xml

closes #2044
---
 PowerEditor/installer/nativeLang/polish.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/PowerEditor/installer/nativeLang/polish.xml b/PowerEditor/installer/nativeLang/polish.xml
index 4f6e91c3e..eb3786a04 100644
--- a/PowerEditor/installer/nativeLang/polish.xml
+++ b/PowerEditor/installer/nativeLang/polish.xml
@@ -290,7 +290,7 @@
                     <Item id="47010" name="Argumenty linii poleceń..."/>
                     <Item id="47011" name="Pomoc na żywo"/>
                     <Item id="48005" name="Importuj wtyczki..."/>
-                    <Item id="48006" name="Import motywy..."/>
+                    <Item id="48006" name="Importuj motywy..."/>
                     <Item id="48009" name="Skróty klawiaturowe..."/>
                     <Item id="48011" name="Preferencje..."/>
                     <Item id="48016" name="Zmień skrót/usuń makro..."/>
@@ -803,7 +803,7 @@
                 </Cloud>
 
                 <MISC title="Inne">
-                    <Item id="6114" name="Umożliwić przełączanie"/>
+                    <Item id="6114" name="Umożliwiaj przełączanie"/>
                     <Item id="6115" name="Automatyczne wcięcia"/>
                     <Item id="6117" name="Kolejność ostatniego użycia (MRU)"/>
                     <Item id="6307" name="Włącz"/>
@@ -849,6 +849,7 @@
                 <Item id="2033" name="Wstaw liczby"/>
                 <Item id="2030" name="Zacznij od:"/>
                 <Item id="2031" name="Zwiększaj o:"/>
+                <Item id="2036" name="Powtarzaj:"/>
                 <Item id="2035" name="Dopełniaj zerami"/>
                 <Item id="2032" name="Format"/>
                 <Item id="2024" name="Dec"/>

From ec433863c304058729dc24ac50203939febc3389 Mon Sep 17 00:00:00 2001
From: Tmp341 <tmp341@gmail.com>
Date: Wed, 20 Jan 2016 08:59:17 +0200
Subject: [PATCH 2/4] translation: updated turkish

There was a change in line 89, which states singular other than plural. And id 2036 added too.
closes #1393
---
 PowerEditor/installer/nativeLang/turkish.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/PowerEditor/installer/nativeLang/turkish.xml b/PowerEditor/installer/nativeLang/turkish.xml
index 66ed5f442..a2f94bb49 100644
--- a/PowerEditor/installer/nativeLang/turkish.xml
+++ b/PowerEditor/installer/nativeLang/turkish.xml
@@ -86,7 +86,8 @@
 					<Item id="41015" name="Kopya Olarak Kaydet"/>
 					<Item id="41016" name="Diskten Sil"/>
 					<Item id="41017" name="Yeniden Adlandır"/>
-					<Item id="41021" name="Son Kapatılan Dosyaları Geri Yükle"/>
+					<Item id="41021" name="Son Kapatılan Dosyayı Geri Yükle"/>
+					<Item id="41022" name="Klasörü Çalışma Alanı Olarak Aç"/>
 
 					<Item id="42001" name="K&amp;es"/>
 					<Item id="42002" name="&amp;Kopyala"/>
@@ -848,6 +849,7 @@
 				<Item id="2030" name="Başlangıç sayısı:"/>
 				<Item id="2031" name="Artış miktarı:"/>
 				<Item id="2035" name="Başına sıfır ekle"/>
+				<Item id="2036" name="Tekrar :"/>
 				<Item id="2032" name="Biçim"/>
 				<Item id="2024" name="Onlu"/>
 				<Item id="2025" name="Sekizli"/>

From a3bb9d294adf3247972543b016c6c3e3ef56b8d8 Mon Sep 17 00:00:00 2001
From: dail8859 <dail8859@yahoo.com>
Date: Mon, 20 Jun 2016 17:16:27 -0400
Subject: [PATCH 3/4] Report the correct crashed plugin

Closes #1980
---
 PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp | 8 ++++----
 PowerEditor/src/MISC/PluginsManager/PluginsManager.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
index c08b5fa07..76c769306 100644
--- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
+++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
@@ -470,10 +470,10 @@ void PluginsManager::notify(const SCNotification *notification)
 			}
 			catch (...)
 			{
-				TCHAR funcInfo[128];
+				TCHAR funcInfo[256];
 				generic_sprintf(funcInfo, TEXT("notify(SCNotification *notification) : \r notification->nmhdr.code == %d\r notification->nmhdr.hwndFrom == %p\r notification->nmhdr.idFrom == %d"),\
 					scNotif.nmhdr.code, scNotif.nmhdr.hwndFrom, scNotif.nmhdr.idFrom);
-				pluginCrashAlert(_pluginsCommands[i]._pluginName.c_str(), funcInfo);
+				pluginCrashAlert(_pluginInfos[i]->_moduleName.c_str(), funcInfo);
 			}
 		}
 	}
@@ -498,7 +498,7 @@ void PluginsManager::relayNppMessages(UINT Message, WPARAM wParam, LPARAM lParam
 			{
 				TCHAR funcInfo[128];
 				generic_sprintf(funcInfo, TEXT("relayNppMessages(UINT Message : %d, WPARAM wParam : %d, LPARAM lParam : %d)"), Message, wParam, lParam);
-				pluginCrashAlert(_pluginsCommands[i]._pluginName.c_str(), TEXT(""));
+				pluginCrashAlert(_pluginInfos[i]->_moduleName.c_str(), funcInfo);
 			}
 		}
 	}
@@ -529,7 +529,7 @@ bool PluginsManager::relayPluginMessages(UINT Message, WPARAM wParam, LPARAM lPa
 				{
 					TCHAR funcInfo[128];
 					generic_sprintf(funcInfo, TEXT("relayPluginMessages(UINT Message : %d, WPARAM wParam : %d, LPARAM lParam : %d)"), Message, wParam, lParam);
-					pluginCrashAlert(_pluginsCommands[i]._pluginName.c_str(), funcInfo);
+					pluginCrashAlert(_pluginInfos[i]->_moduleName.c_str(), funcInfo);
 				}
 				return true;
             }
diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.h b/PowerEditor/src/MISC/PluginsManager/PluginsManager.h
index eaef46dcd..9eb958223 100644
--- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.h
+++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.h
@@ -142,9 +142,9 @@ private:
 	void pluginCrashAlert(const TCHAR *pluginName, const TCHAR *funcSignature)
 	{
 		generic_string msg = pluginName;
-		msg += TEXT(" just crash in\r");
+		msg += TEXT(" just crashed in\r");
 		msg += funcSignature;
-		::MessageBox(NULL, msg.c_str(), TEXT(" just crash in\r"), MB_OK|MB_ICONSTOP);
+		::MessageBox(NULL, msg.c_str(), TEXT("Plugin Crash"), MB_OK|MB_ICONSTOP);
 	}
 
 	bool isInLoadedDlls(const TCHAR *fn) const

From 3b1e722ba6ad318f0dc4b1fde070860e0c292917 Mon Sep 17 00:00:00 2001
From: Don HO <don.h@free.fr>
Date: Wed, 6 Jul 2016 16:33:06 +0200
Subject: [PATCH 4/4] Fix typo

---
 PowerEditor/bin/change.log | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 240abf384..5cc945a55 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,6 +1,6 @@
 Notepad++ v6.9.2 new features and bug-fixes:
 
-1.  Add most wanted feature: Log Mornitoring (tail -f).
+1.  Add most wanted feature: Log Monitoring (tail -f).
 2.  Add new feature: Find in Finder.
 3.  Fix status bar display bug in high dpi environment.
 4.  Fix open in explorer problem while path contain unusual characters.