langpacks/english: update

10 files changed, 45 insertions, 82 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 09342729b8..c8f8decd9f 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -190,7 +190,7 @@
 ;file \src\core\stdmsg\res\resource.rc

 [Automatically popup window when:]

 [In background]

-[Maximum number of flashes]

+[Maximum number of flashes (0 = indefinite)]

 [Close the message window on send]

 [Minimize the message window on send]

 [Use the contact's status icon as the window icon]

@@ -599,6 +599,20 @@
 [Show popups only when the chat room is not active]

 [Show button menus when right clicking the buttons]

 [Hidden window]

+[Select crypto provider]

+[Login to Miranda NG]

+[New password]

+[Please enter your new password]

+[Enter password]

+[Change password]

+[Change]

+[Old password]

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

+[Set password]

 [&Hide/Show]

 [E&xit]

 [Nowhere]

@@ -1122,6 +1136,7 @@
 [Extra icons]

 ;file \src\mir_app\src\ei_services.cpp

 [Mute chat]

+[Database]

 ;file \src\mir_app\src\findadd.cpp

 [You haven't filled in the search field. Please enter a search term and try again.]

 [Search]

@@ -1203,6 +1218,14 @@
 [(incompatible)]

 [Unknown]

 [Languages]

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

+[Change/remove password]

+[Wrong old password entered!]

+[Password is too short!]

+[Passwords do not match!]

+[Too many errors!]

+[Password is not correct!]

+[Please type in your password]

 ;file \src\mir_app\src\menu_clist.cpp

 [Custom status]

 [%s (locked)]

diff --git a/langpacks/english/Plugins/DbChecker.txt b/langpacks/english/Plugins/DbChecker.txt
index 726c23825b..ca84aa1635 100644
--- a/langpacks/english/Plugins/DbChecker.txt
+++ b/langpacks/english/Plugins/DbChecker.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: DbChecker.dll
 ;  Plugin: Database checker
-;  Version: 0.95.13.1
+;  Version: 0.95.13.2
 ;  Authors: George Hazan
 ;============================================================
 [Miranda NG Database Checker.]
@@ -10,6 +10,10 @@
 [Miranda Database Tool]
 [&Next >]
 [Cancel]
+[Checker's options]
+[Customize settings and proceed to the checking.]
+[File name:]
+[Mark all events as read]
 [Error Opening Database]
 [There was an error opening the profile database given.]
 [Click Next to try opening the file again, or click Back to select a new profile database to manipulate.]
@@ -19,7 +23,7 @@
 ;file \plugins\DbChecker\src\main.cpp
 [Database]
 [Check database]
-;file \plugins\DbChecker\src\openerror.cpp
+;file \plugins\DbChecker\src\options.cpp
 [Database Checker cannot find a suitable database plugin to open '%s'.]
 [Error]
 [Database driver '%s' doesn't support checking.]
@@ -30,6 +34,7 @@
 ;file \plugins\DbChecker\src\wizard.cpp
 ;file \plugins\DbChecker\src\worker.cpp
 [Database worker thread activated]
+[%d events marked as read]
 [Processing aborted by user]
 [Elapsed time: %d sec]
 [All tasks completed but with errors (%d)]
diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 23a8bd014a..68a7e4a8aa 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.1.3

+;  Version: 4.0.1.4

 ;  Authors: Bio, Jonathan Gordon

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

 [Advanced Database Editor.]

@@ -25,6 +25,7 @@
 [Use popups when watched settings change values]

 [Popup timeout (0 for infinite)]

 [Background color]

+[Text color]

 [Add a module to contact]

 [Add a module named]

 [Add to all contacts (including Settings)]

@@ -165,6 +166,7 @@
 [Loading modules...]

 [Contacts]

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

+[Popups]

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

 [Add module to "%s"]

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

diff --git a/langpacks/english/Plugins/Dbx_mdbx.txt b/langpacks/english/Plugins/Dbx_mdbx.txt
index 0545b02218..7b92f9f00f 100644
--- a/langpacks/english/Plugins/Dbx_mdbx.txt
+++ b/langpacks/english/Plugins/Dbx_mdbx.txt
@@ -6,44 +6,16 @@
 ;  Authors: Miranda-NG project

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

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

-;file \plugins\Dbx_mdbx\res\dbx_mdbx.rc

-[Select crypto provider]

-[Cancel]

-[Total encryption (Recommended only for paranoid users)]

-[Login to Miranda NG]

-[New password]

-[Please enter your new password]

-[Enter password]

-[Change password]

-[Change]

-[Remove]

-[Old password]

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

-[Set password]

 ;file \plugins\Dbx_mdbx\src\dbcheck.cpp

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

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

 [Orphaned event id with wrong event ID %08X, deleting]

 [Orphaned setting with wrong contact ID %08X, deleting]

-;file \plugins\Dbx_mdbx\src\dbcrypt.cpp

-[Too many errors!]

-[Password is not correct!]

-[Please type in your password]

 ;file \plugins\Dbx_mdbx\src\dbintf.cpp

 [Your database is in the obsolete format. Click OK to read the upgrade instructions or Cancel to exit]

 [Error]

-;file \plugins\Dbx_mdbx\src\dbintf.h

-[Change/remove password]

 ;file \plugins\Dbx_mdbx\src\ui.cpp

-[Wrong old password entered!]

-[Password is too short!]

-[Passwords do not match!]

 [Database was compacted successfully]

 [Database]

 [Database compaction failed]

-[Logo]

 [Compact]

diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 481acdfeb4..4428a2d6c5 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -6,23 +6,6 @@
 ;  Authors: Miranda-NG project

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

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

-;file \plugins\Db3x_mmap\res\db3x_mmap.rc

-[Select crypto provider]

-[Cancel]

-[Login to Miranda NG]

-[New password]

-[Please enter your new password]

-[Enter password]

-[Change password]

-[Change]

-[Remove]

-[Old password]

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

-[Set password]

 ;file \plugins\Db3x_mmap\src\database.cpp

 [Miranda has detected corruption in your database. Miranda will now shut down.]

 [Disk is full. Miranda will now shut down.]

@@ -32,20 +15,9 @@
 ;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\dbintf.h

-[Change/remove password]

 ;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]

-;file \plugins\Db3x_mmap\src\ui.cpp

-[Logo]

-[Too many errors!]

-[Password is not correct!]

-[Please type in your password]

-[Wrong old password entered!]

-[Password is too short!]

-[Passwords do not match!]

-[Database]

diff --git a/langpacks/english/Plugins/Dbx_sqlite.txt b/langpacks/english/Plugins/Dbx_sqlite.txt
index 4b0025e0e7..acaf571a6b 100644
--- a/langpacks/english/Plugins/Dbx_sqlite.txt
+++ b/langpacks/english/Plugins/Dbx_sqlite.txt
@@ -2,24 +2,13 @@
 ;============================================================

 ;  File: Dbx_sqlite.dll

 ;  Plugin: Miranda NG SQLite database driver

-;  Version: 0.95.10.2

+;  Version: 0.95.13.1

 ;  Authors: Miranda-NG project

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

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

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

-[Select crypto provider]

-[Cancel]

-[Login to Miranda NG]

-[New password]

-[Please enter your new password]

-[Enter password]

-[Change password]

-[Change]

-[Remove]

-[Old password]

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

-[Set password]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 8dc977323b..88ae2de087 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.9

+;  Version: 0.2.0.10

 ;  Authors: Mataes, George Hazan

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

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

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index af64e061ff..11beaa13d9 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SkypeWeb.dll

 ;  Plugin: Skype protocol (Web)

-;  Version: 0.95.13.1

+;  Version: 0.95.13.2

 ;  Authors: Miranda NG team

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

 [Skype protocol support for Miranda NG. Based on new Skype for Web.]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index 5b471b9e66..5fe9f5ce88 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Steam.dll

 ;  Plugin: Steam protocol

-;  Version: 0.95.12.1

+;  Version: 0.95.12.2

 ;  Authors: Miranda NG team, Robert Pösel

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

 [Steam protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 12218a1430..048c47788f 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -470,8 +470,8 @@
 [Channel operators]

 [Extended mode 1]

 [Extended mode 2]

-[Selected nicklist background]

-[Selected nicklist text]

+[Selected nick list background]

+[Selected nick list text]

 [Incremental search highlight]

 [Fields background]

 [Nick list background]

@@ -905,6 +905,11 @@
 ;file \plugins\TabSRMM\src\sendlater.cpp

 [A send later job completed successfully.\nThe original message: %s]

 [A send later job failed to complete.\nThe original message: %s]

+[Contact]

+[Original timestamp]

+[Message text]

+[Last send info]

+[You are about to modify the state of one or more items in the\nunattended send queue. The requested action(s) will be executed at the next scheduled queue processing.\n\nThis action cannot be made undone.]

 [<All contacts>]

 [Removed]

 [Failed]

@@ -912,11 +917,6 @@
 [Deferred]

 [Suspended]

 [Pending]

-[Contact]

-[Original timestamp]

-[Message text]

-[Last send info]

-[You are about to modify the state of one or more items in the\nunattended send queue. The requested action(s) will be executed at the next scheduled queue processing.\n\nThis action cannot be made undone.]

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

 [The message cannot be sent delayed or to multiple contacts, because it exceeds the maximum allowed message length of %d bytes]

 [A message delivery has failed after the contacts chat window was closed. You may want to resend the last message]