8 files changed, 56 insertions, 12 deletions
diff --git a/langpacks/french/Untranslated/Dbx_mdbx.txt b/langpacks/french/Untranslated/Dbx_mdbx.txt
index 788e55c9a6..76f93380f9 100644
--- a/langpacks/french/Untranslated/Dbx_mdbx.txt
+++ b/langpacks/french/Untranslated/Dbx_mdbx.txt
@@ -9,7 +9,7 @@
 [Standard]
 [Total]
 [Only critical data are encrypted (passwords, security tokens, etc). All other 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]
+[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 database in case of losing password. Recommended only for paranoid users]
 [Change/remove password]
 [Wrong old password entered!]
 [Password is too short!]
diff --git a/langpacks/french/Untranslated/Dbx_mmap.txt b/langpacks/french/Untranslated/Dbx_mmap.txt
index 1bc16fbe8e..f92b6d8495 100644
--- a/langpacks/french/Untranslated/Dbx_mmap.txt
+++ b/langpacks/french/Untranslated/Dbx_mmap.txt
@@ -8,7 +8,7 @@
 [Standard]
 [Total]
 [Only critical data are encrypted (passwords, security tokens, etc). All other 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]
+[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 database in case of losing password. Recommended only for paranoid users]
 [Miranda has detected corruption in your database. Miranda will now shut down.]
 [This profile is too old to be updated with PluginUpdater, your database must be converted first.\n\nWould you like to read how to fix this?]
 [Obsolete database format]
diff --git a/langpacks/french/Untranslated/MirLua.txt b/langpacks/french/Untranslated/MirLua.txt
index 6bfbb93534..df156d9696 100644
--- a/langpacks/french/Untranslated/MirLua.txt
+++ b/langpacks/french/Untranslated/MirLua.txt
@@ -5,6 +5,7 @@
 [Popup on obsolete methods]
 [Script]
 [Loaded]
+[Compile]
 [Common scripts]
 [C libs folder]
 [Scripts folder]
diff --git a/langpacks/french/Untranslated/ProxySwitch.txt b/langpacks/french/Untranslated/ProxySwitch.txt
new file mode 100644
index 0000000000..bfa5ba3e4a
--- /dev/null
+++ b/langpacks/french/Untranslated/ProxySwitch.txt
@@ -0,0 +1,38 @@
+[Watches IP address changes, displays popups, and adjusts the proxy settings of Miranda, Internet Explorer and Firefox.]
+[Network addresses]
+[Direct connection]
+[Use proxy]
+[Manage Miranda NG proxy]
+[Manage Internet Explorer proxy]
+[Manage Firefox proxy]
+[Reconnect if IP address changes]
+[Display 'Show my IP' in menu]
+[Display 'Proxy && IP' submenu]
+[Hide interfaces]
+[Popup options]
+[Enable popups]
+[Use default popup colors]
+[Show proxy status on change]
+[Restart of Miranda NG is required.]
+[Enter semicolon (;) separated list of IP network addresses in any of the formats below:\n\tip/bits\t(10.0.0.1/24)\t\tip/mask\t(10.0.0.1/255.255.255.0)\n\tip1-2\t(10.0.0.1-50)\t\tip1-ip2\t(10.0.0.1-10.0.2.255)]
+[Any entry in the 'Use proxy' list can be prefixed by an exclamation mark (!) to increase its priority. Entries with wrong syntax will be ignored. The program checks the IP addresses in the following way:]
+[\t1) Use proxy if any interface has prioritized 'Use proxy' address\n\t2) Don't use proxy if any interface has 'Direct connection' address\n\t3) Use proxy if any interface has 'Use proxy' address\n\t4) Do nothing if unknown or any at all addresses found]
+[\nMiranda	]
+[Proxy]
+[Direct]
+[\nExplorer	]
+[\nFirefox	]
+[Cannot retrieve IP or adapter data.]
+[Cannot allocate memory for pAddresses]
+[GetAdaptersAddresses sizing failed]
+[Cannot allocate memory for pAdapterInfo]
+[GetAdaptersInfo sizing failed]
+[Current IP address]
+[Proxy settings && interfaces]
+[Enable &IP change notification]
+[Disable &IP change notification]
+[Show my &IP addresses]
+[Disable proxy]
+[Enable proxy]
+[IP change notification]
+[ProxySwitch]
diff --git a/langpacks/french/Untranslated/Scriver.txt b/langpacks/french/Untranslated/Scriver.txt
index 74a2820beb..9a9f4d824e 100644
--- a/langpacks/french/Untranslated/Scriver.txt
+++ b/langpacks/french/Untranslated/Scriver.txt
@@ -1,4 +1,4 @@
-[Send message on 'Ctrl+Enter']
+[Send message on:]
 [You can use embedded variables here: %name% for contact's name, %status% for its status, %statusmsg% for its status message and %account% for its account's name]
 [Save logs]
 [Trim to]
