- langpacks/english: update;

- langpacks/russian: update;





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

1 files changed, 116 insertions, 6 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index e35cfec19b..d3f5e93fc3 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -225,6 +225,52 @@
 [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:]

+[&OK]

+[Sort Alphabetically]

+[Editing]

+[Information]

+[Contacts]

+[&Remove]

+[&Set as Default]

+[Move &Up]

+[Move &Down]

+[Force use of default for sending (even if offline)]

+[Send &Offline]

+[Set default contact on receipt of message]

+[Always send to default contact if not offline]

+[Suppress status notification for subcontacts]

+[Context Menu]

+[Use contact's unique ID]

+[Use contact's display name]

+[Contact Labels]

+[Function]

+[Set default and open message window]

+[Show subcontact context menu]

+[Show user information]

+[Contact List]

+[Display subcontact nickname]

+[Display subcontact display name]

+[Use subcontact message windows]

+[Copy subcontact data]

+[Lock name to first contact]

+[but only for the current conversation]

+[History Copy]

+[Please wait while the contact's history is copied.]

+[History Remove]

+[Please wait while the contact's history is removed.]

+[Subcontact Priorities]

+[Rank:]

+[Status:]

+[Protocol:]

+[Reset All]

+[(Lower ranks are preferred)]

+[Copy subcontact history to MetaContact when creating or adding]

+[Number of days to copy (0=all):]

+[Keep MetaContact history synchronized with subcontacts]

+[Keep subcontact history synchronized with MetaContact]

+[History (** beware - change at your own risk **)]

 [Tray]

 [&Hide/Show]

 [E&xit]

@@ -294,7 +340,6 @@
 [Users leaving]

 [Topic changes]

 [Status changes]

-[Information]

 [Disconnects]

 [User kicks]

 [Notices]

@@ -1059,7 +1104,6 @@
 [Custom status]

 [%s (locked)]

 [Status menu]

-[%s\t%s]

 [Main menu]

 ;file \src\modules\clist\clistsettings.cpp

 [(Unknown contact)]

@@ -1187,7 +1231,76 @@
 [Icon sets]

 ;file \src\modules\ignore\ignore.cpp

 [** All contacts **]

-[Contacts]

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

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

+[a contact]

+[Adding %s...]

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

+[Delete MetaContact?]

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

+[Toggle Off]

+[Toggle On]

+[Convert to MetaContact]

+[Add to Existing]

+[Edit]

+[Set to Default]

+[Error - Database corruption.\nPlugin disabled.]

+[MetaContacts]

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

+[Are you sure?]

+[Remove from MetaContact]

+[Toggle MetaContacts On]

+[Toggle MetaContacts Off]

+[Add to existing MetaContact...]

+[Edit MetaContact...]

+[Set as MetaContact default]

+[Delete MetaContact]

+[Context]

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

+[<default>]

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

+[Meta ID]

+[No online contacts found.]

+[Priorities]

+[History]

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

+[Sender]

+[Could not get MetaContact ID]

+[Assignment error]

+[Could not retreive MetaContact contact count]

+[Could not retreive contact protocol]

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

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

+[Meta ID: ]

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

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

+[MetaContacts Warning]

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

 [No times]

 [Standard hh:mm:ss times]

@@ -1236,11 +1349,9 @@
 [Account error]

 [Account is disabled. Please activate it to access options.]

 [New account]

-[Edit]

 [Remove account]

 [Configure...]

 [Upgrade account]

-[Protocol]

 [Account ID]

 [<unknown>]

 [Protocol is not loaded.]

@@ -1272,7 +1383,6 @@
 [Group (closed)]

 [Connecting]

 [User details]

-[History]

 [Down arrow]

 [Find user]

 [SMS]