15 files changed, 29 insertions, 31 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 753ac61236..803ea78a7c 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1276,8 +1276,8 @@
 [Could not write unique ID of contact to metacontact]
 [Could not write nickname of contact to metacontact]
 ;file \src\mir_app\src\movetogroup.cpp
-[&Move to group]
 [<Root group>]
+[&Move to group]
 ;file \src\mir_app\src\netliblog.cpp
 [Standard Netlib log]
 [No times]
diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index 0ca4687317..8075d1a346 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -150,7 +150,7 @@
 [Open mail account?]
 ;file \protocols\AimOscar\src\proto.cpp
 [%s server connection]
-[%s Client-to-client connection]
+[%s client-to-client connections]
 ;file \protocols\AimOscar\src\server.cpp
 [[Auto-Response]:]
 [Contact tried to open an audio/video conference (not currently supported)]
diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index 636bb1e037..8595fa5c58 100644
--- a/langpacks/english/Plugins/AVS.txt
+++ b/langpacks/english/Plugins/AVS.txt
@@ -10,7 +10,7 @@
 [The pictures you can set here are used as default avatars\nfor contacts that don't have their own.\nUse the checkboxes to enable/disable showing avatars for the protocols.]
 [Set default picture]
 [Delete default picture]
-[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatars.]
+[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatar.]
 [Try to draw avatar background transparent (for images without transparency)]
 [Number of points to define background:]
 [Color difference allowed:]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index ddd1b62e8b..debe5f64bc 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -313,10 +313,10 @@
 [&Position]
 [&Up]
 [&Down]
+[Lock frame]
 [Show all frames]
 [Show all title bars]
 [Hide all title bars]
-[Lock frame]
 ;file \plugins\Clist_modern\src\groupmenu.cpp
 [&Hide/show]
 [&Find/add contacts...]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 7a1542eea0..aa0c6b2097 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -12,7 +12,7 @@
 [Continue]
 [Exit Miranda]
 [Although the exception was caught and you may continue working with Miranda, you should restart the program as soon as possible. The exception may have damaged internal data structures and can have a serious impact on stability.]
-[About CList nicer]
+[About Clist nicer]
 [Clist nicer]
 [Copyright © 2004-2010 by the Miranda IM project, 2012-2015 by the Miranda NG project. More detailed copyright information can be found in the included README file.]
 [Version]
@@ -215,7 +215,7 @@
 [Appear always offline (block contact)]
 [Other]
 [Hide this contact from the list]
-[To show a previously hidden contact, navigate to Options -> Events -> Ignore, search the contact in the list and tick the checkbox next to its name.]
+[To show a previously hidden contact, navigate to Options -> Contacts -> Ignore, search the contact in the list and tick the checkbox next to its name.]
 [Display options]
 [Show contact with priority]
 [Show avatar:]
@@ -353,15 +353,15 @@
 [&Position]
 [&Up]
 [&Down]
-[Frames]
-[Show all frames]
-[Show all title bars]
-[Hide all title bars]
 [Lock frame]
 [Visible]
 [Show title bar]
 [Skinned frame]
 [Floating]
+[Frames]
+[Show all frames]
+[Show all title bars]
+[Hide all title bars]
 ;file \plugins\Clist_nicer\src\cluiopts.cpp
 [Title bar]
 [Tool Window]
diff --git a/langpacks/english/Plugins/Contacts.txt b/langpacks/english/Plugins/Contacts.txt
index 01772934e8..fab8c2a2b5 100644
--- a/langpacks/english/Plugins/Contacts.txt
+++ b/langpacks/english/Plugins/Contacts.txt
@@ -30,6 +30,7 @@
 ;file \plugins\ContactsPlus\src\main.cpp
 [Contacts received from]
 [Contacts]
+[Events]
 [Incoming Contacts]
 [Outgoing Contacts]
 ;file \plugins\ContactsPlus\src\receive.cpp
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 7bc27f6e10..b899a3a04f 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Facebook.dll
 ;  Plugin: Facebook RM
-;  Version: 0.2.11.4
+;  Version: 0.2.11.6
 ;  Authors: Michal Zelinka, Robert Pösel
 ;============================================================
 [Facebook protocol support for Miranda NG.]
@@ -43,7 +43,7 @@
 [Statuses]
 [Post Miranda statuses to Wall]
 [Turn off chat on Facebook when going to offline in Miranda]
-[Map unsupported statuses to Invisible (instead of Online)]
+[Map unsupported statuses to Invisible (instead of Away)]
 [Allow posting statuses to my pages (may slow down login)]
 [Bots challenge test]
 [Instruction:]
diff --git a/langpacks/english/Plugins/FileAsMessage.txt b/langpacks/english/Plugins/FileAsMessage.txt
index 608634aa52..bf53cf0a47 100644
--- a/langpacks/english/Plugins/FileAsMessage.txt
+++ b/langpacks/english/Plugins/FileAsMessage.txt
@@ -21,7 +21,7 @@
 [To send]
 [Received]
 [Use only alphanumeric encoding on transfer]
-[Extra options: Events > File Transfers, "Receiving files" group]
+[Extra options: Events -> File Transfers, "Receiving files" group]
 ;file \plugins\FileAsMessage\src\dialog.cpp
 [File already exists. Overwrite?]
 [Couldn't open a file]
diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 1dae6f801a..0e268784f3 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -40,12 +40,12 @@
 [Set to default filename]
 [Copy]
 ;file \plugins\Msg_Export\src\FileViewer.cpp
-[Failed to write to the RichEdit the buffer was to small.]
+[Failed to write to the Rich Edit the buffer was to small.]
 [Error: Optimal buffer size decreased to a too low size!]
 [Internal error! (lExtraRead >= 0)]
 [Failed to execute external file view]
-[Failed to load Rich Edit ( Msftedit.DLL )]
-[Failed to get handle to RichEdit!]
+[Failed to load Rich Edit (Msftedit.dll)]
+[Failed to get handle to Rich Edit!]
 [Failed to open file\r\n%s\r\n\r\nContact handle is invalid]
 [Failed to open file\r\n%s\r\n\r\nMiranda database contains %d events]
 [With scroll to bottom %d\n]
diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
index 287e077d75..ecd3e15492 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/Popup.txt
@@ -7,8 +7,8 @@
 ;============================================================
 [Provides popup notification services for different plugins.]
 ;file \plugins\Popup\res\resource.rc
-[Content && Style]
-[Go to Customize > Fonts && Colors for fonts and colors options]
+[Content and Style]
+[Go to Customize -> Fonts and Colors for fonts and colors options]
 [Miscellaneous]
 [Effects]
 [Live Preview]
@@ -78,7 +78,7 @@
 [Right click action:]
 [Disable when global status is...]
 [Disable when relevant protocol's status is...]
-[Colors can be configured in\r\nCustomize > Fonts and colors]
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
 [More...]
 [Disable if message window is open]
 [Sec]
@@ -164,7 +164,7 @@
 [Toggle Popups]
 [Enable Popups]
 [Disable Popups]
-[Popup Plus]
+[Popup plus]
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 ;file \plugins\Popup\src\opt_adv.cpp
 [No effect]
@@ -194,7 +194,7 @@
 [Protocol Status]
 [You cannot specify a value lower than %d and higher than %d.]
 ['Reorder popups' option is currently disabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewXstatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n]
-[Popup Plus Warning]
+[Popup plus warning]
 ;file \plugins\Popup\src\opt_skins.cpp
 [Failed to register %s class.]
 [Skin preview]
@@ -214,7 +214,7 @@
 ;file \plugins\Popup\src\services.cpp
 [Notify]
 ;file \plugins\Popup\src\skin.cpp
-[The skin you are trying to load is designed\r\nfor newer version of Popup Plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]
+[The skin you are trying to load is designed\r\nfor newer version of Popup plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]
 ;file \plugins\Popup\src\srmm_menu.cpp
 [Auto]
 [Favorite]
diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 76de5546d8..ee0e19cffd 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -112,7 +112,7 @@
 [SendSS HTTP connections]
 [SendSS]
 [Screenshots]
-[Image services (AdvaImg) not found.\nSendSS disabled.]
+[Image services (AdvaImg plugin) not found.\nSendSS disabled.]
 [Buttons]
 [Could not register Miranda service.]
 [Take a screenshot]
diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index 87c5d2fd7a..f084e02c85 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -5,7 +5,7 @@
 ;  Version: 2.1.0.7
 ;  Authors: Scott Ellis, yaho
 ;============================================================
-[Tool Tip notification windows.]
+[Tooltip notification windows.]
 ;file \plugins\TipperYM\res\resource.rc
 [Layout]
 [Text indent:]
diff --git a/langpacks/english/Plugins/TooltipNotify.txt b/langpacks/english/Plugins/TooltipNotify.txt
index 76635e0490..8642436fe7 100644
--- a/langpacks/english/Plugins/TooltipNotify.txt
+++ b/langpacks/english/Plugins/TooltipNotify.txt
@@ -40,10 +40,7 @@
 ;file \plugins\TooltipNotify\src\TooltipNotify.cpp
 [Tooltip Notify]
 [Other status]
-[Tooltip Notify: Online]
-[Tooltip Notify: Offline]
-[Tooltip Notify: Other]
-[Tooltip Notify: Typing]
+[Other]
 [Popups]
 [** New contacts **]
 [** Unknown contacts **]
diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 7dd3998585..68e0bc35dc 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.16
+;  Version: 0.11.1.18
 ;  Authors: Miranda NG Team
 ;============================================================
 [Tox protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index d61f428c70..2bce29e83f 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -90,8 +90,8 @@
 [New E-mail available in Inbox]
 [%s plugin connections]
 [ID]
-[Please enter your Yahoo ID in Options/Network/Yahoo]
-[Please enter your Yahoo password in Options/Network/Yahoo]
+[Please enter your Yahoo ID in Options -> Network -> Yahoo]
+[Please enter your Yahoo password in Options -> Network -> Yahoo]
 [Yahoo Login Error]
 ;file \protocols\Yahoo\src\services.cpp
 [You need to be connected to set the custom message]