11 files changed, 54 insertions, 55 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index aae4f4db6d..9bec441c75 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -13,7 +13,7 @@
 [Custom name:]
 [Group:]
 [Options]
-[Authorization Request]
+[Authorization request]
 [Delete Contact]
 [&Yes]
 [&No]
@@ -620,7 +620,6 @@
 [%s added you to their contact list]
 [%u added you to their contact list]
 [Alerts]
-[Authorization request]
 [Added event]
 ;file \src\core\stdauth\authdialogs.cpp
 [View User's Details]
diff --git a/langpacks/english/Plugins/AddContactPlus.txt b/langpacks/english/Plugins/AddContactPlus.txt
index 9eb1e919d4..e5f962fb21 100644
--- a/langpacks/english/Plugins/AddContactPlus.txt
+++ b/langpacks/english/Plugins/AddContactPlus.txt
@@ -17,7 +17,7 @@
 [Add temporarily]
 [Send "You were added"]
 [Send authorization request]
-[Authorization Request]
+[Authorization request]
 [&Add]
 [&Cancel]
 ;file \plugins\AddContactPlus\src\addcontact.cpp
diff --git a/langpacks/english/Plugins/CryptoPP.txt b/langpacks/english/Plugins/CryptoPP.txt
index 88190adb26..eb34adc031 100644
--- a/langpacks/english/Plugins/CryptoPP.txt
+++ b/langpacks/english/Plugins/CryptoPP.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CryptoPP.dll
 ;  Plugin: Crypto++
-;  Version: 1.0.4.6
+;  Version: 1.0.4.7
 ;  Authors: Baloo
 ;============================================================
 [Crypto++ library for SecureIM plugin.]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 2aad887f1f..02d783b748 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -209,7 +209,7 @@
 [Custom messages]
 [Quit:]
 [Slap:]
-[Authorization Request]
+[Authorization request]
 [HTTP Authorization\nAccept or reject incoming request]
 [Someone (maybe you) has requested the following file:]
 [Request was sent from JID:]
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index e080988f61..19d867f267 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -118,7 +118,7 @@
 [Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]
 [GPG binary does not exist.\nPlease choose another location]
 [Please choose GPG binary location]
-[please set keyring's home directory]
+[Please set keyring's home directory]
 [There is existing key for contact, would you like to replace it with new key?]
 [New public key was received, do you want to import it?]
 [Replace]
diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index 2b057881d8..29890f7ea2 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -176,7 +176,7 @@
 [Connection Established]
 [Contact Menu]
 [Disable Secure Connection]
-[Establishe Secure Connection]
+[Establish Secure Connection]
 [Message Window]
 [Popups]
 [Secure Connection Disabled]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 9b766cd0b5..b52cf5570c 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -1,13 +1,13 @@
 #muuid {32579908-724b-467f-adad-22b6359a749a}
 ;============================================================
 ;  File: VKontakte.dll
-;  Plugin: VKontakte
-;  Version: 0.1.0.2
+;  Plugin: VKontakte protocol
+;  Version: 0.1.0.3
 ;  Authors: Miranda NG Team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
 ;file \protocols\VKontakte\res\resource.rc
-[Your login or phone number:]
+[Login or phone number:]
 [Password:]
 [Open VK site]
 [Bots Challenge Test]
diff --git a/langpacks/english/Plugins/WinterSpeak.txt b/langpacks/english/Plugins/WinterSpeak.txt
index ad064083fd..2247ce7d71 100644
--- a/langpacks/english/Plugins/WinterSpeak.txt
+++ b/langpacks/english/Plugins/WinterSpeak.txt
@@ -1,24 +1,21 @@
 #muuid {81e189dc-c251-45f6-9edf-a0f3a05c4248}
 ;============================================================
-;  File: speak.dll
-;  Plugin: Speak
-;  Version: 0.9.8.0
+;  File: WinterSpeak.dll
+;  Plugin: WinterSpeak
+;  Version: 0.9.8.3
 ;  Authors: Ryan Winter, BlubbFish
 ;============================================================
-[Miranda interface to the Microsoft Speech API]
+[Miranda interface to the Microsoft Speech API.]
 ;file \plugins\WinterSpeak\res\Speak.rc
 [Engine Settings]
-[Rate]
-[Volume]
+[Engine]
 [Voice]
+[Volume]
+[Rate]
 [Pitch]
 [Test]
-[Engine]
-[Welcome Message]
 [Lexicon]
-[Message Events]
-[Read message if less characters than]
-[Ignore event if message dialog is open]
+[Welcome Message]
 [Status Changes]
 [Offline]
 [Online]
@@ -32,11 +29,14 @@
 [Incoming Message]
 [Incoming URL]
 [Incoming File]
-[Authorization Request]
+[Authorization request]
 [Added to Contact List]
-[Ignore event if message dialog is focused]
 [Status Messages]
 [Announce status changes on connect]
+[Message Events]
+[Read message if less characters than]
+[Ignore event if message dialog is open]
+[Ignore event if message dialog is focused]
 [Active Modes]
 [Active Users]
 [The following events are being ignored:]
diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index d06eb0c28e..db22113b81 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -11,10 +11,10 @@
 [Login name:]
 [XFire]
 [Nick:]
-[Current Protocolversion:]
+[Current protocol version:]
 [Note: You can only change these settings, if you are connected to Xfire.]
 [Create a new Xfire account on website]
-[Lost Password?]
+[Lost password?]
 [Account options]
 [Show my friends]
 [Game Status]
@@ -37,12 +37,12 @@
 [Blocked User List]
 [This list contains all your blocked Xfire users. You can remove one, if you wanna allow him to send you a friend request.]
 [You can simply block someone, if you right click on his friend request in clist and choose Block User...]
-[This file is used for the game search, game detection and gameid resolving. It contains all xfire supported games.]
+[This file is used for the game search, game detection and game ID resolving. It contains all xfire supported games.]
 [This file contains all original game icons. You can also activate the option for icon downloading, if you don't have it.]
 [Be sure you put these files in following folder:]
 [Status Message]
 [Enable]
-[With this feature, following status message will be set on your other protocol plugins, if you are ingame. So your other buddy's can also see what you play. It will also change the status to occupied, if this option is enabled.]
+[With this feature, following status message will be set on your other protocol plugins, if you are ingame. So your other buddies can also see what you play. It will also change the status to occupied, if this option is enabled.]
 [Following Variables are available: %myxfiregame%, %myxfirevoice%, %myxfireserverip%, %myxfirevoiceip%]
 [Status message:]
 [Change the status to occupied or dnd]
@@ -65,7 +65,7 @@
 [Name:]
 [IP:]
 [Port:]
-[Userdetails]
+[User details]
 [Copy]
 [Enter Password]
 [Join]
@@ -73,33 +73,34 @@
 [OK]
 [Cancel]
 [New xfire_games.ini]
-[There is a new XFire Gamelist online, do you want to update now?]
-[New supported Games:]
+[There is a new XFire gamelist online, do you want to update now?]
+[New supported games:]
 [Update]
-[Add Game]
+[Add game]
 [Search:]
-[Custom ...]
+[Custom...]
+[Add Game]
 [Game name:]
 [Game exe:]
-[Browse ...]
+[Browse...]
 [Launcher exe (optional):]
 [Game id:]
-[Send game id:]
-[Statusmessage for Xfire, if this game will be started:]
+[Send game ID:]
+[Status message for Xfire, if this game will be started:]
 [Parameter:]
 [Add a new game]
-[Searching games ...]
+[Searching games...]
 ;file \protocols\Xfire\src\addgamedialog.cpp
 [All Files]
-[Please wait, gameini will be currently parsed ...]
+[Please wait, game.ini will be currently parsed...]
 [XFire Options]
 [Please choose one game in the list!]
-[If you add a mod of a Xfire supported game, then you can specify what gameid will be sent to Xfire. So if you add a Half-Life mod, you can set the Half-Life game id and if you start the game, your Xfire buddies will see the Half-Life game icon next to your name and the game time will be tracked.]
+[If you add a mod of a Xfire supported game, then you can specify what game ID will be sent to Xfire. So if you add a Half-Life mod, you can set the Half-Life game ID and if you start the game, your Xfire buddies will see the Half-Life game icon next to your name and the game time will be tracked.]
 [Every game in Xfire needs an id. Use a number above the last used id to avoid problems with used ids. Every number above 10000 should be save. This id will not be sent to Xfire, when you start a game.]
 [Please enter a game name.]
-[Please enter a game id.]
-[Please enter a game id above 1.]
-[This game id is already in use.]
+[Please enter a game ID.]
+[Please enter a game ID above 1.]
+[This game ID is already in use.]
 [Please select a game exe. Note: If you don't select a launcher exe, the game exe will be used in the game start menu.]
 [Supported Games]
 [Custom game]
@@ -125,7 +126,7 @@
 [Login failed.]
 [The protocol version is too old. Changed current version from %d to %d. You can reconnect now.]
 [The protocol version is too old. Cannot detect a new version number.]
-[Someone loged in with your account.disconnect.]
+[Someone logged in with your account. Disconnect.]
 [Do you really want to add %s to your friend list?]
 [Add me to your friends list.]
 [XFire is not connected.]
@@ -145,13 +146,13 @@
 [XFire &Clan Site]
 [C&opy Server Address and Port]
 [Cop&y Voice Server Address and Port]
-[Join &Game ...]
-[Play this Game ...]
-[Remove F&riend ...]
-[Block U&ser ...]
+[Join &Game...]
+[Play this game...]
+[Remove F&riend...]
+[Block U&ser...]
 [&My XFire Online Profile]
 [&Activity Report]
-[&Rescan my Games ...]
+[&Rescan my games...]
 [Set &Nickname]
 [Protocols/XFire]
 [XFire game icon]
@@ -209,7 +210,7 @@
 [<Root Group>]
 [Are you sure you want to remove this game?]
 [Please select a game.]
-[Error unknown game id.]
+[Error: unknown game ID.]
 [Not supported]
 [Configuration saved!]
 [Game not found?!]
@@ -221,11 +222,11 @@
 ;file \protocols\Xfire\src\pwd_dlg.cpp
 [Please enter server password...]
 ;file \protocols\Xfire\src\searching4games.cpp
-[Write to database ...]
+[Write to database...]
 [Games found:%s%s]
 ;file \protocols\Xfire\src\userdetails.cpp
 [<not specified>]
 ;file \protocols\Xfire\src\Xfire_game.cpp
 [Start game]
 ;file \protocols\Xfire\src\Xfire_gamelist.cpp
-[Please wait ...]
+[Please wait...]
diff --git a/langpacks/english/Plugins/wbOSD.txt b/langpacks/english/Plugins/wbOSD.txt
index bf95f96245..7987e465d9 100644
--- a/langpacks/english/Plugins/wbOSD.txt
+++ b/langpacks/english/Plugins/wbOSD.txt
@@ -20,7 +20,6 @@
 [Background color]
 [Transparent]
 [Alpha:]
-[Static]
 [Timeout (ms):]
 [Show testing OSD]
 [Announce]
diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
index bd5cbfa80e..4f48c760b3 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
@@ -124,10 +124,10 @@ YAMN_PROTOREGISTRATION POP3ProtocolRegistration =
 {
 	"POP3 protocol (internal)",
 	__VERSION_STRING,
-	"� 2002-2004 majvan | 2005-2007 tweety, yb",
-	"Mail notifier and browser for Miranda NG. Included POP3 protocol.",
-	"francois.mean@skynet.be",
-	"http://miranda-ng.org/",
+	__COPYRIGHT,
+	__DESCRIPTION,
+	__AUTHOREMAIL,
+	__AUTHORWEB,
 };
 
 static TCHAR *FileName = NULL;