unneeded check for stdchat removed (nothing to check for anymore)

langpacks updated accordingly

8 files changed, 181 insertions, 196 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index eb1cae303d..1d9b6e8ad3 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -28,76 +28,6 @@
 [Status messages:]

 [Change %s message]

 [Closing in %d]

-;file \src\core\stdchat\res\chat.rc

-[&Send]

-[&Emoticons]

-[&Bold]

-[&Italic]

-[&Underline]

-[&Color]

-[&Background color]

-[&History]

-[&Filter]

-[&Room settings]

-[&Show/Hide nick list]

-[Show these events only:]

-[Actions]

-[Messages]

-[Nick changes]

-[Users joining]

-[Users leaving]

-[Topic changes]

-[Status changes]

-[Information]

-[Disconnects]

-[User kicks]

-[Notices]

-[Options]

-[Log options]

-[Log timestamp]

-[Timestamp]

-[Other name]

-[Your name]

-[Enable highlighting]

-[Limit log text to (events):]

-[Trim to (KB)]

-[Words to highlight (wildcards allowed)]

-[Enable logging to disk]

-[Log directory]

-[Other]

-[Add new rooms to group:]

-[Nick list row distance (pixels):]

-[Use same style as in the message log]

-[Use default colors]

-[Use custom colors]

-[Popups for the Chat plugin]

-[Timeout (s)]

-[Text]

-[Background]

-[(Setting timeout to 0 means default setting and -1 means indefinite time)]

-[List]

-[&Message]

-[Log]

-[Clear lo&g]

-[Co&py all]

-[Word lookup]

-[Wikipedia]

-[Link]

-[Open a &new browser window]

-[&Open in current browser window]

-[&Copy link]

-[Message]

-[Undo]

-[Redo]

-[Copy]

-[Cut]

-[Paste]

-[Select all]

-[Clear]

-[Tabs]

-[&Close tab]

-[C&lose other tabs]

-[&Open at this position]

 ;file \src\core\stdclist\res\resource.rc

 [Delete contact]

 [No]

@@ -217,6 +147,7 @@
 [Out to &lunch\tCtrl+9]

 ;file \src\core\stdfile\res\resource.rc

 [Send file(s)]

+[&Send]

 [Cancel]

 [To:]

 [File(s):]

@@ -224,6 +155,7 @@
 [Total size:]

 [Description:]

 [&User menu]

+[&History]

 [Incoming file transfer]

 [A&ccept]

 [&Decline]

@@ -339,6 +271,73 @@
 [Save the window position for each contact]

 [Message window behavior:]

 [Messaging:]

+[&Emoticons]

+[&Bold]

+[&Italic]

+[&Underline]

+[&Color]

+[&Background color]

+[&Filter]

+[&Room settings]

+[&Show/Hide nick list]

+[Show these events only:]

+[Actions]

+[Messages]

+[Nick changes]

+[Users joining]

+[Users leaving]

+[Topic changes]

+[Status changes]

+[Information]

+[Disconnects]

+[User kicks]

+[Notices]

+[Options]

+[Log options]

+[Log timestamp]

+[Timestamp]

+[Other name]

+[Your name]

+[Enable highlighting]

+[Limit log text to (events):]

+[Trim to (KB)]

+[Words to highlight (wildcards allowed)]

+[Enable logging to disk]

+[Log directory]

+[Other]

+[Add new rooms to group:]

+[Nick list row distance (pixels):]

+[Use same style as in the message log]

+[Use default colors]

+[Use custom colors]

+[Popups for the Chat plugin]

+[Timeout (s)]

+[Text]

+[Background]

+[(Setting timeout to 0 means default setting and -1 means indefinite time)]

+[List]

+[&Message]

+[Log]

+[Clear lo&g]

+[Co&py all]

+[Word lookup]

+[Wikipedia]

+[Link]

+[Open a &new browser window]

+[&Open in current browser window]

+[&Copy link]

+[Message]

+[Undo]

+[Redo]

+[Copy]

+[Cut]

+[Paste]

