14 files changed, 41 insertions, 45 deletions
diff --git a/langpacks/french/Plugins/AIM.txt b/langpacks/french/Plugins/AIM.txt
index 4dd9f31482..917a413f30 100644
--- a/langpacks/french/Plugins/AIM.txt
+++ b/langpacks/french/Plugins/AIM.txt
@@ -288,8 +288,8 @@ Raccourci du protocole AIM
 ;file \protocols\AimOscar\src\proto.cpp
 [%s server connection]
 %s serveur connexion
-[%s Client-to-client connection]
-
+[%s client-to-client connections]
+%s client-to-client connexions
 ;file \protocols\AimOscar\src\server.cpp
 [[Auto-Response]:]
 {Auto-Response} :
diff --git a/langpacks/french/Plugins/AVS.txt b/langpacks/french/Plugins/AVS.txt
index cfc9ebabad..a6a79ee79e 100644
--- a/langpacks/french/Plugins/AVS.txt
+++ b/langpacks/french/Plugins/AVS.txt
@@ -14,7 +14,7 @@
 Changer d'image par défaut
 [Delete default picture]
 Effacer l'image
-[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatars.]
+[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatar.]
 
 [Try to draw avatar background transparent (for images without transparency)]
 Tenter de rendre l'arrière-plan transparent (pour des images sans transparence)
diff --git a/langpacks/french/Plugins/Clist_modern.txt b/langpacks/french/Plugins/Clist_modern.txt
index 669d6d254c..8bdbc5a9f5 100644
--- a/langpacks/french/Plugins/Clist_modern.txt
+++ b/langpacks/french/Plugins/Clist_modern.txt
@@ -619,14 +619,14 @@ Parti &manger\tCtrl+9
 &Vers le Haut
 [&Down]
 &Vers le Bas
+[Lock frame]
+Cadre vérouillé
 [Show all frames]
 Montrer tous les cadres
 [Show all title bars]
 Montrer toutes les barres de titres
 [Hide all title bars]
 Cacher toutes les barres de titres
-[Lock frame]
-Cadre vérouillé
 ;file \plugins\Clist_modern\src\groupmenu.cpp
 [&Hide/show]
 &Afficher/Cacher
diff --git a/langpacks/french/Plugins/Clist_nicer.txt b/langpacks/french/Plugins/Clist_nicer.txt
index 226f5fe254..d187c231fc 100644
--- a/langpacks/french/Plugins/Clist_nicer.txt
+++ b/langpacks/french/Plugins/Clist_nicer.txt
@@ -18,8 +18,8 @@ Continuer
 Quitter Miranda
 [Although the exception was caught and you may continue working with Miranda, you should restart the program as soon as possible. The exception may have damaged internal data structures and can have a serious impact on stability.]
 L'exception a été capturée et vous pouvez continuer à travailler avec Miranda, cependant vous devez redémarrer le programme dès que possible. L'exception peut avoir endommagé les structures de données internes et peut avoir un impact grave sur la stabilité.
-[About CList nicer]
-À propos de CList nicer
+[About Clist nicer]
+À propos de Clist nicer
 [Clist nicer]
 Clist nicer
 [Copyright © 2004-2010 by the Miranda IM project, 2012-2015 by the Miranda NG project. More detailed copyright information can be found in the included README file.]
@@ -424,8 +424,8 @@ Toujours apparaître déconnecté (contact bloqué)
 Autre
 [Hide this contact from the list]
 Cacher ce contact de la liste
-[To show a previously hidden contact, navigate to Options -> Events -> Ignore, search the contact in the list and tick the checkbox next to its name.]
-Pour afficher un contact bloqué, aller dans Paramètres -> Évènements -> Ignorer et cocher le contact en question.
+[To show a previously hidden contact, navigate to Options -> Contacts -> Ignore, search the contact in the list and tick the checkbox next to its name.]
+Pour afficher un contact bloqué, aller dans Paramètres -> Contacts -> Ignorer et cocher le contact en question.
 [Display options]
 Options d'affichage
 [Show contact with priority]
@@ -693,14 +693,6 @@ Image skinnée
 &Vers le Haut
 [&Down]
 &Vers le Bas
-[Frames]
-Cadres
-[Show all frames]
-Montrer tous les cadres
-[Show all title bars]
-Montrer toutes les barres de titres
-[Hide all title bars]
-Cacher toutes les barres de titres
 [Lock frame]
 Cadre vérouillé
 [Visible]
