6 files changed, 216 insertions, 168 deletions
diff --git a/langpacks/french/Untranslated/Exchange.txt b/langpacks/french/Untranslated/Exchange.txt
index 7fb7ed0100..25de080a3a 100644
--- a/langpacks/french/Untranslated/Exchange.txt
+++ b/langpacks/french/Untranslated/Exchange.txt
@@ -9,9 +9,15 @@
 [Entry ID]
 [Subject]
 [Sender]
+[Maximum number of retries reached.\nPlugin will stop trying to connect automatically.]
+[Server not available]
+[Server is not configured...]
 [You have %d unread emails...]
 [You have one unread email...]
+[Cannot connect to Exchange server...]
 [Exchange email]
 [Do you want to see the email headers?]
 [Check exchange mailbox]
 [Exchange notify]
+[Forcefully reconnecting to Exchange server ...]
+[Connecting to Exchange ...]
diff --git a/langpacks/french/Untranslated/Facebook.txt b/langpacks/french/Untranslated/Facebook.txt
index 5be7c4c115..943ffae576 100644
--- a/langpacks/french/Untranslated/Facebook.txt
+++ b/langpacks/french/Untranslated/Facebook.txt
@@ -37,6 +37,7 @@
 [Login error, probably bad login credentials.]
 [Could not load communication token. You should report this and wait for plugin update.]
 [Could not load all required data. Plugin may still work correctly, but you should report this and wait for plugin update.]
