diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 8d3f1521993..54252012911 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -1462,13 +1462,13 @@ ar:
   unsubscribe_mailer:
     subject_template: "أكّد عدم رغبتك بعد الآن باستقبال تحديثات %{site_title} على البريد"
   invite_mailer:
-    subject_template: "دعاك %{invitee_name} إلى ’%{topic_title}‘ على %{site_domain_name}"
+    subject_template: "دعاك %{inviter_name} إلى ’%{topic_title}‘ على %{site_domain_name}"
   custom_invite_mailer:
-    subject_template: "دعاك %{invitee_name} إلى ’%{topic_title}‘ على %{site_domain_name}"
+    subject_template: "دعاك %{inviter_name} إلى ’%{topic_title}‘ على %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} قام بدعوتك للإنضمام إلى %{site_domain_name}"
+    subject_template: "%{inviter_name} قام بدعوتك للإنضمام إلى %{site_domain_name}"
   custom_invite_forum_mailer:
-    subject_template: "دعاك %{invitee_name} للانضمام إلى %{site_domain_name}"
+    subject_template: "دعاك %{inviter_name} للانضمام إلى %{site_domain_name}"
   invite_password_instructions:
     subject_template: "اضبط كلمة سرّ لحسابك على %{site_name}"
   admin_confirmation_mailer:
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index cef76d0cc95..0138b4b75e2 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -640,9 +640,9 @@ bs_BA:
       not_allowed: "is not allowed from that email provider. Please use another email address."
       blocked: "is not allowed."
   invite_mailer:
-    subject_template: "%{invitee_name} vas poziva da pogledate '%{topic_title}' na sajtu %{site_domain_name}"
+    subject_template: "%{inviter_name} vas poziva da pogledate '%{topic_title}' na sajtu %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} vas poziva da se pridružite %{site_domain_name}"
+    subject_template: "%{inviter_name} vas poziva da se pridružite %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Set password for your %{site_name} account"
   flag_reasons:
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 00b4a61ddee..24876c4bd33 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -1134,13 +1134,13 @@ da:
       Hvis du ønsker at fortsætte med at modtage mailopdateringer, kan du bare ignorere denne mail.
 
   invite_mailer:
-    subject_template: "%{invitee_name} inviterede dig til '%{topic_title}' på %{site_domain_name}"
+    subject_template: "%{inviter_name} inviterede dig til '%{topic_title}' på %{site_domain_name}"
   custom_invite_mailer:
-    subject_template: "%{invitee_name} inviterede dig til '%{topic_title}' på %{site_domain_name}"
+    subject_template: "%{inviter_name} inviterede dig til '%{topic_title}' på %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} inviterede dig til at oprette dig på %{site_domain_name}"
+    subject_template: "%{inviter_name} inviterede dig til at oprette dig på %{site_domain_name}"
   custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} inviterede dig til at oprette dig på %{site_domain_name}"
+    subject_template: "%{inviter_name} inviterede dig til at oprette dig på %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Opret password til din %{site_name}-konto"
     text_body_template: |
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 571a9f38f0a..33c9460c408 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -1572,9 +1572,9 @@ de:
       Wenn du weiterhin E-Mail-Aktualisierungen erhalten möchtest, kannst du diese E-Mail ignorieren.
   invite_mailer:
     title: "Einladung zu einem Thema"
-    subject_template: "%{invitee_name} hat dich zum Thema '%{topic_title}' auf %{site_domain_name} eingeladen"
+    subject_template: "%{inviter_name} hat dich zum Thema '%{topic_title}' auf %{site_domain_name} eingeladen"
     text_body_template: |
-      %{invitee_name} hat dich eingeladen zur Diskussion
+      %{inviter_name} hat dich eingeladen zur Diskussion
 
       > **%{topic_title}**
       >
@@ -1589,9 +1589,9 @@ de:
       %{invite_link}
   custom_invite_mailer:
     title: "Einladung zu einem Thema (mit Nachricht)"
-    subject_template: "%{invitee_name} hat dich eingeladen zu '%{topic_title}' auf %{site_domain_name}"
+    subject_template: "%{inviter_name} hat dich eingeladen zu '%{topic_title}' auf %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} hat dich eingeladen zur Diskussion
+      %{inviter_name} hat dich eingeladen zur Diskussion
 
       > **%{topic_title}**
       >
@@ -1610,9 +1610,9 @@ de:
       %{invite_link}
   invite_forum_mailer:
     title: "Einladung zur Teilnahme"
-    subject_template: "%{invitee_name} hat dich eingeladen %{site_domain_name} beizutreten"
+    subject_template: "%{inviter_name} hat dich eingeladen %{site_domain_name} beizutreten"
     text_body_template: |
