From 584684560ec66b8a4596f88c9c5111ce8b16a1cc Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Wed, 9 Mar 2011 17:58:29 -0800
Subject: [PATCH] Make conversation delete clearer

---
 app/views/conversations/_show.haml | 4 ++--
 config/locales/diaspora/en.yml     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/conversations/_show.haml b/app/views/conversations/_show.haml
index 9e71f45b7..0d7e7c187 100644
--- a/app/views/conversations/_show.haml
+++ b/app/views/conversations/_show.haml
@@ -8,10 +8,10 @@
     .span-9
       %h3
         = conversation.subject
-        
+
       .conversation_controls
         = link_to (image_tag('reply.png', :height => 14, :width => 14) + ' ' + t('.reply')), '#', :id => 'reply_to_conversation'
-        = link_to (image_tag('deletelabel.png') + ' ' + t('delete').downcase), conversation_conversation_visibility_path(conversation), :method => 'delete', :confirm => t('are_you_sure')
+        = link_to (image_tag('deletelabel.png') + ' ' + t('.delete').downcase), conversation_conversation_visibility_path(conversation), :method => 'delete', :confirm => t('are_you_sure')
 
     .span-6.avatars.last
       - for participant in conversation.participants
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 03703fb7e..6ed7bfa9d 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -538,6 +538,7 @@ en:
           no_messages: "no messages"
       show:
           reply: "reply"
+          delete:"delete and block conversation"
       new:
           to: "to"
           subject: "subject"