21 files changed, 52 insertions, 40 deletions
diff --git a/langpacks/french/Untranslated/AvatarHistory.txt b/langpacks/french/Untranslated/AvatarHistory.txt
index 05112e4427..ab828b1354 100644
--- a/langpacks/french/Untranslated/AvatarHistory.txt
+++ b/langpacks/french/Untranslated/AvatarHistory.txt
@@ -1,16 +1,9 @@
 [This plugin keeps backups of all your contacts' avatar changes and/or shows popups.]
-[Avatar List Popup]
 [Delay]
 [Permanent]
 [Track]
-[avatar path is null.]
-[AVH Debug]
-[Removed avatar, no avatar before... skipping]
-[Hashes are the same... skipping]
-[AVH Debug: File copied successfully]
-[Avatar Overlay]
+[Avatar path is null.]
+[Avatar overlay]
 [Do nothing]
 [Close popup]
-[AVH Debug: GetOldStyleAvatarName]
-[Avatar History: Unable to create shortcut]
-[AVH Debug: Shortcut created successfully]
+[Avatar history: Unable to create shortcut]
diff --git a/langpacks/french/Untranslated/Facebook.txt b/langpacks/french/Untranslated/Facebook.txt
index 409d042fb0..89f1cf6edc 100644
--- a/langpacks/french/Untranslated/Facebook.txt
+++ b/langpacks/french/Untranslated/Facebook.txt
@@ -7,7 +7,7 @@
 [Show wall posts (news feed) (WARNING: Causes excessive network traffic!)]
 [News feed types to notify:]
 [Don't show advertising posts]
-[Show friendships changes (when someone remove/approve you)]
+[Show friendships changes (when someone removes/approves you)]
 [Show real-time friends activity (ticker feed)]
 [Show my "On this day" posts at login]
 [Chatroom logging]
@@ -23,13 +23,14 @@
 [Multi user chats]
 [Enable multi user chats support]
 [Do not open chat windows on creation]
+[Automatically join active chats that exist in contact list]
 [History synchronization]
-[Load last messages (24 hours old) on login (EXPERIMENTAL)]
 [Load last messages on opening message window (EXPERIMENTAL)]
 [Number of messages to load:]
 [Facebook Login Approval]
 [Your security settings requires to input a security code to access your account from unknown browsers.\n\nYou can get the code via Facebook application on your phone or click button below to receive it via SMS.]
 [Enter the text you see]
+[Former]
 [Myself]
 [Friend]
 [&Leave chat session]
@@ -39,6 +40,9 @@
 [You entered too many invalid verification codes. Plugin will disconnect.]
 [You entered wrong verification code. Try it again.]
 [Login error: Your account is temporarily locked. You need to confirm this device from web browser.]
+[Check last login]
+[Do you recognize this activity?]
+[Login error: You need to confirm last unknown login or revoke it from web browser.]
 [Login error: Facebook thinks your computer is infected. Solve it by logging in via 'private browsing' mode of your web browser and run their antivirus check.]
 [Login error: Captcha code is required. You need to confirm this device from web browser.]
 [Login error, probably bad login credentials.]
@@ -70,10 +74,15 @@
 [<< Contacts]
 [What's on your mind, %s?]
 [a link]
+[a video]
 [a GIF]
 [User sent %s:]
 [User sent an unsupported attachment. Open your browser to see it.]
 [Contact is back on server-list.]
+[Loading history started.]
+[Loading messages: %d/%d]
+[Loading history completed.]
+[<attachment without text>]
 [On this day]
 [Unable to initialize Netlib for %s.]
 [Video call]
@@ -82,20 +91,21 @@
 [Loading wall posts...]
 [Loading friendship requests...]
 [Loading notifications...]
-[Loading what happened on this day...]
+[Loading memories...]
+[Loading history is already in progress. It can't run for more contacts at once so please wait until it finishes.]
+[This will load all messages from the server. To avoid having duplicate messages in your history, delete existing messages manually before continuing.\nLoading process might take a while, so be patient.\n\nDo you want to continue?]
 [Do you want to cancel your friendship with '%s'?]
 [Client errors]
 [Wall posts]
 [Friendship events]
 [Real-time friends activity]
-["On this day" posts]
+[Memories]
 [Visit notifications]
 [Show 'Share status' window]
 [Notification]
 [Newsfeed event]
 [Friendship event]
 [Ticker event]
-["On this day" event]
 [Message read: %s by %s]
 [Facebook icon]
 [Mind]
@@ -104,11 +114,12 @@
 [Message read]
 [Captcha form icon]
 [Visit conversation]
+[Load history]
 [Cancel friendship request]
 [Request friendship]
 [Approve friendship]
 [Deny friendship request]
 [Check friendship requests]
 [Check newsfeeds]
-[Check "On this day" posts]
+[Check memories]
 [Check notifications]
diff --git a/langpacks/french/Untranslated/FileAsMessage.txt b/langpacks/french/Untranslated/FileAsMessage.txt
index 5f361b80f8..3ee0d72c6a 100644
--- a/langpacks/french/Untranslated/FileAsMessage.txt
+++ b/langpacks/french/Untranslated/FileAsMessage.txt
@@ -1,6 +1,7 @@
 [File transfer by using the messaging services - as plain text.]
 [fileAsMessage]
 [Go to Options -> Events -> File Transfers, "Receiving files" group for extra settings]
+[Receive file]
 [File already exists. Overwrite?]
 [Unknown command for "File As Message" was received]
 [Play]
diff --git a/langpacks/french/Untranslated/GG.txt b/langpacks/french/Untranslated/GG.txt
index 185c8a6fdc..e62a5e3c68 100644
--- a/langpacks/french/Untranslated/GG.txt
+++ b/langpacks/french/Untranslated/GG.txt
@@ -38,8 +38,8 @@
 [Concurrent sessions]
 [&Image]
 [Image files (*.bmp,*.gif,*.jpeg,*.jpg,*.png)]
-[Delete image from the list]
 [Save image to disk]
+[Delete image from the list]
 [Cannot create image cache directory. ERROR: %d: %s\n%s]
 [Cannot save received image to file. ERROR: %d: %s\n%s]
 [Cannot open image file. ERROR: %d: %s\n%s]
diff --git a/langpacks/french/Untranslated/IRC.txt b/langpacks/french/Untranslated/IRC.txt
index 37c46c80a3..ee33310b98 100644
--- a/langpacks/french/Untranslated/IRC.txt
+++ b/langpacks/french/Untranslated/IRC.txt
@@ -7,6 +7,9 @@
 [CTCP ERROR: Malformed CTCP command received from %s!%s@%s. Possible attempt to take control of your IRC client registered]
 [%u second]
 [%u seconds]
+[Admin]
+[Op]
+[Halfop]
 [%ud, %uh, %um, %us]
 [%uh, %um, %us]
 [%um, %us]
diff --git a/langpacks/french/Untranslated/Jabber.txt b/langpacks/french/Untranslated/Jabber.txt
index 5af0c21bc7..33e77713b6 100644
--- a/langpacks/french/Untranslated/Jabber.txt
+++ b/langpacks/french/Untranslated/Jabber.txt
@@ -90,6 +90,7 @@
 [Supports Jingle]
 [Supports Roster Exchange]
 [Supports direct chat invitations (XEP-0249)]
+[Receives information about OMEMO devices]
 [Enter the text you see]
 [Admin]
 [Participant]
@@ -361,6 +362,7 @@
 [Show information about operating system in version replies]
 [Accept only in band incoming filetransfers (don't disclose own IP)]
 [Accept HTTP Authentication requests (XEP-0070)]
+[Use OMEMO encryption for messages if possible (placeholder)]
 [Automatically join bookmarks on login]
 [Hide conference windows at startup]
 [Do not show multiuser chat invitations]
diff --git a/langpacks/french/Untranslated/ListeningTo.txt b/langpacks/french/Untranslated/ListeningTo.txt
index 099e944416..68d377cfc2 100644
--- a/langpacks/french/Untranslated/ListeningTo.txt
+++ b/langpacks/french/Untranslated/ListeningTo.txt
@@ -18,7 +18,6 @@
 [Other Variables:]
 [Listening to (enabled)]
 [Listening to (disabled)]
-[ListeningTo]
 [Listening to music]
 [Listening info as set in the options]
 [Media type: Music, Video, etc.]
@@ -32,6 +31,7 @@
 [Enable/Disable sending Listening To info (to all protocols)]
 [Disable ListeningTo (to all protocols)]
 [Enable ListeningTo (to all protocols)]
+[ListeningTo]
 [<Nothing is playing now>]
 [Miranda ListeningTo receiver]
 [Miranda ListeningTo WMP receiver]
diff --git a/langpacks/french/Untranslated/MRA.txt b/langpacks/french/Untranslated/MRA.txt
index 10bae65fd8..3511688f89 100644
--- a/langpacks/french/Untranslated/MRA.txt
+++ b/langpacks/french/Untranslated/MRA.txt
@@ -58,6 +58,8 @@
 [Avatars' plugin connections]
 [Avatars: server return HTTP code: %lu]
 [Avatars: can't open file %s, error]
+[Owners]
+[Inviter]
 [Chat plugin is required for conferences. Install it before chatting]
 [invite sender]
 [invite new members]
diff --git a/langpacks/french/Untranslated/MSN.txt b/langpacks/french/Untranslated/MSN.txt
index 9684c45847..38108a7b17 100644
--- a/langpacks/french/Untranslated/MSN.txt
+++ b/langpacks/french/Untranslated/MSN.txt
@@ -5,7 +5,6 @@
 [Notify me when a message delivery has failed]
 [Your host (or router):]
 [Contact is on your local list]
-[Hotmail]
 [Enable Contact List notifications]
 [Enable Tray notifications]
 [Ignore new messages not in Inbox folder]
@@ -22,6 +21,7 @@
 [Block Contact]
 [Invite Contact To Chat]
 [Live ID]
+[Admin]
 [Chat #]
 [&Leave chat session]
 [User &history]
diff --git a/langpacks/french/Untranslated/MinecraftDynmap.txt b/langpacks/french/Untranslated/MinecraftDynmap.txt
index a535f79808..7dc9c2d679 100644
--- a/langpacks/french/Untranslated/MinecraftDynmap.txt
+++ b/langpacks/french/Untranslated/MinecraftDynmap.txt
@@ -1,5 +1,6 @@
 [Minecraft Dynmap support for Miranda NG.]
 [Visible name:]
+[Admin]
 [You]
 [Message was not sent. Probably you are sending them too fast or chat is disabled completely.]
 [Set server address to connect.]
diff --git a/langpacks/french/Untranslated/MirandaG15.txt b/langpacks/french/Untranslated/MirandaG15.txt
index 466adb9351..9714954f49 100644
--- a/langpacks/french/Untranslated/MirandaG15.txt
+++ b/langpacks/french/Untranslated/MirandaG15.txt
@@ -11,11 +11,6 @@
 [Use transition effects when changing screens]
 [Credits]
 [About]
-[Mirandag15 + TrillianG15]
-[For updates and news check the thread on http://www.g15forums.com]
-[Or visit http://www.mkleinhans.de]
-[mail@mkleinhans.de]
-[© 2006 by Martin Kleinhans]
 [Device:]
 [If the screensaver is active:]
 [Lock the screen]
@@ -84,6 +79,5 @@
 [Maximized replying]
 [Close chat after]
 [When in background]
-[MirandaG15]
 [Chat sessions]
 [No device attached]
diff --git a/langpacks/french/Untranslated/Omegle.txt b/langpacks/french/Untranslated/Omegle.txt
index 8e8b483db1..b94341137f 100644
--- a/langpacks/french/Untranslated/Omegle.txt
+++ b/langpacks/french/Untranslated/Omegle.txt
@@ -18,6 +18,7 @@
 [Unknown command. Send '/commands' for list.]
 [You aren't connected to any stranger. Send '/help' or '/commands' for help.]
 [You can't send messages in question mode.]
+[Admin]
 [Omegle is a great way of meeting new friends!]
 [You]
 [Connection error.]
diff --git a/langpacks/french/Untranslated/QuickSearch.txt b/langpacks/french/Untranslated/QuickSearch.txt
index 31a9d0be55..9d19777cf5 100644
--- a/langpacks/french/Untranslated/QuickSearch.txt
+++ b/langpacks/french/Untranslated/QuickSearch.txt
@@ -27,7 +27,6 @@
 [Signed]
 [As hex]
 [String]
-[IP]
 [Param]
 [last result]
 [parameter]
diff --git a/langpacks/french/Untranslated/SkypeWeb.txt b/langpacks/french/Untranslated/SkypeWeb.txt
index 4a841bb909..af46e46108 100644
--- a/langpacks/french/Untranslated/SkypeWeb.txt
+++ b/langpacks/french/Untranslated/SkypeWeb.txt
@@ -15,11 +15,11 @@
 [Enter new nickname]
 [This chat is going to be destroyed forever with all its contents. This action cannot be undone. Are you sure?]
 [&Leave chat session]
-[&Change topic]
+[&Change topic...]
 [Kick &user]
 [Set &role]
 [&Admin]
-[Change nick]
+[Change nick...]
 [Enter new chatroom topic]
 [Incoming call]
 [Edited message]
diff --git a/langpacks/french/Untranslated/Steam.txt b/langpacks/french/Untranslated/Steam.txt
index 69a413aeeb..91f727d1c5 100644
--- a/langpacks/french/Untranslated/Steam.txt
+++ b/langpacks/french/Untranslated/Steam.txt
@@ -1,6 +1,5 @@
 [Show chat state events (i.e., user closed chat session)]
 [Captcha]
-[Steam Guard]
 [As an added account security measure, you'll need to grant access by entering the special code we've just sent to your email address.]
 [Go to email domain]
 [Enter the password to continue.]
@@ -22,4 +21,3 @@
 [Protocol icon]
 [Gaming icon]
 [%s connection]
-[SteamID]
diff --git a/langpacks/french/Untranslated/TabSRMM.txt b/langpacks/french/Untranslated/TabSRMM.txt
index 2b675eca15..4f615d81ee 100644
--- a/langpacks/french/Untranslated/TabSRMM.txt
+++ b/langpacks/french/Untranslated/TabSRMM.txt
@@ -206,6 +206,8 @@
 [Toggle send later]
 [Send message]
 [Show message history]
+[Show send menu]
+[Show protocol menu]
 [Show user menu]
 [Show user details]
 [Toggle toolbar]
diff --git a/langpacks/french/Untranslated/Tlen.txt b/langpacks/french/Untranslated/Tlen.txt
index 56eec482f0..0156c7d52a 100644
--- a/langpacks/french/Untranslated/Tlen.txt
+++ b/langpacks/french/Untranslated/Tlen.txt
@@ -7,7 +7,6 @@
 [Login server:]
 [Mail Notification]
 [Delay]
-[&From Popup plugin]
 [P&ermanent]
 [Tlen Password]
 [Public avatar]
diff --git a/langpacks/french/Untranslated/UInfoEx.txt b/langpacks/french/Untranslated/UInfoEx.txt
index e1094ebf1c..d3c609b8c0 100644
--- a/langpacks/french/Untranslated/UInfoEx.txt
+++ b/langpacks/french/Untranslated/UInfoEx.txt
@@ -108,6 +108,8 @@
 [Anniversary later]
 [Warning: No IconPack found in one of the following directories: 'customize\\icons', 'icons' or 'plugins'!]
 [Extended user info]
+[Dialogs]
+[Buttons]
 [Export/import contact]
 [&Export user details]
 [&Import]
diff --git a/langpacks/french/Untranslated/VKontakte.txt b/langpacks/french/Untranslated/VKontakte.txt
index d3c0ff2226..5e30f296e9 100644
--- a/langpacks/french/Untranslated/VKontakte.txt
+++ b/langpacks/french/Untranslated/VKontakte.txt
@@ -17,6 +17,7 @@
 [BBCode support on attachments]
 [Process stickers as smileys]
 [Shorten links for audio attachments]
+[Use non-standard popups for news and event notifications]
 [News and event notifications]
 [WARNING: Causes excessive network traffic!!!]
 [Enable news feeds]
@@ -50,7 +51,8 @@
 [Force invisible status upon user activity]
 [Invisible interval timeout (min):]
 [Use non-standard urlEncode for sent messages (less traffic)]
-[Use non-standard popups for news and event notifications]
+[Send VK-objects links as attachments]
+[and load sent attachments]
 [When I ban user...]
 [Report abuse]
 [Clear server history]
@@ -90,10 +92,12 @@
 [Mark messages as read icon]
 [VKontakte]
 [Access denied! Data will not be sent or received.]
-[You must validate your account before use VK in Miranda NG]
+[You have to validate your account before you can use VK in Miranda NG]
 [Error %d. Data will not be sent or received.]
 [One of the parameters specified was missing or invalid]
 [Access to adding post denied]
+[Enter the missing digits between %s and %s of the phone number linked to your account]
+[Attention!]
 [Enter confirmation code]
 [Enter new nickname]
 [has invited you to a group]
@@ -145,7 +149,7 @@
 [Change nick]
 [&Kick]
 [Enter the text you see]
-[Wall message for]
+[Wall message for %s]
 [New news]
 [New notifications]
 [User was tagged in these photos:]
@@ -176,12 +180,12 @@
 [Invalid filesize]
 [Unknown error occurred]
 [Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]
-[Attention!]
 [Are you sure you want to reload all messages for all contacts from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a very long time and/or corrupt Miranda database.\nWe recommend check your database before reloading messages and after it (Miranda32.exe /svc:dbchecker or Miranda64.exe /svc:dbchecker).\nDo you want to continue?]
-[Error loading message history from server]
-[Loading messages for all contacts is completed]
+[Error loading message history from server.]
+[Loading messages for all contacts is completed.]
 [Loading history]
-[Loading messages for %s is completed]
+[Error loading message history for %s from server.]
+[Loading messages for %s is completed.]
 [News and notifications]
 [View]
 [Account language]
@@ -216,6 +220,7 @@
 [Loading status message from vk.com.\nThis may take some time.]
 [Enter new status message]
 [I\'m back]
+[Service message]
 [Activities]
 [Movies]
 [TV]
diff --git a/langpacks/french/Untranslated/WhenWasIt.txt b/langpacks/french/Untranslated/WhenWasIt.txt
index bc530a1386..1bfa2ab5e5 100644
--- a/langpacks/french/Untranslated/WhenWasIt.txt
+++ b/langpacks/french/Untranslated/WhenWasIt.txt
@@ -63,8 +63,8 @@
 [Exporting birthdays to file: %s]
 [Done exporting birthdays]
 [Could not open file to import birthdays]
+[Could not find UID '%s [%S]' in current database, skipping]
 [Could not open file to export birthdays]
 [Please do not edit this file by hand. Use the export function of WhenWasIt plugin.\n]
 [Warning! Please do not mix Unicode and Ansi exported birthday files. You should use the same version (Ansi/Unicode) of WhenWasIt that was used to export the info.\n]
 [This file was exported with a Unicode version of WhenWasIt. Please only use a Unicode version of the plugin to import the birthdays.\n]
-[Could not find UID '%s [%S]' in current database, skipping]
diff --git a/langpacks/french/Untranslated/YAMN.txt b/langpacks/french/Untranslated/YAMN.txt
index 2c161f0889..bef394637f 100644
--- a/langpacks/french/Untranslated/YAMN.txt
+++ b/langpacks/french/Untranslated/YAMN.txt
@@ -1,6 +1,5 @@
 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]
 [Version:]
-[APOP]
 [Only check when...]
 [New Mail]
 [Sound]