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

2011-07-26 10:27:45 +02:00 · 2011-07-26 10:27:45 +02:00 · 0237c54452
commit 0237c54452
parent 835005ef02 e65dd78765
2 changed files with 2 additions and 1 deletions
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@ -29,7 +29,7 @@
          - else
            %li
              %span.new_aspect
-                No tags
+                = t('aspects.index.no_tags')

 .span-13.append-1
  #aspect_stream_container.stream_container
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@ -149,6 +149,7 @@ en:
    index: 
      your_aspects: "Your Aspects"
      tags_following: "Followed Tags"
+      no_tags: "No tags"
      handle_explanation: "This is your diaspora id. Like an email address, you can give this to people to reach you."
      no_contacts: "No contacts"
      post_a_message: "post a message >>"