-langpacks/english: update;

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

27 files changed, 94 insertions, 115 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 426bae5208..707b1e57f7 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -536,6 +536,7 @@
 [Move to the main menu]

 [Move to the status bar]

 [Warning!\r\nThis menu object not support user defined options.]

+[Insert submenu]

 [Insert separator]

 [Service:]

 [Default]

@@ -1215,6 +1216,7 @@
 [Group menu]

 [Subgroup menu]

 ;file \src\mir_app\src\menu_options.cpp

+[New submenu]

 [Menus]

 ;file \src\mir_app\src\menu_tray.cpp

 [Tray menu]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index e90d3dfa7e..f729a4083d 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -235,38 +235,6 @@
 [&Invisible\tCtrl+7]

 [On the &phone\tCtrl+8]

 [Out to &lunch\tCtrl+9]

-;file \plugins\Clist_nicer\skineditor\res\skinedit.rc

-[Skin items]

-[General]

-[Gradient]

-[Left to right]

-[Right to left]

-[Top to bottom]

-[Bottom to top]

-[Round corners]

-[Top-Left]

-[Top-Right]

-[Bottom-Right]

-[Bottom-Left]

-[Item colors]

-[First color]

-[Text color]

-[Second color]

-[Transparent]

-[Alpha (percent)]

-[Item margins]

-[Item borders]

-[Border style]

-[3D border (bright / dark)]

-[Item ignored]

-[Not yet supported]

-;file \plugins\Clist_nicer\skineditor\src\main.cpp

-[Copy from]

-[<None>]

-[Raised]

-[Sunken]

-[Bumped]

-[Etched]

 ;file \plugins\Clist_nicer\src\CLCButton.cpp

 [Show menu]

 [Show/Hide offline contacts]

@@ -309,6 +277,7 @@
 [Far left]

 [Far right]

 [With nickname - right]

+[General]

 [List layout]

 [Background]

 [Row items]

diff --git a/langpacks/english/Plugins/Cln_skinedit.txt b/langpacks/english/Plugins/Cln_skinedit.txt
index a2781081bd..a8681520bc 100644
--- a/langpacks/english/Plugins/Cln_skinedit.txt
+++ b/langpacks/english/Plugins/Cln_skinedit.txt
@@ -6,7 +6,7 @@
 ;  Authors: Nightwish, Pixel

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

 [Allows inline skin item editing for clist nicer.]

-;file \plugins\Clist_nicer\skineditor\res\skinedit.rc

+;file \plugins\Cln_skinedit\res\skinedit.rc

 [Skin items]

 [General]

 [Gradient]

@@ -32,7 +32,7 @@
 [Item ignored]

 [Dialog]

 [Not yet supported]

-;file \plugins\Clist_nicer\skineditor\src\main.cpp

+;file \plugins\Cln_skinedit\src\main.cpp

 [Copy from]

 [<None>]

 [Raised]

diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index b03117a6b3..3129a7ace1 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -30,9 +30,6 @@
 [Database backed up]

 [Database back up in process...]

 [Error]

-;file \plugins\Db_autobackups\src\headers.h

-[Backup profile]

-[Save profile as...]

 ;file \plugins\Db_autobackups\src\main.cpp

 [Database]

 [Database backups]

@@ -40,6 +37,8 @@
 [Compressed Miranda NG databases]

 [All files]

 [Backup folder]

+[Backup profile]

+[Save profile as...]

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

 [path to Miranda root folder]

 [path to folder containing Miranda profiles]

@@ -56,3 +55,4 @@
 [minutes]

 [Select backup folder]

 [Error creating backup folder]

+;file \plugins\Db_autobackups\src\stdafx.h

diff --git a/langpacks/english/Plugins/FTPFile.txt b/langpacks/english/Plugins/FTPFile.txt
index 89b8ee8a49..1880d9ce9b 100644
--- a/langpacks/english/Plugins/FTPFile.txt
+++ b/langpacks/english/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: FTPFile.dll

 ;  Plugin: FTP File YM

