16 files changed, 58 insertions, 164 deletions
diff --git a/langpacks/french/Untranslated/=CORE=.txt b/langpacks/french/Untranslated/=CORE=.txt
index f3c2e6bef7..b23c4e2a45 100644
--- a/langpacks/french/Untranslated/=CORE=.txt
+++ b/langpacks/french/Untranslated/=CORE=.txt
@@ -56,6 +56,15 @@
 [Contact stopped typing]
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 [Host we are connecting to is not the one certificate was issued for]
+[Single]
+[Close relationships]
+[Engaged]
+[Married]
+[Divorced]
+[Separated]
+[Widowed]
+[Actively searching]
+[It\'s complicated]
 [ (set by %s on %s)]
 [%s enables '%s' status for %s]
 [%s disables '%s' status for %s]
diff --git a/langpacks/french/Untranslated/AIM.txt b/langpacks/french/Untranslated/AIM.txt
index a694559db1..acf9f025de 100644
--- a/langpacks/french/Untranslated/AIM.txt
+++ b/langpacks/french/Untranslated/AIM.txt
@@ -7,6 +7,7 @@
 [Connection]
 [Disable SSL]
 [Force Single Client]
+[Use "clientlogin" (recommended)]
 [Create a new AIM account]
 [Users who can contact me:]
 [Allow all users]
diff --git a/langpacks/french/Untranslated/AuthState.txt b/langpacks/french/Untranslated/AuthState.txt
index 9f67913da0..12137da782 100644
--- a/langpacks/french/Untranslated/AuthState.txt
+++ b/langpacks/french/Untranslated/AuthState.txt
@@ -4,9 +4,9 @@
 [Plugin settings]
 [Enable menu item (restart required)]
 [Show icons only for recently added contacts]
-[Disable AuthState icons]
-[Enable AuthState icons]
 [Request]
 [Grant]
 [Request & Grant]
+[Disable AuthState icons]
+[Enable AuthState icons]
 [Auth state]
diff --git a/langpacks/french/Untranslated/Db_autobackups.txt b/langpacks/french/Untranslated/Db_autobackups.txt
index 880141ffea..7b28d02cfb 100644
--- a/langpacks/french/Untranslated/Db_autobackups.txt
+++ b/langpacks/french/Untranslated/Db_autobackups.txt
@@ -6,7 +6,6 @@
 [Disable popups]
 [Use Dropbox]
 [Backup profile folder]
-[Created by:]
 [Uploading to Dropbox failed]
 [Database backed up]
 [Database back up in process...]
@@ -25,3 +24,4 @@
 ["Desktop" folder for currently logged-on Windows user]
 [any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]
 [Variables]
+[Miranda NG [%s] database backup]
diff --git a/langpacks/french/Untranslated/Facebook.txt b/langpacks/french/Untranslated/Facebook.txt
index f97b7b2e92..36149e1446 100644
--- a/langpacks/french/Untranslated/Facebook.txt
+++ b/langpacks/french/Untranslated/Facebook.txt
@@ -34,6 +34,7 @@
 [Login error: Invalid request.]
 [Login error: Some Facebook things are required.]
 [Login error: Your account is temporarily locked. You need to confirm this device 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.]
 [Could not load communication token. You should report this and wait for plugin update.]
diff --git a/langpacks/french/Untranslated/GTalkExt.txt b/langpacks/french/Untranslated/GTalkExt.txt
index 66ed5946e3..5e2f5005ff 100644
--- a/langpacks/french/Untranslated/GTalkExt.txt
+++ b/langpacks/french/Untranslated/GTalkExt.txt
@@ -1,4 +1,5 @@
 [Add message snip to notification]
+[Popup icon]
 [You've received an e-mail\n%s unread threads]
 [Why C sucks]
 [brickstrace@gmail.com [1]]
diff --git a/langpacks/french/Untranslated/Jabber.txt b/langpacks/french/Untranslated/Jabber.txt
index e2f6255a35..5af0c21bc7 100644
--- a/langpacks/french/Untranslated/Jabber.txt
+++ b/langpacks/french/Untranslated/Jabber.txt
@@ -374,6 +374,10 @@
 [XML for MS Excel (UTF-8 encoded)]
 [Secure XMPP Network (old style)]
 [LiveJournal Talk]
+[League Of Legends (EU Nordic)]
+[League Of Legends (EU West)]
+[League Of Legends (Oceania)]
+[League Of Legends (US)]
 [Odnoklassniki]
 [Set New Password for %s@%S]
 [Sending request, please wait...]
@@ -522,134 +526,3 @@
 [Activities]
 [I'm happy Miranda NG user. Get it at http://miranda-ng.org/.]
 [/me slaps %s around a bit with a large trout]
-[One or more addresses for communication related to abusive traffic]
-[One or more addresses for customer feedback]
-[One or more addresses for communication related to sales and marketing]
-[One or more addresses for communication related to security concerns]
-[One or more addresses for customer support]
-[The Jabber ID of a single entity to which an operation applies]
-[The Jabber ID of one or more entities to which an operation applies]
-[The Jabber IDs associated with active sessions]
-[The number of online entities that are active]
-[A list of entities with administrative privileges]
-[The text of an announcement to be sent to active users or all users]
-[A list of entities with whom communication is blocked]
-[The number of seconds to delay before applying a change]
-[The Jabber IDs that have been disabled]
-[The number of disabled entities]
-[The email address for a user]
-[The given (first) name of a user]
-[The number of online entities that are idle]
-[The IP addresses of an account's online sessions]
-[The last login time (per XEP-0082) of a user]
-[The number of logins per minute for an account]
-[The maximum number of items associated with a search or list]
-[The text of a message of the day]
-[The names of an account's online sessions]
-[The Jabber IDs associated with online users]
-[The number of online entities]
-[The password for an account]
-[A list of registered entities]
-[The number of registered entities]
-[Number of roster items for an account]
-[The number of stanzas being sent per second by an account]
-[The family (last) name of a user]
-[A list of entities with whom communication is allowed]
-[Desired Nickname]
-[FAQ Entry]
-[Whether to allow occupants to invite others]
-[Whether to allow occupants to change subject]
-[Whether to enable logging of room conversations]
-[Natural language for room discussions]
-[Maximum number of room occupants]
-[Whether to make room members-only]
-[Whether to make room moderated]
-[Whether a password is required to enter]
-[Whether to make room persistent]
-[Roles for which presence is broadcast]
-[Whether to allow public searching for room]
-[Full list of room admins]
-[Short description of room]
-[Natural-language room name]
-[Full list of room owners]
-[The room password]
-[Affiliations that may discover real JIDs of occupants]
-[Precondition: node configuration with the specified access model]
-[Whether to allow the subscription]
-[The SubID of the subscription]
-[The NodeID of the relevant node]
-[The address (JID) of the subscriber]
-[Whether an entity wants to receive or disable notifications]
-[Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually]
-[The minimum number of milliseconds between sending any two notification digests]
-[The date and time at which a leased subscription will end or has ended]
-[Whether an entity wants to receive an XMPP message body in addition to the payload format]
-[The presence states for which an entity wants to receive notifications]
-[Who may subscribe and retrieve items]
-[The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.]
-[The collection with which a node is affiliated]
-[The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine]
-[Whether to deliver payloads with event notifications]
-[Whether owners or publisher should receive replies to items]
-[Who may associate leaf nodes with a collection]
-[The list of JIDs that may associated leaf nodes with a collection]
-[The child nodes (leaf or collection) associated with a collection]
-[The maximum number of child nodes that can be associated with a collection]
-[The maximum number of items to persist]
-[The maximum payload size in bytes]
-[Whether the node is a leaf (default) or a collection]
-[Whether to notify subscribers when the node configuration changes]
-[Whether to notify subscribers when the node is deleted]
-[Whether to notify subscribers when items are removed from the node]
-[Whether to persist items to storage]
-[Whether to deliver notifications to available users only]
-[The publisher model]
-[The specific multi-user chat rooms to specify for replyroom]
-[The specific JID(s) to specify for replyto]
-[The roster group(s) allowed to subscribe and retrieve items]
-[Whether to send items to new subscribers]
-[Whether to allow subscriptions]
-[A friendly name for the node]
-[The type of node data, usually specified by the namespace of the payload (if any); MAY be list-single rather than text-single]
-[The JIDs of those to contact with questions]
-[The date and time when the node was created]
-[The JID of the node creator]
-[A description of the node]
-[The default language of the node]
-[The number of subscribers to the node]
-[The JIDs of those with an affiliation of owner]
-[The JIDs of those with an affiliation of publisher]
-[The name of the node]
-[Payload type]
-[Whether to automatically authorize subscription requests]
-[Whether to automatically accept file transfers]
-[Whether to automatically open new messages]
-[Whether to automatically go offline when idle]
-[Whether to play sounds]
-[A list of pending file transfers]
-[A list of joined group chat rooms]
-[A presence or availability status]
-[The status message text]
-[The new priority for the client]
-[Account name associated with the user]
-[Familiar name of the user]
-[Password or secret for the user]
-[Full name of the user]
-[First name or given name of the user]
-[Last name, surname, or family name of the user]
-[Street portion of a physical or mailing address]
-[Locality portion of a physical or mailing address]
-[Region portion of a physical or mailing address]
-[Postal code portion of a physical or mailing address]
-[Family Name]
-[Whether to accept the invitation]
-[Another resource with which to continue the session]
-[Disclosure of content, decryption keys or identities]
-[Whether may send Chat State Notifications per XEP-0085]
-[Whether allowed to use XHTML-IM formatting per XEP-0071]
-[Primary written language of the chat (each value appears in order of preference and conforms to RFC 4646 and the IANA registry)]
-[Whether allowed to log messages (i.e., whether Off-The-Record mode is required)]
-[Whether to renegotiate the session]
-[Minimum security level]
-[Whether to terminate the session]
-[Whether to enable Message Receipts per XEP-0184]
diff --git a/langpacks/french/Untranslated/MirLua.txt b/langpacks/french/Untranslated/MirLua.txt
index b8efabdeda..bb00a46e2e 100644
--- a/langpacks/french/Untranslated/MirLua.txt
+++ b/langpacks/french/Untranslated/MirLua.txt
@@ -7,5 +7,4 @@
 [Scripts folder]
 [Script]
 [Loaded]
-[Failed]
 [Common scripts]
diff --git a/langpacks/french/Untranslated/MirOTR.txt b/langpacks/french/Untranslated/MirOTR.txt
index 861835245b..5e47a9eb48 100644
--- a/langpacks/french/Untranslated/MirOTR.txt
+++ b/langpacks/french/Untranslated/MirOTR.txt
@@ -102,5 +102,5 @@
 [We received a malformed data message from '%s']
 [The following message received from '%s' was NOT encrypted:\n\n%s]
 ['%s' has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message.]
-[unknown OTR message received, please report that to Miranda NG]
+[unknown OTR message received, please report that to Miranda NG developers]
 [ has requested an Off-the-Record private conversation. However, you do not have a plugin to support that.\nSee http://wikipedia.org/wiki/Off-the-Record_Messaging for more information.]
diff --git a/langpacks/french/Untranslated/OpenSSL.txt b/langpacks/french/Untranslated/OpenSSL.txt
index 6c2ec12140..69822389db 100644
--- a/langpacks/french/Untranslated/OpenSSL.txt
+++ b/langpacks/french/Untranslated/OpenSSL.txt
@@ -1,3 +1,5 @@
 [Core driver to provide OpenSSL-based SSL services.]
 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
 [Host we are connecting to is not the one certificate was issued for]
+[OpenSSL library loading failed]
+[OpenSSL error]
diff --git a/langpacks/french/Untranslated/SkypeWeb.txt b/langpacks/french/Untranslated/SkypeWeb.txt
index 77bc1d53b5..44ad8afe3c 100644
--- a/langpacks/french/Untranslated/SkypeWeb.txt
+++ b/langpacks/french/Untranslated/SkypeWeb.txt
@@ -19,13 +19,13 @@
 [Set &role]
 [&Admin]
 [Enter new chatroom topic]
+[Incoming call]
 [Edited message]
 [Action]
 [Call information]
 [File transfer information]
 [URI object]
 [Moji]
-[Incoming call]
 [SkypeWeb error: Invalid data!]
 [[b]Original message:[/b]\n%s\n]
 [Original message:\n%s\n]
@@ -61,5 +61,6 @@
 [Calls]
 [Incoming call sound]
 [Incoming call canceled sound]
+[Skypename]
 [Failed to establish a TRouter connection.]
 [Incoming call from %s]
diff --git a/langpacks/french/Untranslated/SmileyAdd.txt b/langpacks/french/Untranslated/SmileyAdd.txt
index 2b08013c08..3ce122f2f9 100644
--- a/langpacks/french/Untranslated/SmileyAdd.txt
+++ b/langpacks/french/Untranslated/SmileyAdd.txt
@@ -9,12 +9,9 @@
 [Enable smileys]
 [Don't replace at cursor]
 [Built-in message dialog support]
-[Disable]
 [Horizontal sorting]
 [SmileyAdd]
 [Smiley cache]
-[Off]
-[On]
 [Smileys]
 [Protocol specific]
 [Smiley pack %s for category "%s" not found.\nSelect correct smiley pack in the Options -> Customize -> Smileys.]
diff --git a/langpacks/french/Untranslated/TabSRMM.txt b/langpacks/french/Untranslated/TabSRMM.txt
index 62dce40d3d..2b675eca15 100644
--- a/langpacks/french/Untranslated/TabSRMM.txt
+++ b/langpacks/french/Untranslated/TabSRMM.txt
@@ -172,7 +172,7 @@
 [Flashing]
 [You can select a private theme (.tabsrmm file) for this container which will then override the default message log theme. You will have to close and re-open all message windows after changing this option.]
 [Transparency]
-[This feature requires Windows 2000 or later and may be unavailable when using a container skin.]
+[This feature may be unavailable when using a container skin.]
 [Contact avatars]
 [Sound notifications]
 [Tabs at the top]
diff --git a/langpacks/french/Untranslated/Twitter.txt b/langpacks/french/Untranslated/Twitter.txt
index 30487d47be..0d528f7c3f 100644
--- a/langpacks/french/Untranslated/Twitter.txt
+++ b/langpacks/french/Untranslated/Twitter.txt
@@ -6,7 +6,6 @@
 [Base URL:]
 [Polling rate:]
 [Once every]
-[Please cycle your connection for these changes to take effect]
 [Treat tweets as messages]
 [Enable popup notifications for tweets]
 [Use Popup colors]
@@ -18,7 +17,7 @@
 [Enter the PIN provided by Twitter to complete your sign in. This is a one time process until you recreate your Miranda Twitter account.]
 [OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorize Miranda to Twitter.com (do the PIN stuff again)]
 [Failed to get Twitter Access Tokens, please go offline and try again. If this keeps happening, check your internet connection.]
-[You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or reset your Twitter account in the Miranda account options]
+[You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or recreate your Miranda Twitter account]
 [Send Tweet...]
 [Unable to initialize Netlib for %s.]
 [%s avatar connection]
diff --git a/langpacks/french/Untranslated/UInfoEx.txt b/langpacks/french/Untranslated/UInfoEx.txt
index ad7ad38298..e1094ebf1c 100644
--- a/langpacks/french/Untranslated/UInfoEx.txt
+++ b/langpacks/french/Untranslated/UInfoEx.txt
@@ -241,6 +241,8 @@
 [Divorced]
 [Separated]
 [Widowed]
+[Actively searching]
+[It\'s complicated]
 [jun.]
 [sen.]
 [E-mail (UInfoEx)]
diff --git a/langpacks/french/Untranslated/VKontakte.txt b/langpacks/french/Untranslated/VKontakte.txt
index 5339965e6f..d6b7aaa47d 100644
--- a/langpacks/french/Untranslated/VKontakte.txt
+++ b/langpacks/french/Untranslated/VKontakte.txt
@@ -1,4 +1,11 @@
-[[img] BBCode support for image]
+[Show in protocol menu ]
+[Create new chat]
+[Status message]
+[Send message to my wall]
+[Load news from VK]
+[Load history for all contacts from VK]
+[Wipe contacts missing in friend list]
+[[img] BBCode support for image]
 [off]
 [for original size images]
 [for preview max 130px*130px]
@@ -56,17 +63,11 @@
 [Login settings]
 [Local settings]
 [Contact list group:]
+[Language for names and titles:]
 [Server-side delivery confirmation]
 [Automatically wipe local contacts missing in your friend list]
-[Mark message as read...]
-[on read]
-[on receive]
-[on reply]
-[on typing]
-[Sync history on protocol online...]
-[automatically]
-[for last 1 day]
-[for last 3 days]
+[Mark message as read:]
+[Sync history on protocol online:]
 [Bots challenge test]
 [Invite user to chat]
 [Choose one of your contacts to be invited:]
@@ -74,7 +75,6 @@
 [Mark users you want to invite to a new chat]
 [New chat's title:]
 [Only for friends]
-[Attention]
 [Captcha form icon]
 [Notification icon]
 [Read message icon]
@@ -120,7 +120,6 @@
 [Unsupported or unknown attachment type: %s]
 [Message from]
 [at]
-[Enter the text you see]
 [Participants]
 [Owners]
 [create chat]
@@ -140,6 +139,8 @@
 [View/change &title]
 [&Destroy room]
 [&Kick]
+[Enter the text you see]
+[Wall message for]
 [New news]
 [New notifications]
 [User was tagged in these photos:]
@@ -176,16 +177,20 @@
 [Loading messages for all contacts is completed]
 [Loading history]
 [Loading messages for %s is completed]
-[I'm back]
 [News and notifications]
 [View]
+[Account language]
+[Spanish]
+[automatically]
+[for last 1 day]
+[for last 3 days]
+[on read]
+[on receive]
+[on reply]
+[on typing]
+[These changes will take effect after Miranda NG restart.\nWould you like to restart it now?]
+[VKontakte protocol]
 [VKontakte newsfeed & notification event]
-[Create new chat]
-[Status message]
-[Send message to my wall]
-[Load news from VK]
-[Load history for all contacts from VK]
-[Wipe contacts missing in friend list]
 [Mark messages as read]
 [Send message to user\'s wall]
 [Add as friend]
@@ -205,6 +210,12 @@
 [Cannot add this user to friends as you put him on blacklist]
 [Loading status message from vk.com.\nThis may take some time.]
 [Enter new status message]
+[I\'m back]
+[Activities]
+[Movies]
+[TV]
+[Books]
+[Quotes]
 [Please authorize me to add you to my friend list.]
 [Are you sure to wipe local contacts missing in your friend list?]
 [Are you sure to delete %s from your friend list?]
@@ -220,5 +231,3 @@
 [Are you sure to ban %s? %s%sContinue?]
 [\nIt will also]
 [Are you sure to report abuse on %s?]
-[Wall message for]
-[Attention! Message body or url should not be empty!]