langpacks/english: update

2 files changed, 126 insertions, 124 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index ff8042e62a..ba32526db8 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -117,71 +117,6 @@
 [Make sections equal width]

 [Show bevels on panels]

 [Show resize grip indicator]

-;file \src\core\stdfile\res\resource.rc

-[Send file(s)]

-[&Send]

-[Cancel]

-[To:]

-[File(s):]

-[&Choose again...]

-[Total size:]

-[Description:]

-[&User menu]

-[User &details]

-[&History]

-[Incoming file transfer]

-[A&ccept]

-[&Decline]

-[From:]

-[Date:]

-[Files:]

-[Save to:]

-[&Add]

-[&Open...]

-[Open &folder]

-[Transfer completed, open file(s).]

-[No data transferred]

-[File already exists]

-[Resume]

-[Resume all]

-[Overwrite]

-[Overwrite all]

-[Save as...]

-[Auto rename]

-[Skip]

-[Cancel transfer]

-[You are about to receive the file]

-[Existing file]

-[Size:]

-[Last modified:]

-[Type:]

-[Open file]

-[Open folder]

-[File properties]

-[File being received]

-[File transfers]

-[Clear completed]

-[Close]

-[Receiving files]

-[Received files folder:]

-[Variables allowed: %userid%, %nick%, %proto%, %miranda_path%, %userprofile%]

-[Auto-accept incoming files from people on my contact list]

-[Minimize the file transfer window]

-[Close window when transfer completes]

-[Clear completed transfers on window closing]

-[Sort file transfers in the reverse order]

-[Virus scanner]

-[Scan files:]

-[Never, do not use virus scanning]

-[When all files have been downloaded]

-[As each file finishes downloading]

-[Command line:]

-[%f will be replaced by the file or folder name to be scanned]

-[Warn me before opening a file that has not been scanned]

-[If incoming files already exist]

-[Ask me]

-[Rename (append " (1)", etc.)]