-      %{invitee_name} hat dich eingeladen, der folgenden Seite beizutreten:
+      %{inviter_name} hat dich eingeladen, der folgenden Seite beizutreten:
 
       > **%{site_title}**
       >
@@ -1623,9 +1623,9 @@ de:
       %{invite_link}
   custom_invite_forum_mailer:
     title: "Einladung zum Forum (mit Nachricht)"
-    subject_template: "%{invitee_name} hat dich eingeladen %{site_domain_name} beizutreten"
+    subject_template: "%{inviter_name} hat dich eingeladen %{site_domain_name} beizutreten"
     text_body_template: |
-      %{invitee_name} hat dich eingeladen der folgenden Seite beizutreten:
+      %{inviter_name} hat dich eingeladen der folgenden Seite beizutreten:
 
       > **%{site_title}**
       >
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 0bf509d2cd3..77e76642394 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -1579,9 +1579,9 @@ el:
       Εάν θέλεις να συνεχίσεις να λαμβάνεις ενημερώσεις με email, μπορείς να αγνοήσεις αυτό το email.
   invite_mailer:
     title: "Αποστολή Προσκλήσεων"
-    subject_template: "Ο/Η %{invitee_name} σε προσκάλεσε στο νήμα '%{topic_title}' στην %{site_domain_name}"
+    subject_template: "Ο/Η %{inviter_name} σε προσκάλεσε στο νήμα '%{topic_title}' στην %{site_domain_name}"
     text_body_template: |
-      Ο/Η %{invitee_name} σας προσκάλεσε σε μία συζήτηση
+      Ο/Η %{inviter_name} σας προσκάλεσε σε μία συζήτηση
 
       > **%{topic_title}**
       >
@@ -1596,9 +1596,9 @@ el:
       %{invite_link}
   custom_invite_mailer:
     title: "Προσαρμοσμένη Αποστολή Προσκλήσεων"
-    subject_template: "Ο/Η %{invitee_name} σε προσκάλεσε στο νήμα '%{topic_title}' στην %{site_domain_name}"
+    subject_template: "Ο/Η %{inviter_name} σε προσκάλεσε στο νήμα '%{topic_title}' στην %{site_domain_name}"
     text_body_template: |
-      Ο/Η %{invitee_name} σας προσκάλεσε σε μία συζήτηση
+      Ο/Η %{inviter_name} σας προσκάλεσε σε μία συζήτηση
 
       > **%{topic_title}**
       >
@@ -1617,9 +1617,9 @@ el:
       %{invite_link}
   invite_forum_mailer:
     title: "Αποστολή Προσκλήσεων Forum"
-    subject_template: "Ο/Η %{invitee_name} σε προσκάλεσε να συμμετέχεις στην %{site_domain_name}"
+    subject_template: "Ο/Η %{inviter_name} σε προσκάλεσε να συμμετέχεις στην %{site_domain_name}"
     text_body_template: |+
-      Ο/Η %{invitee_name} σας προσκάλεσε να γίνετε μέλος
+      Ο/Η %{inviter_name} σας προσκάλεσε να γίνετε μέλος
 
       > **%{site_title}**
       >
@@ -1631,9 +1631,9 @@ el:
 
   custom_invite_forum_mailer:
     title: "Προσαρμογή Πρόσκλησης Forum "
-    subject_template: "Ο/Η %{invitee_name} σε προσκάλεσε να συμμετέχεις στην %{site_domailn_name}"
+    subject_template: "Ο/Η %{inviter_name} σε προσκάλεσε να συμμετέχεις στην %{site_domailn_name}"
     text_body_template: |
-      Ο/Η %{invitee_name} σας προσκάλεσε να γίνετε μέλος
+      Ο/Η %{inviter_name} σας προσκάλεσε να γίνετε μέλος
 
       > **%{site_title}**
       >
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index ebdae901173..8e6cb61f545 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -1512,9 +1512,9 @@ es:
       Si quieres continuar recibiendo actualizaciones por email, por favor ignora este correo.
   invite_mailer:
     title: "Invitar Usuario"
-    subject_template: "%{invitee_name} te invitó a '%{topic_title}' en %{site_domain_name}"
+    subject_template: "%{inviter_name} te invitó a '%{topic_title}' en %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} te ha invitado a un debate
+      %{inviter_name} te ha invitado a un debate
 
       > **%{topic_title}**
       >
@@ -1528,12 +1528,12 @@ es:
       %{invite_link}
   custom_invite_mailer:
     title: "Personalizar Invitar Usuario"
-    subject_template: "%{invitee_name} te ha invitado a '%{topic_title}' en %{site_domain_name}"
+    subject_template: "%{inviter_name} te ha invitado a '%{topic_title}' en %{site_domain_name}"
   invite_forum_mailer:
     title: "Invitación suscripción del foro"
