a user now has the option to disable reshare email notifications

app/models/user_preference.rb

@@ -9,7 +9,8 @@ class UserPreference < ActiveRecord::Base
    "private_message",
    "started_sharing",
    "also_commented",
-   "liked"]
+   "liked",
+   "reshared"]
 
   def must_be_valid_email_type
     unless VALID_EMAIL_TYPES.include?(self.email_type)

app/views/users/edit.html.haml

@@ -109,6 +109,10 @@
           = type.label t('.liked') 
           = type.check_box :liked, {:checked =>  @email_prefs['liked']}, false, true 
 
+        %br
+        %p.checkbox_select
+          = type.label t('.reshared') 
+          = type.check_box :reshared, {:checked =>  @email_prefs['reshared']}, false, true 
     %br
     = f.submit t('.change')
 

config/locales/diaspora/en.yml

@@ -795,6 +795,7 @@ en:
       started_sharing: "...someone starts sharing with you?"
       private_message: "...you receive a private message?"
       liked: "...someone likes your post?"
+      reshared: "...someone reshares your post?"
       change: "Change"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}."
     destroy: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."