langpacks: update

5 files changed, 11 insertions, 27 deletions

diff --git a/langpacks/french/Untranslated/Import.txt b/langpacks/french/Untranslated/Import.txt
index 7679974e37..2e2eb47000 100644
--- a/langpacks/french/Untranslated/Import.txt
+++ b/langpacks/french/Untranslated/Import.txt
@@ -8,6 +8,8 @@
 [Imports contacts only, doesn't import any message history.]

 [Custom schema: you can choose what to import.]

 [Choose appropriate accounts for import]

+[Enter file name for import:]

+[Check duplicates]

 [Old account]

 [Protocol %S is not loaded, skipping account %s creation]

 [Unable to create an account %s of protocol %S]

@@ -44,6 +46,8 @@
 [Skipped %d duplicates and %d filtered events.]

 [Miranda Import]

 [You cannot import your current profile into itself]

+[Import history for]

+[JSON file]

 [Skipping duplicate group %s.]

 [Import...]

 [Finish]

diff --git a/langpacks/french/Untranslated/Msg_Export.txt b/langpacks/french/Untranslated/Msg_Export.txt
index 0d772a60f9..12e123591f 100644
--- a/langpacks/french/Untranslated/Msg_Export.txt
+++ b/langpacks/french/Untranslated/Msg_Export.txt
@@ -1,26 +1,17 @@
 [Exports every message, URL or file you receive to a text file.]

 [Browse]

+[Use JSON format for export]

 [Do nothing]

 [Debug]

-[Failed to write to the Rich Edit the buffer was to small.]

-[Error: Optimal buffer size decreased to a too low size!]

 [Internal error! (lExtraRead >= 0)]

-[Failed to execute external file view]

-[Failed to load Rich Edit (Msftedit.dll)]

-[Failed to get handle to Rich Edit!]

-[Failed to open file\r\n%s\r\n\r\nContact handle is invalid]

-[Failed to open file\r\n%s\r\n\r\nMiranda database contains %d events]

+[Miranda database contains %d events]

 [With scroll to bottom %d\n]

 [Save as RTF]

-[Failed to save file]

 [History was saved successfully in file\r\n]

-[Failed to create history dialog]

 [Reading database information (Phase 1 of 2)]

 [Max line width must be at least %d. Or use 0 for no limit.]

 [Proto]

 [UIN]

-[Failed to get the shells allocator!]

-[Failed to Allocate buffer space]

 [Additional]

 [Miranda NG (Message Export Plugin)]

 [No_Group]

@@ -28,21 +19,10 @@
 [\nMessage has not been saved!\n]

 [Do you wish to save debug information?]

 [All\0*.*\0Text\0*.TXT\0\0]

-[Failed to UTF8 byte order code to file :\n]

-[      History for\r\n]

-[UIN       : %UIN%\r\n]

-[Age       : %Age%\r\n]

-[e-mail    : %e-mail%\r\n]

-[Nick      : %Nick%\r\n]

-[Failed to write user details to file :\n]

-[Failed to write timestamp and username to file :\n]

-[e-mail    :]

-[Failed to write Invalid Database event the file :\n]

+[      History for]

 [UIN       :]

-[Failed to write AUTHREQUEST or ADDED to the file :\n]

 [WebPager from:]

 [No from address]

 [Unknown event type %d, size %d]

-[Failed to write Unknown event to the file :\n]

 [User has been deleted. Do you want to delete the file?]

 [No_Nick]

diff --git a/langpacks/french/Untranslated/Omegle.txt b/langpacks/french/Untranslated/Omegle.txt
index 03252f2b7c..4b933f029f 100644
--- a/langpacks/french/Untranslated/Omegle.txt
+++ b/langpacks/french/Untranslated/Omegle.txt
@@ -10,11 +10,11 @@
 [Load count of users on actual server after connection]

 [Meet strangers with common interests]

 [Your interests (separated by commas):]

+[There are three different modes of chatting:\n1) Standard mode\t - You chat with random stranger privately\n2) Question mode\t - You ask two strangers a question and see how they discuss it (you can't join their conversation, only watch)\n3) Spy mode\t - You and stranger got a question to discuss from third stranger (he can't join your conversation, only watch)\n\nSend '/commands' for available commands.]

+[You can use different commands:\n/help\t - show info about chat modes\n/new\t - start standard mode\n/ask <question> - start question mode with your question\n/ask\t - start question mode with your last asked question\n/spy\t - start spy mode\n/quit\t - disconnect from stranger or stop connecting\n/asl\t - send your predefined ASL message\n\nNote: You can reconnect to different stranger without disconnecting from current one.]

 [Last question is empty.]

 [Your question is too short.]

 [Your '/asl' setting is empty.]

-[There are three different modes of chatting:\n1) Standard mode\t - You chat with random stranger privately\n2) Question mode\t - You ask two strangers a question and see how they discuss it (you can't join their conversation, only watch)\n3) Spy mode\t - You and stranger got a question to discuss from third stranger (he can't join your conversation, only watch)\n\nSend '/commands' for available commands.]

-[You can use different commands:\n/help\t - show info about chat modes\n/new\t - start standard mode\n/ask <question> - start question mode with your question\n/ask\t - start question mode with your last asked question\n/spy\t - start spy mode\n/quit\t - disconnect from stranger or stop connecting\n/asl\t - send your predefined ASL message\n\nNote: You can reconnect to different stranger without disconnecting from current one.]

 [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.]

diff --git a/langpacks/french/Untranslated/PluginUpdater.txt b/langpacks/french/Untranslated/PluginUpdater.txt
index aba03c2793..4f3948beea 100644
--- a/langpacks/french/Untranslated/PluginUpdater.txt
+++ b/langpacks/french/Untranslated/PluginUpdater.txt
@@ -2,8 +2,8 @@
 [Update options]

 [Silent mode]

 [Backup database before update (requires Db_autobackups plugin)]

-[Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.]

 [Change platform to 32-bit]

+[Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.]

 [Restart]

 [Info messages]

 [For "Restart" popup setting is always infinity]

diff --git a/langpacks/french/Untranslated/ProxySwitch.txt b/langpacks/french/Untranslated/ProxySwitch.txt
index 76f3cc9069..32aed9995a 100644
--- a/langpacks/french/Untranslated/ProxySwitch.txt
+++ b/langpacks/french/Untranslated/ProxySwitch.txt
@@ -14,7 +14,7 @@
 [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 plugin 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]
+[\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 no address found]
 [Proxy]
 [Direct]
 [Current IP address]