langpacks: update

19 files changed, 45 insertions, 65 deletions

diff --git a/langpacks/french/Untranslated/=CORE=.txt b/langpacks/french/Untranslated/=CORE=.txt
index 5225bcb184..bfe242b1d3 100644
--- a/langpacks/french/Untranslated/=CORE=.txt
+++ b/langpacks/french/Untranslated/=CORE=.txt
@@ -1,8 +1,6 @@
 [Enable docking]

 [Sort file transfers in the reverse order]

 [Maximum number of flashes (0 = indefinite)]

-[Send message on 'Ctrl+Enter']

-[(Setting timeout to 0 means default setting and -1 means indefinite time)]

 [Default timeout]

 [Opacity (%):]

 [Round corners (window)]

@@ -49,16 +47,17 @@
 [Total]

 [Only critical data are encrypted (passwords, security tokens, etc). All other settings and history remains unencrypted.]

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

+[(Setting timeout to 0 means default setting and -1 means indefinite time)]

 [Re&ad status message]

 [Standard crypto provider]

 [This file transfer has been canceled by the other side]

 [Group chat log background]

 [Nick list background (selected)]

+[Send message]

 [Add ':' to auto-completed user names]

 [Enable the 'event filter' for new rooms]

 [Show icon for notices]

 [Group chats log]

-[Chat]

 [Me]

 [&Room settings]

 [&Show/hide nick list]

