From edbb0bdf07c6dbbb225b5a42cec2682fea4ed835 Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Mon, 22 Nov 2010 14:52:39 -0800
Subject: [PATCH] slightly more discriptive cannot remove the person from the
 last aspect messagge

---
 config/deploy_config.yml       | 2 +-
 config/locales/diaspora/en.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/deploy_config.yml b/config/deploy_config.yml
index 6538e273c..06a6747e1 100644
--- a/config/deploy_config.yml
+++ b/config/deploy_config.yml
@@ -6,7 +6,7 @@ cross_server:
   deploy_to: '/usr/local/app/diaspora'
   user: 'root'
   repo: 'git://github.com/diaspora/diaspora.git'
-  branch: 'homepage'
+  branch: 'master'
   default_env: 'development'
 servers:
   tom:
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 51901b871..58a4e5b4a 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -112,7 +112,7 @@ en:
           new: "New %{type} from %{from}"
       contact_list:
           search_contacts: "Search contacts"
-          cannot_remove: "Cannot remove person from last aspect."
+          cannot_remove: "Cannot remove person from last aspect.(If you want to disconnect from this person you must remove contact.)"
   aspects:
       no_contacts_message:
           nobody: "We know you know people — bring them to Diaspora!"