16 files changed, 261 insertions, 74 deletions
diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index 8eca0e76d5..9001632c17 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -9,11 +9,11 @@
 ;file \Plugins\StatusPlugins\resource.rc
 [Check connection]
 [Max. retries]
-[Protocol Connection]
+[Account Connection]
 [Delay between retries (secs)]
 [Show popups]
 [General]
-[Protocols to check]
+[Accounts to check]
 [Dial-Up]
 [Don't reconnect if no internet connection seems available]
 [Continuously check for internet connection]
@@ -27,7 +27,7 @@
 [minutes of inactivity]
 [minutes of level 1 mode]
 [Confirm resetting status]
-[Protocol]
+[Account]
 [Only set if current status is]
 [Monitor Miranda's activity only]
 [Reset status on return]
@@ -89,8 +89,8 @@
 [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]
+[Specify settings for each account]
+[Use same settings for all accounts]
 [Ignore caps-lock, num-lock and scroll-lock keys]
 [Check interval (secs)]
 [Confirm dialog timeout (secs)]
@@ -99,7 +99,7 @@
 [Monitor mouse activity]
 [Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
 [Ignore any key combination with above keys]
-[Protocols]
+[Accounts]
 [Enable checking]
 [Disable checking]
 [Set status message]
@@ -122,14 +122,14 @@
 [In submenu]
 [Max. delay (secs)]
 [Increase delay exponential]
-[Cancel all if a protocol connects from another location]
+[Cancel all if a account 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)]
+[Set account offline before a connection attempt]
+[Max. account connecting time (secs)]
 [Timers]
 [Reconnecting]
 [Ignore locked status of accounts]
@@ -142,7 +142,7 @@
 [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]
+[Status: The status the account will change to\r\nAccount: The account changing state]
 ;file \plugins\StatusPlugins\AdvancedAutoAway\options.cpp
 [minutes of %s mode]
 [Rules]
@@ -165,4 +165,5 @@
 [<last>]
 [<current>]
 [<n/a>]
+[Protocol]
 [Closing in %d]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 9d8dc557a2..c3f5a74c4a 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -928,7 +928,6 @@
 [Nickname]
 [First name]
 [Last name]
-[Age]
 [Gender]
 [About]
 [Password]
@@ -970,7 +969,6 @@
 [Company department]
 [Company position]
 [Company industry]
-[Company occupation]
 [Personal Interests]
 [Interest category 1]
 [Interest areas 1]
@@ -980,20 +978,6 @@
 [Interest areas 3]
 [Interest category 4]
 [Interest areas 4]
-[Past Background]
-[Category 1]
-[Past Background 1]
-[Category 2]
-[Past Background 2]
-[Category 3]
-[Past Background 3]
-[Affiliations]
-[Affiliation category 1]
-[Affiliation 1]
-[Affiliation category 2]
-[Affiliation 2]
-[Affiliation category 3]
-[Affiliation 3]
 ;file \protocols\IcqOscarJ\src\changeinfo\db.cpp
 [The password does not match your current password. Check Caps Lock and try again.]
 [Change ICQ Details]
diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 8aa615fe30..808df64f34 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -9,11 +9,11 @@
 ;file \Plugins\StatusPlugins\resource.rc
 [Check connection]
 [Max. retries]
-[Protocol Connection]
+[Account Connection]
 [Delay between retries (secs)]
 [Show popups]
 [General]
-[Protocols to check]
+[Accounts to check]
 [Dial-Up]
 [Don't reconnect if no internet connection seems available]
 [Continuously check for internet connection]
@@ -27,7 +27,7 @@
 [minutes of inactivity]
 [minutes of level 1 mode]
 [Confirm resetting status]
-[Protocol]
+[Account]
 [Only set if current status is]
 [Monitor Miranda's activity only]
 [Reset status on return]
@@ -89,8 +89,8 @@
 [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]
+[Specify settings for each account]
+[Use same settings for all accounts]
 [Ignore caps-lock, num-lock and scroll-lock keys]
 [Check interval (secs)]
 [Confirm dialog timeout (secs)]
@@ -99,7 +99,7 @@
 [Monitor mouse activity]
 [Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
 [Ignore any key combination with above keys]
-[Protocols]
+[Accounts]
 [Enable checking]
 [Disable checking]
 [Set status message]
@@ -122,14 +122,14 @@
 [In submenu]
 [Max. delay (secs)]
 [Increase delay exponential]
-[Cancel all if a protocol connects from another location]
+[Cancel all if a account 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)]
+[Set account offline before a connection attempt]
+[Max. account connecting time (secs)]
 [Timers]
 [Reconnecting]
 [Ignore locked status of accounts]
@@ -142,8 +142,9 @@
 [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]
+[Status: The status the account will change to\r\nAccount: The account changing state]
 ;file \plugins\StatusPlugins\KeepStatus\action_keepstatus.cpp
+[Protocol]
 [<from trigger>]
 ;file \plugins\StatusPlugins\KeepStatus\keepstatus.cpp
 [KeepStatus]
diff --git a/langpacks/english/Plugins/KeyboardNotify.txt b/langpacks/english/Plugins/KeyboardNotify.txt
index 98a3c996b1..588fe18134 100644
--- a/langpacks/english/Plugins/KeyboardNotify.txt
+++ b/langpacks/english/Plugins/KeyboardNotify.txt
@@ -1,7 +1,7 @@
 #muuid {119d7288-2050-448d-9900-d86ac70426bf}
 ;langpack template for KeyboardNotify
 ;file \plugins\KeyboardNotify\res\resources.rc
-[Protocols to check]
+[Accounts to check]
 [Events to react on]
 [Incoming messages]
 [Incoming files]
diff --git a/langpacks/english/Plugins/ListeningTo.txt b/langpacks/english/Plugins/ListeningTo.txt
index 6b129f0357..5b4c26f18c 100644
--- a/langpacks/english/Plugins/ListeningTo.txt
+++ b/langpacks/english/Plugins/ListeningTo.txt
@@ -50,16 +50,17 @@
 [Listening to (enabled)]
 [Listening to (disabled)]
 [Send to all protocols]
-[Listening info\tListening info as set in the options]
-[Listening info\tMedia type: Music, Video, etc]
-[Listening info\tArtist name]
-[Listening info\tAlbum name]
-[Listening info\tSong name]
-[Listening info\tTrack number]
-[Listening info\tSong year]
-[Listening info\tSong genre]
-[Listening info\tSong length]
-[Listening info\tPlayer name]
+[Listening info]
+[Listening info as set in the options]
+[Media type: Music, Video, etc]
+[Artist name]
+[Album name]
+[Song name]
+[Track number]
+[Song year]
+[Song genre]
+[Song length]
+[Player name]
 [Don't send to any protocols]
 [Toggle send to all protocols]
 [Enable/Disable sending Listening To info (to all protocols)]
@@ -69,7 +70,6 @@
 [<Unknown>]
 [<Nothing is playing now>]
 [Status]
-[Listening info]
 [General]
 [Format]
 [Players]
diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index c82c95eb57..7f1578a213 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -109,6 +109,39 @@
 [CHAT plugin is required for conferences. Install it before chatting]
 [invite sender]
 [invite new members]
+;file \protocols\MRA\src\MraConstans.h
+[Your contact wakes you]
+[Display &Inbox]
+[Display &Inbox status]
+[Edit &Profile]
+[My Album]
+[My Blog]
+[My Blog Status]
+[My Video]
+[My Answers]
+[My World]
+[Zhuki]
+[Web search]
+[Update all users info]
+[Check updates users avatars]
+[Request authorization for all]
+[Request authorization]
+[Grant authorization]
+[&Send postcard]
+[&View Album]
+[&Read Blog]
+[Reply Blog Status]
+[View Video]
+[Answers]
+[World]
+[Send &Nudge]
+[Mail box deleted]
+[Contact not on server]
+[Not authorized]
+[Phone/SMS only contact]
+[Blog status message]
+[New E-mail available in Inbox]
+[Please authorize me]
 ;file \protocols\MRA\src\MraFilesQueue.cpp
 [Receive files: cant allocate disk space for file, size %lu bytes, error]
 [Receive files: cant open file %s, error]
diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 0433465045..b207d4df09 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -78,6 +78,7 @@
 [Reading database information (Phase 1 of 2)]
 [Failed to export at least one contact]
 [Sorting and writing database information ( Phase 2 of 2 )]
+[Max line width must be at least %d]
 [You need to restart miranda to change the history function]
 [Failed to get the path to Msg_Export.dll\nPlease locate Msg_Export.txt your self]
 [File]
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index ae9cec56c7..42b3e594ac 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\%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]
+[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 d63aa64701..36cf059b4f 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:\\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.]
+[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/QuickReplies.txt b/langpacks/english/Plugins/QuickReplies.txt
index 0cc5fc1c37..5286f0c754 100644
--- a/langpacks/english/Plugins/QuickReplies.txt
+++ b/langpacks/english/Plugins/QuickReplies.txt
@@ -7,6 +7,7 @@
 ;============================================================
 [Plugin for quick insert (or sending) pre-defined messages in message input area.]
 ;file \plugins\QuickReplies\res\resources.rc
+[QuickReplies]
 [Send replies immediately]
 [- Add your replies, one per line.]
 [Variables]
diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 687ef22d96..d92781719d 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -18,8 +18,11 @@
 [Display]
 [Replace only smileys surrounded by spaces]
 [Scale smiley to textheight]
-[Animate]
 [Disable custom smileys]
+[High Quality smiley scaling]
+[Animate]
+[Max "Custom Smiley" height]
+[Min smiley height]
 [Smiley Selector]
 [Surround inserted smiley with spaces]
 [Use first smiley for selection size]
@@ -30,9 +33,6 @@
 [Built-In Message Dialog Support]
 [Disable]
 [Smiley Button]
-[Max "Custom Smiley" height]
-[High Quality smiley scaling]
-[Min smiley height]
 ;file \plugins\SmileyAdd\src\dlgboxsubclass.cpp
 [Show Smiley Selection Window]
 ;file \plugins\SmileyAdd\src\download.cpp
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 6c41f559c8..4f69ea69e2 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -9,11 +9,11 @@
 ;file \Plugins\StatusPlugins\resource.rc
 [Check connection]
 [Max. retries]
-[Protocol Connection]
+[Account Connection]
 [Delay between retries (secs)]
 [Show popups]
 [General]
-[Protocols to check]
+[Accounts to check]
 [Dial-Up]
 [Don't reconnect if no internet connection seems available]
 [Continuously check for internet connection]
@@ -27,7 +27,7 @@
 [minutes of inactivity]
 [minutes of level 1 mode]
 [Confirm resetting status]
-[Protocol]
+[Account]
 [Only set if current status is]
 [Monitor Miranda's activity only]
 [Reset status on return]
@@ -89,8 +89,8 @@
 [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]
+[Specify settings for each account]
+[Use same settings for all accounts]
 [Ignore caps-lock, num-lock and scroll-lock keys]
 [Check interval (secs)]
 [Confirm dialog timeout (secs)]
@@ -99,7 +99,7 @@
 [Monitor mouse activity]
 [Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
 [Ignore any key combination with above keys]
-[Protocols]
+[Accounts]
 [Enable checking]
 [Disable checking]
 [Set status message]
@@ -122,14 +122,14 @@
 [In submenu]
 [Max. delay (secs)]
 [Increase delay exponential]
-[Cancel all if a protocol connects from another location]
+[Cancel all if a account 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)]
+[Set account offline before a connection attempt]
+[Max. account connecting time (secs)]
 [Timers]
 [Reconnecting]
 [Ignore locked status of accounts]
@@ -142,7 +142,7 @@
 [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]
+[Status: The status the account will change to\r\nAccount: The account changing state]
 ;file \plugins\StatusPlugins\StartupStatus\options.cpp
 [<last>]
 [<current>]
@@ -180,4 +180,5 @@
 ;file \Plugins\StatusPlugins\confirmdialog.cpp
 [Set %s message for %s.]
 [<n/a>]
+[Protocol]
 [Closing in %d]
diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index b57d25fdbf..41c5649c14 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -1,15 +1,15 @@
 #muuid {59b0036e-5403-422e-883b-c9aaf425682b}
 ;langpack template for Variables
 ;file \plugins\Variables\res\Variables.rc
-[Parse]
-[Auto parse]
-[Parse the following string at startup]
+[Parse options]
 [Automatically strip "end of line" characters]
 [Automatically strip white space]
+[Automatically strip all non-parsing characters]
 [Test area]
 [Click on the help button to get more information]
-[Parse options]
-[Automatically strip all non-parsing characters]
+[Parse the following string at startup]
+[Auto parse]
+[Parse]
 [Trigger when the following string changes]
 [Please enter your input below]
 [Don't set a contact]
@@ -25,6 +25,7 @@
 [Variables...]
 ;file \plugins\Variables\src\help.cpp
 [Token]
+[--- Special characters ---\r\n\r\nThe following characters have a special meaning in a formatting string:\r\n\r\n?<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will be parsed again. Example: Today is ?cdate(yyyy/MM/dd).\r\n\r\n!<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will not be parsed again. Example: Message waiting: !message(,first,rcvd,unread).\r\n\r\n%<field>%\r\nThis will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n`<string>`\r\nThis will not parse the given string, any function, field or special character in the string will shown in the result without being translated. Example: Use `%mirandapath%` to show the installation path.\r\n\r\n#<comment>\r\nThis will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n--- Contacts ---\r\n\r\nWhenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n(1) Using a unique id (UIN for ICQ, email for MSN) or, a protocol id followed by a unique id in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n(2) Using the contact function:\r\n?contact(x,y)\r\nA contact will be searched which will have value x for its property y, y can be one of the following:\r\nfirst, last, nick, email, id or display\r\n\r\nFor example: ?contact(miranda@hotmail.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.]
 [Tokens]
 [Input]
 [Cancel]
@@ -34,7 +35,167 @@
 ;file \plugins\Variables\src\options.cpp
 [Services]
 [Variables]
+;file \plugins\Variables\src\parse_alias.cpp
+[Alias]
+[user defined]
+[stores y as alias named x]
 ;file \plugins\Variables\src\parse_external.cpp
 [Stopped]
 [Paused]
+[External Applications]
+[retrieves song name of the song currently playing in Winamp]
+[retrieves current Winamp state (Playing/Paused/Stopped)]
+[retrieves info from AMIP (x is var_<variable> with any AMIP variable)]
+[retrieves info from AMIP (x is AMIP format string)]
+;file \plugins\Variables\src\parse_inet.cpp
+[Internet Related]
+[converts each non-html character into hex format]
+[converts each hex value into non-html character]
+[converts a 32-bit number to IPv4 dotted notation]
+[converts a 32-bit number (in host byte order) to IPv4 dotted notation]
+;file \plugins\Variables\src\parse_logic.cpp
+[Logical Expressions]
+[performs logical AND (x && y && ...)]
+[Boolean FALSE]
+[performs w, then shows z and performs y while x is TRUE]
+[shows y if x is TRUE, otherwise it shows z]
+[shows x if x is TRUE, otherwise it shows y (if(x,x,y))]
+[the first argument parsed successfully]
+[y if w = x, else z]
+[y if w > x, else z]
+[y if string length of w > x, else z]
+[TRUE if x = y]
+[TRUE if x > y]
+[TRUE if x is longer than y]
+[performs logical NOT (!x)]
+[performs logical OR (x || y || ...)]
+[Boolean TRUE]
+[performs logical XOR (x ^ y)]
+;file \plugins\Variables\src\parse_math.cpp
+[Mathematical Functions]
+[x + y + ...]
+[x divided by y]
+[converts decimal value x to hex value and padds to length y]
+[x modulo y (remainder of x divided by y)]
+[x times y]
+[x times y divided by z]
+[minimum value of (decimal) arguments]
+[maximum value of (decimal) arguments]
+[pads decimal value x to length y with zeros]
+[random number]
+[x - y - ...]
+;file \plugins\Variables\src\parse_metacontacts.cpp
+[MetaContacts]
+[get parent metacontact of contact x]
+[get default subcontact x]
+[get the 'most online' subcontact x]
+;file \plugins\Variables\src\parse_miranda.cpp
+[Miranda Core Global]
+[path to root miranda folder]
+[path to current miranda profile]
+[name of current miranda profile (filename, without extension)]
+[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
+[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%\\AvatarCache]
+[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%\\Logs]
+[Miranda Core OS]
+[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]
+[Miranda Related]
+[translates status code x into a status description]
+[zth contact with property y described by x, example: (unregistered,nick) (z is optional)]
+[number of contacts with property y described by x, example: (unregistered,nick)]
+[info property y of contact x]
+[db profile name]
+[db profile path]
+[db setting z of module y of contact x and return w if z isn't exist (w is optional)]
+[get event for contact x (optional), according to y,z,w, see documentation]
+[get last seen time of contact x in format y (y is optional)]
+[get last seen date of contact x in format y (y is optional)]
+[get last seen status of contact x]
+[path to the Miranda NG executable]
+[current status description of protocol x (without x, the global status is retrieved)]
+[info property y of protocol id x]
+[retrieves the subject, depending on situation]
+[translates x]
+[get the version of Miranda]
+[get the contact display name]
+[get the date and time (using Miranda format)]
+[TRUE if service function exists]
+;file \plugins\Variables\src\parse_regexp.cpp
+[Regular Expressions]
+[(ANSI input only) the number of substring matches found in y with pattern x]
+[(ANSI input only) substring match number z found in subject y with pattern x]
+;file \plugins\Variables\src\parse_str.cpp
+[String Functions]
+[converts each first letter of a word to uppercase, all others to lowercase]
+[converts each first letter of a word to uppercase]
+[inserts 'end of line' character]
+[depends on calling plugin]
+[Replace all occurrences of \\n (Unix) by \\r\\n (Windows)]
+[cuts x after the first line and appends y (y is optional)]
+[replaces all end of line characters by y (y is optional)]
+[inserts string y at position z in string x]
+[trims x to length y, keeping first y characters]
+[length of x]
+[the number of lines in string x]
+[the longest string of the arguments]
+[converts x to lowercase]
+[no operation, x as given]
+[pads x to length y prepending character z (z is optional)]
+[pads x to length y appending character z (z is optional)]
+[pads x to length y prepending character z, or cut if x is longer (z is optional)]
+[pads x to length y appending character z, or cut if x is longer (z is optional)]
+[repeats x y times]
+[replace all occurrences of y in x with z, multiple y and z arguments allowed]
+[trims x to length y, keeping last y characters]
+[moves string x, z characters to the left and trims it to y characters]
+[TRUE if x equals y]
+[TRUE if x equals any of the following arguments]
+[TRUE if the first z characters of x equal y]
+[TRUE if x equals y, ignoring case]
+[TRUE if the first z characters of x equal y, ignoring case]
+[the shortest string of the arguments]
+[location of first occurrence of character y in string x]
+[location of last occurrence of character y in string x]
+[location of first occurrence of string y in x]
+[substring of x starting from position y to z]
+[the xth string of the arguments]
+[z if y equals x, multiple y and z arguments allowed]
+[removes white spaces in before and after x]
+[inserts x tab characters (x is optional)]
+[converts x to upper case]
+[words (separated by white spaces) number y to z from string x (z is optional)]
+;file \plugins\Variables\src\parse_system.cpp
+[System Functions]
+[computer name]
+[cpu load of process x (without extension) (x is optional)]
+[current date in format y (y is optional)]
+[current time in format y (y is optional)]
+[the directory y directories above x]
+[strips y directories from x]
+[number of seconds between date x and y (x and y in format: M/d/yy H:m:s)]
+[TRUE if directory x exists]
+[TRUE if file x exists]
+[window title of first window of class x]
+[shows files and directories of directory z, with filter y, separated by z (y and z optional)]
+[TRUE if process x is running]
+[value y from registry key x (REG_SZ (string) values only)]
+[formats timestamp x (seconds since 1/1/1970) in date format y]
+[formats timestamp x (seconds since 1/1/1970) in time format y]
+[y > 0: line number y from file x, y = 0: the whole file, y < 0: line y counted from the end, y = r: random line]
+[uptime in seconds]
+[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]
+[expand environment variable x]
+[user name]
+[text from clipboard]
+;file \plugins\Variables\src\parse_variables.cpp
+[variable set by put(s) with name x]
+[x, and stores y as variable named x]
+[only stores y as variables x]
+;file \plugins\Variables\src\parse_xml.cpp
+[XML]
+[apply stylesheet file x to document file y]
+[apply stylesheet x to document y]
 ;file \plugins\Variables\src\variables.cpp
diff --git a/langpacks/english/Plugins/WhenWasIt.txt b/langpacks/english/Plugins/WhenWasIt.txt
index 3324fcb709..59765d9e6a 100644
--- a/langpacks/english/Plugins/WhenWasIt.txt
+++ b/langpacks/english/Plugins/WhenWasIt.txt
@@ -7,8 +7,7 @@
 ;============================================================
 [Notifies you of upcoming birthdays.]
 ;file \plugins\WhenWasIt\res\WhenWasIt.rc
-[`]
-[Notify of birthdays using:]
+[Notify of birthdays:]
 [  ]
 [Popups]
 [Popup timeout:]
diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index 113d878541..619df8ff50 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -95,6 +95,9 @@
 [Launch application]
 [Check mail]
 [Connect Fail]
+;file \plugins\YAMN\src\main.h
+[YAMN: new mail message]
+[YAMN: connect failed]
 ;file \plugins\YAMN\src\services.cpp
 [Nick]
 [No new mail message]
diff --git a/langpacks/english/Plugins/YAPP.txt b/langpacks/english/Plugins/YAPP.txt
index 06c1c2a586..b437775928 100644
--- a/langpacks/english/Plugins/YAPP.txt
+++ b/langpacks/english/Plugins/YAPP.txt
@@ -20,7 +20,6 @@
 [Border]
 [Round corners (window)]
 [Preview]
-[Animate]
 [Transparent background]
 [Layout]
 [Avatar size:]
@@ -57,6 +56,9 @@
 [Right avatar]
 [Status]
 [Full-screen app running]
+[No animate]
+[Horizontal animate]
+[Vertical animate]
 [You cannot set a default timeout of 0.\nValue has been reset.]
 [Error]
 [PopUps]