From ac738df8f5552ce211e5e01adc147b1a1f2e03fb Mon Sep 17 00:00:00 2001
From: danielgrippi <daniel@joindiaspora.com>
Date: Tue, 8 Mar 2011 19:22:49 -0800
Subject: [PATCH] added missing translation

---
 Gemfile.lock                       | 8 ++++----
 app/views/conversations/index.haml | 9 +++++++--
 config/locales/diaspora/en.yml     | 1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4c4048569..34fd88c9c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -206,7 +206,7 @@ GEM
       yui-compressor (>= 0.9.1)
     json (1.4.6)
     json_pure (1.5.1)
-    launchy (0.3.7)
+    launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
     linecache (0.43)
@@ -323,7 +323,7 @@ GEM
     rspec-core (2.5.1)
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-instafail (0.1.6)
+    rspec-instafail (0.1.7)
     rspec-mocks (2.5.0)
     rspec-rails (2.5.0)
       actionpack (~> 3.0)
@@ -343,7 +343,7 @@ GEM
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
     selenium-client (1.2.18)
-    selenium-rc (2.3.1)
+    selenium-rc (2.3.2)
       selenium-client (>= 1.2.18)
     selenium-webdriver (0.1.3)
       childprocess (~> 0.1.5)
@@ -351,7 +351,7 @@ GEM
       json_pure
       rubyzip
     simple_oauth (0.1.4)
-    sinatra (1.1.3)
+    sinatra (1.2.0)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
     subexec (0.0.4)
diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml
index 7962d6c84..1214816b5 100644
--- a/app/views/conversations/index.haml
+++ b/app/views/conversations/index.haml
@@ -25,8 +25,13 @@
         = render :partial => 'conversations/conversation', :collection => @conversations, :locals => {:authors => @authors, :unread_counts => @unread_counts}
       = will_paginate @conversations
     - else
-      %i
-        = t('.you_have_no_new_messages')
+      %br
+      %br
+      %br
+      %br
+      %div{:style => 'text-align:center;'}
+        %i
+          = t('.no_messages')
 
 #conversation_show.span-16.prepend-8.last
   - if @conversation
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index a5f0f617e..f0a7d1802 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -533,6 +533,7 @@ en:
           new_message: "New Message"
           no_conversation_selected: "no conversation selected"
           create_a_new_message: "create a new message"
+          no_messages: "no messages"
       show:
           reply: 'reply'
       new: