9 files changed, 174 insertions, 159 deletions
diff --git a/langpacks/french/Untranslated/=CORE=.txt b/langpacks/french/Untranslated/=CORE=.txt
index bc18211b19..8ddffb6b58 100644
--- a/langpacks/french/Untranslated/=CORE=.txt
+++ b/langpacks/french/Untranslated/=CORE=.txt
@@ -50,7 +50,6 @@
 [Default events to show in new chat rooms if the 'event filter' is enabled]
 [Popups to display]
 [Chat]
-[Look up '%s':]
 [Me]
 [&Room settings]
 [&Show/hide nick list]
@@ -76,6 +75,7 @@
 [Chat log symbols (Webdings)]
 [%s enables '%s' status for %s in %s]
 [%s disables '%s' status for %s in %s]
+[Look up '%s':]
 [Connecting (attempt %d)]
 [Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s automatically\nMost likely this is due to insufficient privileges. Please move profile manually.]
 [Miranda was unable to open '%s'\nThere is no suitable database driver installed]
diff --git a/langpacks/french/Untranslated/Discord.txt b/langpacks/french/Untranslated/Discord.txt
index 8b6bb19008..b8afba7ee5 100644
--- a/langpacks/french/Untranslated/Discord.txt
+++ b/langpacks/french/Untranslated/Discord.txt
@@ -1,14 +1,24 @@
 [Discord support for Miranda NG.]
 [edited at]
 [Change &nickname]
+[Channel control]
+[Change &topic]
+[&Rename channel]
+[&Destroy channel]
 [&Invite a user]
+[Do you really want to destroy this channel? This action is non-revertable.]
+[Enter new channel name:]
+[Enter new topic:]
 [Enter your new nick name:]
 [Main icon]
+[Enter channel name]
 [Enter invitation code you received]
 [Do you really want to leave the guild?]
 [Join guild]
 [Leave guild]
