15 files changed, 75 insertions, 78 deletions
diff --git a/langpacks/french/=CORE=.txt b/langpacks/french/=CORE=.txt
index fafa10738e..667899bbbb 100644
--- a/langpacks/french/=CORE=.txt
+++ b/langpacks/french/=CORE=.txt
@@ -1143,8 +1143,14 @@ Zone de texte de la Fenêtre
 Voir les noms
 [Show timestamp]
 Voir l'horodatage
+[Show seconds]
+Voir les secondes
 [Show dates]
 Voir la date
+[Show formatting]
+Afficher le formatage
+[Load history events]
+Derniers échanges
 [Load unread events only]
 Voir seulement les messages non lus
 [Load number of previous events]
@@ -1153,12 +1159,6 @@ Voir les x derniers évènements
 Voir les évènements ayant moins de
 [minutes old]
 minutes
-[Show seconds]
-Voir les secondes
-[Load history events]
-Derniers échanges
-[Show formatting]
-Afficher le formatage
 [Send typing notifications to the following users when you are typing a message to them:]
 Envoyer des notifications aux usagers suivants quand vous tapez un message qui leur est destiné :
 [Show typing notifications when a user is typing a message]
diff --git a/langpacks/french/Plugins/Dbx_mmap.txt b/langpacks/french/Plugins/Dbx_mmap.txt
index d73ee51225..95220c9909 100644
--- a/langpacks/french/Plugins/Dbx_mmap.txt
+++ b/langpacks/french/Plugins/Dbx_mmap.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Dbx_mmap.dll
 ;  Plugin: Miranda NG mmap database driver
-;  Version: 0.95.0.4
+;  Version: 0.95.1.1
 ;  Authors: Miranda-NG project
 ;============================================================
 [Provides Miranda database support: global settings, contacts, history, settings per contact.]
@@ -49,6 +49,11 @@ Erreur dans la base de donnée
 
 [Database Panic]
 Panique dans la Base de données !
+;file \plugins\Db3x_mmap\src\dbheaders.cpp
+[This profile is too old to be updated with PluginUpdater, your database must be converted first.\n\nPlease press Yes to read further instructions or No to cancel]
+
+[Obsolete database format]
+
 ;file \plugins\Db3x_mmap\src\dbintf.cpp
 [Your database must be converted into the new format. This is potentially dangerous operation, so please make a backup before.\n\nClick Yes to proceed with conversion or No to exit Miranda]
 
diff --git a/langpacks/french/Plugins/HistoryStats.txt b/langpacks/french/Plugins/HistoryStats.txt
index 1e39526c7b..6126c2550e 100644
--- a/langpacks/french/Plugins/HistoryStats.txt
+++ b/langpacks/french/Plugins/HistoryStats.txt
@@ -550,12 +550,8 @@ Effacer la colonne
 
 [...can be output as: ]
 
-[HTML]
-
 [PNG (partial)]
 
-[PNG]
-
 [...will be output as: ]
 
 [Nothing (column will be skipped)]
diff --git a/langpacks/french/Plugins/MirFox.txt b/langpacks/french/Plugins/MirFox.txt
index 2e74e5e2f5..fa1d5ffc77 100644
--- a/langpacks/french/Plugins/MirFox.txt
+++ b/langpacks/french/Plugins/MirFox.txt
@@ -55,8 +55,6 @@ Comptes
 
 [Message sent]
 
-[MirFox]
-
 [Cannot send message to %s (%s) - %S]
 
 [Cannot send message - %S]
diff --git a/langpacks/french/Plugins/PluginUpdater.txt b/langpacks/french/Plugins/PluginUpdater.txt
index 606f9e92e9..43ec8ebe4b 100644
--- a/langpacks/french/Plugins/PluginUpdater.txt
+++ b/langpacks/french/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.1.2.0
+;  Version: 0.1.2.1
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Plugin updater for Miranda NG.]
@@ -150,6 +150,7 @@ Mise à jour accomplie. Appuyer sur Oui pour redémarrer Miranda maintenant.
 Aucune mises à jour trouvée.
 [Update checking already started!]
 Vérification des mises à jour en cours!
+;file \plugins\PluginUpdater\src\Events.cpp
 ;file \plugins\PluginUpdater\src\Options.cpp
 [hours]
 heures
diff --git a/langpacks/french/Plugins/SendSS.txt b/langpacks/french/Plugins/SendSS.txt
index 0fc6a35e21..d198bd1ea2 100644
--- a/langpacks/french/Plugins/SendSS.txt
+++ b/langpacks/french/Plugins/SendSS.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SendSS.dll
 ;  Plugin: Send ScreenShot+
