6 files changed, 141 insertions, 42 deletions
diff --git a/langpacks/french/Plugins/CmdLine.txt b/langpacks/french/Plugins/CmdLine.txt
index 61a96c9974..10ce62a964 100644
--- a/langpacks/french/Plugins/CmdLine.txt
+++ b/langpacks/french/Plugins/CmdLine.txt
@@ -72,8 +72,6 @@ Erreur
 [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'.]
@@ -100,6 +98,38 @@ Erreur
 
 [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.]
@@ -124,8 +154,34 @@ Erreur
 
 [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]
+Valeur inconnue
 [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.]
@@ -152,6 +208,8 @@ Erreur
 
 [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!]
 
diff --git a/langpacks/french/Plugins/DbEditorPP.txt b/langpacks/french/Plugins/DbEditorPP.txt
index ce8257a47e..94f52c80fa 100644
--- a/langpacks/french/Plugins/DbEditorPP.txt
+++ b/langpacks/french/Plugins/DbEditorPP.txt
@@ -10,6 +10,12 @@
 ;file \plugins\DbEditorPP\res\resource.rc
 [Database Editor++ search and replace]
 Database Editor++ - rechercher et remplacer
+[Search for]
+Recherche de
+[Text:]
+Texte :
+[In:]
+Dans :
 [Case sensitive]
 Respecter casse
 [Module name]
@@ -22,22 +28,16 @@ Réglage
 
 [&Search]
 &Recherche
+[Replace with]
+Remplacer par
+[Entirely]
+Entièrement
 [Found field]
 Champ trouvé
 [&Replace]
 &Remplacer
 [&Cancel]
 &Annuler
-[Search for]
-Recherche de
-[Text:]
-Texte :
-[In:]
-Dans :
-[Replace with]
-Remplacer par
-[Entirely]
-Entièrement
 [Restore last opened position]
 Sauver la position de la fenêtre
 [Automatically expand "Settings" when Database Editor++ starts]
@@ -60,42 +60,42 @@ Ajouter module nommé
 Annuler
 [Edit setting]
 Modifier réglage
-[Byte]
-
-[Word]
-
-[Dword]
-
-[String]
-
-[Hexadecimal]
-
-[Decimal]
-
 [Value name:]
 Nom de valeur :
 [Value data:]
 Données de valeur :
 [Base]
 
+[Hexadecimal]
+
+[Decimal]
+
 [Save value as:]
 Enregistrer valeur sous :
+[Byte]
+
+[Word]
+
+[Dword]
+
+[String]
+
 [Watched database settings]
 Variables de la base surveillées
 [Copy module to contact]
 Copier le module du contact
-[Copy to all contacts (including Settings)]
-
 [Contact to copy module and settings to]
 Contact vers lequel copier module et réglages
+[Copy to all contacts (including Settings)]
+
 [Import module/settings]
 Importer module / réglages
+[Paste the settings to import here.]
+Coller les réglages à importer ici.
 [Import]
 
 [Insert &CR/LF]
 
-[Paste the settings to import here.]
-Coller les réglages à importer ici.
 [Database Editor++]
 
 [&Main]
diff --git a/langpacks/french/Plugins/New_GPG.txt b/langpacks/french/Plugins/New_GPG.txt
index 2ad7902fd8..a87931e307 100644
--- a/langpacks/french/Plugins/New_GPG.txt
+++ b/langpacks/french/Plugins/New_GPG.txt
@@ -206,6 +206,10 @@ Erreur
 
 [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]
@@ -236,7 +240,7 @@ Info
 Remplacer :
 [Accept]
 Accepter
-[Received key from ]
+[Received key from %s]
 
 [You must set encryption algorithm first]
 
@@ -334,6 +338,8 @@ info
 
 [.asc pubkey file]
 
+[Failed to open clipboard with error %d]
+
 [Set log file]
 
 [LOG files]
@@ -375,16 +381,18 @@ info
 
 [encrypting file for transfer]
 
-[we have successfully exported]
+[We have successfully exported %d public keys and all private keys.]
 
-[public keys]
+[We have successfully exported all private keys.]
 
-[and]
-Et
-[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]
diff --git a/langpacks/french/Untranslated/CmdLine.txt b/langpacks/french/Untranslated/CmdLine.txt
index 22b1e253e2..3110e7ead6 100644
--- a/langpacks/french/Untranslated/CmdLine.txt
+++ b/langpacks/french/Untranslated/CmdLine.txt
@@ -28,7 +28,6 @@
 [Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.]
 [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]
-[Command '%s' is not currently supported.]
 [Wrong number of parameters for command '%s'.]
 [Unknown parameter '%s' for command '%s'.]
 [Current global status: %s.%s]
@@ -42,6 +41,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.]
@@ -54,7 +69,19 @@
 [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]
 [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.]
@@ -68,6 +95,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.]
 [Could not create CommandLine listening server!]
 [You can only run one instance of CmdLine plugin.]
 [Notify]
diff --git a/langpacks/french/Untranslated/DbEditorPP.txt b/langpacks/french/Untranslated/DbEditorPP.txt
index cd03d39037..1c5d359ddc 100644
--- a/langpacks/french/Untranslated/DbEditorPP.txt
+++ b/langpacks/french/Untranslated/DbEditorPP.txt
@@ -1,13 +1,13 @@
 [Advanced Database Editor.]
 [Setting value]
 [Add to all contacts (including Settings)]
+[Base]
+[Hexadecimal]
+[Decimal]
 [Byte]
 [Word]
 [Dword]
 [String]
-[Hexadecimal]
-[Decimal]
-[Base]
 [Copy to all contacts (including Settings)]
 [Import]
 [Insert &CR/LF]
diff --git a/langpacks/french/Untranslated/New_GPG.txt b/langpacks/french/Untranslated/New_GPG.txt
index f54d629de6..4b64f2d5fa 100644
--- a/langpacks/french/Untranslated/New_GPG.txt
+++ b/langpacks/french/Untranslated/New_GPG.txt
@@ -84,6 +84,8 @@
 [Failed to open file]
 [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.]
 [Wrong GPG binary location found in system.\nPlease choose another location]
 [This is not GnuPG binary!\nIt is recommended to use GnuPG v1.x.x with this plugin.]
@@ -95,7 +97,7 @@
 [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?]
-[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]
@@ -136,6 +138,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]
@@ -156,10 +159,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]
-[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?]