From 69a0135e42daf7030045c9408a915320fee3c8b0 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Sun, 25 Mar 2018 22:25:26 +0300 Subject: langpacks/english: update --- langpacks/english/=CORE=.txt | 4 +-- langpacks/english/Plugins/CloudFile.txt | 5 +++ langpacks/english/Plugins/Dbx_mdbx.txt | 2 +- langpacks/english/Plugins/Dbx_mmap.txt | 52 ++------------------------------ langpacks/english/Plugins/Jabber.txt | 1 + langpacks/english/Plugins/PManagerEx.txt | 4 +-- langpacks/english/Plugins/VKontakte.txt | 2 +- 7 files changed, 12 insertions(+), 58 deletions(-) (limited to 'langpacks') diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index 3e2e935ec8..f131daa872 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -1074,7 +1074,7 @@ [Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s automatically\nMost likely this is due to insufficient privileges. Please move profile manually.] [Profile cannot be placed into Miranda root folder.\nPlease move Miranda profile to some other location.] [Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mmap.dll] -[Miranda was unable to open '%s', it's in an unknown format.\nThis profile might also be damaged, please run DbChecker which should be installed.] +[Miranda was unable to open '%s', it's in an unknown format.] [Miranda was unable to open '%s'\nIt's inaccessible or used by other application or Miranda instance] [Miranda was unable to open '%s'\nThere is no suitable database driver installed] [No profile support installed!] @@ -1306,8 +1306,6 @@ [Are you sure you want to remove profile "%s"?] [&Convert] [Run] -[Convert database] -[Check database] [Size] [Created] [Modified] diff --git a/langpacks/english/Plugins/CloudFile.txt b/langpacks/english/Plugins/CloudFile.txt index 3a4f4db556..1381b7b50d 100644 --- a/langpacks/english/Plugins/CloudFile.txt +++ b/langpacks/english/Plugins/CloudFile.txt @@ -36,3 +36,8 @@ [Services] ;file \plugins\CloudFile\src\srmm.cpp [Upload files to...] +;file \plugins\CloudFile\src\Services\dropbox_service.cpp +[Server does not respond] +;file \plugins\CloudFile\src\Services\google_service.cpp +;file \plugins\CloudFile\src\Services\microsoft_service.cpp +;file \plugins\CloudFile\src\Services\yandex_service.cpp diff --git a/langpacks/english/Plugins/Dbx_mdbx.txt b/langpacks/english/Plugins/Dbx_mdbx.txt index c12fc9f2e6..96bc2ffad5 100644 --- a/langpacks/english/Plugins/Dbx_mdbx.txt +++ b/langpacks/english/Plugins/Dbx_mdbx.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Dbx_mdbx.dll ; Plugin: Miranda NG MDBX database driver -; Version: 0.95.8.4 +; Version: 0.95.8.6 ; Authors: Miranda-NG project ;============================================================ [Provides Miranda database support: global settings, contacts, history, settings per contact.] diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt index 5b2daf8afd..a3abb242f2 100644 --- a/langpacks/english/Plugins/Dbx_mmap.txt +++ b/langpacks/english/Plugins/Dbx_mmap.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Dbx_mmap.dll ; Plugin: Miranda NG mmap database driver -; Version: 0.95.3.1 +; Version: 0.95.8.1 ; Authors: Miranda-NG project ;============================================================ [Provides Miranda database support: global settings, contacts, history, settings per contact.] @@ -24,7 +24,7 @@ [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] [Set password] ;file \plugins\Db3x_mmap\src\database.cpp -[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.] [Disk is full. Miranda will now shut down.] [Database failure. Miranda will now shut down.] [Database Error] @@ -48,51 +48,3 @@ [Password is too short!] [Passwords do not match!] [Database] -;file \plugins\Db3x_mmap\src\dbtool\aggressive.cpp -[Performing aggressive pass] -[Aggressive: random junk at %08X: skipping] -[Aggressive: unlinked data at %08X: can't automatically place] -;file \plugins\Db3x_mmap\src\dbtool\contactchain.cpp -[Processing contact chain] -[Contact count marked wrongly: correcting] -[Contact chain corrupted, further entries ignored] -;file \plugins\Db3x_mmap\src\dbtool\disk.cpp -[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)] -;file \plugins\Db3x_mmap\src\dbtool\eventchain.cpp -[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] -;file \plugins\Db3x_mmap\src\dbtool\finaltasks.cpp -[Processing final tasks] -;file \plugins\Db3x_mmap\src\dbtool\initialchecks.cpp -[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)] -;file \plugins\Db3x_mmap\src\dbtool\modulechain.cpp -[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] -;file \plugins\Db3x_mmap\src\dbtool\settingschain.cpp -[Settings chain corrupted, further entries ignored] -[Infeasibly large settings blob: skipping] -[Empty settings group at %08X: skipping] -;file \plugins\Db3x_mmap\src\dbtool\user.cpp -[Processing user data] -[User corrupted, this could cause major problems] -[More than one user contact: keeping only first] diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index 2c5a114016..d30dbf6da2 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -717,6 +717,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)] [Server options] [Disable SASL authentication (for old servers)] [Enable stream compression (if possible)] diff --git a/langpacks/english/Plugins/PManagerEx.txt b/langpacks/english/Plugins/PManagerEx.txt index d2c99bf6cc..4dc2a2623f 100644 --- a/langpacks/english/Plugins/PManagerEx.txt +++ b/langpacks/english/Plugins/PManagerEx.txt @@ -5,10 +5,8 @@ ; Version: 0.0.0.5 ; Authors: Roman Gemini ;============================================================ -[Adds a menu item to change or load a different profile of Miranda NG, restart or run DbChecker.] +[Adds a menu item to change or load a different profile of Miranda NG or restart.] ;file \plugins\ProfileManager\src\pmanagerEx.cpp -[Miranda NG will exit and Database checker will start.\n\nAre you sure you want to do this?] -[Check database] [Load profile] [Change profile] [Restart] diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index b123f9418b..86f4a8d01f 100644 --- a/langpacks/english/Plugins/VKontakte.txt +++ b/langpacks/english/Plugins/VKontakte.txt @@ -238,7 +238,7 @@ [Unknown error occurred] ;file \protocols\VKontakte\src\vk_history.cpp [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] -- cgit v1.2.3