7 files changed, 94 insertions, 64 deletions
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index e86db0c09b..e43ccc3995 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -4548,8 +4548,8 @@
 [Toggle show online/offline]
 [Toggle groups]
 [Find contacts]
-[Show tabSRMM session list]
-[Show tabSRMM menu]
+[Show TabSRMM session list]
+[Show TabSRMM menu]
 [Sounds are off]
 [Reset view mode]
 [Configure view modes]
@@ -9032,8 +9032,8 @@
 [In progress. Please Wait...]
 [Execute]
 [Requesting command list. Please wait...]
-[Jabber Ad-Hoc commands at]
-[Sending Ad-Hoc command to]
+[Jabber Ad-Hoc commands at %s]
+[Sending Ad-Hoc command to %s]
 ;file \protocols\JabberG\src\jabber_agent.cpp
 [No message]
 [Please wait...]
@@ -9104,7 +9104,7 @@
 [Participants]
 [Moderators]
 [Owners]
-[User %s in now banned.]
+[User %s is now banned.]
 [User %s changed status to %s with message: %s]
 [User %s changed status to %s]
 [Room configuration was changed.]
@@ -9160,17 +9160,17 @@
 [Copy real &JID]
 [Copy in-room JID]
 [Real &JID: %s]
-[Send groupchat invitation.]
-[not on roster]
-[Member Info:]
-[from]
+[%s\nSend groupchat invitation.]
+[%s (not on roster)]
+[Member Info: %s]
+[Member Information\n%s from %s]
 [Real JID not available]
-[Reason to kick]
-[Reason to ban]
+[Reason to kick %s]
+[Reason to ban %s]
 [Invite %s to %s]
