- langpacks/english: updated

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

1 files changed, 35 insertions, 9 deletions

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 6cc23c1c4d..2cfb5db474 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -1,11 +1,13 @@
-;#muuid not found, please specify manually!

+#muuid {4227c050-8d97-48d2-91ec-6a952b3dab94}

 ;langpack template for New_GPG

 ;file \plugins\New_GPG\res\new_gpg.rc

+[Load Public GPG key]

 [ОК]

 [Load from file]

 [Select existing]

 [Turn on encryption]

 [Import key from keyserver]

+[Set own key]

 [Generate key]

 [Select key for use]

 [Key password:]

@@ -14,15 +16,20 @@
 [Generate and use random key]

 [Account:]

 [key id: ]

+[Copy public key]

+[Export private key]

+[Set GPG bin path and keyring home dir.]

 [Continue]

 [Home directory:]

 [GnuPG binary:]

 [Browse]

 [Turn on key autoexchange]

+[The new public key was recieved]

 [Import key]

 [Accept and enable encryption]

 [Ignore]

-[Статический]

+[Static]

+[Key Generation dialog]

 [OK]

 [Cancel]

 [Key type:]

@@ -35,14 +42,22 @@
 [From 1024 to 4096]

 [It can take a long time, be patient]

 [0 - does not expire]

+[Select existing public key from list]

+[Enter password for your secret key]

 [Password:]

 [Save password to database]

 [Default password]

 [Import]

 [Select keyserver for key search:]

+[Recieved encrypted file]

 [Decrypt]

 [Recieved encrypted file form contact whith disabled encryption.]

 [Remember choice]

+[Choose which  keys to export]

+[Ok]

+[Export public keys (only set for contacts)]

+[Export all private keys]

+[Export public and private keys]

 [Userlist:]

 [Export PubKey]

 [Select own key]

@@ -59,6 +74,8 @@
 [Close:]

 [Strip all tags in outgoing messages]

 [Turn on presence signing (Jabber) (required by xep 0-27)]

+[Export keys]

+[Import keys]

 ;file \plugins\New_GPG\src\gpg_wrapper.cpp

 [" --homedir "]

 [LANGUAGE=en@quot\0LC_ALL=English\0]

@@ -72,10 +89,9 @@
 [Load GPG public key]

 [Toggle GPG encryption]

 [Send public key]

-[Export GPG Public keys from all users]

-[Import GPG Public keys from all users]

+[Export GPG Public keys]

+[Import GPG Public keys]

 ;file \plugins\New_GPG\src\main.cpp

-[Set own key]

 [Key ID]

 [Email]

 [Name]

@@ -91,6 +107,9 @@
 [Failed to open file]

 [Error]

 [Generating new random key, please wait]

+[Failed to alocate memory]

+[Choose file to export key]

+[Any file]

 [\\GnuPG\\gnupg.nls\\en@quot.mo]

 [gpg binary found in miranda folder, but english locale does not exists.\nit's highly recommended to place \\gnupg.nls\\en@quot.mo in gnupg folder under miranda root.\nwithout this file you may expirense many problem with gpg output on non english systems.\nand plugin may completely do not work.\nyou have beed warned.]

 [Warning]

@@ -115,7 +134,6 @@
 [Replace]

 [Accept]

 [Received key from ]

-[Key Generation dialog]

 [RSA]

 [DSA]

 [You must set encryption algorythm first]

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

 [Export public key]

 [.asc pubkey file]

-[Failed to alocate memory]

 [Set log file]

 [LOG files]

 [Load Public GPG Key for ]

@@ -202,6 +219,10 @@
 [ --trust-model always ]

 [ -o "]

 [ -e "]

+[GPG_Encrypted_FileTransfers:0]

+[Capability to decrypt file not found on other side\nRecipient may be unable to decrypt file(s)\nDo you want to encrypt file(s) anyway?]

+[Filetransfer 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 used on other side.\nDo you want to encrypt file(s) anyway?]

 [encrypting file for transfer]

 [This message is encrypted.]

 [Version: ]

@@ -217,8 +238,13 @@
 [from]

 [Indicates that gpg installed and configured to public key auto exchange (currently implemented in new_gpg plugin for Miranda IM and Miranda NG)]

 [GPG_Key_Auto_Exchange:0\0\0]

-[Choose file to export public keys]

-[Any file]

+[Indicates that gpg installed and configured to encrypt files (currently implemented in new_gpg plugin for Miranda IM and Miranda NG)]

+[GPG_Encrypted_FileTransfers:0\0\0]

+[Choose file to export keys]

+[we have succesfully exported]

+[public keys]

+[and]

+[all private keys]

 [Keys export result]

 [Choose file to import keys from]

 [Keys import result]