1 files changed, 60 insertions, 49 deletions
diff --git a/langpacks/french/Plugins/New_GPG.txt b/langpacks/french/Plugins/New_GPG.txt
index 059ce0abb3..ac25cf5cd9 100644
--- a/langpacks/french/Plugins/New_GPG.txt
+++ b/langpacks/french/Plugins/New_GPG.txt
@@ -2,8 +2,8 @@
 ;============================================================
 ;  File: New_GPG.dll
 ;  Plugin: GPG
-;  Version: 0.1.0.1
-;  Authors: sss
+;  Version: 0.2.0.4
+;  Authors: sss, Miranda NG Team
 ;============================================================
 [New GPG encryption support plugin, based on code from old GPG plugin and SecureIM.]
 
@@ -18,11 +18,13 @@
 
 [Import key from keyserver]
 
-[Set own key]
+[Bind own keys to accounts]
+
+[Bind]
 
 [Generate key]
 
-[Select key to use]
+[Select own key to bind to account]
 
 [Key password:]
 
@@ -140,7 +142,7 @@ Passe actuel :
 
 [Copy own key]
 
-[Select own key]
+[Bind keys to accounts]
 
 [Add tags to encoded and decoded messages]
 
@@ -160,6 +162,8 @@ Passe actuel :
 
 [Import keys]
 
+[Send error messages]
+
 ;file \plugins\New_GPG\src\init.cpp
 [GPG Turn off encryption]
 
@@ -176,6 +180,24 @@ Passe actuel :
 [GPG encryption status]
 
 ;file \plugins\New_GPG\src\main.cpp
+[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]
+Avertissement
+[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.]
+
+[Error]
+Erreur
+[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]
+Info
+[Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]
+
 [GPG binary is set and valid (this is good).\n]
 
 [GPG binary unset or invalid (plugin will not work).\n]
@@ -213,25 +235,37 @@ Passe actuel :
 ;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]
-Avertissement
 [Do you want to try to decrypt encrypted message?]
 
+[GPG cannot decrypt incoming message]
+
+[Received unencrypted message:]
+
+[Failed to decrypt GPG encrypted message.\nMessage body for manual decryption:\n]
+
 [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
-[Contact]
-Contact
 [Key ID]
 
+[Email]
+
 [Name]
 Nom
-[Email]
+[Creation date]
+
+[Expiration date]
 
-[Protocol]
-Protocole
+[Key length]
+
+[Failed to export public key.]
+
+[Contact]
+Contact
+[Account]
+Compte
 [Default private key ID]
 
 [not set]
@@ -254,8 +288,6 @@ info
 
 [Failed to allocate memory]
 
-[Error]
-Erreur
 [Failed to lock memory with error %d]
 
 [Failed write to clipboard with error %d]
@@ -268,8 +300,6 @@ Erreur
 
 [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 ]
@@ -286,8 +316,6 @@ Erreur
 
 [Key already in secret keyring.]
 
-[Info]
-Info
 [Set file containing GPG public key]
 
 [GPG public key file]
@@ -311,11 +339,21 @@ Avancé
 
 [Old password does not match, you can continue, but GPG will reject wrong password.\nDo you want to continue?]
 
-[Creation date]
+[You must set encryption algorithm first]
 
-[Expire date]
+[Key length must be of length from 1024 to 4096 bits]
 
-[Key length]
+[Invalid date]
+
+[Name must contain at least 5 characters]
+
+[Name cannot contain '(' or ')']
+
+[Invalid Email]
+
+[Generating new key, please wait...]
+
+[Expire date]
 
 [Accounts]
 Comptes
@@ -325,16 +363,6 @@ Défaut
 
 [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?]
@@ -345,23 +373,7 @@ Remplacer :
 Accepter
 [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.]
+[Please enter password for key with ID: ]
 
 ;file \plugins\New_GPG\src\utilities.cpp
 [Do you want to toggle encryption for all subcontacts?]
@@ -400,4 +412,3 @@ Accepter
 
 [Please set keyring's home directory]
 
-;file \plugins\New_GPG\src\utilities.h