+[Create new channel]
 [%s gateway connection]
 [User ID]
 [Protocol is offline or user isn't authorized yet]
 [Attachment]
+[Embed]
diff --git a/langpacks/french/Untranslated/Facebook.txt b/langpacks/french/Untranslated/Facebook.txt
index 0f300f0a9c..ac89c5556d 100644
--- a/langpacks/french/Untranslated/Facebook.txt
+++ b/langpacks/french/Untranslated/Facebook.txt
@@ -37,6 +37,7 @@
 [Friend]
 [&Leave chat session]
 [User &history]
+[%s and more (%d)]
 [Login error: %s]
 [Login error: Invalid request.]
 [You entered too many invalid verification codes. Plugin will disconnect.]
@@ -63,7 +64,6 @@
 [Friends]
 [Friends except acquaintances]
 [Only me]
-[%s and more (%d)]
 [Error occurred when removing contact from server.]
 [Request for friendship was sent.]
 [Error occurred when requesting friendship.]
@@ -85,15 +85,20 @@
 [Loading messages: %d/%d]
 [Loading history completed.]
 [<attachment without text>]
+[Loading memories...]
 [On this day]
+[Found %d memories.]
+[Loading notifications...]
+[Found %d notifications.]
+[Loading friendship requests...]
+[Found %d friendship requests (%d seen).]
+[Found %d friendship requests.]
+[Loading wall posts...]
+[Found %d wall posts.]
 [Unable to initialize Netlib for %s.]
 [Video call]
 [Facebook ID must be numeric value.]
 [Own wall]
-[Loading wall posts...]
-[Loading friendship requests...]
-[Loading notifications...]
-[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'?]
diff --git a/langpacks/french/Untranslated/ICQ.txt b/langpacks/french/Untranslated/ICQ.txt
index 5b8dc1e3a7..986eff7765 100644
--- a/langpacks/french/Untranslated/ICQ.txt
+++ b/langpacks/french/Untranslated/ICQ.txt
@@ -8,7 +8,6 @@
 [Notify me when a message delivery has failed]
 [Enable Custom status support for xtraz]
 [Enable Custom status support for moods]
-[Enable AIM contacts support]
 [Display errors using popups]
 [Back Color]
 [Note]
diff --git a/langpacks/french/Untranslated/QuickReplies.txt b/langpacks/french/Untranslated/QuickReplies.txt
index 52348bc26f..7ca72f7e85 100644
--- a/langpacks/french/Untranslated/QuickReplies.txt
+++ b/langpacks/french/Untranslated/QuickReplies.txt
@@ -6,4 +6,3 @@
 [Hints:]
 [- Add "---" for separator.]
 [- Press [v] button for variable's help.]
-[Quick Replies\r\nLeft button - open menu\r\nRight button - options page]
diff --git a/langpacks/french/Untranslated/Scriver.txt b/langpacks/french/Untranslated/Scriver.txt
index 305ff07eaf..4b9dd64be5 100644
--- a/langpacks/french/Untranslated/Scriver.txt
+++ b/langpacks/french/Untranslated/Scriver.txt
@@ -4,49 +4,6 @@
 [Paste && send]
 [Close other tabs]
 [Close tab]
-[Send message]
-[Typing notification off]
-[Close button]
-[Single Messaging]
-[Navigate: Previous tab]
-[Navigate: Next tab]
-[Navigate: Tab %d]
-[Window: Toggle status bar]
-[Window: Toggle title bar]
-[Window: Toggle toolbar]
-[Window: Toggle info bar]
-[Window: Clear log]
-[Window: Minimize]
-[Window: Close tab]
-[Action: Quote]
-[Action: Send to all]
-[Action: Paste and send]
-[Look up '%s':]
-[Me]
-[O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies]
-[to tiny bits, in Thy mercy]
-[My contact]
-[Lorem ipsum dolor sit amet,]
-[consectetur adipisicing elit]
-[Today]
-[Yesterday]
-[URL sent]
-[URL received]
-[Outgoing background]
-[Incoming background]
-[Input area background]
-[Info bar contact name]
-[Info bar background]
-[Info bar status message]
-[Line between messages]
-[Event log]
-[Group chat log]
-[Quote]
-[&Room settings]
-[&Show/hide nick list]
-[&Filter]
-[Contact started typing]
-[Contact stopped typing]
 [Flash when someone speaks]
 [Flash when a word is highlighted]
 [Show chat nick list]
@@ -102,3 +59,46 @@
 [full weekday name]
 [Variables]
 [Default events to show in new chat rooms if the 'event filter' is enabled]
+[Send message]
+[Typing notification off]
+[Close button]
+[Single Messaging]
+[Navigate: Previous tab]
+[Navigate: Next tab]
+[Navigate: Tab %d]
+[Window: Toggle status bar]
+[Window: Toggle title bar]
+[Window: Toggle toolbar]
+[Window: Toggle info bar]
+[Window: Clear log]
+[Window: Minimize]
+[Window: Close tab]
+[Action: Quote]
+[Action: Send to all]
+[Action: Paste and send]
+[Look up '%s':]
+[Me]
+[O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies]
+[to tiny bits, in Thy mercy]
+[My contact]
+[Lorem ipsum dolor sit amet,]
+[consectetur adipisicing elit]
+[Today]
+[Yesterday]
+[URL sent]
+[URL received]
+[Outgoing background]
+[Incoming background]
+[Input area background]
+[Info bar contact name]
+[Info bar background]
+[Info bar status message]
+[Line between messages]
+[Event log]
+[Group chat log]
+[Quote]
+[&Room settings]
+[&Show/hide nick list]
+[&Filter]
+[Contact started typing]
+[Contact stopped typing]
diff --git a/langpacks/french/Untranslated/TabSRMM.txt b/langpacks/french/Untranslated/TabSRMM.txt
index ebc1c6ab47..c36b19e88f 100644
--- a/langpacks/french/Untranslated/TabSRMM.txt
+++ b/langpacks/french/Untranslated/TabSRMM.txt
@@ -159,6 +159,105 @@
 [Show popups if window is focused]
 [Close session]
 [Edit user notes]
+[ (set by %s on %s)]
+[%s enables '%s' status for %s]
+[%s disables '%s' status for %s]
+[Highlight user...]
+[Input area background]
+[Single Messaging]
+[Outgoing background]
+[Incoming background]
+[Status background]
+[Incoming background(old)]
+[Outgoing background(old)]
+[Horizontal Grid Lines]
+[Info Panel]
+[Panel background low]
+[Panel background high]
+[Common colors]
+[Toolbar background high]
+[Toolbar background low]
+[Window fill color]
+[Text area borders]
+[Aero glow effect]
+[Generic text color (only when fill color is set)]
+[Normal text]
+[Active text]
+[Hovered text]
+[Unread text]
+[Normal background]
+[Active background]
+[Hovered background]
+[Unread background]
+[>> Outgoing messages]
+[<< Incoming messages]
+[>> Outgoing name]
+[>> Outgoing timestamp]
+[<< Incoming name]
+[<< Incoming timestamp]
+[>> Outgoing timestamp (old)]
+[<< Incoming timestamp (old)]
+[UIN]
+[Window caption (skinned mode)]
+[Create tabs or windows for highlight events]
+[Activate chat window on highlight]
+[Colorize nicknames in member list]
+[Show topic as status message on the contact list]
+[Hide or show the window by double click in the contact list]
+[Show contact's status modes if supported by the protocol]
+[Display contact's status icon before user role icon]
+[Use IRC style status indicators in the nick list]
+[Use alternative sorting method in member list]
+[Timestamp only when event time differs]
+[Add a colon (:) to auto-completed user names]
+[Add a comma instead of a colon to auto-completed user names]
+[Enable the 'event filter' for new rooms]
+[Use IRC style status indicators in the log]
+[Allow clickable user names in the message log]
+[Add new line after names]
+[Colorize user names in message log]
+[Group chat windows]
+[Group chat log]
+[Voiced]
+[Incremental search highlight]
+[Fields background]
+[Group chat log background]
+[nick of current contact (if defined)]
+[protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts]
+[user-defined account name of current contact (if defined).]
+[user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc.]
+[path to Miranda root folder]
+[path to folder containing Miranda profiles]
+[name of current Miranda profile (filename, without extension)]
+[will return parsed string %miranda_profilesdir%\\%miranda_profilename%]
+[will return parsed string %miranda_userdata%\\Logs]
+[same as environment variable %APPDATA% for currently logged-on Windows user]
+[username for currently logged-on Windows user]
+["My Documents" folder for currently logged-on Windows user]
+["Desktop" folder for currently logged-on Windows user]
+[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]
+[day of month, 1-31]
+[day of month, 01-31]
+[month number, 1-12]
+[month number, 01-12]
+[abbreviated month name]
+[full month name]
+[year without century, 01-99]
+[year with century, 1901-9999]
+[abbreviated weekday name]
+[full weekday name]
+[Variables]
+[No markers]
+[Show as icons]
+[Show as text symbols]
+[%s%s says:%s %s]
+[Expand or collapse the side bar]
+[The filter cannot be enabled, because there are no event types selected either global or for this chat room]
+[, %d %s, %d %s idle]
+[hour]
+[minute]
+[, %d %s idle]
+[%s on %s%s]
 [Default container]
 [Tabs and switch bar]
 [Choose your options for the tabbed user interface. Not all options can be applied to open windows. You may need to close and re-open them.]
@@ -187,9 +286,6 @@
 [You cannot edit user notes when there are unsent messages]
 [%s has entered text.]
 [Auto scrolling is disabled, %d message(s) queued (press F12 to enable it)]
-[UID: %s (SHIFT click -> copy to clipboard)\nClick for user's details\nRight click for metacontact control\nClick dropdown to add or remove user from your favorites.]
-[No UID]
-[UID: %s (SHIFT click -> copy to clipboard)\nClick for user's details\nClick dropdown to change this contact's favorite status.]
 [Message send error]
 [TabSRMM: typing]
 [&Messaging settings...]
@@ -239,10 +335,12 @@
 [Saved TabSRMM avatars]
 [Group chat logs root]
 [Insert [img] tag / surround selected text with [img][/img]]
-[Expand or collapse the side bar]
 [Contact not on list. You may add it...]
 [Auto scrolling is disabled (press F12 to enable it)]
 [Retry]
+[UID: %s (SHIFT click -> copy to clipboard)\nClick for user's details\nRight click for metacontact control\nClick dropdown to add or remove user from your favorites.]
+[No UID]
+[UID: %s (SHIFT click -> copy to clipboard)\nClick for user's details\nClick dropdown to change this contact's favorite status.]
 [You are editing the user notes. Click the button again or use the hotkey (default: Alt-N) to save the notes and return to normal messaging mode]
 [Image files]
 [Set your avatar...]
@@ -293,6 +391,8 @@
 [Message windows - IM]
 [Message windows - all]
 [Message windows - group chats]
+[Add user to highlight list]
+[Edit user highlight list]
 [A send later job completed successfully.\nThe original message: %s]
 [A send later job failed to complete.\nThe original message: %s]
 [<All contacts>]
@@ -319,7 +419,6 @@
 [%d unread]
 [Chat room %s]
 [%d user(s)]
-[%s on %s%s]
 [Message In]
 [Message Out]
 [Group In (Start)]
@@ -337,7 +436,6 @@
 [Message window tweaks]
 [Display metacontact icons]
 [Error feedback]
-[Show skinnable tooltip in chat (Tipper plugin required)]
 [Enable typing sounds]
 [Automatic keyboard layout: Do not load the system default for new contacts]
 [Enable unattended send (experimental feature, required for multisend and send later) (*)]
@@ -382,104 +480,3 @@
 [Closing Window|You are about to close a window with multiple tabs open.\n\nProceed?]
 [Closing options dialog|To reflect the changes done by importing a theme in the options dialog, the dialog must be closed after loading a theme \\b1 and unsaved changes might be lost\\b0 .\n\nDo you want to continue?]
 [Loading a theme|Loading a color and font theme can overwrite the settings defined by your skin.\n\nDo you want to continue?]
-[ (set by %s on %s)]
-[%s enables '%s' status for %s]
-[%s disables '%s' status for %s]
-[Add user to highlight list]
-[Edit user highlight list]
-[Input area background]
-[Single Messaging]
-[Outgoing background]
-[Incoming background]
-[Status background]
-[Incoming background(old)]
-[Outgoing background(old)]
-[Horizontal Grid Lines]
-[Info Panel]
-[Panel background low]
-[Panel background high]
-[Common colors]
-[Toolbar background high]
-[Toolbar background low]
-[Window fill color]
-[Text area borders]
-[Aero glow effect]
-[Generic text color (only when fill color is set)]
-[Normal text]
-[Active text]
-[Hovered text]
-[Unread text]
-[Normal background]
-[Active background]
-[Hovered background]
-[Unread background]
-[>> Outgoing messages]
-[<< Incoming messages]
-[>> Outgoing name]
-[>> Outgoing timestamp]
-[<< Incoming name]
-[<< Incoming timestamp]
-[>> Outgoing timestamp (old)]
-[<< Incoming timestamp (old)]
-[UIN]
-[Window caption (skinned mode)]
-[Create tabs or windows for highlight events]
-[Activate chat window on highlight]
-[Colorize nicknames in member list]
-[Show topic as status message on the contact list]
-[Hide or show the window by double click in the contact list]
-[Show contact's status modes if supported by the protocol]
-[Display contact's status icon before user role icon]
-[Use IRC style status indicators in the nick list]
-[Use alternative sorting method in member list]
-[Timestamp only when event time differs]
-[Add a colon (:) to auto-completed user names]
-[Add a comma instead of a colon to auto-completed user names]
-[Enable the 'event filter' for new rooms]
-[Use IRC style status indicators in the log]
-[Allow clickable user names in the message log]
-[Add new line after names]
-[Colorize user names in message log]
-[Group chat windows]
-[Group chat log]
-[Voiced]
-[Incremental search highlight]
-[Fields background]
-[Group chat log background]
-[nick of current contact (if defined)]
-[protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts]
-[user-defined account name of current contact (if defined).]
-[user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc.]
-[path to Miranda root folder]
-[path to folder containing Miranda profiles]
-[name of current Miranda profile (filename, without extension)]
-[will return parsed string %miranda_profilesdir%\\%miranda_profilename%]
-[will return parsed string %miranda_userdata%\\Logs]
-[same as environment variable %APPDATA% for currently logged-on Windows user]
-[username for currently logged-on Windows user]
-["My Documents" folder for currently logged-on Windows user]
-["Desktop" folder for currently logged-on Windows user]
-[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]
-[day of month, 1-31]
-[day of month, 01-31]
-[month number, 1-12]
-[month number, 01-12]
-[abbreviated month name]
-[full month name]
-[year without century, 01-99]
-[year with century, 1901-9999]
-[abbreviated weekday name]
-[full weekday name]
-[Variables]
-[No markers]
-[Show as icons]
-[Show as text symbols]
-[%s%s says:%s %s]
-[Look up '%s':]
-[Highlight user...]
-[Edit highlight list...]
-[, %d %s, %d %s idle]
-[hour]
-[minute]
-[, %d %s idle]
-[The filter cannot be enabled, because there are no event types selected either global or for this chat room]
diff --git a/langpacks/french/Untranslated/Tox.txt b/langpacks/french/Untranslated/Tox.txt
index 12c56cd03c..97b01f427b 100644
--- a/langpacks/french/Untranslated/Tox.txt
+++ b/langpacks/french/Untranslated/Tox.txt
@@ -11,6 +11,8 @@
 [Connection settings]
 [Enable UDP (otherwise force Tox to use TCP)]
 [Enable IPv6]
+[Max connect retries:]
+[Max reconnect retries:]
 [If this field contains Tox address (76 hex characters), you will be prompted to add it in your friend list. Otherwise, Miranda will search this query via Tox DNS discovery.]
 [DNS name:]
 [Tox profile is encrypted. Enter the password to continue.]
@@ -28,6 +30,8 @@
 [Answer]
 [Reject]
 [Outgoing call]
+[Current version of plugin is support Tox API version %i.%i.%i which is incompatible with %s]
+[Unable to initialize Tox core]
 [Profiles folder]
 [Tox URI scheme]
 [Action]
@@ -40,7 +44,6 @@
 [Incoming call from %s]
 [Outgoing call to %s]
 [%s connection]
-[Unable to initialize Tox core]
 [Tox profile]
 [Select Tox profile]
 [Save Tox profile]
diff --git a/langpacks/french/Untranslated/VKontakte.txt b/langpacks/french/Untranslated/VKontakte.txt
index a1e9725143..cf838354c1 100644
--- a/langpacks/french/Untranslated/VKontakte.txt
+++ b/langpacks/french/Untranslated/VKontakte.txt
@@ -18,6 +18,7 @@
 [Process stickers as smileys]
 [Shorten links for audio attachments]
 [Use non-standard popups for news and event notifications]
+[Add message link to messages with attachments]
 [News and event notifications]
 [WARNING: Causes excessive network traffic!!!]
 [Enable news feeds]
@@ -134,6 +135,7 @@
 [User was deactivated (banned)]
 [Participants]
 [Owners]
+[Message link]
 [create chat]
 [kick user]
 [left chat]