langpacks/english: update

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

1 files changed, 49 insertions, 51 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 5c8f2e2405..f555cec93a 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -22,11 +22,11 @@
 [This will erase all history and settings for this contact!]

 [Contact display options]

 [Instead of displaying contacts by their nickname,\ndrag to choose another order:]

-[Miranda NG Profile Manager]

+[Miranda NG profile manager]

 [&Run]

 [&Exit]

-[Start in Service Mode with]

-[Find/Add contacts]

+[Start in service mode with]

+[Find/add contacts]

 [Search:]

 [E-mail address]

 [Name]

@@ -39,7 +39,7 @@
 [More options]

 [Add to list]

 [Custom]

-[Find/Add contacts\nHere you can add contacts to your contact list]

+[Find/add contacts\nHere you can add contacts to your contact list]

 [Options\nConfigure your Miranda NG options]

 [Apply]

 [Switch to simple options]

@@ -223,26 +223,26 @@
 [Select the extra icons to be shown in the contact list:]

 [*only the first %d icons will be shown]

 [You can group/ungroup icons by selecting them (CTRL+left click) and using the popup menu (right click)]

-[Add to Existing MetaContact]

-[Please select a MetaContact:]

-[Sort Alphabetically]

+[Add to existing metacontact]

+[Please select a metacontact:]

+[Sort alphabetically]

 [Editing]

 [Information]

 [Contacts]

 [&Remove]

-[&Set as Default]

-[Move &Up]

-[Move &Down]

-[Send &Offline]

-[Context Menu]

+[&Set as default]

+[Move &up]

+[Move &down]

+[Send &offline]

+[Context menu]

 [Use contact's unique ID]

 [Use contact's display name]

-[Contact Labels]

+[Contact labels]

 [When I click on a sub in the popup menu...]

 [Set default and open message window]

 [Show subcontact context menu]

 [Show user information]

-[Contact List]

+[Contact list]

 [Display subcontact nickname]

 [Display subcontact display name]

 [Lock name to first contact]

@@ -382,7 +382,6 @@
 [seconds, when statuses differ]

 [Show multiple icons]

 [Only when statuses differ]

-[Contact list]

 [System tray icon]

 [System tray icon when using multiple protocols]

 [Contact list sorting]

@@ -1174,7 +1173,7 @@
 [Searching]

 [All networks]

 [Handle]

-[&Find/Add contacts...]

+[&Find/add contacts...]

 ;file \src\modules\findadd\searchresults.cpp

 [Could not start a search on '%s', there was a problem - is %s connected?]

 [Could not search on any of the protocols, are you online?]

@@ -1212,60 +1211,59 @@
 [built-in]

 [Languages]

 ;file \src\modules\metacontacts\metacontacts.h

-[You are going to remove all the contacts associated with this MetaContact.\nThis will delete the MetaContact.\n\nProceed Anyway?]

+[You are going to remove all the contacts associated with this metacontact.\nThis will delete the metacontact.\n\nProceed anyway?]

 ;file \src\modules\metacontacts\meta_addto.cpp

-[Either there is no MetaContact in the database (in this case you should first convert a contact into one)\nor there is none that can host this contact.\nAnother solution could be to convert this contact into a new MetaContact.\n\nConvert this contact into a new MetaContact?]

-[This contact is a MetaContact.\nYou can't add a MetaContact to another MetaContact.\n\nPlease choose another.]

-[MetaContact Conflict]

-[This contact is already associated to a MetaContact.\nYou cannot add a contact to multiple MetaContacts.]

-[Multiple MetaContacts]

-[No suitable MetaContact found]

+[Either there is no metacontact in the database (in this case you should first convert a contact into one)\nor there is none that can host this contact.\nAnother solution could be to convert this contact into a new metacontact.\n\nConvert this contact into a new metacontact?]

+[This contact is a metacontact.\nYou can't add a metacontact to another metacontact.\n\nPlease choose another.]

+[Metacontact conflict]

+[This contact is already associated to a metacontact.\nYou cannot add a contact to multiple metacontacts.]

+[Multiple metacontacts]

+[No suitable metacontact found]

 [a contact]

 [Adding %s...]

-[Please select a MetaContact]

-[No MetaContact selected]

-[Assignment to the MetaContact failed.]

+[Please select a metacontact]

+[No metacontact selected]

+[Assignment to the metacontact failed.]

 [Assignment failure]

 ;file \src\modules\metacontacts\meta_edit.cpp

-[(Unknown Contact)]

 [ID]

 [Protocol]

-[Send Offline]

-[Send &Online]

-[Delete MetaContact?]

+[Send offline]

+[Send &online]

+[Delete metacontact?]

 ;file \src\modules\metacontacts\meta_main.cpp

-[Toggle Off]

-[Toggle On]

-[Convert to MetaContact]

-[Add to Existing]

+[Toggle off]

+[Toggle on]

+[Convert to metacontact]

+[Add to existing]

 [Edit]

-[Set to Default]

+[Set to default]

 ;file \src\modules\metacontacts\meta_menu.cpp

-[There was a problem in assigning the contact to the MetaContact]

-[This will remove the MetaContact permanently.\n\nProceed Anyway?]

+[There was a problem in assigning the contact to the metacontact]

+[This will remove the metacontact permanently.\n\nProceed anyway?]

 [Are you sure?]

 [Remove from metacontact]

-[Toggle MetaContacts Off]

-[Toggle MetaContacts On]

-[Add to existing MetaContact...]

-[Edit MetaContact...]

-[Set as MetaContact default]

-[Delete MetaContact]

+[Toggle metacontacts off]

+[Toggle metacontacts on]

+[Add to existing metacontact...]

+[Edit metacontact...]

+[Set as metacontact default]

+[Delete metacontact]

 [Subcontacts]

 ;file \src\modules\metacontacts\meta_options.cpp

-[MetaContacts]

+[Metacontacts]

 ;file \src\modules\metacontacts\meta_services.cpp

 [No online contacts found.]

 ;file \src\modules\metacontacts\meta_utils.cpp

 [Sender]

-[Could not retreive contact protocol]

+[Could not retrieve contact protocol]

 [Assignment error]

 [Could not get unique ID of contact]

-[Contact is 'Not on List' - please add the contact to your contact list before assigning.]

-[MetaContact is full]

-[Could not write contact protocol to MetaContact]

-[Could not write unique ID of contact to MetaContact]

-[Could not write nickname of contact to MetaContact]

+[Contact is 'not on list' - please add the contact to your contact list before assigning.]

+[Metacontact is full]

+[Could not write contact protocol to metacontact]

+[Could not write unique ID of contact to metacontact]

+[Could not write nickname of contact to metacontact]

 ;file \src\modules\netlib\netliblog.cpp

 [Standard netlib log]

 [No times]

@@ -1295,7 +1293,7 @@
 [No messaging plugins loaded. Please install/enable one of the messaging plugins, for instance, "StdMsg.dll"]

 ['%s' is disabled, re-enable?]

 [Re-enable Miranda plugin?]

-[Unable to load plugin in Service Mode!]

+[Unable to load plugin in service mode!]

 [Unable to start any of the installed contact list plugins, I even ignored your preferences for which contact list couldn't load any.]

 [Can't find a contact list plugin! You need StdClist or any other contact list plugin.]

 ;file \src\modules\plugins\pluginopts.cpp