langpacks/english: update

6 files changed, 53 insertions, 54 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 37138098de..cf434ae353 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -230,7 +230,6 @@
 [Padding:]

 [Round corners (avatar)]

 [Disable when]

-[Always (has priority)]

 [Fullscreen mode]

 [Statuses]

 [Text color:]

diff --git a/langpacks/english/Plugins/Discord.txt b/langpacks/english/Plugins/Discord.txt
index d7d44cc741..3f28afd26f 100644
--- a/langpacks/english/Plugins/Discord.txt
+++ b/langpacks/english/Plugins/Discord.txt
@@ -8,7 +8,7 @@
 [Discord support for Miranda NG.]

 ;file \protocols\Discord\res\discord.rc

 [User details]

-[E-mail:]

+[E-mail or phone:]

 [Password:]

 [Contacts]

 [Default group:]

@@ -17,18 +17,26 @@
 [Use subgroups for server channels (requires restart)]

 [Delete messages in Miranda when they are deleted from server]

 [Log out]

+[Delete contacts in Miranda when they are deleted from server]

 [Nick:]

-[2-step verification]

+[Multi-factor authentication]

 [Cancel]

+[Send group chat invitation]

+[&Invite]

 ;file \protocols\Discord\src\dispatch.cpp

 [edited at]

 ;file \protocols\Discord\src\groupchat.cpp

 [Change &nickname]

+[Invite users]

 [Channel control]

 [Change &topic]

 [&Rename channel]

-[&Destroy channel]

+[Destroy channel]

+[Leave channel]

 [Copy ID]

+[Add friend]

+[Kick user]

+[Make group owner]

 [Do you really want to destroy this channel? This action is non-revertable.]

 [Enter new channel name:]

 [Enter new topic:]

@@ -50,13 +58,12 @@
 [Create new channel]

 [Enable guild sync]

 ;file \protocols\Discord\src\mfa.cpp

-[Use authentication app]

+[Use your authenticator app]

 [Use a code sent to your phone]

 [Use a backup code]

-[Enter Discord verification code:]

-[Enter SMS code you received:]

-[Enter one of your backup codes]

-[Wrong code entered]

+[6-digit authentication code:]

+[8-digit backup code:]

+[Invalid two-factor code]

 [MFA initialization]

 ;file \protocols\Discord\src\options.cpp

 [Network]

@@ -77,5 +84,10 @@
 [Attachment]

 [Embed]

 [Preview]

+[%s added %s to the group]

+[%s joined the group]

+[%s removed %s from the group]

+[%s left the group]

+[%s changed the group icon]

 ;file \protocols\Discord\src\voice.cpp

 [Call ended, %d seconds long]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 90526911fb..475ca0582a 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -33,7 +33,7 @@
 [Use hostname as resource]

 [Port:]

 [Use SSL]

-[Use TLS]

+[Use STARTTLS]

 [Unregister]

 [Expert]

 [Manually specify connection host]

@@ -907,8 +907,8 @@
 ;file \protocols\JabberG\src\jabber_thread.cpp

 [Enter password for %s]

 [Error: Not enough memory]

+[Requesting XMPP service address through proxy is not supported.\nPlease allow direct DNS in options or specify the hostname manually]

 [Error: Cannot connect to the server]

-[SSL initialization failed]

 [Error: Connection lost]

 [Requesting registration instruction...]

 [Authentication failed for %s@%s.]

diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 2b61313a7d..94b6831975 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -21,7 +21,6 @@
 [Use UTF-8 in new files]

 [Append extra new line]

 [Use << and >>]

-[Help]

 [Exporting old messages]

 [History file for %s (%s, format %s)]

 [&Find...]

@@ -42,6 +41,29 @@
 [Auto filename]

 [Clear all]

 [Copy]

+;file \plugins\Msg_Export\src\export.cpp

+[FirstName]

+[LastName]

+[e-mail]

+[Nick]

+[Age]

+[Gender]

+[City]

+[State]

+[Phone]

+[Homepage]

+[About]

+[      History for]

+[User]

+[Account]

+[User ID]

+[Nick      :]

+[FirstName :]

+[LastName  :]

+[e-mail    :]

+[Reason    :]

+[Invalid Database event received. Type %d, size %d]

+[Unknown event type %d, size %d]

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

 [Miranda database contains %d events]

 [Failed to open file]

@@ -64,9 +86,6 @@
 [All files]

 [Select Destination Directory]

 [File]

-[Nick]

-[Account]

-[User ID]

 [No contacts found to export]

 [Export accounts]

 [Message export]

@@ -78,40 +97,11 @@
 [Miranda NG (Message Export Plugin)]

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

 [No_Group]

+[User has been deleted. Do you want to delete the file?]

+[Failed to delete the file]

+[No_Nick]

 [File name for the user "%s" has changed!\n\nfrom:\t%s\nto:\t%s\n\nDo you wish to rename file?]

 [Failed to rename file\n\nfrom:\t%s\nto:\t%s\n\nFailed with error: %s]

 [\nError: ]

 [\nMessage has not been saved!\n]

 [Do you wish to save debug information?]

-[All\0*.*\0Text\0*.TXT\0\0]

-[FirstName]

-[LastName]

-[e-mail]

-[Age]

-[Gender]

-[City]

-[State]

-[Phone]

-[Homepage]

-[About]

-[      History for]

-[User]

-[File: ]

-[Description: ]

-[Size: ]

-[Transferred: ]

-[Path: ]

-[URL: ]

-[Nick      :]

-[FirstName :]

-[LastName  :]

-[e-mail    :]

-[Reason    :]

-[Invalid Database event received. Type %d, size %d]

-[The following user made an authorization request:]

-[The following user added you to their contact list:]

-[UIN       :]

-[Unknown event type %d, size %d]

-[User has been deleted. Do you want to delete the file?]

-[Failed to delete the file]

-[No_Nick]

diff --git a/langpacks/english/Plugins/NewStory.txt b/langpacks/english/Plugins/NewStory.txt
index 13dced999f..b3f5854679 100644
--- a/langpacks/english/Plugins/NewStory.txt
+++ b/langpacks/english/Plugins/NewStory.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: NewStory.dll

 ;  Plugin: NewStory

-;  Version: 0.2.0.1

+;  Version: 0.2.0.2

 ;  Authors: nullbie

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

 [History viewer for Miranda NG.]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 7d74936ece..2e16adb880 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -15,7 +15,7 @@
 [Load history for all contacts from VK]

 [Wipe contacts missing in friend list]

 [Visit profile]

-[Support BBC for NewStory]

+[Support BBCode for NewStory]

 [[img] BBCode support for image]

 [off]

 [for preview max height 320 px]

@@ -102,8 +102,9 @@
 [Share]

 [URL:]

 [Only for friends]

-[Mark contacts]

-[Message]

+[Mark contacts for forwarding messages]

+[Mark contacts you want to forward messages]

+[Enter accompanying message]

 ;file \protocols\VKontakte\src\misc.cpp

 [Notification icon]

 [Read message icon]

@@ -309,9 +310,6 @@
 [for last 30 days]

 [for last 90 days]

 [for all time]

-[Mark contacts for forwarding messages]

-[Mark contacts you want to forward messages]

-[Enter accompanying messages]

 [Errors]

 [Notifications]

 [VK user activate/deactivate action]