13 files changed, 67 insertions, 46 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 1c861b1f93..76490568ec 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -824,11 +824,6 @@
 [Chat log]
 ;file \src\core\stdmsg\src\cmdlist.cpp
 [The message send timed out.]
-;file \src\core\stdmsg\src\globals.cpp
-[Incoming message (10x10)]
-[Outgoing message (10x10)]
-[Encrypted (10x10)]
-[Encrypted verified (10x10)]
 ;file \src\core\stdmsg\src\msgdialog.cpp
 [%s is typing a message...]
 [Last message received on %s at %s.]
@@ -838,6 +833,10 @@
 [%s: message session (%u users)]
 [Message session]
 ;file \src\core\stdmsg\src\msglog.cpp
+[Incoming message (10x10)]
+[Outgoing message (10x10)]
+[Encrypted (10x10)]
+[Encrypted verified (10x10)]
 [Me]
 [File sent]
 ;file \src\core\stdmsg\src\msgoptions.cpp
@@ -1467,6 +1466,9 @@
 ;file \src\mir_app\src\srmm_log_hpp.cpp
 [History++ log window]
 ;file \src\mir_app\src\srmm_log_rtf.cpp
+[Unnamed]
+[Download]
+[Copy URL]
 [Copy all]
 [Look up '%s':]
 [No word to look up]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 4bbf0ef4bf..1e7bbf495e 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -29,23 +29,23 @@
 [* Restart may be required for all changes to take effect]
 [Skin folder]
 [Download more skins]
+[Cancel]
 [Available view modes]
 [Include protocols]
 [Include groups]
 [Show contacts in groups]
+[Hide empty groups]
+[Show groups folded]
 [Include status modes]
-[Cancel]
-[Sticky contacts]
-[Clear all]
-[Using the contact list on the left side, you can select contacts which will be "sticky" for this view mode. These contacts will ignore the standard filter rules and only use the status mode filter below.]
 [Protocol]
 [Group]
 [Status mode]
 [Automatically clear this view mode after]
 [seconds]
 [View mode options]
-[Editing view mode]
 [Last message]
+[Sticky contacts]
+[Clear all]
 [Status bar]
 [Show status bar]
 [Make sections equal width]
@@ -428,6 +428,10 @@
 [Toolbar upgrade]
 ;file \plugins\Clist_modern\src\modern_viewmodebar.cpp
 [All contacts]
+[Configure view modes]
+[Add view mode]
+[Rename view mode]
+[Remove view mode]
 [Ungrouped contacts]
 [And]
 [Or]
@@ -436,19 +440,16 @@
 [Minutes]
 [Hours]
 [Days]
-[Configuring view mode: %s]
-[Add view mode]
-[Rename view mode]
-[Remove view mode]
-[Filtering]
-[*** All contacts ***]
-[Configure view modes]
 [Enter view mode name]
 [A view mode with this name does already exist]
 [Duplicate name]
 [Enter new view mode name]
 [Really delete this view mode? This cannot be undone]
 [Delete a view mode]
+[Configuring view mode: %s]
+[*** All contacts ***]
+[Editing view mode]
+[Filtering]
 [Setup view modes...]
 [Select a view mode]
 [Setup view modes]
diff --git a/langpacks/english/Plugins/DbChecker.txt b/langpacks/english/Plugins/DbChecker.txt
index 6088affde8..f4d8767a9b 100644
--- a/langpacks/english/Plugins/DbChecker.txt
+++ b/langpacks/english/Plugins/DbChecker.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: DbChecker.dll
 ;  Plugin: Database checker
-;  Version: 0.95.13.3
+;  Version: 0.96.3.1
 ;  Authors: George Hazan
 ;============================================================
 [Miranda NG Database Checker.]
@@ -16,6 +16,7 @@
 [Mark all events as read]
 [Fix UTF-8 encoding in old events]
 [Remove duplicate events]
+[Fix server message IDs]
 [Error Opening Database]
 [There was an error opening the profile database given.]
 [Click Next to try opening the file again, or click Back to select a new profile database to manipulate.]