@@ -95,6 +95,10 @@
 [Info bar background]
 [Info bar status message]
 [Line between messages]
+[Enter]
+[Double 'Enter']
+[Ctrl+Enter]
+[Shift+Enter]
 [Event log]
 [Quote]
 [&Room settings]
diff --git a/langpacks/french/Untranslated/SmileyAdd.txt b/langpacks/french/Untranslated/SmileyAdd.txt
index c5164319dd..668d5965c2 100644
--- a/langpacks/french/Untranslated/SmileyAdd.txt
+++ b/langpacks/french/Untranslated/SmileyAdd.txt
@@ -8,7 +8,6 @@
 [Minimum smiley height]
 [Enable smileys]
 [Don't replace at cursor]
-[Built-in message dialog support]
 [Horizontal sorting]
 [SmileyAdd]
 [Smiley cache]
diff --git a/langpacks/french/Untranslated/StatusManager.txt b/langpacks/french/Untranslated/StatusManager.txt
index 35b1777a54..f0ca1c88ab 100644
--- a/langpacks/french/Untranslated/StatusManager.txt
+++ b/langpacks/french/Untranslated/StatusManager.txt
@@ -17,16 +17,20 @@
 [Continuously check for internet connection]
 [Do so by pinging host]
 [Confirm status]
+[Away mode]
 [when full-screen mode is active]
 [when screen saver engages]
 [when workstation is locked]
+[when terminal session is disconnected]
 [after]
 [minutes of inactivity]
+[After away]
 [minutes of level 1 mode]
 [only set when inactive]
 [Monitor Miranda's activity only]
 [Reset status on return]
 [Confirm resetting status]
+[Enter idle mode]
 [Only set if current status is]
 [Command line]
 [Create shortcut]
@@ -67,7 +71,6 @@
 [Ignore Caps Lock, Num Lock and Scroll Lock keys]
 [Check interval (secs)]
 [Confirm dialog timeout (secs)]
-[This options are ignored because you enabled "Change my status mode to" in the "Idle" options dialog.]
 [Monitor keyboard activity]
 [Monitor mouse activity]
 [Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
@@ -103,12 +106,11 @@
 [TriggerData]
 [Becoming active without status change]
 [Leaving second auto-away status]
+[Rules]
 [Set %s message for %s.]
 [<last>]
 [<current>]
 [<n/a>]
-[Status manager]
-[Rules]
 [%s login error (next retry (%d) in %d s)]
 [%s status error (next retry (%d) in %d s)]
 [Status error (next retry (%d) in %d s)]
@@ -116,6 +118,7 @@
 [%s\t(will be set to %s)\r\n]
 [No internet connection seems available... (next retry (%d) in %d s)]
 [You broke the Internet!]
+[Status manager]
 [size: %d x %d]
 [loc: %d x %d]
 [Pressed toolbar icon]
diff --git a/langpacks/french/Untranslated/TabSRMM.txt b/langpacks/french/Untranslated/TabSRMM.txt
index 8500a6314a..a774fe9612 100644
--- a/langpacks/french/Untranslated/TabSRMM.txt
+++ b/langpacks/french/Untranslated/TabSRMM.txt
@@ -193,11 +193,11 @@
 [Colorize user names in message log]
 [Group chat windows]
 [Group chat log]
-[Chat rooms]
 [Voiced]
 [Incremental search highlight]
 [Fields background]
 [Group chat log background]
+[Chat rooms]
 [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).]
@@ -226,6 +226,9 @@
 [No markers]
 [Show as icons]
 [Show as text symbols]
+[Log formatting]
+[Events and filters]
+[Highlighting]
 [%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]
@@ -350,9 +353,6 @@
 [Close or hide window, depends on the close button setting above]
 [Event notifications]
 [Window layout tweaks]
-[Log formatting]
-[Events and filters]
-[Highlighting]
 [Image tag]
 [Event filter]
 [Nick list]
@@ -410,7 +410,6 @@
 [Display metacontact icons]
 [Error feedback]
 [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) (*)]
 [Show client description in info panel]
 [On tab control]