1 files changed, 505 insertions, 22 deletions
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 33e6f4e20a..b2102f4004 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -1466,13 +1466,166 @@
 ;  Authors: P Boon
 ;============================================================
 [An Auto Away module with some more options than the original.]
-;file \plugins\StatusPlugins\AdvancedAutoAway\options.cpp
+;file \Plugins\StatusPlugins\resource.rc
+[Check connection]
+[Max. retries]
+[Protocol Connection]
+[Delay between retries (secs)]
+[Show popups]
+[General]
+[Protocols to check]
+[Dial-Up]
+[Don't reconnect if no internet connection seems available]
+[Continuously check for internet connection]
+[Do so by pinging host]
+[Confirm Status]
+[Close]
+[Cancel]
+[Profile]
+[Message]
+[after]
+[minutes of inactivity]
+[minutes of level 1 mode]
+[Confirm resetting status]
+[Protocol]
+[Only set if current status is]
+[Monitor Miranda's activity only]
+[Reset status on return]
+[when screen saver engages]
+[Set]
+[only set when inactive]
+[when workstation is locked]
+[Command Line]
+[OK]
+[Copy to Clipboard]
+[Command Line:]
+[Create Shortcut]
+[Add new profile]
+[Profile name]
+[Set window state]
+[Show dialog]
+[Set status to offline before exit]
+[Show CMDL]
+[Activate status profile]
+[Set docked]
+[Other]
+[Status on startup]
+[ms]
+[Set after]
+[Timeout]
+[s]
+[Set window location]
+[,]
+[Set window size]
+[x]
+[Allow override]
+[Note: status profiles can be created in the 'Status Profiles' options screen]
+[Window on startup]
+[Automatically dial on startup]
+[Automatically hang up on exit]
+[Dial-up (experimental)]
+[Background colour]
+[Text colour]
+[Use Windows colours]
+[Use default colours]
+[Delay]
+[On left click]
+[On right click]
+[Do nothing]
+[Close popup]
+[Cancel reconnecting]
+[Colours]
+[Preview]
+[Events]
+[Show when connection is lost]
+[Show when a connection attempt is made]
+[Show when reconnection has finished]
+[Show other messages]
+[From PopUp plugin]
+[Custom]
+[Permanent]
+[Show additional information in popups]
+[Use Miranda's message setting]
+[Use this message:]
+[Use %time% for the current time, %date% for the current date]
+[Variables...]
+[Specify settings for each protocol]
+[Use same settings for all protocols]
+[Ignore caps-lock, num-lock and scroll-lock keys]
+[Check interval (secs)]
+[Confirm dialog timeout (secs)]
+[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
+[Monitor keyboard activity]
+[Monitor mouse activity]
+[Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
+[Ignore any key combination with above keys]
+[Protocols]
+[Enable checking]
+[Disable checking]
+[Set status message]
+[Trigger when connection loss is detected]
+[Trigger when reconnection attempt is made]
+[Trigger when successfull reconnected]
+[Trigger when giving up reconnecting]
+[Trigger when reconnected from another location]
+[Pre-conditions]
+[Trigger when a login error occurs]
 [Status]
+[Add...]
+[Delete]
+[Create a TopToolBar button]
+[Show confirm dialog when loading]
+[Create a main menu item]
+[Status Profiles]
+[HotKey1]
+[Hotkey]
+[In submenu]
+[Max. delay (secs)]
+[Increase delay exponential]
+[Cancel all if a protocol connects from another location]
+[Reconnect on APM resume]
+[Stop trying to reconnect]
+[Set delay to]
+[React on login errors]
+[seconds]
+[Set protocol offline before a connection attempt]
+[Max. protocol connecting time (secs)]
+[Timers]
+[Reconnecting]
+[Ignore locked status of accounts]
+[Consider connection lost after]
+[failed pings]
+[Continuously check interval (secs)]
+[Entering first auto-away status]
+[Entering second auto-away status]
+[Leaving first auto-away status]
+[Leaving second auto-away status]
+[Becoming active without status change]
+[TriggerData]
+[Status: The status the protocol will change to\r\nProtocol: The protocol changing state]
+;file \plugins\StatusPlugins\AdvancedAutoAway\options.cpp
 [minutes of %s mode]
-[General]
 [Rules]
 [Status Messages]
 [Auto Away]
+;file \Plugins\StatusPlugins\commonstatus.cpp
+[I've been away since %time%.]
+[Give it up, I'm not in!]
+[Not right now.]
+[Give a guy some peace, would ya?]
+[I'm a chatbot!]
+[Yep, I'm here.]
+[Nope, not here.]
+[I'm hiding from the mafia.]
+[That'll be the phone.]
+[Mmm...food.]
+[idleeeeeeee]
+;file \Plugins\StatusPlugins\confirmdialog.cpp
+[Set %s message for %s.]
+[<last>]
+[<current>]
+[<n/a>]
+[Closing in %d]
 #muuid {3750a5a3-bf0d-490e-b65d-41ac4d29aeb3}
 ;============================================================
 ;  File: AIM.dll
@@ -1988,7 +2141,7 @@
 #muuid {dbe8c990-7aa0-458d-bab7-33eb07238e71}
 ;============================================================
 ;  File: AvatarHistory.dll
-;  Plugin: Avatar History
+;  Plugin: Avatar history
 ;  Version: 0.0.3.3
 ;  Authors: Matthew Wild (MattJ), Ricardo Pescuma Domenecci
 ;============================================================
@@ -8837,8 +8990,144 @@
 ;  Authors: P Boon
 ;============================================================
 [KeepStatus, A connection checker, for use with (or without) StartupStatus and/or AdvancedAutoAway.]
-;file \plugins\StatusPlugins\KeepStatus\action_keepstatus.cpp
+;file \Plugins\StatusPlugins\resource.rc
+[Check connection]
+[Max. retries]
+[Protocol Connection]
+[Delay between retries (secs)]
+[Show popups]
+[General]
+[Protocols to check]
+[Dial-Up]
+[Don't reconnect if no internet connection seems available]
+[Continuously check for internet connection]
+[Do so by pinging host]
+[Confirm Status]
+[Close]
+[Cancel]
+[Profile]
+[Message]
+[after]
+[minutes of inactivity]
+[minutes of level 1 mode]
+[Confirm resetting status]
 [Protocol]
+[Only set if current status is]
+[Monitor Miranda's activity only]
+[Reset status on return]
+[when screen saver engages]
+[Set]
+[only set when inactive]
+[when workstation is locked]
+[Command Line]
+[OK]
+[Copy to Clipboard]
+[Command Line:]
+[Create Shortcut]
+[Add new profile]
+[Profile name]
+[Set window state]
+[Show dialog]
+[Set status to offline before exit]
+[Show CMDL]
+[Activate status profile]
+[Set docked]
+[Other]
+[Status on startup]
+[ms]
+[Set after]
+[Timeout]
+[s]
+[Set window location]
+[,]
+[Set window size]
+[x]
+[Allow override]
+[Note: status profiles can be created in the 'Status Profiles' options screen]
+[Window on startup]
+[Automatically dial on startup]
+[Automatically hang up on exit]
+[Dial-up (experimental)]
+[Background colour]
+[Text colour]
+[Use Windows colours]
+[Use default colours]
+[Delay]
+[On left click]
+[On right click]
+[Do nothing]
+[Close popup]
+[Cancel reconnecting]
+[Colours]
+[Preview]
+[Events]
+[Show when connection is lost]
+[Show when a connection attempt is made]
+[Show when reconnection has finished]
+[Show other messages]
+[From PopUp plugin]
+[Custom]
+[Permanent]
+[Show additional information in popups]
+[Use Miranda's message setting]
+[Use this message:]
+[Use %time% for the current time, %date% for the current date]
+[Variables...]
+[Specify settings for each protocol]
+[Use same settings for all protocols]
+[Ignore caps-lock, num-lock and scroll-lock keys]
+[Check interval (secs)]
+[Confirm dialog timeout (secs)]
+[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
+[Monitor keyboard activity]
+[Monitor mouse activity]
+[Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
+[Ignore any key combination with above keys]
+[Protocols]
+[Enable checking]
+[Disable checking]
+[Set status message]
+[Trigger when connection loss is detected]
+[Trigger when reconnection attempt is made]
+[Trigger when successfull reconnected]
+[Trigger when giving up reconnecting]
+[Trigger when reconnected from another location]
+[Pre-conditions]
+[Trigger when a login error occurs]
+[Status]
+[Add...]
+[Delete]
+[Create a TopToolBar button]
+[Show confirm dialog when loading]
+[Create a main menu item]
+[Status Profiles]
+[HotKey1]
+[Hotkey]
+[In submenu]
+[Max. delay (secs)]
+[Increase delay exponential]
+[Cancel all if a protocol connects from another location]
+[Reconnect on APM resume]
+[Stop trying to reconnect]
+[Set delay to]
+[React on login errors]
+[seconds]
+[Set protocol offline before a connection attempt]
+[Max. protocol connecting time (secs)]
+[Timers]
+[Reconnecting]
+[Ignore locked status of accounts]
+[Consider connection lost after]
+[failed pings]
+[Continuously check interval (secs)]
+[Entering first auto-away status]
+[Entering second auto-away status]
+[Leaving first auto-away status]
+[Leaving second auto-away status]
+[Becoming active without status change]
+[TriggerData]
+[Status: The status the protocol will change to\r\nProtocol: The protocol changing state]
+;file \plugins\StatusPlugins\KeepStatus\action_keepstatus.cpp
 [<from trigger>]
 ;file \plugins\StatusPlugins\KeepStatus\keepstatus.cpp
 [KeepStatus]
@@ -8859,8 +9148,25 @@
 [Basic]
 [Advanced]
 [You broke the Internet!]
-[Status]
 [PopUps]
+;file \Plugins\StatusPlugins\commonstatus.cpp
+[I've been away since %time%.]
+[Give it up, I'm not in!]
+[Not right now.]
+[Give a guy some peace, would ya?]
+[I'm a chatbot!]
+[Yep, I'm here.]
+[Nope, not here.]
+[I'm hiding from the mafia.]
+[That'll be the phone.]
+[Mmm...food.]
+[idleeeeeeee]
+;file \Plugins\StatusPlugins\confirmdialog.cpp
+[Set %s message for %s.]
+[<last>]
+[<current>]
+[<n/a>]
+[Closing in %d]
 #muuid {119d7288-2050-448d-9900-d86ac70426bf}
 ;langpack template for KeyboardNotify
 ;file \plugins\KeyboardNotify\res\resources.rc
@@ -9766,7 +10072,8 @@
 [Oops! BASS error]
 [Mute with Miranda]
 [Advanced]
-[Stop]#muuid {46102b07-c215-4162-9c83-d377881da7cc}
+[Stop]
+[Play]#muuid {46102b07-c215-4162-9c83-d377881da7cc}
 ;langpack template for Msg_Export
 ;file \plugins\Msg_Export\res\resource.rc
 [Browse]
@@ -10130,8 +10437,8 @@
 [Status]
 [Status Message]
 [Listening To]
-[Background]
 [My Details]
+[Background]
 [Avatar Border]
 [Show My Details]
 [Enable Listening To for %s]
@@ -10143,9 +10450,9 @@
 [Listening to]
 [Previous protocol]
 [Next protocol]
-[Contact List]
 [Set My Nickname for %s]
 [Set My Status Message for %s]
+[Contact List]
 ;file \plugins\MyDetails\src\options.cpp
 #muuid {3503D584-6234-4BEF-A553-6C1B9CD471F2}
 ;langpack template for NewEventNotify
@@ -10470,8 +10777,8 @@
 [changed %N @ %T%D%I]
 [changed %N message @ %I]
 [has %N @ %T%D%I]
-[These variables are available:\r\n\r\n\\r\n%N\textra status name (Xstatus, Mood, Activity)\r\n\\r\n%T\textra status title\r\n\\r\n%I\textra status text\r\n\\r\n%D\tdelimiter\r\n\\r\n%B\tline break (can be used as delimiter)]
-[These variables are available:\r\n\r\n\\r\n%n\tNew Status Message\r\n\\r\n%o\tOld Status Message\r\n\\r\n%c\tCustom Nickname\r\n\\r\n\\n\tline break\r\n\\r\n\\t\ttab stop]
+[These variables are available:\r\n\r\n\%N\textra status name (Xstatus, Mood, Activity)\r\n\%T\textra status title\r\n\%I\textra status text\r\n\%D\tdelimiter\r\n\%B\tline break (can be used as delimiter)]
+[These variables are available:\r\n\r\n\%n\tNew Status Message\r\n\%o\tOld Status Message\r\n\%c\tCustom Nickname\r\n\\\n\tline break\r\n\\\t\ttab stop]
 #muuid {4227c050-8d97-48d2-91ec-6a952b3dab94}
 ;langpack template for New_GPG
 ;file \plugins\New_GPG\res\new_gpg.rc
@@ -10935,8 +11242,8 @@
 [Last question is empty.]
 [Your question is too short.]
 [Your '/asl' setting is empty.]
-[There are three different modes of chatting:\\r\n\n1) Standard mode\t - You chat with random stranger privately\\r\n\n2) Question mode\t - You ask two strangers a question and see how they discuss it (you can't join their conversation, only watch)\\r\n\n3) Spy mode\t - You and stranger got a question to discuss from third stranger (he can't join your conversation, only watch)\\r\n\n\nSend '/commands' for available commands.]
-[You can use different commands:\\r\n\n/help\t - show info about chat modes\\r\n\n/new\t - start standard mode\\r\n\n/ask <question> - start question mode with your question\\r\n\n/ask\t - start question mode with your last asked question\\r\n\n/spy\t - start spy mode\\r\n\n/quit\t - disconnect from stranger or stop connecting\\r\n\n/asl\t - send your predefined ASL message\\r\n\n\nNote: You can reconnect to different stranger without disconnecting from current one.]
+[There are three different modes of chatting:\\n1) Standard mode\t - You chat with random stranger privately\\n2) Question mode\t - You ask two strangers a question and see how they discuss it (you can't join their conversation, only watch)\\n3) Spy mode\t - You and stranger got a question to discuss from third stranger (he can't join your conversation, only watch)\\n\nSend '/commands' for available commands.]
+[You can use different commands:\\n/help\t - show info about chat modes\\n/new\t - start standard mode\\n/ask <question> - start question mode with your question\\n/ask\t - start question mode with your last asked question\\n/spy\t - start spy mode\\n/quit\t - disconnect from stranger or stop connecting\\n/asl\t - send your predefined ASL message\\n\nNote: You can reconnect to different stranger without disconnecting from current one.]
 [Unknown command. Send '/commands' for list.]
 [You aren't connected to any stranger. Send '/help' or '/commands' for help.]
 [You can't send messages in question mode.]
@@ -13393,6 +13700,143 @@
 ;  Authors: P Boon
 ;============================================================
 [StartupStatus, allows you to define the status Miranda should set on startup, configurable per protocol.]
+;file \Plugins\StatusPlugins\resource.rc
+[Check connection]
+[Max. retries]
+[Protocol Connection]
+[Delay between retries (secs)]
+[Show popups]
+[General]
+[Protocols to check]
+[Dial-Up]
+[Don't reconnect if no internet connection seems available]
+[Continuously check for internet connection]
+[Do so by pinging host]
+[Confirm Status]
+[Close]
+[Cancel]
+[Profile]
+[Message]
+[after]
+[minutes of inactivity]
+[minutes of level 1 mode]
+[Confirm resetting status]
+[Protocol]
+[Only set if current status is]
+[Monitor Miranda's activity only]
+[Reset status on return]
+[when screen saver engages]
+[Set]
+[only set when inactive]
+[when workstation is locked]
+[Command Line]
+[OK]
+[Copy to Clipboard]
+[Command Line:]
+[Create Shortcut]
+[Add new profile]
+[Profile name]
+[Set window state]
+[Show dialog]
+[Set status to offline before exit]
+[Show CMDL]
+[Activate status profile]
+[Set docked]
+[Other]
+[Status on startup]
+[ms]
+[Set after]
+[Timeout]
+[s]
+[Set window location]
+[,]
+[Set window size]
+[x]
+[Allow override]
+[Note: status profiles can be created in the 'Status Profiles' options screen]
+[Window on startup]
+[Automatically dial on startup]
+[Automatically hang up on exit]
+[Dial-up (experimental)]
+[Background colour]
+[Text colour]
+[Use Windows colours]
+[Use default colours]
+[Delay]
+[On left click]
+[On right click]
+[Do nothing]
+[Close popup]
+[Cancel reconnecting]
+[Colours]
+[Preview]
+[Events]
+[Show when connection is lost]
+[Show when a connection attempt is made]
+[Show when reconnection has finished]
+[Show other messages]
+[From PopUp plugin]
+[Custom]
+[Permanent]
+[Show additional information in popups]
+[Use Miranda's message setting]
+[Use this message:]
+[Use %time% for the current time, %date% for the current date]
+[Variables...]
+[Specify settings for each protocol]
+[Use same settings for all protocols]
+[Ignore caps-lock, num-lock and scroll-lock keys]
+[Check interval (secs)]
+[Confirm dialog timeout (secs)]
+[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
+[Monitor keyboard activity]
+[Monitor mouse activity]
+[Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
+[Ignore any key combination with above keys]
+[Protocols]
+[Enable checking]
+[Disable checking]
+[Set status message]
+[Trigger when connection loss is detected]
+[Trigger when reconnection attempt is made]
+[Trigger when successfull reconnected]
+[Trigger when giving up reconnecting]
+[Trigger when reconnected from another location]
+[Pre-conditions]
+[Trigger when a login error occurs]
+[Status]
+[Add...]
+[Delete]
+[Create a TopToolBar button]
+[Show confirm dialog when loading]
+[Create a main menu item]
+[Status Profiles]
+[HotKey1]
+[Hotkey]
+[In submenu]
+[Max. delay (secs)]
+[Increase delay exponential]
+[Cancel all if a protocol connects from another location]
+[Reconnect on APM resume]
+[Stop trying to reconnect]
+[Set delay to]
+[React on login errors]
+[seconds]
+[Set protocol offline before a connection attempt]
+[Max. protocol connecting time (secs)]
+[Timers]
+[Reconnecting]
+[Ignore locked status of accounts]
+[Consider connection lost after]
+[failed pings]
+[Continuously check interval (secs)]
+[Entering first auto-away status]
+[Entering second auto-away status]
+[Leaving first auto-away status]
+[Leaving second auto-away status]
+[Becoming active without status change]
+[TriggerData]
+[Status: The status the protocol will change to\r\nProtocol: The protocol changing state]
 ;file \plugins\StatusPlugins\StartupStatus\options.cpp
 [<last>]
 [<current>]
@@ -13410,14 +13854,27 @@
 [At least one profile must exist]
 [StartupStatus]
 [Your default profile will be changed]
-[Status]
-[General]
-[Status Profiles]
 ;file \plugins\StatusPlugins\StartupStatus\profiles.cpp
 [There is a maximum of 6 menu items]
 ;file \plugins\StatusPlugins\StartupStatus\toolbars.cpp
 [Pressed toolbar icon]
 [Released toolbar icon]
+;file \Plugins\StatusPlugins\commonstatus.cpp
+[I've been away since %time%.]
+[Give it up, I'm not in!]
+[Not right now.]
+[Give a guy some peace, would ya?]
+[I'm a chatbot!]
+[Yep, I'm here.]
+[Nope, not here.]
+[I'm hiding from the mafia.]
+[That'll be the phone.]
+[Mmm...food.]
+[idleeeeeeee]
+;file \Plugins\StatusPlugins\confirmdialog.cpp
+[Set %s message for %s.]
+[<n/a>]
+[Closing in %d]
 #muuid {553811ee-deb6-48b8-8902-a8a00c1fd679}
 ;============================================================
 ;  File: StopSpam.dll
@@ -13445,7 +13902,7 @@
 [Log Spammers to system history]
 ;file \plugins\StopSpamPlus\src\events.cpp
 [Message Sessions]
-[Main]
+[General]
 [Messages]
 [Accounts]
 ;file \plugins\StopSpamPlus\src\options.cpp
@@ -13514,7 +13971,7 @@
 [Info]
 [Message Sessions]
 [StopSpam]
-[Main]
+[General]
 [Messages]
 [Accounts]
 [Advanced]
@@ -13858,6 +14315,7 @@
 [Show Message Length Indicator]
 [Tabmenu]
 [Close Tab]
+[Close Other Tabs]
 [Leave Chat Room]
 [Save Tab Position]
 [Clear saved Tab Position]
@@ -13995,6 +14453,26 @@
 [URL events]
 [Other events]
 [Send message on Ctrl+Enter (always enabled)]
+;file \plugins\TabSRMM\src\buttonsbar.cpp
+[Protocol Button]
+[Info button]
+[Insert Emoticon]
+[Bold text]
+[Italic text]
+[Underlined text]
+[Strike-through text]
+[Select font color]
+[Send message\nClick dropdown arrow for sending options]
+[Close session]
+[Quote last message OR selected text]
+[Message Log Options]
+[View User's History]
+[Edit user notes]
+[Change background color]
+[Toggle nick list]
+[Event filter - right click to setup, left click to activate/deactivate]
+[Channel manager]
+[<Separator>]
 ;file \plugins\TabSRMM\src\container.cpp
 [Hide titlebar]
 [Container options...]
@@ -14095,11 +14573,8 @@
 [Toggle text direction]
 [Toggle multi send]
 [Clear message log]
-[Edit user notes]
 [Collapse side bar]
-[Channel manager]
 [Toggle filter]
-[Toggle nick list]
 [Show server window]
 ;file \plugins\TabSRMM\src\infopanel.cpp
 [%s    Idle: %dh,%02dm]
@@ -14243,7 +14718,6 @@
 ;file \plugins\TabSRMM\src\msgs.cpp
 [The image service plugin (advaimg.dll) is not properly installed.\n\nTabSRMM is disabled.]
 [TabSRMM fatal error]
-[Message Log Options]
 [Image tag]
 [Quote text]
 [Save and close]
@@ -16445,6 +16919,7 @@
 [Disable Plugin]
 [Enable Plugin]
 [Don't forget to enter Login and Password to use Last.fm service]
+[Don't forget to enter Login and Password to use MyShows service]
 [Attempts]
 [Disable scrobbling]
 [Enable scrobbling]
@@ -16474,7 +16949,15 @@
 [Alpha]
 [Hide when no player]
 [Hide when no music]
-[Use popup action buttons]#muuid {692e87d0-6c71-4cdc-9e36-2b2d69fbdc4c}
+[Use popup action buttons]
+[Left click]
+[Right click]
+[Default colors]
+[Windows colors]
+[Custom colors]
+[artist]
+[album]
+[genre]#muuid {692e87d0-6c71-4cdc-9e36-2b2d69fbdc4c}
 ;langpack template for Watrack_MPD
 ;file \plugins\Watrack_MPD\res\watrack_mpd.rc
 [MPD Host]