16 files changed, 33 insertions, 37 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index cf4bbbd7f7..a9fcdb8971 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -140,18 +140,18 @@
 [Try again]
 [Cancel]
 [&Send]
+[Load unread events only]
+[Load number of previous events]
+[Load previous events less than]
+[minutes old]
 [Message window event log]
 [Show names]
 [Show timestamp]
 [Show seconds]
 [Show dates]
 [Show formatting]
-[Load history events]
-[Load unread events only]
-[Load number of previous events]
-[Load previous events less than]
-[minutes old]
 [Automatically copy selected text]
+[Load history events]
 [Use a tabbed interface]
 [Close tab on double click]
 [Show tabs at the bottom]
@@ -879,6 +879,7 @@
 [Time]
 [Sidebar]
 [Title underline]
+[Popup Mode]
 ;file \src\core\stdpopup\src\yapp_history_dlg.cpp
 [Copy title to clipboard]
 [Copy message to clipboard]
@@ -1378,6 +1379,8 @@
 [Modified]
 [My profiles]
 [New profile]
+;file \src\mir_app\src\protocols.cpp
+[Protocol is offline]
 ;file \src\mir_app\src\proto_interface.cpp
 [Request authorization]
 [Grant authorization]
@@ -1409,7 +1412,8 @@
 [Upgrading account]
 [Account name must be filled.]
 [Account error]
-[Account name has to be unique. Please enter unique name.]
+[Account internal name contains invalid symbols, only ASCII chars are allowed.]
+[Account internal name has to be unique. Please enter unique name.]
 ;file \src\mir_app\src\proto_order.cpp
 ;file \src\mir_app\src\searchresults.cpp
 [Could not start a search on '%s', there was a problem - is %s connected?]
@@ -1474,6 +1478,7 @@
 [History++ log window]
 ;file \src\mir_app\src\srmm_log_rtf.cpp
 [Unnamed]
+[on]
 [Download]
 [Copy URL]
 [Save as]
diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index 0faa8ce325..b7173bfd16 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -108,7 +108,7 @@
 [Send message]
 [Reply &quoted]
 [Delete group]
-[Delete all user history]
+[Delete all contact history]
 [Options]
 [Filters]
 [Fonts and colors]
diff --git a/langpacks/english/Plugins/Dbx_sqlite.txt b/langpacks/english/Plugins/Dbx_sqlite.txt
index 9897fe1985..97810582fd 100644
--- a/langpacks/english/Plugins/Dbx_sqlite.txt
+++ b/langpacks/english/Plugins/Dbx_sqlite.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Dbx_sqlite.dll
 ;  Plugin: Miranda NG SQLite database driver
-;  Version: 0.96.2.4
+;  Version: 0.96.4.1
 ;  Authors: Miranda-NG project
 ;============================================================
 [Provides Miranda database support: global settings, contacts, history, settings per contact.]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index ec02fad7ec..05f3d0e708 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -29,8 +29,6 @@
 ;file \protocols\Facebook\src\options.cpp
 [Network]
 [Account]
