- langpacks/english: updated

git-svn-id: http://svn.miranda-ng.org/main/trunk@3461 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

9 files changed, 472 insertions, 16 deletions

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index 750ecca1c8..8eca0e76d5 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -6,10 +6,163 @@
 ;  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]

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index c208dd57cc..124f56296e 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -1,7 +1,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

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

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 5c148f9d30..8aa615fe30 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -6,8 +6,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]

@@ -28,5 +164,22 @@
 [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]

diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index 80a27dda2a..7f246c5328 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -67,8 +67,8 @@
 [Status]

 [Status Message]

 [Listening To]

-[Background]

 [My Details]

+[Background]

 [Avatar Border]

 [Show My Details]

 [Enable Listening To for %s]

@@ -80,7 +80,7 @@
 [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

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index 8fcb4f2ec3..ae9cec56c7 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -191,5 +191,5 @@
 [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]

diff --git a/langpacks/english/Plugins/Omegle.txt b/langpacks/english/Plugins/Omegle.txt
index 304027778c..d63aa64701 100644
--- a/langpacks/english/Plugins/Omegle.txt
+++ b/langpacks/english/Plugins/Omegle.txt
@@ -19,8 +19,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.]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 8b16e02b74..6c41f559c8 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -6,6 +6,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>]

@@ -23,11 +160,24 @@
 [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]

diff --git a/langpacks/english/Plugins/StopSpam.txt b/langpacks/english/Plugins/StopSpam.txt
index 330fd552f5..ba50f85242 100644
--- a/langpacks/english/Plugins/StopSpam.txt
+++ b/langpacks/english/Plugins/StopSpam.txt
@@ -25,7 +25,7 @@
 [Log Spammers to system history]

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

 [Message Sessions]

-[Main]

+[General]

 [Messages]

 [Accounts]

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

diff --git a/langpacks/english/Plugins/StopSpamMod.txt b/langpacks/english/Plugins/StopSpamMod.txt
index 06bedea195..8e84c755c3 100644
--- a/langpacks/english/Plugins/StopSpamMod.txt
+++ b/langpacks/english/Plugins/StopSpamMod.txt
@@ -54,7 +54,7 @@
 [Info]

 [Message Sessions]

 [StopSpam]

-[Main]

+[General]

 [Messages]

 [Accounts]

 [Advanced]