Added LoginKey support to emails.

2020-09-22 17:06:08 -07:00 · 2020-09-22 17:06:08 -07:00 · 98544382db
parent c65098c6fa
commit 98544382db
112 changed files with 265 additions and 218 deletions
--- a/emails/account-check.html
+++ b/emails/account-check.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </table>
-    <p>Hi [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> is requesting email verification, click on the following link to complete the process.</p>
+    <p>Hi [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> is requesting email verification, click on the following link to complete the process.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Click here to verify your e-mail address.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Click here to verify your e-mail address.</a>
    </p>
    If you did not initiate this request, please ignore this mail.
 </div>
--- a/emails/account-check.txt
+++ b/emails/account-check.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Email Verification
-Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 If you did not initiate this request, please ignore this mail.
--- a/emails/account-invite.html
+++ b/emails/account-invite.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </table>
-    <p>An account was created for you on server <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, you can access it now with:</p>
+    <p>An account was created for you on server <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, you can access it now with:</p>
    <p>
        &nbsp;&nbsp;&nbsp;Username: <b notrans="1">[[[ACCOUNTNAME]]]</b><br />
        &nbsp;&nbsp;&nbsp;Password: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/account-invite.txt
+++ b/emails/account-invite.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - Account Invitation
-An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 Best regards,
 ~[[[USERNAME]]]
--- a/emails/account-reset.html
+++ b/emails/account-reset.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </table>
-    <p>Hi [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> is requesting an account password reset, click on the following link to complete the process.</p>
+    <p>Hi [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> is requesting an account password reset, click on the following link to complete the process.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Click here to reset your account password.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Click here to reset your account password.</a>
    </p>
    If you did not initiate this request, please ignore this mail.
 </div>
--- a/emails/account-reset.txt
+++ b/emails/account-reset.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Account Reset
-Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 If you did not initiate this request, please ignore this mail.
--- a/emails/mesh-invite.txt
+++ b/emails/mesh-invite.txt
@ -2,7 +2,7 @@
 ~<area-name>
 Hello [[[NAME]]],
 ~</area-name>
-User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/) is requesting you install software to start the remote control session.
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
 ~<area-msg>
 ~
 Message: [[[MSG]]]
@ -27,7 +27,7 @@ For Linux, cut & paste the following in a terminal to install the agent:
 ~
 ~</area-linux>
 ~<area-link>
-To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]] and follow the instructions.
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
 ~</area-link>
 If you did not initiate this request, please ignore this mail.
 ~
--- a/emails/translations/account-check_cs.html
+++ b/emails/translations/account-check_cs.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Ahoj [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> požaduje ověření e-mailem a dokončete proces kliknutím na následující odkaz.</p>
+    <p>Ahoj [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> požaduje ověření e-mailem a dokončete proces kliknutím na následující odkaz.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Kliknutím sem ověřte svou e-mailovou adresu.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Kliknutím sem ověřte svou e-mailovou adresu.</a>
    </p>
    Pokud jste tento požadavek nezačali, ignorujte tento e-mail.
 </div></body></html>
--- a/emails/translations/account-check_cs.txt
+++ b/emails/translations/account-check_cs.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Ověření e-mailem
-Ahoj [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) provádí ověření e-mailem. Chcete-li proces dokončit, přejděte na následující odkaz:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Pokud jste tento požadavek nezačali, ignorujte tento e-mail.
--- a/emails/translations/account-check_de.html
+++ b/emails/translations/account-check_de.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Hallo [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> Wenn Sie eine E-Mail-Bestätigung anfordern, klicken Sie auf den folgenden Link, um den Vorgang abzuschließen.</p>
+    <p>Hallo [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> Wenn Sie eine E-Mail-Bestätigung anfordern, klicken Sie auf den folgenden Link, um den Vorgang abzuschließen.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Klicken Sie hier, um Ihre E-Mail-Adresse zu bestätigen.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Klicken Sie hier, um Ihre E-Mail-Adresse zu bestätigen.</a>
    </p>
    Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte.
 </div></body></html>
--- a/emails/translations/account-check_de.txt
+++ b/emails/translations/account-check_de.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - E-Mail-Überprüfung
-Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) führt eine E-Mail-Überprüfung durch. Klicken Sie auf den folgenden Link, um den Vorgang abzuschließen:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte.
--- a/emails/translations/account-check_es.html
+++ b/emails/translations/account-check_es.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Hola [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> solicita la verificación por correo electrónico, haga clic en el siguiente enlace para completar el proceso.</p>
+    <p>Hola [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> solicita la verificación por correo electrónico, haga clic en el siguiente enlace para completar el proceso.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Haga clic aquí para verificar su dirección de correo electrónico.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Haga clic aquí para verificar su dirección de correo electrónico.</a>
    </p>
    Si Ud. no inicio este requerimiento, por favor ignore este correo.
 </div></body></html>
--- a/emails/translations/account-check_es.txt
+++ b/emails/translations/account-check_es.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Verificación de Correo Electrónico
-Hola [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) esta realizando una comprobación del correo electrónico. Navegue al siguiente enlace para completar el proceso:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Si Ud. no inicio este requerimiento, por favor ignore este correo.
--- a/emails/translations/account-check_fi.html
+++ b/emails/translations/account-check_fi.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Moi [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> pyytää sähköpostitse vahvistusta, suorita prosessi napsauttamalla seuraavaa linkkiä.</p>
+    <p>Moi [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> pyytää sähköpostitse vahvistusta, suorita prosessi napsauttamalla seuraavaa linkkiä.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Napsauta tätä vahvistaaksesi sähköpostiosoitteesi.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Napsauta tätä vahvistaaksesi sähköpostiosoitteesi.</a>
    </p>
    Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin.
 </div></body></html>
--- a/emails/translations/account-check_fi.txt
+++ b/emails/translations/account-check_fi.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Sähköpostivarmistus
-Hei [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) tarkistaa sähköpostiosoitetta. Seuraa linkkiä prosessin loppuun saattamiseksi:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin.
--- a/emails/translations/account-check_fr.html
+++ b/emails/translations/account-check_fr.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Bonjour [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> demande une vérification par e-mail, cliquez sur le lien suivant pour terminer le processus.</p>
+    <p>Bonjour [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> demande une vérification par e-mail, cliquez sur le lien suivant pour terminer le processus.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Cliquez ici pour vérifier votre adresse e-mail.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Cliquez ici pour vérifier votre adresse e-mail.</a>
    </p>
    Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier.
 </div></body></html>
--- a/emails/translations/account-check_fr.txt
+++ b/emails/translations/account-check_fr.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Vérification E-mail
-Bonjour [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) effectue une vérification par e-mail. Accédez au lien suivant pour terminer le processus:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier.
--- a/emails/translations/account-check_hi.html
+++ b/emails/translations/account-check_hi.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>हाय [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> ईमेल सत्यापन का अनुरोध कर रहा है, प्रक्रिया को पूरा करने के लिए निम्न लिंक पर क्लिक करें।</p>
+    <p>हाय [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> ईमेल सत्यापन का अनुरोध कर रहा है, प्रक्रिया को पूरा करने के लिए निम्न लिंक पर क्लिक करें।</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">अपना ई-मेल पता सत्यापित करने के लिए यहां क्लिक करें।</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">अपना ई-मेल पता सत्यापित करने के लिए यहां क्लिक करें।</a>
    </p>
    यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें।
 </div></body></html>
--- a/emails/translations/account-check_hi.txt
+++ b/emails/translations/account-check_hi.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - ईमेल सत्यापन
-हाय [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]] ई-मेल सत्यापन कर रहा है। प्रक्रिया को पूरा करने के लिए निम्नलिखित लिंक को बताएं:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें।
--- a/emails/translations/account-check_ja.html
+++ b/emails/translations/account-check_ja.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>[[[USERNAME]]]様 <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> がメールの確認をリクエストしている場合は、次のリンクをクリックしてプロセスを完了してください。</p>
+    <p>[[[USERNAME]]]様 <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> がメールの確認をリクエストしている場合は、次のリンクをクリックしてプロセスを完了してください。</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">ここをクリックして、電子メールアドレスを確認してください。</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">ここをクリックして、電子メールアドレスを確認してください。</a>
    </p>
    このリクエストを開始していない場合は、このメールを無視してください。
 </div></body></html>
--- a/emails/translations/account-check_ja.txt
+++ b/emails/translations/account-check_ja.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - メールの確認
-こんにちは[[[USERNAME]]]、[[[SERVERNAME]]]（[[[SERVERURL]]]）は電子メールの検証を実行しています。プロセスを完了するには、次のリンクに移動します。
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 このリクエストを開始していない場合は、このメールを無視してください。
--- a/emails/translations/account-check_ko.html
+++ b/emails/translations/account-check_ko.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>안녕하세요, [[[USERNAME]]]님. <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> 이메일 검증을 요구하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.</p>
+    <p>안녕하세요, [[[USERNAME]]]님. <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> 이메일 검증을 요구하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">이메일 주소를 검증하려면 여기를 클릭하십시오.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">이메일 주소를 검증하려면 여기를 클릭하십시오.</a>
    </p>
    이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오.
 </div></body></html>
--- a/emails/translations/account-check_ko.txt
+++ b/emails/translations/account-check_ko.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Email 인증
-안녕하세요, [[[USERNAME]]]님. [[[SERVERNAME]]] ([[[SERVERURL]]])은 이메일 검증을 위해 실행됩니다. 다음 링크로 이동하여 과정을 완료하십시오 :
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오.
--- a/emails/translations/account-check_nl.html
+++ b/emails/translations/account-check_nl.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Hallo [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> vraagt om e-mailverificatie, klik op de volgende link om het proces te voltooien.</p>
+    <p>Hallo [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> vraagt om e-mailverificatie, klik op de volgende link om het proces te voltooien.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Klik hier om uw e-mailadres te verifiëren.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Klik hier om uw e-mailadres te verifiëren.</a>
    </p>
    Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren.
 </div></body></html>
--- a/emails/translations/account-check_nl.txt
+++ b/emails/translations/account-check_nl.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - E-mail Verificatie
-Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) voert een e-mailverificatie uit. Ga naar de volgende link om het proces te voltooien:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren.
--- a/emails/translations/account-check_pt.html
+++ b/emails/translations/account-check_pt.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Olá [[[NOME DE USUÁRIO]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> está solicitando verificação de e-mail, clique no link a seguir para concluir o processo.</p>
+    <p>Olá [[[NOME DE USUÁRIO]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> está solicitando verificação de e-mail, clique no link a seguir para concluir o processo.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Clique aqui para verificar seu endereço de e-mail.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Clique aqui para verificar seu endereço de e-mail.</a>
    </p>
    Se você não iniciou esta solicitação, ignore este e-mail.
 </div></body></html>
--- a/emails/translations/account-check_pt.txt
+++ b/emails/translations/account-check_pt.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Verificação de Email
-Olá, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) está realizando uma verificação de e-mail. Acesse o seguinte link para concluir o processo:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Se você não iniciou esta solicitação, ignore este e-mail.
--- a/emails/translations/account-check_ru.html
+++ b/emails/translations/account-check_ru.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Привет [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> запрашивает подтверждение по электронной почте, нажмите на следующую ссылку, чтобы завершить процесс.</p>
+    <p>Привет [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> запрашивает подтверждение по электронной почте, нажмите на следующую ссылку, чтобы завершить процесс.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Нажмите здесь, чтобы подтвердить свой адрес электронной почты.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Нажмите здесь, чтобы подтвердить свой адрес электронной почты.</a>
    </p>
    Если вы не инициировали этот запрос, игнорируйте это письмо.
 </div></body></html>
--- a/emails/translations/account-check_ru.txt
+++ b/emails/translations/account-check_ru.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - подтверждение по электронной почте
-Здравствуйте, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) выполняет проверку электронной почты. Для завершения процесса перейдите по следующей ссылке:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Если вы не инициировали этот запрос, игнорируйте это письмо.
--- a/emails/translations/account-check_tr.html
+++ b/emails/translations/account-check_tr.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Merhaba [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> e-posta doğrulaması istiyorsa, işlemi tamamlamak için aşağıdaki bağlantıya tıklayın.</p>
+    <p>Merhaba [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> e-posta doğrulaması istiyorsa, işlemi tamamlamak için aşağıdaki bağlantıya tıklayın.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">E-posta adresinizi doğrulamak için burayı tıklayın.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">E-posta adresinizi doğrulamak için burayı tıklayın.</a>
    </p>
    Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın.
 </div></body></html>
--- a/emails/translations/account-check_tr.txt
+++ b/emails/translations/account-check_tr.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - E-posta Doğrulaması
-Merhaba [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) bir e-posta doğrulaması yapıyor. İşlemi tamamlamak için aşağıdaki bağlantıya gidin:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın.
--- a/emails/translations/account-check_zh-chs.html
+++ b/emails/translations/account-check_zh-chs.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> 正在请求电邮验证，请单击以下连结以完成该过程。</p>
+    <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> 正在请求电邮验证，请单击以下连结以完成该过程。</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">单击此处以验证您的电邮地址。</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">单击此处以验证您的电邮地址。</a>
    </p>
    如果您没有发起此请求，请不理此邮件。
 </div></body></html>
--- a/emails/translations/account-check_zh-chs.txt
+++ b/emails/translations/account-check_zh-chs.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]]-电邮验证
-嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在执行电邮验证。导航至以下连结以完成该过程：
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 如果您没有发起此请求，请不理此邮件。
--- a/emails/translations/account-check_zh-cht.html
+++ b/emails/translations/account-check_zh-cht.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]]">[[[SERVERNAME]]</a> 正在請求電郵驗證，請單擊以下鏈結以完成該過程。</p>
+    <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]</a> 正在請求電郵驗證，請單擊以下鏈結以完成該過程。</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">單擊此處以驗證你的電郵地址。</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">單擊此處以驗證你的電郵地址。</a>
    </p>
    如果你沒有發起此請求，請不理此電郵。
 </div></body></html>
--- a/emails/translations/account-check_zh-cht.txt
+++ b/emails/translations/account-check_zh-cht.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]]-電郵驗證
-嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在執行電郵驗證。導航至以下鏈結以完成該過程：
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 如果你沒有發起此請求，請不理此電郵。
--- a/emails/translations/account-invite_cs.html
+++ b/emails/translations/account-invite_cs.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Účet byl pro vás vytvořen na serveru <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, nyní k němu máte přístup:</p>
+    <p>Účet byl pro vás vytvořen na serveru <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, nyní k němu máte přístup:</p>
    <p>
        &nbsp;&nbsp;&nbsp;Uživatelské jméno: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;Heslo: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_cs.txt
+++ b/emails/translations/account-invite_cs.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - Pozvánka na účet
-Účet pro vás byl vytvořen na serveru [[[SERVERNAME]]] ([[[[SERVERURL]]] /), nyní k němu můžete přistupovat pomocí uživatelského jména „[[[[ACCOUNTNAME]]]“ “a hesla„ [[[HESLO]] ]] ".
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 S pozdravem,
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_de.html
+++ b/emails/translations/account-invite_de.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Auf dem Server wurde ein Konto für Sie erstellt <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>können Sie jetzt darauf zugreifen mit:</p>
+    <p>Auf dem Server wurde ein Konto für Sie erstellt <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>können Sie jetzt darauf zugreifen mit:</p>
    <p>
        &nbsp;&nbsp;&nbsp;Benutzername: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;Passwort: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_de.txt
+++ b/emails/translations/account-invite_de.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - Kontoeinladung
-Auf dem Server [[[SERVERNAME]]] ([[[SERVERURL]]]/) wurde ein Konto für Sie erstellt, Sie können ab sofort mit dem Benutzernamen "[[[ACCOUNTNAME]]]" und dem Passwort "[[[PASSWORD]]]" darauf zugreifen.
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 Freundliche Grüße,
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_es.html
+++ b/emails/translations/account-invite_es.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Una cuenta ha sido creada en su servidor <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, ahora puede acceder con:</p>
+    <p>Una cuenta ha sido creada en su servidor <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, ahora puede acceder con:</p>
    <p>
        &nbsp;&nbsp;&nbsp;Nombre de usuario: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;Contraseña: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_es.txt
+++ b/emails/translations/account-invite_es.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - Invitación de Cuenta
-Una cuenta ha sido creada en su servidor [[[SERVERNAME]]] ([[[SERVERURL]]]/), ahora puede acceder con el usuario "[[[ACCOUNTNAME]]]" y la contraseña "[[[PASSWORD]]]".
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 Atentamente,
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_fi.html
+++ b/emails/translations/account-invite_fi.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Sinulle on luotu tili palvelimelle <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, voit käyttää sitä nyt:</p>
+    <p>Sinulle on luotu tili palvelimelle <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, voit käyttää sitä nyt:</p>
    <p>
        &nbsp;&nbsp;&nbsp;Käyttäjätunnus: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;Salasana: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_fi.txt
+++ b/emails/translations/account-invite_fi.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - Tili kutsu
-Sinulle on luotu tili palvelimelle [[[SERVERNAME]]] ([[[SERVERURL]]]/), voit käyttää sitä nyt käyttäjätunnuksella "[[[ACCOUNTNAME]]]" and salasanalla "[[[PASSWORD]]]".
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 Ystävällisin terveisin,
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_fr.html
+++ b/emails/translations/account-invite_fr.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Un compte a été créé pour vous sur le serveur <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, vous pouvez y accéder maintenant avec:</p>
+    <p>Un compte a été créé pour vous sur le serveur <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, vous pouvez y accéder maintenant avec:</p>
    <p>
        &nbsp;&nbsp;&nbsp;Nom d'utilisateur: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;Mot de passe: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_fr.txt
+++ b/emails/translations/account-invite_fr.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - Invitation au compte
-Un compte a été créé pour vous sur le serveur [[[[SERVERNAME]]] ([[[SERVERURL]]] /), vous pouvez y accéder maintenant avec le nom d'utilisateur "[[[ACCOUNTNAME]]]" et le mot de passe "[[[PASSWORD]]]".
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 Meilleures salutations,
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_hi.html
+++ b/emails/translations/account-invite_hi.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>सर्वर पर आपके लिए एक खाता बनाया गया था <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, आप इसे अभी एक्सेस कर सकते हैं:</p>
+    <p>सर्वर पर आपके लिए एक खाता बनाया गया था <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, आप इसे अभी एक्सेस कर सकते हैं:</p>
    <p>
        &nbsp;&nbsp;&nbsp;उपयोगकर्ता नाम: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;कुंजिका: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_hi.txt
+++ b/emails/translations/account-invite_hi.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - खाता निमंत्रण
-सर्वर [[[SERVERNAME]]] ([[[SERVERURL]]] /) पर आपके लिए एक खाता बनाया गया था, आप इसे अब उपयोगकर्ता नाम "[[[ACCOUNTNAME]]]]" और पासवर्ड "[[[PASSWORD]]]" के साथ एक्सेस कर सकते हैं।।
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 सादर,
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_ja.html
+++ b/emails/translations/account-invite_ja.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>サーバー上にアカウントが作成されました <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>、あなたは今それを使ってそれにアクセスできます：</p>
+    <p>サーバー上にアカウントが作成されました <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>、あなたは今それを使ってそれにアクセスできます：</p>
    <p>
        &nbsp;&nbsp;&nbsp;ユーザー名： <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;パスワード： <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_ja.txt
+++ b/emails/translations/account-invite_ja.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - アカウントの招待
-サーバー[[[SERVERNAME]]]（[[[SERVERURL]]] /）にアカウントが作成されました。ユーザー名 "[[[ACCOUNTNAME]]]"とパスワード "[[[PASSWORD] ]] "。
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 宜しくお願いします、
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_ko.html
+++ b/emails/translations/account-invite_ko.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>당신을 위해 서버에서 한 계정이 생성되었습니다. <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>이제 당신은 다음으로 접근 가능합니다:</p>
+    <p>당신을 위해 서버에서 한 계정이 생성되었습니다. <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>이제 당신은 다음으로 접근 가능합니다:</p>
    <p>
        &nbsp;&nbsp;&nbsp;사용자 이름: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;암호: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_ko.txt
+++ b/emails/translations/account-invite_ko.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - 계정 초대
-당신을 위해 서버에서 한 계정이 생성되었습니다 : [[[SERVERNAME]]] ([[[SERVERURL]]]/), 이제 당신은 다음 이름으로 접근 가능합니다 : "[[[ACCOUNTNAME]]]" 그리고 비밀번호는 다음과 같습니다 : "[[[PASSWORD]]]".
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 최고의 안부를 전합니다,
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_nl.html
+++ b/emails/translations/account-invite_nl.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Er is een account voor je aangemaakt op de server <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, je hebt er nu toegang toe met:</p>
+    <p>Er is een account voor je aangemaakt op de server <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, je hebt er nu toegang toe met:</p>
    <p>
        &nbsp;&nbsp;&nbsp;Gebruikersnaam: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;Wachtwoord: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_nl.txt
+++ b/emails/translations/account-invite_nl.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - Account uitnodiging
-Er is een account jouw aangemaakt op de server [[[SERVERNAME]]] ([[[SERVERURL]]]/), Je kan inloggen met de gebruikersnaam "[[[ACCOUNTNAME]]]" en wachtwoord "[[[PASSWORD]]]".
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 Vriendelijke groeten,
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_pt.html
+++ b/emails/translations/account-invite_pt.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Uma conta foi criada para você no servidor <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, você pode acessá-lo agora com:</p>
+    <p>Uma conta foi criada para você no servidor <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, você pode acessá-lo agora com:</p>
    <p>
        &nbsp;&nbsp;&nbsp;Nome de usuário: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;Senha: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_pt.txt
+++ b/emails/translations/account-invite_pt.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - Convite para conta
-Uma conta foi criada para você no servidor [[[SERVERNAME]]] ([[[SERVERURL]]] /), você pode acessá-la agora com o nome de usuário "[[[ACCOUNTNAME]]]" e a senha "[[[PASSWORD] ]] ".
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 Cumprimentos,
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_ru.html
+++ b/emails/translations/account-invite_ru.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Учетная запись была создана для вас на сервере <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>Вы можете получить к нему доступ сейчас:</p>
+    <p>Учетная запись была создана для вас на сервере <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>Вы можете получить к нему доступ сейчас:</p>
    <p>
        &nbsp;&nbsp;&nbsp;Имя пользователя: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;Пароль: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_ru.txt
+++ b/emails/translations/account-invite_ru.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - приглашение в аккаунт
-Учетная запись была создана для вас на сервере [[[SERVERNAME]]] ([[[SERVERURL]]] /), теперь вы можете получить к ней доступ с именем пользователя «[[[ACCOUNTNAME]]]» и паролем «[[[PASSWORD] ]] ".
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 С уважением,
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_tr.html
+++ b/emails/translations/account-invite_tr.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Sunucuda sizin için bir hesap oluşturuldu <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, şimdi şununla erişebilirsiniz:</p>
+    <p>Sunucuda sizin için bir hesap oluşturuldu <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, şimdi şununla erişebilirsiniz:</p>
    <p>
        &nbsp;&nbsp;&nbsp;Kullanıcı adı: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;Parola: <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_tr.txt
+++ b/emails/translations/account-invite_tr.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]] - Hesap Davetiyesi
-[[[SERVERNAME]]] ([[[SERVERURL]]] /) sunucusunda sizin için bir hesap oluşturuldu, şimdi "[[[ACCOUNTNAME]]]" kullanıcı adı ve "[[[PASSWORD]]]" ile bu hesaba erişebilirsiniz.
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 Saygılarımla,
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_zh-chs.html
+++ b/emails/translations/account-invite_zh-chs.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>在服务器上为您创建了一个帐户 <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>，您现在可以通过以下方式访问它：</p>
+    <p>在服务器上为您创建了一个帐户 <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>，您现在可以通过以下方式访问它：</p>
    <p>
        &nbsp;&nbsp;&nbsp;用户名： <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;密码： <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_zh-chs.txt
+++ b/emails/translations/account-invite_zh-chs.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]]-帐户邀请
-已在服务器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上为您创建了一个帐户，您现在可以使用用户名“ [[[ACCOUNTNAME]]]”和密码“ [[[PASSWORD] ]]”。
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 最好的祝福，
 ~[[[USERNAME]]]
--- a/emails/translations/account-invite_zh-cht.html
+++ b/emails/translations/account-invite_zh-cht.html
@ -7,7 +7,7 @@
            </td>
        </tr>
    </tbody></table>
-    <p>在伺服器上為你創建了一個帳戶 <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>，你現在可以通過以下方式訪問它：</p>
+    <p>在伺服器上為你創建了一個帳戶 <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>，你現在可以通過以下方式訪問它：</p>
    <p>
        &nbsp;&nbsp;&nbsp;用戶名： <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
        &nbsp;&nbsp;&nbsp;密碼： <b notrans="1">[[[PASSWORD]]]</b>
--- a/emails/translations/account-invite_zh-cht.txt
+++ b/emails/translations/account-invite_zh-cht.txt
@ -1,5 +1,5 @@
 [[[SERVERNAME]]]-帳戶邀請
-在伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上為你創建了一個帳戶，你現在可以使用用戶名“ [[[ACCOUNTNAME]]]”和密碼“ [[[PASSWORD] ]]”。
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
 ~
 最好的祝福，
 ~[[[USERNAME]]]
--- a/emails/translations/account-reset_cs.html
+++ b/emails/translations/account-reset_cs.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Ahoj [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> požaduje obnovení hesla k účtu, dokončete proces kliknutím na následující odkaz.</p>
+    <p>Ahoj [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> požaduje obnovení hesla k účtu, dokončete proces kliknutím na následující odkaz.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Kliknutím sem obnovíte heslo svého účtu.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Kliknutím sem obnovíte heslo svého účtu.</a>
    </p>
    Pokud jste tento požadavek nezačali, ignorujte tento e-mail.
 </div></body></html>
--- a/emails/translations/account-reset_cs.txt
+++ b/emails/translations/account-reset_cs.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Reset účtu
-Ahoj [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]])) požaduje obnovení hesla k účtu. Chcete-li proces dokončit, přejděte na následující odkaz:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Pokud jste tento požadavek nezačali, ignorujte tento e-mail.
--- a/emails/translations/account-reset_de.html
+++ b/emails/translations/account-reset_de.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Hallo [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> Wenn Sie ein Zurücksetzen des Kontokennworts anfordern, klicken Sie auf den folgenden Link, um den Vorgang abzuschließen.</p>
+    <p>Hallo [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> Wenn Sie ein Zurücksetzen des Kontokennworts anfordern, klicken Sie auf den folgenden Link, um den Vorgang abzuschließen.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Klicken Sie hier, um Ihr Kontopasswort zurückzusetzen.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Klicken Sie hier, um Ihr Kontopasswort zurückzusetzen.</a>
    </p>
    Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte.
 </div></body></html>
--- a/emails/translations/account-reset_de.txt
+++ b/emails/translations/account-reset_de.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Zurücksetzen des Kontos
-Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) fordert ein Zurücksetzen des Kontokennworts an. Klicken Sie auf den folgenden Link, um den Vorgang abzuschließen:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte.
--- a/emails/translations/account-reset_es.html
+++ b/emails/translations/account-reset_es.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Hola [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> solicita restablecer la contraseña de la cuenta, haga clic en el siguiente enlace para completar el proceso.</p>
+    <p>Hola [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> solicita restablecer la contraseña de la cuenta, haga clic en el siguiente enlace para completar el proceso.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Haga clic aquí para restablecer la contraseña de su cuenta.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Haga clic aquí para restablecer la contraseña de su cuenta.</a>
    </p>
    Si Ud. no inicio este requerimiento, por favor ignore este correo.
 </div></body></html>
--- a/emails/translations/account-reset_es.txt
+++ b/emails/translations/account-reset_es.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Restablecimiento de Cuenta
-Hola [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) está solicitando un restablecimiento de contraseña de cuenta. Navegue al siguiente enlace para completar el proceso:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Si Ud. no inicio este requerimiento, por favor ignore este correo.
--- a/emails/translations/account-reset_fi.html
+++ b/emails/translations/account-reset_fi.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Moi [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> pyytää tilin salasanan palauttamista, suorita prosessi napsauttamalla seuraavaa linkkiä.</p>
+    <p>Moi [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> pyytää tilin salasanan palauttamista, suorita prosessi napsauttamalla seuraavaa linkkiä.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Palauta tilisi salasana napsauttamalla tätä.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Palauta tilisi salasana napsauttamalla tätä.</a>
    </p>
    Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin.
 </div></body></html>
--- a/emails/translations/account-reset_fi.txt
+++ b/emails/translations/account-reset_fi.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Tili nollattu
-Hei [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) pyytää tilin salasanan palauttamista. Seuraa linkkiä prosessin loppuun saattamiseksi:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin.
--- a/emails/translations/account-reset_fr.html
+++ b/emails/translations/account-reset_fr.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Bonjour [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> demande une réinitialisation du mot de passe du compte, cliquez sur le lien suivant pour terminer le processus.</p>
+    <p>Bonjour [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> demande une réinitialisation du mot de passe du compte, cliquez sur le lien suivant pour terminer le processus.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Cliquez ici pour réinitialiser le mot de passe de votre compte.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Cliquez ici pour réinitialiser le mot de passe de votre compte.</a>
    </p>
    Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier.
 </div></body></html>
--- a/emails/translations/account-reset_fr.txt
+++ b/emails/translations/account-reset_fr.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Réinitialisation du compte
-Bonjour [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) demande une réinitialisation du mot de passe du compte. Accédez au lien suivant pour terminer le processus:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier.
--- a/emails/translations/account-reset_hi.html
+++ b/emails/translations/account-reset_hi.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>हाय [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> खाता पासवर्ड रीसेट का अनुरोध कर रहा है, प्रक्रिया पूरी करने के लिए निम्न लिंक पर क्लिक करें।</p>
+    <p>हाय [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> खाता पासवर्ड रीसेट का अनुरोध कर रहा है, प्रक्रिया पूरी करने के लिए निम्न लिंक पर क्लिक करें।</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">अपना खाता पासवर्ड रीसेट करने के लिए यहां क्लिक करें।</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">अपना खाता पासवर्ड रीसेट करने के लिए यहां क्लिक करें।</a>
    </p>
    यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें।
 </div></body></html>
--- a/emails/translations/account-reset_hi.txt
+++ b/emails/translations/account-reset_hi.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - खाता रीसेट
-हाय [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]] से खाता पासवर्ड रीसेट करने का अनुरोध किया जा रहा है। प्रक्रिया को पूरा करने के लिए निम्नलिखित लिंक को बताएं:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें।
--- a/emails/translations/account-reset_ja.html
+++ b/emails/translations/account-reset_ja.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>[[[USERNAME]]]様 <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> がアカウントパスワードのリセットを要求している場合は、次のリンクをクリックしてプロセスを完了します。</p>
+    <p>[[[USERNAME]]]様 <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> がアカウントパスワードのリセットを要求している場合は、次のリンクをクリックしてプロセスを完了します。</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">ここをクリックしてアカウントのパスワードをリセットしてください。</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">ここをクリックしてアカウントのパスワードをリセットしてください。</a>
    </p>
    このリクエストを開始していない場合は、このメールを無視してください。
 </div></body></html>
--- a/emails/translations/account-reset_ja.txt
+++ b/emails/translations/account-reset_ja.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - アカウントのリセット
-こんにちは[[[USERNAME]]]、[[[SERVERNAME]]]（[[[SERVERURL]]]）はアカウントパスワードのリセットをリクエストしています。プロセスを完了するには、次のリンクに移動します。
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 このリクエストを開始していない場合は、このメールを無視してください。
--- a/emails/translations/account-reset_ko.html
+++ b/emails/translations/account-reset_ko.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>안녕하세요, [[[USERNAME]]]님. <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> 계정 비밀번호 재설정을 요청하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.</p>
+    <p>안녕하세요, [[[USERNAME]]]님. <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> 계정 비밀번호 재설정을 요청하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">당신의 계정 암호를 초기화하려면 여기를 클릭하십시오.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">당신의 계정 암호를 초기화하려면 여기를 클릭하십시오.</a>
    </p>
    이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오.
 </div></body></html>
--- a/emails/translations/account-reset_ko.txt
+++ b/emails/translations/account-reset_ko.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - 계정 재설정
-안녕하세요, [[[USERNAME]]]님. [[[SERVERNAME]]] ([[[SERVERURL]]])은 계정 비밀번호 초기화를 위해 요구됩니다. 다음 링크로 이동하여 과정을 완료하십시오 :
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오.
--- a/emails/translations/account-reset_nl.html
+++ b/emails/translations/account-reset_nl.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Hallo [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> vraagt om het opnieuw instellen van het wachtwoord van een account, klik op de volgende link om het proces te voltooien.</p>
+    <p>Hallo [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> vraagt om het opnieuw instellen van het wachtwoord van een account, klik op de volgende link om het proces te voltooien.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Klik hier om je wachtwoord opnieuw in te stellen.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Klik hier om je wachtwoord opnieuw in te stellen.</a>
    </p>
    Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren.
 </div></body></html>
--- a/emails/translations/account-reset_nl.txt
+++ b/emails/translations/account-reset_nl.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Account Reset
-Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) vraagt om het opnieuw instellen van het account wachtwoord. Ga naar de volgende link om het proces te voltooien:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren.
--- a/emails/translations/account-reset_pt.html
+++ b/emails/translations/account-reset_pt.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Olá [[[NOME DE USUÁRIO]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> está solicitando a redefinição da senha da conta, clique no link a seguir para concluir o processo.</p>
+    <p>Olá [[[NOME DE USUÁRIO]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> está solicitando a redefinição da senha da conta, clique no link a seguir para concluir o processo.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Clique aqui para redefinir a senha da sua conta.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Clique aqui para redefinir a senha da sua conta.</a>
    </p>
    Se você não iniciou esta solicitação, ignore este e-mail.
 </div></body></html>
--- a/emails/translations/account-reset_pt.txt
+++ b/emails/translations/account-reset_pt.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Redefinição de conta
-Olá, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) está solicitando uma redefinição de senha de conta. Acesse o seguinte link para concluir o processo:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Se você não iniciou esta solicitação, ignore este e-mail.
--- a/emails/translations/account-reset_ru.html
+++ b/emails/translations/account-reset_ru.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Привет [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> запрашивает сброс пароля учетной записи, нажмите на следующую ссылку, чтобы завершить процесс.</p>
+    <p>Привет [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> запрашивает сброс пароля учетной записи, нажмите на следующую ссылку, чтобы завершить процесс.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Нажмите здесь, чтобы сбросить пароль учетной записи.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Нажмите здесь, чтобы сбросить пароль учетной записи.</a>
    </p>
    Если вы не инициировали этот запрос, игнорируйте это письмо.
 </div></body></html>
--- a/emails/translations/account-reset_ru.txt
+++ b/emails/translations/account-reset_ru.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Сброс учетной записи
-Здравствуйте, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) запрашивает сброс пароля учетной записи. Для завершения процесса перейдите по следующей ссылке:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Если вы не инициировали этот запрос, игнорируйте это письмо.
--- a/emails/translations/account-reset_tr.html
+++ b/emails/translations/account-reset_tr.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>Merhaba [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> bir hesap şifresi sıfırlama talep ediyor, işlemi tamamlamak için aşağıdaki bağlantıya tıklayın.</p>
+    <p>Merhaba [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> bir hesap şifresi sıfırlama talep ediyor, işlemi tamamlamak için aşağıdaki bağlantıya tıklayın.</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Hesap şifrenizi sıfırlamak için burayı tıklayın.</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Hesap şifrenizi sıfırlamak için burayı tıklayın.</a>
    </p>
    Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın.
 </div></body></html>
--- a/emails/translations/account-reset_tr.txt
+++ b/emails/translations/account-reset_tr.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]] - Hesabı Sıfırlama
-Merhaba [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) bir hesap şifresi sıfırlama istiyor. İşlemi tamamlamak için aşağıdaki bağlantıya gidin:
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın.
--- a/emails/translations/account-reset_zh-chs.html
+++ b/emails/translations/account-reset_zh-chs.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> 正在要求重置帐户密码，请单击以下连结以完成该过程。</p>
+    <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> 正在要求重置帐户密码，请单击以下连结以完成该过程。</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">单击此处重置您的帐户密码。</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">单击此处重置您的帐户密码。</a>
    </p>
    如果您没有发起此请求，请不理此邮件。
 </div></body></html>
--- a/emails/translations/account-reset_zh-chs.txt
+++ b/emails/translations/account-reset_zh-chs.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]]-帐户重置
-[[[USERNAME]]，您好：[[[SERVERNAME]]]（[[[SERVERURL]]]）正在请求重置帐户密码。导航至以下连结以完成该过程：
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 如果您没有发起此请求，请不理此邮件。
--- a/emails/translations/account-reset_zh-cht.html
+++ b/emails/translations/account-reset_zh-cht.html
@ -7,9 +7,9 @@
            </td>
        </tr>
    </tbody></table>
-    <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]]">[[[SERVERNAME]]</a> 正在要求重置帳戶密碼，請單擊以下鏈結以完成該過程。</p>
+    <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]</a> 正在要求重置帳戶密碼，請單擊以下鏈結以完成該過程。</p>
    <p style="margin-left:30px">
-        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">單擊此處重置你的帳戶密碼。</a>
+        <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">單擊此處重置你的帳戶密碼。</a>
    </p>
    如果你沒有發起此請求，請不理此電郵。
 </div></body></html>
--- a/emails/translations/account-reset_zh-cht.txt
+++ b/emails/translations/account-reset_zh-cht.txt
@ -1,6 +1,6 @@
 [[[SERVERNAME]]]-帳戶重置
-[[[USERNAME]]，你好，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在請求重設帳戶密碼。導航至以下鏈結以完成該過程：
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
 ~
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
 ~
 如果你沒有發起此請求，請不理此電郵。
--- a/emails/translations/mesh-invite_cs.txt
+++ b/emails/translations/mesh-invite_cs.txt
@ -2,7 +2,7 @@
 ~<area-name>
 Dobrý den, [[[NAME]]],
 ~</area-name>
-Uživatel [[[USERNAME]]] na serveru [[[SERVERNAME]]] ([[[SERVERURL]]]/) požaduje instalaci softwaru k zahájení relace vzdáleného řízení.
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
 ~<area-msg>
 ~
 Zpráva: [[[MSG]]]
@ -27,7 +27,7 @@ V případě systému Linux vyjměte a vložte do terminálu a nainstalujte agen
 ~
 ~</area-linux>
 ~<area-link>
-Chcete-li nainstalovat software, přejděte na [[[SERVERURL]]][[[LINKURL]]] a postupujte podle pokynů.
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
 ~</area-link>
 Pokud jste tento požadavek nezačali, ignorujte tento e-mail.
 ~
--- a/emails/translations/mesh-invite_de.txt
+++ b/emails/translations/mesh-invite_de.txt
@ -2,7 +2,7 @@
 ~<area-name>
 Hallo [[[NAME]]],
 ~</area-name>
-Benutzer [[[USERNAME]]] auf dem Server [[[SERVERNAME]]] ([[[SERVERURL]]]/) fordert Sie auf, Software zu installieren, um die Fernsteuerungssitzung zu starten.
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
 ~<area-msg>
 ~
 Nachricht: [[[MSG]]]
@ -27,7 +27,7 @@ Schneiden Sie unter Linux Folgendes aus und fügen Sie es in ein Terminal ein, u
 ~
 ~</area-linux>
 ~<area-link>
-Navigieren Sie zum Installieren der Software zu [[[SERVERURL]]][[[LINKURL]]] und befolgen Sie die Anweisungen.
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
 ~</area-link>
 Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte.
 ~
--- a/emails/translations/mesh-invite_es.txt
+++ b/emails/translations/mesh-invite_es.txt
@ -2,7 +2,7 @@
 ~<area-name>
 Hola [[[NAME]]],
 ~</area-name>
-Usuario [[[USERNAME]]] en servitor [[[SERVERNAME]]] ([[[SERVERURL]]]/) solicita que instale el software para iniciar la sesión de control remoto.
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
 ~<area-msg>
 ~
 Mensaje: [[[MSG]]]
@ -27,7 +27,7 @@ Para Linux, copie y pegue lo siguiente en la terminal para instalar el agente:
 ~
 ~</area-linux>
 ~<area-link>
-Para instalar el software, navega a [[[SERVERURL]]][[[LINKURL]]] y siga las instrucciones.
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
 ~</area-link>
 Si Ud. no inicio este requerimiento, por favor ignore este correo.
 ~
--- a/emails/translations/mesh-invite_fi.txt
+++ b/emails/translations/mesh-invite_fi.txt
@ -2,7 +2,7 @@
 ~<area-name>
 Hei [[[NAME]]],
 ~</area-name>
-Käyttäjä[[[USERNAME]]] palvelimella [[[SERVERNAME]]] ([[[SERVERURL]]]/) pyytää sinua asentamaan ohjelmiston etähallintaistunnon käynnistämiseksi.
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
 ~<area-msg>
 ~
 Viesti: [[[MSG]]]
@ -27,7 +27,7 @@ Linux: leikkaa ja liitä seuraava päätelaitteeseen agentin asentamiseksi:
 ~
 ~</area-linux>
 ~<area-link>
-Asenna ohjelmisto siirtymällä kohtaan [[[SERVERURL]]] [[[[LINKURL]]] ja noudattamalla ohjeita.
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
 ~</area-link>
 Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin.
 ~
--- a/emails/translations/mesh-invite_fr.txt
+++ b/emails/translations/mesh-invite_fr.txt
@ -2,7 +2,7 @@
 ~<area-name>
 Bonjour [[[NAME]]],
 ~</area-name>
-L'utilisateur [[[USERNAME]]] sur le serveur [[[SERVERNAME]]] ([[[SERVERURL]]]/) vous demande d'installer un logiciel pour démarrer la session de contrôle à distance.
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
 ~<area-msg>
 ~
 Message: [[[MSG]]]
@ -27,7 +27,7 @@ Pour Linux, copiez et collez les éléments suivants dans un terminal pour insta
 ~
 ~</area-linux>
 ~<area-link>
-Pour installer le logiciel, accédez à [[[SERVERURL]]][[[LINKURL]]] et suivez les instructions.
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
 ~</area-link>
 Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier.
 ~
--- a/emails/translations/mesh-invite_hi.txt
+++ b/emails/translations/mesh-invite_hi.txt
@ -2,7 +2,7 @@
 ~<area-name>
 नमस्कार [[[NAME]]],
 ~</area-name>
-उपयोगकर्ता [[[USERNAME]]] सर्वर पर [[[SERVERNAME]]] ([[[SERVERURL]]]/) आपसे रिमोट कंट्रोल सेशन शुरू करने के लिए सॉफ़्टवेयर स्थापित करने का अनुरोध कर रहा है।
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
 ~<area-msg>
 ~
 संदेश: [[[MSG]]]
@ -27,7 +27,7 @@ Apple OSX के लिए, इस प्रक्रिया को पूर
 ~
 ~</area-linux>
 ~<area-link>
-सॉफ़्टवेयर को स्थापित करने के लिए, [[[SERVERURL]]] [[[LINKURL]]] पर जाएँ और निर्देशों का पालन करें।
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
 ~</area-link>
 यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें।
 ~
--- a/emails/translations/mesh-invite_ja.txt
+++ b/emails/translations/mesh-invite_ja.txt
@ -2,7 +2,7 @@
 ~<area-name>
 [[[NAME]]]様
 ~</area-name>
-サーバー[[[SERVERNAME]]]（[[[SERVERURL]]]/）のユーザー[[[USERNAME]]]が、リモートコントロールセッションを開始するためのソフトウェアのインストールを要求しています。
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
 ~<area-msg>
 ~
 メッセージ：[[[MSG]]]
@ -27,7 +27,7 @@ Linuxの場合は、ターミナルで以下をカットアンドペーストし
 ~
 ~</area-linux>
 ~<area-link>
-ソフトウェアをインストールするには、[[[SERVERURL]]][[[LINKURL]]]に移動し、指示に従います。
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
 ~</area-link>
 このリクエストを開始していない場合は、このメールを無視してください。
 ~
--- a/emails/translations/mesh-invite_ko.txt
+++ b/emails/translations/mesh-invite_ko.txt
@ -2,7 +2,7 @@
 ~<area-name>
 안녕하세요, [[[NAME]]]님.
 ~</area-name>
-[[[SERVERNAME]]] ([[[SERVERURL]]]/) 서버의 [[[USERNAME]]] 사용자가 원격 제어 세션을 시작하기 위해서는 소프트웨어 설치가 요구됩니다.
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
 ~<area-msg>
 ~
 메시지: [[[MSG]]]
@ -28,7 +28,7 @@ Linux의 경우, 다음을 잘라내어 터미널에 붙여 넣어 에이전트
 ~
 ~</area-linux>
 ~<area-link>
-소프트웨어를 설치하려면, 다음에 접속하여 지시에 따르십시오 : [[[SERVERURL]]][[[LINKURL]]]
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
 ~</area-link>
 이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오.
 ~
--- a/emails/translations/mesh-invite_nl.txt
+++ b/emails/translations/mesh-invite_nl.txt
@ -2,7 +2,7 @@
 ~<area-name>
 Hallo [[[NAME]]],
 ~</area-name>
-Gebruiker [[[USERNAME]]] op server [[[SERVERNAME]]] ([[[SERVERURL]]]/) vraagt u de software te installeren om de sessie voor afstandsbediening te starten.
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
 ~<area-msg>
 ~
 Bericht: [[[MSG]]]
@ -27,7 +27,7 @@ Voor Linux, knip het volgende en plak dit in een terminal om de agent te install
 ~
 ~</area-linux>
 ~<area-link>
-Om de software te installeren, navigeert u naar [[[SERVERURL]]][[[LINKURL]]] en volgt u de instructies.
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
 ~</area-link>
 Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren.
 ~
--- a/Show More
+++ b/Show More