Delete a stray file, some cleanup

app/models/user.rb

@@ -190,7 +190,7 @@ class User < ActiveRecord::Base
     build_relayable(Like, options)
   end
 
-  # Check whether the user has liked a post.  Extremely inefficient if the post's likes are not loaded.
+  # Check whether the user has liked a post.
   # @param [Post] post
   def liked?(target)
     if target.likes.loaded?
@@ -204,7 +204,7 @@ class User < ActiveRecord::Base
     end
   end
 
-  # Get the user's like of a post, if there is one.  Extremely inefficient if the post's likes are not loaded.
+  # Get the user's like of a post, if there is one.
   # @param [Post] post
   # @return [Like]
   def like_for(target)

app/views/devise/mailer/_batch_invites.html.yml

@@ -1,10 +0,0 @@
-%p
-  You have been invited to Diaspora, an open social web.  We are building an interface to the social web that keeps sharing intuitive while putting it in context, making it easy to know who you are sharing with.
-  We are elated to offer you a first glimpse of our Alpha release. 
-  We know there still are bugs and missing features, but we are excited by the progress we made in these short months.
-
-  We would love your feedback, as it is the users of Diaspora which should drive what it becomes.
-
-  For suggestions, feature requests, or bug reports, please use the "Feedback" link found on the left side of the page.  
-
-  Find more details on what what we have released

config/locales/diaspora/en.yml

@@ -602,11 +602,11 @@ en:
     reshare:
       reshare_original: "Reshare original"
       reshare:
-        zero: "Reshare"
-        one: "1 Reshare"
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        other: "%{count} Reshares"
+        zero: "reshare"
+        one: "1 reshare"
+        few: "%{count} reshares"
+        many: "%{count} reshares"
+        other: "%{count} reshares"
       show_original: "Show original"
       reshare_confirmation: "Reshare %{author}'s post?"
       deleted: "Original post deleted by author."