Merge pull request #3128 from m4tze/master

email-invitation translation error in subject and body

app/mailers/notifier.rb

@@ -40,7 +40,7 @@ class Notifier < ActionMailer::Base
     @invitation_code = invitation_code
 
     mail_opts = {:to => email, :from => AppConfig[:smtp_sender_address],
-                 :subject => I18n.t('notifier.invited!'),  
+                 :subject => I18n.t('notifier.invited_you', :name => @inviter.person.name),  
                  :host => AppConfig[:pod_uri].host}
 
     I18n.with_locale(locale) do

config/locales/diaspora/de.yml

@@ -488,7 +488,6 @@ de:
           Klick auf diesen Link um loszulegen
 
           %{invite_url}
-          <%= invite_code_url(@invitation_code)%>
 
 
           Alles Liebe,
@@ -1016,4 +1015,4 @@ de:
   welcome: "Willkommen!"
   will_paginate:
     next_label: "nächstes &raquo;"
-    previous_label: "&laquo; voriges"
+    previous_label: "&laquo; voriges"