1 files changed, 18 insertions, 20 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 52cb3cb71d..4e0dec6e75 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -201,9 +201,6 @@
 [Show 'Send' button]
 [Show character count]
 [Show toolbar buttons on top row]
-[Send message on double 'Enter']
-[Send message on 'Enter']
-[Send message on 'Ctrl+Enter']
 [Show warning when message has not been received after]
 [Send error]
 [An error has occurred. The protocol reported the following error:]
@@ -256,14 +253,6 @@
 [Other]
 [Add new rooms to group:]
 [Nick list row distance (pixels):]
-[Use same style as in the message log]
-[Use default colors]
-[Use custom colors]
-[Popups for the StdMsg plugin]
-[Timeout (s)]
-[Text]
-[Background]
-[(Setting timeout to 0 means default setting and -1 means indefinite time)]
 [Message]
 [Undo]
 [Redo]
@@ -613,6 +602,14 @@
 [Only critical data are encrypted (passwords, security tokens, etc). All other settings and history remains unencrypted.]
 [All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of losing everything you've stored in a database in case of losing password.]
 [Set password]
+[Group chats]
+[Use same style as in the message log]
+[Use default colors]
+[Use custom colors]
+[Timeout (s)]
+[Text]
+[Background]
+[(Setting timeout to 0 means default setting and -1 means indefinite time)]
 [&Hide/Show]
 [E&xit]
 [Nowhere]
@@ -765,6 +762,8 @@
 [Nick list background]
 [Nick list lines]
 [Nick list background (selected)]
+[Messaging]
+[Send message]
 ;file \src\core\stdmsg\src\chat_options.cpp
 [Flash window when someone speaks]
 [Flash window when a word is highlighted]
@@ -820,15 +819,11 @@
 [Topic (10x10)]
 [Highlight (10x10)]
 [Information (10x10)]
-[Messaging]
-[Group chats]
 [Group chats log]
 [Appearance and functionality of chat room windows]
 [Appearance of the message log]
 [Icons to display in the message log]
 [Chat log]
-[Chat]
-[Popups]
 ;file \src\core\stdmsg\src\cmdlist.cpp
 [The message send timed out.]
 ;file \src\core\stdmsg\src\globals.cpp
@@ -918,6 +913,7 @@
 [Example With a Long Title]
 [Thequickbrownfoxjumpsoverthelazydog.]
 [An avatar.]
+[Popups]
 [Settings]
 [Classes]
 ;file \src\core\stdpopup\src\services.cpp
@@ -1331,14 +1327,14 @@
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 [Host we are connecting to is not the one certificate was issued for]
 ;file \src\mir_app\src\newplugins.cpp
-[No messaging plugins loaded. Please install/enable one of the messaging plugins, for instance, "StdMsg.dll"]
+[Plugin %S cannot be unloaded because the core plugin is missing]
 ['%S' is disabled, re-enable?]
 [Re-enable Miranda plugin?]
-[Core plugin '%s' cannot be loaded or missing. Miranda will exit now]
-[Fatal error]
 [Unable to load plugin in service mode!]
 [Unable to start any of the installed contact list plugins, I even ignored your preferences for which contact list couldn't load any.]
 [Can't find a contact list plugin! You need StdClist or any other contact list plugin.]
+[Core plugin '%s' cannot be loaded or missing. Miranda will exit now]
+[Fatal error]
 ;file \src\mir_app\src\options.cpp
 [<all modules>]
 [<core modules>]
@@ -1354,7 +1350,11 @@
 [Miranda NG must be restarted to apply changes for these plugins:]
 [Do you want to restart it now?]
 [Plugins]
+;file \src\mir_app\src\popupOption.cpp
+[Enabled items]
 ;file \src\mir_app\src\profilemanager.cpp
+[<In use>]
+[<Unknown format>]
 [The profile '%s' already exists. Do you want to move it to the Recycle Bin?\n\nWARNING: The profile will be deleted if Recycle Bin is disabled.\nWARNING: A profile may contain confidential information and should be properly deleted.]
 [The profile already exists]
 [Couldn't move '%s' to the Recycle Bin. Please select another profile name.]
@@ -1362,8 +1362,6 @@
 [Unable to create the profile '%s', the error was %x]
 [Problem creating profile]
 [&Create]
-[<In use>]
-[<Unknown format>]
 [Are you sure you want to remove profile "%s"?]
 [&Convert]
 [Run]