+[Contact doesn't have required data in database.]
 [Need confirmation for sending messages to other clients.\nOpen Facebook website and try to send message to this contact again!]
 [User cancel captcha challenge.]
 [Timeout when sending message.]
diff --git a/langpacks/french/Untranslated/ICQ.txt b/langpacks/french/Untranslated/ICQ.txt
index 1ca0510edc..e493892fa0 100644
--- a/langpacks/french/Untranslated/ICQ.txt
+++ b/langpacks/french/Untranslated/ICQ.txt
@@ -16,9 +16,37 @@
 [Past]
 [Homepage]
 [Custom Status "%s" Details]
+[Please authorize me to add you to my contact list.]
 [Unable to connect to migrated ICQ communication server]
 [Connection failed.\nThe server is temporarily unavailable (%d).]
 [Connection failed.\nSecure (MD5) login is not supported on this account.]
+[January]
+[February]
+[March]
+[April]
+[May]
+[June]
+[July]
+[August]
+[September]
+[October]
+[November]
+[December]
+[Gender]
+[About]
+[Primary e-mail]
+[Secondary e-mail]
+[Tertiary e-mail]
+[Timezone]
+[Education]
+[Level]
+[Institute]
+[Degree]
+[Graduation Year]
+[Company industry]
+[The password does not match your current password. Check Caps Lock and try again.]
+[The password does not match the password you originally entered. Check Caps Lock and try again.]
+[<empty>]
 [Failed to request offline messages. They may be received next time you log in.]
 [Incoming URL:]
 [Contact "%s" has closed the message window.]
@@ -132,7 +160,6 @@
 [Construction]
 [Consumer Goods]
 [Corporate Services]
-[Education]
 [Finance]
 [High Tech]
 [Legal]
@@ -274,31 +301,4 @@
 [File transfer negotiation failed for unknown reason.]
 [The checksum of file "%s" does not match, the file is probably damaged.]
 [Your file transfer has been aborted (error=%d), because one of the files that you selected to send is no longer readable from the disk. You may have deleted or moved it.]
-[January]
-[February]
-[March]
-[April]
-[May]
-[June]
-[July]
-[August]
-[September]
-[October]
-[November]
-[December]
-[Gender]
-[About]
-[Primary e-mail]
-[Secondary e-mail]
-[Tertiary e-mail]
-[Timezone]
-[Level]
-[Institute]
-[Degree]
-[Graduation Year]
-[Company industry]
-[The password does not match your current password. Check Caps Lock and try again.]
-[The password does not match the password you originally entered. Check Caps Lock and try again.]
-[<empty>]
-[Please authorize me to add you to my contact list.]
 [ (DC Established)]
diff --git a/langpacks/french/Untranslated/Jabber.txt b/langpacks/french/Untranslated/Jabber.txt
index 570d5ac0bf..4177b14f0e 100644
--- a/langpacks/french/Untranslated/Jabber.txt
+++ b/langpacks/french/Untranslated/Jabber.txt
@@ -5,8 +5,6 @@
 [View and modify your server-side contact list.]
 [Upload]
 [Allow file sending through bytestream proxy server:]
-[Invite Users to <room jid>]
-[Group chat invitation to <room jid>]
 [Set as default (Ctrl+Space)]
 [Move rule up (Alt+Up)]
 [Move rule down (Alt+Down)]
@@ -44,8 +42,6 @@
 [Fatal error, image services not found. Jabber Protocol will be disabled.]
 [Jabber Activity]
 [Jabber Mood]
-[I'm happy Miranda NG user. Get it at http://miranda-ng.org/.]
-[/me slaps %s around a bit with a large trout]
 [Jabber Ad-Hoc commands at %s]
 [Sending Ad-Hoc command to %s]
 [Please wait...]
@@ -147,9 +143,8 @@
 [Copy real &JID]
 [Copy in-room JID]
 [Real &JID: %s]
-[Invite Users to %s]
+[Invite Users to\n%s]
 [%s (not on roster)]
-[Member Info: %s]
 [Real JID not available]
 [Reason to kick %s]
 [Reason to ban %s]
@@ -184,137 +179,6 @@
 [Info request error]
 [Items request error]
 [Set filter...]
-[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]
 [Failed to retrieve room list from server.]
 [No rooms available on server.]
 [Room list request timed out.]
@@ -322,7 +186,7 @@
 [Please specify group chat directory first.]
 [Change nickname in <%s>]
 [has set the subject to:]
-[Group chat invitation to %s]
+[Group chat invitation to\n%s]
 [Multi-User Conference]
 [Agents list]
 [Transports]
@@ -511,7 +375,6 @@
 [XML for MS Excel (UTF-8 encoded)]
 [Secure XMPP Network (old style)]
 [LiveJournal Talk]
-[Facebook Chat]
 [Odnoklassniki]
 [Set New Password for %s@%S]
 [Sending request, please wait...]
@@ -657,3 +520,136 @@
 [coding]
 [Moods]
 [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/SkypeWeb.txt b/langpacks/french/Untranslated/SkypeWeb.txt
index eee1f5311a..633d8889f5 100644
--- a/langpacks/french/Untranslated/SkypeWeb.txt
+++ b/langpacks/french/Untranslated/SkypeWeb.txt
@@ -13,20 +13,30 @@
 [Enter the password to continue.]
 [Skype Link Protocol]
 [Admin]
+[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]
 [Kick &user]
 [Set &role]
 [&Admin]
 [&User]
-[This chat is going to be destroyed forever with all its contents. This action cannot be undone. Are you sure?]
 [Edited at]
 [Call started]
 [Call ended]
+[File name]
 [Protocol icon]
 [Create new chat icon]
 [Sync history icon]
+[Block user icon]
+[Unblock user icon]
+[Incoming call icon]
 [Get server history]
+[Block contact]
+[Unblock contact]
 [Create new chat]
+[Incoming call]
 [%s connection]
 [Action]
+[Incoming call sound]
+[Incoming call canceled sound]
+[Incoming call from %s]
diff --git a/langpacks/french/Untranslated/weatherxml.txt b/langpacks/french/Untranslated/weatherxml.txt
index d73b0cc72b..7e72c2a837 100644
--- a/langpacks/french/Untranslated/weatherxml.txt
+++ b/langpacks/french/Untranslated/weatherxml.txt
@@ -153,3 +153,38 @@
 [Snow Early]
 [Light Snow Late]
 [Snow And Sleet]
+[Pm Rain / Wind]
+[Rain / Wind Early]
+[Rain / Freezing Rain / Wind]
+[Snow / Wind Early]
+[Sunny / Wind]
+[Heavy Rain]
+[Rain Late]
+[Light Rain / Wind Early]
+[Heavy Rain / Wind]
+[Cloudy / Windy]
+[Wintry Mix / Wind]
+[Rain Shower]
+[Light Freezing Rain / Windy]
+[Light Freezing Rain / Fog]
+[Snow / Windy]
+[Fog / Windy]
+[Partly Cloudy / Windy]
+[Sunny / Windy]
+[Am Snow]
+[Rain / Snow Late]
+[Am Rain / Snow]
+[Partly Cloudy / Wind]
+[Mostly Sunny / Wind]
+[Isolated T-Storms / Wind]
+[T-Storms Late]
+[Scattered T-Storms / Wind]
+[Snow To Wintry Mix]
+[T-Storms Early]
+[T-Storms Late]
+[Am T-Storms]
+[Fog Late]
+[Partly Cloudy / Wind]
+[Rain / Snow Late]
+[Am Rain / Snow]
+[Rain Early]