-    subject_template: "%{invitee_name} te invitó a unirte a %{site_domain_name}"
+    subject_template: "%{inviter_name} te invitó a unirte a %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} te ha invitado a unirte a
+      %{inviter_name} te ha invitado a unirte a
 
       > **%{site_title}**
       >
@@ -1546,15 +1546,15 @@ es:
       Esta invitación viene de un usuario en el que confiamos, por lo que se te creará una cuenta automáticamente.
   custom_invite_forum_mailer:
     title: "Invitación suscripción del foro"
-    subject_template: "%{invitee_name} te ha invitado a %{site_domain_name}"
+    subject_template: "%{inviter_name} te ha invitado a %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} te ha invitado a
+      %{inviter_name} te ha invitado a
 
       > **%{site_title}**
       >
       > %{site_description}
 
-      Mensaje de %{invitee_name}:
+      Mensaje de %{inviter_name}:
 
       %{user_custom_message}
 
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index a63c001419d..dc5a9de709c 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -1456,15 +1456,15 @@ fa_IR:
       اگر می‌خواهید ایمیل بروزرسانی دریافت کنید، این ایمیل را نادیده بگیرید.
   invite_mailer:
     title: "دعوت نامه‌رسان"
-    subject_template: "%{invitee_name} شما را به %{topic_title}' در  %{site_domain_name}  دعوت کرده"
+    subject_template: "%{inviter_name} شما را به %{topic_title}' در  %{site_domain_name}  دعوت کرده"
   custom_invite_mailer:
     title: "دعوت سفارشی نامه‌رسان"
-    subject_template: "%{invitee_name} شما را به '%{topic_title}' در %{site_domain_name} دعوت کرده"
+    subject_template: "%{inviter_name} شما را به '%{topic_title}' در %{site_domain_name} دعوت کرده"
   invite_forum_mailer:
     title: "دعوت نامه‌رسان انجمن"
-    subject_template: "%{invitee_name} به عضویت در %{site_domain_name} دعوت شدید"
+    subject_template: "%{inviter_name} به عضویت در %{site_domain_name} دعوت شدید"
     text_body_template: |
-      %{invitee_name} شما را دعوت کرده که به سایت زیر بپیوندید
+      %{inviter_name} شما را دعوت کرده که به سایت زیر بپیوندید
 
       > **%{site_title}**
       >
@@ -1475,9 +1475,9 @@ fa_IR:
       %{invite_link}
   custom_invite_forum_mailer:
     title: "دعوت نامه‌رسان سفارشی انجمن"
-    subject_template: "%{invitee_name} از شما دعوت کرده که به %{site_domain_name} بپیوندید"
+    subject_template: "%{inviter_name} از شما دعوت کرده که به %{site_domain_name} بپیوندید"
     text_body_template: |
-      %{invitee_name} از شما دعوت کرده به سایت زیر بپیوندید
+      %{inviter_name} از شما دعوت کرده به سایت زیر بپیوندید
 
       > **%{site_title}**
       >
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 51172c587eb..b24e631dc95 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -1544,9 +1544,9 @@ fi:
       Jos haluat jatkossakin saada sähköposti-ilmoituksia, voit jättää tämän viestin huomiotta.
   invite_mailer:
     title: "Kutsu keskusteluun"
-    subject_template: "%{invitee_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}"
+    subject_template: "%{inviter_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} kutsui sinut keskusteluun
+      %{inviter_name} kutsui sinut keskusteluun
 
       > **%{topic_title}**
       >
@@ -1561,9 +1561,9 @@ fi:
       %{invite_link}
   custom_invite_mailer:
     title: "Kutsu keskusteluun saatesanoilla"
-    subject_template: "%{invitee_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}"
+    subject_template: "%{inviter_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} kutsui sinut keskusteluun
+      %{inviter_name} kutsui sinut keskusteluun
 
       > **%{topic_title}**
       >
@@ -1582,9 +1582,9 @@ fi:
       %{invite_link}
   invite_forum_mailer:
     title: "Kutsu palstalle"
-    subject_template: "%{invitee_name} kutsui sinut sivustolle %{site_domain_name}"
+    subject_template: "%{inviter_name} kutsui sinut sivustolle %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} kutsui sinut liittymään sivustolle
+      %{inviter_name} kutsui sinut liittymään sivustolle
 
       > **%{site_title}**
       >
@@ -1595,9 +1595,9 @@ fi:
       %{invite_link}
   custom_invite_forum_mailer:
     title: "Kutsu palstalle saatesanoilla"
