13 files changed, 58 insertions, 89 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 898ae8f7b1..bf0e415c1b 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1,7 +1,7 @@
 ;============================================================
 ;  File: miranda32/64.exe
 ;  Module: Miranda Core
-;  Version: 0.95.13
+;  Version: 0.96.1
 ;============================================================
 ;file \src\core\stdautoaway\res\resource.rc
 [Become idle if the following is left unattended:]
@@ -1131,6 +1131,12 @@
 [This change is known to be potentially hazardous.]
 [This change is not known to be safe.]
 [Invalid setting type for '%s'. The first character of every value must be b, w, d, l, s, e, u, g, h or n.]
+;file \src\mir_app\src\db_upgrade.cpp
+[This database is in old format that isn't supported anymore. Press Yes to convert it to the new format or No to return back]
+[To open this database you need to install the Dbx_sqlite plugin. Click Yes to download it from Miranda NG's site or No to return back]
+[To open this database you need to install the Import plugin. Click Yes to download it from Miranda NG's site or No to return back]
+[Cannot move old profile '%s' to '%s': error %d]
+[Attempt to create database '%s' failed with error code %d]
 ;file \src\mir_app\src\ei_defaulticons.cpp
 [Homepage]
 [Phone/SMS]
diff --git a/langpacks/english/Plugins/AuthState.txt b/langpacks/english/Plugins/AuthState.txt
index 45b9bd4803..ed4645be0e 100644
--- a/langpacks/english/Plugins/AuthState.txt
+++ b/langpacks/english/Plugins/AuthState.txt
@@ -2,16 +2,15 @@
 ;============================================================
 ;  File: AuthState.dll
 ;  Plugin: Authorization state
-;  Version: 0.0.2.1
+;  Version: 0.0.2.2
 ;  Authors: Thief, idea by snwbrdr
 ;============================================================
 [If a contact didn't authorize you, this plugin puts an icon in front of the contact's name.]
 ;file \plugins\AuthState\res\authstate.rc
-[Show Request icon]
-[Show Grant icon]
 [Plugin settings]
-[Enable menu item]
 [Show icons only for recently added contacts]
+[Show Request icon]
+[Show Grant icon]
 ;file \plugins\AuthState\src\main.cpp
 [Request]
 [Grant]
diff --git a/langpacks/english/Plugins/BossKey.txt b/langpacks/english/Plugins/BossKey.txt
index 81b8de86b2..06ceba81c9 100644
--- a/langpacks/english/Plugins/BossKey.txt
+++ b/langpacks/english/Plugins/BossKey.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: BossKey.dll
 ;  Plugin: BossKey+
-;  Version: 0.5.0.3
+;  Version: 0.5.0.4
 ;  Authors: Goblineye Entertainment, Billy_Bons
 ;============================================================
 [Anti-Boss plugin. Makes your Miranda NG hidden or password-protected.]
@@ -29,7 +29,6 @@
 [min]
 [Miranda is started]
 [Others]
-[Create a main menu item]
 [Restore hiding on startup after failure]
 ;file \plugins\BossKeyPlus\src\BossKey.cpp
 [Password is not correct!\nPlease, enter correct password.]
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index 955ecb7f1f..0f401597c0 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Db_autobackups.dll
 ;  Plugin: Db autobackuper
-;  Version: 0.1.0.4
+;  Version: 0.1.0.5
 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons
 ;============================================================
 [Database autobackuper plugin.]
@@ -32,14 +32,14 @@
 [Database backed up]
 [Database back up in process...]
 ;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]
-[Backup profile]
-[Save profile as...]
 [Popups]
 [Database backups]
 [Backup folder]
@@ -58,7 +58,7 @@
 [any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]
 [Variables]
 [Error creating backup folder]
+[Next backup is scheduled to]
 [Select backup folder]
-;file \plugins\Db_autobackups\src\stdafx.h
 ;file \plugins\Db_autobackups\src\zip.cpp
 [Miranda NG [%s] database backup]
diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 4428a2d6c5..5a78d59c68 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -15,9 +15,3 @@
 ;file \plugins\Db3x_mmap\src\dbheaders.cpp
 [This profile is too old to be updated with PluginUpdater, your database must be converted first.\n\nWould you like to read how to fix this?]
 [Obsolete database format]
-;file \plugins\Db3x_mmap\src\init.cpp
-[This database is in old format that isn't supported anymore. Press Yes to convert it to the new format or No to return back]
-[To open this database you need to install the dbx_mdbx plugin. Click Yes to download it from Miranda NG's site or No to return back]
-[To open this database you need to install the Import plugin. Click Yes to download it from Miranda NG's site or No to return back]
-[Cannot move old profile '%s' to '%s': error %d]
-[Attempt to create database '%s' failed with error code %d]
diff --git a/langpacks/english/Plugins/Dbx_sqlite.txt b/langpacks/english/Plugins/Dbx_sqlite.txt
index 91755262d9..1d6bb962f7 100644
--- a/langpacks/english/Plugins/Dbx_sqlite.txt
+++ b/langpacks/english/Plugins/Dbx_sqlite.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Dbx_sqlite.dll
 ;  Plugin: Miranda NG SQLite database driver
-;  Version: 0.95.13.4
+;  Version: 0.96.1.1
 ;  Authors: Miranda-NG project
 ;============================================================
 [Provides Miranda database support: global settings, contacts, history, settings per contact.]
diff --git a/langpacks/english/Plugins/Discord.txt b/langpacks/english/Plugins/Discord.txt
index 4b74d4b49a..d99ccf176c 100644
--- a/langpacks/english/Plugins/Discord.txt
+++ b/langpacks/english/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.6.2.7
+;  Version: 0.6.2.8
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
diff --git a/langpacks/english/Plugins/HTTPServer.txt b/langpacks/english/Plugins/HTTPServer.txt
index 4e93223004..f4e9d44175 100644
--- a/langpacks/english/Plugins/HTTPServer.txt
+++ b/langpacks/english/Plugins/HTTPServer.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: HTTPServer.dll
 ;  Plugin: HTTPServer
-;  Version: 0.1.2.3
+;  Version: 0.1.2.4
 ;  Authors: Kennet Nielsen, modified by Vampik, Houdini
 ;============================================================
 [HTTP Web Server plugin for Miranda.]
@@ -17,13 +17,10 @@
 [HTTP Server statistics view]
 [Display hidden shares]
 [New share]
-[Show HTTP server statistics]
 [Set to default]
 [External server name]
 [This is the link pasted to the message window]
 [Write log file]
-[Enable HTTP server]
-[Main menu items]
 [Open log]
 [Show popups]
 [Page keyword]
@@ -62,12 +59,13 @@
 [IP Address: ]
 [You are browsing from]
 [Your external IP was detected as %d.%d.%d.%d\r\nby: %s]
-[You need to restart Miranda to change the main menu]
 [HTTP Server]
 [Network]
 [HTTP Share new file]
+[Show HTTP server statistics]
 ;file \plugins\HTTPServer\src\HttpUser.cpp
 [Share removed]
 ;file \plugins\HTTPServer\src\main.cpp
 [Failed to bind to port %s\r\nThis is most likely because another program or service is using this port]
 [Disable HTTP server]
+[Enable HTTP server]
diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 1d6c1cdab5..68c1c7cc2f 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -2,26 +2,23 @@
 ;============================================================
 ;  File: IRC.dll
 ;  Plugin: IRC protocol
-;  Version: 0.95.10.1
+;  Version: 0.96.1.1
 ;  Authors: Miranda team
 ;============================================================
 [Internet Relay Chat (IRC) protocol support for Miranda NG.]
 ;file \protocols\IRCG\res\IRC.rc
-[Default network]
-[Enable]
-[Server name]
-[Internet address]
+[Server]
+[Host address]
 [Port range]
+[Enable SASL]
 [Password]
-[&Add]
-[&Edit]
-[&Del]
 [User info - Required]
 [Nick]
 [Alternative nick]
 [Full name (e-mail)]
 [User ID (Ident)]
 [Ident]
+[Enable]
 [System]
 [Port]
 [only while connecting]
@@ -52,7 +49,6 @@
 [Address]
 [Channels]
 [Auth]
-[Server]
 [User]
 [Away Info]
 [The server returned the following information. Please note that this information might be misleading and/or falsified]
@@ -61,23 +57,16 @@
 [&Cancel]
 [Perform]
 [&Set]
+[&Del]
 [Alias]
 [Perform on event:]
 [Scripting support]
 [Quit message:]
 [Server code page:]
 [Enable UTF-8 autodetection]
-[Add server]
-[Auto]
-[On]
-[Off]
-[Host address]
-[Server description]
-[Network]
 [Channels on server]
 [&Join]
 [Filter by]
-[C&onnect]
 [&Save]
 [Hostmask]
 [&Clear all]
@@ -88,6 +77,8 @@
 [Bans]
 [Invites]
 [Excepts]
+[&Add]
+[&Edit]
 [Only Ops set topic]
 [No external messages]
 [Invite only]
@@ -102,22 +93,22 @@
 [Hidden]
 [Use the options to set modes for this channel. You are usually required to be op. or higher to modify.]
 [Strip colors]
+[Client-to-Client File Transfers]
+[Send mode:]
 [Normal]
 [Send-ahead]
+[Packet size (bytes):]
+[Send notice]
 [Attempt reverse DCC (good if firewalled)]
+[Client-to-Client Chats]
+[Auto-accept from:]
 [none]
 [everyone on the contact list]
 [everyone]
 [Disconnect DCC chats when disconnecting from server]
-[Manually set external IP:]
-[Client-to-Client File Transfers]
 [Client-to-Client Protocol]
-[Client-to-Client Chats]
-[Send mode:]
-[Packet size (bytes):]
+[Manually set external IP:]
 [Get IP address from server]
-[Auto-accept from:]
-[Send notice]
 [CTCP Chat Request]
 [&Accept]
 [&Deny]
@@ -128,15 +119,12 @@
 [Ignore DCC Chat requests from unknown contacts]
 [Ignore users]
 [(*) Queries from users on your contact list are never ignored]
+[Ignore mask (nick!user@host)]
+[Ignore events]
 [Queries]
 [Messages]
 [Notices]
-[Ignore mask (nick!user@host)]
-[Network (*)]
-[Ignore events]
-[(*) blank to set this mask for all networks]
-[Server:]
-[Password:]
+[Host]
 ;file \protocols\IRCG\src\clist.cpp
 [CTCP chat request from %s]
 ;file \protocols\IRCG\src\commandmonitor.cpp
@@ -189,7 +177,7 @@
 [Incorrect parameters. Usage: /sleep [ms], ms should be greater than 0 and less than 4000.]
 [Ignore system is enabled]
 [Ignore system is disabled]
-[%s on %s is now ignored (+%s)]
+[%s is now ignored (+%s)]
 [%s is not ignored now]
 [%s was not ignored]
 [Outgoing commands are shown]
@@ -218,7 +206,6 @@
 [DCC ERROR: Unable to bind local port]
 [The dcc chat connection is not active]
 [The protocol is not online]
-[Please choose an IRC-network to go online. This network will be the default.]
 [Connection cannot be established! You have not completed all necessary fields (Nickname, User ID and Full name).]
 ;file \protocols\IRCG\src\options.cpp
 [Main]
@@ -228,7 +215,6 @@
 [Edit]
 [Cancel]
 [Channel list]
-[Quick connect]
 [Server window]
 [Show channel]
 [WhoIs]
@@ -250,16 +236,13 @@
 [Baltic]
 [Vietnamese]
 [Korean (Johab)]
-[Please complete all fields]
-[Add a new network]
-[Edit this network]
-[Delete this network]
-[Do you want to delete\r\n%s]
-[Delete server]
-[Edit server]
+[Off]
+[Auto]
+[On]
 [<Resolved IP: ]
 [<Automatic>]
 [<Local IP: ]
+[Event: Connect]
 [Event: Available]
 [Event: Away]
 [Event: Not available]
@@ -267,7 +250,6 @@
 [Event: Do not disturb]
 [Event: Free for chat]
 [Event: Disconnect]
-[ALL NETWORKS]
 [Click to set commands that will be performed for this event]
 [Click to delete the commands for this event]
 [Default ANSI codepage]
@@ -278,6 +260,7 @@
 [Flags]
 [Add ignore]
 [Edit ignore]
+[Network]
 [Account]
 [DCC and CTCP]
 [Advanced]
@@ -290,7 +273,6 @@
 [CTCP %s reply sent to %s: %s]
 [Notice to %s: ]
 ;file \protocols\IRCG\src\services.cpp
-[&Quick connect]
 [&Join channel]
 [&Change your nickname]
 [Show the &list of available channels]
@@ -302,7 +284,6 @@
 [%s (%s) is requesting a client-to-client chat connection.]
 [Join channel]
 [Please enter a channel to join]
-[Please select IRC network and enter the password if needed]
 [Please enter a unique nickname]
 [Please enter your authentication code]
 [Authenticate nick]
@@ -380,7 +361,6 @@
 [&Add User]
 [Connecting to]
 ;file \protocols\IRCG\src\tools.cpp
-[Offline]
 ;file \protocols\IRCG\src\userinfo.cpp
 [Faster! Searches the network for an exact match of the nickname only. The hostmask is optional and provides further security if used. Wildcards (? and *) are allowed.]
 [Slower! Searches the network for nicknames matching a wildcard string. The hostmask is mandatory and a minimum of 4 characters is necessary in the "Nick" field. Wildcards (? and *) are allowed.]
@@ -391,8 +371,6 @@
 [Channel]
 [Mode]
 [%s - Filtered - %d items]
-[Not listed server]
-[Type new server address here]
 [Add ban/invite/exception]
 [Edit selected ban/invite/exception]
 [Delete selected ban/invite/exception]
diff --git a/langpacks/english/Plugins/NotesReminders.txt b/langpacks/english/Plugins/NotesReminders.txt
index 24156f679a..20789b3bba 100644
--- a/langpacks/english/Plugins/NotesReminders.txt
+++ b/langpacks/english/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: NotesReminders.dll
 ;  Plugin: Sticky Notes & Reminders
-;  Version: 0.2.1.0
+;  Version: 0.2.2.0
 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
 ;============================================================
 [Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -17,8 +17,6 @@
 [Title Time]
 [Startup options]
 [Hide notes at startup]
-[Add Contact list menu items]
-[(Requires Miranda restart)]
 [Reminder options]
 [Add Reminder closes dialog]
 [Use MCI to play alert sounds]
diff --git a/langpacks/english/Plugins/Sessions.txt b/langpacks/english/Plugins/Sessions.txt
index e046fdf6a3..e704ce9bce 100644
--- a/langpacks/english/Plugins/Sessions.txt
+++ b/langpacks/english/Plugins/Sessions.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Sessions.dll
 ;  Plugin: Sessions
-;  Version: 0.1.4.0
+;  Version: 0.2.0.1
 ;  Authors: MaD_CLuSTeR
 ;============================================================
 [Sessions Manager for Miranda NG.]
@@ -41,29 +41,31 @@
 [Sessions Manager]
 [Cancel]
 [Save your current session?]
-;file \plugins\Sessions\Src\Main.cpp
-[Sessions]
-[Favorite Session]
-[Not favorite Session]
-[Load Session]
-[Load last Session]
-[Current session is empty!]
-[Session name is empty, enter the name and try again]
+;file \plugins\Sessions\Src\LoadSessions.cpp
 [No sessions to open]
 [Last Sessions is empty]
 [No contacts to open]
 [This Session already opened]
 [This Session already opened (but probably hidden).\nDo you want to show hidden contacts?]
+;file \plugins\Sessions\Src\Main.cpp
 [Open Sessions Manager]
 [Show Favorite Sessions Menu]
+[Sessions]
 [Restore last Session]
 [Close Session]
 [Save session...]
 [Load session...]
 [Close session]
 [Load last session]
+[Favorite Session]
+[Not favorite Session]
+[Load Session]
+[Load last Session]
 ;file \plugins\Sessions\Src\Options.cpp
 [View]
 [Message sessions]
+;file \plugins\Sessions\Src\SaveSessions.cpp
+[Session name is empty, enter the name and try again]
+[Current session is empty!]
 ;file \plugins\Sessions\Src\Utils.cpp
 [Session Before Last Crash]
diff --git a/langpacks/english/Plugins/StartupSilence.txt b/langpacks/english/Plugins/StartupSilence.txt
index 07aba533d8..61c8b1da13 100644
--- a/langpacks/english/Plugins/StartupSilence.txt
+++ b/langpacks/english/Plugins/StartupSilence.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StartupSilence.dll
 ;  Plugin: StartupSilence
-;  Version: 0.2.0.0
+;  Version: 0.2.0.1
 ;  Authors: Vladimir Lyubimov
 ;============================================================
 [Suppresses popups and mutes sounds for 10-300 sec at Miranda NG startup, then sets them back to predefined state (Automatically per computer settings).]
@@ -14,11 +14,8 @@
 [10-300 seconds (Default 20)]
 [Show Popup notification]
 [Popup time 1-30 seconds (Default 5)]
-[Main Menu Item (plugin reload or Miranda restart required)]
 [TopToolBar button (Miranda restart required)]
-[Reset to default\r\n(for this computer)]
-[You need to configure it once for each computer, where you run your Miranda NG.]
-[No Apply button required.]
+[Reset to default]
 [After startup set:]
 [Filtered popups only (leave uncheck for no popups)]
 [Enable sounds]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index fe2e691573..1196455c30 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -924,8 +924,6 @@
 [Compact layout, horizontal buttons]
 [Advanced layout with avatars]
 [Advanced with avatars, vertical orientation]
-;file \plugins\TabSRMM\src\srmm.cpp
-[This version of TabSRMM requires Windows 2000 or later.]
 ;file \plugins\TabSRMM\src\taskbar.cpp
 [Previews not available when using History++ plugin for message log display.]
 [%d unread]