@@ -711,6 +703,14 @@ Afficher la barre de titre
 Image skinée
 [Floating]
 Flottant
+[Frames]
+Cadres
+[Show all frames]
+Montrer tous les cadres
+[Show all title bars]
+Montrer toutes les barres de titres
+[Hide all title bars]
+Cacher toutes les barres de titres
 ;file \plugins\Clist_nicer\src\cluiopts.cpp
 [Title bar]
 Barre de titre
diff --git a/langpacks/french/Plugins/Contacts.txt b/langpacks/french/Plugins/Contacts.txt
index a09d45e28e..0849df9182 100644
--- a/langpacks/french/Plugins/Contacts.txt
+++ b/langpacks/french/Plugins/Contacts.txt
@@ -53,6 +53,8 @@ Détails du contact
 
 [Contacts]
 Contacts
+[Events]
+Évènements
 [Incoming Contacts]
 Contacts entrants
 [Outgoing Contacts]
diff --git a/langpacks/french/Plugins/Facebook.txt b/langpacks/french/Plugins/Facebook.txt
index ff3bd45104..e4f34d2fc1 100644
--- a/langpacks/french/Plugins/Facebook.txt
+++ b/langpacks/french/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Facebook.dll
 ;  Plugin: Facebook RM
-;  Version: 0.2.11.4
+;  Version: 0.2.11.6
 ;  Authors: Michal Zelinka, Robert Pösel
 ;============================================================
 [Facebook protocol support for Miranda NG.]
@@ -80,7 +80,7 @@ Aperçu
 Poster les statuts de Miranda sur le mur
 [Turn off chat on Facebook when going to offline in Miranda]
 
-[Map unsupported statuses to Invisible (instead of Online)]
+[Map unsupported statuses to Invisible (instead of Away)]
 
 [Allow posting statuses to my pages (may slow down login)]
 
diff --git a/langpacks/french/Plugins/FileAsMessage.txt b/langpacks/french/Plugins/FileAsMessage.txt
index a706025e8b..362e70d083 100644
--- a/langpacks/french/Plugins/FileAsMessage.txt
+++ b/langpacks/french/Plugins/FileAsMessage.txt
@@ -36,7 +36,7 @@ Envoyé
 Reçu
 [Use only alphanumeric encoding on transfer]
 Veuillez utiliser uniquement de l'alphanumérique sur les transferts
-[Extra options: Events > File Transfers, "Receiving files" group]
+[Extra options: Events -> File Transfers, "Receiving files" group]
 
 ;file \plugins\FileAsMessage\src\dialog.cpp
 [File already exists. Overwrite?]
diff --git a/langpacks/french/Plugins/Msg_Export.txt b/langpacks/french/Plugins/Msg_Export.txt
index 8584ddf19c..677997bd73 100644
--- a/langpacks/french/Plugins/Msg_Export.txt
+++ b/langpacks/french/Plugins/Msg_Export.txt
@@ -73,7 +73,7 @@ Remettre le nom de fichier par défaut
 [Copy]
 Copier
 ;file \plugins\Msg_Export\src\FileViewer.cpp
-[Failed to write to the RichEdit the buffer was to small.]
+[Failed to write to the Rich Edit the buffer was to small.]
 
 [Error: Optimal buffer size decreased to a too low size!]
 
@@ -81,9 +81,9 @@ Copier
 
 [Failed to execute external file view]
 
-[Failed to load Rich Edit ( Msftedit.DLL )]
+[Failed to load Rich Edit (Msftedit.dll)]
 
-[Failed to get handle to RichEdit!]
+[Failed to get handle to Rich Edit!]
 
 [Failed to open file\r\n%s\r\n\r\nContact handle is invalid]
 
diff --git a/langpacks/french/Plugins/Popup.txt b/langpacks/french/Plugins/Popup.txt
index 109d12c401..917a7c2d76 100644
--- a/langpacks/french/Plugins/Popup.txt
+++ b/langpacks/french/Plugins/Popup.txt
@@ -8,9 +8,9 @@
 [Provides popup notification services for different plugins.]
 
 ;file \plugins\Popup\res\resource.rc
-[Content && Style]
-Contenu && Style
-[Go to Customize > Fonts && Colors for fonts and colors options]
+[Content and Style]
+Contenu et Style
+[Go to Customize -> Fonts and Colors for fonts and colors options]
 
 [Miscellaneous]
 Divers