-;  Version: 0.8.5.2
+;  Version: 0.8.7.0
 ;  Authors: Merlin
 ;============================================================
 [Take a screenshot and send it to a contact.]
@@ -34,6 +34,8 @@ Explorer
 Remplir description dans boite texte
 [Delete &after send]
 Supprimer après envoi
+[Open editor before sending]
+
 [Open again]
 Ré-ouvrir
 [&Capture]
@@ -54,6 +56,8 @@ Légende :
 Taille (HxW) :
 [C&lient Area]
 Zone du client
+[indirect capture]
+
 [Target Tool]
 
 [File:]
@@ -90,6 +94,10 @@ Une erreur inconnue s'est produite.
 
 [MAPI error (%i):\n%s.]
 
+[Unknown response from %s (%i)]
+
+[Got no response from %s (%i)]
+
 ;file \plugins\SendScreenshotPlus\src\CSendDropbox.cpp
 [Dropbox transfer]
 
@@ -134,11 +142,11 @@ Transfert de fichiers
 
 [%s (%i):\nCould not add a share to the FTP File plugin.]
 
-;file \plugins\SendScreenshotPlus\src\CSendHost_uploadpie.cpp
+;file \plugins\SendScreenshotPlus\src\CSendHost_ImageShack.cpp
 [Image upload]
 
-[Upload server did not respond timely.]
-
+;file \plugins\SendScreenshotPlus\src\CSendHost_imgur.cpp
+;file \plugins\SendScreenshotPlus\src\CSendHost_uploadpie.cpp
 ;file \plugins\SendScreenshotPlus\src\CSendHTTPServer.cpp
 [HTTPServer transfer]
 
@@ -146,7 +154,6 @@ Transfert de fichiers
 Impossible de lancer le plugin "serveur HTTP".
 [%s (%i):\nCould not add a share to the HTTP Server plugin.]
 
-;file \plugins\SendScreenshotPlus\src\CSendImageShack.cpp
 ;file \plugins\SendScreenshotPlus\src\dlg_msgbox.cpp
 [Retry]
 
@@ -211,6 +218,8 @@ Préc
 Suivant
 [Update]
 Mise à jour
+[Edit on]
+
 [BBC]
 
 [BBC link]
@@ -254,10 +263,6 @@ Transfert de fichiers
 Courriel
 [FTP File]
 
-[Dropbox]
-
-[ImageShack]
-
 [Upload Pie (30m)]
 
 [Upload Pie (1d)]
diff --git a/langpacks/french/Plugins/SimpleStatusMsg.txt b/langpacks/french/Plugins/SimpleStatusMsg.txt
index 80a0a2e7e5..9003af5da0 100644
--- a/langpacks/french/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/french/Plugins/SimpleStatusMsg.txt
@@ -8,15 +8,15 @@
 [Provides a simple way to set status and away messages.]
 
 ;file \plugins\SimpleStatusMsg\res\resource.rc
-[%s Message for %s]
+[%s message for %s]
 Message %s pour %s
 [&Cancel]
 &Annuler
 [Retrieving %s message...]
 Récupération du message %s...
-[Co&py to Clipboard]
+[Co&py to clipboard]
 Co&pier dans le presse-papier
-[%s Message (%s)]
+[%s message (%s)]
 
 [Retrieving status message for %s...]
 Récupération du message d'état de %s...
