- langpacks/en update

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

1 files changed, 14 insertions, 16 deletions

diff --git a/langpacks/en/Plugins/MetaContacts.txt b/langpacks/en/Plugins/MetaContacts.txt
index 0d7edb7a08..b2de46b5ef 100644
--- a/langpacks/en/Plugins/MetaContacts.txt
+++ b/langpacks/en/Plugins/MetaContacts.txt
@@ -31,7 +31,6 @@
 [Contact List]

 [Display subcontact nickname]

 [Display subcontact display name]

-[Hide in status bar and status menu (*requires restart, uncheck to set proto icons)]

 [Use subcontact message windows]

 [Copy subcontact data]

 [Lock name to first contact]

@@ -56,21 +55,30 @@
 [MetaContact Conflict]

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

 [Multiple MetaContacts]

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

 [No suitable MetaContact found]

+[a contact]

 [Adding %s...]

 [Please select a MetaContact]

 [No MetaContact selected]

 [Assignment to the MetaContact failed.]

 [Assignment failure]

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

 ;file \plugins\MetaContacts\src\edit.cpp

+[(Unknown Contact)]

+[Unknown]

 [Yes]

 [Contact]

 [Protocol]

 [Send Offline]

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

 [Delete MetaContact?]

+[None]

+;file \plugins\MetaContacts\src\icons.cpp

+[Toggle Off]

+[Toggle On]

+[Convert to MetaContact]

+[Add to Existing]

+[Edit]

+[Set to Default]

+[Remove]

 ;file \plugins\MetaContacts\src\meta_main.cpp

 [Error - Database corruption.\nPlugin disabled.]

 [MetaContacts]

@@ -79,8 +87,6 @@
 [Error]

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

 [Are you sure?]

-[Unforce Default]

-[Force Default]

 [Delete MetaContact]

 [Remove from MetaContact]

 ;file \plugins\MetaContacts\src\meta_options.cpp

@@ -105,21 +111,15 @@
 [Could not write contact protocol to MetaContact]

 [Could not write unique id of contact to MetaContact]

 [Could not write nickname of contact to MetaContact]

-[Could not write contact status to MetaContact]

-[Could not write contact handle to MetaContact]

-[Could not write contact status string to MetaContact]

-[Could not write MetaContact id to contact]

-[Could not write MetaContact contact number to contact]

-[Could not write contact count to MetaContact]

+[meta_id: ]

+[, contact num: ]

 [Subcontact contact number < 0 - deleting MetaContact]

 [Subcontact contact number (%d) > meta num contacts (%d) - deleting MetaContact]

 [Subcontact's MetaContact not found - deleting MetaContact data]

 [MetaContact number of contacts < 0 - deleting MetaContact]

 [MetaContact default contact number out of range - deleting MetaContact]

 [MetaId: ]

-[MetaContact corrupted - the number of subcontacts is incorrect.\nDelete MetaContact?]

 [MetaContact corrupted - the number of subcontacts is incorrect.\nDeleting MetaContact.]

-[The 'MetaContacts Hidden Group' has been added to your contact list.\n"\r\n							"This is most likely due to server-side contact information. To fix this, so that\n"\r\n							"MetaContacts continues to function correctly, you should:\n"\r\n							"   - disable MetaContacts using the 'Toggle MetaContacts Off' main menu item\n"\r\n							"   - move all contacts out of this group\n"\r\n							"   - synchronize your contacts with the server\n"\r\n							"   - re-enable MetaContacts]

 [MetaContacts Warning]

 [Offline]

 [Online]

@@ -132,5 +132,3 @@
 [On the Phone]

 [Out to Lunch]

 [IDLE]

-[Unknown]

-[(Unknown Contact)]