-    subject_template: "%{invitee_name} kutsui sinut sivustolle %{site_domain_name}"
+    subject_template: "%{inviter_name} kutsui sinut sivustolle %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} kutsui sinut liittymään sivustolle
+      %{inviter_name} kutsui sinut liittymään sivustolle
 
       > **%{site_title}**
       >
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 7a01989512d..66872c95943 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -1542,9 +1542,9 @@ fr:
       Si vous souhaitez continuer à recevoir ces emails, vous pouvez ignorer ce message.
   invite_mailer:
     title: "Invitiation"
-    subject_template: "%{invitee_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
+    subject_template: "%{inviter_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} vous a invité(e) à une discussion
+      %{inviter_name} vous a invité(e) à une discussion
 
       > **%{topic_title}**
       >
@@ -1559,9 +1559,9 @@ fr:
       %{invite_link}
   custom_invite_mailer:
     title: "Invitation personnalisée"
-    subject_template: "%{invitee_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
+    subject_template: "%{inviter_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} vous a invité(e) à une discussion
+      %{inviter_name} vous a invité(e) à une discussion
 
       > **%{topic_title}**
       >
@@ -1580,9 +1580,9 @@ fr:
       %{invite_link}
   invite_forum_mailer:
     title: "Invitation sur le forum"
-    subject_template: "%{invitee_name} vous a invité(e) à rejoindre %{site_domain_name}"
+    subject_template: "%{inviter_name} vous a invité(e) à rejoindre %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} vous invite à rejoindre :
+      %{inviter_name} vous invite à rejoindre :
 
       > **%{site_title}**
       >
@@ -1593,9 +1593,9 @@ fr:
       %{invite_link}
   custom_invite_forum_mailer:
     title: "Invitation personnalisée sur le forum"
-    subject_template: "%{invitee_name} vous a invité(e) à rejoindre %{site_domain_name}"
+    subject_template: "%{inviter_name} vous a invité(e) à rejoindre %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} vous invite à rejoindre :
+      %{inviter_name} vous invite à rejoindre :
 
       > **%{site_title}**
       >
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 33432a2566a..cf317e95906 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -1517,15 +1517,15 @@ he:
       אם אתם מעוניינים להמשיך לקבל עדכוני מייל, אתם יכולים להתעלם ממייל זה.
   invite_mailer:
     title: "שולח-מיילים להזמנה"
-    subject_template: "הוזמנת על ידי %{invitee_name} ל '%{topic_title}' ב%{site_domain_name}"
+    subject_template: "הוזמנת על ידי %{inviter_name} ל '%{topic_title}' ב%{site_domain_name}"
   custom_invite_mailer:
     title: "שולח-מיילים מותאם-אישית להזמנה"
-    subject_template: "%{invitee_name} הזמין/הזמינה אותך לדיון  '%{topic_title}' באתר %{site_domain_name}"
+    subject_template: "%{inviter_name} הזמין/הזמינה אותך לדיון  '%{topic_title}' באתר %{site_domain_name}"
   invite_forum_mailer:
     title: "שולח-מיילים להזמנה לפורום"
-    subject_template: "%{invitee_name} הזמינ/ה אתכם להצטרף ל%{site_domain_name}"
+    subject_template: "%{inviter_name} הזמינ/ה אתכם להצטרף ל%{site_domain_name}"
     text_body_template: |
-      %{invitee_name} הזמין/ה אתכם להצטרף
+      %{inviter_name} הזמין/ה אתכם להצטרף
 
       > **%{site_title}**
       >
@@ -1536,9 +1536,9 @@ he:
       %{invite_link}
   custom_invite_forum_mailer:
     title: "דואר הזמנה לפורום מותאם אישית"
-    subject_template: "%{invitee_name} הזמין/ה אתכם להצטרף ל %{site_domain_name}"
+    subject_template: "%{inviter_name} הזמין/ה אתכם להצטרף ל %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} הזמין/ה אתכם להצטרף
+      %{inviter_name} הזמין/ה אתכם להצטרף
 
       > **%{site_title}**
       >
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 4e8e627bcf7..b9e4f57617e 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -1574,9 +1574,9 @@ it:
       Se desideri continuare a ricevere aggiornamenti via email, puoi ignorare questa email.
   invite_mailer:
     title: "Mailer Invito"
-    subject_template: "%{invitee_name} ti ha invitato a '%{topic_title}' su %{site_domain_name}"
+    subject_template: "%{inviter_name} ti ha invitato a '%{topic_title}' su %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} ti ha invitato alla discussione
+      %{inviter_name} ti ha invitato alla discussione
 
       > **%{topic_title}**
       >
@@ -1591,9 +1591,9 @@ it:
       %{invite_link}
   custom_invite_mailer:
     title: "Mailer Invito Personalizzato"