+[Select all]

+[Clear]

+[Tabs]

+[&Close tab]

+[C&lose other tabs]

+[&Open at this position]

 [C&lear log]

 [&Copy]

 [Select &all]

@@ -667,14 +666,110 @@
 [Mmm... food.]

 [idleeeeeeee]

 [Status]

-;file \src\core\stdchat\src\main.cpp

+;file \src\core\stdclist\src\clcfonts.cpp

+[Standard contacts]

+[Online contacts to whom you have a different visibility]

+[Offline contacts]

+[Contacts which are 'not on list']

+[Group member counts]

+[Dividers]

+[Offline contacts to whom you have a different visibility]

+[Selected text]

+[Hottrack text]

+[Quicksearch text]

+;file \src\core\stdclist\src\clcopts.cpp

+[Not focused]

+[Offline]

+[Online]

+[Away]

+[Not available]

+[Occupied]

+[Do not disturb]

+[Free for chat]

+[Invisible]

+[Out to lunch]

+[On the phone]

+[List background]

+;file \src\core\stdclist\src\clistopts.cpp

+[Global]

+;file \src\core\stdclist\src\cluiopts.cpp

+;file \src\core\stdcrypt\src\encrypt.cpp

+[Standard crypto provider]

+;file \src\core\stdemail\src\email.cpp

+[User has not registered an e-mail address]

+[Send e-mail]

+[&E-mail]

+;file \src\core\stdfile\src\file.cpp

+[File from %s]

+[bytes]

+[&File]

+[File &transfers...]

+[Incoming]

+[Complete]

+[Error]

+[Denied]

+;file \src\core\stdfile\src\fileexistsdlg.cpp

+[%s file]

+[All files]

+;file \src\core\stdfile\src\fileopts.cpp

+[Executable files]

+[Events]

+;file \src\core\stdfile\src\filerecvdlg.cpp

+[Select folder]

+[My received files]

