- langpacks/english: updated

git-svn-id: http://svn.miranda-ng.org/main/trunk@5841 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

13 files changed, 64 insertions, 35 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 21d4729661..8ef2f134b2 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1100,12 +1100,12 @@
 [&Move to Group]

 [<Root Group>]

 ;file \src\modules\database\database.cpp

-[Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s\nBecause profile with this name already exist. Please resolve the issue manually.]

+[Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s\nBecause profile with this name already exists. Please resolve the issue manually.]

 [Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s automatically\nMost likely 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_3x.dll or equivalent.]

 [No profile support installed!]

-[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.\nThis profile might also be damaged, please run DbChecker which should be installed.]

 [Miranda can't understand that profile]

 [Miranda was unable to open '%s'\nIt's inaccessible or used by other application or Miranda instance]

 [Miranda can't open that profile]

@@ -1223,8 +1223,7 @@
 ;file \src\modules\protocols\protoopts.cpp

 [WARNING! The account is going to be deleted. It means that all its settings, contacts and histories will be also erased.\n\nAre you absolutely sure?]

 [Your account was successfully upgraded. To activate it, restart of Miranda is needed.\n\nIf you want to restart Miranda now, press Yes, if you want to upgrade another account, press No]

-[This account uses legacy protocol plugin. Use Miranda NG options dialogs to change it's preferences.]

-[Welcome to Miranda NG's account manager!\n Here you can set up your IM accounts.\n\n Select an account from the list on the left to see the available options. Alternatively, just click on the Plus sign underneath the list to set up a new IM account.]

+[This account uses legacy protocol plugin. Use Miranda NG options dialogs to change its preferences.]

 [Create new account]

 [Editing account]

 [Upgrading account]

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index ef343104ec..f59e6868b9 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -1101,12 +1101,12 @@
 [&Move to Group]

 [<Root Group>]

 ;file \src\modules\database\database.cpp

-[Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s\nBecause profile with this name already exist. Please resolve the issue manually.]

+[Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s\nBecause profile with this name already exists. Please resolve the issue manually.]

 [Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s automatically\nMost likely 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_3x.dll or equivalent.]

 [No profile support installed!]

-[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.\nThis profile might also be damaged, please run DbChecker which should be installed.]

 [Miranda can't understand that profile]

 [Miranda was unable to open '%s'\nIt's inaccessible or used by other application or Miranda instance]

 [Miranda can't open that profile]

@@ -1224,8 +1224,7 @@
 ;file \src\modules\protocols\protoopts.cpp

 [WARNING! The account is going to be deleted. It means that all its settings, contacts and histories will be also erased.\n\nAre you absolutely sure?]

 [Your account was successfully upgraded. To activate it, restart of Miranda is needed.\n\nIf you want to restart Miranda now, press Yes, if you want to upgrade another account, press No]

-[This account uses legacy protocol plugin. Use Miranda NG options dialogs to change it's preferences.]

-[Welcome to Miranda NG's account manager!\n Here you can set up your IM accounts.\n\n Select an account from the list on the left to see the available options. Alternatively, just click on the Plus sign underneath the list to set up a new IM account.]

+[This account uses legacy protocol plugin. Use Miranda NG options dialogs to change its preferences.]

 [Create new account]

 [Editing account]

 [Upgrading account]

@@ -1580,7 +1579,6 @@
 ;  Authors: Awkward

 ;============================================================

 [Contact window]

-[Text insert]

 [vars]

 [DWord]

 [You can use %name%, %uid%, %account% and %group% macros]

@@ -1659,6 +1657,7 @@
 [Contact list format]

 [Active accounts only]

 [Dropdown list format]

+[Apply]

 [Apply format]

 [Use Byte array/pointer for ANSI strings\n\Use Word array/pointer for Unicode strings\n\n\$## replaces by byte with hex value ##\n\$#### replaces by word with hex value #### (for Unicode strings only)\n\n\All data length calculating in bytes]

 [New]

@@ -1723,11 +1722,12 @@
 [Return]

 [Effect]

 [Start]

-[action group list was changed: some was added or deleted]

-[the context menu for a contact is about to be built]

-[double click on the CList]

+[Action group list was changed: some was added or deleted]

+[The context menu for a contact is about to be built]

+[Double click on the CList]

 [New contact added to database]

-[Contact deleting]#muuid {6471d451-2fe0-4ee2-850e-9f84f3c0d187}

+[Contact deleting]

+#muuid {6471d451-2fe0-4ee2-850e-9f84f3c0d187}

 ;============================================================

 ;  File: AddContactPlus.dll

 ;  Plugin: Add contact+

@@ -2308,7 +2308,7 @@
 ;  Version: 0.0.2.1

 ;  Authors: Thief, idea by snwbrdr

 ;============================================================

-[If contact didn't authorized you this plugin puts an icon in front of contacts name.]

+[If a contact didn't authorize you this plugin puts an icon in front of the contact's name.]

 ;file \plugins\AuthState\res\authstate.rc

 [Show Auth icon]

 [Show Grant icon]

@@ -2474,7 +2474,7 @@
 [Use Windows colours]

 [Use default colours]

 [Delay]

-[From popup plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Actions]

@@ -3403,7 +3403,7 @@
 ;  Version: 0.9.0.11

 ;  Authors: Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven

 ;============================================================

-[Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enchanced metacontact cooperation.]

+[Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enhanced metacontact cooperation.]

 ;file \plugins\Clist_modern\res\resource.rc

 [Transparency:]

 [Window behaviour:]

@@ -11096,7 +11096,7 @@
 [Closing in %d]

 [Title:]

 [Message:]

-[Enable Anti Spam]

+[Enable anti-spam]

 [Check temp contacts]

 [Delete spam bot contacts]

 [Max. language changes in message (0 - disabled)]

@@ -11197,7 +11197,7 @@
 [Network]

 [Account]

 [Connections]

-[Anti spam]

+[Anti-spam]

 [Files]

 ;file \protocols\MRA\src\Mra_proto.cpp

 [Please, setup e-mail in options]

@@ -11372,7 +11372,7 @@
 ;  Version: 0.1.1.3

 ;  Authors: StDenis

 ;============================================================

-[Plugin replaces MessageBoxes [whose have only OK button] into Popups.]

+[Plugin replaces MessageBoxes (those having only OK button) with popups.]

 ;file \plugins\MsgPopup\res\MsgPopup.rc

 [ASTERISK style]

 [Background]

@@ -13217,7 +13217,7 @@
 ;  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 a dbchecker.]

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

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

@@ -13788,6 +13788,21 @@
 [Last Year]

 [User-Defined]

 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp

+;file \plugins\Quotes\src\QuotesProviderBase.cpp

+[No resource name given.]

+[Icon indices start at 1.]

+[Cou件ၬ 耀࡙t find the requested icon.]

+[Application launching is disabled.]

+[Unterminated option.]

+[No argument given to msg option.]

+[Id is required for replacement.]

+[Invalid argument for replace option: ]

+[Empty message ignored.]

+[Failed to write to log file.]

+[Failed to open log file.]

+[N/A: Failed to format error message]

+[N/A: FormatMessage failed, error code was 0x]

+[Error]

 ;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp

 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp

 [Error occurred during html parsing.]

@@ -14954,7 +14969,7 @@
 #muuid {7993ab24-1fda-428c-a89b-be377a10be3a}

 ;============================================================

 ;  File: ShlExt.dll

-;  Plugin: ShlExt

+;  Plugin: Shell extension

 ;  Version: 2.2.0.1

 ;  Authors: Sam Kothari, Miranda NG Team

 ;============================================================

@@ -16030,7 +16045,7 @@
 ;  Version: 0.0.1.4

 ;  Authors: Roman Miklashevsky, A. Petkevich, Kosh&chka, persei

 ;============================================================

-[Antispam plugin for Miranda NG.]

+[Anti-spam plugin for Miranda NG.]

 ;file \plugins\StopSpamPlus\res\stopspam.rc

 [Question: (Ctrl-Enter for carriage return)]

 [Restore defaults]

@@ -16072,7 +16087,7 @@
 ;  Version: 0.0.2.0

 ;  Authors: Roman Miklashevsky, sss, Elzor

 ;============================================================

-[Antispam plugin for Miranda NG.]

+[Anti-spam plugin for Miranda NG.]

 ;file \plugins\StopSpamMod\res\stopspam.rc

 [Question: (Ctrl-Enter for carriage return)]

 [Restore defaults]

@@ -19382,7 +19397,7 @@
 ;  Version: 0.2.1.0

 ;  Authors: Andrej Krutak

 ;============================================================

-[Shows new message/status change info using onscreen display.]

+[Shows new message/status change info using on-screen display.]

 ;file \plugins\wbOSD\res\wbOSD.rc

 [Dialog]

 [Select font]

diff --git a/langpacks/english/Plugins/AuthState.txt b/langpacks/english/Plugins/AuthState.txt
index dda35805b9..e068b2d1a3 100644
--- a/langpacks/english/Plugins/AuthState.txt
+++ b/langpacks/english/Plugins/AuthState.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.0.2.1

 ;  Authors: Thief, idea by snwbrdr

 ;============================================================

-[If contact didn't authorized you this plugin puts an icon in front of contacts name.]

+[If a contact didn't authorize you this plugin puts an icon in front of the contact's name.]

 ;file \plugins\AuthState\res\authstate.rc

 [Show Auth icon]

 [Show Grant icon]

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index 1908c0df88..c5f35eaf72 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -28,7 +28,7 @@
 [Use Windows colours]

 [Use default colours]

 [Delay]

-[From popup plugin]

+[From Popup plugin]

 [Custom]

 [Permanent]

 [Actions]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 02ed8af5f6..2987991fd8 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.9.0.11

 ;  Authors: Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven

 ;============================================================

-[Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enchanced metacontact cooperation.]

+[Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enhanced metacontact cooperation.]

 ;file \plugins\Clist_modern\res\resource.rc

 [Transparency:]

 [Window behaviour:]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index 1c924925f1..d744e23581 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -77,7 +77,7 @@
 [Closing in %d]

 [Title:]

 [Message:]

-[Enable Anti Spam]

+[Enable anti-spam]

 [Check temp contacts]

 [Delete spam bot contacts]

 [Max. language changes in message (0 - disabled)]

@@ -178,7 +178,7 @@
 [Network]

 [Account]

 [Connections]

-[Anti spam]

+[Anti-spam]

 [Files]

 ;file \protocols\MRA\src\Mra_proto.cpp

 [Please, setup e-mail in options]

diff --git a/langpacks/english/Plugins/MsgPopup.txt b/langpacks/english/Plugins/MsgPopup.txt
index aa3035f700..59e79c36d2 100644
--- a/langpacks/english/Plugins/MsgPopup.txt
+++ b/langpacks/english/Plugins/MsgPopup.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.1.1.3

 ;  Authors: StDenis

 ;============================================================

-[Plugin replaces MessageBoxes [whose have only OK button] into Popups.]

+[Plugin replaces MessageBoxes (those having only OK button) with popups.]

 ;file \plugins\MsgPopup\res\MsgPopup.rc

 [ASTERISK style]

 [Background]

diff --git a/langpacks/english/Plugins/PManagerEx.txt b/langpacks/english/Plugins/PManagerEx.txt
index 43ea3a417e..bc329a33b0 100644
--- a/langpacks/english/Plugins/PManagerEx.txt
+++ b/langpacks/english/Plugins/PManagerEx.txt
@@ -5,7 +5,7 @@
 ;  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 a dbchecker.]

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

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

diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index 24a01bfb44..bf66c70d96 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -120,6 +120,21 @@
 [Last Year]

 [User-Defined]

 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp

+;file \plugins\Quotes\src\QuotesProviderBase.cpp

+[No resource name given.]

+[Icon indices start at 1.]

+[Cou件ၬ 耀࡙t find the requested icon.]

+[Application launching is disabled.]

+[Unterminated option.]

+[No argument given to msg option.]

+[Id is required for replacement.]

+[Invalid argument for replace option: ]

+[Empty message ignored.]

+[Failed to write to log file.]

+[Failed to open log file.]

+[N/A: Failed to format error message]

+[N/A: FormatMessage failed, error code was 0x]

+[Error]

 ;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp

 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp

 [Error occurred during html parsing.]

diff --git a/langpacks/english/Plugins/ShlExt.txt b/langpacks/english/Plugins/ShlExt.txt
index 305e8e7380..65b470990f 100644
--- a/langpacks/english/Plugins/ShlExt.txt
+++ b/langpacks/english/Plugins/ShlExt.txt
@@ -1,7 +1,7 @@
 #muuid {7993ab24-1fda-428c-a89b-be377a10be3a}

 ;============================================================

 ;  File: ShlExt.dll

-;  Plugin: ShlExt

+;  Plugin: Shell extension

 ;  Version: 2.2.0.1

 ;  Authors: Sam Kothari, Miranda NG Team

 ;============================================================

diff --git a/langpacks/english/Plugins/StopSpam.txt b/langpacks/english/Plugins/StopSpam.txt
index fa9653362b..c557416d4f 100644
--- a/langpacks/english/Plugins/StopSpam.txt
+++ b/langpacks/english/Plugins/StopSpam.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.0.1.4

 ;  Authors: Roman Miklashevsky, A. Petkevich, Kosh&chka, persei

 ;============================================================

-[Antispam plugin for Miranda NG.]

+[Anti-spam plugin for Miranda NG.]

 ;file \plugins\StopSpamPlus\res\stopspam.rc

 [Question: (Ctrl-Enter for carriage return)]

 [Restore defaults]

diff --git a/langpacks/english/Plugins/StopSpamMod.txt b/langpacks/english/Plugins/StopSpamMod.txt
index 34046dcee3..b28ce47421 100644
--- a/langpacks/english/Plugins/StopSpamMod.txt
+++ b/langpacks/english/Plugins/StopSpamMod.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.0.2.0

 ;  Authors: Roman Miklashevsky, sss, Elzor

 ;============================================================

-[Antispam plugin for Miranda NG.]

+[Anti-spam plugin for Miranda NG.]

 ;file \plugins\StopSpamMod\res\stopspam.rc

 [Question: (Ctrl-Enter for carriage return)]

 [Restore defaults]

diff --git a/langpacks/english/Plugins/wbOSD.txt b/langpacks/english/Plugins/wbOSD.txt
index 71e7e0c528..6edebd76a3 100644
--- a/langpacks/english/Plugins/wbOSD.txt
+++ b/langpacks/english/Plugins/wbOSD.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.2.1.0

 ;  Authors: Andrej Krutak

 ;============================================================

-[Shows new message/status change info using onscreen display.]

+[Shows new message/status change info using on-screen display.]

 ;file \plugins\wbOSD\res\wbOSD.rc

 [Dialog]

 [Select font]