langpacks: update

6 files changed, 5 insertions, 107 deletions

diff --git a/langpacks/french/Untranslated/CloudFile.txt b/langpacks/french/Untranslated/CloudFile.txt
index 4897aeb0e5..50118759ae 100644
--- a/langpacks/french/Untranslated/CloudFile.txt
+++ b/langpacks/french/Untranslated/CloudFile.txt
@@ -18,3 +18,4 @@
 [Upload to...]
 [Upload]
 [Upload files to...]
+[Server does not respond]
diff --git a/langpacks/french/Untranslated/DbChecker.txt b/langpacks/french/Untranslated/DbChecker.txt
deleted file mode 100644
index d70b35042b..0000000000
--- a/langpacks/french/Untranslated/DbChecker.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-[Miranda NG Database Checker.]

-[Welcome to the Miranda Database Wizard]

-[Using this Wizard you can compact your Miranda profile database to remove dead space created during normal usage, as well as repair a large number of issues that could affect the database.]

-[To continue, click Next.]

-[This program is licensed under the terms of the GNU General Public License.]

-[Miranda Database Tool]

-[< &Back]

-[&Next >]

-[Select Miranda Profile]

-[You can choose the Miranda profile database to compact or repair.]

-[Select the &profile database from the list below. If the database you wish to use is not listed here then click Other to browse your computer.]

-[&File:]

-[&Other...]

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

-[The file may be in use by a currently running copy of Miranda. Exit any running Mirandas and click Next to retry.]

-[File Access Options]

-[You can select low level options to determine how the database is processed.]

-[Create backup]

-[Creates a backup copy of the database before any of the requested changes are made.]

-[Aggressively find corruption]

-[Scans the database for data that is not linked to any other data. This requires more disk space and more time, so is only required if you suspect corruption.]

-[Check consistency only]

-[Just checks that the database is valid, without writing anything to the disk.]

-[Cleaning Options]

-[You can choose to remove information from the database while it is being processed.]

-[Erase all histories]

-[Removes all the saved history for all contacts in the database.]

-[Mark all events read]

-[Marks all the history events as read. This will rectify any problems with old messages always appearing in the message window log box.]

-[Convert old Unicode messages to UTF8]

-[Converts history messages in pre-0.7 format (ANSI+UCS2) to the new UTF8 format supported by 0.7. Saves the database space in most cases (recommended).]

-[Working...]

-[Please wait while the requested operations are being performed.]

-[Finished!]

-[All tasks have been completed.]

-[Launch Miranda with this profile]

-[Launches Miranda with the profile that was just worked on.]

-[Backup:]

-[The processing of the database has been completed. Click Next to return to the start of the wizard to select another database to check, or click Finish to exit the wizard.]

-[&Finish]

-[Click Next to continue]

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

-[Processing has not yet completed, if you go back 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 go back?]

-[Database Checker cannot find a suitable database plugin to open '%s'.]

