15 files changed, 40 insertions, 32 deletions
diff --git a/langpacks/french/=CORE=.txt b/langpacks/french/=CORE=.txt
index c707eeee8b..7923fd92b6 100644
--- a/langpacks/french/=CORE=.txt
+++ b/langpacks/french/=CORE=.txt
@@ -1,7 +1,7 @@
 ;============================================================
 ;  File: miranda32/64.exe
 ;  Module: Miranda Core
-;  Version: 0.95.7
+;  Version: 0.95.8
 ;============================================================
 ;file \src\core\stdauth\res\resource.rc
 [Authorization request]
diff --git a/langpacks/french/Plugins/AssocMgr.txt b/langpacks/french/Plugins/AssocMgr.txt
index d2563434c5..2ce1943a39 100644
--- a/langpacks/french/Plugins/AssocMgr.txt
+++ b/langpacks/french/Plugins/AssocMgr.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: AssocMgr.dll
 ;  Plugin: File association manager
-;  Version: 0.1.1.0
+;  Version: 0.2.1.0
 ;  Authors: H. Herkenrath
 ;============================================================
 [Handles file type associations and URLs like aim, gg, mirpu, tlen, wpmsg, xmpp, ymsgr.]
diff --git a/langpacks/french/Plugins/BasicHistory.txt b/langpacks/french/Plugins/BasicHistory.txt
index 69ba660003..7a57a54186 100644
--- a/langpacks/french/Plugins/BasicHistory.txt
+++ b/langpacks/french/Plugins/BasicHistory.txt
@@ -353,7 +353,7 @@ Page de code invalide
 
 [Export and Delete]
 
-[Import and Marge]
+[Import and Merge]
 
 [Minute]
 
diff --git a/langpacks/french/Plugins/ICQ.txt b/langpacks/french/Plugins/ICQ.txt
index 9d13357f12..3a44240457 100644
--- a/langpacks/french/Plugins/ICQ.txt
+++ b/langpacks/french/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: IcqOscarJ protocol
-;  Version: 0.11.3.5
+;  Version: 0.11.3.6
 ;  Authors: Joe Kucera, Bio, Martin Öberg, Richard Hughes, Jon Keating, etc.
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -444,8 +444,6 @@ Mots-clés 4
 Changer Détails ICQ
 [The password does not match the password you originally entered. Check Caps Lock and try again.]
 
-[The ICQ server does not support passwords longer than 8 characters. Please use a shorter password.]
-Le serveur d'ICQ ne supporte pas les mots de passe supérieur à 8 caractères. Utiliser en un plus court.
 ;file \protocols\IcqOscarJ\src\dlgproc.cpp
 [<unremovable once applied>]
 <définitif une fois appliqué>
diff --git a/langpacks/french/Plugins/IRC.txt b/langpacks/french/Plugins/IRC.txt
index b8d1bf225f..ffbbc54344 100644
--- a/langpacks/french/Plugins/IRC.txt
+++ b/langpacks/french/Plugins/IRC.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: IRC.dll
 ;  Plugin: IRC protocol
-;  Version: 0.11.0.3
+;  Version: 0.95.7.1
 ;  Authors: Miranda team
 ;============================================================
 [Internet Relay Chat (IRC) protocol support for Miranda NG.]
diff --git a/langpacks/french/Plugins/SkypeWeb.txt b/langpacks/french/Plugins/SkypeWeb.txt
index 79e9f18447..a31b0b9389 100644
--- a/langpacks/french/Plugins/SkypeWeb.txt
+++ b/langpacks/french/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.2.4
+;  Version: 0.12.2.5
 ;  Authors: Miranda NG Team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/french/Plugins/SmileyAdd.txt b/langpacks/french/Plugins/SmileyAdd.txt
index 187164fd4f..e7a00bdb18 100644
--- a/langpacks/french/Plugins/SmileyAdd.txt
+++ b/langpacks/french/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.2.4.1
+;  Version: 0.2.4.2
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
diff --git a/langpacks/french/Plugins/StartPosition.txt b/langpacks/french/Plugins/StartPosition.txt
index 2d1013985e..bad53445b5 100644
--- a/langpacks/french/Plugins/StartPosition.txt
+++ b/langpacks/french/Plugins/StartPosition.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StartPosition.dll
 ;  Plugin: Start position
-;  Version: 0.2.0.3
+;  Version: 0.3.0.4
 ;  Authors: Felipe Brahm - souFrag
 ;============================================================
 [Plugin supports starting position of Contact List relative to the taskbar and screen side.]