-[You will always be asked about files from people not on your contact list]

 ;file \src\core\stdmsg\res\resource.rc

 [Automatically popup window when:]

 [Don't steal focus]

@@ -203,6 +138,8 @@
 [An error has occurred. The protocol reported the following error:]

 [while sending the following message:]

 [Try again]

+[Cancel]

+[&Send]

 [Message window event log]

 [Show names]

 [Show timestamp]

@@ -272,6 +209,7 @@
 [Delete]

 ;file \src\core\stdpopup\res\resource.rc

 [Popup history]

+[Close]

 [Case sensitive]

 [Default timeout]

 [Never timeout]

@@ -343,6 +281,7 @@
 [Choose the protocol type]

 [Specify the internal account name (optional)]

 [Add contact]

+[&Add]

 [Send authorization request]

 [Open contact's chat window]

 [Custom name:]

@@ -442,6 +381,7 @@
 [Logging...]

 [Outgoing connections]

 [Use proxy server]

+[Type:]

 [Host:]

 [Port:]

 [(often %d)]

@@ -460,8 +400,9 @@
 [e.g., Workplace]

 [You can select a different database driver from the default, it may offer more features or abilities, if in doubt use the default.]

 [Driver]

-[Problem: Unable to find any database drivers, this means you cannot create a new profile, you need to get dbx_mdbx.dll]

+[Problem: Unable to find any database drivers, this means you cannot create a new profile, you need to get dbx_sqlite.dll]

 [Download more plugins]

+[Description:]

 [Author(s):]

 [Homepage:]

 [Unique ID:]

@@ -548,6 +489,7 @@
 [Enable custom log controls in group chats]

 [Current language:]

 [Last modified using:]

+[Date:]

 [Locale:]

 [Reload langpack]

 [Download more language packs]

@@ -558,6 +500,7 @@
 [&Authorize]

 [&Deny]

 [Decide &later]

+[User &details]

 [Reason:]

 [Denial reason:]

 [Add to contact list if authorized]

@@ -608,6 +551,64 @@
 [Text]

 [Background]

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

+[Send file(s)]

+[To:]

+[File(s):]

+[&Choose again...]

+[Total size:]

+[&User menu]

+[&History]

+[Incoming file transfer]

+[A&ccept]

+[&Decline]

+[From:]

+[Files:]

+[Save to:]

+[&Open...]

+[Open &folder]

+[Transfer completed, open file(s).]

+[No data transferred]

+[File already exists]

+[Resume]

+[Resume all]

+[Overwrite]

+[Overwrite all]

+[Save as...]

+[Auto rename]

+[Skip]

+[Cancel transfer]

+[You are about to receive the file]

+[Existing file]

+[Size:]

+[Last modified:]

+[Open file]

+[Open folder]

+[File properties]

+[File being received]

+[File transfers]

+[Clear completed]

+[Receiving files]

+[Received files folder:]

+[Variables allowed: %userid%, %nick%, %proto%, %miranda_path%, %userprofile%]

+[Auto-accept incoming files from people on my contact list]

+[Minimize the file transfer window]

+[Close window when transfer completes]

+[Clear completed transfers on window closing]

+[Sort file transfers in the reverse order]

+[You will always be asked about files from people not on your contact list]

+[If incoming files already exist]

+[Offline files]

+[Download offline files automatically]

+[Only if their size is less than]

+[KBytes (0 - always)]

+[Virus scanner]

+[Scan files:]

+[Never, do not use virus scanning]

+[When all files have been downloaded]

+[As each file finishes downloading]

+[Command line:]

+[%f will be replaced by the file or folder name to be scanned]

+[Warn me before opening a file that has not been scanned]

 [&Hide/Show]

 [E&xit]

 [Nowhere]

@@ -697,61 +698,6 @@
 [User has not registered an e-mail address]

 [Send e-mail]

 [&E-mail]

-;file \src\core\stdfile\src\file.cpp

-[bytes]

-[&File]

-[File from %s]

-[File &transfers...]

-[Incoming]

-[Complete]

-[Error]

-[Denied]

-;file \src\core\stdfile\src\fileexistsdlg.cpp

-[%s file]

-[All files]

-;file \src\core\stdfile\src\fileopts.cpp

-[Executable files]

-[Events]

-;file \src\core\stdfile\src\filerecvdlg.cpp

-[Select folder]

-[My received files]

-[Add contact permanently to list]

-[View user's details]

-[View user's history]

-[User menu]

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

-[Canceled]

-;file \src\core\stdfile\src\filesenddlg.cpp

-[%d files]

-[%d directories]

-;file \src\core\stdfile\src\filexferdlg.cpp

-[This file has not yet been scanned for viruses. Are you certain you want to open it?]

-[File received]

-[of]

-[Request sent, waiting for acceptance...]

-[Waiting for connection...]

-[Unable to initiate transfer.]

-[Contact menu]

-[Open...]

-[sec]

-[remaining]

-[Decision sent]

-[Connecting...]

-[Connecting to proxy...]

-[Connected]

-[Initializing...]

-[Moving to next file...]

-[Sending...]

-[Receiving...]

-[File transfer denied]

-[File transfer failed]

-[Transfer completed.]

-[Transfer completed, open file.]

-[Transfer completed, open folder.]

-[Scanning for viruses...]

-[Transfer and virus scan complete]

-;file \src\core\stdfile\src\ftmanager.cpp

-[Outgoing]

 ;file \src\core\stdmsg\src\chat_manager.cpp

 [Message sessions]

 [Chat module]

@@ -821,6 +767,7 @@
 [Show icon for name changes]

 [Show icon for information messages]

 [Show icon for status changes]

+[Select folder]

 [Chat log]

 ;file \src\core\stdmsg\src\cmdlist.cpp

 [The message send timed out.]

@@ -839,6 +786,7 @@
 [Secure verified message (10x10)]

 [Me]

 [File sent]

+[File received]

 ;file \src\core\stdmsg\src\msgoptions.cpp

 [Outgoing messages]

 [Incoming messages]

@@ -858,6 +806,9 @@
 ;file \src\core\stdmsg\src\msgs.cpp

 [%s is typing a message]

 [Typing notification]

+[Add contact permanently to list]

+[User menu]

+[View user's details]

 [View user's history (Ctrl+H)]

 [&Bold]

 [Make the text bold (Ctrl+B)]

@@ -880,6 +831,7 @@
 [Incoming (focused window)]

 [Incoming (unfocused window)]

 [Incoming (new session)]

+[Outgoing]

 [Message send error]

 [Contact started typing]

 [Contact stopped typing]

@@ -906,6 +858,7 @@
 [Horizontal animate]

 [Vertical animate]

 [You cannot set a default timeout of 0.\nValue has been reset.]

+[Error]

 [Example]

 [The quick brown fox jumps over the lazy dog.]

 [Example With a Long Title]

@@ -1109,7 +1062,7 @@
 [Database]

 [Database compaction failed]

 [Compact database]

-[Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mdbx.dll]

+[Miranda is unable to open '%s' because you do not have any profile plugins installed.\nPress Yes to install DBX_Sqlite or Cancel to exit]

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

@@ -1144,6 +1097,56 @@
 [Extra icons]

 ;file \src\mir_app\src\ei_services.cpp

 [Mute chat]

+;file \src\mir_app\src\file.cpp

+[bytes]

+[&File]

+[File from %s]

+[File &transfers...]

+[Incoming]

+[Complete]

+[Denied]

+;file \src\mir_app\src\fileexistsdlg.cpp

+[%s file]

+[All files]

+;file \src\mir_app\src\fileopts.cpp

+[Ask me]

+[Rename (append " (1)", etc.)]

+[Executable files]

+[Events]

+[Security]

+;file \src\mir_app\src\filerecvdlg.cpp

+[My received files]

+[View user's history]

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

+[Canceled]

+;file \src\mir_app\src\filesenddlg.cpp

+[%d files]

+[%d directories]

+;file \src\mir_app\src\filexferdlg.cpp

+[This file has not yet been scanned for viruses. Are you certain you want to open it?]

+[of]

+[Request sent, waiting for acceptance...]

+[Waiting for connection...]

+[Unable to initiate transfer.]

+[Contact menu]

+[Open...]

+[sec]

+[remaining]

+[Decision sent]

+[Connecting...]

+[Connecting to proxy...]

+[Connected]

+[Initializing...]

+[Moving to next file...]

+[Sending...]

+[Receiving...]

+[File transfer denied]

+[File transfer failed]

+[Transfer completed.]

+[Transfer completed, open file.]

+[Transfer completed, open folder.]

+[Scanning for viruses...]

+[Transfer and virus scan complete]

 ;file \src\mir_app\src\findadd.cpp

 [You haven't filled in the search field. Please enter a search term and try again.]

 [Search]

@@ -1172,6 +1175,7 @@
 [Headers]

 [Generic text]

 [Small text]

+;file \src\mir_app\src\ftmanager.cpp

 ;file \src\mir_app\src\help.cpp

 [< Copyright]

 [&Help]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 97da980f5b..9d711d54ea 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -986,8 +986,6 @@
 [Jabber vCard: Edit Phone Number]

 [Contacts]

 [Note]

-;file \protocols\JabberG\src\jabber_voip.cpp

-[Client's program does not support voice calls]

 ;file \protocols\JabberG\src\jabber_xstatus.cpp

 [<advanced status slot>]

 [Afraid]