@@ -38,6 +39,7 @@
 [Database worker thread activated]
 [%d events marked as read]
 [%d duplicate events removed]
+[%d server message IDs fixed]
 [Processing aborted by user]
 [Elapsed time: %d sec]
 [All tasks completed but with errors (%d)]
diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index a70e606de4..3ae8a750e1 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Fingerprint.dll
 ;  Plugin: Fingerprint NG
-;  Version: 0.2.0.1
+;  Version: 0.2.1.1
 ;  Authors: faith_healer, ghazan, Mataes
 ;============================================================
 [Fingerprint NG (client version) icons module for Miranda NG.]
@@ -31,16 +31,6 @@
 [Show client icon in message window status bar]
 ;file \plugins\FingerprintNG\src\fingerprint.cpp
 [Fingerprint]
-;file \plugins\FingerprintNG\src\finger_groups.h
-[Client icons]
-[Pack overlays]
-[Multi-proto clients]
-[Other protocols]
-[Overlays]
-[Resource]
-[Platform]
-[Security]
-[Protocol]
 ;file \plugins\FingerprintNG\src\masks.cpp
 [Miranda NG stable]
 [Miranda IM (old versions)]
@@ -104,3 +94,13 @@
 [SecureIM overlay]
 ;file \plugins\FingerprintNG\src\options.cpp
 [Icons]
+;file \plugins\FingerprintNG\src\prepare.cpp
+[Client icons]
+[Pack overlays]
+[Multi-proto clients]
+[Other protocols]
+[Overlays]
+[Resource]
+[Platform]
+[Security]
+[Protocol]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index bbe5ca31ee..37fa15ebf8 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.96.3.1
+;  Version: 0.96.3.3
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -14,7 +14,6 @@
 [Do not open chat windows on creation]
 [Use tray icon notifications]
 [Launch mailbox in a browser on click]
-[Show error popups]
 [Notifications]
 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
@@ -56,6 +55,7 @@
 [You received e-mail from %s: %s]
 [You have %d unread emails]
 ;file \protocols\ICQ-WIM\src\proto.cpp
+[%s error notifications]
 [Synchronize server groups]
 [Edit my web profile]
 [UIN/e-mail/phone]
diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index af7d255583..2ff99212cd 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Import.dll
 ;  Plugin: Import contacts and messages
-;  Version: 0.95.11.1
+;  Version: 0.96.3.1
 ;  Authors: Miranda team
 ;============================================================
 [Imports contacts and messages from another Miranda profile or from an external program.]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 3ac5ed1352..f7a4e47416 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -516,7 +516,8 @@
 [Are you sure?]
 [Incoming note]
 ;file \protocols\JabberG\src\jabber_omemo.cpp
-[Do you want to create OMEMO session with new device:]
+[Trust on first use]
+[Unknown device added]
 [OMEMO can not encrypt private messages in public groupchats. Continue using plain text?]
 ;file \protocols\JabberG\src\jabber_opt.cpp
 [Afar]
@@ -957,6 +958,9 @@
 [Untrust]
 [Trust]
 [Kill session]
+[Remove device]
+[Remove device master key completely?\nPress NO to regenerate prekeys only]
+[Delete device %d from the announce?]
 [Photo]
 ;file \protocols\JabberG\src\jabber_util.cpp
 [Redirect]
diff --git a/langpacks/english/Plugins/NewStory.txt b/langpacks/english/Plugins/NewStory.txt
index d1dbb31683..02398f61a3 100644
--- a/langpacks/english/Plugins/NewStory.txt
+++ b/langpacks/english/Plugins/NewStory.txt
@@ -39,10 +39,6 @@
 [Log options]
 [Options]
 [Templates]
-[Copy]
-[Edit]
-[Delete]
-[Select all]
 ;file \plugins\NewStory\src\fonts.cpp
 [Incoming messages]
 [Outgoing messages]
@@ -71,6 +67,7 @@
 [Homepage]
 [About]
 [History search results]
+[Copy]
 [Export...]
 [Delete...]
 [Search...]