-[Set topic for]
-[Change nickname in]
-[Reason to destroy]
+[Set topic for %s]
+[Change nickname in %s]
+[Reason to destroy %s]
 ;file \protocols\JabberG\src\jabber_console.cpp
 [Can't send data while you are offline.]
 [Jabber Error]
@@ -9358,8 +9358,9 @@
 [Please wait for room list to download.]
 [Please specify groupchat directory first.]
 [Bookmarks...]
+[Change nickname in <%s>]
 [has set the subject to:]
-[Incoming groupchat invitation.]
+[%s\nIncoming groupchat invitation.]
 ;file \protocols\JabberG\src\jabber_icolib.cpp
 [transport]
 [Notes]
@@ -9403,7 +9404,7 @@
 [Discovery]
 [Privacy]
 ;file \protocols\JabberG\src\jabber_iqid.cpp
-[Authentication failed for]
+[Authentication failed for %s.]
 [Jabber Authentication]
 [Registration successful]
 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
@@ -9417,7 +9418,8 @@
 [Ban List]
 [Admin List]
 [Owner List]
-[Removing]
+[Reason to ban]
+[Removing %s?]
 ;file \protocols\JabberG\src\jabber_iq_handlers.cpp
 [Http authentication request received]
 ;file \protocols\JabberG\src\jabber_menu.cpp
@@ -9447,7 +9449,7 @@
 [Open bookmarks]
 [Privacy lists]
 [Service discovery]
-[Last active]
+[Last active (%s)]
 [No activity yet, use server's choice]
 [Highest priority (server's choice)]
 [Status Message]
@@ -9657,7 +9659,7 @@
 [Jabber Protocol Option]
 [Confirm password]
 [Passwords do not match.]
-[This operation will kill your account, roster and all another information stored at the server. Are you ready to do that?]
+[This operation will kill your account, roster and all other information stored at the server. Are you ready to do that?]
 [Account removal warning]
 [You can change your password only when you are online]
 [You must be online]
@@ -9724,7 +9726,7 @@
 [Odnoklassniki]
 [Some changes will take effect the next time you connect to the Jabber network.]
 ;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for]
+[Set New Password for %s@%S]
 [New password does not match.]
 [Current password is incorrect.]
 ;file \protocols\JabberG\src\jabber_privacy.cpp
@@ -9834,11 +9836,12 @@
 [sent error presence]
 [sent unknown presence type]
 ;file \protocols\JabberG\src\jabber_thread.cpp
-[Enter password for]
+[Enter password for %s]
 [Error: Not enough memory]
 [Error: Cannot connect to the server]
 [Error: Connection lost]
 [Requesting registration instruction...]
+[Authentication failed for %s@%S.]
 [Message redirected from: %s\r\n%s]
 [Sending registration information...]
 ;file \protocols\JabberG\src\jabber_userinfo.cpp
@@ -9861,6 +9864,7 @@
 [Tune]
 [both]
 [to]
+[from]
 [none]
 [Last logoff time]
 [Uptime]
@@ -9898,6 +9902,7 @@
 [Advanced Status]
 [Set mood...]
 [Set activity...]
+[OK (%d)]
 ;file \protocols\JabberG\src\jabber_vcard.cpp
 [Male]
 [Female]
@@ -11382,7 +11387,7 @@
 ;file \plugins\MsgPopup\src\main.cpp
 [VirtualProtect failed. Code %d\nTry to call the author]
 [MsgBox]
-[Hmm. Something goes wrong. I can't write into the memory.\nAnd as u can c, there are no any exception raised...\nTry to call the author]
+[Hmm. Something goes wrong. I can't write into the memory.\nAnd as you can see, there are no any exception raised...\nTry to call the author]
 [MessagePopup]
 [Popups]
 ;file \plugins\MsgPopup\src\options.cpp
@@ -13783,6 +13788,16 @@
 [Last Year]
 [User-Defined]
 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp
+;file \plugins\Quotes\src\QuotesProviderBase.cpp
+[upper right corner]
+[horizontal]
+[vertical]
+[Global Status]
+[Protocol Status]
+[Maximum width]
+[Width]
+[Plugins]
+[Non-IM Contacts]
 ;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp
 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp
 [Error occurred during html parsing.]
@@ -15705,7 +15720,7 @@
 [Disabled]
 ;file \plugins\SpellChecker\src\utils.cpp
 [There are %d spelling errors. Are you sure you want to send this message?]
-[Your message window does not support SpellChecker Plugin.\nIf you use SRMM, tabSRMM or Scriver, please update them to the latest version,\notherwise ask the author of your message window plugin to add support for Spell Checker.]
+[Your message window does not support SpellChecker Plugin.\nIf you use SRMM, TabSRMM or Scriver, please update them to the latest version,\notherwise ask the author of your message window plugin to add support for Spell Checker.]
 [Other...]
 [Always replace with]
 [Ignore all]
@@ -16363,7 +16378,7 @@
 [Bottom tabs vertical adjustment:]
 [NOTE: some settings will not affect open containers.]
 [Tab layout tweaks]
-[About tabSRMM]
+[About TabSRMM]
 [Copyright 2004-2011 by the Miranda IM project, 2012-2013 by the Miranda NG project. More detailed copyright information can be found in the included README file.]
 [Support and latest version information]
 [Selected skin]
@@ -16543,7 +16558,7 @@
 [Show Popups for all inactive sessions]
 [Save current Window Position as Default]
 [Help]
-[About tabSRMM...]
+[About TabSRMM...]
 ;file \plugins\TabSRMM\src\buttonsbar.cpp
 [Protocol Button]
 [Info button]
@@ -16638,9 +16653,9 @@
 [Message send error]
 [No status message]
 [Other]
-[TABSRMM: Typing]
-[tabSRMM session list]
-[tabSRMM Menu]
+[TabSRMM: Typing]
+[TabSRMM session list]
+[TabSRMM Menu]
 [&Messaging settings...]
 [&Send later job list...]
 [Message from %s]
@@ -16684,7 +16699,7 @@
 [\\par\\par\\tab \\ul\\b Extended status information:\\ul0\\b0 \\par ]
 [\\par\\par\\tab \\ul\\b Listening to:\\ul0\\b0 \\par %s]
 [\\par\\par\\ul\\b Client:\\ul0\\b0  %s]
-[tabSRMM Information]
+[TabSRMM Information]
 [Set panel visibility for this %s]
 [chat room]
 [contact]
@@ -16891,8 +16906,8 @@
 [Advanced layout with avatars]
 [Advanced with avatars, vertical orientation]
 ;file \plugins\TabSRMM\src\srmm.cpp
-[This version of tabSRMM requires Windows 2000 or later.]
-[tabSRMM Message (%s)]
+[This version of TabSRMM requires Windows 2000 or later.]
+[TabSRMM Message (%s)]
 ;file \plugins\TabSRMM\src\taskbar.cpp
 [Previews not availble when using History++ plugin for message log display.]
 [%d Unread]
@@ -16905,7 +16920,7 @@
 [This will reset the template set to the default built-in templates. Are you sure you want to do this?]
 [Template set was successfully reset, please close and reopen all message windows. This template editor window will now close.]
 ;file \plugins\TabSRMM\src\themeio.cpp
-[tabSRMM themes]
+[TabSRMM themes]
 ;file \plugins\TabSRMM\src\themes.cpp
 [No effect]
 [Milky Glass]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index bd1753efdb..bd3b609700 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -352,8 +352,8 @@
 [Toggle show online/offline]
 [Toggle groups]
 [Find contacts]
-[Show tabSRMM session list]
-[Show tabSRMM menu]
+[Show TabSRMM session list]
+[Show TabSRMM menu]
 [Sounds are off]
 [Reset view mode]
 [Configure view modes]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 2794ad7578..b51f675225 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -242,8 +242,8 @@
 [In progress. Please Wait...]
 [Execute]
 [Requesting command list. Please wait...]
-[Jabber Ad-Hoc commands at]
-[Sending Ad-Hoc command to]
+[Jabber Ad-Hoc commands at %s]
+[Sending Ad-Hoc command to %s]
 ;file \protocols\JabberG\src\jabber_agent.cpp
 [No message]
 [Please wait...]
@@ -314,7 +314,7 @@
 [Participants]
 [Moderators]
 [Owners]
-[User %s in now banned.]
+[User %s is now banned.]
 [User %s changed status to %s with message: %s]
 [User %s changed status to %s]
 [Room configuration was changed.]
@@ -370,17 +370,17 @@
 [Copy real &JID]
 [Copy in-room JID]
 [Real &JID: %s]
-[Send groupchat invitation.]
-[not on roster]
-[Member Info:]
-[from]
+[%s\nSend groupchat invitation.]
+[%s (not on roster)]
+[Member Info: %s]
+[Member Information\n%s from %s]
 [Real JID not available]
-[Reason to kick]
-[Reason to ban]
+[Reason to kick %s]
+[Reason to ban %s]
 [Invite %s to %s]
-[Set topic for]
-[Change nickname in]
-[Reason to destroy]
+[Set topic for %s]
+[Change nickname in %s]
+[Reason to destroy %s]
 ;file \protocols\JabberG\src\jabber_console.cpp
 [Can't send data while you are offline.]
 [Jabber Error]
@@ -568,8 +568,9 @@
 [Please wait for room list to download.]
 [Please specify groupchat directory first.]
 [Bookmarks...]
+[Change nickname in <%s>]
 [has set the subject to:]
-[Incoming groupchat invitation.]
+[%s\nIncoming groupchat invitation.]
 ;file \protocols\JabberG\src\jabber_icolib.cpp
 [transport]
 [Notes]
@@ -613,7 +614,7 @@
 [Discovery]
 [Privacy]
 ;file \protocols\JabberG\src\jabber_iqid.cpp
-[Authentication failed for]
+[Authentication failed for %s.]
 [Jabber Authentication]
 [Registration successful]
 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
@@ -627,7 +628,8 @@
 [Ban List]
 [Admin List]
 [Owner List]
-[Removing]
+[Reason to ban]
+[Removing %s?]
 ;file \protocols\JabberG\src\jabber_iq_handlers.cpp
 [Http authentication request received]
 ;file \protocols\JabberG\src\jabber_menu.cpp
@@ -657,7 +659,7 @@
 [Open bookmarks]
 [Privacy lists]
 [Service discovery]
-[Last active]
+[Last active (%s)]
 [No activity yet, use server's choice]
 [Highest priority (server's choice)]
 [Status Message]
@@ -867,7 +869,7 @@
 [Jabber Protocol Option]
 [Confirm password]
 [Passwords do not match.]
-[This operation will kill your account, roster and all another information stored at the server. Are you ready to do that?]
+[This operation will kill your account, roster and all other information stored at the server. Are you ready to do that?]
 [Account removal warning]
 [You can change your password only when you are online]
 [You must be online]
@@ -934,7 +936,7 @@
 [Odnoklassniki]
 [Some changes will take effect the next time you connect to the Jabber network.]
 ;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for]
+[Set New Password for %s@%S]
 [New password does not match.]
 [Current password is incorrect.]
 ;file \protocols\JabberG\src\jabber_privacy.cpp
@@ -1044,11 +1046,12 @@
 [sent error presence]
 [sent unknown presence type]
 ;file \protocols\JabberG\src\jabber_thread.cpp
-[Enter password for]
+[Enter password for %s]
 [Error: Not enough memory]
 [Error: Cannot connect to the server]
 [Error: Connection lost]
 [Requesting registration instruction...]
+[Authentication failed for %s@%S.]
 [Message redirected from: %s\r\n%s]
 [Sending registration information...]
 ;file \protocols\JabberG\src\jabber_userinfo.cpp
@@ -1071,6 +1074,7 @@
 [Tune]
 [both]
 [to]
+[from]
 [none]
 [Last logoff time]
 [Uptime]
@@ -1108,6 +1112,7 @@
 [Advanced Status]
 [Set mood...]
 [Set activity...]
+[OK (%d)]
 ;file \protocols\JabberG\src\jabber_vcard.cpp
 [Male]
 [Female]
diff --git a/langpacks/english/Plugins/MsgPopup.txt b/langpacks/english/Plugins/MsgPopup.txt
index aa43dceda9..c96bfaf32b 100644
--- a/langpacks/english/Plugins/MsgPopup.txt
+++ b/langpacks/english/Plugins/MsgPopup.txt
@@ -20,7 +20,7 @@
 ;file \plugins\MsgPopup\src\main.cpp
 [VirtualProtect failed. Code %d\nTry to call the author]
 [MsgBox]
-[Hmm. Something goes wrong. I can't write into the memory.\nAnd as u can c, there are no any exception raised...\nTry to call the author]
+[Hmm. Something goes wrong. I can't write into the memory.\nAnd as you can see, there are no any exception raised...\nTry to call the author]
 [MessagePopup]
 [Popups]
 ;file \plugins\MsgPopup\src\options.cpp
diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index 24a01bfb44..d26148eb32 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -120,6 +120,16 @@
 [Last Year]
 [User-Defined]
 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp
+;file \plugins\Quotes\src\QuotesProviderBase.cpp
+[upper right corner]
+[horizontal]
+[vertical]
+[Global Status]
+[Protocol Status]
+[Maximum width]
+[Width]
+[Plugins]
+[Non-IM Contacts]
 ;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp
 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp
 [Error occurred during html parsing.]
diff --git a/langpacks/english/Plugins/SpellChecker.txt b/langpacks/english/Plugins/SpellChecker.txt
index 428d489e34..f58600f8a2 100644
--- a/langpacks/english/Plugins/SpellChecker.txt
+++ b/langpacks/english/Plugins/SpellChecker.txt
@@ -67,7 +67,7 @@
 [Disabled]
 ;file \plugins\SpellChecker\src\utils.cpp
 [There are %d spelling errors. Are you sure you want to send this message?]
-[Your message window does not support SpellChecker Plugin.\nIf you use SRMM, tabSRMM or Scriver, please update them to the latest version,\notherwise ask the author of your message window plugin to add support for Spell Checker.]
+[Your message window does not support SpellChecker Plugin.\nIf you use SRMM, TabSRMM or Scriver, please update them to the latest version,\notherwise ask the author of your message window plugin to add support for Spell Checker.]
 [Other...]
 [Always replace with]
 [Ignore all]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 6a631fa8ca..cc0a401215 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -283,7 +283,7 @@
 [Bottom tabs vertical adjustment:]
 [NOTE: some settings will not affect open containers.]
 [Tab layout tweaks]
-[About tabSRMM]
+[About TabSRMM]
 [Copyright 2004-2011 by the Miranda IM project, 2012-2013 by the Miranda NG project. More detailed copyright information can be found in the included README file.]
 [Support and latest version information]
 [Selected skin]
@@ -463,7 +463,7 @@
 [Show Popups for all inactive sessions]
 [Save current Window Position as Default]
 [Help]
-[About tabSRMM...]
+[About TabSRMM...]
 ;file \plugins\TabSRMM\src\buttonsbar.cpp
 [Protocol Button]
 [Info button]
@@ -558,9 +558,9 @@
 [Message send error]
 [No status message]
 [Other]
-[TABSRMM: Typing]
-[tabSRMM session list]
-[tabSRMM Menu]
+[TabSRMM: Typing]
+[TabSRMM session list]
+[TabSRMM Menu]
 [&Messaging settings...]
 [&Send later job list...]
 [Message from %s]
@@ -604,7 +604,7 @@
 [\\par\\par\\tab \\ul\\b Extended status information:\\ul0\\b0 \\par ]
 [\\par\\par\\tab \\ul\\b Listening to:\\ul0\\b0 \\par %s]
 [\\par\\par\\ul\\b Client:\\ul0\\b0  %s]
-[tabSRMM Information]
+[TabSRMM Information]
 [Set panel visibility for this %s]
 [chat room]
 [contact]
@@ -811,8 +811,8 @@
 [Advanced layout with avatars]
 [Advanced with avatars, vertical orientation]
 ;file \plugins\TabSRMM\src\srmm.cpp
-[This version of tabSRMM requires Windows 2000 or later.]
-[tabSRMM Message (%s)]
+[This version of TabSRMM requires Windows 2000 or later.]
+[TabSRMM Message (%s)]
 ;file \plugins\TabSRMM\src\taskbar.cpp
 [Previews not availble when using History++ plugin for message log display.]
 [%d Unread]
@@ -825,7 +825,7 @@
 [This will reset the template set to the default built-in templates. Are you sure you want to do this?]
 [Template set was successfully reset, please close and reopen all message windows. This template editor window will now close.]
 ;file \plugins\TabSRMM\src\themeio.cpp
-[tabSRMM themes]
+[TabSRMM themes]
 ;file \plugins\TabSRMM\src\themes.cpp
 [No effect]
 [Milky Glass]