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

app/views/notifications/index.html.haml

@@ -17,7 +17,7 @@
   = image_tag 'icons/mail_big.png', :height => 30, :width => 30, :style=>"margin-top:3px;"
 .span-23.last
   %h2
-    Notifications
+    = t('.notifications')
 
 .span-24.last
   %ul.stream.notifications

config/locales/diaspora/en.yml

@@ -186,6 +186,8 @@ en:
       new_request: "offered to share with you."
       comment_on_post: "commented on your"
       post: 'post'
+      index:
+        notifications: "Notifications"
   users:
       edit:
           export_data: "Export Data"