@@ -98,9 +97,9 @@
 [Actively searching]

 [It's complicated]

 [In a civil union]

-[%s requested authorization\n%u (%s) on %s]

-[%s requested authorization\n%u on %s]

-[%s requested authorization\n%s on %s]

+[ requested authorization\n%u (%s) on %s]

+[ requested authorization\n%u on %s]

+[ requested authorization\n%s on %s]

 [%s added you to the contact list\n%u (%s) on %s]

 [%s added you to the contact list\n%u on %s]

 [%s added you to the contact list\n%s on %s]

@@ -198,8 +197,9 @@
 [<mixed>]

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

-[Core plugin '%s' cannot be loaded or missing. Miranda will exit now]

+[Plugin %S cannot be unloaded because the core plugin is missing]

 [Unable to load plugin in service mode!]

+[Core plugin '%s' cannot be loaded or missing. Miranda will exit now]

 [<core modules>]

 [Loading... %d%%]

 [<In use>]

diff --git a/langpacks/french/Untranslated/ClientChangeNotify.txt b/langpacks/french/Untranslated/ClientChangeNotify.txt
index a61d18b361..0636f9828f 100644
--- a/langpacks/french/Untranslated/ClientChangeNotify.txt
+++ b/langpacks/french/Untranslated/ClientChangeNotify.txt
@@ -14,8 +14,7 @@
 [changed client to %s (was %s)]

 [changed client to %s]

 [%s (was %s)]

-[Disable c&lient change notification]

-[Enable c&lient change notification]

+[Client change notifications]

 [ClientChangeNotify: Client changed]

 [Error #%d]

 [Can't open log file ]

diff --git a/langpacks/french/Untranslated/Contacts.txt b/langpacks/french/Untranslated/Contacts.txt
index 619841b8d3..68e4a31740 100644
--- a/langpacks/french/Untranslated/Contacts.txt
+++ b/langpacks/french/Untranslated/Contacts.txt
@@ -1,7 +1,7 @@
 [Allows you to send and receive contacts.]

 [&Select All]

 [Popup]

-[Send Message]

+[Send message]

 [Contacts received from]

 [Contacts from]

 [Send Contacts to]

diff --git a/langpacks/french/Untranslated/DbChecker.txt b/langpacks/french/Untranslated/DbChecker.txt
index 4eb1833f57..00a3c18601 100644
--- a/langpacks/french/Untranslated/DbChecker.txt
+++ b/langpacks/french/Untranslated/DbChecker.txt
@@ -5,6 +5,7 @@
 [Customize settings and proceed to the checking.]
 [Mark all events as read]
 [Fix UTF-8 encoding in old events]
+[Remove duplicate events]
 [Error Opening Database]
 [There was an error opening the profile database given.]
 [Click Next to try opening the file again, or click Back to select a new profile database to manipulate.]
@@ -19,6 +20,7 @@
 [Processing has not yet completed, if you cancel now then the changes that have currently been made will be rolled back and the original database will be restored. Do you still want to cancel?]
 [Database worker thread activated]
 [%d events marked as read]
+[%d duplicate events removed]
 [Processing aborted by user]
 [Elapsed time: %d sec]
 [All tasks completed but with errors (%d)]
diff --git a/langpacks/french/Untranslated/Db_autobackups.txt b/langpacks/french/Untranslated/Db_autobackups.txt
index 7ed445000b..071dbbabae 100644
--- a/langpacks/french/Untranslated/Db_autobackups.txt
+++ b/langpacks/french/Untranslated/Db_autobackups.txt
@@ -10,12 +10,11 @@
 [Database backed up]

 [Database back up in process...]

 [Save profile as...]

-[Enable &AutoBackups notification]

-[Disable &AutoBackups notification]

 [Miranda NG databases]

 [Compressed Miranda NG databases]

 [Database]

 [Backup folder]

+[AutoBackups notifications]

 [path to Miranda root folder]

 [path to folder containing Miranda profiles]

 [name of current Miranda profile (filename, without extension)]

diff --git a/langpacks/french/Untranslated/GmailNotifier.txt b/langpacks/french/Untranslated/GmailNotifier.txt
index 5eab6729c1..7942d44d3e 100644
--- a/langpacks/french/Untranslated/GmailNotifier.txt
+++ b/langpacks/french/Untranslated/GmailNotifier.txt
@@ -19,7 +19,6 @@
 [Wrong name or password!]

 [Can't get RSS feed!]

 [Gmail: New thread(s)]

-[Gmail Notifier]

+[GmailNotifier]

 [&Check all Gmail inboxes]

 [&Check Gmail inbox]

-[GmailNotifier]

diff --git a/langpacks/french/Untranslated/Jabber.txt b/langpacks/french/Untranslated/Jabber.txt
index 9dad99f3ad..03f3b5ef70 100644
--- a/langpacks/french/Untranslated/Jabber.txt
+++ b/langpacks/french/Untranslated/Jabber.txt
@@ -5,6 +5,7 @@
 [View and modify your server-side contact list.]

 [Upload]

 [History recording mode]

+[(*) marks the current session]

 [Set as default (Ctrl+Space)]

 [Move rule up (Alt+Up)]

 [Move rule down (Alt+Down)]

@@ -365,10 +366,10 @@
 [Automatically accept authorization requests]

 [Fix incorrect timestamps in incoming messages]

 [Disable frame]

-[Display popups with errors]

 [Enable XMPP link processing (requires AssocMgr)]

 [Embrace picture URLs with [img]]

 [Ignore server roster (groups and nick names)]

+[Allow local time & timezone requests (XEP-0202)]

 [Allow servers to request version (XEP-0092)]

 [Show information about operating system in version replies]

 [Accept only in band incoming filetransfers (don't disclose own IP)]

@@ -430,6 +431,7 @@
 [Can't remove active or default list]

 [Unable to save list because you are currently offline.]

 [List Editor...]

+[%s error notifications]

 [Protocol is offline or no JID]

 [No valid OMEMO session exists]

 [Command completed successfully]

@@ -469,6 +471,7 @@
 [Authentication failed for %s@%s.]

 [Message redirected from: %s\r\n]

 [Unable to decrypt a carbon copy of the encrypted outgoing message]

+[Description]

 [Registration canceled]

 [Resource]

 [<currently online>]

@@ -484,10 +487,16 @@
 [Last active resource]

 [Please switch online to see more details.]

 [Copy only this value]

+[Device ID]

+[Fingerprint]

+[Own device]

+[Trusted]

+[UNTRUSTED]

 [Advanced Status]

 [Set mood...]

 [Set activity...]

 [Note]

+[OMEMO]

 [<advanced status slot>]

 [Set Mood]

 [Mood: %s]

diff --git a/langpacks/french/Untranslated/NewEventNotify.txt b/langpacks/french/Untranslated/NewEventNotify.txt
index 8fd25c3e0e..7170421f21 100644
--- a/langpacks/french/Untranslated/NewEventNotify.txt
+++ b/langpacks/french/Untranslated/NewEventNotify.txt
@@ -1,8 +1,15 @@
 [Notifies you when you receive a message, URL, file or any other event by displaying a popup.]

-[Show entry in the Popups menu]

 [Popup options]

+[Timeout, secs]

+[(timeout -1 means forever, 0 - default)]

+[New event notifications]

+[Enable event notifications for instant messages]

+[Enable event notifications for group chats]

 [Dismiss popup]

-[Message event only]

+[Misc options]

 [No popups for read messages]

+[Main options]

+[Message events]

 [Received %d contacts.]

+[This is a sample error event :-D]

 [Plugin Test]

diff --git a/langpacks/french/Untranslated/NewXstatusNotify.txt b/langpacks/french/Untranslated/NewXstatusNotify.txt
index df4b216225..080f1f735e 100644
--- a/langpacks/french/Untranslated/NewXstatusNotify.txt
+++ b/langpacks/french/Untranslated/NewXstatusNotify.txt
@@ -61,8 +61,6 @@
 [Log status message when opening message window]

 [Wave files]

 [Sound file]

-[Notification enabled]

-[Notification disabled]

 [%s is now %s]

 [aborting]

 [%s changed status message to %s]

@@ -76,9 +74,7 @@
 [Extra status message changed]

 [Extra status changed]

 [Extra status message removed]

-[Enable status notification]

-[Disable status notification]

-[Toggle status notification]

+[Status notifications]

 [New Status Notify]

 [This is status message]

 [This is extra status]

diff --git a/langpacks/french/Untranslated/PluginUpdater.txt b/langpacks/french/Untranslated/PluginUpdater.txt
index 6b538a4684..1f73c1204b 100644
--- a/langpacks/french/Untranslated/PluginUpdater.txt
+++ b/langpacks/french/Untranslated/PluginUpdater.txt
@@ -4,7 +4,6 @@
 [Restart Miranda automatically]

 [Backup database before update (requires Db_autobackups plugin)]

 [Change platform to 32-bit]

-[Use HTTPS]

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

 [Restart]

 [Info messages]

diff --git a/langpacks/french/Untranslated/ProxySwitch.txt b/langpacks/french/Untranslated/ProxySwitch.txt
index 3f11a8adb1..28e7e0eb0f 100644
--- a/langpacks/french/Untranslated/ProxySwitch.txt
+++ b/langpacks/french/Untranslated/ProxySwitch.txt
@@ -17,11 +17,9 @@
 [Proxy]

 [Direct]

 [Current IP address]

-[Enable &IP change notification]

-[Disable &IP change notification]

+[IP change notification]

 [Show my &IP addresses]

 [Proxy settings && interfaces]

 [Disable proxy]

 [Enable proxy]

-[IP change notification]

 [ProxySwitch]

diff --git a/langpacks/french/Untranslated/Scriver.txt b/langpacks/french/Untranslated/Scriver.txt
index 2655c69267..651a568532 100644
--- a/langpacks/french/Untranslated/Scriver.txt
+++ b/langpacks/french/Untranslated/Scriver.txt
@@ -1,11 +1,10 @@
-[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]

-[(0 means default setting, -1 means indefinite time)]

 [Paste && send]

 [Close other tabs]

 [Close tab]

+[Action: Send message]

 [Flash when someone speaks]

 [Flash when a word is highlighted]

 [Show chat nick list]

@@ -78,10 +77,6 @@
 [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/TabSRMM.txt b/langpacks/french/Untranslated/TabSRMM.txt
index 3d93d34b12..0d51f993aa 100644
--- a/langpacks/french/Untranslated/TabSRMM.txt
+++ b/langpacks/french/Untranslated/TabSRMM.txt
@@ -25,9 +25,6 @@
 [Note: All settings are applied immediately]

 [The container is using private settings. The panel height will not be shared with other containers.]

 [Show picture for this contact]

-[Only show event notifications when my status is...]

-[Popup options]

-[Use the message log color theme for group chat popups]

 [Choose modes]

 [Show avatar in message window]

 [Close or hide inactive container after]

@@ -124,6 +121,7 @@
 [Show popups if window is focused]

 [Close session]

 [Edit user notes]

+[Send message]

 [Input area background]

 [Single Messaging]

 [Outgoing background]

@@ -231,21 +229,6 @@
 [On, if present, always in bottom display]

 [enabled]

 [There are %d pending send jobs. Message length: %d bytes, message length limit: %d bytes\n\n%d messages are queued for later delivery]

-[TabSRMM warning message]

-[No description given]

-[Incoming file (invalid format)]

-[Unknown module or contact]

-[Merge new events for the same contact into existing popup]

-[Dismiss popup]

-[Disable event notifications for instant messages]

-[Disable event notifications for group chats]

-[Disable notifications for non-message events]

-[Remove popups for a contact when the message window is focused]

-[Remove popups for a contact when I start typing a reply]

-[Remove popups for a contact when I send a reply]

-[Disable notifications]

-[Combine notifications for the same contact]

-[Event notifications]

 [No status message]

 [You cannot edit user notes when there are unsent messages]

 [%s has entered text.]

@@ -258,7 +241,6 @@
 [Quote message]

 [Clear message area]

 [Toggle send later]

-[Send message]

 [Show message history]

 [Show send menu]

 [Show protocol menu]

@@ -304,7 +286,6 @@
 [Auto scrolling is disabled (press F12 to enable it)]

 [Retry]

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

-[The filter cannot be enabled, because there are no event types selected either global or for this chat room]

 [Set your avatar...]

 [Image files]

 [JPEG-compressed images]

@@ -338,10 +319,12 @@
 [Today]

 [Yesterday]

 [<no skin>]

-[Send on Shift+Enter]

 [Enable "Paste and send" feature]

 [Allow BBCode formatting in outgoing messages]

 [Use the same splitter height for all sessions]

+[is now offline (was online)]

+[Sample error message]

+[My Nickname]

 [Message log icons]

 [Show seconds in timestamps]

 [Log status changes]

@@ -432,3 +415,4 @@
 [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?]

+[TabSRMM warning message]

diff --git a/langpacks/french/Untranslated/UInfoEx.txt b/langpacks/french/Untranslated/UInfoEx.txt
index 636199408f..7f24180cfa 100644
--- a/langpacks/french/Untranslated/UInfoEx.txt
+++ b/langpacks/french/Untranslated/UInfoEx.txt
@@ -34,7 +34,6 @@
 [Subgroup menu]

 [Account menu]

 [Misc]

-[Use zodiac as default avatar]

 [Country flags]

 [Use &unknown flag if country cannot be determined]

 [Show country flag as &status icon on message window]

@@ -122,8 +121,6 @@
 [Address and contact]

 [Everything is done!]

 [All settings are reset to default values now!]

-[mBirthday]

-[UserInfo (default)]

 [This is the reminder message]

 [Past]

 [Affiliation]

diff --git a/langpacks/french/Untranslated/Weather.txt b/langpacks/french/Untranslated/Weather.txt
index 3b974addd5..50de86a786 100644
--- a/langpacks/french/Untranslated/Weather.txt
+++ b/langpacks/french/Untranslated/Weather.txt
@@ -46,9 +46,8 @@
 [View Brief]

 [View Complete]

 [Weather Update]

-[Popup]

-[No Popup]

 [Edit Settings]

+[Weather notifications]

 [Browse]

 [mm]

 [Author]

diff --git a/langpacks/french/Untranslated/WhenWasIt.txt b/langpacks/french/Untranslated/WhenWasIt.txt
index dbb1520e4c..4c7d964633 100644
--- a/langpacks/french/Untranslated/WhenWasIt.txt
+++ b/langpacks/french/Untranslated/WhenWasIt.txt
@@ -18,7 +18,6 @@
 [Current age]

 [UserInfo module]

 [Protocol module]

-[mBirthday module]

 [Dismiss]

 [All contacts except hidden ones]

 [All contacts except ignored ones]

diff --git a/langpacks/french/Untranslated/WhoUsesMyFiles.txt b/langpacks/french/Untranslated/WhoUsesMyFiles.txt
index 0b87a7e714..3894f43a78 100644
--- a/langpacks/french/Untranslated/WhoUsesMyFiles.txt
+++ b/langpacks/french/Untranslated/WhoUsesMyFiles.txt
@@ -17,7 +17,6 @@
 [Error opening file]

 [Error memory allocation]

 [Error creating menu]

-[Enable WUMF popups]

-[Disable WUMF popups]

 [Show connections list]

+[WUMF popups]

 [WUMF: Show connections]

diff --git a/langpacks/french/Untranslated/YAMN.txt b/langpacks/french/Untranslated/YAMN.txt
index 100ff5f8ee..e23d4cde68 100644
--- a/langpacks/french/Untranslated/YAMN.txt
+++ b/langpacks/french/Untranslated/YAMN.txt
@@ -1,5 +1,4 @@
 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]

-[Version:]

 [Only check when...]

 [New Mail]

 [Sound]

diff --git a/langpacks/french/Untranslated/mRadio.txt b/langpacks/french/Untranslated/mRadio.txt
index 300cec4ded..7aa3d9b0bd 100644
--- a/langpacks/french/Untranslated/mRadio.txt
+++ b/langpacks/french/Untranslated/mRadio.txt
@@ -18,15 +18,15 @@
 [Shuffle playlist]

 [Loop single media]

 [Station Name]

-[Timeout, ms (5000)]

-[PreBuf, % (75%)]

+[Timeout, ms]

+[PreBuf, %]

 [Hallway]

 [Mountains]

 [Use EAX]

 [Under Water]

 [Station URL (required)]

 [To INI]

-[Buffer, ms (5000)]

+[Buffer, ms]

 [Add station]

 [Add Station]

 [Stone Room]