langpacks: update

3 files changed, 7 insertions, 4 deletions

diff --git a/langpacks/french/Untranslated/BasicHistory.txt b/langpacks/french/Untranslated/BasicHistory.txt
index 8739532348..17a4124a67 100644
--- a/langpacks/french/Untranslated/BasicHistory.txt
+++ b/langpacks/french/Untranslated/BasicHistory.txt
@@ -115,7 +115,7 @@
 [Save WinSCP log file]

 [Browse CSS file]

 [Export and Delete]

-[Import and Marge]

+[Import and Merge]

 [Minute]

 [Hour]

 [At Start]

diff --git a/langpacks/french/Untranslated/StopSpam.txt b/langpacks/french/Untranslated/StopSpam.txt
index ded43e2723..7a2bc6b8b7 100644
--- a/langpacks/french/Untranslated/StopSpam.txt
+++ b/langpacks/french/Untranslated/StopSpam.txt
@@ -13,8 +13,11 @@
 [Answer is not case sensitive]

 [Remove all temporary contacts after restart]

 [Log Spammers to system history]

-[No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you.]

 [StopSpam automatic message:\r\n]

+[No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you.]

 [Not In List]

+[Spammers made me to install small anti-spam system you are now speaking with. Please reply "nospam" without quotes and spaces if you want to contact me.]

+[StopSpam: send a message and reply to an anti-spam bot question.]

+[Congratulations! You just passed human/robot test. Now you can write me a message.]

 [StopSpam]

 [Remove Temporary Contacts]

diff --git a/langpacks/french/Untranslated/StopSpamMod.txt b/langpacks/french/Untranslated/StopSpamMod.txt
index d1af7d193e..32b8511647 100644
--- a/langpacks/french/Untranslated/StopSpamMod.txt
+++ b/langpacks/french/Untranslated/StopSpamMod.txt
@@ -31,7 +31,7 @@
 [StopSpam Logs]

 [Remove Temporary Contacts]

 [No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you.]

-[Spammers made me to install small anti-spam system you are now speaking with.\r\nPlease reply "nospam" without quotes and spaces if you want to contact me.]

-[StopSpam: send a message and reply to an anti-spam bot question.]

+[Spammers made me to install small anti-spam system you are now speaking with. Please reply "nospam" without quotes and spaces if you want to contact me.]

 [Congratulations! You just passed human/robot test. Now you can write me a message.]

+[StopSpam: send a message and reply to an anti-spam bot question.]

 [If math expression is turned on, you can use following expression in message text:\nXX+XX-X/X*X\neach X will be replaced by one random number and answer will be expression result.\nMessage must contain only one expression without spaces.]