11 files changed, 28 insertions, 27 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index bf68fabea5..abf771a4aa 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1,7 +1,7 @@
 ;============================================================
 ;  File: miranda32/64.exe
 ;  Module: Miranda Core
-;  Version: 0.96.1
+;  Version: 0.96.2
 ;============================================================
 ;file \src\core\stdautoaway\res\resource.rc
 [Become idle if the following is left unattended:]
@@ -954,6 +954,7 @@
 [Mobile]
 [Work phone]
 [Work fax]
+[Contact]
 ;file \src\core\stduserinfo\src\stdinfo.cpp
 [Male]
 [Female]
@@ -970,7 +971,6 @@
 [It's complicated]
 [In a civil union]
 [Summary]
-[Contact]
 [Location]
 [Work]
 [Background info]
diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index e2dd49d718..8db353bfc8 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -118,12 +118,12 @@
 [You need to specify your registration e-mail first.]
 [Your password will be sent to your registration e-mail.\nDo you want to continue?]
 [You should disconnect before making any permanent changes with your account.\nDo you want to disconnect now?]
-[Your details has been uploaded to the public directory.]
-[You have to be logged in before you can change your details.]
 [Network]
 [General]
 [Conference]
 [Advanced]
+[Your details has been uploaded to the public directory.]
+[You have to be logged in before you can change your details.]
 ;file \protocols\Gadu-Gadu\src\filetransfer.cpp
 [Cannot create transfer file. ERROR: %d: %s (dcc)\n%s]
 [Cannot create transfer file. ERROR: %d: %s (dcc7)\n%s]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 6b975004c7..eed4e79e05 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -92,7 +92,6 @@
 [Cellular]
 [Video]
 [Modem]
-[(*) marks the current session]
 [Load]
 [Save]
 [Delete]
@@ -388,6 +387,7 @@
 [Info request error]
 [Items request error]
 ;file \protocols\JabberG\src\jabber_ft.cpp
+[%s is too large. Maximum size supported by the service is %d KB]
 [No compatible file transfer mechanism exists]
 ;file \protocols\JabberG\src\jabber_groupchat.cpp
 [Failed to retrieve room list from server.]
@@ -511,6 +511,7 @@
 ;file \protocols\JabberG\src\jabber_omemo.cpp
 [Do you want to create OMEMO session with new device:]
 [OMEMO: New session]
+[OMEMO can not encrypt private messages in public groupchats. Continue using plain text?]
 ;file \protocols\JabberG\src\jabber_opt.cpp
 [Afar]
 [Abkhazian]
@@ -737,7 +738,7 @@
 [Embrace picture URLs with [img]]
 [Ignore server roster (groups and nick names)]
 [Security]
-[Allow local time & timezone requests (XEP-0202)]
+[Allow local time and timezone requests (XEP-0202)]
 [Allow servers to request version (XEP-0092)]
 [Show information about operating system in version replies]
 [Accept only in band incoming filetransfers (don't disclose own IP)]
@@ -983,7 +984,6 @@
 [Jabber vCard: Edit Phone Number]
 [Contacts]
 [Note]
-[OMEMO]
 ;file \protocols\JabberG\src\jabber_xstatus.cpp
 [<advanced status slot>]
 [Afraid]
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index 6dc9ff2d15..b8070ea8e5 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -113,9 +113,9 @@
 [Sound files]
 [All files]
 [Wave files]
+[** All contacts **]
 [Status]
 [Sound file]
-[** All contacts **]
 ;file \plugins\NewXstatusNotify\src\indsnd.h
 [(default sound)]
 ;file \plugins\NewXstatusNotify\src\main.cpp
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index eee76bcbf2..303ac3972f 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.2.1.2
+;  Version: 0.2.1.3
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Installs and updates plugins and other Miranda NG components.]
diff --git a/langpacks/english/Plugins/PopupPlus.txt b/langpacks/english/Plugins/PopupPlus.txt
index 485378f7d6..86a04b24a5 100644
--- a/langpacks/english/Plugins/PopupPlus.txt
+++ b/langpacks/english/Plugins/PopupPlus.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PopupPlus.dll
 ;  Plugin: Popup plus
-;  Version: 2.1.1.17
+;  Version: 2.1.2.0
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
 ;============================================================
 [Provides popup notification services for different plugins.]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 82bb5cd12a..1b6e018580 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Scriver.dll
 ;  Plugin: Scriver
-;  Version: 3.0.2.2
+;  Version: 3.0.2.3
 ;  Authors: Miranda NG team
 ;============================================================
 [Scriver - send and receive instant messages.]
diff --git a/langpacks/english/Plugins/StopSpam.txt b/langpacks/english/Plugins/StopSpam.txt
index e26553cba0..b97f4a53d9 100644
--- a/langpacks/english/Plugins/StopSpam.txt
+++ b/langpacks/english/Plugins/StopSpam.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StopSpam.dll
 ;  Plugin: StopSpam+
-;  Version: 0.1.0.2
+;  Version: 0.1.0.3
 ;  Authors: Roman Miklashevsky, A. Petkevich, Kosh&chka, persei
 ;============================================================
 [Anti-spam plugin for Miranda NG.]
@@ -14,7 +14,7 @@
 [Auth. request reply:]
 [Divider:]
 [Vars]
-[Disable protection for following accounts:]
+[Enable protection for following accounts:]
 [Do not send more than]
 [questions to one contact (0 - for no limit)]
 [Enable StopSpam-StopSpam infinite talk protection]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 71f4dd0ef9..ba0af2219c 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -609,7 +609,6 @@
 ;file \plugins\TabSRMM\src\infopanel.cpp
 [%s    Idle: %dh,%02dm]
 [  Client: %s]
-[  Client not cached yet]
 [Topic is: %s]
 [no topic set.]
 [Open user details...]
diff --git a/langpacks/english/Plugins/Toaster.txt b/langpacks/english/Plugins/Toaster.txt
index ff747b4f5e..fa8bc9b3dc 100644
--- a/langpacks/english/Plugins/Toaster.txt
+++ b/langpacks/english/Plugins/Toaster.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Toaster.dll
 ;  Plugin: Toaster
-;  Version: 0.11.2.0
+;  Version: 0.11.2.1
 ;  Authors: Miranda NG team
 ;============================================================
 [Provides popup services based on Windows toast notification for different plugins.]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index b2fadf4dd0..0c4ce9b551 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.9.0.2
+;  Version: 0.9.0.3
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]
@@ -185,7 +185,6 @@
 ;file \plugins\UserInfoEx\src\classPsTreeItem.cpp
 [Creating unique name for a page failed with %d and error code %d]
 [Creating the label for a page failed with %d and error code %d]
-[The dialog template type is no longer supported]
 ;file \plugins\UserInfoEx\src\ctrl_annivedit.cpp
 [Add a new anniversary]
 [Delete an existing anniversary]
@@ -228,14 +227,6 @@
 [Could not find contact's protocol. Maybe it is not active!]
 [No pages have been added. Canceling dialog creation!]
 [Details dialog failed to be created. Returning error is %d.]
-[General]
-[Contact (private)]
-[Anniversaries]
-[Work]
-[Contact (work)]
-[About]
-[Profile]
-[Notes]
 [Export to file]
 [Import from file]
 [Owner]
@@ -321,18 +312,27 @@
 ;file \plugins\UserInfoEx\src\psp_about.cpp
 [My notes:]
 [About:]
+[About]
+[Notes]
 ;file \plugins\UserInfoEx\src\psp_anniversary.cpp
 [Please enter a valid description first!]
 [No valid date selected for editing!]
 [Do you really want to delete the %s?]
+[General]
+[Anniversaries]
+;file \plugins\UserInfoEx\src\psp_company.cpp
+[Work]
 ;file \plugins\UserInfoEx\src\psp_contact.cpp
-[home]
 [Open in browser]
+[home]
 [Primary e-mail]
 [Secondary e-mail]
 [Tertiary e-mail]
 [Address and contact]
 [company]
+[Contact (private)]
+[Contact (work)]
+;file \plugins\UserInfoEx\src\psp_general.cpp
 ;file \plugins\UserInfoEx\src\psp_options.cpp
 [Question]
 [This will delete all settings, you've made!\nAll TreeView settings, window positions and any other settings!\n\nAre you sure to proceed?]
@@ -346,16 +346,18 @@
 [Advanced]
 [Details dialog]
 [Popups]
+;file \plugins\UserInfoEx\src\psp_origin.cpp
 ;file \plugins\UserInfoEx\src\psp_profile.cpp
 [Past]
 [Affiliation]
 [Interest]
-[Sorry, but there is a problem with adding a new item of type "%s"]
 [<empty>]
+[Sorry, but there is a problem with adding a new item of type "%s"]
 [Edit category]
 [Edit value]
 [Delete an entry]
 [Do you really want to delete this entry?]
+[Profile]
 ;file \plugins\UserInfoEx\src\svc_constants.cpp
 [Afrikaans]
 [Albanian]