@@ -150,7 +150,7 @@ Clic gauche :
 Désactiver si l'état général est :
 [Disable when relevant protocol's status is...]
 Désactiver si l'état du protocole est :
-[Colors can be configured in\r\nCustomize > Fonts and colors]
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
 
 [More...]
 
@@ -315,7 +315,7 @@ Avancé
 
 [Disable Popups]
 
-[Popup Plus]
+[Popup plus]
 
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 
@@ -372,7 +372,7 @@ Angle haut droit
 
 ['Reorder popups' option is currently disabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewXstatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n]
 
-[Popup Plus Warning]
+[Popup plus warning]
 Avertissement de Popup Plus
 ;file \plugins\Popup\src\opt_skins.cpp
 [Failed to register %s class.]
@@ -407,7 +407,7 @@ Rafraîchir
 [Notify]
 
 ;file \plugins\Popup\src\skin.cpp
-[The skin you are trying to load is designed\r\nfor newer version of Popup Plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]
+[The skin you are trying to load is designed\r\nfor newer version of Popup plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]
 
 ;file \plugins\Popup\src\srmm_menu.cpp
 [Auto]
diff --git a/langpacks/french/Plugins/SendSS.txt b/langpacks/french/Plugins/SendSS.txt
index 5215e5fd48..566a571e9e 100644
--- a/langpacks/french/Plugins/SendSS.txt
+++ b/langpacks/french/Plugins/SendSS.txt
@@ -206,7 +206,7 @@ Flèche bas
 
 [Screenshots]
 
-[Image services (AdvaImg) not found.\nSendSS disabled.]
+[Image services (AdvaImg plugin) not found.\nSendSS disabled.]
 
 [Buttons]
 
diff --git a/langpacks/french/Plugins/Tipper.txt b/langpacks/french/Plugins/Tipper.txt
index c162e24fef..b642ed00af 100644
--- a/langpacks/french/Plugins/Tipper.txt
+++ b/langpacks/french/Plugins/Tipper.txt
@@ -5,7 +5,7 @@
 ;  Version: 2.1.0.7
 ;  Authors: Scott Ellis, yaho
 ;============================================================
-[Tool Tip notification windows.]
+[Tooltip notification windows.]
 
 ;file \plugins\TipperYM\res\resource.rc
 [Layout]
diff --git a/langpacks/french/Plugins/TooltipNotify.txt b/langpacks/french/Plugins/TooltipNotify.txt
index ab67dde4e3..1d7e67b4f5 100644
--- a/langpacks/french/Plugins/TooltipNotify.txt
+++ b/langpacks/french/Plugins/TooltipNotify.txt
@@ -73,14 +73,8 @@ Inactif
 
 [Other status]
 
-[Tooltip Notify: Online]
-
-[Tooltip Notify: Offline]
-
-[Tooltip Notify: Other]
-
-[Tooltip Notify: Typing]
-
+[Other]
+Autre
 [Popups]
 Popups
 [** New contacts **]
diff --git a/langpacks/french/Plugins/Tox.txt b/langpacks/french/Plugins/Tox.txt
index f8c3249d04..47a07349d3 100644
--- a/langpacks/french/Plugins/Tox.txt
+++ b/langpacks/french/Plugins/Tox.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Tox.dll
 ;  Plugin: Tox protocol
-;  Version: 0.11.1.16
+;  Version: 0.11.1.18
 ;  Authors: Miranda NG Team
 ;============================================================
 [Tox protocol support for Miranda NG.]
diff --git a/langpacks/french/Plugins/Yahoo.txt b/langpacks/french/Plugins/Yahoo.txt
index e8c1d51186..8692cff179 100644
--- a/langpacks/french/Plugins/Yahoo.txt
+++ b/langpacks/french/Plugins/Yahoo.txt
@@ -167,10 +167,10 @@ Compte
 
 [ID]
 ID
-[Please enter your Yahoo ID in Options/Network/Yahoo]
-Veuillez entrer votre ID Yahoo dans Options/Réseaux/Yahoo
-[Please enter your Yahoo password in Options/Network/Yahoo]
-Veuillez entrer votre passe Yahoo dans Options/Réseaux/Yahoo
+[Please enter your Yahoo ID in Options -> Network -> Yahoo]
+Veuillez entrer votre ID Yahoo dans Options -> Réseaux -> Yahoo
+[Please enter your Yahoo password in Options -> Network -> Yahoo]
+Veuillez entrer votre passe Yahoo dans Options -> Réseaux -> Yahoo
 [Yahoo Login Error]
 Erreur de login Yahoo
 ;file \protocols\Yahoo\src\services.cpp