286 files changed, 104 insertions, 109 deletions

diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 9ec365da1f..42f7945bb0 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -144,24 +144,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Variables", "..\plugins\Var
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhenWasIt", "..\plugins\WhenWasIt\WhenWasIt_10.vcxproj", "{63E05ECA-0A63-479E-86BD-2CAF53869BDA}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAMN", "..\protocols\YAMN\YAMN_10.vcxproj", "{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MRA", "..\protocols\MRA\Mra.vcxproj", "{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTalkExt", "..\protocols\GTalkExt\GTalkExt.vcxproj", "{2A737817-2443-48FF-A2E8-CA8D69E450F3}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook_10.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\protocols\Weather\weather_10.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpellChecker", "..\plugins\SpellChecker\spellchecker.vcxproj", "{5DB86086-10E9-42E7-AC90-503D2678C2A2}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Alarms", "..\plugins\Alarms\alarms_10.vcxproj", "{5F09C93B-463A-4BF5-A85E-6E4E916AA8F8}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LangMan", "..\plugins\LangMan\langman.vcxproj", "{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\protocols\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroNotify", "..\plugins\ZeroNotification\Zero Notification_10.vcxproj", "{E37561EB-B9C5-4215-9FF9-DB559916FBA2}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardNotify", "..\plugins\KeyboardNotify\KeyboardNotify_10.vcxproj", "{A9265E36-7F2D-440C-BF3E-F447FDB6200F}"

@@ -182,8 +176,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RC4", "..\plugins\Dbx_mmap_
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecentContacts", "..\plugins\RecentContacts\RecentContacts.vcxproj", "{07137F45-8B5F-4561-BEC8-B883E9123785}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\protocols\NewsAggregator\NewsAggregator_10.vcxproj", "{6DE11A47-2268-4B08-8DE5-15A1705FCE28}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicHistory", "..\plugins\BasicHistory\BasicHistory.vcxproj", "{7DF5234A-A93A-47AD-8201-377ECF59AE5F}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Twitter", "..\protocols\Twitter\twitter.vcxproj", "{12FFF2B0-0D0B-430B-A4C6-1577CA98F598}"

@@ -357,6 +349,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugin
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmLanProto", "..\protocols\EmLanProto\amdproto.vcxproj", "{2115FEBC-1EC4-4F95-A058-A523ED5295A4}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAMN", "..\plugins\YAMN\YAMN_10.vcxproj", "{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\plugins\NewsAggregator\NewsAggregator_10.vcxproj", "{6DE11A47-2268-4B08-8DE5-15A1705FCE28}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\plugins\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather_10.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}"

+EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PingPlugin", "..\plugins\Ping\ping.vcxproj", "{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}"

 EndProject

 Global

@@ -919,14 +919,6 @@ Global
 		{63E05ECA-0A63-479E-86BD-2CAF53869BDA}.Release|Win32.Build.0 = Release|Win32

 		{63E05ECA-0A63-479E-86BD-2CAF53869BDA}.Release|x64.ActiveCfg = Release|x64

 		{63E05ECA-0A63-479E-86BD-2CAF53869BDA}.Release|x64.Build.0 = Release|x64

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|Win32.Build.0 = Debug|Win32

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|x64.ActiveCfg = Debug|x64

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|x64.Build.0 = Debug|x64

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|Win32.ActiveCfg = Release|Win32

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|Win32.Build.0 = Release|Win32

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|x64.ActiveCfg = Release|x64

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|x64.Build.0 = Release|x64

 		{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA}.Debug|Win32.ActiveCfg = Debug|Win32

 		{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA}.Debug|Win32.Build.0 = Debug|Win32

 		{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA}.Debug|x64.ActiveCfg = Debug|x64

@@ -951,14 +943,6 @@ Global
 		{DADE9455-DC28-465A-9604-2CA28052B9FB}.Release|Win32.Build.0 = Release|Win32

 		{DADE9455-DC28-465A-9604-2CA28052B9FB}.Release|x64.ActiveCfg = Release|x64

 		{DADE9455-DC28-465A-9604-2CA28052B9FB}.Release|x64.Build.0 = Release|x64

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.ActiveCfg = Debug|Win32

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.Build.0 = Debug|Win32

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|x64.ActiveCfg = Debug|x64

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|x64.Build.0 = Debug|x64

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|Win32.ActiveCfg = Release|Win32

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|Win32.Build.0 = Release|Win32

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|x64.ActiveCfg = Release|x64

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|x64.Build.0 = Release|x64

 		{5DB86086-10E9-42E7-AC90-503D2678C2A2}.Debug|Win32.ActiveCfg = Debug|Win32

 		{5DB86086-10E9-42E7-AC90-503D2678C2A2}.Debug|Win32.Build.0 = Debug|Win32

 		{5DB86086-10E9-42E7-AC90-503D2678C2A2}.Debug|x64.ActiveCfg = Debug|x64

@@ -983,12 +967,6 @@ Global
 		{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|Win32.Build.0 = Release|Win32

 		{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|x64.ActiveCfg = Release|x64

 		{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|x64.Build.0 = Release|x64

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.Build.0 = Debug|Win32

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.ActiveCfg = Debug|x64

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.Build.0 = Debug|x64

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.ActiveCfg = Release|Win32

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.ActiveCfg = Release|x64

 		{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|Win32.ActiveCfg = Debug|Win32

 		{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|Win32.Build.0 = Debug|Win32

 		{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|x64.ActiveCfg = Debug|x64

@@ -1069,14 +1047,6 @@ Global
 		{07137F45-8B5F-4561-BEC8-B883E9123785}.Release|Win32.Build.0 = Release|Win32

 		{07137F45-8B5F-4561-BEC8-B883E9123785}.Release|x64.ActiveCfg = Release|x64

 		{07137F45-8B5F-4561-BEC8-B883E9123785}.Release|x64.Build.0 = Release|x64

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|Win32.ActiveCfg = Debug|Win32

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|Win32.Build.0 = Debug|Win32

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|x64.ActiveCfg = Debug|x64

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|x64.Build.0 = Debug|x64

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|Win32.ActiveCfg = Release|Win32

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|Win32.Build.0 = Release|Win32

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|x64.ActiveCfg = Release|x64

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|x64.Build.0 = Release|x64

 		{7DF5234A-A93A-47AD-8201-377ECF59AE5F}.Debug|Win32.ActiveCfg = Debug|Win32

 		{7DF5234A-A93A-47AD-8201-377ECF59AE5F}.Debug|Win32.Build.0 = Debug|Win32

 		{7DF5234A-A93A-47AD-8201-377ECF59AE5F}.Debug|x64.ActiveCfg = Debug|x64

@@ -1583,6 +1553,38 @@ Global
 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|Win32.Build.0 = Release|Win32

 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.ActiveCfg = Release|x64

 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.Build.0 = Release|x64

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|Win32.Build.0 = Debug|Win32

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|x64.ActiveCfg = Debug|x64

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|x64.Build.0 = Debug|x64

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|Win32.ActiveCfg = Release|Win32

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|Win32.Build.0 = Release|Win32

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|x64.ActiveCfg = Release|x64

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|x64.Build.0 = Release|x64

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|Win32.Build.0 = Debug|Win32

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|x64.ActiveCfg = Debug|x64

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|x64.Build.0 = Debug|x64

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|Win32.ActiveCfg = Release|Win32

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|Win32.Build.0 = Release|Win32

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|x64.ActiveCfg = Release|x64

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|x64.Build.0 = Release|x64

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.Build.0 = Debug|Win32

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.ActiveCfg = Debug|x64

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.Build.0 = Debug|x64

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.ActiveCfg = Release|Win32

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.Build.0 = Release|Win32

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.ActiveCfg = Release|x64

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.Build.0 = Release|x64

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.Build.0 = Debug|Win32

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|x64.ActiveCfg = Debug|x64

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|x64.Build.0 = Debug|x64

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|Win32.ActiveCfg = Release|Win32

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|Win32.Build.0 = Release|Win32

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|x64.ActiveCfg = Release|x64

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|x64.Build.0 = Release|x64

 		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|Win32.ActiveCfg = Debug|Win32

 		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|Win32.Build.0 = Debug|Win32

 		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 22afee5641..7790673a93 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -144,24 +144,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Variables", "..\plugins\Var
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhenWasIt", "..\plugins\WhenWasIt\WhenWasIt_10.vcxproj", "{63E05ECA-0A63-479E-86BD-2CAF53869BDA}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAMN", "..\protocols\YAMN\YAMN_10.vcxproj", "{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MRA", "..\protocols\MRA\Mra.vcxproj", "{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTalkExt", "..\protocols\GTalkExt\GTalkExt.vcxproj", "{2A737817-2443-48FF-A2E8-CA8D69E450F3}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook_10.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\protocols\Weather\weather_10.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpellChecker", "..\plugins\SpellChecker\spellchecker.vcxproj", "{5DB86086-10E9-42E7-AC90-503D2678C2A2}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Alarms", "..\plugins\Alarms\alarms_10.vcxproj", "{5F09C93B-463A-4BF5-A85E-6E4E916AA8F8}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LangMan", "..\plugins\LangMan\langman.vcxproj", "{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\protocols\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroNotify", "..\plugins\ZeroNotification\Zero Notification_10.vcxproj", "{E37561EB-B9C5-4215-9FF9-DB559916FBA2}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardNotify", "..\plugins\KeyboardNotify\KeyboardNotify_10.vcxproj", "{A9265E36-7F2D-440C-BF3E-F447FDB6200F}"

@@ -182,8 +176,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RC4", "..\plugins\Dbx_mmap_
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecentContacts", "..\plugins\RecentContacts\RecentContacts.vcxproj", "{07137F45-8B5F-4561-BEC8-B883E9123785}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\protocols\NewsAggregator\NewsAggregator_10.vcxproj", "{6DE11A47-2268-4B08-8DE5-15A1705FCE28}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicHistory", "..\plugins\BasicHistory\BasicHistory.vcxproj", "{7DF5234A-A93A-47AD-8201-377ECF59AE5F}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Twitter", "..\protocols\Twitter\twitter.vcxproj", "{12FFF2B0-0D0B-430B-A4C6-1577CA98F598}"

@@ -393,6 +385,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugin
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmLanProto", "..\protocols\EmLanProto\amdproto.vcxproj", "{2115FEBC-1EC4-4F95-A058-A523ED5295A4}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAMN", "..\plugins\YAMN\YAMN_10.vcxproj", "{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\plugins\NewsAggregator\NewsAggregator_10.vcxproj", "{6DE11A47-2268-4B08-8DE5-15A1705FCE28}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather_10.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\plugins\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}"

+EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PingPlugin", "..\plugins\Ping\ping.vcxproj", "{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}"

 EndProject

 Global

@@ -955,14 +955,6 @@ Global
 		{63E05ECA-0A63-479E-86BD-2CAF53869BDA}.Release|Win32.Build.0 = Release|Win32

 		{63E05ECA-0A63-479E-86BD-2CAF53869BDA}.Release|x64.ActiveCfg = Release|x64

 		{63E05ECA-0A63-479E-86BD-2CAF53869BDA}.Release|x64.Build.0 = Release|x64

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|Win32.Build.0 = Debug|Win32

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|x64.ActiveCfg = Debug|x64

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|x64.Build.0 = Debug|x64

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|Win32.ActiveCfg = Release|Win32

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|Win32.Build.0 = Release|Win32

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|x64.ActiveCfg = Release|x64

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|x64.Build.0 = Release|x64

 		{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA}.Debug|Win32.ActiveCfg = Debug|Win32

 		{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA}.Debug|Win32.Build.0 = Debug|Win32

 		{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA}.Debug|x64.ActiveCfg = Debug|x64

@@ -987,14 +979,6 @@ Global
 		{DADE9455-DC28-465A-9604-2CA28052B9FB}.Release|Win32.Build.0 = Release|Win32

 		{DADE9455-DC28-465A-9604-2CA28052B9FB}.Release|x64.ActiveCfg = Release|x64

 		{DADE9455-DC28-465A-9604-2CA28052B9FB}.Release|x64.Build.0 = Release|x64

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.ActiveCfg = Debug|Win32

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.Build.0 = Debug|Win32

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|x64.ActiveCfg = Debug|x64

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|x64.Build.0 = Debug|x64

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|Win32.ActiveCfg = Release|Win32

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|Win32.Build.0 = Release|Win32

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|x64.ActiveCfg = Release|x64

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|x64.Build.0 = Release|x64

 		{5DB86086-10E9-42E7-AC90-503D2678C2A2}.Debug|Win32.ActiveCfg = Debug|Win32

 		{5DB86086-10E9-42E7-AC90-503D2678C2A2}.Debug|Win32.Build.0 = Debug|Win32

 		{5DB86086-10E9-42E7-AC90-503D2678C2A2}.Debug|x64.ActiveCfg = Debug|x64

@@ -1019,12 +1003,6 @@ Global
 		{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|Win32.Build.0 = Release|Win32

 		{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|x64.ActiveCfg = Release|x64

 		{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|x64.Build.0 = Release|x64

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.Build.0 = Debug|Win32

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.ActiveCfg = Debug|x64

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.Build.0 = Debug|x64

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.ActiveCfg = Release|Win32

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.ActiveCfg = Release|x64

 		{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|Win32.ActiveCfg = Debug|Win32

 		{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|Win32.Build.0 = Debug|Win32

 		{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|x64.ActiveCfg = Debug|x64

@@ -1105,14 +1083,6 @@ Global
 		{07137F45-8B5F-4561-BEC8-B883E9123785}.Release|Win32.Build.0 = Release|Win32

 		{07137F45-8B5F-4561-BEC8-B883E9123785}.Release|x64.ActiveCfg = Release|x64

 		{07137F45-8B5F-4561-BEC8-B883E9123785}.Release|x64.Build.0 = Release|x64

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|Win32.ActiveCfg = Debug|Win32

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|Win32.Build.0 = Debug|Win32

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|x64.ActiveCfg = Debug|x64

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|x64.Build.0 = Debug|x64

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|Win32.ActiveCfg = Release|Win32

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|Win32.Build.0 = Release|Win32

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|x64.ActiveCfg = Release|x64

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|x64.Build.0 = Release|x64

 		{7DF5234A-A93A-47AD-8201-377ECF59AE5F}.Debug|Win32.ActiveCfg = Debug|Win32

 		{7DF5234A-A93A-47AD-8201-377ECF59AE5F}.Debug|Win32.Build.0 = Debug|Win32

 		{7DF5234A-A93A-47AD-8201-377ECF59AE5F}.Debug|x64.ActiveCfg = Debug|x64

@@ -1619,6 +1589,38 @@ Global
 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|Win32.Build.0 = Release|Win32

 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.ActiveCfg = Release|x64

 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.Build.0 = Release|x64

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|Win32.Build.0 = Debug|Win32

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|x64.ActiveCfg = Debug|x64

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|x64.Build.0 = Debug|x64

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|Win32.ActiveCfg = Release|Win32

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|Win32.Build.0 = Release|Win32

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|x64.ActiveCfg = Release|x64

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Release|x64.Build.0 = Release|x64

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|Win32.Build.0 = Debug|Win32

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|x64.ActiveCfg = Debug|x64

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|x64.Build.0 = Debug|x64

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|Win32.ActiveCfg = Release|Win32

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|Win32.Build.0 = Release|Win32

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|x64.ActiveCfg = Release|x64

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|x64.Build.0 = Release|x64

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.Build.0 = Debug|Win32

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|x64.ActiveCfg = Debug|x64

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|x64.Build.0 = Debug|x64

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|Win32.ActiveCfg = Release|Win32

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|Win32.Build.0 = Release|Win32

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|x64.ActiveCfg = Release|x64

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|x64.Build.0 = Release|x64

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.Build.0 = Debug|Win32

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.ActiveCfg = Debug|x64

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.Build.0 = Debug|x64

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.ActiveCfg = Release|Win32

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.Build.0 = Release|Win32

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.ActiveCfg = Release|x64

+		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.Build.0 = Release|x64

 		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|Win32.ActiveCfg = Debug|Win32

 		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|Win32.Build.0 = Debug|Win32

 		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|x64.ActiveCfg = Debug|x64

@@ -1660,6 +1662,11 @@ Global
 		{18195F68-A747-8643-050C-C5101DA658FD} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}

 		{885010EA-D008-4E38-85D4-487693F0BA00} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}

 		{20413125-4D68-4751-8062-DDA026DDABF1} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}

+		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}

+		{6DE11A47-2268-4B08-8DE5-15A1705FCE28} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}

+		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}

+		{C619A811-8023-4441-B3D7-785388A09DF0} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}

 		{F9916510-9055-4C9F-997A-3755DEC1511B} = {CBBD3DE7-97CE-479D-87E3-8EACD035AF9B}

 		{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C} = {CBBD3DE7-97CE-479D-87E3-8EACD035AF9B}

 		{1C856B14-54CD-4D07-B18B-5F7DB073AB51} = {CBBD3DE7-97CE-479D-87E3-8EACD035AF9B}

@@ -1695,14 +1702,10 @@ Global
 		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{33276462-8313-4192-8306-13717ECCA60A} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

-		{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{EE182018-5D3D-43F3-955F-7B5AB0BE2FCA} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{2A737817-2443-48FF-A2E8-CA8D69E450F3} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{DADE9455-DC28-465A-9604-2CA28052B9FB} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

-		{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

-		{C619A811-8023-4441-B3D7-785388A09DF0} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{D5E2FEC1-B29A-476C-BD41-469FE282EE0F} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

-		{6DE11A47-2268-4B08-8DE5-15A1705FCE28} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{12FFF2B0-0D0B-430B-A4C6-1577CA98F598} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{736E59E5-CDCE-4C88-9C3A-E7913D45C9EC} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{F3208C96-3C21-46AA-8695-C794E28CDC34} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

@@ -1766,7 +1769,6 @@ Global
 		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

 		{D3D80E27-D099-41EC-AFB2-A891A33F1608} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

 		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

-		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

 		{9DE1F0B0-B9D1-4681-82E7-13CC3E047445} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}

 		{07137F45-8B5F-4561-BEC8-B883E9123785} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}

 		{7DF5234A-A93A-47AD-8201-377ECF59AE5F} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}

diff --git a/plugins/MetaContacts/src/meta_main.cpp b/plugins/MetaContacts/src/meta_main.cpp
index 5e4cea2186..5ff2d14878 100644
--- a/plugins/MetaContacts/src/meta_main.cpp
+++ b/plugins/MetaContacts/src/meta_main.cpp
@@ -211,7 +211,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);

 

 	pd.szName = META_PROTO;

-	pd.type = PROTOTYPE_PROTOCOL;

+	pd.type = PROTOTYPE_VIRTUAL;

 	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);

 

 	// further db setup done in modules loaded (nick [protocol string required] & clist display name)

diff --git a/protocols/NewsAggregator/NewsAggregator_10.vcxproj b/plugins/NewsAggregator/NewsAggregator_10.vcxproj
index 78450a3189..78450a3189 100644
--- a/protocols/NewsAggregator/NewsAggregator_10.vcxproj
+++ b/plugins/NewsAggregator/NewsAggregator_10.vcxproj
diff --git a/protocols/NewsAggregator/NewsAggregator_10.vcxproj.filters b/plugins/NewsAggregator/NewsAggregator_10.vcxproj.filters
index e02b0ce97e..e02b0ce97e 100644
--- a/protocols/NewsAggregator/NewsAggregator_10.vcxproj.filters
+++ b/plugins/NewsAggregator/NewsAggregator_10.vcxproj.filters
diff --git a/protocols/NewsAggregator/Res/AddFeed.ico b/plugins/NewsAggregator/Res/AddFeed.ico
index 2503d8ec60..2503d8ec60 100644
--- a/protocols/NewsAggregator/Res/AddFeed.ico
+++ b/plugins/NewsAggregator/Res/AddFeed.ico
diff --git a/protocols/NewsAggregator/Res/CheckALL.ico b/plugins/NewsAggregator/Res/CheckALL.ico
index 98d434b2ba..98d434b2ba 100644
--- a/protocols/NewsAggregator/Res/CheckALL.ico
+++ b/plugins/NewsAggregator/Res/CheckALL.ico
diff --git a/protocols/NewsAggregator/Res/Export.ico b/plugins/NewsAggregator/Res/Export.ico
index ef475bb5cd..ef475bb5cd 100644
--- a/protocols/NewsAggregator/Res/Export.ico
+++ b/plugins/NewsAggregator/Res/Export.ico
diff --git a/protocols/NewsAggregator/Res/Import.ico b/plugins/NewsAggregator/Res/Import.ico
index 4becddf394..4becddf394 100644
--- a/protocols/NewsAggregator/Res/Import.ico
+++ b/plugins/NewsAggregator/Res/Import.ico
diff --git a/protocols/NewsAggregator/Res/Main.ico b/plugins/NewsAggregator/Res/Main.ico
index 4e9d1abc51..4e9d1abc51 100644
--- a/protocols/NewsAggregator/Res/Main.ico
+++ b/plugins/NewsAggregator/Res/Main.ico
diff --git a/protocols/NewsAggregator/Res/Resource.rc b/plugins/NewsAggregator/Res/Resource.rc
index ccfef31466..ccfef31466 100644
--- a/protocols/NewsAggregator/Res/Resource.rc
+++ b/plugins/NewsAggregator/Res/Resource.rc
diff --git a/protocols/NewsAggregator/Res/Version.rc b/plugins/NewsAggregator/Res/Version.rc
index d741488c4f..d741488c4f 100644
--- a/protocols/NewsAggregator/Res/Version.rc
+++ b/plugins/NewsAggregator/Res/Version.rc
diff --git a/protocols/NewsAggregator/Src/Common.h b/plugins/NewsAggregator/Src/Common.h
index 953229080d..953229080d 100644
--- a/protocols/NewsAggregator/Src/Common.h
+++ b/plugins/NewsAggregator/Src/Common.h
diff --git a/protocols/NewsAggregator/Src/Icons.cpp b/plugins/NewsAggregator/Src/Icons.cpp
index 5cd94ff76d..5cd94ff76d 100644
--- a/protocols/NewsAggregator/Src/Icons.cpp
+++ b/plugins/NewsAggregator/Src/Icons.cpp
diff --git a/protocols/NewsAggregator/Src/Menus.cpp b/plugins/NewsAggregator/Src/Menus.cpp
index 62a5da045d..62a5da045d 100644
--- a/protocols/NewsAggregator/Src/Menus.cpp
+++ b/plugins/NewsAggregator/Src/Menus.cpp
diff --git a/protocols/NewsAggregator/Src/NewsAggregator.cpp b/plugins/NewsAggregator/Src/NewsAggregator.cpp
index 57795ac15d..57795ac15d 100644
--- a/protocols/NewsAggregator/Src/NewsAggregator.cpp
+++ b/plugins/NewsAggregator/Src/NewsAggregator.cpp
diff --git a/protocols/NewsAggregator/Src/Options.cpp b/plugins/NewsAggregator/Src/Options.cpp
index 4869867d9a..4869867d9a 100644
--- a/protocols/NewsAggregator/Src/Options.cpp
+++ b/plugins/NewsAggregator/Src/Options.cpp
diff --git a/protocols/NewsAggregator/Src/Services.cpp b/plugins/NewsAggregator/Src/Services.cpp
index 72f666fa98..72f666fa98 100644
--- a/protocols/NewsAggregator/Src/Services.cpp
+++ b/plugins/NewsAggregator/Src/Services.cpp
diff --git a/protocols/NewsAggregator/Src/Stdafx.cpp b/plugins/NewsAggregator/Src/Stdafx.cpp
index 7a516adf58..7a516adf58 100644
--- a/protocols/NewsAggregator/Src/Stdafx.cpp
+++ b/plugins/NewsAggregator/Src/Stdafx.cpp
diff --git a/protocols/NewsAggregator/Src/Update.cpp b/plugins/NewsAggregator/Src/Update.cpp
index c0b42eb759..c0b42eb759 100644
--- a/protocols/NewsAggregator/Src/Update.cpp
+++ b/plugins/NewsAggregator/Src/Update.cpp
diff --git a/protocols/NewsAggregator/Src/Utils.cpp b/plugins/NewsAggregator/Src/Utils.cpp
index f28825d7e5..f28825d7e5 100644
--- a/protocols/NewsAggregator/Src/Utils.cpp
+++ b/plugins/NewsAggregator/Src/Utils.cpp
diff --git a/protocols/NewsAggregator/Src/Version.h b/plugins/NewsAggregator/Src/Version.h
index 7d4efa3d9d..7d4efa3d9d 100644
--- a/protocols/NewsAggregator/Src/Version.h
+++ b/plugins/NewsAggregator/Src/Version.h
diff --git a/protocols/NewsAggregator/Src/resource.h b/plugins/NewsAggregator/Src/resource.h
index f243b95585..f243b95585 100644
--- a/protocols/NewsAggregator/Src/resource.h
+++ b/plugins/NewsAggregator/Src/resource.h
diff --git a/protocols/NewsAggregator/docs/AtomText.txt b/plugins/NewsAggregator/docs/AtomText.txt
index 052516a6bb..052516a6bb 100644
--- a/protocols/NewsAggregator/docs/AtomText.txt
+++ b/plugins/NewsAggregator/docs/AtomText.txt
diff --git a/protocols/NewsAggregator/docs/RssText.txt b/plugins/NewsAggregator/docs/RssText.txt
index b229fc9e78..b229fc9e78 100644
--- a/protocols/NewsAggregator/docs/RssText.txt
+++ b/plugins/NewsAggregator/docs/RssText.txt
diff --git a/protocols/NewsAggregator/docs/ToDo.txt b/plugins/NewsAggregator/docs/ToDo.txt
index fa08c1a5f3..fa08c1a5f3 100644
--- a/protocols/NewsAggregator/docs/ToDo.txt
+++ b/plugins/NewsAggregator/docs/ToDo.txt
diff --git a/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj b/plugins/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj
index 0b4c2702ce..0b4c2702ce 100644
--- a/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj
+++ b/plugins/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj
diff --git a/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj.filters b/plugins/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj.filters
index e32e34e0dc..e32e34e0dc 100644
--- a/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj.filters
+++ b/plugins/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj.filters
diff --git a/protocols/NewsAggregator/proto_newsaggr/res/Offline.ico b/plugins/NewsAggregator/proto_newsaggr/res/Offline.ico
index 91788e73e7..91788e73e7 100644
--- a/protocols/NewsAggregator/proto_newsaggr/res/Offline.ico
+++ b/plugins/NewsAggregator/proto_newsaggr/res/Offline.ico
diff --git a/protocols/NewsAggregator/proto_newsaggr/res/Online.ico b/plugins/NewsAggregator/proto_newsaggr/res/Online.ico
index 3629737fda..3629737fda 100644
--- a/protocols/NewsAggregator/proto_newsaggr/res/Online.ico
+++ b/plugins/NewsAggregator/proto_newsaggr/res/Online.ico
diff --git a/protocols/NewsAggregator/proto_newsaggr/res/Proto_NewsAggr.rc b/plugins/NewsAggregator/proto_newsaggr/res/Proto_NewsAggr.rc
index 3eaac4e99b..3eaac4e99b 100644
--- a/protocols/NewsAggregator/proto_newsaggr/res/Proto_NewsAggr.rc
+++ b/plugins/NewsAggregator/proto_newsaggr/res/Proto_NewsAggr.rc
diff --git a/protocols/NewsAggregator/proto_newsaggr/src/resource.h b/plugins/NewsAggregator/proto_newsaggr/src/resource.h
index c6b804fd4e..c6b804fd4e 100644
--- a/protocols/NewsAggregator/proto_newsaggr/src/resource.h
+++ b/plugins/NewsAggregator/proto_newsaggr/src/resource.h
diff --git a/protocols/Quotes/Forex.vcxproj b/plugins/Quotes/Forex.vcxproj
index 3def2265f1..3def2265f1 100644
--- a/protocols/Quotes/Forex.vcxproj
+++ b/plugins/Quotes/Forex.vcxproj
diff --git a/protocols/Quotes/Forex.vcxproj.filters b/plugins/Quotes/Forex.vcxproj.filters
index 632658ed44..632658ed44 100644
--- a/protocols/Quotes/Forex.vcxproj.filters
+++ b/plugins/Quotes/Forex.vcxproj.filters
diff --git a/protocols/Quotes/docs/Utility/DukasCopy.py b/plugins/Quotes/docs/Utility/DukasCopy.py
index 2d12d1c4ec..2d12d1c4ec 100644
--- a/protocols/Quotes/docs/Utility/DukasCopy.py
+++ b/plugins/Quotes/docs/Utility/DukasCopy.py
diff --git a/protocols/Quotes/docs/Utility/Dukascopy.xml b/plugins/Quotes/docs/Utility/Dukascopy.xml
index 92890888b9..92890888b9 100644
--- a/protocols/Quotes/docs/Utility/Dukascopy.xml
+++ b/plugins/Quotes/docs/Utility/Dukascopy.xml
diff --git a/protocols/Quotes/docs/Utility/Google.py b/plugins/Quotes/docs/Utility/Google.py
index 35653a77f6..35653a77f6 100644
--- a/protocols/Quotes/docs/Utility/Google.py
+++ b/plugins/Quotes/docs/Utility/Google.py
diff --git a/protocols/Quotes/docs/Utility/GoogleFinance.xml b/plugins/Quotes/docs/Utility/GoogleFinance.xml
index 031afbcdd5..031afbcdd5 100644
--- a/protocols/Quotes/docs/Utility/GoogleFinance.xml
+++ b/plugins/Quotes/docs/Utility/GoogleFinance.xml
diff --git a/protocols/Quotes/docs/Utility/Quotes_Readme.txt b/plugins/Quotes/docs/Utility/Quotes_Readme.txt
index 7c0bf2ca10..7c0bf2ca10 100644
--- a/protocols/Quotes/docs/Utility/Quotes_Readme.txt
+++ b/plugins/Quotes/docs/Utility/Quotes_Readme.txt
diff --git a/protocols/Quotes/docs/Utility/Yahoo.xml b/plugins/Quotes/docs/Utility/Yahoo.xml
index 1c2a156d89..1c2a156d89 100644
--- a/protocols/Quotes/docs/Utility/Yahoo.xml
+++ b/plugins/Quotes/docs/Utility/Yahoo.xml
diff --git a/protocols/Quotes/docs/Utility/google.xml b/plugins/Quotes/docs/Utility/google.xml
index 9363addced..9363addced 100644
--- a/protocols/Quotes/docs/Utility/google.xml
+++ b/plugins/Quotes/docs/Utility/google.xml
diff --git a/protocols/Quotes/proto_Quotes/proto_Quotes_10.vcxproj b/plugins/Quotes/proto_Quotes/proto_Quotes_10.vcxproj
index 0f4a4592b0..0f4a4592b0 100644
--- a/protocols/Quotes/proto_Quotes/proto_Quotes_10.vcxproj
+++ b/plugins/Quotes/proto_Quotes/proto_Quotes_10.vcxproj
diff --git a/protocols/Quotes/proto_Quotes/proto_Quotes_10.vcxproj.filters b/plugins/Quotes/proto_Quotes/proto_Quotes_10.vcxproj.filters
index 835e3f8bf1..835e3f8bf1 100644
--- a/protocols/Quotes/proto_Quotes/proto_Quotes_10.vcxproj.filters
+++ b/plugins/Quotes/proto_Quotes/proto_Quotes_10.vcxproj.filters
diff --git a/protocols/Quotes/proto_Quotes/res/proto_Quotes.rc b/plugins/Quotes/proto_Quotes/res/proto_Quotes.rc
index 4f696d5870..4f696d5870 100644
--- a/protocols/Quotes/proto_Quotes/res/proto_Quotes.rc
+++ b/plugins/Quotes/proto_Quotes/res/proto_Quotes.rc
diff --git a/protocols/Quotes/proto_Quotes/res/proto_na.ico b/plugins/Quotes/proto_Quotes/res/proto_na.ico
index c8888adb80..c8888adb80 100644
--- a/protocols/Quotes/proto_Quotes/res/proto_na.ico
+++ b/plugins/Quotes/proto_Quotes/res/proto_na.ico
diff --git a/protocols/Quotes/proto_Quotes/res/proto_occupied.ico b/plugins/Quotes/proto_Quotes/res/proto_occupied.ico
index 3f54c740d1..3f54c740d1 100644
--- a/protocols/Quotes/proto_Quotes/res/proto_occupied.ico
+++ b/plugins/Quotes/proto_Quotes/res/proto_occupied.ico
diff --git a/protocols/Quotes/proto_Quotes/res/proto_offline.ico b/plugins/Quotes/proto_Quotes/res/proto_offline.ico
index cd99c072bf..cd99c072bf 100644
--- a/protocols/Quotes/proto_Quotes/res/proto_offline.ico
+++ b/plugins/Quotes/proto_Quotes/res/proto_offline.ico
diff --git a/protocols/Quotes/proto_Quotes/res/proto_online.ico b/plugins/Quotes/proto_Quotes/res/proto_online.ico
index 29e500e2bb..29e500e2bb 100644
--- a/protocols/Quotes/proto_Quotes/res/proto_online.ico
+++ b/plugins/Quotes/proto_Quotes/res/proto_online.ico
diff --git a/protocols/Quotes/res/CurrencyConverter.ico b/plugins/Quotes/res/CurrencyConverter.ico
index 67ac2095f5..67ac2095f5 100644
--- a/protocols/Quotes/res/CurrencyConverter.ico
+++ b/plugins/Quotes/res/CurrencyConverter.ico
diff --git a/protocols/Quotes/res/Export quotes.ico b/plugins/Quotes/res/Export quotes.ico
index 31c7aa2ba1..31c7aa2ba1 100644
--- a/protocols/Quotes/res/Export quotes.ico
+++ b/plugins/Quotes/res/Export quotes.ico
diff --git a/protocols/Quotes/res/Forex.rc b/plugins/Quotes/res/Forex.rc
index 8d62c83725..8d62c83725 100644
--- a/protocols/Quotes/res/Forex.rc
+++ b/plugins/Quotes/res/Forex.rc
diff --git a/protocols/Quotes/res/Import quotes.ico b/plugins/Quotes/res/Import quotes.ico
index 506aa62af3..506aa62af3 100644
--- a/protocols/Quotes/res/Import quotes.ico
+++ b/plugins/Quotes/res/Import quotes.ico
diff --git a/protocols/Quotes/res/Refresh.ico b/plugins/Quotes/res/Refresh.ico
index 2dbcfd3878..2dbcfd3878 100644
--- a/protocols/Quotes/res/Refresh.ico
+++ b/plugins/Quotes/res/Refresh.ico
diff --git a/protocols/Quotes/res/Section.ico b/plugins/Quotes/res/Section.ico
index f59105b665..f59105b665 100644
--- a/protocols/Quotes/res/Section.ico
+++ b/plugins/Quotes/res/Section.ico
diff --git a/protocols/Quotes/res/Version.rc b/plugins/Quotes/res/Version.rc
index d5721e1578..d5721e1578 100644
--- a/protocols/Quotes/res/Version.rc
+++ b/plugins/Quotes/res/Version.rc
diff --git a/protocols/Quotes/res/down.ico b/plugins/Quotes/res/down.ico
index 9dfe185cbe..9dfe185cbe 100644
--- a/protocols/Quotes/res/down.ico
+++ b/plugins/Quotes/res/down.ico
diff --git a/protocols/Quotes/res/main.ico b/plugins/Quotes/res/main.ico
index 4d32e57495..4d32e57495 100644
--- a/protocols/Quotes/res/main.ico
+++ b/plugins/Quotes/res/main.ico
diff --git a/protocols/Quotes/res/notchanged.ico b/plugins/Quotes/res/notchanged.ico
index e1d9ee3a09..e1d9ee3a09 100644
--- a/protocols/Quotes/res/notchanged.ico
+++ b/plugins/Quotes/res/notchanged.ico
diff --git a/protocols/Quotes/res/quote.ico b/plugins/Quotes/res/quote.ico
index 832ed12f52..832ed12f52 100644
--- a/protocols/Quotes/res/quote.ico
+++ b/plugins/Quotes/res/quote.ico
diff --git a/protocols/Quotes/res/swap.ico b/plugins/Quotes/res/swap.ico
index 1bff71b764..1bff71b764 100644
--- a/protocols/Quotes/res/swap.ico
+++ b/plugins/Quotes/res/swap.ico
diff --git a/protocols/Quotes/res/up.ico b/plugins/Quotes/res/up.ico
index a75899cd3d..a75899cd3d 100644
--- a/protocols/Quotes/res/up.ico
+++ b/plugins/Quotes/res/up.ico
diff --git a/protocols/Quotes/src/Base64.cpp b/plugins/Quotes/src/Base64.cpp
index 1854fb42fd..1854fb42fd 100644
--- a/protocols/Quotes/src/Base64.cpp
+++ b/plugins/Quotes/src/Base64.cpp
diff --git a/protocols/Quotes/src/Base64.h b/plugins/Quotes/src/Base64.h
index 3f911bfeb8..3f911bfeb8 100644
--- a/protocols/Quotes/src/Base64.h
+++ b/plugins/Quotes/src/Base64.h
diff --git a/protocols/Quotes/src/Chart.h b/plugins/Quotes/src/Chart.h
index 62a658d818..62a658d818 100644
--- a/protocols/Quotes/src/Chart.h
+++ b/plugins/Quotes/src/Chart.h
diff --git a/protocols/Quotes/src/ComHelper.cpp b/plugins/Quotes/src/ComHelper.cpp
index e15d05d739..e15d05d739 100644
--- a/protocols/Quotes/src/ComHelper.cpp
+++ b/plugins/Quotes/src/ComHelper.cpp
diff --git a/protocols/Quotes/src/ComHelper.h b/plugins/Quotes/src/ComHelper.h
index 0b4140d80d..0b4140d80d 100644
--- a/protocols/Quotes/src/ComHelper.h
+++ b/plugins/Quotes/src/ComHelper.h
diff --git a/protocols/Quotes/src/CommonOptionDlg.cpp b/plugins/Quotes/src/CommonOptionDlg.cpp
index 0b460665c5..0b460665c5 100644
--- a/protocols/Quotes/src/CommonOptionDlg.cpp
+++ b/plugins/Quotes/src/CommonOptionDlg.cpp
diff --git a/protocols/Quotes/src/CommonOptionDlg.h b/plugins/Quotes/src/CommonOptionDlg.h
index b9f696362a..b9f696362a 100644
--- a/protocols/Quotes/src/CommonOptionDlg.h
+++ b/plugins/Quotes/src/CommonOptionDlg.h
diff --git a/protocols/Quotes/src/CreateFilePath.cpp b/plugins/Quotes/src/CreateFilePath.cpp
index 23c0c345b0..23c0c345b0 100644
--- a/protocols/Quotes/src/CreateFilePath.cpp
+++ b/plugins/Quotes/src/CreateFilePath.cpp
diff --git a/protocols/Quotes/src/CreateFilePath.h b/plugins/Quotes/src/CreateFilePath.h
index f097e59a52..f097e59a52 100644
--- a/protocols/Quotes/src/CreateFilePath.h
+++ b/plugins/Quotes/src/CreateFilePath.h
diff --git a/protocols/Quotes/src/CurrencyConverter.cpp b/plugins/Quotes/src/CurrencyConverter.cpp
index 7124677567..7124677567 100644
--- a/protocols/Quotes/src/CurrencyConverter.cpp
+++ b/plugins/Quotes/src/CurrencyConverter.cpp
diff --git a/protocols/Quotes/src/CurrencyConverter.h b/plugins/Quotes/src/CurrencyConverter.h
index 9af7c6bca1..9af7c6bca1 100644
--- a/protocols/Quotes/src/CurrencyConverter.h
+++ b/plugins/Quotes/src/CurrencyConverter.h
diff --git a/protocols/Quotes/src/DBUtils.cpp b/plugins/Quotes/src/DBUtils.cpp
index 11c0fb3d0d..11c0fb3d0d 100644
--- a/protocols/Quotes/src/DBUtils.cpp
+++ b/plugins/Quotes/src/DBUtils.cpp
diff --git a/protocols/Quotes/src/DBUtils.h b/plugins/Quotes/src/DBUtils.h
index 27e3de5038..27e3de5038 100644
--- a/protocols/Quotes/src/DBUtils.h
+++ b/plugins/Quotes/src/DBUtils.h
diff --git a/protocols/Quotes/src/EconomicRateInfo.h b/plugins/Quotes/src/EconomicRateInfo.h
index 73e269619c..73e269619c 100644
--- a/protocols/Quotes/src/EconomicRateInfo.h
+++ b/plugins/Quotes/src/EconomicRateInfo.h
diff --git a/protocols/Quotes/src/ExtraImages.cpp b/plugins/Quotes/src/ExtraImages.cpp
index a89032e53c..a89032e53c 100644
--- a/protocols/Quotes/src/ExtraImages.cpp
+++ b/plugins/Quotes/src/ExtraImages.cpp
diff --git a/protocols/Quotes/src/ExtraImages.h b/plugins/Quotes/src/ExtraImages.h
index cd09600217..cd09600217 100644
--- a/protocols/Quotes/src/ExtraImages.h
+++ b/plugins/Quotes/src/ExtraImages.h
diff --git a/protocols/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp
index 6aa7d90dcf..6aa7d90dcf 100644
--- a/protocols/Quotes/src/Forex.cpp
+++ b/plugins/Quotes/src/Forex.cpp
diff --git a/protocols/Quotes/src/HTMLParserMS.cpp b/plugins/Quotes/src/HTMLParserMS.cpp
index bfe58b43b1..bfe58b43b1 100644
--- a/protocols/Quotes/src/HTMLParserMS.cpp
+++ b/plugins/Quotes/src/HTMLParserMS.cpp
diff --git a/protocols/Quotes/src/HTMLParserMS.h b/plugins/Quotes/src/HTMLParserMS.h
index 0773efa42a..0773efa42a 100644
--- a/protocols/Quotes/src/HTMLParserMS.h
+++ b/plugins/Quotes/src/HTMLParserMS.h
diff --git a/protocols/Quotes/src/HTTPSession.cpp b/plugins/Quotes/src/HTTPSession.cpp
index aa66948ae9..aa66948ae9 100644
--- a/protocols/Quotes/src/HTTPSession.cpp
+++ b/plugins/Quotes/src/HTTPSession.cpp
diff --git a/protocols/Quotes/src/HTTPSession.h b/plugins/Quotes/src/HTTPSession.h
index fe93a2dce5..fe93a2dce5 100644
--- a/protocols/Quotes/src/HTTPSession.h
+++ b/plugins/Quotes/src/HTTPSession.h
diff --git a/protocols/Quotes/src/IHTMLEngine.h b/plugins/Quotes/src/IHTMLEngine.h
index 7df3074d3e..7df3074d3e 100644
--- a/protocols/Quotes/src/IHTMLEngine.h
+++ b/plugins/Quotes/src/IHTMLEngine.h
diff --git a/protocols/Quotes/src/IHTMLParser.h b/plugins/Quotes/src/IHTMLParser.h
index defc6f61cb..defc6f61cb 100644
--- a/protocols/Quotes/src/IHTMLParser.h
+++ b/plugins/Quotes/src/IHTMLParser.h
diff --git a/protocols/Quotes/src/IQuotesProvider.h b/plugins/Quotes/src/IQuotesProvider.h
index a03a2a9bcd..a03a2a9bcd 100644
--- a/protocols/Quotes/src/IQuotesProvider.h
+++ b/plugins/Quotes/src/IQuotesProvider.h
diff --git a/protocols/Quotes/src/IXMLEngine.h b/plugins/Quotes/src/IXMLEngine.h
index 910c3efea0..910c3efea0 100644
--- a/protocols/Quotes/src/IXMLEngine.h
+++ b/plugins/Quotes/src/IXMLEngine.h
diff --git a/protocols/Quotes/src/IconLib.cpp b/plugins/Quotes/src/IconLib.cpp
index 9ac96599a5..9ac96599a5 100644
--- a/protocols/Quotes/src/IconLib.cpp
+++ b/plugins/Quotes/src/IconLib.cpp
diff --git a/protocols/Quotes/src/IconLib.h b/plugins/Quotes/src/IconLib.h
index 29b0326622..29b0326622 100644
--- a/protocols/Quotes/src/IconLib.h
+++ b/plugins/Quotes/src/IconLib.h
diff --git a/protocols/Quotes/src/ImportExport.cpp b/plugins/Quotes/src/ImportExport.cpp
index 80ab41d309..80ab41d309 100644
--- a/protocols/Quotes/src/ImportExport.cpp
+++ b/plugins/Quotes/src/ImportExport.cpp
diff --git a/protocols/Quotes/src/ImportExport.h b/plugins/Quotes/src/ImportExport.h
index da2053e9a3..da2053e9a3 100644
--- a/protocols/Quotes/src/ImportExport.h
+++ b/plugins/Quotes/src/ImportExport.h
diff --git a/protocols/Quotes/src/IsWithinAccuracy.h b/plugins/Quotes/src/IsWithinAccuracy.h
index 5e39281719..5e39281719 100644
--- a/protocols/Quotes/src/IsWithinAccuracy.h
+++ b/plugins/Quotes/src/IsWithinAccuracy.h
diff --git a/protocols/Quotes/src/LightMutex.cpp b/plugins/Quotes/src/LightMutex.cpp
index 8d14e8e7bb..8d14e8e7bb 100644
--- a/protocols/Quotes/src/LightMutex.cpp
+++ b/plugins/Quotes/src/LightMutex.cpp
diff --git a/protocols/Quotes/src/LightMutex.h b/plugins/Quotes/src/LightMutex.h
index e8c7363ba1..e8c7363ba1 100644
--- a/protocols/Quotes/src/LightMutex.h
+++ b/plugins/Quotes/src/LightMutex.h
diff --git a/protocols/Quotes/src/Locale.cpp b/plugins/Quotes/src/Locale.cpp
index c01f67148a..c01f67148a 100644
--- a/protocols/Quotes/src/Locale.cpp
+++ b/plugins/Quotes/src/Locale.cpp
diff --git a/protocols/Quotes/src/Locale.h b/plugins/Quotes/src/Locale.h
index 92d3a56ed4..92d3a56ed4 100644
--- a/protocols/Quotes/src/Locale.h
+++ b/plugins/Quotes/src/Locale.h
diff --git a/protocols/Quotes/src/Log.cpp b/plugins/Quotes/src/Log.cpp
index d692763bad..d692763bad 100644
--- a/protocols/Quotes/src/Log.cpp
+++ b/plugins/Quotes/src/Log.cpp
diff --git a/protocols/Quotes/src/Log.h b/plugins/Quotes/src/Log.h
index 274fcfec06..274fcfec06 100644
--- a/protocols/Quotes/src/Log.h
+++ b/plugins/Quotes/src/Log.h
diff --git a/protocols/Quotes/src/ModuleInfo.cpp b/plugins/Quotes/src/ModuleInfo.cpp
index 4caec96368..4caec96368 100644
--- a/protocols/Quotes/src/ModuleInfo.cpp
+++ b/plugins/Quotes/src/ModuleInfo.cpp
diff --git a/protocols/Quotes/src/ModuleInfo.h b/plugins/Quotes/src/ModuleInfo.h
index 2882dfae6d..2882dfae6d 100644
--- a/protocols/Quotes/src/ModuleInfo.h
+++ b/plugins/Quotes/src/ModuleInfo.h
diff --git a/protocols/Quotes/src/OptionDukasCopy.cpp b/plugins/Quotes/src/OptionDukasCopy.cpp
index 6fcc542b09..6fcc542b09 100644
--- a/protocols/Quotes/src/OptionDukasCopy.cpp
+++ b/plugins/Quotes/src/OptionDukasCopy.cpp
diff --git a/protocols/Quotes/src/OptionDukasCopy.h b/plugins/Quotes/src/OptionDukasCopy.h
index 0674119e83..0674119e83 100644
--- a/protocols/Quotes/src/OptionDukasCopy.h
+++ b/plugins/Quotes/src/OptionDukasCopy.h
diff --git a/protocols/Quotes/src/QuoteChart.cpp b/plugins/Quotes/src/QuoteChart.cpp
index 3746540d23..3746540d23 100644
--- a/protocols/Quotes/src/QuoteChart.cpp
+++ b/plugins/Quotes/src/QuoteChart.cpp
diff --git a/protocols/Quotes/src/QuoteChart.h b/plugins/Quotes/src/QuoteChart.h
index 1b40f428b5..1b40f428b5 100644
--- a/protocols/Quotes/src/QuoteChart.h
+++ b/plugins/Quotes/src/QuoteChart.h
diff --git a/protocols/Quotes/src/QuoteInfoDlg.cpp b/plugins/Quotes/src/QuoteInfoDlg.cpp
index 61b6fb5f11..61b6fb5f11 100644
--- a/protocols/Quotes/src/QuoteInfoDlg.cpp
+++ b/plugins/Quotes/src/QuoteInfoDlg.cpp
diff --git a/protocols/Quotes/src/QuoteInfoDlg.h b/plugins/Quotes/src/QuoteInfoDlg.h
index c4a1999a4c..c4a1999a4c 100644
--- a/protocols/Quotes/src/QuoteInfoDlg.h
+++ b/plugins/Quotes/src/QuoteInfoDlg.h
diff --git a/protocols/Quotes/src/QuotesProviderBase.cpp b/plugins/Quotes/src/QuotesProviderBase.cpp
index 681afb0d38..681afb0d38 100644
--- a/protocols/Quotes/src/QuotesProviderBase.cpp
+++ b/plugins/Quotes/src/QuotesProviderBase.cpp
diff --git a/protocols/Quotes/src/QuotesProviderBase.h b/plugins/Quotes/src/QuotesProviderBase.h
index 76db155f4c..76db155f4c 100644
--- a/protocols/Quotes/src/QuotesProviderBase.h
+++ b/plugins/Quotes/src/QuotesProviderBase.h
diff --git a/protocols/Quotes/src/QuotesProviderDukasCopy.cpp b/plugins/Quotes/src/QuotesProviderDukasCopy.cpp
index a7ffc5331a..a7ffc5331a 100644
--- a/protocols/Quotes/src/QuotesProviderDukasCopy.cpp
+++ b/plugins/Quotes/src/QuotesProviderDukasCopy.cpp
diff --git a/protocols/Quotes/src/QuotesProviderDukasCopy.h b/plugins/Quotes/src/QuotesProviderDukasCopy.h
index d6ec498bcf..d6ec498bcf 100644
--- a/protocols/Quotes/src/QuotesProviderDukasCopy.h
+++ b/plugins/Quotes/src/QuotesProviderDukasCopy.h
diff --git a/protocols/Quotes/src/QuotesProviderFinance.cpp b/plugins/Quotes/src/QuotesProviderFinance.cpp
index e8b335035d..e8b335035d 100644
--- a/protocols/Quotes/src/QuotesProviderFinance.cpp
+++ b/plugins/Quotes/src/QuotesProviderFinance.cpp
diff --git a/protocols/Quotes/src/QuotesProviderFinance.h b/plugins/Quotes/src/QuotesProviderFinance.h
index f63077071d..f63077071d 100644
--- a/protocols/Quotes/src/QuotesProviderFinance.h
+++ b/plugins/Quotes/src/QuotesProviderFinance.h
diff --git a/protocols/Quotes/src/QuotesProviderGoogle.cpp b/plugins/Quotes/src/QuotesProviderGoogle.cpp
index c2b30a9a6a..c2b30a9a6a 100644
--- a/protocols/Quotes/src/QuotesProviderGoogle.cpp
+++ b/plugins/Quotes/src/QuotesProviderGoogle.cpp
diff --git a/protocols/Quotes/src/QuotesProviderGoogle.h b/plugins/Quotes/src/QuotesProviderGoogle.h
index 4289861178..4289861178 100644
--- a/protocols/Quotes/src/QuotesProviderGoogle.h
+++ b/plugins/Quotes/src/QuotesProviderGoogle.h
diff --git a/protocols/Quotes/src/QuotesProviderGoogleFinance.cpp b/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp
index 8a129b6b8b..8a129b6b8b 100644
--- a/protocols/Quotes/src/QuotesProviderGoogleFinance.cpp
+++ b/plugins/Quotes/src/QuotesProviderGoogleFinance.cpp
diff --git a/protocols/Quotes/src/QuotesProviderGoogleFinance.h b/plugins/Quotes/src/QuotesProviderGoogleFinance.h
index 075498a4dd..075498a4dd 100644
--- a/protocols/Quotes/src/QuotesProviderGoogleFinance.h
+++ b/plugins/Quotes/src/QuotesProviderGoogleFinance.h
diff --git a/protocols/Quotes/src/QuotesProviderVisitor.h b/plugins/Quotes/src/QuotesProviderVisitor.h
index 9ae601f2a1..9ae601f2a1 100644
--- a/protocols/Quotes/src/QuotesProviderVisitor.h
+++ b/plugins/Quotes/src/QuotesProviderVisitor.h
diff --git a/protocols/Quotes/src/QuotesProviderVisitorDbSettings.cpp b/plugins/Quotes/src/QuotesProviderVisitorDbSettings.cpp
index 5caea48685..5caea48685 100644
--- a/protocols/Quotes/src/QuotesProviderVisitorDbSettings.cpp
+++ b/plugins/Quotes/src/QuotesProviderVisitorDbSettings.cpp
diff --git a/protocols/Quotes/src/QuotesProviderVisitorDbSettings.h b/plugins/Quotes/src/QuotesProviderVisitorDbSettings.h
index 728a436dfa..728a436dfa 100644
--- a/protocols/Quotes/src/QuotesProviderVisitorDbSettings.h
+++ b/plugins/Quotes/src/QuotesProviderVisitorDbSettings.h
diff --git a/protocols/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp
index 9e643fe1b6..9e643fe1b6 100644
--- a/protocols/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp
+++ b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.cpp
diff --git a/protocols/Quotes/src/QuotesProviderVisitorFormatSpecificator.h b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.h
index 870ab00634..870ab00634 100644
--- a/protocols/Quotes/src/QuotesProviderVisitorFormatSpecificator.h
+++ b/plugins/Quotes/src/QuotesProviderVisitorFormatSpecificator.h
diff --git a/protocols/Quotes/src/QuotesProviderVisitorFormater.cpp b/plugins/Quotes/src/QuotesProviderVisitorFormater.cpp
index 4b1d73bb05..4b1d73bb05 100644
--- a/protocols/Quotes/src/QuotesProviderVisitorFormater.cpp
+++ b/plugins/Quotes/src/QuotesProviderVisitorFormater.cpp
diff --git a/protocols/Quotes/src/QuotesProviderVisitorFormater.h b/plugins/Quotes/src/QuotesProviderVisitorFormater.h
index 7c9c222269..7c9c222269 100644
--- a/protocols/Quotes/src/QuotesProviderVisitorFormater.h
+++ b/plugins/Quotes/src/QuotesProviderVisitorFormater.h
diff --git a/protocols/Quotes/src/QuotesProviderVisitorTendency.cpp b/plugins/Quotes/src/QuotesProviderVisitorTendency.cpp
index 00703521b3..00703521b3 100644
--- a/protocols/Quotes/src/QuotesProviderVisitorTendency.cpp
+++ b/plugins/Quotes/src/QuotesProviderVisitorTendency.cpp
diff --git a/protocols/Quotes/src/QuotesProviderVisitorTendency.h b/plugins/Quotes/src/QuotesProviderVisitorTendency.h
index fa0f04c5f0..fa0f04c5f0 100644
--- a/protocols/Quotes/src/QuotesProviderVisitorTendency.h
+++ b/plugins/Quotes/src/QuotesProviderVisitorTendency.h
diff --git a/protocols/Quotes/src/QuotesProviderYahoo.cpp b/plugins/Quotes/src/QuotesProviderYahoo.cpp
index 35edb3207c..35edb3207c 100644
--- a/protocols/Quotes/src/QuotesProviderYahoo.cpp
+++ b/plugins/Quotes/src/QuotesProviderYahoo.cpp
diff --git a/protocols/Quotes/src/QuotesProviderYahoo.h b/plugins/Quotes/src/QuotesProviderYahoo.h
index feadefbca4..feadefbca4 100644
--- a/protocols/Quotes/src/QuotesProviderYahoo.h
+++ b/plugins/Quotes/src/QuotesProviderYahoo.h
diff --git a/protocols/Quotes/src/QuotesProviders.cpp b/plugins/Quotes/src/QuotesProviders.cpp
index 26cbb067ea..26cbb067ea 100644
--- a/protocols/Quotes/src/QuotesProviders.cpp
+++ b/plugins/Quotes/src/QuotesProviders.cpp
diff --git a/protocols/Quotes/src/QuotesProviders.h b/plugins/Quotes/src/QuotesProviders.h
index 02aa5184c9..02aa5184c9 100644
--- a/protocols/Quotes/src/QuotesProviders.h
+++ b/plugins/Quotes/src/QuotesProviders.h
diff --git a/protocols/Quotes/src/SettingsDlg.cpp b/plugins/Quotes/src/SettingsDlg.cpp
index 0011d2e917..0011d2e917 100644
--- a/protocols/Quotes/src/SettingsDlg.cpp
+++ b/plugins/Quotes/src/SettingsDlg.cpp
diff --git a/protocols/Quotes/src/SettingsDlg.h b/plugins/Quotes/src/SettingsDlg.h
index 569d0b7d2c..569d0b7d2c 100644
--- a/protocols/Quotes/src/SettingsDlg.h
+++ b/plugins/Quotes/src/SettingsDlg.h
diff --git a/protocols/Quotes/src/WinCtrlHelper.cpp b/plugins/Quotes/src/WinCtrlHelper.cpp
index 619fe3d41b..619fe3d41b 100644
--- a/protocols/Quotes/src/WinCtrlHelper.cpp
+++ b/plugins/Quotes/src/WinCtrlHelper.cpp
diff --git a/protocols/Quotes/src/WinCtrlHelper.h b/plugins/Quotes/src/WinCtrlHelper.h
index d7f8957a86..d7f8957a86 100644
--- a/protocols/Quotes/src/WinCtrlHelper.h
+++ b/plugins/Quotes/src/WinCtrlHelper.h
diff --git a/protocols/Quotes/src/WorkingThread.cpp b/plugins/Quotes/src/WorkingThread.cpp
index bc4d80b734..bc4d80b734 100644
--- a/protocols/Quotes/src/WorkingThread.cpp
+++ b/plugins/Quotes/src/WorkingThread.cpp
diff --git a/protocols/Quotes/src/WorkingThread.h b/plugins/Quotes/src/WorkingThread.h
index a77734bb85..a77734bb85 100644
--- a/protocols/Quotes/src/WorkingThread.h
+++ b/plugins/Quotes/src/WorkingThread.h
diff --git a/protocols/Quotes/src/XMLEngineMI.cpp b/plugins/Quotes/src/XMLEngineMI.cpp
index 7e2adfb7d9..7e2adfb7d9 100644
--- a/protocols/Quotes/src/XMLEngineMI.cpp
+++ b/plugins/Quotes/src/XMLEngineMI.cpp
diff --git a/protocols/Quotes/src/XMLEngineMI.h b/plugins/Quotes/src/XMLEngineMI.h
index 5e5a51232f..5e5a51232f 100644
--- a/protocols/Quotes/src/XMLEngineMI.h
+++ b/plugins/Quotes/src/XMLEngineMI.h
diff --git a/protocols/Quotes/src/resource.h b/plugins/Quotes/src/resource.h
index 50ee0a637b..50ee0a637b 100644
--- a/protocols/Quotes/src/resource.h
+++ b/plugins/Quotes/src/resource.h
diff --git a/protocols/Quotes/src/stdafx.cpp b/plugins/Quotes/src/stdafx.cpp
index e4738d8f60..e4738d8f60 100644
--- a/protocols/Quotes/src/stdafx.cpp
+++ b/plugins/Quotes/src/stdafx.cpp
diff --git a/protocols/Quotes/src/stdafx.h b/plugins/Quotes/src/stdafx.h
index 5e72bc0e0b..5e72bc0e0b 100644
--- a/protocols/Quotes/src/stdafx.h
+++ b/plugins/Quotes/src/stdafx.h
diff --git a/protocols/Quotes/src/targetver.h b/plugins/Quotes/src/targetver.h
index f583181dfd..f583181dfd 100644
--- a/protocols/Quotes/src/targetver.h
+++ b/plugins/Quotes/src/targetver.h
diff --git a/protocols/Quotes/src/version.h b/plugins/Quotes/src/version.h
index a80f032948..a80f032948 100644
--- a/protocols/Quotes/src/version.h
+++ b/plugins/Quotes/src/version.h
diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/plugins/StatusPlugins/StartupStatus/options.cpp
index d6b30052f7..c6cecb3d17 100644
--- a/plugins/StatusPlugins/StartupStatus/options.cpp
+++ b/plugins/StatusPlugins/StartupStatus/options.cpp
@@ -39,16 +39,16 @@ static int ClearDatabase(char* filter);
 static TSettingsList* GetCurrentProtoSettings()

 {

 	int count;

-	PROTOACCOUNT** protos;

-	ProtoEnumAccounts( &count, &protos );

+	PROTOACCOUNT **protos;

+	ProtoEnumAccounts(&count, &protos);

 

-	TSettingsList* result = new TSettingsList( count, CompareSettings );

-	if ( result == NULL )

+	TSettingsList *result = new TSettingsList(count, CompareSettings);

+	if (result == NULL)

 		return NULL;

 

-	for ( int i=0; i < count; i++ )

-		if ( IsSuitableProto( protos[i] ))

-			result->insert( new TSSSetting( protos[i] ));

+	for (int i=0; i < count; i++)

+		if ( IsSuitableProto(protos[i]))

+			result->insert( new TSSSetting(protos[i]));

 

 	return result;

 }

diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp
index d02986a275..9ca9e15e35 100644
--- a/plugins/StatusPlugins/commonstatus.cpp
+++ b/plugins/StatusPlugins/commonstatus.cpp
@@ -164,11 +164,11 @@ static int equalsGlobalStatus(PROTOCOLSETTINGEX **ps) {
 			return 0;

 

 	int count;

-	PROTOACCOUNT** protos;

-	ProtoEnumAccounts( &count, &protos );

+	PROTOACCOUNT **protos;

+	ProtoEnumAccounts(&count, &protos);

 

-	for ( i=0; i < count; i++ ) {

-		if ( !IsSuitableProto( protos[i] ))

+	for (i=0; i < count; i++) {

+		if ( !IsSuitableProto(protos[i]))

 			continue;

 

 		pstatus = 0;

@@ -317,18 +317,9 @@ static INT_PTR GetProtocolCountService(WPARAM wParam, LPARAM lParam)
 	return GetProtoCount();

 }

 

-bool IsSuitableProto( PROTOACCOUNT* pa )

+bool IsSuitableProto(PROTOACCOUNT *pa)

 {

-	if ( pa == NULL )

-		return false;

-

-	if ( pa->bDynDisabled || !pa->bIsEnabled )

-		return false;

-

-	if ( CallProtoService( pa->szProtoName, PS_GETCAPS, PFLAGNUM_2, 0 ) == 0 )

-		return false;

-

-	return true;

+	return (pa == NULL) ? false : (pcli->pfnGetProtocolVisibility(pa->szModuleName) != 0);

 }

 

 int GetProtoCount()

@@ -336,12 +327,12 @@ int GetProtoCount()
 	int pCount = 0;

 

 	int count;

-	PROTOACCOUNT** protos;

+	PROTOACCOUNT **protos;

 	ProtoEnumAccounts( &count, &protos );

 

-	for ( int i=0; i < count; i++ )

-		if ( IsSuitableProto( protos[i] ))

-			pCount ++;

+	for (int i=0; i < count; i++)

+		if ( IsSuitableProto(protos[i]))

+			pCount++;

 

 	return pCount;

 }

diff --git a/plugins/StatusPlugins/commonstatus.h b/plugins/StatusPlugins/commonstatus.h
index 8eccbc3a8f..64619f11bd 100644
--- a/plugins/StatusPlugins/commonstatus.h
+++ b/plugins/StatusPlugins/commonstatus.h
@@ -75,7 +75,7 @@ static int statusModePf2List[]={PF2_OFFLINE,PF2_ONLINE,PF2_SHORTAWAY,PF2_LONGAWA
 TCHAR *GetDefaultStatusMessage(PROTOCOLSETTINGEX *ps, int status);

 int GetActualStatus(PROTOCOLSETTINGEX *protoSetting);

 int InitCommonStatus();

-bool IsSuitableProto( PROTOACCOUNT* pa );

+bool IsSuitableProto(PROTOACCOUNT *pa);

 

 /* SimpleAway */

 

diff --git a/protocols/Weather/docs/license.txt b/plugins/Weather/docs/license.txt
index 45645b4b53..45645b4b53 100644
--- a/protocols/Weather/docs/license.txt
+++ b/plugins/Weather/docs/license.txt
diff --git a/protocols/Weather/docs/sample_ini.ini b/plugins/Weather/docs/sample_ini.ini
index dc36eda754..dc36eda754 100644
--- a/protocols/Weather/docs/sample_ini.ini
+++ b/plugins/Weather/docs/sample_ini.ini
diff --git a/protocols/Weather/docs/weather-history.txt b/plugins/Weather/docs/weather-history.txt
index ff936f56f2..ff936f56f2 100644
--- a/protocols/Weather/docs/weather-history.txt
+++ b/plugins/Weather/docs/weather-history.txt
diff --git a/protocols/Weather/docs/weather-readme.html b/plugins/Weather/docs/weather-readme.html
index ff81561171..ff81561171 100644
--- a/protocols/Weather/docs/weather-readme.html
+++ b/plugins/Weather/docs/weather-readme.html
diff --git a/protocols/Weather/proto_weather/proto_weather_10.vcxproj b/plugins/Weather/proto_weather/proto_weather_10.vcxproj
index 8187912e95..8187912e95 100644
--- a/protocols/Weather/proto_weather/proto_weather_10.vcxproj
+++ b/plugins/Weather/proto_weather/proto_weather_10.vcxproj
diff --git a/protocols/Weather/proto_weather/proto_weather_10.vcxproj.filters b/plugins/Weather/proto_weather/proto_weather_10.vcxproj.filters
index 27e90fab59..27e90fab59 100644
--- a/protocols/Weather/proto_weather/proto_weather_10.vcxproj.filters
+++ b/plugins/Weather/proto_weather/proto_weather_10.vcxproj.filters
diff --git a/protocols/Weather/proto_weather/res/Cloud.ico b/plugins/Weather/proto_weather/res/Cloud.ico
index 2edb539dcb..2edb539dcb 100644
--- a/protocols/Weather/proto_weather/res/Cloud.ico
+++ b/plugins/Weather/proto_weather/res/Cloud.ico
diff --git a/protocols/Weather/proto_weather/res/FOG.ico b/plugins/Weather/proto_weather/res/FOG.ico
index fbd81b9a03..fbd81b9a03 100644
--- a/protocols/Weather/proto_weather/res/FOG.ico
+++ b/plugins/Weather/proto_weather/res/FOG.ico
diff --git a/protocols/Weather/proto_weather/res/LIGHT.ico b/plugins/Weather/proto_weather/res/LIGHT.ico
index d266094fbe..d266094fbe 100644
--- a/protocols/Weather/proto_weather/res/LIGHT.ico
+++ b/plugins/Weather/proto_weather/res/LIGHT.ico
diff --git a/protocols/Weather/proto_weather/res/NA.ico b/plugins/Weather/proto_weather/res/NA.ico
index 3e4a3aa324..3e4a3aa324 100644
--- a/protocols/Weather/proto_weather/res/NA.ico
+++ b/plugins/Weather/proto_weather/res/NA.ico
diff --git a/protocols/Weather/proto_weather/res/PCLOUDY.ico b/plugins/Weather/proto_weather/res/PCLOUDY.ico
index be3d0c88bd..be3d0c88bd 100644
--- a/protocols/Weather/proto_weather/res/PCLOUDY.ico
+++ b/plugins/Weather/proto_weather/res/PCLOUDY.ico
diff --git a/protocols/Weather/proto_weather/res/RAIN.ico b/plugins/Weather/proto_weather/res/RAIN.ico
index 4b65fb6714..4b65fb6714 100644
--- a/protocols/Weather/proto_weather/res/RAIN.ico
+++ b/plugins/Weather/proto_weather/res/RAIN.ico
diff --git a/protocols/Weather/proto_weather/res/RSHOWER.ico b/plugins/Weather/proto_weather/res/RSHOWER.ico
index 442552e155..442552e155 100644
--- a/protocols/Weather/proto_weather/res/RSHOWER.ico
+++ b/plugins/Weather/proto_weather/res/RSHOWER.ico
diff --git a/protocols/Weather/proto_weather/res/SNOW.ico b/plugins/Weather/proto_weather/res/SNOW.ico
index 1a482c3bc8..1a482c3bc8 100644
--- a/protocols/Weather/proto_weather/res/SNOW.ico
+++ b/plugins/Weather/proto_weather/res/SNOW.ico
diff --git a/protocols/Weather/proto_weather/res/SSHOWER.ico b/plugins/Weather/proto_weather/res/SSHOWER.ico
index 0bd2264413..0bd2264413 100644
--- a/protocols/Weather/proto_weather/res/SSHOWER.ico
+++ b/plugins/Weather/proto_weather/res/SSHOWER.ico
diff --git a/protocols/Weather/proto_weather/res/SUN.ico b/plugins/Weather/proto_weather/res/SUN.ico
index b37fc6ad2a..b37fc6ad2a 100644
--- a/protocols/Weather/proto_weather/res/SUN.ico
+++ b/plugins/Weather/proto_weather/res/SUN.ico
diff --git a/protocols/Weather/proto_weather/res/resource.rc b/plugins/Weather/proto_weather/res/resource.rc
index b059c0696d..b059c0696d 100644
--- a/protocols/Weather/proto_weather/res/resource.rc
+++ b/plugins/Weather/proto_weather/res/resource.rc
diff --git a/protocols/Weather/res/brief.ico b/plugins/Weather/res/brief.ico
index 717ef66669..717ef66669 100644
--- a/protocols/Weather/res/brief.ico
+++ b/plugins/Weather/res/brief.ico
diff --git a/protocols/Weather/res/disabled.ico b/plugins/Weather/res/disabled.ico
index ed6e27b691..ed6e27b691 100644
--- a/protocols/Weather/res/disabled.ico
+++ b/plugins/Weather/res/disabled.ico
diff --git a/protocols/Weather/res/edit.ico b/plugins/Weather/res/edit.ico
index f59dc79b9c..f59dc79b9c 100644
--- a/protocols/Weather/res/edit.ico
+++ b/plugins/Weather/res/edit.ico
diff --git a/protocols/Weather/res/icon.ico b/plugins/Weather/res/icon.ico
index be3d0c88bd..be3d0c88bd 100644
--- a/protocols/Weather/res/icon.ico
+++ b/plugins/Weather/res/icon.ico
diff --git a/protocols/Weather/res/info.ico b/plugins/Weather/res/info.ico
index 97d34dc4a5..97d34dc4a5 100644
--- a/protocols/Weather/res/info.ico
+++ b/plugins/Weather/res/info.ico
diff --git a/protocols/Weather/res/infologo.ico b/plugins/Weather/res/infologo.ico
index cf22ece1b1..cf22ece1b1 100644
--- a/protocols/Weather/res/infologo.ico
+++ b/plugins/Weather/res/infologo.ico
diff --git a/protocols/Weather/res/log.ico b/plugins/Weather/res/log.ico
index 86139d5e23..86139d5e23 100644
--- a/protocols/Weather/res/log.ico
+++ b/plugins/Weather/res/log.ico
diff --git a/protocols/Weather/res/map.ico b/plugins/Weather/res/map.ico
index 8c4c70742d..8c4c70742d 100644
--- a/protocols/Weather/res/map.ico
+++ b/plugins/Weather/res/map.ico
diff --git a/protocols/Weather/res/more.ico b/plugins/Weather/res/more.ico
index 47e13df383..47e13df383 100644
--- a/protocols/Weather/res/more.ico
+++ b/plugins/Weather/res/more.ico
diff --git a/protocols/Weather/res/popup.ico b/plugins/Weather/res/popup.ico
index 7e0301b42f..7e0301b42f 100644
--- a/protocols/Weather/res/popup.ico
+++ b/plugins/Weather/res/popup.ico
diff --git a/protocols/Weather/res/popup_no.ico b/plugins/Weather/res/popup_no.ico
index 08de082ec2..08de082ec2 100644
--- a/protocols/Weather/res/popup_no.ico
+++ b/plugins/Weather/res/popup_no.ico
diff --git a/protocols/Weather/res/reload.ico b/plugins/Weather/res/reload.ico
index 3c81203c03..3c81203c03 100644
--- a/protocols/Weather/res/reload.ico
+++ b/plugins/Weather/res/reload.ico
diff --git a/protocols/Weather/res/resource.rc b/plugins/Weather/res/resource.rc
index f8dd82df30..f8dd82df30 100644
--- a/protocols/Weather/res/resource.rc
+++ b/plugins/Weather/res/resource.rc
diff --git a/protocols/Weather/res/update.ico b/plugins/Weather/res/update.ico
index ccc4d4611d..ccc4d4611d 100644
--- a/protocols/Weather/res/update.ico
+++ b/plugins/Weather/res/update.ico
diff --git a/protocols/Weather/res/update2.ico b/plugins/Weather/res/update2.ico
index f71be51ee2..f71be51ee2 100644
--- a/protocols/Weather/res/update2.ico
+++ b/plugins/Weather/res/update2.ico
diff --git a/protocols/Weather/src/resource.h b/plugins/Weather/src/resource.h
index e88e4c19de..e88e4c19de 100644
--- a/protocols/Weather/src/resource.h
+++ b/plugins/Weather/src/resource.h
diff --git a/protocols/Weather/src/stdafx.cpp b/plugins/Weather/src/stdafx.cpp
index 2d786344e5..2d786344e5 100644
--- a/protocols/Weather/src/stdafx.cpp
+++ b/plugins/Weather/src/stdafx.cpp
diff --git a/protocols/Weather/src/version.h b/plugins/Weather/src/version.h
index 58a8f34a3c..58a8f34a3c 100644
--- a/protocols/Weather/src/version.h
+++ b/plugins/Weather/src/version.h
diff --git a/protocols/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp
index 9eb22252b5..9eb22252b5 100644
--- a/protocols/Weather/src/weather.cpp
+++ b/plugins/Weather/src/weather.cpp
diff --git a/protocols/Weather/src/weather.h b/plugins/Weather/src/weather.h
index 072860c914..072860c914 100644
--- a/protocols/Weather/src/weather.h
+++ b/plugins/Weather/src/weather.h
diff --git a/protocols/Weather/src/weather_addstn.cpp b/plugins/Weather/src/weather_addstn.cpp
index 9a3f1fd19f..9a3f1fd19f 100644
--- a/protocols/Weather/src/weather_addstn.cpp
+++ b/plugins/Weather/src/weather_addstn.cpp
diff --git a/protocols/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp
index 4c049f5d26..4c049f5d26 100644
--- a/protocols/Weather/src/weather_contacts.cpp
+++ b/plugins/Weather/src/weather_contacts.cpp
diff --git a/protocols/Weather/src/weather_conv.cpp b/plugins/Weather/src/weather_conv.cpp
index 780253b8ac..780253b8ac 100644
--- a/protocols/Weather/src/weather_conv.cpp
+++ b/plugins/Weather/src/weather_conv.cpp
diff --git a/protocols/Weather/src/weather_data.cpp b/plugins/Weather/src/weather_data.cpp
index 5def028c3d..5def028c3d 100644
--- a/protocols/Weather/src/weather_data.cpp
+++ b/plugins/Weather/src/weather_data.cpp
diff --git a/protocols/Weather/src/weather_http.cpp b/plugins/Weather/src/weather_http.cpp
index d9038db9c8..d9038db9c8 100644
--- a/protocols/Weather/src/weather_http.cpp
+++ b/plugins/Weather/src/weather_http.cpp
diff --git a/protocols/Weather/src/weather_icons.cpp b/plugins/Weather/src/weather_icons.cpp
index 321d758ca2..321d758ca2 100644
--- a/protocols/Weather/src/weather_icons.cpp
+++ b/plugins/Weather/src/weather_icons.cpp
diff --git a/protocols/Weather/src/weather_info.cpp b/plugins/Weather/src/weather_info.cpp
index f02fc79a28..f02fc79a28 100644
--- a/protocols/Weather/src/weather_info.cpp
+++ b/plugins/Weather/src/weather_info.cpp
diff --git a/protocols/Weather/src/weather_ini.cpp b/plugins/Weather/src/weather_ini.cpp
index 69f9ba40bb..69f9ba40bb 100644
--- a/protocols/Weather/src/weather_ini.cpp
+++ b/plugins/Weather/src/weather_ini.cpp
diff --git a/protocols/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp
index 8a7798b3b1..8a7798b3b1 100644
--- a/protocols/Weather/src/weather_mwin.cpp
+++ b/plugins/Weather/src/weather_mwin.cpp
diff --git a/protocols/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp
index f242adb0f1..f242adb0f1 100644
--- a/protocols/Weather/src/weather_opt.cpp
+++ b/plugins/Weather/src/weather_opt.cpp
diff --git a/protocols/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp
index 2a3e3580e5..2a3e3580e5 100644
--- a/protocols/Weather/src/weather_popup.cpp
+++ b/plugins/Weather/src/weather_popup.cpp
diff --git a/protocols/Weather/src/weather_svcs.cpp b/plugins/Weather/src/weather_svcs.cpp
index 3872760fc6..3872760fc6 100644
--- a/protocols/Weather/src/weather_svcs.cpp
+++ b/plugins/Weather/src/weather_svcs.cpp
diff --git a/protocols/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp
index d07af7865b..d07af7865b 100644
--- a/protocols/Weather/src/weather_update.cpp
+++ b/plugins/Weather/src/weather_update.cpp
diff --git a/protocols/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp
index 1d716a58ef..1d716a58ef 100644
--- a/protocols/Weather/src/weather_userinfo.cpp
+++ b/plugins/Weather/src/weather_userinfo.cpp
diff --git a/protocols/Weather/weather_10.vcxproj b/plugins/Weather/weather_10.vcxproj
index d09c5d1cb1..d09c5d1cb1 100644
--- a/protocols/Weather/weather_10.vcxproj
+++ b/plugins/Weather/weather_10.vcxproj
diff --git a/protocols/Weather/weather_10.vcxproj.filters b/plugins/Weather/weather_10.vcxproj.filters
index 385b06f839..385b06f839 100644
--- a/protocols/Weather/weather_10.vcxproj.filters
+++ b/plugins/Weather/weather_10.vcxproj.filters
diff --git a/protocols/YAMN/YAMN_10.vcxproj b/plugins/YAMN/YAMN_10.vcxproj
index a9479b4d2d..a9479b4d2d 100644
--- a/protocols/YAMN/YAMN_10.vcxproj
+++ b/plugins/YAMN/YAMN_10.vcxproj
diff --git a/protocols/YAMN/YAMN_10.vcxproj.filters b/plugins/YAMN/YAMN_10.vcxproj.filters
index 5a21b2d9db..5a21b2d9db 100644
--- a/protocols/YAMN/YAMN_10.vcxproj.filters
+++ b/plugins/YAMN/YAMN_10.vcxproj.filters
diff --git a/protocols/YAMN/docs/ChangeLog.txt b/plugins/YAMN/docs/ChangeLog.txt
index 6a85810ab2..6a85810ab2 100644
--- a/protocols/YAMN/docs/ChangeLog.txt
+++ b/plugins/YAMN/docs/ChangeLog.txt
diff --git a/protocols/YAMN/docs/InstallScript.xml b/plugins/YAMN/docs/InstallScript.xml
index 33d8ac9dfd..33d8ac9dfd 100644
--- a/protocols/YAMN/docs/InstallScript.xml
+++ b/plugins/YAMN/docs/InstallScript.xml
diff --git a/protocols/YAMN/docs/YAMN-License.txt b/plugins/YAMN/docs/YAMN-License.txt
index 7f1161073d..7f1161073d 100644
--- a/protocols/YAMN/docs/YAMN-License.txt
+++ b/plugins/YAMN/docs/YAMN-License.txt
diff --git a/protocols/YAMN/docs/YAMN-Readme.developers.txt b/plugins/YAMN/docs/YAMN-Readme.developers.txt
index fdb338707c..fdb338707c 100644
--- a/protocols/YAMN/docs/YAMN-Readme.developers.txt
+++ b/plugins/YAMN/docs/YAMN-Readme.developers.txt
diff --git a/protocols/YAMN/docs/YAMN-Readme.txt b/plugins/YAMN/docs/YAMN-Readme.txt
index 901ad22f73..901ad22f73 100644
--- a/protocols/YAMN/docs/YAMN-Readme.txt
+++ b/plugins/YAMN/docs/YAMN-Readme.txt
diff --git a/protocols/YAMN/proto_yamn/proto_YAMN_10.vcxproj b/plugins/YAMN/proto_yamn/proto_YAMN_10.vcxproj
index 2338196c5f..2338196c5f 100644
--- a/protocols/YAMN/proto_yamn/proto_YAMN_10.vcxproj
+++ b/plugins/YAMN/proto_yamn/proto_YAMN_10.vcxproj
diff --git a/protocols/YAMN/proto_yamn/proto_YAMN_10.vcxproj.filters b/plugins/YAMN/proto_yamn/proto_YAMN_10.vcxproj.filters
index 3fa00bebfb..3fa00bebfb 100644
--- a/protocols/YAMN/proto_yamn/proto_YAMN_10.vcxproj.filters
+++ b/plugins/YAMN/proto_yamn/proto_YAMN_10.vcxproj.filters
diff --git a/protocols/YAMN/proto_yamn/res/icoaway.ico b/plugins/YAMN/proto_yamn/res/icoaway.ico
index a99cbe0a60..a99cbe0a60 100644
--- a/protocols/YAMN/proto_yamn/res/icoaway.ico
+++ b/plugins/YAMN/proto_yamn/res/icoaway.ico
diff --git a/protocols/YAMN/proto_yamn/res/icooccupied.ico b/plugins/YAMN/proto_yamn/res/icooccupied.ico
index 81dd9fe467..81dd9fe467 100644
--- a/protocols/YAMN/proto_yamn/res/icooccupied.ico
+++ b/plugins/YAMN/proto_yamn/res/icooccupied.ico
diff --git a/protocols/YAMN/proto_yamn/res/icooffline.ico b/plugins/YAMN/proto_yamn/res/icooffline.ico
index 78f925ede7..78f925ede7 100644
--- a/protocols/YAMN/proto_yamn/res/icooffline.ico
+++ b/plugins/YAMN/proto_yamn/res/icooffline.ico
diff --git a/protocols/YAMN/proto_yamn/res/icoonline.ico b/plugins/YAMN/proto_yamn/res/icoonline.ico
index b2605bb9d4..b2605bb9d4 100644
--- a/protocols/YAMN/proto_yamn/res/icoonline.ico
+++ b/plugins/YAMN/proto_yamn/res/icoonline.ico
diff --git a/protocols/YAMN/proto_yamn/res/proto_YAMN.rc b/plugins/YAMN/proto_yamn/res/proto_YAMN.rc
index 087ee444c9..087ee444c9 100644
--- a/protocols/YAMN/proto_yamn/res/proto_YAMN.rc
+++ b/plugins/YAMN/proto_yamn/res/proto_YAMN.rc
diff --git a/protocols/YAMN/proto_yamn/src/resource.h b/plugins/YAMN/proto_yamn/src/resource.h
index 0532df3fa6..0532df3fa6 100644
--- a/protocols/YAMN/proto_yamn/src/resource.h
+++ b/plugins/YAMN/proto_yamn/src/resource.h
diff --git a/protocols/YAMN/res/YAMN.rc b/plugins/YAMN/res/YAMN.rc
index 70f5976d15..70f5976d15 100644
--- a/protocols/YAMN/res/YAMN.rc
+++ b/plugins/YAMN/res/YAMN.rc
diff --git a/protocols/YAMN/res/badconnect.ico b/plugins/YAMN/res/badconnect.ico
index 78f925ede7..78f925ede7 100644
--- a/protocols/YAMN/res/badconnect.ico
+++ b/plugins/YAMN/res/badconnect.ico
diff --git a/protocols/YAMN/res/checkmail.ico b/plugins/YAMN/res/checkmail.ico
index b2605bb9d4..b2605bb9d4 100644
--- a/protocols/YAMN/res/checkmail.ico
+++ b/plugins/YAMN/res/checkmail.ico
diff --git a/protocols/YAMN/res/launchapp.ico b/plugins/YAMN/res/launchapp.ico
index 81dd9fe467..81dd9fe467 100644
--- a/protocols/YAMN/res/launchapp.ico
+++ b/plugins/YAMN/res/launchapp.ico
diff --git a/protocols/YAMN/res/newmail.ico b/plugins/YAMN/res/newmail.ico
index a99cbe0a60..a99cbe0a60 100644
--- a/protocols/YAMN/res/newmail.ico
+++ b/plugins/YAMN/res/newmail.ico
diff --git a/protocols/YAMN/res/yamn_ver.rc b/plugins/YAMN/res/yamn_ver.rc
index 84d27568b6..84d27568b6 100644
--- a/protocols/YAMN/res/yamn_ver.rc
+++ b/plugins/YAMN/res/yamn_ver.rc
diff --git a/protocols/YAMN/src/YAMNopts.cpp b/plugins/YAMN/src/YAMNopts.cpp
index 99a8091366..99a8091366 100644
--- a/protocols/YAMN/src/YAMNopts.cpp
+++ b/plugins/YAMN/src/YAMNopts.cpp
diff --git a/protocols/YAMN/src/account.cpp b/plugins/YAMN/src/account.cpp
index f45dcfadcd..f45dcfadcd 100644
--- a/protocols/YAMN/src/account.cpp
+++ b/plugins/YAMN/src/account.cpp
diff --git a/protocols/YAMN/src/browser/badconnect.cpp b/plugins/YAMN/src/browser/badconnect.cpp
index 6f11151ee3..6f11151ee3 100644
--- a/protocols/YAMN/src/browser/badconnect.cpp
+++ b/plugins/YAMN/src/browser/badconnect.cpp
diff --git a/protocols/YAMN/src/browser/m_browser.h b/plugins/YAMN/src/browser/m_browser.h
index 8b05e3d84a..8b05e3d84a 100644
--- a/protocols/YAMN/src/browser/m_browser.h
+++ b/plugins/YAMN/src/browser/m_browser.h
diff --git a/protocols/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp
index 4f1f5593d6..4f1f5593d6 100644
--- a/protocols/YAMN/src/browser/mailbrowser.cpp
+++ b/plugins/YAMN/src/browser/mailbrowser.cpp
diff --git a/protocols/YAMN/src/debug.cpp b/plugins/YAMN/src/debug.cpp
index 9b9793a965..9b9793a965 100644
--- a/protocols/YAMN/src/debug.cpp
+++ b/plugins/YAMN/src/debug.cpp
diff --git a/protocols/YAMN/src/debug.h b/plugins/YAMN/src/debug.h
index 3bde9ddc81..3bde9ddc81 100644
--- a/protocols/YAMN/src/debug.h
+++ b/plugins/YAMN/src/debug.h
diff --git a/protocols/YAMN/src/filterplugin.cpp b/plugins/YAMN/src/filterplugin.cpp
index 8f61003293..8f61003293 100644
--- a/protocols/YAMN/src/filterplugin.cpp
+++ b/plugins/YAMN/src/filterplugin.cpp
diff --git a/protocols/YAMN/src/mails/decode.cpp b/plugins/YAMN/src/mails/decode.cpp
index 867ed7ff25..867ed7ff25 100644
--- a/protocols/YAMN/src/mails/decode.cpp
+++ b/plugins/YAMN/src/mails/decode.cpp
diff --git a/protocols/YAMN/src/mails/m_decode.h b/plugins/YAMN/src/mails/m_decode.h
index e6d2b52fae..e6d2b52fae 100644
--- a/protocols/YAMN/src/mails/m_decode.h
+++ b/plugins/YAMN/src/mails/m_decode.h
diff --git a/protocols/YAMN/src/mails/mails.cpp b/plugins/YAMN/src/mails/mails.cpp
index af0f3d2329..af0f3d2329 100644
--- a/protocols/YAMN/src/mails/mails.cpp
+++ b/plugins/YAMN/src/mails/mails.cpp
diff --git a/protocols/YAMN/src/mails/mime.cpp b/plugins/YAMN/src/mails/mime.cpp
index 2a66b80e2b..2a66b80e2b 100644
--- a/protocols/YAMN/src/mails/mime.cpp
+++ b/plugins/YAMN/src/mails/mime.cpp
diff --git a/protocols/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp
index 018d9f9565..018d9f9565 100644
--- a/protocols/YAMN/src/main.cpp
+++ b/plugins/YAMN/src/main.cpp
diff --git a/protocols/YAMN/src/main.h b/plugins/YAMN/src/main.h
index 08d9f91fed..08d9f91fed 100644
--- a/protocols/YAMN/src/main.h
+++ b/plugins/YAMN/src/main.h
diff --git a/protocols/YAMN/src/proto/md5.c b/plugins/YAMN/src/proto/md5.c
index 280fcdeaae..280fcdeaae 100644
--- a/protocols/YAMN/src/proto/md5.c
+++ b/plugins/YAMN/src/proto/md5.c
diff --git a/protocols/YAMN/src/proto/md5.h b/plugins/YAMN/src/proto/md5.h
index e264f686db..e264f686db 100644
--- a/protocols/YAMN/src/proto/md5.h
+++ b/plugins/YAMN/src/proto/md5.h
diff --git a/protocols/YAMN/src/proto/netclient.h b/plugins/YAMN/src/proto/netclient.h
index 2414dbdef1..2414dbdef1 100644
--- a/protocols/YAMN/src/proto/netclient.h
+++ b/plugins/YAMN/src/proto/netclient.h
diff --git a/protocols/YAMN/src/proto/netlib.cpp b/plugins/YAMN/src/proto/netlib.cpp
index b7c1864ffa..b7c1864ffa 100644
--- a/protocols/YAMN/src/proto/netlib.cpp
+++ b/plugins/YAMN/src/proto/netlib.cpp
diff --git a/protocols/YAMN/src/proto/netlib.h b/plugins/YAMN/src/proto/netlib.h
index 90ad3613a5..90ad3613a5 100644
--- a/protocols/YAMN/src/proto/netlib.h
+++ b/plugins/YAMN/src/proto/netlib.h
diff --git a/protocols/YAMN/src/proto/pop3/pop3.cpp b/plugins/YAMN/src/proto/pop3/pop3.cpp
index 05e85d7156..05e85d7156 100644
--- a/protocols/YAMN/src/proto/pop3/pop3.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3.cpp
diff --git a/protocols/YAMN/src/proto/pop3/pop3.h b/plugins/YAMN/src/proto/pop3/pop3.h
index 1f7f2ea737..1f7f2ea737 100644
--- a/protocols/YAMN/src/proto/pop3/pop3.h
+++ b/plugins/YAMN/src/proto/pop3/pop3.h
diff --git a/protocols/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
index 98888a1733..98888a1733 100644
--- a/protocols/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
diff --git a/protocols/YAMN/src/proto/pop3/pop3comm.h b/plugins/YAMN/src/proto/pop3/pop3comm.h
index c7eb01b5a1..c7eb01b5a1 100644
--- a/protocols/YAMN/src/proto/pop3/pop3comm.h
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.h
diff --git a/protocols/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
index c730b4b3fc..c730b4b3fc 100644
--- a/protocols/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
diff --git a/protocols/YAMN/src/proto/pop3/pop3opt.h b/plugins/YAMN/src/proto/pop3/pop3opt.h
index 6a678284fa..6a678284fa 100644
--- a/protocols/YAMN/src/proto/pop3/pop3opt.h
+++ b/plugins/YAMN/src/proto/pop3/pop3opt.h
diff --git a/protocols/YAMN/src/protoplugin.cpp b/plugins/YAMN/src/protoplugin.cpp
index 479b54ce67..479b54ce67 100644
--- a/protocols/YAMN/src/protoplugin.cpp
+++ b/plugins/YAMN/src/protoplugin.cpp
diff --git a/protocols/YAMN/src/resource.h b/plugins/YAMN/src/resource.h
index 62720a471e..62720a471e 100644
--- a/protocols/YAMN/src/resource.h
+++ b/plugins/YAMN/src/resource.h
diff --git a/protocols/YAMN/src/services.cpp b/plugins/YAMN/src/services.cpp
index 7254a02428..7254a02428 100644
--- a/protocols/YAMN/src/services.cpp
+++ b/plugins/YAMN/src/services.cpp
diff --git a/protocols/YAMN/src/synchro.cpp b/plugins/YAMN/src/synchro.cpp
index e510d8bac9..e510d8bac9 100644
--- a/protocols/YAMN/src/synchro.cpp
+++ b/plugins/YAMN/src/synchro.cpp
diff --git a/protocols/YAMN/src/version.h b/plugins/YAMN/src/version.h
index e658cfee0c..e658cfee0c 100644
--- a/protocols/YAMN/src/version.h
+++ b/plugins/YAMN/src/version.h
diff --git a/protocols/YAMN/src/yamn.cpp b/plugins/YAMN/src/yamn.cpp
index c93225e609..c93225e609 100644
--- a/protocols/YAMN/src/yamn.cpp
+++ b/plugins/YAMN/src/yamn.cpp
diff --git a/protocols/YAMN/src/yamn.h b/plugins/YAMN/src/yamn.h
index c8cd8d596d..c8cd8d596d 100644
--- a/protocols/YAMN/src/yamn.h
+++ b/plugins/YAMN/src/yamn.h
diff --git a/protocols/mRadio/activex.pp b/plugins/mRadio/activex.pp
index d36762ccf1..d36762ccf1 100644
--- a/protocols/mRadio/activex.pp
+++ b/plugins/mRadio/activex.pp
diff --git a/protocols/mRadio/commctrl.pp b/plugins/mRadio/commctrl.pp
index 56c995c210..56c995c210 100644
--- a/protocols/mRadio/commctrl.pp
+++ b/plugins/mRadio/commctrl.pp
diff --git a/protocols/mRadio/i_bass.inc b/plugins/mRadio/i_bass.inc
index 77f0d3650a..77f0d3650a 100644
--- a/protocols/mRadio/i_bass.inc
+++ b/plugins/mRadio/i_bass.inc
diff --git a/protocols/mRadio/i_cc.inc b/plugins/mRadio/i_cc.inc
index deb993ec0c..deb993ec0c 100644
--- a/protocols/mRadio/i_cc.inc
+++ b/plugins/mRadio/i_cc.inc
diff --git a/protocols/mRadio/i_frameapi.inc b/plugins/mRadio/i_frameapi.inc
index baca5d885f..baca5d885f 100644
--- a/protocols/mRadio/i_frameapi.inc
+++ b/plugins/mRadio/i_frameapi.inc
diff --git a/protocols/mRadio/i_hotkey.inc b/plugins/mRadio/i_hotkey.inc
index 04271fe824..04271fe824 100644
--- a/protocols/mRadio/i_hotkey.inc
+++ b/plugins/mRadio/i_hotkey.inc
diff --git a/protocols/mRadio/i_myservice.inc b/plugins/mRadio/i_myservice.inc
index e4e76ba10f..e4e76ba10f 100644
--- a/protocols/mRadio/i_myservice.inc
+++ b/plugins/mRadio/i_myservice.inc
diff --git a/protocols/mRadio/i_optdlg.inc b/plugins/mRadio/i_optdlg.inc
index e047fe20a1..e047fe20a1 100644
--- a/protocols/mRadio/i_optdlg.inc
+++ b/plugins/mRadio/i_optdlg.inc
diff --git a/protocols/mRadio/i_search.inc b/plugins/mRadio/i_search.inc
index d4330e84d1..d4330e84d1 100644
--- a/protocols/mRadio/i_search.inc
+++ b/plugins/mRadio/i_search.inc
diff --git a/protocols/mRadio/i_service.inc b/plugins/mRadio/i_service.inc
index 4f12544a81..4f12544a81 100644
--- a/protocols/mRadio/i_service.inc
+++ b/plugins/mRadio/i_service.inc
diff --git a/protocols/mRadio/i_tray.inc b/plugins/mRadio/i_tray.inc
index fa63acc720..fa63acc720 100644
--- a/protocols/mRadio/i_tray.inc
+++ b/plugins/mRadio/i_tray.inc
diff --git a/protocols/mRadio/i_variables.inc b/plugins/mRadio/i_variables.inc
index fead4afad8..fead4afad8 100644
--- a/protocols/mRadio/i_variables.inc
+++ b/plugins/mRadio/i_variables.inc
diff --git a/protocols/mRadio/i_vars.inc b/plugins/mRadio/i_vars.inc
index 5d75dc7fae..5d75dc7fae 100644
--- a/protocols/mRadio/i_vars.inc
+++ b/plugins/mRadio/i_vars.inc
diff --git a/protocols/mRadio/i_visual.inc b/plugins/mRadio/i_visual.inc
index 77012b55f2..77012b55f2 100644
--- a/protocols/mRadio/i_visual.inc
+++ b/plugins/mRadio/i_visual.inc
diff --git a/protocols/mRadio/ico/delete.ico b/plugins/mRadio/ico/delete.ico
index eea851da19..eea851da19 100644
--- a/protocols/mRadio/ico/delete.ico
+++ b/plugins/mRadio/ico/delete.ico
diff --git a/protocols/mRadio/ico/mradio.ico b/plugins/mRadio/ico/mradio.ico
index e95c6fe21a..e95c6fe21a 100644
--- a/protocols/mRadio/ico/mradio.ico
+++ b/plugins/mRadio/ico/mradio.ico
diff --git a/protocols/mRadio/ico/new.ico b/plugins/mRadio/ico/new.ico
index 73937210e0..73937210e0 100644
--- a/protocols/mRadio/ico/new.ico
+++ b/plugins/mRadio/ico/new.ico
diff --git a/protocols/mRadio/ico/off.ico b/plugins/mRadio/ico/off.ico
index 041e55bb9e..041e55bb9e 100644
--- a/protocols/mRadio/ico/off.ico
+++ b/plugins/mRadio/ico/off.ico
diff --git a/protocols/mRadio/ico/on.ico b/plugins/mRadio/ico/on.ico
index 35bf39e0b9..35bf39e0b9 100644
--- a/protocols/mRadio/ico/on.ico
+++ b/plugins/mRadio/ico/on.ico
diff --git a/protocols/mRadio/ico/recoff.ico b/plugins/mRadio/ico/recoff.ico
index 4bb6000ef0..4bb6000ef0 100644
--- a/protocols/mRadio/ico/recoff.ico
+++ b/plugins/mRadio/ico/recoff.ico
diff --git a/protocols/mRadio/ico/recon.ico b/plugins/mRadio/ico/recon.ico
index d8007b1c8c..d8007b1c8c 100644
--- a/protocols/mRadio/ico/recon.ico
+++ b/plugins/mRadio/ico/recon.ico
diff --git a/protocols/mRadio/make.bat b/plugins/mRadio/make.bat
index 2917577c4a..2917577c4a 100644
--- a/protocols/mRadio/make.bat
+++ b/plugins/mRadio/make.bat
diff --git a/protocols/mRadio/mr_rc.inc b/plugins/mRadio/mr_rc.inc
index 41998194b6..41998194b6 100644
--- a/protocols/mRadio/mr_rc.inc
+++ b/plugins/mRadio/mr_rc.inc
diff --git a/protocols/mRadio/mradio.dpr b/plugins/mRadio/mradio.dpr
index f5e09dab4f..f5e09dab4f 100644
--- a/protocols/mRadio/mradio.dpr
+++ b/plugins/mRadio/mradio.dpr
diff --git a/protocols/mRadio/mradio.rc b/plugins/mRadio/mradio.rc
index 2b81408090..2b81408090 100644
--- a/protocols/mRadio/mradio.rc
+++ b/plugins/mRadio/mradio.rc
diff --git a/protocols/mRadio/mradio.res b/plugins/mRadio/mradio.res
index 10d008f143..10d008f143 100644
--- a/protocols/mRadio/mradio.res
+++ b/plugins/mRadio/mradio.res
diff --git a/protocols/mRadio/proto_mradio/Proto_mRadio.vcxproj b/plugins/mRadio/proto_mradio/Proto_mRadio.vcxproj
index f78dc543ae..f78dc543ae 100644
--- a/protocols/mRadio/proto_mradio/Proto_mRadio.vcxproj
+++ b/plugins/mRadio/proto_mradio/Proto_mRadio.vcxproj
diff --git a/protocols/mRadio/proto_mradio/Proto_mRadio.vcxproj.filters b/plugins/mRadio/proto_mradio/Proto_mRadio.vcxproj.filters
index adb1b35427..adb1b35427 100644
--- a/protocols/mRadio/proto_mradio/Proto_mRadio.vcxproj.filters
+++ b/plugins/mRadio/proto_mradio/Proto_mRadio.vcxproj.filters
diff --git a/protocols/mRadio/proto_mradio/res/proto_away.ico b/plugins/mRadio/proto_mradio/res/proto_away.ico
index f9d97408f8..f9d97408f8 100644
--- a/protocols/mRadio/proto_mradio/res/proto_away.ico
+++ b/plugins/mRadio/proto_mradio/res/proto_away.ico
diff --git a/protocols/mRadio/proto_mradio/res/proto_invisible.ico b/plugins/mRadio/proto_mradio/res/proto_invisible.ico
index 6a868bc106..6a868bc106 100644
--- a/protocols/mRadio/proto_mradio/res/proto_invisible.ico
+++ b/plugins/mRadio/proto_mradio/res/proto_invisible.ico
diff --git a/protocols/mRadio/proto_mradio/res/proto_offline.ico b/plugins/mRadio/proto_mradio/res/proto_offline.ico
index 5a7e6172ac..5a7e6172ac 100644
--- a/protocols/mRadio/proto_mradio/res/proto_offline.ico
+++ b/plugins/mRadio/proto_mradio/res/proto_offline.ico
diff --git a/protocols/mRadio/proto_mradio/res/proto_online.ico b/plugins/mRadio/proto_mradio/res/proto_online.ico
index 53f13cddca..53f13cddca 100644
--- a/protocols/mRadio/proto_mradio/res/proto_online.ico
+++ b/plugins/mRadio/proto_mradio/res/proto_online.ico
diff --git a/protocols/mRadio/proto_mradio/res/resource.rc b/plugins/mRadio/proto_mradio/res/resource.rc
index 43ad52b944..43ad52b944 100644
--- a/protocols/mRadio/proto_mradio/res/resource.rc
+++ b/plugins/mRadio/proto_mradio/res/resource.rc
diff --git a/protocols/mRadio/proto_mradio/src/resource.h b/plugins/mRadio/proto_mradio/src/resource.h
index d425e7b8b1..d425e7b8b1 100644
--- a/protocols/mRadio/proto_mradio/src/resource.h
+++ b/plugins/mRadio/proto_mradio/src/resource.h
diff --git a/protocols/mRadio/readme.txt b/plugins/mRadio/readme.txt
index ea111e1056..ea111e1056 100644
--- a/protocols/mRadio/readme.txt
+++ b/plugins/mRadio/readme.txt
diff --git a/protocols/mRadio/variants.pas b/plugins/mRadio/variants.pas
index c7c8fdc824..c7c8fdc824 100644
--- a/protocols/mRadio/variants.pas
+++ b/plugins/mRadio/variants.pas