-    subject_template: "%{invitee_name} ti ha invitato a '%{topic_title}' su %{site_domain_name}"
+    subject_template: "%{inviter_name} ti ha invitato a '%{topic_title}' su %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} ti ha invitato alla discussione
+      %{inviter_name} ti ha invitato alla discussione
 
       > **%{topic_title}**
       >
@@ -1612,9 +1612,9 @@ it:
       %{invite_link}
   invite_forum_mailer:
     title: "Mailer Invito Forum"
-    subject_template: "%{invitee_name} ti invita a partecipare su %{site_domain_name}"
+    subject_template: "%{inviter_name} ti invita a partecipare su %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} ti ha invitato ad unirti a
+      %{inviter_name} ti ha invitato ad unirti a
 
       > **%{site_title}**
       >
@@ -1625,9 +1625,9 @@ it:
       %{invite_link}
   custom_invite_forum_mailer:
     title: "Mailer Invito Forum Personalizzato"
-    subject_template: "%{invitee_name} ti ha invitato ad unirti a %{site_domain_name}"
+    subject_template: "%{inviter_name} ti ha invitato ad unirti a %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} ti ha invitato ad unirti a
+      %{inviter_name} ti ha invitato ad unirti a
 
       > **%{site_title}**
       >
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 40aef301855..fbf3e9c580b 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -929,9 +929,9 @@ ja:
     subject_template:
       other: "%{count}件の通報が対応待ちです"
   invite_mailer:
-    subject_template: "%{invitee_name} があなたを %{site_domain_name}の'%{topic_title}'に招待しました"
+    subject_template: "%{inviter_name} があなたを %{site_domain_name}の'%{topic_title}'に招待しました"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} あなたを %{site_domain_name}に招待しました。"
+    subject_template: "%{inviter_name} あなたを %{site_domain_name}に招待しました。"
   invite_password_instructions:
     subject_template: "%{site_name} アカウントのパスワードを設定"
   flag_reasons:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index d673cf488d8..08462cf7803 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -1334,9 +1334,9 @@ ko:
   unsubscribe_mailer:
     title: "메일링 구독해지"
   invite_mailer:
-    subject_template: "%{invitee_name} 회원님이 %{site_domain_name} 에 '%{topic_title}'에 초대하였습니다."
+    subject_template: "%{inviter_name} 회원님이 %{site_domain_name} 에 '%{topic_title}'에 초대하였습니다."
   invite_forum_mailer:
-    subject_template: "%{site_domain_name}의 %{invitee_name}님께서 당신을 초대하였습니다."
+    subject_template: "%{site_domain_name}의 %{inviter_name}님께서 당신을 초대하였습니다."
   invite_password_instructions:
     subject_template: "%{site_name} 계정을 위해 비밀번호 설정"
   flag_reasons:
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 65470cf79f3..85536e163cc 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -1365,9 +1365,9 @@ nl:
       one: "Eén vlag af te handelen"
       other: "%{count} vlaggen af te handelen"
   invite_mailer:
-    subject_template: "%{invitee_name} nodigt je uit voor '%{topic_title}' op %{site_domain_name}"
+    subject_template: "%{inviter_name} nodigt je uit voor '%{topic_title}' op %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} heeft je uitgenodigd voor %{site_domain_name}"
+    subject_template: "%{inviter_name} heeft je uitgenodigd voor %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Geeft wachtwoord voor je %{site_name} account"
   flag_reasons:
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index fee4fa3c7f4..edc1f073f89 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -1609,9 +1609,9 @@ pl_PL:
       Jeśli nadal chcesz otrzymywać powiadomienia mailowe, po prostu zignoruj ten mail.
   invite_mailer:
     title: "Zaproś mailera"
-    subject_template: "%{invitee_name} zaprosił cię do '%{topic_title}' na %{site_domain_name}"
+    subject_template: "%{inviter_name} zaprosił cię do '%{topic_title}' na %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} zaprosił cię do dyskusji
+      %{inviter_name} zaprosił cię do dyskusji
 
       > **%{topic_title}**
       >
@@ -1626,9 +1626,9 @@ pl_PL:
       %{invite_link}
   custom_invite_mailer:
     title: "Niestandardowe zaproszenie mailera"
-    subject_template: "%{invitee_name} zaprosił cię do dyskusji '%{topic_title}' w serwisie %{site_domain_name}"
+    subject_template: "%{inviter_name} zaprosił cię do dyskusji '%{topic_title}' w serwisie %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} zaprosił cię do dyskusji
+      %{inviter_name} zaprosił cię do dyskusji
 
       > **%{topic_title}**
       >
