14 files changed, 26 insertions, 22 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index c00fd271c5..dd239ff54a 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -933,6 +933,7 @@
 [Outgoing message (10x10)]
 ;file \src\core\stdmsg\src\msgdialog.cpp
 [Last message received on %s at %s.]
+[Message Session]
 [%s is typing a message...]
 ;file \src\core\stdmsg\src\msglog.cpp
 [File sent]
@@ -946,6 +947,7 @@
 [Incoming time]
 [Incoming colon]
 [Message area]
+[Other events]
 [Message log]
 [** New contacts **]
 [** Unknown contacts **]
@@ -1315,11 +1317,12 @@
 [WARNING! The account is going to be deleted. It means that all its settings, contacts and histories will be also erased.\n\nAre you absolutely sure?]
 [Your account was successfully upgraded. To activate it, restart of Miranda is needed.\n\nIf you want to restart Miranda now, press Yes, if you want to upgrade another account, press No]
 [This account uses legacy protocol plugin. Use Miranda NG options dialogs to change its preferences.]
+[Account name must be filled.]
+[Account error]
+[Account name has to be unique. Please enter unique name.]
 [Create new account]
 [Editing account]
 [Upgrading account]
-[Account name has to be unique. Please enter unique name.]
-[Account error]
 [Account is disabled. Please activate it to access options.]
 [New account]
 [Remove account]
diff --git a/langpacks/english/Plugins/BuddyExpectator.txt b/langpacks/english/Plugins/BuddyExpectator.txt
index e9ad0fa0c6..317bad64e3 100644
--- a/langpacks/english/Plugins/BuddyExpectator.txt
+++ b/langpacks/english/Plugins/BuddyExpectator.txt
@@ -57,8 +57,8 @@
 [Contact still absent]
 [Miss you event]
 [Hide contact event]
-[Buddy Expectator]
 [Hide contact]
+[Buddy Expectator]
 ;file \plugins\BuddyExpectator\src\options.cpp
 [weeks]
 [months]
diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index 1fee43ee34..b41d5215d6 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -42,8 +42,9 @@
 ;file \plugins\ChangeKeyboardLayout\src\commonheaders.h
 [ChangeKeyboardLayout]
 ;file \plugins\ChangeKeyboardLayout\src\hook_events.cpp
-[Popup]
 [Changing Layout]
 [Changing Case]
 [Message Sessions]
 [Popups]
+;file \plugins\ChangeKeyboardLayout\src\main.cpp
+[Popup]
diff --git a/langpacks/english/Plugins/ClientChangeNotify.txt b/langpacks/english/Plugins/ClientChangeNotify.txt
index a1532f01a5..8d0448600c 100644
--- a/langpacks/english/Plugins/ClientChangeNotify.txt
+++ b/langpacks/english/Plugins/ClientChangeNotify.txt
@@ -29,7 +29,7 @@
 [Text]
 [Preview]
 [Ignore these clients (separated by semicolons):]
