From 2bedd31fe4d12a073c5aa9ec0919cbdcccea1223 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Sun, 9 Mar 2014 15:17:36 +0000
Subject: cleanup

git-svn-id: http://svn.miranda-ng.org/main/trunk@8506 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 langpacks/english/=CORE=.txt | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'langpacks/english/=CORE=.txt')

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 4acfd5afe5..857311016c 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -238,9 +238,6 @@
 [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]
@@ -252,10 +249,7 @@
 [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]
@@ -266,11 +260,6 @@
 [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]
@@ -1275,7 +1264,6 @@
 [<default>]
 [MetaContacts]
 [Priorities]
-[History]
 ;file \src\modules\metacontacts\meta_services.cpp
 [No online contacts found.]
 ;file \src\modules\metacontacts\meta_utils.cpp
@@ -1371,6 +1359,7 @@
 [Group (closed)]
 [Connecting]
 [User details]
+[History]
 [Down arrow]
 [Find user]
 [SMS]
-- 
cgit v1.2.3