langpacks/english: update

11 files changed, 41 insertions, 41 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index bf0e415c1b..8afe52e27a 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -610,8 +610,8 @@
 [Database encryption mode]

 [Standard]

 [Total]

-[Only critical data are encrypted (passwords, security tokens, etc). All other settings and history remains unencrypted. Fast and effective, suitable for the most cases]

-[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. Recommended only for paranoid users]

+[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]

 [&Hide/Show]

 [E&xit]

@@ -1082,6 +1082,8 @@
 ;file \src\mir_app\src\clistmod.cpp

 [Connecting]

 [Connecting (attempt %d)]

+[&Accounts...]

+[&Options...]

 ;file \src\mir_app\src\clistopts.cpp

 [Common]

 ;file \src\mir_app\src\clistsettings.cpp

@@ -1132,9 +1134,9 @@
 [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]

+[This database is in the old format that isn't supported anymore. Press Yes to convert it to the new format or No to return]

+[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]

+[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]

 [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

@@ -1252,7 +1254,6 @@
 ;file \src\mir_app\src\menu_tray.cpp

 [Tray menu]

 [&Hide/show]

-[&Options...]

 [&About]

 ;file \src\mir_app\src\menu_utils.cpp

 [Menu icons]

@@ -1328,7 +1329,7 @@
 [Network]

 ;file \src\mir_app\src\newplugins.cpp

 [No messaging plugins loaded. Please install/enable one of the messaging plugins, for instance, "StdMsg.dll"]

-['%s' is disabled, re-enable?]

+['%S' is disabled, re-enable?]

 [Re-enable Miranda plugin?]

 [Core plugin '%s' cannot be loaded or missing. Miranda will exit now]

 [Fatal error]

@@ -1400,7 +1401,6 @@
 [Account name must be filled.]

 [Account error]

 [Account name has to be unique. Please enter unique name.]

-[&Accounts...]

 ;file \src\mir_app\src\proto_order.cpp

 ;file \src\mir_app\src\searchresults.cpp

 [Could not start a search on '%s', there was a problem - is %s connected?]

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 4dd0755403..1b7d8efff1 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: DbEditorPP.dll

 ;  Plugin: Database editor++

-;  Version: 4.0.2.1

+;  Version: 4.0.2.2

 ;  Authors: Bio, Jonathan Gordon

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

 [Advanced Database Editor.]

@@ -171,7 +171,8 @@
 [Type]

 [Size]

 [Unable to store value in this data type!]

-[Are you sure you want to delete setting(s): %d?]

+[Are you sure you want to delete %d contact(s)?]

+[Are you sure you want to delete %d setting(s)?]

 [*** encrypted ***]

 [*** buggy resident ***]

 ;file \plugins\DbEditorPP\src\settingsdlg.cpp

diff --git a/langpacks/english/Plugins/Dbx_sqlite.txt b/langpacks/english/Plugins/Dbx_sqlite.txt
index 1d6bb962f7..b01f6fffc3 100644
--- a/langpacks/english/Plugins/Dbx_sqlite.txt
+++ b/langpacks/english/Plugins/Dbx_sqlite.txt
@@ -2,13 +2,12 @@
 ;============================================================

 ;  File: Dbx_sqlite.dll

 ;  Plugin: Miranda NG SQLite database driver

-;  Version: 0.96.1.1

+;  Version: 0.96.1.2

 ;  Authors: Miranda-NG project

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

 [Provides Miranda database support: global settings, contacts, history, settings per contact.]

-;file \plugins\Dbx_sqlite\res\dbx_sqlite.rc

-[Database encryption mode]

-[Standard]

-[Total]

-[Only critical data are encrypted (passwords, security tokens, etc). All other settings and history remains unencrypted. Fast and effective, suitable for the most cases]

-[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. Recommended only for paranoid users]

+;file \plugins\Dbx_sqlite\src\dbcheck.cpp

+[Orphaned event with wrong contact ID %d, deleting]

+[Orphaned sorting event with wrong event ID %d:%08X, deleting]

+[Orphaned event with wrong event ID %d:%08X, deleting]

+[Orphaned setting [%S:%S] with wrong contact ID %d, deleting]

diff --git a/langpacks/english/Plugins/Discord.txt b/langpacks/english/Plugins/Discord.txt
index d99ccf176c..2c227c1a5d 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.8

+;  Version: 0.6.2.10

 ;  Authors: George Hazan

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

 [Discord support for Miranda NG.]

@@ -15,6 +15,7 @@
 [Enable group chats]

 [Do not open chat windows on creation]

 [Use subgroups for server channels (requires restart)]

+[Delete messages in Miranda when they are deleted from server]

 [Nick:]

 ;file \protocols\Discord\src\dispatch.cpp

 [edited at]

diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index 1be8085feb..af7d255583 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -60,6 +60,7 @@
 [Skipping contact, %S not installed.]

 [Skipping non-IM contact (%S)]

 [Skipping duplicate %S contact %s]

+[Failed to create contact %s (%s)]

 [Failed to add %S contact %s]

 [Added %S contact %s, '%s']

 [Added %S contact %s]

diff --git a/langpacks/english/Plugins/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
index b2e905e9aa..4304bfca33 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: NewAwaySys.dll

 ;  Plugin: New Away System Mod

-;  Version: 0.4.0.4

+;  Version: 0.4.0.5

 ;  Authors: NightFox, Deathdemon, XF007, Goblineye Entertainment

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

 [Allows you to handle your status messages in a convenient way.]

@@ -54,7 +54,6 @@
 [Store protocol autoreply settings for each status separately]

 [Remember last message used for a contact...]

 [Store contact autoreply/ignore settings for each status separately]

-[Enable contact menu items]

 [Use protocol specific nick for %nas_mynick%]

 [Update status messages for non-ICQ protocols every]

 [seconds]

diff --git a/langpacks/english/Plugins/NotesReminders.txt b/langpacks/english/Plugins/NotesReminders.txt
index 20789b3bba..f1ff5ab89a 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.2.0

+;  Version: 0.2.2.1

 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer

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

 [Sticky Notes & Reminders Implementation for Miranda NG.]

@@ -134,10 +134,10 @@
 [Select Executable]

 [Plugins]

 ;file \plugins\NotesAndReminders\src\reminders.cpp

+[The specified time is invalid.]

 [Minutes]

 [Hours]

 [The specified time is invalid due to begin of daylight saving (summer time).]

-[The specified time is invalid.]

 [Hour]

 [Day]

 [Days]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 304073f405..ccfeaac18e 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: PluginUpdater.dll

 ;  Plugin: Plugin updater

-;  Version: 0.2.0.11

+;  Version: 0.2.0.12

 ;  Authors: Mataes, George Hazan

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

 [Installs and updates plugins and other Miranda NG components.]

@@ -100,11 +100,12 @@
 [Services]

 ;file \plugins\PluginUpdater\src\PluginUpdater.cpp

 [Check for updates]

+[Plugin info]

+[Plugin Updater HTTP connections]

 [Available components list]

-[Update completed]

 [Update failed]

+[Update completed]

 ;file \plugins\PluginUpdater\src\Utils.cpp

-[Plugin info]

-[Plugin Updater HTTP connections]

+[Updates are temporarily disabled, try again later.]

 [An error occurred while checking for new updates.]

 ;file \plugins\PluginUpdater\src\Compat\compat.h

diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index abc0f016d6..9c73277941 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SimpleStatusMsg.dll

 ;  Plugin: Simple status message

-;  Version: 1.9.0.8

+;  Version: 1.9.0.9

 ;  Authors: Bartosz 'Dezeath' Białek, Harven

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

 [Provides a simple way to set status and away messages.]

@@ -48,7 +48,6 @@
 [Automatically close dialog window after]

 [Remember last dialog window position]

 [Remove Carriage Return (CR = '\\r' = #0D) chars from status messages]

-[Show 'Status message...' item in status menu]

 [Clear History]

 [Clear Predefined]

 [* This feature is available only when using StatusManager plugin.]

diff --git a/langpacks/english/Plugins/StatusManager.txt b/langpacks/english/Plugins/StatusManager.txt
index 532e25bac7..2dd1b353c4 100644
--- a/langpacks/english/Plugins/StatusManager.txt
+++ b/langpacks/english/Plugins/StatusManager.txt
@@ -121,7 +121,7 @@
 [Delete]

 [Create a TopToolBar button]

 [Show confirm dialog when loading]

-[Create a main menu item]

+[Create a status menu item]

 [Status profiles]

 [Hotkey]

 [In submenu]

@@ -183,7 +183,6 @@
 [None]

 [size: %d x %d]

 [loc: %d x %d]

-[Create a status menu item]

 [unknown]

 [At least one profile must exist]

 [Your default profile will be changed]

diff --git a/langpacks/english/Plugins/WebView.txt b/langpacks/english/Plugins/WebView.txt
index 9e9c251da9..8ca301cede 100644
--- a/langpacks/english/Plugins/WebView.txt
+++ b/langpacks/english/Plugins/WebView.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Webview.dll

 ;  Plugin: Webview

-;  Version: 0.1.3.2

+;  Version: 0.1.3.3

 ;  Authors: Vincent Joyce

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

 [Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window.]

@@ -13,7 +13,6 @@
 [Delay update on start]

 [seconds]

 [Hide icon on status bar]

-[Disable main menu items]

 [Load page on window open]

 [Update data on startup]

 [Only update window on alert]

@@ -109,8 +108,6 @@
 [Stop data processing]

 ;file \protocols\WebView\src\webview.cpp

 [All Webview sites have been updated.]

-[Network]

-[Popups]

 ;file \protocols\WebView\src\webview_alerts.cpp

 [Cannot write to file]

 [Last updated on]

@@ -159,6 +156,16 @@
 [Bytes downloaded]

 [Alert test conditions not met; press the refresh button to view content.]

 ;file \protocols\WebView\src\webview_opts.cpp

+[This is a preview popup.]

+[Network]

+[Popups]

+;file \protocols\WebView\src\webview_services.cpp

+[Invalid symbol present in contact name.]

+[Cache folder does not exist.]

+[Missing "psite.bat" file.]

+[Site URL]

+[Please select site in Find/Add contacts...]

+;file \protocols\WebView\src\webview_ui.cpp

 [No whitespace removal]

 [Minimal level of whitespace removal]

 [Medium level of whitespace removal]

@@ -169,16 +176,9 @@
 [A string is present]

 [The web page changes]

 [A specific part of web page changes]

-[This is a preview popup.]

 [You need to supply a search string.]

 [You need to supply a start string.]

 [You need to supply an end string.]

 [You need to supply a file name and path.]

 [You need to supply a URL.]

 [You need to supply a name for the contact.]

-[Invalid symbol present in contact name.]

-;file \protocols\WebView\src\webview_services.cpp

-[Cache folder does not exist.]

-[Missing "psite.bat" file.]

-[Site URL]

-[Please select site in Find/Add contacts...]