1 files changed, 50 insertions, 47 deletions
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 68372a214f..1995653892 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -92,46 +92,6 @@
 [Import GPG Public keys]
 [GPG encryption status]
 ;file \plugins\New_GPG\src\main.cpp
-[Email]
-[Name]
-[Creation date]
-[Expire date]
-[Key length]
-[Accounts]
-[Default]
-[key ID]
-[not set]
-[Default private key ID]
-[Failed to open file]
-[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 that you 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]
-[This is not GnuPG binary!\nIt is recommended that you use GnuPG v1.x.x with this plugin.]
-[Unsupported GnuPG version found, use at you own risk!\nIt is recommended that you use GnuPG v1.x.x with this plugin.]
-["GPG" directory found in Miranda root.\nAssuming it's GPG home directory.\nGPG home directory set.]
-[Info]
-[Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]
-[GPG binary does not exist.\nPlease choose another location]
-[Please choose GPG binary location]
-[Please set keyring's home directory]
-[There is existing key for contact, would you like to replace it with new key?]
-[New public key was received, do you want to import it?]
-[Replace]
-[Accept]
-[Received key from %s]
-[You must set encryption algorithm first]
-[Key length must be of length from 1024 to 4096 bits]
-[Invalid date]
-[Name must contain at least 5 characters]
-[Name cannot contain '(' or ')']
-[Invalid Email]
-[Generating new key, please wait...]
-[Failed to export public key.]
 [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]
@@ -151,18 +111,18 @@
 [Metacontact detected]
 ;file \plugins\New_GPG\src\messages.cpp
 [We received encrypted message from contact with encryption turned off.\nDo you want to turn on encryption for this contact?]
+[Warning]
 [Do you want to try to decrypt encrypted message?]
 [We're trying to encrypt with untrusted key. Do you want to trust this key permanently?]
 [Something is wrong, GPG does not understand us, aborting encryption.]
 ;file \plugins\New_GPG\src\options.cpp
-[Services]
-[Main]
-[GnuPG Variables]
-[Messages]
-[Advanced]
 [Contact]
 [Key ID]
+[Name]
+[Email]
 [Protocol]
+[Default private key ID]
+[not set]
 [This key is not used by any contact. Do you want to remove it from public keyring?]
 [Key info]
 [we have secret key for this public key, do not removing from GPG keyring]
@@ -171,10 +131,15 @@
 [Do you want to remove key from entire metacontact (all subcontacts)?]
 [Export public key]
 [.asc pubkey file]
+[Failed to allocate memory]
+[Error]
+[Failed to lock memory with error %d]
+[Failed write to clipboard with error %d]
 [Failed to open clipboard with error %d]
 [Set log file]
 [LOG files]
 [Choose gpg.exe]
+[This is not GnuPG binary!\nIt is recommended that you use GnuPG v1.x.x with this plugin.]
 [Set home directory]
 [Load Public GPG Key for ]
 [Turn off encryption]
@@ -183,9 +148,45 @@
 [ found in presence.)]
 [This is not public or private key]
 [Key already in secret keyring.]
+[Info]
 [Set file containing GPG public key]
 [GPG public key file]
+[Failed to open file]
 [There is no public or private key.]
+[Services]
+[Main]
+[GnuPG Variables]
+[Messages]
+[Advanced]
+;file \plugins\New_GPG\src\ui.cpp
+[New passwords do not match]
+[Old password does not match, you can continue, but GPG will reject wrong password.\nDo you want to continue?]
+[Creation date]
+[Expire date]
+[Key length]
+[Accounts]
+[Default]
+[key ID]
+[Generating new random key, please wait]
+[GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended that you 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.]
+[Wrong GPG binary location found in system.\nPlease choose another location]
+[Unsupported GnuPG version found, use at you own risk!\nIt is recommended that you use GnuPG v1.x.x with this plugin.]
+["GPG" directory found in Miranda root.\nAssuming it's GPG home directory.\nGPG home directory set.]
+[Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]
+[There is existing key for contact, would you like to replace it with new key?]
+[New public key was received, do you want to import it?]
+[Replace]
+[Accept]
+[Received key from %s]
+[You must set encryption algorithm first]
+[Key length must be of length from 1024 to 4096 bits]
+[Invalid date]
+[Name must contain at least 5 characters]
+[Name cannot contain '(' or ')']
+[Invalid Email]
+[Generating new key, please wait...]
+[Expiration date]
+[Failed to export public key.]
 ;file \plugins\New_GPG\src\utilities.cpp
 [Do you want to toggle encryption for all subcontacts?]
 [Turn off GPG encryption]
@@ -202,5 +203,7 @@
 [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?]
+[GPG binary does not exist.\nPlease choose another location]
+[Please choose GPG binary location]
+[Please set keyring's home directory]
+;file \plugins\New_GPG\src\utilities.h