+[View user's history]

+[User menu]

+[Canceled]

+[This file transfer has been canceled by the other side]

+;file \src\core\stdfile\src\filesenddlg.cpp

+[%d files]

+[%d directories]

+;file \src\core\stdfile\src\filexferdlg.cpp

+[This file has not yet been scanned for viruses. Are you certain you want to open it?]

+[File received]

+[of]

+[Request sent, waiting for acceptance...]

+[Waiting for connection...]

+[Unable to initiate transfer.]

+[Contact menu]

+[Open...]

+[sec]

+[remaining]

+[Decision sent]

+[Connecting...]

+[Connecting to proxy...]

+[Connected]

+[Initializing...]

+[Moving to next file...]

+[Sending...]

+[Receiving...]

+[File transfer denied]

+[File transfer failed]

+[Transfer completed.]

+[Transfer completed, open file.]

+[Transfer completed, open folder.]

+[Scanning for viruses...]

+[Transfer and virus scan complete]

+;file \src\core\stdfile\src\ftmanager.cpp

+[Outgoing]

+;file \src\core\stdhelp\src\about.cpp

+[< Copyright]

+;file \src\core\stdhelp\src\help.cpp

+[&Help]

+[&About...]

+[&Support]

+[&Miranda NG homepage]

+[&Report bug]

+;file \src\core\stdidle\src\idle.cpp

+[Idle]

+;file \src\core\stdmsg\src\chat_manager.cpp

 [Chat module]

 [Group chat log background]

 [Message background]

 [Nick list background]

 [Nick list lines]

 [Nick list background (selected)]

-;file \src\core\stdchat\src\options.cpp

+;file \src\core\stdmsg\src\chat_options.cpp

 [Use a tabbed interface]

 [Close tab on double click]

 [Restore previously open tabs when showing the window]

@@ -795,16 +890,15 @@
 [Icons to display in the message log]

 [Icons to display in the tray]

 [Popups to display]

-[Select folder]

 [Message sessions]

 [General]

 [Chat log]

 [Popups]

-;file \src\core\stdchat\src\tools.cpp

+;file \src\core\stdmsg\src\chat_util.cpp

 [Look up '%s':]

 [No word to look up]

 [&Message %s]

-;file \src\core\stdchat\src\window.cpp

+;file \src\core\stdmsg\src\chat_window.cpp

 [Insert a smiley]

 [Make the text bold (CTRL+B)]

 [Make the text italicized (CTRL+I)]

@@ -816,107 +910,12 @@
 [Control this room (CTRL+O)]

 [Enable/disable the event filter (CTRL+F)]

 [Close current tab (CTRL+F4)]

-[Nickname]

-[Unique ID]

 [%s: chat room (%u user)]

 [%s: chat room (%u users)]

 [%s: message session]

 [%s: message session (%u users)]

-;file \src\core\stdclist\src\clcfonts.cpp

-[Standard contacts]

-[Online contacts to whom you have a different visibility]

-[Offline contacts]

-[Contacts which are 'not on list']

-[Group member counts]

-[Dividers]

-[Offline contacts to whom you have a different visibility]

-[Selected text]

-[Hottrack text]

-[Quicksearch text]

-;file \src\core\stdclist\src\clcopts.cpp

-[Not focused]

-[Offline]

-[Online]

-[Away]

-[Not available]

-[Occupied]

-[Do not disturb]

-[Free for chat]

-[Invisible]

-[Out to lunch]

-[On the phone]

-[List background]

-;file \src\core\stdclist\src\clistopts.cpp

-[Global]

-;file \src\core\stdclist\src\cluiopts.cpp

-;file \src\core\stdcrypt\src\encrypt.cpp

-[Standard crypto provider]

-;file \src\core\stdemail\src\email.cpp

-[User has not registered an e-mail address]

-[Send e-mail]

-[&E-mail]

-;file \src\core\stdfile\src\file.cpp

-[File from %s]

-[bytes]

-[&File]

-[File &transfers...]

-[Incoming]

-[Complete]

-[Error]

-[Denied]

-;file \src\core\stdfile\src\fileexistsdlg.cpp

-[%s file]

-[All files]

-;file \src\core\stdfile\src\fileopts.cpp

-[Executable files]

-[Events]

-;file \src\core\stdfile\src\filerecvdlg.cpp

-[My received files]

-[View user's history]

-[User menu]

-[Canceled]

-[This file transfer has been canceled by the other side]

-;file \src\core\stdfile\src\filesenddlg.cpp

-[%d files]

-[%d directories]

-;file \src\core\stdfile\src\filexferdlg.cpp

-[This file has not yet been scanned for viruses. Are you certain you want to open it?]

-[File received]

-[of]

-[Request sent, waiting for acceptance...]

-[Waiting for connection...]

-[Unable to initiate transfer.]

-[Contact menu]

-[Open...]

-[sec]

-[remaining]

-[Decision sent]

-[Connecting...]

-[Connecting to proxy...]

-[Connected]

-[Initializing...]

-[Moving to next file...]

-[Sending...]

-[Receiving...]

-[File transfer denied]

-[File transfer failed]

-[Transfer completed.]

-[Transfer completed, open file.]

-[Transfer completed, open folder.]

-[Scanning for viruses...]

-[Transfer and virus scan complete]

-;file \src\core\stdfile\src\ftmanager.cpp

-[Outgoing]

-;file \src\core\stdhelp\src\about.cpp

-[< Copyright]

-;file \src\core\stdhelp\src\help.cpp

-[&Help]

-[&About...]

-[&Support]

-[&Miranda NG homepage]

-[&Report bug]

-;file \src\core\stdidle\src\idle.cpp

-[Idle]

+[Nickname]

+[Unique ID]

 ;file \src\core\stdmsg\src\cmdlist.cpp

 [The message send timed out.]

 ;file \src\core\stdmsg\src\globals.cpp

@@ -1076,6 +1075,7 @@
 [Notice from %s: %s]

 [The topic is '%s']

 [The topic is '%s' (set by %s)]

+[Nick]

 ;file \src\mir_app\src\clcitems.cpp

 ;file \src\mir_app\src\clistgroups.cpp

 [New group]

@@ -1097,7 +1097,6 @@
 ;file \src\mir_app\src\colorchooser.cpp

 ;file \src\mir_app\src\contacts.cpp

 [My custom name (not movable)]

-[Nick]

 [FirstName]

 [E-mail]

 [LastName]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 474d38f5f8..6eb3d6c701 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -502,7 +502,6 @@
 [Status Message]

 ;file \protocols\JabberG\src\jabber_message_handlers.cpp

 ;file \protocols\JabberG\src\jabber_misc.cpp

-[Chat plugin is required for conferences. Install it before chatting]

 [To]

 [From]

 [Both]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index 6a712bd48a..79c3b39821 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -117,7 +117,6 @@
 [Owners]

 [Inviter]

 [Visitors]

-[Chat plugin is required for conferences. Install it before chatting]

 [invite sender]

 [invite new members]

 ;file \protocols\MRA\src\MraConstans.h

diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index 1c671fd602..e89565f368 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Quotes.dll

 ;  Plugin: Quotes

-;  Version: 0.1.0.1

+;  Version: 0.1.0.101

 ;  Authors: Dioksin

 ;============================================================

 [Shows currency rates and economic quotes.]

@@ -32,10 +32,6 @@
 [Convert]

 [Info provided by <a href="http://www.google.com">Google</a>]

 [Close]

-[Chart]

-[Info provided by <a href="http://www.dukascopy.com">Dukascopy Swiss Forex Group</a>]

-[Get data from:]

-[Filter:]

 [Popup Window Settings]

 [Colors]

 [Use default colors]

@@ -113,15 +109,6 @@
 ;file \plugins\Quotes\src\ModuleInfo.cpp

 [Miranda could not load Quotes plugin. XML parser is missing.]

 [Miranda could not load Quotes plugin. Microsoft HTML parser is missing.]

-;file \plugins\Quotes\src\QuoteChart.cpp

-[Log File]

-[Miranda's History]

-[All]

-[Last Day]

-[Last Week]

-[Last Month]

-[Last Year]

-[User-Defined]

 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp

 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp

 [Error occurred during html parsing.]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 150302508a..5fa7520b58 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -426,10 +426,10 @@
 [Show/hide the nick list (CTRL+N)]

 [Control this room (CTRL+O)]

 [Enable/disable the event filter (CTRL+F)]

-[Nickname]

-[Unique ID]

-[Status]

 [%s: chat room (%u user)]

 [%s: chat room (%u users)]

 [%s: message session]

 [%s: message session (%u users)]

+[Nickname]

+[Unique ID]

+[Status]

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 21f5e65c55..b844253694 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -108,5 +108,4 @@
 [Incoming call canceled sound]

 [Skypename]

 ;file \protocols\SkypeWeb\src\skype_trouter.cpp

-[Failed to establish a TRouter connection.]

 [Incoming call from %s]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index b929b413d4..09de71311c 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -1098,8 +1098,6 @@
 [Highlight user...]

 [Edit highlight list...]

 ;file \plugins\TabSRMM\src\chat\window.cpp

-[Unique ID]

-[Nick]

 [%s: chat room (%u user%s)]

 [%s: chat room (%u users%s)]

 [, event filter active]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 33a96d5888..71b59dd405 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.2.7

+;  Version: 0.1.2.8

 ;  Authors: Miranda NG Team

 ;============================================================

 [VKontakte protocol support for Miranda NG.]

@@ -163,6 +163,9 @@
 [(Unknown contact)]

 [Message from]

 [at]

+[User restored control over own page]

+[User was deactivated (deleted)]

+[User was deactivated (banned)]

 ;file \protocols\VKontakte\src\vk_chats.cpp

 [Participants]

 [Owners]

@@ -271,6 +274,7 @@
 [for all time]

 [Errors]

 [Notification]

+[VK user activate/deactivate action]

 [User %s added as friend]

 [You cannot add yourself as friend]

 [Cannot add this user to friends as they have put you on their blacklist]