Merge branch 'master' of https://github.com/miranda-ng/miranda-ng

13 files changed, 376 insertions, 385 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 96f3cd9314..950f6ab633 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -260,6 +260,10 @@
 [Load number of previous events]

 [Load previous events less than]

 [minutes old]

+[Use a tabbed interface]

+[Close tab on double click]

+[Restore previously open tabs when showing the window]

+[Show tabs at the bottom]

 [Send typing notifications to the following users when you are typing a message to them:]

 [Show typing notifications when a user is typing a message]

 [Update inactive message window icons when a user is typing]

@@ -304,17 +308,6 @@
 [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]

@@ -327,10 +320,11 @@
 [&Close tab]

 [C&lose other tabs]

 [&Open at this position]

+[Log]

 [C&lear log]

 [&Copy]

+[Co&py all]

 [Select &all]

-[&Open link]

 [Paste and send]

 [Delete]

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

@@ -619,10 +613,18 @@
 [find/add]

 [&Add to list]

 [Send &message]

-[Open in &new window]

-[&Open in existing window]

+[&Open link]

+[&Copy link]

 [Cancel change]

 [Ungroup]

+[List]

+[&Message]

+[Clear lo&g]

+[Word lookup]

+[Yandex]

+[Wikipedia (en)]

+[Google Maps]

+[Google Translate]

 ;file \src\core\stdauth\src\auth.cpp

 [%s requests authorization]

 [%u requests authorization]

@@ -762,10 +764,6 @@
 [Nick list lines]

 [Nick list background (selected)]

 ;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]

-[Show tabs at the bottom]

 [Send message by pressing the 'Enter' key]

 [Send message by pressing the 'Enter' key twice]

 [Flash window when someone speaks]

@@ -775,8 +773,6 @@
 [Show buttons for controlling the chat room]

 [Show buttons for formatting the text you are typing]

 [Show button menus when right clicking the buttons]

-[Show new windows cascaded]

-[Save the size and position of chat rooms]

 [Show the topic of the room on your contact list (if supported)]

 [Do not play sounds when the chat room is focused]

 [Do not pop up the window when joining a chat room]

@@ -875,7 +871,6 @@
 [Messaging]

 [Group chats]

 [Group chats log]

-[Options for using a tabbed interface]

 [Appearance and functionality of chat room windows]

 [Appearance of the message log]

 [Default events to show in new chat rooms if the 'event filter' is enabled]

@@ -887,10 +882,6 @@
 [Chat log]

 [Chat]

 [Popups]

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

-[Look up '%s':]

-[No word to look up]

-[&Message %s]

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

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

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

@@ -1075,7 +1066,9 @@
 [Notice from %s: %s]

 [The topic is '%s']

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

-[Nick]

+[Look up '%s':]

+[No word to look up]

+[&Message %s]

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

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

 [New group]

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

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

 [My custom name (not movable)]

+[Nick]

 [FirstName]

 [E-mail]

 [LastName]

@@ -1427,6 +1421,7 @@
 ;file \src\mir_app\src\sounds.cpp

 [Sound files]

 [WAV files]

+;file \src\mir_app\src\srmm_base.cpp

 ;file \src\mir_app\src\srmm_toolbar.cpp

 [<Separator>]

 [Toolbar]

diff --git a/langpacks/english/Plugins/Console.txt b/langpacks/english/Plugins/Console.txt
index 5071ff055c..40eda6ba5c 100644
--- a/langpacks/english/Plugins/Console.txt
+++ b/langpacks/english/Plugins/Console.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Console.dll

 ;  Plugin: Console

-;  Version: 0.0.7.3

+;  Version: 0.0.7.4

 ;  Authors: Bio

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

 [Console log window for Miranda.]

diff --git a/langpacks/english/Plugins/Discord.txt b/langpacks/english/Plugins/Discord.txt
index d82ffde192..297a9f6c3d 100644
--- a/langpacks/english/Plugins/Discord.txt
+++ b/langpacks/english/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.3.1.1
+;  Version: 0.5.0.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -14,20 +14,28 @@
 [Default group:]
 [Nick:]
 ;file \protocols\Discord\src\dispatch.cpp
-[User]
 [edited at]
 ;file \protocols\Discord\src\groupchat.cpp
 [Change &nickname]
+[Channel control]
+[Change &topic]
+[&Rename channel]
+[&Destroy channel]
 [&Invite a user]
+[Do you really want to destroy this channel? This action is non-revertable.]
+[Enter new channel name:]
+[Enter new topic:]
 [Enter your new nick name:]
 ;file \protocols\Discord\src\main.cpp
 [Main icon]
 [Group chats]
 ;file \protocols\Discord\src\menus.cpp
+[Enter channel name]
 [Enter invitation code you received]
 [Do you really want to leave the guild?]
 [Join guild]
 [Leave guild]
+[Create new channel]
 ;file \protocols\Discord\src\options.cpp
 [Network]
 [Account]
