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

1 files changed, 212 insertions, 230 deletions

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]