@@ -1647,9 +1647,9 @@ pl_PL:
       %{invite_link}
   invite_forum_mailer:
     title: "Zaproś forum mailera"
-    subject_template: "%{invitee_name} zaprosił cię do dołączenia do %{site_domain_name}"
+    subject_template: "%{inviter_name} zaprosił cię do dołączenia do %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} zaprosił cię, byś dołączył do serwisu
+      %{inviter_name} zaprosił cię, byś dołączył do serwisu
 
       > **%{site_title}**
       >
@@ -1660,9 +1660,9 @@ pl_PL:
       %{invite_link}
   custom_invite_forum_mailer:
     title: "Niestandardowe zaproszenie forum mailera"
-    subject_template: "%{invitee_name} zaprosił cię, byś dołączył do serwisu %{site_domain_name}"
+    subject_template: "%{inviter_name} zaprosił cię, byś dołączył do serwisu %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} zaprosił cię, byś dołączył do serwisu
+      %{inviter_name} zaprosił cię, byś dołączył do serwisu
 
       > **%{site_title}**
       >
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 56844fd0e18..b1da3a6bfdd 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -1373,13 +1373,13 @@ pt:
   unsubscribe_mailer:
     subject_template: "Confirme que não quer receber emails com actualizações de %{site_title}"
   invite_mailer:
-    subject_template: "%{invitee_name} convidou-o a juntar-se a '%{topic_title}' em %{site_domain_name}"
+    subject_template: "%{inviter_name} convidou-o a juntar-se a '%{topic_title}' em %{site_domain_name}"
   custom_invite_mailer:
-    subject_template: "%{invitee_name} convidou-o para '%{topic_title}' em %{site_domain_name}"
+    subject_template: "%{inviter_name} convidou-o para '%{topic_title}' em %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} convidou-o a juntar-se a %{site_domain_name}"
+    subject_template: "%{inviter_name} convidou-o a juntar-se a %{site_domain_name}"
   custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} convidou-o para %{site_domain_name}"
+    subject_template: "%{inviter_name} convidou-o para %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Configurar a palavra-passe para a sua conta %{site_name}"
   download_backup_mailer:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 019b0c3a9f2..72649f83811 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -1259,9 +1259,9 @@ pt_BR:
       one: "1 sinalização aguardando a ser controlada"
       other: "%{count} sinalizações aguardando a ser controladas"
   invite_mailer:
-    subject_template: "%{invitee_name} convidou você para '%{topic_title}' em %{site_domain_name}"
+    subject_template: "%{inviter_name} convidou você para '%{topic_title}' em %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} convidou você para participar de %{site_domain_name}"
+    subject_template: "%{inviter_name} convidou você para participar de %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Defina uma senha para a sua %{site_name}  conta"
   flag_reasons:
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 81379337b2b..0d6b4556570 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -1398,13 +1398,13 @@ ro:
   unsubscribe_mailer:
     subject_template: "Confirmă că nu mai vrei să primești actualizări pe email de la %{site_title}"
   invite_mailer:
-    subject_template: "%{invitee_name} te-a invitat la subiectul '%{topic_title}' pe %{site_domain_name}"
+    subject_template: "%{inviter_name} te-a invitat la subiectul '%{topic_title}' pe %{site_domain_name}"
   custom_invite_mailer:
-    subject_template: "%{invitee_name} te-a invitat la subiectul '%{topic_title}' pe  %{site_domain_name}"
+    subject_template: "%{inviter_name} te-a invitat la subiectul '%{topic_title}' pe  %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} te-a invitat să te alături pe %{site_domain_name}"
+    subject_template: "%{inviter_name} te-a invitat să te alături pe %{site_domain_name}"
   custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} te-a invitat să te alături pe %{site_domain_name}"
+    subject_template: "%{inviter_name} te-a invitat să te alături pe %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Setează parolă pentru contul tău %{site_name}"
   test_mailer:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index dac234a4947..d183b71f81b 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -1307,11 +1307,11 @@ ru:
   unsubscribe_mailer:
     subject_template: "Подтвердите, что вы больше не желаете получать обновления по электронной почте от %{site_title}"
   invite_mailer:
-    subject_template: "%{invitee_name} приглашает вас присоединиться к '%{topic_title}' на сайте %{site_domain_name}"
+    subject_template: "%{inviter_name} приглашает вас присоединиться к '%{topic_title}' на сайте %{site_domain_name}"
   custom_invite_mailer:
-    subject_template: "%{invitee_name} приглашает Вас присоединиться к '%{topic_title}' на сайте %{site_domain_name}"
+    subject_template: "%{inviter_name} приглашает Вас присоединиться к '%{topic_title}' на сайте %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} приглашает вас присоединиться к %{site_domain_name}"
+    subject_template: "%{inviter_name} приглашает вас присоединиться к %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Задайте пароль для вашей учетной записи на сайте %{site_name}"
   flag_reasons:
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index 8d4d6df9007..3c1167d0d92 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -1154,9 +1154,9 @@ sk:
   unsubscribe_mailer:
     subject_template: "Potvrďte, že už ďalej nechcete dostávať aktualizácie z  %{site_title}"
   invite_mailer:
-    subject_template: "%{invitee_name} Vás pozval '%{topic_title}' na %{site_domain_name}"
+    subject_template: "%{inviter_name} Vás pozval '%{topic_title}' na %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} Vás pozval na %{site_domain_name}"
+    subject_template: "%{inviter_name} Vás pozval na %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Nastavte heslo pre účet na  %{site_name}"
   flag_reasons:
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 49c82d02ece..0852a1c4c93 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -927,11 +927,11 @@ sq:
       one: "1 sinjalizim në pritje për t'u trajtuar"
       other: "%{count} sinjalizime në pritje për t'u trajtuar"
   invite_mailer:
-    subject_template: "%{invitee_name} ju ftoi tek tema '%{topic_title}' tek %{site_domain_name}"
+    subject_template: "%{inviter_name} ju ftoi tek tema '%{topic_title}' tek %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} ju ka ftuar të bëheni pjesë e %{site_domain_name}"
+    subject_template: "%{inviter_name} ju ka ftuar të bëheni pjesë e %{site_domain_name}"
   custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} ju ka ftuar të bëheni pjesë e %{site_domain_name}"
+    subject_template: "%{inviter_name} ju ka ftuar të bëheni pjesë e %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Vendos fjalëkalimin për llogarinë tek %{site_name}"
   admin_confirmation_mailer:
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 229beda454d..c6b38fa1ad4 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -1314,15 +1314,15 @@ sv:
     subject_template: "Bekräfta att du inte längre vill motta e-postuppdateringar från %{site_title}"
   invite_mailer:
     title: "Invitera mail skrivaren"
-    subject_template: "%{invitee_name} har bjudit in dig till '%{topic_title}' på %{site_domain_name}"
+    subject_template: "%{inviter_name} har bjudit in dig till '%{topic_title}' på %{site_domain_name}"
   custom_invite_mailer:
     title: "Kund inviterar mail skrivare"
-    subject_template: "%{invitee_name} har bjudit in dig till '%{topic_title}' på %{site_domain_name}"
+    subject_template: "%{inviter_name} har bjudit in dig till '%{topic_title}' på %{site_domain_name}"
   invite_forum_mailer:
     title: "Invitera forumets skrivare"
-    subject_template: "%{invitee_name} har bjudit in dig till %{site_domain_name}"
+    subject_template: "%{inviter_name} har bjudit in dig till %{site_domain_name}"
   custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} har bjudit in dig till %{site_domain_name}"
+    subject_template: "%{inviter_name} har bjudit in dig till %{site_domain_name}"
   invite_password_instructions:
     title: "Invitera lösenords instruktioner"
     subject_template: "Ange lösenord för ditt konto på %{site_name}"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index b463ead79e9..da50d519766 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -1134,13 +1134,13 @@ tr_TR:
   unsubscribe_mailer:
     subject_template: "%{site_title} üzerinden daha fazla e-posta güncellemesi almak istemediğinizi onaylayın"
   invite_mailer:
-    subject_template: "%{invitee_name}  sizi %{site_domain_name} sitesindeki '%{topic_title}' adlı konuya davet etti. "
+    subject_template: "%{inviter_name}  sizi %{site_domain_name} sitesindeki '%{topic_title}' adlı konuya davet etti. "
   custom_invite_mailer:
-    subject_template: "%{invitee_name} sizi %{site_domain_name} sitesindeki '%{topic_title}' adlı konuya davet etti "
+    subject_template: "%{inviter_name} sizi %{site_domain_name} sitesindeki '%{topic_title}' adlı konuya davet etti "
   invite_forum_mailer:
-    subject_template: "%{invitee_name} sizi %{site_domain_name} sitesine katılmanız için davet etti"
+    subject_template: "%{inviter_name} sizi %{site_domain_name} sitesine katılmanız için davet etti"
   custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} sizi %{site_domain_name} sitesine katılmaya davet etti"
+    subject_template: "%{inviter_name} sizi %{site_domain_name} sitesine katılmaya davet etti"
   invite_password_instructions:
     subject_template: "%{site_name} hesabınız için parola oluşturun"
   new_version_mailer:
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 5241eb852dc..81c8e87f088 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -1080,9 +1080,9 @@ vi:
   unsubscribe_mailer:
     subject_template: "Xác nhận bạn không còn muốn nhận email cập nhật từ %{site_title}"
   invite_mailer:
-    subject_template: "%{invitee_name} mời bạn tham gia chủ đề '%{topic_title}' trên %{site_domain_name}"
+    subject_template: "%{inviter_name} mời bạn tham gia chủ đề '%{topic_title}' trên %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} đã mời bạn gia nhập %{site_domain_name}"
+    subject_template: "%{inviter_name} đã mời bạn gia nhập %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Đặt mật khẩu cho tài khoản của bạn ở %{site_name}"
   flag_reasons:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 81354b34f5a..d430b6eae16 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -1508,9 +1508,9 @@ zh_CN:
       如果你想要继续收到邮件更新，你可以忽略这封邮件。
   invite_mailer:
     title: "要求发件人"
-    subject_template: "%{invitee_name} 邀请你参与 %{site_domain_name} 主题 '%{topic_title}' "
+    subject_template: "%{inviter_name} 邀请你参与 %{site_domain_name} 主题 '%{topic_title}' "
     text_body_template: |
-      %{invitee_name}邀请你参与讨论：
+      %{inviter_name}邀请你参与讨论：
 
       > **%{topic_title}**
       >
@@ -1525,9 +1525,9 @@ zh_CN:
       %{invite_link}
   custom_invite_mailer:
     title: "自定义邀请发件人"
-    subject_template: "%{invitee_name}邀请你'%{topic_title}'在%{site_domain_name}"
+    subject_template: "%{inviter_name}邀请你'%{topic_title}'在%{site_domain_name}"
     text_body_template: |
-      %{invitee_name}邀请你参与讨论：
+      %{inviter_name}邀请你参与讨论：
 
       > **%{topic_title}**
       >
@@ -1546,9 +1546,9 @@ zh_CN:
       %{invite_link}
   invite_forum_mailer:
     title: "邀请论坛发件人"
-    subject_template: "%{invitee_name} 邀请你加入 %{site_domain_name}"
+    subject_template: "%{inviter_name} 邀请你加入 %{site_domain_name}"
     text_body_template: |
-      %{invitee_name}邀请你加入
+      %{inviter_name}邀请你加入
 
       > **%{site_title}**
       >
@@ -1559,9 +1559,9 @@ zh_CN:
       %{invite_link}
   custom_invite_forum_mailer:
     title: "自定义论坛邀请发件人"
-    subject_template: "%{invitee_name}邀请你加入%{site_domain_name}"
+    subject_template: "%{inviter_name}邀请你加入%{site_domain_name}"
     text_body_template: |
-      %{invitee_name}邀请你加入
+      %{inviter_name}邀请你加入
 
       > **%{site_title}**
       >
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 81b711268e6..ca6cc04177a 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -1375,9 +1375,9 @@ zh_TW:
       如果你想要繼續接收郵件更新，你可以直接忽略這封郵件。
   invite_mailer:
     title: "邀請郵件"
-    subject_template: "%{invitee_name} 在 %{site_domain_name} 邀請你參與「%{topic_title}」"
+    subject_template: "%{inviter_name} 在 %{site_domain_name} 邀請你參與「%{topic_title}」"
     text_body_template: |
-      %{invitee_name} 邀請你參與
+      %{inviter_name} 邀請你參與
 
       > %{site_title}－%{site_description}
 
@@ -1392,9 +1392,9 @@ zh_TW:
       %{invite_link}
   custom_invite_mailer:
     title: "客製邀請郵件"
-    subject_template: "%{invitee_name} 在 %{site_domain_name} 邀請你參與「%{topic_title}」"
+    subject_template: "%{inviter_name} 在 %{site_domain_name} 邀請你參與「%{topic_title}」"
     text_body_template: |
-      %{invitee_name} 留下以下留言
+      %{inviter_name} 留下以下留言
 
       > %{user_custom_message}
 
@@ -1413,9 +1413,9 @@ zh_TW:
       %{invite_link}
   invite_forum_mailer:
     title: "邀請論壇 Mailer"
-    subject_template: "%{invitee_name} 邀請你加入 %{site_domain_name}"
+    subject_template: "%{inviter_name} 邀請你加入 %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} 邀請你加入
+      %{inviter_name} 邀請你加入
 
       > **%{site_title}**
       >
@@ -1426,9 +1426,9 @@ zh_TW:
       %{invite_link}
   custom_invite_forum_mailer:
     title: "客製討論區邀請郵件"
-    subject_template: "%{invitee_name} 邀請你加入 %{site_domain_name}"
+    subject_template: "%{inviter_name} 邀請你加入 %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} 留下以下留言
+      %{inviter_name} 留下以下留言
 
       > %{user_custom_message}