@@ -38,3 +46,5 @@
 [Protocol is offline or user isn't authorized yet]
 ;file \protocols\Discord\src\utils.cpp
 [Attachment]
+[Embed]
+[Preview]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index ef02362b73..df2855d5b3 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.3.1.0

+;  Version: 0.3.3.0

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -74,6 +74,7 @@
 [User &details]

 [User &history]

 [Notifications]

+[%s and more (%d)]

 ;file \protocols\FacebookRM\src\communication.cpp

 [Login error: %s]

 [Unknown error]

@@ -112,7 +113,6 @@
 [Friends except acquaintances]

 [Only me]

 ;file \protocols\FacebookRM\src\contacts.cpp

-[%s and more (%d)]

 [Contact was removed from your server list.]

 [Error occurred when removing contact from server.]

 [Request for friendship was sent.]

@@ -138,8 +138,8 @@
 [a GIF]

 [User sent %s:]

 [User sent an unsupported attachment. Open your browser to see it.]

-[This message is no longer available, because it was marked as abusive or spam.]

 [%s is typing a message...]

+[This message is no longer available, because it was marked as abusive or spam.]

 ;file \protocols\FacebookRM\src\messages.cpp

 [You cannot send messages when you are offline.]

 ;file \protocols\FacebookRM\src\process.cpp

@@ -149,7 +149,16 @@
 [Loading messages: %d/%d]

 [Loading history completed.]

 [<attachment without text>]

+[Loading memories...]

 [On this day]

+[Found %d memories.]

+[Loading notifications...]

+[Found %d notifications.]

+[Loading friendship requests...]

+[Found %d friendship requests (%d seen).]

+[Found %d friendship requests.]

+[Loading wall posts...]

+[Found %d wall posts.]

 ;file \protocols\FacebookRM\src\proto.cpp

 [%s server connection]

 [Unable to initialize Netlib for %s.]

@@ -161,10 +170,6 @@
 [Messaging]

 [Share status...]

 [Own wall]

-[Loading wall posts...]

-[Loading friendship requests...]

-[Loading notifications...]

-[Loading memories...]

 [Loading history is already in progress. It can't run for more contacts at once so please wait until it finishes.]

 [This will load all messages from the server. To avoid having duplicate messages in your history, delete existing messages manually before continuing.\nLoading process might take a while, so be patient.\n\nDo you want to continue?]

 [Do you want to cancel your friendship with '%s'?]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 5b88391ad7..7043af8872 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.4

+;  Version: 0.11.3.5

 ;  Authors: Joe Kucera, Bio, Martin Öberg, Richard Hughes, Jon Keating, etc.

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

 [ICQ protocol support for Miranda NG.]

@@ -58,7 +58,6 @@
 [Reset Custom status on status change]

 [Auto-retrieve Custom status details]

 [Block known Spam Bots]

-[Enable AIM contacts support]

 [Direct connections]

 [Allowing direct connections will expose your IP address but may be necessary for some ICQ features to work properly.]

 [Allow direct connections with any user]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index bfbfb7330b..6affd54463 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MSN.dll

 ;  Plugin: MSN protocol

-;  Version: 0.12.1.2

+;  Version: 0.12.1.4

 ;  Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher

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

 [Microsoft Network (MSN) protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/OpenSSL.txt b/langpacks/english/Plugins/OpenSSL.txt
index ec79b6530e..7277b78ca2 100644
--- a/langpacks/english/Plugins/OpenSSL.txt
+++ b/langpacks/english/Plugins/OpenSSL.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: OpenSSL.dll

 ;  Plugin: OpenSSL SSL API module

-;  Version: 0.1.0.1

+;  Version: 0.1.0.2

 ;  Authors: Miranda NG Team

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

 [Core driver to provide OpenSSL-based SSL services.]

diff --git a/langpacks/english/Plugins/QuickReplies.txt b/langpacks/english/Plugins/QuickReplies.txt
index b5ac644e78..4c4340e203 100644
--- a/langpacks/english/Plugins/QuickReplies.txt
+++ b/langpacks/english/Plugins/QuickReplies.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: QuickReplies.dll

 ;  Plugin: Quick replies

-;  Version: 0.8.1.0

+;  Version: 0.9.1.2

 ;  Authors: Unsane

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

 [Plugin for quick insert (or sending) pre-defined messages in message input area.]

@@ -16,6 +16,5 @@
 [- Press [v] button for variable's help.]

 ;file \plugins\QuickReplies\src\events.cpp

 [Button]

-[Quick Replies\r\nLeft button - open menu\r\nRight button - options page]

 ;file \plugins\QuickReplies\src\options.cpp

 [Message sessions]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 49d5393fb9..740e0e46e4 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Scriver.dll

 ;  Plugin: Scriver

-;  Version: 2.12.2.1

+;  Version: 3.0.1.6

 ;  Authors: Miranda NG Development Team

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

 [Scriver - send and receive instant messages.]

@@ -144,9 +144,103 @@
 [Clear]

 [Close other tabs]

 [Close tab]

-[List]

-[&Message]

-[Clear lo&g]

+;file \plugins\Scriver\src\chat_main.cpp

+[Messaging]

+[Group chats]

+;file \plugins\Scriver\src\chat_options.cpp

+[Flash when someone speaks]

+[Flash when a word is highlighted]

+[Show chat nick list]

+[Enable button context menus]

+[Show topic on your contact list (if supported)]

+[Do not play sounds when focused]

+[Do not pop up when joining]

+[Show and hide by double clicking in the contact list]

+[Show contact statuses (if supported)]

+[Display contact status icon before role icon]

+[Add ':' to auto-completed names]

+[Prefix all events with a timestamp]

+[Only prefix with timestamp if it has changed]

+[Timestamp has same color as event]

+[Indent the second line of a message]

+[Limit user names to 20 characters]

+[Strip colors from messages]

+[Enable 'event filter' for new rooms]

+[Show topic changes]

+[Show users joining]

+[Show users disconnecting]

+[Show messages]

+[Show actions]

+[Show users leaving]

+[Show users being kicked]

+[Show notices]

+[Show users changing name]

+[Show information messages]

+[Show status changes of users]

+[Show icons in tray only when the chat room is not active]

+[Show icon in tray for topic changes]

+[Show icon in tray for users joining]

+[Show icon in tray for users disconnecting]

+[Show icon in tray for messages]

+[Show icon in tray for actions]

+[Show icon in tray for highlights]

+[Show icon in tray for users leaving]

+[Show icon in tray for users kicking other user]

+[Show icon in tray for notices]

+[Show icon in tray for name changes]

+[Show icon in tray for information messages]

+[Show icon in tray for status changes]

+[Show popups only when the chat room is not active]

+[Show popup for topic changes]

+[Show popup for users joining]

+[Show popup for users disconnecting]

+[Show popup for messages]

+[Show popup for actions]

+[Show popup for highlights]

+[Show popup for users leaving]

+[Show popup for users kicking other user]

+[Show popup for notices]

+[Show popup for name changes]

+[Show popup for information messages]

+[Show popup for status changes]

+[Appearance and functionality of chat windows]

+[Icons to display in the tray]

+[nick of current contact (if defined)]

+[protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts]

+[user-defined account name of current contact (if defined).]

+[user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc.]

+[path to Miranda root folder]

+[path to folder containing Miranda profiles]

+[name of current Miranda profile (filename, without extension)]

+[will return parsed string %miranda_profilesdir%\\%miranda_profilename%]

+[will return parsed string %miranda_userdata%\\Logs]

+[same as environment variable %APPDATA% for currently logged-on Windows user]

+[username for currently logged-on Windows user]

+["My Documents" folder for currently logged-on Windows user]

+["Desktop" folder for currently logged-on Windows user]

+[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]

+[day of month, 1-31]

+[day of month, 01-31]

+[month number, 1-12]

+[month number, 01-12]

+[abbreviated month name]

+[full month name]

+[year without century, 01-99]

+[year with century, 1901-9999]

+[abbreviated weekday name]

+[full weekday name]

+[Variables]

+[Appearance]

+[Default events to show in new chat rooms if the 'event filter' is enabled]

+[Select folder]

+;file \plugins\Scriver\src\chat_window.cpp

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

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

+[%s: message session]

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

+[Nickname]

+[Unique ID]

+[Status]

 ;file \plugins\Scriver\src\globals.cpp

 [Add contact]

 [User's details]

@@ -194,7 +288,6 @@
 [Highlight (10x10)]

 [Information (10x10)]

 [Single Messaging]

-[Group chats]

 [Thai]

 [Japanese]

 [Simplified Chinese]

@@ -211,7 +304,6 @@
 [Vietnamese]

 [Korean (Johab)]

 ;file \plugins\Scriver\src\input.cpp

-[Messaging]

 [Navigate: Previous tab]

 [Navigate: Next tab]

 [Navigate: Tab %d]

@@ -226,12 +318,12 @@
 [Action: Send to all]

 [Action: Paste and send]

 ;file \plugins\Scriver\src\msgdialog.cpp

-[Look up '%s':]

-[No word to look up]

-[User menu - %s]

 [Sending in progress: %d message(s) left...]

 [%s is typing a message...]

 [Last message received on %s at %s.]

+[Look up '%s':]

+[No word to look up]

+[User menu - %s]

 ;file \plugins\Scriver\src\msglog.cpp

 [Me]

 [O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies]

@@ -312,6 +404,7 @@
 [Show/hide the nick list (CTRL+N)]

 [&Filter]

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

+[&Message]

 [Miranda could not load the built-in message module, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]

 [Instant messages]

 [Incoming (focused window)]

@@ -326,100 +419,3 @@
 [The message send timed out.]

 ;file \plugins\Scriver\src\tabs.cpp

 [Always on top]

-;file \plugins\Scriver\src\chat\main.cpp

-;file \plugins\Scriver\src\chat\options.cpp

-[Flash when someone speaks]

-[Flash when a word is highlighted]

-[Show chat nick list]

-[Enable button context menus]

-[Show topic on your contact list (if supported)]

-[Do not play sounds when focused]

-[Do not pop up when joining]

-[Show and hide by double clicking in the contact list]

-[Show contact statuses (if supported)]

-[Display contact status icon before role icon]

-[Add ':' to auto-completed names]

-[Prefix all events with a timestamp]

-[Only prefix with timestamp if it has changed]

-[Timestamp has same color as event]

-[Indent the second line of a message]

-[Limit user names to 20 characters]

-[Strip colors from messages]

-[Enable 'event filter' for new rooms]

-[Show topic changes]

-[Show users joining]

-[Show users disconnecting]

-[Show messages]

-[Show actions]

-[Show users leaving]

-[Show users being kicked]

-[Show notices]

-[Show users changing name]

-[Show information messages]

-[Show status changes of users]

-[Show icons in tray only when the chat room is not active]

-[Show icon in tray for topic changes]

-[Show icon in tray for users joining]

-[Show icon in tray for users disconnecting]

-[Show icon in tray for messages]

-[Show icon in tray for actions]

-[Show icon in tray for highlights]

-[Show icon in tray for users leaving]

-[Show icon in tray for users kicking other user]

-[Show icon in tray for notices]

-[Show icon in tray for name changes]

-[Show icon in tray for information messages]

-[Show icon in tray for status changes]

-[Show popups only when the chat room is not active]

-[Show popup for topic changes]

-[Show popup for users joining]

-[Show popup for users disconnecting]

-[Show popup for messages]

-[Show popup for actions]

-[Show popup for highlights]

-[Show popup for users leaving]

-[Show popup for users kicking other user]

-[Show popup for notices]

-[Show popup for name changes]

-[Show popup for information messages]

-[Show popup for status changes]

-[Appearance and functionality of chat windows]

-[Icons to display in the tray]

-[nick of current contact (if defined)]

-[protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts]

-[user-defined account name of current contact (if defined).]

-[user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc.]

-[path to Miranda root folder]

-[path to folder containing Miranda profiles]

-[name of current Miranda profile (filename, without extension)]

-[will return parsed string %miranda_profilesdir%\\%miranda_profilename%]

-[will return parsed string %miranda_userdata%\\Logs]

-[same as environment variable %APPDATA% for currently logged-on Windows user]

-[username for currently logged-on Windows user]

-["My Documents" folder for currently logged-on Windows user]

-["Desktop" folder for currently logged-on Windows user]

-[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]

-[day of month, 1-31]

-[day of month, 01-31]

-[month number, 1-12]

-[month number, 01-12]

-[abbreviated month name]

-[full month name]

-[year without century, 01-99]

-[year with century, 1901-9999]

-[abbreviated weekday name]

-[full weekday name]

-[Variables]

-[Appearance]

-[Default events to show in new chat rooms if the 'event filter' is enabled]

-[Select folder]

-;file \plugins\Scriver\src\chat\tools.cpp

-[&Message %s]

-;file \plugins\Scriver\src\chat\window.cpp

-[%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/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index ee0e19cffd..0cc50bb03a 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SendSS.dll

 ;  Plugin: Send ScreenShot+

-;  Version: 0.8.9.1

+;  Version: 0.8.10.1

 ;  Authors: Merlin

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

 [Take a screenshot and send it to a contact.]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 01b74551b7..20eeae261c 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TabSRMM.dll

 ;  Plugin: TabSRMM

-;  Version: 3.4.1.2

+;  Version: 3.5.0.4

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

@@ -53,29 +53,6 @@
 [Enable highlighting for message text]

 [Words to highlight, wildcards like * and ? are allowed, separate multiple entries with spaces. Leave it empty if you only want to highlight your own nickname.]

 [Highlight messages containing my own nickname]

-[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 \plugins\TabSRMM\res\msgwindow.rc

 [&Retry]

 [&Cancel]

@@ -111,6 +88,7 @@
 [Text]

 [Background]

 [Timeout (seconds, 0 = default, -1 = no timeout)]

+[Message]

 [Default colors]

 [Others]

 [Preview]

@@ -338,17 +316,24 @@
 [URL events]

 [Other events]

 [Send message on Ctrl+Enter (always enabled)]

+[Log]

 [&Copy]

 [&Quote]

+[Co&py all]

 [Select &all]

 [Clear log]

 [Freeze log]

 [Open in &new window]

 [&Open in existing window]

+[&Copy link]

 [Editor]

+[Cut]

+[Copy]

+[Paste]

 [Paste formatted text]

 [Paste and send immediately]

 [Copy all]

+[Select all]

 [Show message length indicator]

 [Close tab]

 [Close other tabs]

@@ -465,7 +450,198 @@
 [Toggle nick list]

 [Event filter - right click to setup, left click to activate/deactivate]

 [Channel manager]

+;file \plugins\TabSRMM\src\chat_log.cpp

+[%s has joined]

+[You have joined %s]

+[%s has left]

+[%s has disconnected]

+[%s is now known as %s]

+[You are now known as %s]

+[%s kicked %s]

+[Notice from %s: ]

+[The topic is '%s%s']

+[ (set by %s on %s)]

+[ (set by %s)]

+[%s enables '%s' status for %s]

+[%s disables '%s' status for %s]

+;file \plugins\TabSRMM\src\chat_main.cpp

+[Highlight user...]

+[Message Sessions]

+;file \plugins\TabSRMM\src\chat_options.cpp

+[Input area background]

+[Log background]

+[Single Messaging]

+[Outgoing background]

+[Incoming background]

+[Status background]

+[Incoming background(old)]

+[Outgoing background(old)]

+[Horizontal Grid Lines]

+[Info Panel]

+[Panel background low]

+[Panel background high]

+[Common colors]

+[Toolbar background high]

+[Toolbar background low]

+[Window fill color]

+[Text area borders]

+[Aero glow effect]

+[Generic text color (only when fill color is set)]

+[Tabs]

+[Normal text]

+[Active text]

+[Hovered text]

+[Unread text]

+[Normal background]

+[Active background]

+[Hovered background]

+[Unread background]

+[>> Outgoing messages]

+[>> Outgoing misc events]

+[<< Incoming messages]

+[<< Incoming misc events]

+[>> Outgoing name]

+[>> Outgoing timestamp]

+[<< Incoming name]

+[<< Incoming timestamp]

+[>> Outgoing messages (old)]

+[>> Outgoing misc events (old)]

+[<< Incoming messages (old)]

+[<< Incoming misc events (old)]

+[>> Outgoing name (old)]

+[>> Outgoing timestamp (old)]

+[<< Incoming name (old)]

+[<< Incoming timestamp (old)]

+[* Message Input Area]

+[* Status changes]

+[* Dividers]

+[* Error and warning messages]

+[* Symbols (incoming)]

+[* Symbols (outgoing)]

+[Nickname]

+[UIN]

+[Status]

+[Protocol]

+[Contacts local time]

+[Window caption (skinned mode)]

+[Open new chat rooms in the default container]

+[Flash window when someone speaks]

+[Flash window when a word is highlighted]

+[Create tabs or windows for highlight events]

+[Activate chat window on highlight]

+[Show list of users in the chat room]

+[Colorize nicknames in member list]

+[Show button menus when right clicking the buttons]

+[Show topic as status message on the contact list]

+[Do not pop up the window when joining a chat room]

+[Hide or show the window by double click in the contact list]

+[Sync splitter position with standard IM sessions]

+[Show contact's status modes if supported by the protocol]

+[Display contact's status icon before user role icon]

+[Use IRC style status indicators in the nick list]

+[Use alternative sorting method in member list]

+[Prefix all events with a timestamp]

+[Timestamp only when event time differs]

+[Timestamp has same color as the event]

+[Indent the second line of a message]

+[Limit user names in the message log to 20 characters]

+[Add a colon (:) to auto-completed user names]

+[Add a comma instead of a colon to auto-completed user names]

+[Start private conversation on double click in nick list (insert nick if unchecked)]

+[Strip colors from messages in the log]

+[Enable the 'event filter' for new rooms]

+[Use IRC style status indicators in the log]

+[Allow clickable user names in the message log]

+[Add new line after names]

+[Colorize user names in message log]

+[Scale down icons to 10x10 pixels in the chat log]

+[Window Icon]

+[Icon overlay]

+[Status 1 (10x10)]

+[Status 2 (10x10)]

+[Status 3 (10x10)]

+[Status 4 (10x10)]

+[Status 5 (10x10)]

+[Status 6 (10x10)]

+[Message in (10x10)]

+[Message out (10x10)]

+[Action (10x10)]

+[Add Status (10x10)]

+[Remove Status (10x10)]

+[Join (10x10)]

+[Leave (10x10)]

+[Quit (10x10)]

+[Kick (10x10)]

+[Notice (10x10)]

+[Nickchange (10x10)]

+[Topic (10x10)]

+[Highlight (10x10)]

+[Information (10x10)]

+[Group chat windows]

+[Group chat log]

+[Appearance and functionality of chat room windows]

+[Appearance of the message log]

+[Voiced]

+[Half operators]

+[Channel operators]

+[Extended mode 1]

+[Extended mode 2]

+[Selection background]

+[Selected text]

+[Incremental search highlight]

+[Fields background]

+[Nick list background]

+[Group chat log background]

+[nick of current contact (if defined)]

+[protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts]

+[user-defined account name of current contact (if defined).]

+[user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc.]

+[path to Miranda root folder]

+[path to folder containing Miranda profiles]

+[name of current Miranda profile (filename, without extension)]

+[will return parsed string %miranda_profilesdir%\\%miranda_profilename%]

+[will return parsed string %miranda_userdata%\\Logs]

+[same as environment variable %APPDATA% for currently logged-on Windows user]

+[username for currently logged-on Windows user]

+["My Documents" folder for currently logged-on Windows user]

+["Desktop" folder for currently logged-on Windows user]

+[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]

+[day of month, 1-31]

+[day of month, 01-31]

+[month number, 1-12]

+[month number, 01-12]

+[abbreviated month name]

+[full month name]

+[year without century, 01-99]

+[year with century, 1901-9999]

+[abbreviated weekday name]

+[full weekday name]

+[Variables]

+[All files]

+[Select folder]

+[No markers]

+[Show as icons]

+[Show as text symbols]

+;file \plugins\TabSRMM\src\chat_tools.cpp

+[%s%s says:%s %s]

+;file \plugins\TabSRMM\src\chat_window.cpp

+[Expand or collapse the side bar]

+[The filter cannot be enabled, because there are no event types selected either global or for this chat room]

+[Event filter error]

+[, %d %s, %d %s idle]

+[hours]

+[hour]

+[minutes]

+[minute]

+[, %d %s idle]

+[%s on %s%s]

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

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

+[, event filter active]

+[%s: message session]

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

 ;file \plugins\TabSRMM\src\container.cpp

+[Version]

 [Message session...]

 [Default container]

 [Attach to]

@@ -515,15 +691,11 @@
 [No status message]

 [Configuration issue|The unattended send feature is disabled. The \\b1 send later\\b0  and \\b1 send to multiple contacts\\b0  features depend on it.\n\nYou must enable it under \\b1Options -> Message sessions -> Advanced tweaks\\b0. Changing this option requires a restart.]

 [You cannot edit user notes when there are unsent messages]

-[Version]

 [%s is typing a message...]

 [Last received: %s at %s]

 [%s has entered text.]

 [%s is typing a message]

 [Auto scrolling is disabled, %d message(s) queued (press F12 to enable it)]

-[UID: %s (SHIFT click -> copy to clipboard)\nClick for user's details\nRight click for metacontact control\nClick dropdown to add or remove user from your favorites.]

-[No UID]

-[UID: %s (SHIFT click -> copy to clipboard)\nClick for user's details\nClick dropdown to change this contact's favorite status.]

 ;file \plugins\TabSRMM\src\globals.cpp

 [Instant messages]

 [Incoming (focused window)]

@@ -531,6 +703,7 @@
 [Incoming (new session)]

 [Outgoing]

 [Message send error]

+[&Message]

 [Other]

 [TabSRMM: typing]

 [TabSRMM session list]

@@ -604,20 +777,21 @@
 ;file \plugins\TabSRMM\src\msgdialog.cpp

 [Add this contact permanently to your contact list]

 [Do not add this contact permanently]

-[Expand or collapse the side bar]

 [Contact not on list. You may add it...]

 [A message failed to send successfully.]

-[WARNING: The message you are trying to paste exceeds the message size limit for the active protocol. It will be sent in chunks of max %d characters]

-[The message you are trying to paste exceeds the message size limit for the active protocol. Only the first %d characters will be sent.]

-[Save and close session]

 [Auto scrolling is disabled (press F12 to enable it)]

 [Click for contact menu\nClick dropdown for window settings]

 [Retry]

 [Send later]

+[UID: %s (SHIFT click -> copy to clipboard)\nClick for user's details\nRight click for metacontact control\nClick dropdown to add or remove user from your favorites.]

+[No UID]

+[UID: %s (SHIFT click -> copy to clipboard)\nClick for user's details\nClick dropdown to change this contact's favorite status.]

+[You are editing the user notes. Click the button again or use the hotkey (default: Alt-N) to save the notes and return to normal messaging mode]

 [Selection copied to clipboard]

+[WARNING: The message you are trying to paste exceeds the message size limit for the active protocol. It will be sent in chunks of max %d characters]

+[The message you are trying to paste exceeds the message size limit for the active protocol. Only the first %d characters will be sent.]

 [Delivery failure: %s]

 [The message send timed out]

-[You are editing the user notes. Click the button again or use the hotkey (default: Alt-N) to save the notes and return to normal messaging mode]

 [Contact is offline and this protocol does not support sending files to offline users.]

 ;file \plugins\TabSRMM\src\msgdlgutils.cpp

 [Error creating destination directory]

@@ -625,6 +799,7 @@
 [Image files]

 [The file exists. Do you want to overwrite it?]

 [Set your avatar...]

+[Save and close session]

 [The 'paste and send' feature is disabled. You can enable it on the 'General' options page in the 'Sending messages' section]

 [Either the nudge plugin is not installed or the contact's protocol does not support sending a nudge event.]

 ['(Unknown contact)']

@@ -699,6 +874,7 @@
 [Highlighting]

 [Choose status modes]

 ;file \plugins\TabSRMM\src\msgs.cpp

+[A message delivery has failed.\nClick to open the message window.]

 [Message Log Options]

 [Image tag]

 [Quote text]

@@ -729,7 +905,6 @@
 [Frame 2]

 [Frame 3]

 [Frame 4]

-[Message Sessions]

 [Message Log]

 [Animated Tray]

 [Clock symbol (for the info panel clock)]

@@ -741,6 +916,9 @@
 [Message windows - IM]

 [Message windows - all]

 [Message windows - group chats]

+;file \plugins\TabSRMM\src\muchighlight.cpp

+[Add user to highlight list]

+[Edit user highlight list]

 ;file \plugins\TabSRMM\src\selectcontainer.cpp

 [Select container for %s]

 [You cannot delete the default container]

@@ -760,12 +938,10 @@
 [Contact]

 [Original timestamp]

 [Message text]

-[Status]

 [Last send info]

 [You are about to modify the state of one or more items in the\nunattended send queue. The requested action(s) will be executed at the next scheduled queue processing.\n\nThis action cannot be made undone.]

 ;file \plugins\TabSRMM\src\sendqueue.cpp

 [The message cannot be sent delayed or to multiple contacts, because it exceeds the maximum allowed message length of %d bytes]

-[A message delivery has failed.\nClick to open the message window.]

 [A message delivery has failed after the contacts chat window was closed. You may want to resend the last message]

 [There are unsent messages waiting for confirmation.\nIf you close the window now, Miranda will try to send them but may be unable to inform you about possible delivery errors.\nDo you really want to close the window(s)?]

 [Message window warning]

@@ -786,7 +962,6 @@
 [Chat room %s]

 [%d user(s)]

 [Server window]

-[%s on %s%s]

 ;file \plugins\TabSRMM\src\templates.cpp

 [Message In]

 [Message Out]

@@ -813,7 +988,6 @@
 [Message window tweaks]

 [Display metacontact icons]

 [Error feedback]

-[Show skinnable tooltip in chat (Tipper plugin required)]

 [Enable typing sounds]

 [Close current tab on send]

 [Automatic keyboard layout: Do not load the system default for new contacts]

@@ -909,195 +1083,3 @@
 [Closing Window|You are about to close a window with multiple tabs open.\n\nProceed?]

 [Closing options dialog|To reflect the changes done by importing a theme in the options dialog, the dialog must be closed after loading a theme \\b1 and unsaved changes might be lost\\b0 .\n\nDo you want to continue?]

 [Loading a theme|Loading a color and font theme can overwrite the settings defined by your skin.\n\nDo you want to continue?]

-;file \plugins\TabSRMM\src\chat\log.cpp

-[%s has joined]

-[You have joined %s]

-[%s has left]

-[%s has disconnected]

-[%s is now known as %s]

-[You are now known as %s]

-[%s kicked %s]

-[Notice from %s: ]

-[The topic is '%s%s']

-[ (set by %s on %s)]

-[ (set by %s)]

-[%s enables '%s' status for %s]

-[%s disables '%s' status for %s]

-;file \plugins\TabSRMM\src\chat\main.cpp

-;file \plugins\TabSRMM\src\chat\muchighlight.cpp

-[Add user to highlight list]

-[Edit user highlight list]

-;file \plugins\TabSRMM\src\chat\options.cpp

-[Input area background]

-[Log background]

-[Single Messaging]

-[Outgoing background]

-[Incoming background]

-[Status background]

-[Incoming background(old)]

-[Outgoing background(old)]

-[Horizontal Grid Lines]

-[Info Panel]

-[Panel background low]

-[Panel background high]

-[Common colors]

-[Toolbar background high]

-[Toolbar background low]

-[Window fill color]

-[Text area borders]

-[Aero glow effect]

-[Generic text color (only when fill color is set)]

-[Normal text]

-[Active text]

-[Hovered text]

-[Unread text]

-[Normal background]

-[Active background]

-[Hovered background]

-[Unread background]

-[>> Outgoing messages]

-[>> Outgoing misc events]

-[<< Incoming messages]

-[<< Incoming misc events]

-[>> Outgoing name]

-[>> Outgoing timestamp]

-[<< Incoming name]

-[<< Incoming timestamp]

-[>> Outgoing messages (old)]

-[>> Outgoing misc events (old)]

-[<< Incoming messages (old)]

-[<< Incoming misc events (old)]

-[>> Outgoing name (old)]

-[>> Outgoing timestamp (old)]

-[<< Incoming name (old)]

-[<< Incoming timestamp (old)]

-[* Message Input Area]

-[* Status changes]

-[* Dividers]

-[* Error and warning messages]

-[* Symbols (incoming)]

-[* Symbols (outgoing)]

-[Nickname]

-[UIN]

-[Protocol]

-[Contacts local time]

-[Window caption (skinned mode)]

-[Open new chat rooms in the default container]

-[Flash window when someone speaks]

-[Flash window when a word is highlighted]

-[Create tabs or windows for highlight events]

-[Activate chat window on highlight]

-[Show list of users in the chat room]

-[Colorize nicknames in member list]

-[Show button menus when right clicking the buttons]

-[Show topic as status message on the contact list]

-[Do not pop up the window when joining a chat room]

-[Hide or show the window by double click in the contact list]

-[Sync splitter position with standard IM sessions]

-[Show contact's status modes if supported by the protocol]

-[Display contact's status icon before user role icon]

-[Use IRC style status indicators in the nick list]

-[Use alternative sorting method in member list]

-[Prefix all events with a timestamp]

-[Timestamp only when event time differs]

-[Timestamp has same color as the event]

-[Indent the second line of a message]

-[Limit user names in the message log to 20 characters]

-[Add a colon (:) to auto-completed user names]

-[Add a comma instead of a colon to auto-completed user names]

-[Start private conversation on double click in nick list (insert nick if unchecked)]

-[Strip colors from messages in the log]

-[Enable the 'event filter' for new rooms]

-[Use IRC style status indicators in the log]

-[Allow clickable user names in the message log]

-[Add new line after names]

-[Colorize user names in message log]

-[Scale down icons to 10x10 pixels in the chat log]

-[Window Icon]

-[Icon overlay]

-[Status 1 (10x10)]

-[Status 2 (10x10)]

-[Status 3 (10x10)]

-[Status 4 (10x10)]

-[Status 5 (10x10)]

-[Status 6 (10x10)]

-[Message in (10x10)]

-[Message out (10x10)]

-[Action (10x10)]

-[Add Status (10x10)]

-[Remove Status (10x10)]

-[Join (10x10)]

-[Leave (10x10)]

-[Quit (10x10)]

-[Kick (10x10)]

-[Notice (10x10)]

-[Nickchange (10x10)]

-[Topic (10x10)]

-[Highlight (10x10)]

-[Information (10x10)]

-[Group chat windows]

-[Group chat log]

-[Appearance and functionality of chat room windows]

-[Appearance of the message log]

-[Voiced]

-[Half operators]

-[Channel operators]

-[Extended mode 1]

-[Extended mode 2]

-[Selection background]

-[Selected text]

-[Incremental search highlight]

-[Fields background]

-[Nick list background]

-[Group chat log background]

-[nick of current contact (if defined)]

-[protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts]

-[user-defined account name of current contact (if defined).]

-[user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc.]

-[path to Miranda root folder]

-[path to folder containing Miranda profiles]

-[name of current Miranda profile (filename, without extension)]

-[will return parsed string %miranda_profilesdir%\\%miranda_profilename%]

-[will return parsed string %miranda_userdata%\\Logs]

-[same as environment variable %APPDATA% for currently logged-on Windows user]

-[username for currently logged-on Windows user]

-["My Documents" folder for currently logged-on Windows user]

-["Desktop" folder for currently logged-on Windows user]

-[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]

-[day of month, 1-31]

-[day of month, 01-31]

-[month number, 1-12]

-[month number, 01-12]

-[abbreviated month name]

-[full month name]

-[year without century, 01-99]

-[year with century, 1901-9999]

-[abbreviated weekday name]

-[full weekday name]

-[Variables]

-[All files]

-[Select folder]

-[No markers]

-[Show as icons]

-[Show as text symbols]

-;file \plugins\TabSRMM\src\chat\tools.cpp

-[%s%s says:%s %s]

-[Look up '%s':]

-[No word to look up]

-[&Message %s]

-[Highlight user...]

-[Edit highlight list...]

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

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

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

-[, event filter active]

-[%s: message session]

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

-[, %d %s, %d %s idle]

-[hours]

-[hour]

-[minutes]

-[minute]

-[, %d %s idle]

-[The filter cannot be enabled, because there are no event types selected either global or for this chat room]

-[Event filter error]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index f1918e15a0..eb9773c480 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Tox.dll

 ;  Plugin: Tox protocol

-;  Version: 0.11.1.21

+;  Version: 0.11.1.23

 ;  Authors: Miranda NG Team

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

 [Tox protocol support for Miranda NG.]

@@ -22,6 +22,8 @@
 [Connection settings]

 [Enable UDP (otherwise force Tox to use TCP)]

 [Enable IPv6]

+[Max connect retries:]

+[Max reconnect retries:]

 [If this field contains Tox address (76 hex characters), you will be prompted to add it in your friend list. Otherwise, Miranda will search this query via Tox DNS discovery.]

 [DNS name:]

 [Enter password]

@@ -53,8 +55,10 @@
 [&History]

 [Outgoing call]

 [To:]

-;file \protocols\Tox\src\tox_chatrooms.cpp

-[Group chat]

+;file \protocols\Tox\src\main.cpp

+[Current version of plugin is support Tox API version %i.%i.%i which is incompatible with %s]

+;file \protocols\Tox\src\tox_connection.cpp

+[Unable to initialize Tox core]

 ;file \protocols\Tox\src\tox_events.cpp

 [Profiles folder]

 [Tox URI scheme]

@@ -76,8 +80,6 @@
 [Outgoing call to %s]

 ;file \protocols\Tox\src\tox_netlib.cpp

 [%s connection]

-;file \protocols\Tox\src\tox_network.cpp

-[Unable to initialize Tox core]

 ;file \protocols\Tox\src\tox_options.cpp

 [Tox profile]

 [All files]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 9c3c0fd75e..22e3e8c73d 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.12

+;  Version: 0.1.2.17

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

@@ -29,6 +29,7 @@
 [Process stickers as smileys]

 [Shorten links for audio attachments]

 [Use non-standard popups for news and event notifications]

+[Add message link to messages with attachments]

 [News and event notifications]

 [WARNING: Causes excessive network traffic!!!]

 [Enable news feeds]

@@ -170,6 +171,7 @@
 ;file \protocols\VKontakte\src\vk_chats.cpp

 [Participants]

 [Owners]

+[Message link]

 [create chat]

 [kick user]

 [left chat]

@@ -234,6 +236,7 @@
 [Loading history]

 [Error loading message history for %s from server.]

 [Loading messages for %s is completed.]

+;file \protocols\VKontakte\src\vk_messages.cpp

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

 [Network]

 [Account]