langpacks/english: massive cleaning in SRMM plugins

5 files changed, 24 insertions, 99 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 1add2a0912..53b95aca79 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -584,8 +584,16 @@
 [Ask before deleting contacts]

 [Remove temporary contacts on exit]

 ['Hide offline' means to hide:]

-[Hidden window]

+[Default settings for known event types]

+[Show when filter is active]

+[Log to file]

+[Popup]

 [Tray]

+[Sound]

+[Show icons in tray only when the chat room is not active]

+[Highlight event]

+[Show popups only when the chat room is not active]

+[Hidden window]

 [&Hide/Show]

 [E&xit]

 [Nowhere]

@@ -756,17 +764,6 @@
 [Add ':' to auto-completed user names]

 [Strip colors from messages in the log]

 [Enable the 'event filter' for new rooms]

-[Show topic changes]

-[Show users joining]

-[Show users disconnecting]

-[Show messages]

-[Show actions]

-[Show users leaving]

-[Show users being kicked]

-[Show notices]

-[Show users changing name]

-[Show information messages]

-[Show status changes of users]

 [Show icon for topic changes]

 [Show icon for users joining]

 [Show icon for users disconnecting]

@@ -779,32 +776,6 @@
 [Show icon for name changes]

 [Show icon for information messages]

 [Show icon for status changes]

-[Show icons in tray only when the chat room is not active]

-[Show icon in tray for topic changes]

-[Show icon in tray for users joining]

-[Show icon in tray for users disconnecting]

-[Show icon in tray for messages]

-[Show icon in tray for actions]

-[Show icon in tray for highlights]

-[Show icon in tray for users leaving]

-[Show icon in tray for users kicking other user]

-[Show icon in tray for notices]

-[Show icon in tray for name changes]

-[Show icon in tray for information messages]

-[Show icon in tray for status changes]

-[Show popups only when the chat room is not active]

-[Show popup for topic changes]

-[Show popup for users joining]

-[Show popup for users disconnecting]

-[Show popup for messages]

-[Show popup for actions]

-[Show popup for highlights]

-[Show popup for users leaving]

-[Show popup for users kicking other user]

-[Show popup for notices]

-[Show popup for name changes]

-[Show popup for information messages]

-[Show popup for status changes]

 [Window icon]

 [Bold]

 [Italics]

@@ -842,10 +813,7 @@
 [Group chats log]

 [Appearance and functionality of chat room windows]

 [Appearance of the message log]

-[Default events to show in new chat rooms if the 'event filter' is enabled]

 [Icons to display in the message log]

-[Icons to display in the tray]

-[Popups to display]

 [Chat log]

 [Chat]

 [Popups]

@@ -1082,6 +1050,8 @@
 [%s disables '%s' status for %s in %s]

 [%s says]

 [Chat rooms]

+;file \src\mir_app\src\chat_ui.cpp

+[Events and filters]

 ;file \src\mir_app\src\clcitems.cpp

 ;file \src\mir_app\src\clistgroups.cpp

 [New group]

diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 366c70b75e..df14930232 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Msg_Export.dll

 ;  Plugin: Message export

-;  Version: 3.1.2.5

+;  Version: 3.1.2.6

 ;  Authors: Kennet Nielsen, mod by ring0

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

 [Exports every message, URL or file you receive to a text file.]

@@ -21,10 +21,7 @@
 [Use UTF-8 in new files]

 [Append extra new line]

 [Use << and >>]

-[Auto filename]

-[Clear all]

 [Help]

-[Export all history]

 [Exporting old messages]

 [History file for %s (%s, format %s)]

 [&Find...]

@@ -38,8 +35,12 @@
 [Delete file]

 [Debug]

 [User &details]

-[Export selected]

+[Export]

 [Set to default filename]

+[Select all]

+[Select none]

+[Auto filename]

+[Clear all]

 [Copy]

 ;file \plugins\Msg_Export\src\FileViewer.cpp

 [Miranda database contains %d events]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 00cd2d0faa..db48963df8 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -152,45 +152,7 @@
 [Limit user names to 20 characters]

 [Strip colors from messages]

 [Enable 'event filter' for new rooms]

-[Show topic changes]

-[Show users joining]

-[Show users disconnecting]

-[Show messages]

-[Show actions]

-[Show users leaving]

-[Show users being kicked]

-[Show notices]

-[Show users changing name]

-[Show information messages]

-[Show status changes of users]

-[Show icons in tray only when the chat room is not active]

-[Show icon in tray for topic changes]

-[Show icon in tray for users joining]

-[Show icon in tray for users disconnecting]

-[Show icon in tray for messages]

-[Show icon in tray for actions]

-[Show icon in tray for highlights]

-[Show icon in tray for users leaving]

-[Show icon in tray for users kicking other user]

-[Show icon in tray for notices]

-[Show icon in tray for name changes]

-[Show icon in tray for information messages]

-[Show icon in tray for status changes]

-[Show popups only when the chat room is not active]

-[Show popup for topic changes]

-[Show popup for users joining]

-[Show popup for users disconnecting]

-[Show popup for messages]

-[Show popup for actions]

-[Show popup for highlights]

-[Show popup for users leaving]

-[Show popup for users kicking other user]

-[Show popup for notices]

-[Show popup for name changes]

-[Show popup for information messages]

-[Show popup for status changes]

 [Appearance and functionality of chat windows]

-[Icons to display in the tray]

 [nick of current contact (if defined)]

 [protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts]

 [user-defined account name of current contact (if defined).]

@@ -217,11 +179,10 @@
 [full weekday name]

 [Variables]

 [Appearance]

-[Default events to show in new chat rooms if the 'event filter' is enabled]

 [Select folder]

 [Message sessions]

 [General]

-[Event log]

+[Log formatting]

 [Popups]

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

 [Add contact]

@@ -347,6 +308,7 @@
 [Shift+Enter]

 [** New contacts **]

 [** Unknown contacts **]

+[Event log]

 [Typing notify]

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

 [Message from %s]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 4dc6c89595..33320b9971 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.1.2

+;  Version: 3.6.1.3

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

@@ -35,13 +35,6 @@
 [Maximum number of events in the message window]

 [Group chat nick list row height (pixels)]

 [Open log file base folder]

-[Default settings for known event types]

-[Show when filter is active]

-[Log to file]

-[Show popup]

-[Notify in tray]

-[Suppress tray notifications for focused channel windows]

-[Highlight event]

 [Line markers in the message log]

 [Highlight user names]

 [Enable highlighting for user names]

@@ -516,6 +509,9 @@
 [Add new line after names]

 [Colorize user names in message log]

 [Scale down icons to 10x10 pixels in the chat log]

+[No markers]

+[Show as icons]

+[Show as text symbols]

 [nick of current contact (if defined)]

 [protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts]

 [user-defined account name of current contact (if defined).]

@@ -543,12 +539,8 @@
 [Variables]

 [All files]

 [Select folder]

-[No markers]

-[Show as icons]

-[Show as text symbols]

 [Settings]

 [Log formatting]

-[Events and filters]

 [Highlighting]

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

 [%s%s says:%s %s]

@@ -627,7 +619,6 @@
 [Last received: %s at %s]

 [%s has entered text.]

 [%s is typing a message]

-[Auto scrolling is disabled, %d message(s) queued (press F12 to enable it)]

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

 [Instant messages]

 [Incoming (focused window)]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index 677b000f03..a83834af3a 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -47,6 +47,7 @@
 [Unable to initialize Netlib for %s.]

 [%s avatar connection]

 [Twitter (avatars)]

+[User name]

 [Send Tweet...]

 [Network]

 [Basic]