@@ -10,16 +10,16 @@
 ;file \plugins\StartPosition\res\resource.rc
 [Contact List Window Start Position]
 Définir la position de la liste de contact au démarrage
-[Left]
-Gauche
-[Right]
-Droite
 [Pixels from Top]
 Pixels du haut
 [Pixels from Bottom]
 Pixels du bas
 [Pixels from Side]
 Pixels du bord
+[Left]
+Gauche
+[Right]
+Droite
 [Width]
 Largeur
 [Always start...]
@@ -28,7 +28,7 @@ Toujours lancer...
 Minimisé dans le Systray
 [Opened]
 Ouvert
-;file \plugins\StartPosition\src\main.cpp
+;file \plugins\StartPosition\src\startposition.cpp
 [Contact list]
 Liste de contacts
 [Start position]
diff --git a/langpacks/french/Plugins/StatusManager.txt b/langpacks/french/Plugins/StatusManager.txt
index 0a60000afd..971d910c96 100644
--- a/langpacks/french/Plugins/StatusManager.txt
+++ b/langpacks/french/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 0.11.2.1
+;  Version: 0.11.2.3
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
@@ -305,12 +305,12 @@ Fermeture dans %d
 ;file \plugins\StatusManager\src\AdvancedAutoAway\aaa_options.cpp
 [minutes of %s mode]
 minutes en mode %s
+[Auto away]
+Absence automatique
 [Rules]
 
 [Status messages]
 Messages d'état
-[Auto away]
-Absence automatique
 ;file \plugins\StatusManager\src\KeepStatus\keepstatus.cpp
 [%s connected from another location]
 %s est connecté depuis un autre site
@@ -337,12 +337,12 @@ L'état est réglé
 [Giving up]
 Abandon
 ;file \plugins\StatusManager\src\KeepStatus\ks_options.cpp
+[You broke the Internet!]
+
 [Basic]
 Basique
 [Advanced]
 Avancé
-[You broke the Internet!]
-
 [Popups]
 Popups
 ;file \plugins\StatusManager\src\StartupStatus\ss_options.cpp
diff --git a/langpacks/french/Plugins/StopSpam.txt b/langpacks/french/Plugins/StopSpam.txt
index ed6ffba255..23806aec24 100644
--- a/langpacks/french/Plugins/StopSpam.txt
+++ b/langpacks/french/Plugins/StopSpam.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StopSpam.dll
 ;  Plugin: StopSpam+
-;  Version: 0.0.1.4
+;  Version: 0.0.1.5
 ;  Authors: Roman Miklashevsky, A. Petkevich, Kosh&chka, persei
 ;============================================================
 [Anti-spam plugin for Miranda NG.]
@@ -41,6 +41,8 @@ Ajouter le contact
 [Log Spammers to system history]
 
 ;file \plugins\StopSpamPlus\src\events.cpp
+[StopSpam automatic message:\r\n]
+
 [Message sessions]
 Sessions de message
 [General]
@@ -52,13 +54,18 @@ Comptes
 ;file \plugins\StopSpamPlus\src\options.cpp
 [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]
-
 ;file \plugins\StopSpamPlus\src\services.cpp
 [Not In List]
 
 [Complete]
 Terminé
+;file \plugins\StopSpamPlus\src\settings.h
+[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.]
+
 ;file \plugins\StopSpamPlus\src\stdafx.h
 [StopSpam]
 
diff --git a/langpacks/french/Plugins/StopSpamMod.txt b/langpacks/french/Plugins/StopSpamMod.txt
index c08898e178..949a32f08b 100644
--- a/langpacks/french/Plugins/StopSpamMod.txt
+++ b/langpacks/french/Plugins/StopSpamMod.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StopSpamMod.dll
 ;  Plugin: StopSpam mod
-;  Version: 0.0.2.0
+;  Version: 0.0.2.1
 ;  Authors: Roman Miklashevsky, sss, Elzor
 ;============================================================
 [Anti-spam plugin for Miranda NG.]
@@ -80,12 +80,12 @@ Ajouter le contact
 ;file \plugins\StopSpamMod\src\options.cpp
 [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.]
 
 [Info]
diff --git a/langpacks/french/Plugins/TabSRMM.txt b/langpacks/french/Plugins/TabSRMM.txt
index 233a8a27e3..c55930833e 100644
--- a/langpacks/french/Plugins/TabSRMM.txt
+++ b/langpacks/french/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.6
+;  Version: 3.5.0.7
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
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.]