@@ -90,11 +90,7 @@ Autre
 
 [Remove Carriage Return (CR = '\\r' = #0D) chars from status messages]
 
-[Show 'Copy Away Message' item in contact menu]
-
-[Show 'Go to URL in Away Message' item in contact menu]
-
-[Show 'Status Message...' item in status menu]
+[Show 'Status message...' item in status menu]
 
 [Clear History]
 
@@ -102,7 +98,7 @@ Autre
 
 [* This feature is available only when using StartupStatus plugin.]
 
-[Status on Startup]
+[Status on startup]
 
 [Set status after]
 
@@ -162,33 +158,33 @@ Copier
 Coller
 [Delete]
 Effacer
-[Select All]
+[Select all]
 Tout sélectionner
 ;file \plugins\SimpleStatusMsg\src\awaymsg.cpp
 [Failed to retrieve %s message.]
 
 [&Close]
 &Fermer
-[Re&ad %s Message]
+[Re&ad %s message]
 &Message d'état de "%s"
-[Copy %s Message]
+[Copy %s message]
 Copier le message %s
-[&Go to URL in %s Message]
+[&Go to URL in %s message]
 
-[Re&ad Away Message]
+[Re&ad Away message]
 Lire le message d'&absence
-[Copy Away Message]
+[Copy Away message]
 Copier le message d'état
-[&Go to URL in Away Message]
+[&Go to URL in Away message]
 
 ;file \plugins\SimpleStatusMsg\src\main.cpp
-[Change Status Message]
+[Change status message]
 Changer le message d'état
-[Open Status Message Dialog]
+[Open status message dialog]
 
-[Status Message]
+[Status message]
 
-[Status Message...]
+[Status message...]
 
 [%s (locked)]
 %s (verrouillé)
@@ -205,11 +201,13 @@ Changer le message d'état
 
 [<current>]
 
-[Add to Predefined]
+[Clear history]
+
+[Add to predefined]
 
-[Delete Selected]
+[Delete selected]
 Supprimer la sélection
-[Global]
+[global]
 Général
 [Closing in %d]
 Fermeture dans %d
@@ -220,7 +218,7 @@ Fermeture dans %d
 ;file \plugins\SimpleStatusMsg\src\options.cpp
 [Global status change]
 
-[Open String Formatting Help]
+[Open string formatting help]
 
 [Hide]
 Cacher
@@ -234,7 +232,7 @@ Cacher
 
 [Confirm clearing predefined]
 
-[<Last status>]
+[<last status>]
 <Dernier État>
 [Status]
 État
@@ -243,11 +241,11 @@ Général
 [Advanced]
 Avancé
 ;file \plugins\SimpleStatusMsg\src\utils.cpp
-[Recent Message]
+[Recent message]
 
-[Predefined Message]
+[Predefined message]
 
-[Go to URL in Away Message]
+[Go to URL in Away message]
 
 [Simple Status Message]
 
diff --git a/langpacks/french/Plugins/TabSRMM.txt b/langpacks/french/Plugins/TabSRMM.txt
index beb5fb5eab..04561c4f9f 100644
--- a/langpacks/french/Plugins/TabSRMM.txt
+++ b/langpacks/french/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.3.1.2
+;  Version: 3.3.1.4
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
diff --git a/langpacks/french/Plugins/Tlen.txt b/langpacks/french/Plugins/Tlen.txt
index c80b32e01d..534b31f9d7 100644
--- a/langpacks/french/Plugins/Tlen.txt
+++ b/langpacks/french/Plugins/Tlen.txt
@@ -265,10 +265,6 @@ Ignorer toutes les invitations
 <Dernier message>
 [Forwarding]
 Envoi en cours
-[SOCKS4]
-
-[SOCKS5]
-
 [%S mail]
 
 ;file \protocols\Tlen\src\tlen_picture.cpp
diff --git a/langpacks/french/Untranslated/Dbx_mmap.txt b/langpacks/french/Untranslated/Dbx_mmap.txt
index 3eab109cd9..7ab8a1b379 100644
--- a/langpacks/french/Untranslated/Dbx_mmap.txt
+++ b/langpacks/french/Untranslated/Dbx_mmap.txt
@@ -9,6 +9,8 @@
 [Only critical data are encrypted (passwords, security tokens, etc). All another settings and history remains unencrypted. Fast and effective, suitable for the most cases]
 [All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of losing everything you've stored in a profile in case of losing password. Recommended only for paranoid users]
 [Miranda has detected corruption in your database. This corruption may be fixed by DbChecker plugin. Please download it from http://miranda-ng.org/p/DbChecker/. Miranda will now shut down.]
+[This profile is too old to be updated with PluginUpdater, your database must be converted first.\n\nPlease press Yes to read further instructions or No to cancel]
+[Obsolete database format]
 [Your database must be converted into the new format. This is potentially dangerous operation, so please make a backup before.\n\nClick Yes to proceed with conversion or No to exit Miranda]
 [Database conversion required]
 [Change/remove password]
diff --git a/langpacks/french/Untranslated/HistoryStats.txt b/langpacks/french/Untranslated/HistoryStats.txt
index 1da638c98e..1d78be55c9 100644
--- a/langpacks/french/Untranslated/HistoryStats.txt
+++ b/langpacks/french/Untranslated/HistoryStats.txt
@@ -220,9 +220,7 @@
 [Column specific settings]
 [For this config the selected column...]
 [...can be output as: ]
-[HTML]
 [PNG (partial)]
-[PNG]
 [...will be output as: ]
 [Nothing (column will be skipped)]
 [HTML as fallback]
diff --git a/langpacks/french/Untranslated/MirFox.txt b/langpacks/french/Untranslated/MirFox.txt
index ed27a90eba..bb3ad5b84e 100644
--- a/langpacks/french/Untranslated/MirFox.txt
+++ b/langpacks/french/Untranslated/MirFox.txt
@@ -15,7 +15,6 @@
 [MirFox log]
 [Message sent to %s (%s)]
 [Message sent]
-[MirFox]
 [Cannot send message to %s (%s) - %S]
 [Cannot send message - %S]
 [Cannot send message to %s (%s)]
diff --git a/langpacks/french/Untranslated/SendSS.txt b/langpacks/french/Untranslated/SendSS.txt
index 6337e5f151..64536ecce0 100644
--- a/langpacks/french/Untranslated/SendSS.txt
+++ b/langpacks/french/Untranslated/SendSS.txt
@@ -2,8 +2,10 @@
 [All]
 [Send screenshot to\n<unknown>]
 [&Format:]
+[Open editor before sending]
 [About]
 [%s\nv%s]
+[indirect capture]
 [Target Tool]
 [File:]
 [Description:]
@@ -16,6 +18,8 @@
 [GCHAT error]
 [Unable to initiate %s.]
 [MAPI error (%i):\n%s.]
+[Unknown response from %s (%i)]
+[Got no response from %s (%i)]
 [Dropbox transfer]
 [%s (%i):\nCould not add a share to the Dropbox plugin.]
 [Email transfer]
@@ -35,7 +39,6 @@
 [FTPFile transfer]
 [%s (%i):\nCould not add a share to the FTP File plugin.]
 [Image upload]
-[Upload server did not respond timely.]
 [HTTPServer transfer]
 [%s (%i):\nCould not add a share to the HTTP Server plugin.]
 [Retry]
@@ -56,6 +59,7 @@
 [Description on]
 [Delete off]
 [Delete on]
+[Edit on]
 [BBC]
 [BBC link]
 [Buttons]
@@ -70,8 +74,6 @@
 [File]
 [<Only save>]
 [FTP File]
-[Dropbox]
-[ImageShack]
 [Upload Pie (30m)]
 [Upload Pie (1d)]
 [Upload Pie (1w)]
diff --git a/langpacks/french/Untranslated/SimpleStatusMsg.txt b/langpacks/french/Untranslated/SimpleStatusMsg.txt
index e79cfd824e..ead71ebbef 100644
--- a/langpacks/french/Untranslated/SimpleStatusMsg.txt
+++ b/langpacks/french/Untranslated/SimpleStatusMsg.txt
@@ -1,5 +1,5 @@
 [Provides a simple way to set status and away messages.]
-[%s Message (%s)]
+[%s message (%s)]
 [Behavior on status change]
 [Apply to all]
 [Pop up dialog box]
@@ -26,13 +26,11 @@
 [Automatically close dialog window after]
 [Remember last dialog window position]
 [Remove Carriage Return (CR = '\\r' = #0D) chars from status messages]
-[Show 'Copy Away Message' item in contact menu]
-[Show 'Go to URL in Away Message' item in contact menu]
-[Show 'Status Message...' item in status menu]
+[Show 'Status message...' item in status menu]
 [Clear History]
 [Clear Predefined]
 [* This feature is available only when using StartupStatus plugin.]
-[Status on Startup]
+[Status on startup]
 [Set status after]
 [Independent setting for each protocol]
 [Pop up dialog asking for status message]
@@ -56,18 +54,19 @@
 [?scroll(string,numchars,numchars)]
 [More variables...]
 [Failed to retrieve %s message.]
-[&Go to URL in %s Message]
-[&Go to URL in Away Message]
-[Open Status Message Dialog]
-[Status Message]
-[Status Message...]
+[&Go to URL in %s message]
+[&Go to URL in Away message]
+[Open status message dialog]
+[Status message]
+[Status message...]
 [External Applications]
 [retrieves song name of the song currently playing in Winamp (Simple Status Message compatible)]
 [Miranda Related]
 [get the date (Simple Status Message compatible)]
 [<startup>]
 [<current>]
-[Add to Predefined]
+[Clear history]
+[Add to predefined]
 [Are you sure you want to clear status message history?]
 [Confirm clearing history]
 [Global status change]
@@ -77,7 +76,7 @@
 [Show in message list]
 [Are you sure you want to clear predefined status messages?]
 [Confirm clearing predefined]
-[Recent Message]
-[Predefined Message]
-[Go to URL in Away Message]
+[Recent message]
+[Predefined message]
+[Go to URL in Away message]
 [Simple Status Message]
diff --git a/langpacks/french/Untranslated/Tlen.txt b/langpacks/french/Untranslated/Tlen.txt
index 314edeb95c..56ef8af73b 100644
--- a/langpacks/french/Untranslated/Tlen.txt
+++ b/langpacks/french/Untranslated/Tlen.txt
@@ -30,8 +30,6 @@
 [Accept all images]
 [Ignore images from unauthorized contacts]
 [Ignore all images]
-[SOCKS4]
-[SOCKS5]
 [%S mail]
 [Image sent file://%s]
 [Image received file://%s]