-;  Version: 0.6.0.0

+;  Version: 0.6.0.1

 ;  Authors: yaho

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

 [FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.]

diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index ce608c9185..d54760a520 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -45,8 +45,6 @@
 [Other]

 [Choose appropriate accounts for import]

 ;file \plugins\Import\src\import.cpp

-[Ignored event from/to self]

-[Added contact %u (found in history)]

 [<New account>]

 [Old account]

 [New account]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 62a4ad82bf..7217752061 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -60,6 +60,8 @@
 [&Invite]

 [&Cancel]

 [Add]

+;file \protocols\MSN\src\msn_auth.cpp

+[MSN Protocol]

 ;file \protocols\MSN\src\msn_chat.cpp

 [Chat #]

 [&Invite user...]

@@ -74,7 +76,6 @@
 [MSN Alert]

 [Contact tried to open an audio conference (not currently supported)]

 [Accept NetMeeting request from %s?]

-[MSN Protocol]

 [Chat session established by my request]

 [Chat session established by contact request]

 [Contact left channel]

@@ -158,3 +159,5 @@
 [Convert to Chat]

 ;file \protocols\MSN\src\msn_ws.cpp

 [Chat session dropped due to inactivity]

+;file \protocols\MSN\src\stdafx.h

+[Automatic authentication to MSN failed, possibly due to Captcha-Authentication. Do you want to open a browser window to do a manual login?\n\nThis will not log you in to MSN in Miranda, but it allows you to fix potential problems like entering a captcha that gets asked due to location change or to accept new TOS, which are required only once.\n\nAlso please note that MSN protocol doesn't support two-factor authentication.]

diff --git a/langpacks/english/Plugins/MirLua.txt b/langpacks/english/Plugins/MirLua.txt
index ede75f17c9..7633d707b1 100644
--- a/langpacks/english/Plugins/MirLua.txt
+++ b/langpacks/english/Plugins/MirLua.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MirLua.dll

 ;  Plugin: MirLua

-;  Version: 0.11.3.6

+;  Version: 0.11.4.4

 ;  Authors: Miranda NG team

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

 [Extends Miranda NG functionality with Lua scripts.]

@@ -10,8 +10,6 @@
 [Reload all]

 ;file \plugins\MirLua\src\main.cpp

 [Common scripts folder]

-[Custom scripts folder]

 ;file \plugins\MirLua\src\mlua_options.cpp

 [Scripts]

 [Common scripts]

-[Custom scripts]

diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index cc6e139c2f..62c1f99b61 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -58,8 +58,6 @@
 [Failed to save file]

 [History was saved successfully in file\r\n]

 [Failed to create history dialog]

-;file \plugins\Msg_Export\src\Glob.h

-[Miranda NG (Message Export Plugin)]

 ;file \plugins\Msg_Export\src\main.cpp

 [Open E&xported History]

 [Failed to add menu item Open Exported History\nCallService(MS_CLIST_ADDCONTACTMENUITEM,...)]

@@ -86,6 +84,8 @@
 [History]

 [General]

 [Additional]

+;file \plugins\Msg_Export\src\stdafx.h

+[Miranda NG (Message Export Plugin)]

 ;file \plugins\Msg_Export\src\utils.cpp

 [No_Nick]

 [No_Group]

diff --git a/langpacks/english/Plugins/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
index 8f602ca810..2bf15b251c 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -169,13 +169,6 @@
 [Off]

 [Use the default setting]

 [NewAwaySys: Incoming status message request]

-;file \plugins\NewAwaySysMod\src\Common.h

-[Miranda NG autoreply >\r\n%extratext%]

-[extended status]

-[Away System]

-[Status]

-[Popups]

-[Variables plugin is not installed]

 ;file \plugins\NewAwaySysMod\src\MsgTree.cpp

 [You've made changes to multiple message trees at a time.\r\nDo you want to leave changes in "]

 [" dialog?\r\nPress Yes to leave changes in this dialog, or No to discard its changes and save changes of the other message tree instead.]

@@ -201,3 +194,10 @@
 [available autoreply only]

 [all accounts]

 [Closing in %d]

+;file \plugins\NewAwaySysMod\src\stdafx.h

+[Miranda NG autoreply >\r\n%extratext%]

+[extended status]

+[Away System]

+[Status]

+[Popups]

+[Variables plugin is not installed]

diff --git a/langpacks/english/Plugins/NewEventNotify.txt b/langpacks/english/Plugins/NewEventNotify.txt
index c30b51e2a1..e334e9877e 100644
--- a/langpacks/english/Plugins/NewEventNotify.txt
+++ b/langpacks/english/Plugins/NewEventNotify.txt
@@ -43,18 +43,6 @@
 [No popups for read messages]

 ;file \plugins\NewEventNotify\src\menuitem.cpp

 [Popups]

-;file \plugins\NewEventNotify\src\neweventnotify.h

-[Contacts]

-[You were added!]

-[Requests your authorization]

-[ICQ Web pager]

-[ICQ Email express]

-[SMS Message]

-[SMS Confirmation]

-[Unknown Event]

-[Notify of new events]

-[Enable new event notification]

-[Disable new event notification]

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

 [Event Notify]

 ;file \plugins\NewEventNotify\src\popup.cpp

@@ -67,3 +55,15 @@
 [This is a sample other event ;-D]

 [Plugin Test]

 [[b]Number of new message(s): %d[/b]\n]

+;file \plugins\NewEventNotify\src\stdafx.h

+[Contacts]

+[You were added!]

+[Requests your authorization]

+[ICQ Web pager]

+[ICQ Email express]

+[SMS Message]

+[SMS Confirmation]

+[Unknown Event]

+[Notify of new events]

+[Enable new event notification]

+[Disable new event notification]

diff --git a/langpacks/english/Plugins/NotifyAnything.txt b/langpacks/english/Plugins/NotifyAnything.txt
index 259d7a7f4a..c01aa74df7 100644
--- a/langpacks/english/Plugins/NotifyAnything.txt
+++ b/langpacks/english/Plugins/NotifyAnything.txt
@@ -19,8 +19,6 @@
 [Debug]

 [Log to file]

 [Message debugging]

-;file \plugins\NotifyAnything\src\common.h

-[NotifyAnything]

 ;file \plugins\NotifyAnything\src\main.cpp

 [Notify Anything]

 [N/A: Failed to format error message]

@@ -29,4 +27,6 @@
 ;file \plugins\NotifyAnything\src\options.cpp

 [Log (*.log)\0*.log\0Text (*.txt)\0*.txt\0All Files (*.*)\0*.*\0]

 [Invalid port number]

+[NotifyAnything]

 [Plugins]

+;file \plugins\NotifyAnything\src\stdafx.h

diff --git a/langpacks/english/Plugins/RecentContacts.txt b/langpacks/english/Plugins/RecentContacts.txt
index af62077201..ae7d6bf9b9 100644
--- a/langpacks/english/Plugins/RecentContacts.txt
+++ b/langpacks/english/Plugins/RecentContacts.txt
@@ -22,4 +22,4 @@
 [Ignore Contact]

 [Show Contact]

 [Show Recent Contacts]

-;file \plugins\RecentContacts\src\RecentContacts.h

+;file \plugins\RecentContacts\src\stdafx.h

diff --git a/langpacks/english/Plugins/RemovePersonalSettings.txt b/langpacks/english/Plugins/RemovePersonalSettings.txt
index 91215bca4e..90d08f6db4 100644
--- a/langpacks/english/Plugins/RemovePersonalSettings.txt
+++ b/langpacks/english/Plugins/RemovePersonalSettings.txt
@@ -7,8 +7,9 @@
 ;============================================================

 [Remove personal settings to allow you to send a profile to other user(s) without sending personal data.]

 ;file \plugins\RemovePersonalSettings\src\rps.cpp

-[All your personal settings will be erased!\nMake sure you are running this from a copy of your profile (and not over the original one).\nRunning this will erase files/folders under Miranda main folder.\n\nAre you sure you want to remove all your personal settings?\n\n(You cannot say that I don't told you about the risks :P)]

-[Remove Personal Settings]

 [Remove Personal Settings...]

 [Configuration file could not be found!]

 [Settings are deleted now.]

+;file \plugins\RemovePersonalSettings\src\stdafx.h

+[All your personal settings will be erased!\nMake sure you are running this from a copy of your profile (and not over the original one).\nRunning this will erase files/folders under Miranda main folder.\n\nAre you sure you want to remove all your personal settings?\n\n(You cannot say that I don't told you about the risks :P)]

+[Remove Personal Settings]

diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index 8e702802ac..35c059f15e 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -92,7 +92,7 @@
 [Last Seen Variables]

 [Contacts]

 [Popups]

-;file \plugins\SeenPlugin\src\seen.h

+;file \plugins\SeenPlugin\src\stdafx.h

 [%n is %s (%u)]

 [%i(%r)%bWas %o]

 [Name:%t%N%bStatus:%t%s%bDay:%t%d.%m.%Y%bTime:%t%H:%M:%S%bPrevious Status:%t%o%b%b%P ID:%t%u%bExternal IP:%t%i%bInternal IP:%t%r%bClient ID: %t%C%b%bStatus Message:%t%T]

diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index c83af2f3fe..a8a672884e 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -90,8 +90,6 @@
 [No]

 [Abort]

 [Ignore]

-;file \plugins\SendScreenshotPlus\src\global.h

-[SendScreenshot - Error]

 ;file \plugins\SendScreenshotPlus\src\Main.cpp

 [Main Icon]

 [Target Cursor]

@@ -121,6 +119,8 @@
 [Send screenshot]

 [Send desktop screenshot]

 [Open SendSS+]

+;file \plugins\SendScreenshotPlus\src\stdafx.h

+[SendScreenshot - Error]

 ;file \plugins\SendScreenshotPlus\src\UAboutForm.cpp

 [Credits]

 ;file \plugins\SendScreenshotPlus\src\UMainForm.cpp

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index b264ddd4e3..5ee8462c1b 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SkypeWeb.dll

 ;  Plugin: Skype protocol (Web)

-;  Version: 0.12.1.2

+;  Version: 0.12.2.2

 ;  Authors: Miranda NG Team

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

 [Skype protocol support for Miranda NG. Based on new Skype for Web.]

@@ -42,22 +42,23 @@
 [Enter new chatroom topic]

 ;file \protocols\SkypeWeb\src\skype_contacts.cpp

 [Are you sure?]

-;file \protocols\SkypeWeb\src\skype_events.cpp

-[%s %s this call.\n]

-[enters]

-[leaves]

-[File transfer:\n\tFile name: %s\n\tSize: %d bytes]

-[Incoming call.]

+;file \protocols\SkypeWeb\src\skype_db.cpp

+[Edited message]

 [Action]

-[Call information.]

-[File transfer information.]

-[Uri object.]

+[Call information]

+[File transfer information]

+[URI object]

+[Unknown event]

 [Incoming call]

-[Calls]

-[Notifications]

-[Errors]

-;file \protocols\SkypeWeb\src\skype_history_sync.cpp

-[Edited at]

+;file \protocols\SkypeWeb\src\skype_events.cpp

+[Invalid data!]

+[Original message:\n\t%s\n]

+[Edited at %s:\n\t%s\n]

+[Call]

+[Call missed]

+[Call ended (%s)]

+[File transfer:\n\tFile name: %s \n\tSize: %lld bytes \n]

+[Unknown event, please send this text for developer: "%s"]

 ;file \protocols\SkypeWeb\src\skype_icons.cpp

 [Protocol icon]

 [Create new chat icon]

@@ -82,12 +83,18 @@
 [Unblock contact]

 [Create new chat]

 ;file \protocols\SkypeWeb\src\skype_messages.cpp

+[Unknown error!]

 ;file \protocols\SkypeWeb\src\skype_mslogin.cpp

 [Enter confirmation code]

+;file \protocols\SkypeWeb\src\skype_network.cpp

+[%s connection]

 ;file \protocols\SkypeWeb\src\skype_options.cpp

 [Network]

+;file \protocols\SkypeWeb\src\skype_popups.cpp

+[Notifications]

+[Errors]

+[Calls]

 ;file \protocols\SkypeWeb\src\skype_proto.cpp

-[%s connection]

 [Incoming call sound]

 [Incoming call canceled sound]

 ;file \protocols\SkypeWeb\src\skype_trouter.cpp

diff --git a/langpacks/english/Plugins/Spamotron.txt b/langpacks/english/Plugins/Spamotron.txt
index cf8b243cf7..ff679be537 100644
--- a/langpacks/english/Plugins/Spamotron.txt
+++ b/langpacks/english/Plugins/Spamotron.txt
@@ -62,12 +62,6 @@
 [Preview]

 ;file \plugins\Spamotron\src\bayes.cpp

 [Bayes database path]

-;file \plugins\Spamotron\src\common.h

-[Spam-o-tron needs to verify you're not a bot. Reply with "%response%" without quotes.]

-[Spam-o-tron needs to verify you're not a bot. Reply with a result of expression %mathexpr%.]

-[Verified.]

-[Spam-o-tron delayed authorization request. First reply with "%response%" without quotes.]

-[Spam-o-tron delayed authorization request. First reply with a result of expression %mathexpr%.]

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

 [Simple]

 [Math expression]

@@ -94,5 +88,11 @@
 [Sending round-robin challenge to %s.]

 [Sending random challenge to %s.]

 [Sending math expression challenge to %s.]

+;file \plugins\Spamotron\src\stdafx.h

+[Spam-o-tron needs to verify you're not a bot. Reply with "%response%" without quotes.]

+[Spam-o-tron needs to verify you're not a bot. Reply with a result of expression %mathexpr%.]

+[Verified.]

+[Spam-o-tron delayed authorization request. First reply with "%response%" without quotes.]

+[Spam-o-tron delayed authorization request. First reply with a result of expression %mathexpr%.]

 ;file \plugins\Spamotron\src\utils.cpp

 [Their message was]

diff --git a/langpacks/english/Plugins/StartupSilence.txt b/langpacks/english/Plugins/StartupSilence.txt
index 68f8ed41c1..83911fa30b 100644
--- a/langpacks/english/Plugins/StartupSilence.txt
+++ b/langpacks/english/Plugins/StartupSilence.txt
@@ -26,7 +26,7 @@
 [Allow mRadio or Weather popups, etc.]

 ;file \plugins\StartupSilence\src\main.cpp

 [Events]

-;file \plugins\StartupSilence\src\StartupSilence.h

+;file \plugins\StartupSilence\src\stdafx.h

 [Silence at startup]

 [Toggle Silence OFF]

 [Toggle Silence ON]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index 08ffde0851..0ab1486741 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -2,8 +2,8 @@
 ;============================================================

 ;  File: Steam.dll

 ;  Plugin: Steam protocol

-;  Version: 0.11.4.1

-;  Authors: unsane, Robert Pösel

+;  Version: 0.11.4.2

+;  Authors: Miranda NG Team, Robert Pösel

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

 [Steam protocol support for Miranda NG.]

 ;file \protocols\Steam\res\Resource.rc

diff --git a/langpacks/english/Plugins/StopSpam.txt b/langpacks/english/Plugins/StopSpam.txt
index 7c712796ab..9c1b5cad6d 100644
--- a/langpacks/english/Plugins/StopSpam.txt
+++ b/langpacks/english/Plugins/StopSpam.txt
@@ -28,13 +28,13 @@
 [General]

 [Messages]

 [Accounts]

-;file \plugins\StopSpamPlus\src\headers.h

-[StopSpam]

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

 [No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you.]

 [StopSpam automatic message:\r\n]

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

 [Not In List]

 [Complete]

+;file \plugins\StopSpamPlus\src\stdafx.h

+[StopSpam]

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

 [Remove Temporary Contacts]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 4a0254f958..49f329b10e 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.11

+;  Version: 0.11.1.12

 ;  Authors: Miranda NG Team

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

 [Tox protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index ffbfce6ad6..b0c373959a 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.1.9

+;  Version: 0.1.1.10

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index 2745524ae3..14e12efbe1 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -194,6 +194,6 @@
 [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\variables.cpp

-;file \plugins\Variables\src\variables.h

+;file \plugins\Variables\src\stdafx.h

 [--- 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.]

+;file \plugins\Variables\src\variables.cpp

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index b12688af87..69860d8730 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -131,13 +131,7 @@
 [Show user detail]

 [To old setting]

 [To default]

-;file \plugins\Weather\src\weather.cpp

-[Enable/disable auto update]

-[Auto Update Enabled]

-[Auto Update Disabled]

-[Weather Condition Changed]

-[Weather Alert Issued]

-;file \plugins\Weather\src\weather.h

+;file \plugins\Weather\src\stdafx.h

 [N/A]

 [Invalid ID format, missing "/" (10)]

 [Invalid service (11)]

@@ -179,6 +173,12 @@
 [Here is a list of custom variables that are currently available]

 [The URL for complete forecast has not been set. You can set it from the Edit Settings dialog.]

 [The URL for weather map has not been set. You can set it from the Edit Settings dialog.]

+;file \plugins\Weather\src\weather.cpp

+[Enable/disable auto update]

+[Auto Update Enabled]

+[Auto Update Disabled]

+[Weather Condition Changed]

+[Weather Alert Issued]

 ;file \plugins\Weather\src\weather_addstn.cpp

 [Current weather information for %s.]

 [%s is now the default weather station]

diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
index 6c38306346..9305bc2ec1 100644
--- a/langpacks/english/Plugins/WhatsApp.txt
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: WhatsApp.dll

 ;  Plugin: WhatsApp protocol

-;  Version: 0.1.2.14

+;  Version: 0.1.2.15

 ;  Authors: Uli Hecht

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

 [WhatsApp protocol support for Miranda NG.]

@@ -11,6 +11,7 @@
 [Nickname]

 [Default group:]

 [Use SSL connection (port 443)]

+[Use remote message timestamps]

 [Automatically open group chats]

 [Registration]

 [SMS code]

diff --git a/langpacks/english/Plugins/ZeroNotify.txt b/langpacks/english/Plugins/ZeroNotify.txt
index bdb41a3967..0cfc3cb4ca 100644
--- a/langpacks/english/Plugins/ZeroNotify.txt
+++ b/langpacks/english/Plugins/ZeroNotify.txt
@@ -11,9 +11,9 @@
 [No CList blink when:]

 [No SysTray blink when:]

 [Hide the "toggle sound" menu item (requires restart of Miranda)]

-;file \plugins\ZeroNotification\src\common.h

-[Disable &Sounds]

-[Enable &Sounds]

 ;file \plugins\ZeroNotification\src\main.cpp

 [Zero Notifications]

 [Plugins]

+;file \plugins\ZeroNotification\src\stdafx.h

+[Disable &Sounds]

+[Enable &Sounds]