Merge branch 'master' of github.com:diaspora/diaspora

app/views/people/show.html.haml

@@ -37,5 +37,5 @@
         = render type_partial(post), :post => post unless post.class == Album
       = will_paginate @posts
   - else
-    %h3=t('no posts to display!')
+    %h3= t('.no_posts')
 

config/locales/diaspora/en.yml

@@ -217,6 +217,7 @@ en:
           save: "save"
           are_you_sure: "Are you sure?"
           remove_friend: "remove friend"
+          no_posts: "no posts to display!"
   requests:
       new_request:
           add_a_new_friend_to: "Add a new friend to"