- langpacks/english: updated

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

1 files changed, 3 insertions, 58 deletions

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 808b7e9ab7..0c4339d964 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -76,13 +76,7 @@
 [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]

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

-[<GPGdec>]

-[<GPGenc>]

-[Arial]

 [GPG Turn off encryption]

 [GPG Turn on encryption]

 [GPG encryption status]

@@ -92,7 +86,6 @@
 [Export GPG Public keys]

 [Import GPG Public keys]

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

-[Key ID]

 [Email]

 [Name]

 [Creation date]

@@ -103,29 +96,18 @@
 [key id]

 [not set]

 [Default private key id]

-[\\new_key]

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

-[Software\\GNU\\GnuPG]

-[gpgProgram]

 [wrong gpg binary location found in system.\nplease choose another location]

 [This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn.]

 [Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn.]

 [found "gpg" directory in MIranda root.\nassuming it's gpg home directory.\ngpg home directory set.]

 [Info]

-[APPDATA]

-[\\GnuPG]

-[gpg]

 [Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]

-[Choose gpg.exe]

-[Set home diractory]

 [gpg binary does not exists.\nplease choose another location]

 [please choose gpg binary location]

 [please set keyring's home directory]

@@ -134,8 +116,6 @@
 [Replace]

 [Accept]

 [Received key from ]

-[RSA]

-[DSA]

 [You must set encryption algorythm first]

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

 [Invalid date]

@@ -143,12 +123,7 @@
 [Name cannot contain '(' or ')']

 [Invalid Email]

 [Generating new key, please wait...]

-[Expiration date]

 [Failed to export public key.]

-[ --keyserver "]

-[" --recv-keys ]

-[access_test\n]

-[TEMP]

 [GPG binary is set and valid (this is good).\n]

 [GPG binary unset or invalid (plugin will not work).\n]

 [Home dir write access granted (this is good).\n]

@@ -157,7 +132,6 @@
 [Temp dir have not write access (plugin should work, but may have some problems, filetransfers will not work).]

 [\nGPG will be disabled until you solve this problems]

 [GPG plugin problems]

-[\\tmp]

 [Your secret key whith id: ]

 [ for account ]

 [ deleted from gpg secret keyring\nDo you want to set another key ?]

@@ -167,15 +141,10 @@
 [Own private key warning]

 [Do you want load key for all subcontacts ?]

 [Metacontact detected]

-[ --batch ]

-[ --import "]

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

 [We received encrypted message from contact with encryption turned off.\nDo you want turn on encryption for this contact ?]

 [Do you want try to decrypt encrypted message ?]

-[\\tmp\\]

-[ -d -a "]

 [failed to decrypt message, GPG returned error, turn on debug log for more details]

-[GPG_Key_Auto_Exchange:0]

 [We trying to encrypt with untrusted key, do you want to trust this key permanently ?]

 [failed o encrypt message, GPG returned error, turn on debug log for more details]

 [Something wrong, gpg does not understand us, aborting encryption.]

@@ -186,10 +155,10 @@
 [Messages]

 [Advanced]

 [Contact]

+[Key ID]

 [Protocol]

 [This key not used by any contact, do you want to remove it from public keyring ?]

 [Key info]

-[ --batch --yes --delete-key ]

 [we have secret key for this public key, do not removing from GPG keyring]

 [info]

 [Key removed from GPG keyring]

@@ -198,14 +167,14 @@
 [.asc pubkey file]

 [Set log file]

 [LOG files]

+[Choose gpg.exe]

+[Set home diractory]

 [Load Public GPG Key for ]

 [Turn off encryption]

-[ --export -a ]

 [ found in prescense, and exists in keyring.)]

 [Load Public GPG Key (Key ID: ]

 [ found in prescense.)]

 [This is not public or private key]

-[INFO]

 [Key already in scret key ring.]

 [Set file containing GPG public key]

 [GPG public key file]

@@ -213,38 +182,14 @@
 ;file \plugins\New_GPG\src\utilities.cpp

 [Do you want to toggle encryption for all subcontacts ?]

 [Send publick key]

-[ -o ]

 [Target file exists, do you want to replace it ?]

-[ -d "]

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

-[Comment: ]

-[Encoding: ]

-[xmlns]

-[jabber:x:encrypted]

-[status]

-[ --default-key ]

-[ --batch --yes -a -b -s "]

-[jabber:x:signed]

-[\n-----END PGP SIGNATURE-----\n]

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

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