@@ -91,6 +88,9 @@
 [Are you sure to remove selected event(s)?]
 ;file \plugins\NewStory\src\history_menus.cpp
 [User history]
+[Edit]
+[Delete]
+[Select all]
 ;file \plugins\NewStory\src\main.cpp
 [Main icon]
 [Search]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index c7b24d3aed..6058bf3141 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.95.13.3
+;  Version: 0.96.3.1
 ;  Authors: Miranda NG team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/english/Plugins/StopSpamMod.txt b/langpacks/english/Plugins/StopSpamMod.txt
index 387a7b14cd..eea20e2d20 100644
--- a/langpacks/english/Plugins/StopSpamMod.txt
+++ b/langpacks/english/Plugins/StopSpamMod.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StopSpamMod.dll
 ;  Plugin: StopSpam mod
-;  Version: 0.0.2.3
+;  Version: 0.0.2.4
 ;  Authors: Roman Miklashevsky, sss, Elzor
 ;============================================================
 [Anti-spam plugin for Miranda NG.]
@@ -33,7 +33,6 @@
 [After congratulation (ICQ only)]
 [Automatically grant authorization]
 [Request authorization from contacts which pass StopSpam test]
-[Remove all temporary contacts after restart]
 [Use regex for answers checking]
 [Log Spammers to system history]
 [Use math expression in question]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 9a8440ec3f..80253551ca 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -819,6 +819,8 @@
 [Incoming message]
 [Outgoing message]
 [Status change]
+[Secure message]
+[Secure message (verified)]
 [Static container icon]
 [Sounds (status bar)]
 [Pulldown Arrow]
diff --git a/langpacks/english/Plugins/Telegram.txt b/langpacks/english/Plugins/Telegram.txt
index 6c4c9dd89c..dbb12abb2e 100644
--- a/langpacks/english/Plugins/Telegram.txt
+++ b/langpacks/english/Plugins/Telegram.txt
@@ -19,6 +19,8 @@
 [Last name:]
 [Phone:]
 [Cancel]
+[Forward message]
+[Forward]
 ;file \protocols\Telegram\src\auth.cpp
 [Enter email address for account verification]
 [Enter verification code received by email]
@@ -38,6 +40,8 @@
 [&Leave chat session]
 ;file \protocols\Telegram\src\main.cpp
 [Premium user]
+[Telegram Premium user]
+;file \protocols\Telegram\src\menus.cpp
 ;file \protocols\Telegram\src\options.cpp
 [Network]
 [Account]
@@ -45,8 +49,13 @@
 ;file \protocols\Telegram\src\proto.cpp
 ;file \protocols\Telegram\src\server.cpp
 [%d member(s)]
+[Saved messages]
 ;file \protocols\Telegram\src\utils.cpp
 [none]
 [Chat rooms]
 [%s error notifications]
 [Errors]
+[Picture]
+[Video]
+[seconds]
+[Voice message]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 695221a44a..b86042e5e7 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.3
+;  Version: 0.1.14.5
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
@@ -180,6 +180,10 @@
 ;file \protocols\VKontakte\src\vk_chats.cpp
 [Participants]
 [Owners]
+[Adding bots to MUC is not supported]
+[Not supported]
+[This chat is going to be destroyed forever with all its contents. This action cannot be undone. Are you sure?]
+[Warning]
 [Message link]
 [create chat]
 [kick user]
@@ -194,10 +198,6 @@
 [chat action not supported]
 [Unknown]
 [Enter new chat title]
-[Adding bots to MUC is not supported]
-[Not supported]
-[This chat is going to be destroyed forever with all its contents. This action cannot be undone. Are you sure?]
-[Warning]
 [You've been kicked by ]
 [Chat]
 [Kick bots is not supported]
@@ -291,8 +291,10 @@
 [Add as friend]
 [Delete from friend list]
 [Ban user]
-[Destroy room]
 [Open broadcast]
+[View/change title]
+[Invite a user]
+[Destroy room]
 [Reload messages from vk.com...]
 [for last week]
 [for last 30 days]