diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2014-03-03 10:44:18 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2014-03-03 10:44:18 +0000 |
| commit | 3997da2ac44e84d6eaa5ea83c50346ec69571e47 (patch) | |
| tree | c3388e499b2d3f721c64b6b751d2eb3de65371b0 /langpacks/english | |
| parent | 2a7890c474286986bb379c8a50da1efd69cee578 (diff) | |
- langpacks/english: update;
- langpacks/russian: update;
git-svn-id: http://svn.miranda-ng.org/main/trunk@8371 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
| -rw-r--r-- | langpacks/english/=CORE=.txt | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index e71ae48b0f..9e4dac9af7 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -1259,8 +1259,6 @@ [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?]
@@ -1275,6 +1273,7 @@ [Subcontacts]
;file \src\modules\metacontacts\meta_options.cpp
[<default>]
+[MetaContacts]
[Priorities]
[History]
;file \src\modules\metacontacts\meta_services.cpp
@@ -1282,9 +1281,8 @@ [No online contacts found.]
;file \src\modules\metacontacts\meta_utils.cpp
[Sender]
-[Could not get MetaContact ID]
-[Assignment error]
[Could not retreive MetaContact contact count]
+[Assignment error]
[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.]
@@ -1292,15 +1290,7 @@ [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]
|