- langpacks/english: update;

git-svn-id: http://svn.miranda-ng.org/main/trunk@9684 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 53 insertions, 20 deletions

diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index af27d2bd12..b443018931 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -41,7 +41,6 @@
 [Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname <protocol> new_nickname.]

 [Ignores or removes ignore flags for specific contacts.\nUsage:\n  ignore (block | unblock) <contact> [<contact> [<contact> [...]]].\nThe command will set or remove ignore flags for the specified contacts]

 ;file \plugins\CmdLine\src\mimcmd_handlers.cpp

-[Command '%s' is not currently supported.]

 [Wrong number of parameters for command '%s'.]

 [Unknown parameter '%s' for command '%s'.]

 [Current global status: %s.%s]

@@ -55,6 +54,22 @@
 [Changed '%s' status message to '%s' (status is '%s').]

 [Account '%s' does not support away messages, skipping.]

 [Failed to change status message for account '%s' to '%s' (status is '%s').]

+[Popups are currently enabled.]

+[Popups are currently disabled.]

+[Popups were enabled successfully.]

+[Popups could not be enabled.]

+[Popups were disabled successfully.]

+[Popups could not be disabled.]

+[Sounds are currently enabled.]

+[Sounds are currently disabled.]

+[Sounds were enabled successfully.]

+[Sounds were disabled successfully.]

+[Contact list is currectly shown.]

+[Contact list is currently hidden.]

+[Contact list was shown successfully.]

+[Contact list was hidden successfully.]

+[Issued a quit command.]

+[Issued a quit and wait command.]

 [Issued check email command to Exchange plugin.]

 [Exchange plugin is not running.]

 [Issued check email command to YAMN plugin.]

@@ -67,7 +82,20 @@
 [Could not send message to '%s'.]

 [Timed out while waiting for acknowledgement for contact '%s'.]

 [Could not find contact handle for contact '%s'.]

+[byte:%d]

+[word:%d]

+[dword:%ld]

+[string:'%s']

+[wide string:'%S']

+[utf8:'%s']

+[blob:N/A]

+[unknown value]

 [Setting '%s/%s' deleted.]

+[string]

+[byte]

+[word]

+[dword]

+[wide string]

 [Wrote '%s:%s' to database entry '%s/%s'.]

 [Could not retrieve setting '%s/%s': %s.]

 [Setting '%s/%s' was not found.]

@@ -81,6 +109,7 @@
 [%s:%s - %d unread events.]

 [Contact '%s' has %d events in history.]

 [Error setting nickname to '%s' for protocol '%s']

+[Command '%s' is not currently supported.]

 ;file \plugins\CmdLine\src\services.cpp

 [Could not create CommandLine listening server!]

 [You can only run one instance of CmdLine plugin.]

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 64935b2ddb..4cc1c53307 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -8,20 +8,20 @@
 [Advanced Database Editor.]

 ;file \plugins\DbEditorPP\res\resource.rc

 [Database Editor++ search and replace]

+[Search for]

+[Text:]

+[In:]

 [Case sensitive]

 [Module name]

 [Exact match]

 [Setting name]

 [Setting value]

 [&Search]

+[Replace with]

+[Entirely]

 [Found field]

 [&Replace]

 [&Cancel]

-[Search for]

-[Text:]

-[In:]

-[Replace with]

-[Entirely]

 [Restore last opened position]

 [Automatically expand "Settings" when Database Editor++ starts]

 [Warn when deleting modules]

@@ -33,24 +33,24 @@
 [Add to all contacts (including Settings)]

 [Cancel]

 [Edit setting]

-[Byte]

-[Word]

-[Dword]

-[String]

-[Hexadecimal]

-[Decimal]

 [Value name:]

 [Value data:]

 [Base]

+[Hexadecimal]

+[Decimal]

 [Save value as:]

+[Byte]

+[Word]

+[Dword]

+[String]

 [Watched database settings]

 [Copy module to contact]

-[Copy to all contacts (including Settings)]

 [Contact to copy module and settings to]

+[Copy to all contacts (including Settings)]

 [Import module/settings]

+[Paste the settings to import here.]

 [Import]

 [Insert &CR/LF]

-[Paste the settings to import here.]

 [Database Editor++]

 [&Main]

 [&Refresh modules]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 4d8927f55d..58c0289389 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -107,6 +107,8 @@
 [Error]

 [Generating new random key, please wait]

 [Failed to allocate memory]

+[Failed to lock memory with error %d]

+[Failed write to clipboard with error %d]

 [GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended to place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have been warned.]

 [Warning]

 [Wrong GPG binary location found in system.\nPlease choose another location]

@@ -122,7 +124,7 @@
 [New public key was received, do you want to import it?]

 [Replace]

 [Accept]

-[Received key from ]

+[Received key from %s]

 [You must set encryption algorithm first]

 [Key length must be of length from 1024 to 4096 bits]

 [Invalid date]

@@ -172,6 +174,7 @@
 [Do you want to remove key from entire metacontact (all subcontacts)?]

 [Export public key]

 [.asc pubkey file]

+[Failed to open clipboard with error %d]

 [Set log file]

 [LOG files]

 [Choose gpg.exe]

@@ -193,11 +196,12 @@
 [File transfer warning]

 [Unable to check encryption support on other side.\nRecipient may be unable to decrypt file(s).\nCurrently capability check supported only for ICQ and Jabber protocols.\nIt will work for any other proto if Miranda with New_GPG is used on other side.\nDo you want to encrypt file(s) anyway?]

 [encrypting file for transfer]

-[we have successfully exported]

-[public keys]

-[and]

-[all private keys]

+[We have successfully exported %d public keys and all private keys.]

+[We have successfully exported all private keys.]

+[We have successfully exported %d public keys.]

 [Keys export result]

+[We have successfully processed %d public keys and some private keys.]

+[We have successfully processed %d public keys.]

 [Keys import result]

 [New passwords do not match]

 [Old password does not match, you can continue, but GPG will reject wrong password.\nDo you want to continue?]

diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index 132904a4b4..9b8578c194 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -108,7 +108,7 @@
 [Swap button]

 [Import]

 ;file \plugins\Quotes\src\ImportExport.cpp

-[Xml File (*.xml)]

+[XML File (*.xml)]

 [All files (*.*)]

 ;file \plugins\Quotes\src\ModuleInfo.cpp

 [Miranda could not load Quotes plugin. XML parser is missing.]