-[(you have to install pcre.dll or pcre3.dll to use regular expressions here)]
+[(you have to install pcre16.dll to use regular expressions here)]
 ;file \plugins\ClientChangeNotify\src\ClientChangeNotify.cpp
 [changed client to %s (was %s)]
 [changed client to %s]
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index 0687fae666..0d8205f464 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -23,7 +23,7 @@
 ;file \plugins\CmdLine\src\mimcmd_data.h
 [Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is the name of the account. If it's not specified then the command will issue a global status change.]
 [Changes away message either globally or per account.\nUsage: awaymsg <message> [<account>].\n<Message> is the new away message.\n<Account> is an optional parameter specifying the account to set the away message for. If not specified then the away message will be set globally.]
-[Changes extended status either globally or per account.\nUsage: xstatus <status> [<account>].\n<xStatus> is the new extended status to set. Possible values are: ...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.]
+[Changes extended status either globally or per account.\nUsage: xstatus <xStatus> [<account>].\n<xStatus> is the new extended status to set. Possible values are: ...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.]
 [Disables or enables popups display.\nUsage: popups (disable | enable | toggle).\nThe command will either enable or disable popups display.]
 [Disables or enables sounds.\nUsage: sounds (disable | enable | toggle).\nThe command will either disable or enable sounds.]
 [Hides or shows the contact list window.\nUsage: clist (show | hide | toggle).\nThe command will either show or hide the contact list window.]
diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index 07446bc27a..5927bca818 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.11.0.1
+;  Version: 0.95.3.1
 ;  Authors: Miranda team
 ;============================================================
 [Imports contacts and messages from another Miranda profile or from an external program.]
@@ -73,7 +73,6 @@
 [Skipped %d duplicates and %d filtered events.]
 [Skipped %d duplicates.]
 ;file \plugins\Import\src\main.cpp
-[Import...]
 [&Import...]
 ;file \plugins\Import\src\miranda.cpp
 [The given file does not exist. Please check that you have entered the name correctly.]
@@ -82,5 +81,6 @@
 [All Files]
 ;file \plugins\Import\src\utils.cpp
 [Skipping duplicate group %s.]
+[Import...]
 ;file \plugins\Import\src\wizard.cpp
 [Finish]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 34804c17cf..ed333e105a 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -208,9 +208,9 @@
 [Jabber Link Protocol]
 [Frame title]
 [Frame text]
+[Fatal error, image services not found. Jabber Protocol will be disabled.]
 [Jabber Activity]
 [Jabber Mood]
-[Fatal error, image services not found. Jabber Protocol will be disabled.]
 ;file \protocols\JabberG\src\jabber.h
 [I'm happy Miranda NG user. Get it at http://miranda-ng.org/.]
 [/me slaps %s around a bit with a large trout]
diff --git a/langpacks/english/Plugins/ListeningTo.txt b/langpacks/english/Plugins/ListeningTo.txt
index 17213d51dc..4d128b03a4 100644
--- a/langpacks/english/Plugins/ListeningTo.txt
+++ b/langpacks/english/Plugins/ListeningTo.txt
@@ -52,11 +52,11 @@
 [%listening% - Listening to info (as set above)]
 [When nothing is playing, replace %listening% with:]
 ;file \plugins\ListeningTo\src\listeningto.cpp
-[Send to %s]
 [Listening to (enabled)]
 [Listening to (disabled)]
 [ListeningTo]
 [Listening to music]
+[Send to %s]
 [Send to all protocols]
 [Listening info]
 [Listening info as set in the options]
diff --git a/langpacks/english/Plugins/MenuEx.txt b/langpacks/english/Plugins/MenuEx.txt
index aadc7fe687..71a967e31d 100644
--- a/langpacks/english/Plugins/MenuEx.txt
+++ b/langpacks/english/Plugins/MenuEx.txt
@@ -51,8 +51,8 @@
 [Typing Notify]
 [Please authorize me to add you to my contact list.]
 [Do you want to send authorization request\nto new contact?]
-[MenuItemEx]
 [Open ignore settings]
 [Request authorization]
+[MenuItemEx]
 ;file \plugins\MenuItemEx\src\options.cpp
 [Customize]
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 58c0289389..7440c09f2f 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -86,12 +86,12 @@
 ;file \plugins\New_GPG\src\init.cpp
 [GPG Turn off encryption]
 [GPG Turn on encryption]
-[GPG encryption status]
 [Load GPG public key]
 [Toggle GPG encryption]
 [Send public key]
 [Export GPG Public keys]
 [Import GPG Public keys]
+[GPG encryption status]
 ;file \plugins\New_GPG\src\main.cpp
 [Email]
 [Name]
diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index bcd57855ad..4599315b94 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -64,6 +64,10 @@
 [Hosts]
 ;file \plugins\Ping\src\ping.cpp
 [Ping Plugin]
+[Responding]
+[Not Responding]
+[Testing]
+[Disabled]
 ;file \plugins\Ping\src\pinggraph.cpp
 [Show grid lines]
 [Show stats]
@@ -88,7 +92,3 @@
 ;file \plugins\Ping\src\utils.cpp
 [Unknown Address]
 [Unknown]
-[Responding]
-[Not Responding]
-[Testing]
-[Disabled]
diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index 165b4a6530..522b0a5677 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -38,11 +38,11 @@
 [Last seen plugin]
 [You missed following contacts:]
 [Alert when user status changes]
-;file \plugins\SeenPlugin\src\history.cpp
-[last seen history]
-[View User's Details]
 [User Menu]
+[View User's Details]
 [Send Instant Message]
+;file \plugins\SeenPlugin\src\history.cpp
+[last seen history]
 [Date: %d.%m.%y(%Y) \n Date desc: %W - %w - %E - %e \n Time: %H:%M:%S (%h-%p) \n user: %n - %u \n Status: %s \n IP: %i - %r]
 ;file \plugins\SeenPlugin\src\main.cpp
 [LastSeen]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index ef38e626e0..078125833f 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.4.0.2
+;  Version: 3.4.0.3
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
@@ -689,7 +689,7 @@
 [Use default codepage]
 ;file \plugins\TabSRMM\src\msgoptions.cpp
 [<no skin>]
-[Do you want to also read message templates from the theme?\nCaution: This will overwrite the stored template set which may affect the look of your message window significantly.\nSelect cancel to not load anything at all.]
+[Do you want to also read message templates from the theme?\nCaution: This will overwrite the stored template set which may affect the look of your message window significantly.\nSelect Cancel to not load anything at all.]
 [Load theme]
 [Internal message log]
 [IEView plugin]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 2be6ff039a..6afe71afa9 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -589,10 +589,10 @@
 [\n%s becomes %d years old.]
 [No anniversaries to remind of]
 [Backing up and syncing all birthdays complete!]
-[Reminder (uinfoex)]
 [Birthday reminder]
 [Birthday reminder: it's coming]
 [Anniversary Reminder]
+[Reminder (uinfoex)]
 ;file \plugins\UserInfoEx\src\ex_import\classExImContactBase.cpp
 [contact identification]
 [The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your contact list with the same nick and protocol.\nDo you wish to use this contact?]