-[Database driver '%s' doesn't support checking.]

-[Database]

-[Total size]

-[Miranda Databases (*.dat)]

-[Errors were encountered, however you selected not to backup the original database. It is strongly recommended that you do so in case important data was omitted. Do you wish to keep a backup of the original database?]

-[%s\\Backup of %s]

-[%s\\Backup (%d) of %s]

-[Unable to rename original file]

-[Unable to delete original file]

-[Unable to rename output file]

-[Database worker thread activated]

-[<check only>]

-[ (Output).dat]

-[Can't create output file (%u)]

-[Processing aborted by user]

-[Elapsed time: %d sec]

-[All tasks completed but with errors (%d)]

-[All tasks completed successfully]

diff --git a/langpacks/french/Untranslated/Dbx_mmap.txt b/langpacks/french/Untranslated/Dbx_mmap.txt
index 227f8d55bd..1bc16fbe8e 100644
--- a/langpacks/french/Untranslated/Dbx_mmap.txt
+++ b/langpacks/french/Untranslated/Dbx_mmap.txt
@@ -9,7 +9,7 @@
 [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]

-[Miranda has detected corruption in your database. This corruption may be fixed by DbChecker plugin. Please download it from https://miranda-ng.org/p/DbChecker/. Miranda will now shut down.]

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

 [Change/remove password]

@@ -21,42 +21,3 @@
 [Wrong old password entered!]

 [Password is too short!]

 [Database]

-[Performing aggressive pass]

-[Aggressive: random junk at %08X: skipping]

-[Aggressive: unlinked data at %08X: can't automatically place]

-[Processing contact chain]

-[Contact count marked wrongly: correcting]

-[Contact chain corrupted, further entries ignored]

-[Invalid offset found (database truncated?)]

-[Invalid offset found]

-[Error reading, database truncated? (%u)]

-[Can't write to working file, aggressive mode may be too aggressive now]

-[Can't write to output file - disk full? (%u)]

-[Event count marked wrongly: correcting]

-[Event chain corrupted, trying to recover...]

-[Event chain corrupted, further entries ignored]

-[First event not marked as such: correcting]

-[Extra flags found in event: removing]

-[First unread event marked wrong: fixing]

-[Infeasibly large event blob: skipping]

-[Event not backlinked correctly: fixing]

-[Duplicate event was found: skipping]

-[Event position in chain is not correct]

-[Event position in chain is not correct: fixing]

-[Event position in chain is not correct: unable to fix]

-[Processing final tasks]

-[Database signature is corrupted, automatic repair is impossible]

-[Database version doesn't match this driver's one. Convert a database first]

-[Database is newly created and has no data to process]

-[Processing completed successfully]

-[Can't create map view of file (%u)]

-[Processing module name chain]

-[Module chain corrupted, further entries ignored]

-[Module name '%s' is not unique: %d duplicates found]

-[Invalid module name offset, skipping data]

-[Settings chain corrupted, further entries ignored]

-[Infeasibly large settings blob: skipping]

-[Empty settings group at %08X: skipping]

-[Processing user data]

-[User corrupted, this could cause major problems]

-[More than one user contact: keeping only first]

diff --git a/langpacks/french/Untranslated/Jabber.txt b/langpacks/french/Untranslated/Jabber.txt
index 54dc4df9bb..3d8668f6a0 100644
--- a/langpacks/french/Untranslated/Jabber.txt
+++ b/langpacks/french/Untranslated/Jabber.txt
@@ -353,6 +353,7 @@
 [Automatically save received notes]

 [Enable server-side history (XEP-0136)]

 [Receive conversations from other devices (XEP-0280)]

+[Use Stream Management (XEP-0198) if possible (PLACEHOLDER OPTION)]

 [Enable remote controlling (from another resource of same JID only)]

 [Automatically accept authorization requests]

 [Fix incorrect timestamps in incoming messages]

diff --git a/langpacks/french/Untranslated/PManagerEx.txt b/langpacks/french/Untranslated/PManagerEx.txt
index 8c8442a047..34dd1393ee 100644
--- a/langpacks/french/Untranslated/PManagerEx.txt
+++ b/langpacks/french/Untranslated/PManagerEx.txt
@@ -1,5 +1,4 @@
-[Adds a menu item to change or load a different profile of Miranda NG, restart or run DbChecker.]

-[Miranda NG will exit and Database checker will start.\n\nAre you sure you want to do this?]

+[Adds a menu item to change or load a different profile of Miranda NG or restart.]

 [Load profile]

 [Change profile]

 [Restart]

diff --git a/langpacks/french/Untranslated/VKontakte.txt b/langpacks/french/Untranslated/VKontakte.txt
index a443a6e2e3..3dd3e5b729 100644
--- a/langpacks/french/Untranslated/VKontakte.txt
+++ b/langpacks/french/Untranslated/VKontakte.txt
@@ -194,7 +194,7 @@
 [Invalid filesize]

 [Unknown error occurred]

 [Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]

-[Are you sure you want to reload all messages for all contacts from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a very long time and/or corrupt Miranda database.\nWe recommend check your database before reloading messages and after it (Miranda32.exe /svc:dbchecker or Miranda64.exe /svc:dbchecker).\nDo you want to continue?]

+[Are you sure you want to reload all messages for all contacts from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a very long time and/or corrupt Miranda database.\nDo you want to continue?]

 [Error loading message history from server.]

 [Loading messages for all contacts is completed.]

 [Loading history]