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

This commit is contained in:
maxwell 2010-10-15 11:29:31 -07:00
commit 6a7538b273

View file

@ -75,8 +75,8 @@ en:
nobody: "We know you have friends, bring them to Diaspora!"
nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
add_friend: "Add a friend"
add_friend_to: "Add a someone to %{aspect_name}"
invite: "Invite a someone to join Diaspora!"
add_friend_to: "Add someone to %{aspect_name}"
invite: "Invite someone to join Diaspora!"
manage:
add_a_new_aspect: "Add a new aspect"
add_a_new_friend: "Add a new friend"