-;file \protocols\Facebook\src\proto.cpp
-[Protocol is offline or user isn't authorized yet]
 ;file \protocols\Facebook\src\server.cpp
 [Connection failed with error code %d]
 [Participant]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 6aeb8c29fe..368ac55dd1 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -264,6 +264,7 @@
 [Supports direct chat invitations (XEP-0249)]
 [Receives information about OMEMO devices]
 [Supports message carbons (XEP-0280)]
+[Supports offline messages (XEP-0160)]
 ;file \protocols\JabberG\src\jabber_captcha.cpp
 [Enter the text you see]
 ;file \protocols\JabberG\src\jabber_chat.cpp
@@ -845,7 +846,6 @@
 [List Editor...]
 ;file \protocols\JabberG\src\jabber_proto.cpp
 [%s error notifications]
-[Protocol is offline or no JID]
 [No valid OMEMO session exists]
 ;file \protocols\JabberG\src\jabber_rc.cpp
 [Command completed successfully]
diff --git a/langpacks/english/Plugins/NewStory.txt b/langpacks/english/Plugins/NewStory.txt
index 28db54d7bd..7e9e90d9f4 100644
--- a/langpacks/english/Plugins/NewStory.txt
+++ b/langpacks/english/Plugins/NewStory.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NewStory.dll
 ;  Plugin: NewStory
-;  Version: 0.1.0.3
+;  Version: 0.1.0.4
 ;  Authors: nullbie
 ;============================================================
 [History viewer for Miranda NG.]
@@ -101,9 +101,10 @@
 ;file \plugins\NewStory\src\history_menus.cpp
 [Copy file name]
 [Copy URL]
-[User history]
+[History]
 [Global search]
 [Copy text]
+[Quote]
 [Save as]
 [Download]
 [Edit]
@@ -146,7 +147,6 @@
 [AM/PM symbol]
 [name of month, translatable]
 [the message string itself]
-[History]
 [Advanced]
 ;file \plugins\NewStory\src\templates.cpp
 [Sunday]
diff --git a/langpacks/english/Plugins/PopupPlus.txt b/langpacks/english/Plugins/PopupPlus.txt
index 86a04b24a5..2738106d9e 100644
--- a/langpacks/english/Plugins/PopupPlus.txt
+++ b/langpacks/english/Plugins/PopupPlus.txt
@@ -211,4 +211,3 @@
 [Popup Mode: Auto]
 [Popup Mode: Favorite]
 [Popup Mode: Ignore fullscreen]
-[Popup Mode: Block contact]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index aab88a0d81..ca0d384c2c 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -42,6 +42,12 @@
 [Min input area size]
 [lines]
 [You can use embedded variables here: %name% for contact's name, %status% for its status, %statusmsg% for its status message and %account% for its account's name]
+[Preload]
+[Unread events only]
+[Last]
+[Events in the last]
+[events]
+[minutes]
 [Message window event log]
 [Show icons]
 [Show time]
@@ -55,14 +61,8 @@
 [Start message text on a new line]
 [Show lines between messages]
 [Indent text]
-[Customize fonts and colors]
-[Preload]
-[Unread events only]
-[Last]
-[Events in the last]
-[events]
-[minutes]
 [Automatically copy selected text]
+[Customize fonts and colors]
 [Typing notification options]
 [Send typing notifications to the following users when you are typing a message to them:]
 [Show typing notification switch in the status bar]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 6058bf3141..70f40802aa 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -88,7 +88,6 @@
 [Unblock contact]
 [Create new chat]
 ;file \protocols\SkypeWeb\src\skype_messages.cpp
-[You cannot send when you are offline.]
 [Unknown error!]
 [Network error!]
 ;file \protocols\SkypeWeb\src\skype_options.cpp
diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index ebf7199b24..33e3dca747 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -39,7 +39,6 @@
 [Button smiley]
 [Assign smiley category]
 [Background color]
-[Only one instance of SmileyAdd could be executed.\nRemove duplicate instances from 'Plugins' directory]
 ;file \plugins\SmileyAdd\src\options.cpp
 [Smiley packs]
 [All files]
@@ -55,6 +54,7 @@
 [Smiley #%u in file %s for smiley pack %s not found.]
 [%s global smiley pack]
 [Standard]
+[Emoji]
 [Regular expression "%s" in smiley pack "%s" malformed.]
 ;file \plugins\SmileyAdd\src\smltool.cpp
 [d'Oh!]
diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index e3bb6e46d5..e49a417154 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -54,7 +54,6 @@
 [Protocols]
 [Protocol icon]
 [Gaming icon]
-[You cannot send messages when you are offline.]
 ;file \protocols\Steam\src\steam_utils.cpp
 [closed chat session]
 ;file \protocols\Steam\src\steam_xstatus.cpp
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 3e3208d45c..a3daf3b0e3 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -138,6 +138,10 @@
 [Try to keep original size]
 [Help on this]
 [Reset all hidden warnings]
+[Load unread events only]
+[Load number of previous events]
+[Load previous events less than]
+[minutes old]
 [Indent values]
 [Left/Right]
 [px]
@@ -145,10 +149,6 @@
 [Standard templates...]
 [RTL templates...]
 [Load history events]
-[Load unread events only]
-[Load number of previous events]
-[Load previous events less than]
-[minutes old]
 [Typing notification options]
 [Send typing notifications to the following users when you are typing a message to them:]
 [        Show typing notifications in the message window]
@@ -836,7 +836,6 @@
 [Animated Tray]
 [Clock symbol (for the info panel clock)]
 [Feature disabled (used as overlay)]
-[Feature enabled (used as overlay)]
 ;file \plugins\TabSRMM\src\msgs.h
 [Message windows - IM]
 [Message windows - all]
diff --git a/langpacks/english/Plugins/Telegram.txt b/langpacks/english/Plugins/Telegram.txt
index b1dd393293..3bd4354d90 100644
--- a/langpacks/english/Plugins/Telegram.txt
+++ b/langpacks/english/Plugins/Telegram.txt
@@ -41,6 +41,7 @@
 [&Leave chat session]
 ;file \protocols\Telegram\src\main.cpp
 [Telegram Premium user]
+[Reaction]
 ;file \protocols\Telegram\src\menus.cpp
 ;file \protocols\Telegram\src\options.cpp
 [Network]
diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index aaab1c446e..3c51d5f749 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -56,7 +56,6 @@
 [Create password]
 ;file \protocols\Tox\src\tox_messages.cpp
 [Action]
-[You cannot send when you are offline.]
 ;file \protocols\Tox\src\tox_options.cpp
 [Tox profile]
 [All files]
diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index 215e2aa3fd..2d43717bfd 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -38,10 +38,6 @@
 [Enter the PIN provided by Twitter to complete your sign in. This is a one time process until you recreate your Miranda Twitter account.]
 ;file \protocols\Twitter\src\chat.cpp
 [Normal]
-;file \protocols\Twitter\src\connection.cpp
-[OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorize Miranda to Twitter.com (do the PIN stuff again)]
-[Failed to get Twitter Access Tokens, please go offline and try again. If this keeps happening, check your internet connection.]
-[You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or recreate your Miranda Twitter account]
 ;file \protocols\Twitter\src\proto.cpp
 [%s (server)]
 [Unable to initialize Netlib for %s.]
@@ -52,7 +48,6 @@
 [Network]
 [Basic]
 [Popups]
-[%s Protocol]
 [Don't be crazy! Everyone knows the max tweet size is 140, and you're trying to fit %d chars in there?]
 ;file \protocols\Twitter\src\theme.cpp
 [Twitter Icon]
@@ -62,3 +57,5 @@
 [First tweet from new contact]
 [New tweet]
 [Reply...]
+;file \protocols\Twitter\src\utility.cpp
+[%s Protocol]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 72897bcb17..d85ca0f2e5 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.14.8
+;  Version: 0.1.15.0
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]