12 files changed, 22 insertions, 20 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 1c0ba92ce2..4f810959f6 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1,7 +1,7 @@
 ;============================================================
 ;  File: miranda32/64.exe
 ;  Module: Miranda Core
-;  Version: 0.95.7
+;  Version: 0.95.8
 ;============================================================
 ;file \src\core\stdauth\res\resource.rc
 [Authorization request]
diff --git a/langpacks/english/Plugins/AssocMgr.txt b/langpacks/english/Plugins/AssocMgr.txt
index 451675cc6d..f9461fa530 100644
--- a/langpacks/english/Plugins/AssocMgr.txt
+++ b/langpacks/english/Plugins/AssocMgr.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: AssocMgr.dll
 ;  Plugin: File association manager
-;  Version: 0.1.1.0
+;  Version: 0.2.1.0
 ;  Authors: H. Herkenrath
 ;============================================================
 [Handles file type associations and URLs like aim, gg, mirpu, tlen, wpmsg, xmpp, ymsgr.]
diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index f7eb151bb2..8e87f3483a 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -182,7 +182,7 @@
 [Invalid codepage]
 [Browse CSS file]
 [Export and Delete]
-[Import and Marge]
+[Import and Merge]
 [Minute]
 [Hour]
 [At Start]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 85963a2356..a604ce70af 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: IcqOscarJ protocol
-;  Version: 0.11.3.5
+;  Version: 0.11.3.6
 ;  Authors: Joe Kucera, Bio, Martin Öberg, Richard Hughes, Jon Keating, etc.
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -227,7 +227,6 @@
 [The password does not match your current password. Check Caps Lock and try again.]
 [Change ICQ Details]
 [The password does not match the password you originally entered. Check Caps Lock and try again.]
-[The ICQ server does not support passwords longer than 8 characters. Please use a shorter password.]
 ;file \protocols\IcqOscarJ\src\dlgproc.cpp
 [<unremovable once applied>]
 [<empty>]
diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 58ed55a2ef..6f48d46968 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: IRC.dll
 ;  Plugin: IRC protocol
-;  Version: 0.11.0.3
+;  Version: 0.95.7.1
 ;  Authors: Miranda team
 ;============================================================
 [Internet Relay Chat (IRC) protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 7dbf4492c2..bf8d7e0ba6 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.2.4
+;  Version: 0.12.2.5
 ;  Authors: Miranda NG Team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index b2f9f6f910..6644e77dd9 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.2.4.1
+;  Version: 0.2.4.2
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
diff --git a/langpacks/english/Plugins/StartPosition.txt b/langpacks/english/Plugins/StartPosition.txt
index eb9dd7c4f2..2d12f54899 100644
--- a/langpacks/english/Plugins/StartPosition.txt
+++ b/langpacks/english/Plugins/StartPosition.txt
@@ -2,21 +2,21 @@
 ;============================================================
 ;  File: StartPosition.dll
 ;  Plugin: Start position
-;  Version: 0.2.0.3
+;  Version: 0.3.0.4
 ;  Authors: Felipe Brahm - souFrag
 ;============================================================
 [Plugin supports starting position of Contact List relative to the taskbar and screen side.]
 ;file \plugins\StartPosition\res\resource.rc
 [Contact List Window Start Position]
-[Left]
-[Right]
 [Pixels from Top]
 [Pixels from Bottom]
 [Pixels from Side]
+[Left]
+[Right]
 [Width]
 [Always start...]
 [Minimized to System Tray]
 [Opened]
-;file \plugins\StartPosition\src\main.cpp
+;file \plugins\StartPosition\src\startposition.cpp
 [Contact list]
 [Start position]
diff --git a/langpacks/english/Plugins/StatusManager.txt b/langpacks/english/Plugins/StatusManager.txt
index 3fe23450cb..ff5b073643 100644
--- a/langpacks/english/Plugins/StatusManager.txt
+++ b/langpacks/english/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 0.11.2.1
+;  Version: 0.11.2.3
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
@@ -157,9 +157,9 @@
 [Status manager]
 ;file \plugins\StatusManager\src\AdvancedAutoAway\aaa_options.cpp
 [minutes of %s mode]
+[Auto away]
 [Rules]
 [Status messages]
-[Auto away]
 ;file \plugins\StatusManager\src\KeepStatus\keepstatus.cpp
 [%s connected from another location]
 [%s login error, cancel reconnecting]
@@ -174,9 +174,9 @@
 [Status was set ok]
 [Giving up]
 ;file \plugins\StatusManager\src\KeepStatus\ks_options.cpp
+[You broke the Internet!]
 [Basic]
 [Advanced]
-[You broke the Internet!]
 [Popups]
 ;file \plugins\StatusManager\src\StartupStatus\ss_options.cpp
 [<unknown>]
diff --git a/langpacks/english/Plugins/StopSpam.txt b/langpacks/english/Plugins/StopSpam.txt
index 9c1b5cad6d..dbdf49393d 100644
--- a/langpacks/english/Plugins/StopSpam.txt
+++ b/langpacks/english/Plugins/StopSpam.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StopSpam.dll
 ;  Plugin: StopSpam+
-;  Version: 0.0.1.4
+;  Version: 0.0.1.5
 ;  Authors: Roman Miklashevsky, A. Petkevich, Kosh&chka, persei
 ;============================================================
 [Anti-spam plugin for Miranda NG.]
@@ -24,16 +24,19 @@
 [Remove all temporary contacts after restart]
 [Log Spammers to system history]
 ;file \plugins\StopSpamPlus\src\events.cpp
+[StopSpam automatic message:\r\n]
 [Message sessions]
 [General]
 [Messages]
 [Accounts]
 ;file \plugins\StopSpamPlus\src\options.cpp
 [No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you.]
-[StopSpam automatic message:\r\n]
 ;file \plugins\StopSpamPlus\src\services.cpp
 [Not In List]
 [Complete]
+;file \plugins\StopSpamPlus\src\settings.h
+[StopSpam: send a message and reply to an anti-spam bot question.]
+[Congratulations! You just passed human/robot test. Now you can write me a message.]
 ;file \plugins\StopSpamPlus\src\stdafx.h
 [StopSpam]
 ;file \plugins\StopSpamPlus\src\stopspam.cpp
diff --git a/langpacks/english/Plugins/StopSpamMod.txt b/langpacks/english/Plugins/StopSpamMod.txt
index 138a3106d4..5256ef983c 100644
--- a/langpacks/english/Plugins/StopSpamMod.txt
+++ b/langpacks/english/Plugins/StopSpamMod.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StopSpamMod.dll
 ;  Plugin: StopSpam mod
-;  Version: 0.0.2.0
+;  Version: 0.0.2.1
 ;  Authors: Roman Miklashevsky, sss, Elzor
 ;============================================================
 [Anti-spam plugin for Miranda NG.]
@@ -45,8 +45,8 @@
 ;file \plugins\StopSpamMod\src\options.cpp
 [No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you.]
 [Spammers made me to install small anti-spam system you are now speaking with.\r\nPlease reply "nospam" without quotes and spaces if you want to contact me.]
-[StopSpam: send a message and reply to an anti-spam bot question.]
 [Congratulations! You just passed human/robot test. Now you can write me a message.]
+[StopSpam: send a message and reply to an anti-spam bot question.]
 [If math expression is turned on, you can use following expression in message text:\nXX+XX-X/X*X\neach X will be replaced by one random number and answer will be expression result.\nMessage must contain only one expression without spaces.]
 [Info]
 [Message sessions]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 7cea4335bf..0a52aa1fc6 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.6
+;  Version: 3.5.0.7
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]