langpacks/english: update

14 files changed, 48 insertions, 96 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]

diff --git a/langpacks/english/Plugins/ClientChangeNotify.txt b/langpacks/english/Plugins/ClientChangeNotify.txt
index fcdf118a2c..7423530494 100644
--- a/langpacks/english/Plugins/ClientChangeNotify.txt
+++ b/langpacks/english/Plugins/ClientChangeNotify.txt
@@ -34,10 +34,8 @@
 [changed client to %s (was %s)]

 [changed client to %s]

 [%s (was %s)]

-[Disable c&lient change notification]

-[Enable c&lient change notification]

+[Client change notifications]

 [ClientChangeNotify: Client changed]

-[Popups]

 ;file \plugins\ClientChangeNotify\src\Misc.h

 [Error #%d]

 [Can't open log file ]

@@ -49,4 +47,5 @@
 [Open contact menu]

 [Open contact history]

 [Do nothing]

+[Popups]

 [ClientChangeNotify]

diff --git a/langpacks/english/Plugins/Contacts.txt b/langpacks/english/Plugins/Contacts.txt
index 0ee51db8ba..4a05bd7e7d 100644
--- a/langpacks/english/Plugins/Contacts.txt
+++ b/langpacks/english/Plugins/Contacts.txt
@@ -24,9 +24,9 @@
 [An error has occurred. The protocol reported the following error:]

 [Try again]

 [Popup]

-[Add to List]

+[Add to list]

 [User details]

-[Send Message]

+[Send message]

 ;file \plugins\ContactsPlus\src\main.cpp

 [Contacts received from]

 [Contacts]

diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index 4b6b1da5df..eee2138423 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -34,15 +34,13 @@
 ;file \plugins\Db_autobackups\src\main.cpp

 [Backup profile]

 [Save profile as...]

-[Enable &AutoBackups notification]

-[Disable &AutoBackups notification]

 [Miranda NG databases]

 [Compressed Miranda NG databases]

 [All files]

 [Database]

-[Popups]

 [Database backups]

 [Backup folder]

+[AutoBackups notifications]

 ;file \plugins\Db_autobackups\src\options.cpp

 [days]

 [hours]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 07fde8ce8e..931981f945 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -732,7 +732,6 @@
 [Automatically accept authorization requests]

 [Fix incorrect timestamps in incoming messages]

 [Disable frame]

-[Display popups with errors]

 [Enable XMPP link processing (requires AssocMgr)]

 [Embrace picture URLs with [img]]

 [Ignore server roster (groups and nick names)]

@@ -837,6 +836,7 @@
 [Unable to save list because you are currently offline.]

 [List Editor...]

 ;file \protocols\JabberG\src\jabber_proto.cpp

+[%s error notifications]

 [Protocol is offline or no JID]

 [No valid OMEMO session exists]

 ;file \protocols\JabberG\src\jabber_rc.cpp

diff --git a/langpacks/english/Plugins/NewEventNotify.txt b/langpacks/english/Plugins/NewEventNotify.txt
index c0e9c661d9..44788e32ac 100644
--- a/langpacks/english/Plugins/NewEventNotify.txt
+++ b/langpacks/english/Plugins/NewEventNotify.txt
@@ -12,12 +12,13 @@
 [Popup options]

 [Text]

 [Background]

-[Timeout]

+[Timeout, secs]

 [Message]

 [File]

 [Errors]

 [Others]

 [Preview]

+[(timeout -1 means forever, 0 - default)]

 [Don't show popup when message dialog is already open]

 [Hide popup when sending new message]

 [Open reply dialog instead of reading the message]

@@ -28,13 +29,12 @@
 [Number of messages being shown]

 [Last message display first]

 [Last message display last]

-;file \plugins\NewEventNotify\src\menuitem.cpp

-[Popups]

+;file \plugins\NewEventNotify\src\main.cpp

+[New event notifications]

 ;file \plugins\NewEventNotify\src\options.cpp

 [General options]

-[Show entry in the Popups menu]

 [Show preview of event in popup]

-[Disable event notifications for instant messages]

+[Enable event notifications for instant messages]

 [Disable event notifications for group chats]

 [Notify me of...]

 [Error]

@@ -48,6 +48,7 @@
 [No popups for RSS contacts]

 [No popups for read messages]

 [Event Notify]

+[Popups]

 [Main options]

 [Message events]

 ;file \plugins\NewEventNotify\src\popup.cpp

@@ -66,5 +67,3 @@
 [Requests your authorization]

 [Unknown Event]

 [Notify of new events]

-[Enable new event notification]

-[Disable new event notification]

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index fd8856851f..6dc9ff2d15 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -119,8 +119,6 @@
 ;file \plugins\NewXstatusNotify\src\indsnd.h

 [(default sound)]

 ;file \plugins\NewXstatusNotify\src\main.cpp

-[Notification enabled]

-[Notification disabled]

 [<no status message>]

 [Contact]

 [<unknown>]

@@ -169,9 +167,7 @@
 [Extra status message changed]

 [Extra status changed]

 [Extra status message removed]

-[Enable status notification]

-[Disable status notification]

-[Toggle status notification]

+[Status notifications]

 [New Status Notify]

 [Status change]

 ;file \plugins\NewXstatusNotify\src\options.cpp

diff --git a/langpacks/english/Plugins/Omegle.txt b/langpacks/english/Plugins/Omegle.txt
index 771f0a7494..e95225c9e1 100644
--- a/langpacks/english/Plugins/Omegle.txt
+++ b/langpacks/english/Plugins/Omegle.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Omegle.dll

 ;  Plugin: Omegle protocol

-;  Version: 0.1.3.3

+;  Version: 0.1.3.4

 ;  Authors: Robert Pösel

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

 [Omegle protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/ProxySwitch.txt b/langpacks/english/Plugins/ProxySwitch.txt
index efc28b763d..f229b414ed 100644
--- a/langpacks/english/Plugins/ProxySwitch.txt
+++ b/langpacks/english/Plugins/ProxySwitch.txt
@@ -33,14 +33,11 @@
 [disconnected]

 ;file \plugins\ProxySwitch\src\main.cpp

 [Current IP address]

-[Enable &IP change notification]

-[Disable &IP change notification]

+[IP change notification]

 [Show my &IP addresses]

 [Proxy settings && interfaces]

 [Disable proxy]

 [Enable proxy]

-[Popups]

-[IP change notification]

 ;file \plugins\ProxySwitch\src\opt.cpp

 [Services]

 [ProxySwitch]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 232f8e56c4..82bb5cd12a 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -18,7 +18,6 @@
 [Delete temporary contacts on closing]

 [Show warning when message has not been received after]

 [seconds]

-[Send message on:]

 [Tabs]

 [Enable tabs]

 [Only show tab bar when it's needed]

@@ -111,14 +110,6 @@
 [Location]

 [Trim to]

 [KB]

-[Group chat]

-[Use same style as in the message log]

-[Use default colors]

-[Use custom colors]

-[Text]

-[Background]

-[Timeout (s)]

-[(0 means default setting, -1 means indefinite time)]

 [Message]

 [Undo]

 [Redo]

@@ -134,6 +125,7 @@
 ;file \plugins\Scriver\src\chat_main.cpp

 [Messaging]

 [Group chats]

+[Action: Send message]

 ;file \plugins\Scriver\src\chat_options.cpp

 [Flash when someone speaks]

 [Flash when a word is highlighted]

@@ -182,7 +174,6 @@
 [Message sessions]

 [General]

 [Log formatting]

-[Popups]

 ;file \plugins\Scriver\src\globals.cpp

 [Add contact]

 [User's details]

@@ -286,6 +277,7 @@
 [Info bar contact name]

 [Info bar background]

 [Info bar status message]

+[Background]

 [Line between messages]

 [Offline]

 [Online]

@@ -295,10 +287,6 @@
 [Do not disturb]

 [Free for chat]

 [Invisible]

-[Enter]

-[Double 'Enter']

-[Ctrl+Enter]

-[Shift+Enter]

 [** New contacts **]

 [** Unknown contacts **]

 [Event log]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 26c968ee8e..8c81410e9f 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TabSRMM.dll

 ;  Plugin: TabSRMM

-;  Version: 3.6.2.1

+;  Version: 3.6.2.2

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

@@ -70,21 +70,6 @@
 [entries]

 [More about advanced tweaks]

 [Revert to (safe) defaults]

-[Event notify options]

-[Limit message preview to]

-[characters]

-[Only show event notifications when my status is...]

-[Popup options]

-[Text]

-[Background]

-[Timeout (seconds, 0 = default, -1 = no timeout)]

-[Message]

-[Use default colors]

-[Others]

-[Preview]

-[Group chats]

-[Errors]

-[Use the message log color theme for group chat popups]

 [Dialog]

 [Cancel]

 [All modes]

@@ -178,6 +163,7 @@
 [Miscellaneous options]

 [Setup status modes for automatic tab creation...]

 [Limit nicknames on tabs to]

+[characters]

 [Esc key behavior]

 [Select container]

 [Available containers]

@@ -203,16 +189,18 @@
 [Colors]

 [...is &typing]

 [...stopped t&yping]

+[Background]

+[Text]

 [Use &default colors]

 [Use &Windows colors]

 [Only &one popup for each contact]

-[Show &entry in the main menu]

 [...is typing]

 [Default]

 [From protocol]

 [Permanent]

 [Custom]

 [...stopped typing]

+[Preview]

 [Timeout]

 [Templates]

 [Edit template]

@@ -383,6 +371,8 @@
 [Control this room (Ctrl+O)]

 ;file \plugins\TabSRMM\src\chat_main.cpp

 [Message sessions]

+[Group chats]

+[Send message]

 ;file \plugins\TabSRMM\src\chat_options.cpp

 [Input area background]

 [Log background]

@@ -601,7 +591,6 @@
 [Quote message]

 [Clear message area]

 [Toggle send later]

-[Send message]

 [Show message history]

 [Show send menu]

 [Show protocol menu]

@@ -667,8 +656,6 @@
 [Retry]

 [Send later]

 [You are editing the user notes. Click the button again or use the hotkey (default: Alt+N) to save the notes and return to normal messaging mode]

-[The filter cannot be enabled, because there are no event types selected either global or for this chat room]

-[Event filter error]

 [Selection copied to clipboard]

 [WARNING: The message you are trying to paste exceeds the message size limit for the active protocol. It will be sent in chunks of max %d characters]

 [The message you are trying to paste exceeds the message size limit for the active protocol. Only the first %d characters will be sent.]

@@ -745,9 +732,6 @@
 [Load theme]

 [Message window behavior]

 [Sending messages]

-[Send on Shift+Enter]

-[Send message on 'Enter']

-[Send message on double 'Enter']

 [Minimize the message window on send]

 [Close the message window on send]

 [Always flash contact list and tray icon for new messages]

@@ -925,11 +909,10 @@
 [All message containers need to close before the skin can be changed\nProceed?]

 [Change skin]

 ;file \plugins\TabSRMM\src\typingnotify.cpp

-[Disable &typing notification]

-[Enable &typing notification]

 [...has stopped typing.]

 [...is typing a message.]

 [Popups]

+[Typing notifications]

 [Contact started typing]

 [Contact stopped typing]

 ;file \plugins\TabSRMM\src\userprefs.cpp

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index b060750b27..248fd41545 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -168,11 +168,10 @@
 [View Brief]

 [View Complete]

 [Weather Update]

-[Popup]

-[No Popup]

 [Edit Settings]

 [Condition Changed]

 [Alert Issued]

+[Weather notifications]

 ;file \protocols\Weather\src\weather_addstn.cpp

 [Current weather information for %s.]

 [%s is now the default weather station]

@@ -249,8 +248,6 @@
 [%[..]\tcustom variables]

 ;file \protocols\Weather\src\weather_svcs.cpp

 [Station ID]

-[Disable &weather notification]

-[Enable &weather notification]

 [Update Weather]

 [Remove Old Data then Update]

 [Brief Information]

@@ -259,7 +256,6 @@
 [Enable/Disable Weather Update]

 [Update All Weather]

 [Remove Old Data then Update All]

-[Weather Notification]

 [Display in a frame]

 ;file \protocols\Weather\src\weather_update.cpp

 [Unable to retrieve weather information for %s]

diff --git a/langpacks/english/Plugins/WhoUsesMyFiles.txt b/langpacks/english/Plugins/WhoUsesMyFiles.txt
index 9b641bd148..91698339c1 100644
--- a/langpacks/english/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/english/Plugins/WhoUsesMyFiles.txt
@@ -39,8 +39,6 @@
 [Error memory allocation]

 ;file \plugins\WhoUsesMyFiles\src\wumfplug.cpp

 [Error creating menu]

-[Enable WUMF popups]

-[Disable WUMF popups]

 [Show connections list]

-[Popups]

+[WUMF popups]

 [WUMF: Show connections]

diff --git a/langpacks/english/Plugins/mRadio.txt b/langpacks/english/Plugins/mRadio.txt
index fa5b9e1b30..820f468dd7 100644
--- a/langpacks/english/Plugins/mRadio.txt
+++ b/langpacks/english/Plugins/mRadio.txt
@@ -25,15 +25,15 @@
 [Shuffle playlist]

 [Loop single media]

 [Station Name]

-[Timeout, ms (5000)]

-[PreBuf, % (75%)]

+[Timeout, ms]

+[PreBuf, %]

 [Hallway]

 [Mountains]

 [Use EAX]

 [Under Water]

 [Station URL (required)]

 [To INI]

-[Buffer, ms (5000)]

+[Buffer, ms]

 [Add station]

 [Add Station]

 [Bitrate]