Added LoginKey support to emails.
Ylian Saint-Hilaire committed
Sep 22, 2020 at 17:06 UTC
98544382dba4f25a03e72cfa786d950c591ff305
112 files changed
+265
-218
emails/account-check.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</table>
10
- <p>Hi [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> is requesting email verification, click on the following link to complete the process.</p>
10
+ <p>Hi [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> is requesting email verification, click on the following link to complete the process.</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Click here to verify your e-mail address.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Click here to verify your e-mail address.</a>
13
</p>
14
If you did not initiate this request, please ignore this mail.
15
</div>
\ No newline at end of file
emails/account-check.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Email Verification
2
-Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
If you did not initiate this request, please ignore this mail.
\ No newline at end of file
emails/account-invite.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</table>
10
- <p>An account was created for you on server <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, you can access it now with:</p>
10
+ <p>An account was created for you on server <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, you can access it now with:</p>
11
<p>
12
Username: <b notrans="1">[[[ACCOUNTNAME]]]</b><br />
13
Password: <b notrans="1">[[[PASSWORD]]]</b>
emails/account-invite.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - Account Invitation
2
-An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
Best regards,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/account-reset.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</table>
10
- <p>Hi [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> is requesting an account password reset, click on the following link to complete the process.</p>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Click here to reset your account password.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Click here to reset your account password.</a>
13
</p>
14
If you did not initiate this request, please ignore this mail.
15
</div>
\ No newline at end of file
emails/account-reset.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Account Reset
2
-Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
If you did not initiate this request, please ignore this mail.
\ No newline at end of file
emails/mesh-invite.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
Hello [[[NAME]]],
4
~</area-name>
5
-User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/) is requesting you install software to start the remote control session.
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
Message: [[[MSG]]]
@@ -27,7 +27,7 @@ For Linux, cut & paste the following in a terminal to install the agent:
27
~
28
~</area-linux>
29
~<area-link>
30
-To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]] and follow the instructions.
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
If you did not initiate this request, please ignore this mail.
33
~
emails/translations/account-check_cs.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Kliknutím sem ověřte svou e-mailovou adresu.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Kliknutím sem ověřte svou e-mailovou adresu.</a>
13
</p>
14
Pokud jste tento požadavek nezačali, ignorujte tento e-mail.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_cs.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Ověření e-mailem
2
-Ahoj [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) provádí ověření e-mailem. Chcete-li proces dokončit, přejděte na následující odkaz:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Pokud jste tento požadavek nezačali, ignorujte tento e-mail.
\ No newline at end of file
emails/translations/account-check_de.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Klicken Sie hier, um Ihre E-Mail-Adresse zu bestätigen.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Klicken Sie hier, um Ihre E-Mail-Adresse zu bestätigen.</a>
13
</p>
14
Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_de.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - E-Mail-Überprüfung
2
-Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) führt eine E-Mail-Überprüfung durch. Klicken Sie auf den folgenden Link, um den Vorgang abzuschließen:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte.
\ No newline at end of file
emails/translations/account-check_es.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Haga clic aquí para verificar su dirección de correo electrónico.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Haga clic aquí para verificar su dirección de correo electrónico.</a>
13
</p>
14
Si Ud. no inicio este requerimiento, por favor ignore este correo.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_es.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Verificación de Correo Electrónico
2
-Hola [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) esta realizando una comprobación del correo electrónico. Navegue al siguiente enlace para completar el proceso:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Si Ud. no inicio este requerimiento, por favor ignore este correo.
\ No newline at end of file
emails/translations/account-check_fi.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>Moi [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> pyytää sähköpostitse vahvistusta, suorita prosessi napsauttamalla seuraavaa linkkiä.</p>
10
+ <p>Moi [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> pyytää sähköpostitse vahvistusta, suorita prosessi napsauttamalla seuraavaa linkkiä.</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Napsauta tätä vahvistaaksesi sähköpostiosoitteesi.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Napsauta tätä vahvistaaksesi sähköpostiosoitteesi.</a>
13
</p>
14
Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_fi.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Sähköpostivarmistus
2
-Hei [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) tarkistaa sähköpostiosoitetta. Seuraa linkkiä prosessin loppuun saattamiseksi:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin.
\ No newline at end of file
emails/translations/account-check_fr.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Cliquez ici pour vérifier votre adresse e-mail.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Cliquez ici pour vérifier votre adresse e-mail.</a>
13
</p>
14
Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_fr.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Vérification E-mail
2
-Bonjour [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) effectue une vérification par e-mail. Accédez au lien suivant pour terminer le processus:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier.
\ No newline at end of file
emails/translations/account-check_hi.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>हाय [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> ईमेल सत्यापन का अनुरोध कर रहा है, प्रक्रिया को पूरा करने के लिए निम्न लिंक पर क्लिक करें।</p>
10
+ <p>हाय [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> ईमेल सत्यापन का अनुरोध कर रहा है, प्रक्रिया को पूरा करने के लिए निम्न लिंक पर क्लिक करें।</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">अपना ई-मेल पता सत्यापित करने के लिए यहां क्लिक करें।</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">अपना ई-मेल पता सत्यापित करने के लिए यहां क्लिक करें।</a>
13
</p>
14
यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें।
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_hi.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - ईमेल सत्यापन
2
-हाय [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]] ई-मेल सत्यापन कर रहा है। प्रक्रिया को पूरा करने के लिए निम्नलिखित लिंक को बताएं:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें।
\ No newline at end of file
emails/translations/account-check_ja.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>[[[USERNAME]]]様 <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> がメールの確認をリクエストしている場合は、次のリンクをクリックしてプロセスを完了してください。</p>
10
+ <p>[[[USERNAME]]]様 <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> がメールの確認をリクエストしている場合は、次のリンクをクリックしてプロセスを完了してください。</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">ここをクリックして、電子メールアドレスを確認してください。</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">ここをクリックして、電子メールアドレスを確認してください。</a>
13
</p>
14
このリクエストを開始していない場合は、このメールを無視してください。
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_ja.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - メールの確認
2
-こんにちは[[[USERNAME]]]、[[[SERVERNAME]]]（[[[SERVERURL]]]）は電子メールの検証を実行しています。プロセスを完了するには、次のリンクに移動します。
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
このリクエストを開始していない場合は、このメールを無視してください。
\ No newline at end of file
emails/translations/account-check_ko.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>안녕하세요, [[[USERNAME]]]님. <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> 이메일 검증을 요구하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.</p>
10
+ <p>안녕하세요, [[[USERNAME]]]님. <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> 이메일 검증을 요구하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">이메일 주소를 검증하려면 여기를 클릭하십시오.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">이메일 주소를 검증하려면 여기를 클릭하십시오.</a>
13
</p>
14
이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_ko.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Email 인증
2
-안녕하세요, [[[USERNAME]]]님. [[[SERVERNAME]]] ([[[SERVERURL]]])은 이메일 검증을 위해 실행됩니다. 다음 링크로 이동하여 과정을 완료하십시오 :
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오.
\ No newline at end of file
emails/translations/account-check_nl.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>Hallo [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> vraagt om e-mailverificatie, klik op de volgende link om het proces te voltooien.</p>
10
+ <p>Hallo [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> vraagt om e-mailverificatie, klik op de volgende link om het proces te voltooien.</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Klik hier om uw e-mailadres te verifiëren.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Klik hier om uw e-mailadres te verifiëren.</a>
13
</p>
14
Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_nl.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - E-mail Verificatie
2
-Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) voert een e-mailverificatie uit. Ga naar de volgende link om het proces te voltooien:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren.
\ No newline at end of file
emails/translations/account-check_pt.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Clique aqui para verificar seu endereço de e-mail.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Clique aqui para verificar seu endereço de e-mail.</a>
13
</p>
14
Se você não iniciou esta solicitação, ignore este e-mail.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_pt.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Verificação de Email
2
-Olá, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) está realizando uma verificação de e-mail. Acesse o seguinte link para concluir o processo:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Se você não iniciou esta solicitação, ignore este e-mail.
\ No newline at end of file
emails/translations/account-check_ru.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>Привет [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> запрашивает подтверждение по электронной почте, нажмите на следующую ссылку, чтобы завершить процесс.</p>
10
+ <p>Привет [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> запрашивает подтверждение по электронной почте, нажмите на следующую ссылку, чтобы завершить процесс.</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Нажмите здесь, чтобы подтвердить свой адрес электронной почты.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Нажмите здесь, чтобы подтвердить свой адрес электронной почты.</a>
13
</p>
14
Если вы не инициировали этот запрос, игнорируйте это письмо.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_ru.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - подтверждение по электронной почте
2
-Здравствуйте, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) выполняет проверку электронной почты. Для завершения процесса перейдите по следующей ссылке:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Если вы не инициировали этот запрос, игнорируйте это письмо.
\ No newline at end of file
emails/translations/account-check_tr.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">E-posta adresinizi doğrulamak için burayı tıklayın.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">E-posta adresinizi doğrulamak için burayı tıklayın.</a>
13
</p>
14
Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_tr.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - E-posta Doğrulaması
2
-Merhaba [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) bir e-posta doğrulaması yapıyor. İşlemi tamamlamak için aşağıdaki bağlantıya gidin:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın.
\ No newline at end of file
emails/translations/account-check_zh-chs.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> 正在请求电邮验证，请单击以下连结以完成该过程。</p>
10
+ <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> 正在请求电邮验证，请单击以下连结以完成该过程。</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">单击此处以验证您的电邮地址。</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">单击此处以验证您的电邮地址。</a>
13
</p>
14
如果您没有发起此请求，请不理此邮件。
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_zh-chs.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]]-电邮验证
2
-嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在执行电邮验证。导航至以下连结以完成该过程：
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
如果您没有发起此请求，请不理此邮件。
\ No newline at end of file
emails/translations/account-check_zh-cht.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]]">[[[SERVERNAME]]</a> 正在請求電郵驗證，請單擊以下鏈結以完成該過程。</p>
10
+ <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]</a> 正在請求電郵驗證，請單擊以下鏈結以完成該過程。</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">單擊此處以驗證你的電郵地址。</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">單擊此處以驗證你的電郵地址。</a>
13
</p>
14
如果你沒有發起此請求，請不理此電郵。
15
</div></body></html>
\ No newline at end of file
emails/translations/account-check_zh-cht.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]]-電郵驗證
2
-嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在執行電郵驗證。導航至以下鏈結以完成該過程：
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
如果你沒有發起此請求，請不理此電郵。
\ No newline at end of file
emails/translations/account-invite_cs.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p>
12
Uživatelské jméno: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
Heslo: <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_cs.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - Pozvánka na účet
2
-Úč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]] ]] ".
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
S pozdravem,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_de.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p>
12
Benutzername: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
Passwort: <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_de.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - Kontoeinladung
2
-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.
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
Freundliche Grüße,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_es.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>Una cuenta ha sido creada en su servidor <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, ahora puede acceder con:</p>
10
+ <p>Una cuenta ha sido creada en su servidor <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, ahora puede acceder con:</p>
11
<p>
12
Nombre de usuario: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
Contraseña: <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_es.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - Invitación de Cuenta
2
-Una cuenta ha sido creada en su servidor [[[SERVERNAME]]] ([[[SERVERURL]]]/), ahora puede acceder con el usuario "[[[ACCOUNTNAME]]]" y la contraseña "[[[PASSWORD]]]".
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
Atentamente,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_fi.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>Sinulle on luotu tili palvelimelle <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, voit käyttää sitä nyt:</p>
10
+ <p>Sinulle on luotu tili palvelimelle <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, voit käyttää sitä nyt:</p>
11
<p>
12
Käyttäjätunnus: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
Salasana: <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_fi.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - Tili kutsu
2
-Sinulle on luotu tili palvelimelle [[[SERVERNAME]]] ([[[SERVERURL]]]/), voit käyttää sitä nyt käyttäjätunnuksella "[[[ACCOUNTNAME]]]" and salasanalla "[[[PASSWORD]]]".
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
Ystävällisin terveisin,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_fr.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p>
12
Nom d'utilisateur: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
Mot de passe: <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_fr.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - Invitation au compte
2
-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]]]".
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
Meilleures salutations,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_hi.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>सर्वर पर आपके लिए एक खाता बनाया गया था <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, आप इसे अभी एक्सेस कर सकते हैं:</p>
10
+ <p>सर्वर पर आपके लिए एक खाता बनाया गया था <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, आप इसे अभी एक्सेस कर सकते हैं:</p>
11
<p>
12
उपयोगकर्ता नाम: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
कुंजिका: <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_hi.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - खाता निमंत्रण
2
-सर्वर [[[SERVERNAME]]] ([[[SERVERURL]]] /) पर आपके लिए एक खाता बनाया गया था, आप इसे अब उपयोगकर्ता नाम "[[[ACCOUNTNAME]]]]" और पासवर्ड "[[[PASSWORD]]]" के साथ एक्सेस कर सकते हैं।।
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
सादर,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_ja.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>サーバー上にアカウントが作成されました <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>、あなたは今それを使ってそれにアクセスできます：</p>
10
+ <p>サーバー上にアカウントが作成されました <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>、あなたは今それを使ってそれにアクセスできます：</p>
11
<p>
12
ユーザー名： <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
パスワード： <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_ja.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - アカウントの招待
2
-サーバー[[[SERVERNAME]]]（[[[SERVERURL]]] /）にアカウントが作成されました。ユーザー名 "[[[ACCOUNTNAME]]]"とパスワード "[[[PASSWORD] ]] "。
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
宜しくお願いします、
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_ko.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>당신을 위해 서버에서 한 계정이 생성되었습니다. <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>이제 당신은 다음으로 접근 가능합니다:</p>
10
+ <p>당신을 위해 서버에서 한 계정이 생성되었습니다. <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>이제 당신은 다음으로 접근 가능합니다:</p>
11
<p>
12
사용자 이름: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
암호: <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_ko.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - 계정 초대
2
-당신을 위해 서버에서 한 계정이 생성되었습니다 : [[[SERVERNAME]]] ([[[SERVERURL]]]/), 이제 당신은 다음 이름으로 접근 가능합니다 : "[[[ACCOUNTNAME]]]" 그리고 비밀번호는 다음과 같습니다 : "[[[PASSWORD]]]".
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
최고의 안부를 전합니다,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_nl.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p>
12
Gebruikersnaam: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
Wachtwoord: <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_nl.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - Account uitnodiging
2
-Er is een account jouw aangemaakt op de server [[[SERVERNAME]]] ([[[SERVERURL]]]/), Je kan inloggen met de gebruikersnaam "[[[ACCOUNTNAME]]]" en wachtwoord "[[[PASSWORD]]]".
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
Vriendelijke groeten,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_pt.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>Uma conta foi criada para você no servidor <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, você pode acessá-lo agora com:</p>
10
+ <p>Uma conta foi criada para você no servidor <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, você pode acessá-lo agora com:</p>
11
<p>
12
Nome de usuário: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
Senha: <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_pt.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - Convite para conta
2
-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] ]] ".
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
Cumprimentos,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_ru.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>Учетная запись была создана для вас на сервере <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>Вы можете получить к нему доступ сейчас:</p>
10
+ <p>Учетная запись была создана для вас на сервере <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>Вы можете получить к нему доступ сейчас:</p>
11
<p>
12
Имя пользователя: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
Пароль: <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_ru.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - приглашение в аккаунт
2
-Учетная запись была создана для вас на сервере [[[SERVERNAME]]] ([[[SERVERURL]]] /), теперь вы можете получить к ней доступ с именем пользователя «[[[ACCOUNTNAME]]]» и паролем «[[[PASSWORD] ]] ".
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
С уважением,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_tr.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>Sunucuda sizin için bir hesap oluşturuldu <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>, şimdi şununla erişebilirsiniz:</p>
10
+ <p>Sunucuda sizin için bir hesap oluşturuldu <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>, şimdi şununla erişebilirsiniz:</p>
11
<p>
12
Kullanıcı adı: <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
Parola: <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_tr.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]] - Hesap Davetiyesi
2
-[[[SERVERNAME]]] ([[[SERVERURL]]] /) sunucusunda sizin için bir hesap oluşturuldu, şimdi "[[[ACCOUNTNAME]]]" kullanıcı adı ve "[[[PASSWORD]]]" ile bu hesaba erişebilirsiniz.
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
Saygılarımla,
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_zh-chs.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>在服务器上为您创建了一个帐户 <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>，您现在可以通过以下方式访问它：</p>
10
+ <p>在服务器上为您创建了一个帐户 <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>，您现在可以通过以下方式访问它：</p>
11
<p>
12
用户名： <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
密码： <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_zh-chs.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]]-帐户邀请
2
-已在服务器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上为您创建了一个帐户，您现在可以使用用户名“ [[[ACCOUNTNAME]]]”和密码“ [[[PASSWORD] ]]”。
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
最好的祝福，
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-invite_zh-cht.html
+1
-1
@@ -7,7 +7,7 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>在伺服器上為你創建了一個帳戶 <a href="[[[SERVERURL]]]" notrans="1">[[[SERVERNAME]]]</a>，你現在可以通過以下方式訪問它：</p>
10
+ <p>在伺服器上為你創建了一個帳戶 <a href="[[[SERVERURL]]][[[URLARGS1]]]" notrans="1">[[[SERVERNAME]]]</a>，你現在可以通過以下方式訪問它：</p>
11
<p>
12
用戶名： <b notrans="1">[[[ACCOUNTNAME]]]</b><br>
13
密碼： <b notrans="1">[[[PASSWORD]]]</b>
emails/translations/account-invite_zh-cht.txt
+1
-1
@@ -1,5 +1,5 @@
1
[[[SERVERNAME]]]-帳戶邀請
2
-在伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上為你創建了一個帳戶，你現在可以使用用戶名“ [[[ACCOUNTNAME]]]”和密碼“ [[[PASSWORD] ]]”。
2
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
3
~
4
最好的祝福，
5
~[[[USERNAME]]]
\ No newline at end of file
emails/translations/account-reset_cs.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Kliknutím sem obnovíte heslo svého účtu.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Kliknutím sem obnovíte heslo svého účtu.</a>
13
</p>
14
Pokud jste tento požadavek nezačali, ignorujte tento e-mail.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_cs.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Reset účtu
2
-Ahoj [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]])) požaduje obnovení hesla k účtu. Chcete-li proces dokončit, přejděte na následující odkaz:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Pokud jste tento požadavek nezačali, ignorujte tento e-mail.
\ No newline at end of file
emails/translations/account-reset_de.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Klicken Sie hier, um Ihr Kontopasswort zurückzusetzen.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Klicken Sie hier, um Ihr Kontopasswort zurückzusetzen.</a>
13
</p>
14
Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_de.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Zurücksetzen des Kontos
2
-Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) fordert ein Zurücksetzen des Kontokennworts an. Klicken Sie auf den folgenden Link, um den Vorgang abzuschließen:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte.
\ No newline at end of file
emails/translations/account-reset_es.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Haga clic aquí para restablecer la contraseña de su cuenta.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Haga clic aquí para restablecer la contraseña de su cuenta.</a>
13
</p>
14
Si Ud. no inicio este requerimiento, por favor ignore este correo.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_es.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Restablecimiento de Cuenta
2
-Hola [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) está solicitando un restablecimiento de contraseña de cuenta. Navegue al siguiente enlace para completar el proceso:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Si Ud. no inicio este requerimiento, por favor ignore este correo.
\ No newline at end of file
emails/translations/account-reset_fi.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>Moi [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> pyytää tilin salasanan palauttamista, suorita prosessi napsauttamalla seuraavaa linkkiä.</p>
10
+ <p>Moi [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> pyytää tilin salasanan palauttamista, suorita prosessi napsauttamalla seuraavaa linkkiä.</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Palauta tilisi salasana napsauttamalla tätä.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Palauta tilisi salasana napsauttamalla tätä.</a>
13
</p>
14
Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_fi.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Tili nollattu
2
-Hei [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) pyytää tilin salasanan palauttamista. Seuraa linkkiä prosessin loppuun saattamiseksi:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin.
\ No newline at end of file
emails/translations/account-reset_fr.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Cliquez ici pour réinitialiser le mot de passe de votre compte.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Cliquez ici pour réinitialiser le mot de passe de votre compte.</a>
13
</p>
14
Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_fr.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Réinitialisation du compte
2
-Bonjour [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) demande une réinitialisation du mot de passe du compte. Accédez au lien suivant pour terminer le processus:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier.
\ No newline at end of file
emails/translations/account-reset_hi.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>हाय [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> खाता पासवर्ड रीसेट का अनुरोध कर रहा है, प्रक्रिया पूरी करने के लिए निम्न लिंक पर क्लिक करें।</p>
10
+ <p>हाय [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> खाता पासवर्ड रीसेट का अनुरोध कर रहा है, प्रक्रिया पूरी करने के लिए निम्न लिंक पर क्लिक करें।</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">अपना खाता पासवर्ड रीसेट करने के लिए यहां क्लिक करें।</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">अपना खाता पासवर्ड रीसेट करने के लिए यहां क्लिक करें।</a>
13
</p>
14
यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें।
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_hi.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - खाता रीसेट
2
-हाय [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]] से खाता पासवर्ड रीसेट करने का अनुरोध किया जा रहा है। प्रक्रिया को पूरा करने के लिए निम्नलिखित लिंक को बताएं:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें।
\ No newline at end of file
emails/translations/account-reset_ja.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>[[[USERNAME]]]様 <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> がアカウントパスワードのリセットを要求している場合は、次のリンクをクリックしてプロセスを完了します。</p>
10
+ <p>[[[USERNAME]]]様 <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> がアカウントパスワードのリセットを要求している場合は、次のリンクをクリックしてプロセスを完了します。</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">ここをクリックしてアカウントのパスワードをリセットしてください。</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">ここをクリックしてアカウントのパスワードをリセットしてください。</a>
13
</p>
14
このリクエストを開始していない場合は、このメールを無視してください。
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_ja.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - アカウントのリセット
2
-こんにちは[[[USERNAME]]]、[[[SERVERNAME]]]（[[[SERVERURL]]]）はアカウントパスワードのリセットをリクエストしています。プロセスを完了するには、次のリンクに移動します。
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
このリクエストを開始していない場合は、このメールを無視してください。
\ No newline at end of file
emails/translations/account-reset_ko.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>안녕하세요, [[[USERNAME]]]님. <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> 계정 비밀번호 재설정을 요청하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.</p>
10
+ <p>안녕하세요, [[[USERNAME]]]님. <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> 계정 비밀번호 재설정을 요청하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">당신의 계정 암호를 초기화하려면 여기를 클릭하십시오.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">당신의 계정 암호를 초기화하려면 여기를 클릭하십시오.</a>
13
</p>
14
이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_ko.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - 계정 재설정
2
-안녕하세요, [[[USERNAME]]]님. [[[SERVERNAME]]] ([[[SERVERURL]]])은 계정 비밀번호 초기화를 위해 요구됩니다. 다음 링크로 이동하여 과정을 완료하십시오 :
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오.
\ No newline at end of file
emails/translations/account-reset_nl.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Klik hier om je wachtwoord opnieuw in te stellen.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Klik hier om je wachtwoord opnieuw in te stellen.</a>
13
</p>
14
Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_nl.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Account Reset
2
-Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) vraagt om het opnieuw instellen van het account wachtwoord. Ga naar de volgende link om het proces te voltooien:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren.
\ No newline at end of file
emails/translations/account-reset_pt.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Clique aqui para redefinir a senha da sua conta.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Clique aqui para redefinir a senha da sua conta.</a>
13
</p>
14
Se você não iniciou esta solicitação, ignore este e-mail.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_pt.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Redefinição de conta
2
-Olá, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) está solicitando uma redefinição de senha de conta. Acesse o seguinte link para concluir o processo:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Se você não iniciou esta solicitação, ignore este e-mail.
\ No newline at end of file
emails/translations/account-reset_ru.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>Привет [[[USERNAME]]], <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> запрашивает сброс пароля учетной записи, нажмите на следующую ссылку, чтобы завершить процесс.</p>
10
+ <p>Привет [[[USERNAME]]], <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> запрашивает сброс пароля учетной записи, нажмите на следующую ссылку, чтобы завершить процесс.</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Нажмите здесь, чтобы сбросить пароль учетной записи.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Нажмите здесь, чтобы сбросить пароль учетной записи.</a>
13
</p>
14
Если вы не инициировали этот запрос, игнорируйте это письмо.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_ru.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Сброс учетной записи
2
-Здравствуйте, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) запрашивает сброс пароля учетной записи. Для завершения процесса перейдите по следующей ссылке:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Если вы не инициировали этот запрос, игнорируйте это письмо.
\ No newline at end of file
emails/translations/account-reset_tr.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <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>
10
+ <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>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">Hesap şifrenizi sıfırlamak için burayı tıklayın.</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">Hesap şifrenizi sıfırlamak için burayı tıklayın.</a>
13
</p>
14
Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın.
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_tr.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]] - Hesabı Sıfırlama
2
-Merhaba [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) bir hesap şifresi sıfırlama istiyor. İşlemi tamamlamak için aşağıdaki bağlantıya gidin:
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın.
\ No newline at end of file
emails/translations/account-reset_zh-chs.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]]">[[[SERVERNAME]]]</a> 正在要求重置帐户密码，请单击以下连结以完成该过程。</p>
10
+ <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]]</a> 正在要求重置帐户密码，请单击以下连结以完成该过程。</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">单击此处重置您的帐户密码。</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">单击此处重置您的帐户密码。</a>
13
</p>
14
如果您没有发起此请求，请不理此邮件。
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_zh-chs.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]]-帐户重置
2
-[[[USERNAME]]，您好：[[[SERVERNAME]]]（[[[SERVERURL]]]）正在请求重置帐户密码。导航至以下连结以完成该过程：
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
如果您没有发起此请求，请不理此邮件。
\ No newline at end of file
emails/translations/account-reset_zh-cht.html
+2
-2
@@ -7,9 +7,9 @@
7
</td>
8
</tr>
9
</tbody></table>
10
- <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]]">[[[SERVERNAME]]</a> 正在要求重置帳戶密碼，請單擊以下鏈結以完成該過程。</p>
10
+ <p>[[[USERNAME]]，你好， <a href="[[[SERVERURL]]][[[URLARGS1]]]">[[[SERVERNAME]]</a> 正在要求重置帳戶密碼，請單擊以下鏈結以完成該過程。</p>
11
<p style="margin-left:30px">
12
- <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]">單擊此處重置你的帳戶密碼。</a>
12
+ <a href="[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]">單擊此處重置你的帳戶密碼。</a>
13
</p>
14
如果你沒有發起此請求，請不理此電郵。
15
</div></body></html>
\ No newline at end of file
emails/translations/account-reset_zh-cht.txt
+2
-2
@@ -1,6 +1,6 @@
1
[[[SERVERNAME]]]-帳戶重置
2
-[[[USERNAME]]，你好，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在請求重設帳戶密碼。導航至以下鏈結以完成該過程：
2
+Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:
3
~
4
-~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]]
4
+~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]]
5
~
6
如果你沒有發起此請求，請不理此電郵。
\ No newline at end of file
emails/translations/mesh-invite_cs.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
Dobrý den, [[[NAME]]],
4
~</area-name>
5
-Uživatel [[[USERNAME]]] na serveru [[[SERVERNAME]]] ([[[SERVERURL]]]/) požaduje instalaci softwaru k zahájení relace vzdáleného řízení.
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
Zpráva: [[[MSG]]]
@@ -27,7 +27,7 @@ V případě systému Linux vyjměte a vložte do terminálu a nainstalujte agen
27
~
28
~</area-linux>
29
~<area-link>
30
-Chcete-li nainstalovat software, přejděte na [[[SERVERURL]]][[[LINKURL]]] a postupujte podle pokynů.
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
Pokud jste tento požadavek nezačali, ignorujte tento e-mail.
33
~
emails/translations/mesh-invite_de.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
Hallo [[[NAME]]],
4
~</area-name>
5
-Benutzer [[[USERNAME]]] auf dem Server [[[SERVERNAME]]] ([[[SERVERURL]]]/) fordert Sie auf, Software zu installieren, um die Fernsteuerungssitzung zu starten.
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
Nachricht: [[[MSG]]]
@@ -27,7 +27,7 @@ Schneiden Sie unter Linux Folgendes aus und fügen Sie es in ein Terminal ein, u
27
~
28
~</area-linux>
29
~<area-link>
30
-Navigieren Sie zum Installieren der Software zu [[[SERVERURL]]][[[LINKURL]]] und befolgen Sie die Anweisungen.
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte.
33
~
emails/translations/mesh-invite_es.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
Hola [[[NAME]]],
4
~</area-name>
5
-Usuario [[[USERNAME]]] en servitor [[[SERVERNAME]]] ([[[SERVERURL]]]/) solicita que instale el software para iniciar la sesión de control remoto.
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
Mensaje: [[[MSG]]]
@@ -27,7 +27,7 @@ Para Linux, copie y pegue lo siguiente en la terminal para instalar el agente:
27
~
28
~</area-linux>
29
~<area-link>
30
-Para instalar el software, navega a [[[SERVERURL]]][[[LINKURL]]] y siga las instrucciones.
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
Si Ud. no inicio este requerimiento, por favor ignore este correo.
33
~
emails/translations/mesh-invite_fi.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
Hei [[[NAME]]],
4
~</area-name>
5
-Käyttäjä[[[USERNAME]]] palvelimella [[[SERVERNAME]]] ([[[SERVERURL]]]/) pyytää sinua asentamaan ohjelmiston etähallintaistunnon käynnistämiseksi.
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
Viesti: [[[MSG]]]
@@ -27,7 +27,7 @@ Linux: leikkaa ja liitä seuraava päätelaitteeseen agentin asentamiseksi:
27
~
28
~</area-linux>
29
~<area-link>
30
-Asenna ohjelmisto siirtymällä kohtaan [[[SERVERURL]]] [[[[LINKURL]]] ja noudattamalla ohjeita.
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin.
33
~
emails/translations/mesh-invite_fr.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
Bonjour [[[NAME]]],
4
~</area-name>
5
-L'utilisateur [[[USERNAME]]] sur le serveur [[[SERVERNAME]]] ([[[SERVERURL]]]/) vous demande d'installer un logiciel pour démarrer la session de contrôle à distance.
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
Message: [[[MSG]]]
@@ -27,7 +27,7 @@ Pour Linux, copiez et collez les éléments suivants dans un terminal pour insta
27
~
28
~</area-linux>
29
~<area-link>
30
-Pour installer le logiciel, accédez à [[[SERVERURL]]][[[LINKURL]]] et suivez les instructions.
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier.
33
~
emails/translations/mesh-invite_hi.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
नमस्कार [[[NAME]]],
4
~</area-name>
5
-उपयोगकर्ता [[[USERNAME]]] सर्वर पर [[[SERVERNAME]]] ([[[SERVERURL]]]/) आपसे रिमोट कंट्रोल सेशन शुरू करने के लिए सॉफ़्टवेयर स्थापित करने का अनुरोध कर रहा है।
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
संदेश: [[[MSG]]]
@@ -27,7 +27,7 @@ Apple OSX के लिए, इस प्रक्रिया को पूर
27
~
28
~</area-linux>
29
~<area-link>
30
-सॉफ़्टवेयर को स्थापित करने के लिए, [[[SERVERURL]]] [[[LINKURL]]] पर जाएँ और निर्देशों का पालन करें।
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें।
33
~
emails/translations/mesh-invite_ja.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
[[[NAME]]]様
4
~</area-name>
5
-サーバー[[[SERVERNAME]]]（[[[SERVERURL]]]/）のユーザー[[[USERNAME]]]が、リモートコントロールセッションを開始するためのソフトウェアのインストールを要求しています。
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
メッセージ：[[[MSG]]]
@@ -27,7 +27,7 @@ Linuxの場合は、ターミナルで以下をカットアンドペーストし
27
~
28
~</area-linux>
29
~<area-link>
30
-ソフトウェアをインストールするには、[[[SERVERURL]]][[[LINKURL]]]に移動し、指示に従います。
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
このリクエストを開始していない場合は、このメールを無視してください。
33
~
emails/translations/mesh-invite_ko.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
안녕하세요, [[[NAME]]]님.
4
~</area-name>
5
-[[[SERVERNAME]]] ([[[SERVERURL]]]/) 서버의 [[[USERNAME]]] 사용자가 원격 제어 세션을 시작하기 위해서는 소프트웨어 설치가 요구됩니다.
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
메시지: [[[MSG]]]
@@ -28,7 +28,7 @@ Linux의 경우, 다음을 잘라내어 터미널에 붙여 넣어 에이전트
28
~
29
~</area-linux>
30
~<area-link>
31
-소프트웨어를 설치하려면, 다음에 접속하여 지시에 따르십시오 : [[[SERVERURL]]][[[LINKURL]]]
31
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
32
~</area-link>
33
이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오.
34
~
emails/translations/mesh-invite_nl.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
Hallo [[[NAME]]],
4
~</area-name>
5
-Gebruiker [[[USERNAME]]] op server [[[SERVERNAME]]] ([[[SERVERURL]]]/) vraagt u de software te installeren om de sessie voor afstandsbediening te starten.
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
Bericht: [[[MSG]]]
@@ -27,7 +27,7 @@ Voor Linux, knip het volgende en plak dit in een terminal om de agent te install
27
~
28
~</area-linux>
29
~<area-link>
30
-Om de software te installeren, navigeert u naar [[[SERVERURL]]][[[LINKURL]]] en volgt u de instructies.
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren.
33
~
emails/translations/mesh-invite_pt.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
Olá [[[NAME]]],
4
~</area-name>
5
-O usuário [[[USERNAME]]] no servidor [[[SERVERNAME]]] ([[[SERVERURL]]] /) está solicitando a instalação do software para iniciar a sessão de controle remoto.
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
Mensagem: [[[MSG]]]
@@ -27,7 +27,7 @@ Para Linux, recorte e cole o seguinte em um terminal para instalar o agente:
27
~
28
~</area-linux>
29
~<area-link>
30
-Para instalar o software, navegue até [[[SERVERURL]]] [[[LINKURL]]] e siga as instruções.
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
Se você não iniciou esta solicitação, ignore este e-mail.
33
~
emails/translations/mesh-invite_ru.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
Здравствуйте, [[[NAME]]],
4
~</area-name>
5
-Пользователь [[[USERNAME]]] на сервере [[[SERVERNAME]]] ([[[SERVERURL]]]/) запрашивает установку программного обеспечения для запуска сеанса удаленного управления.
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
Сообщение: [[[MSG]]]
@@ -27,7 +27,7 @@
27
~
28
~</area-linux>
29
~<area-link>
30
-Для установки программного обеспечения перейдите к [[[SERVERURL]]][[[LINKURL]]] и следуйте инструкциям.
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
Если вы не инициировали этот запрос, игнорируйте это письмо.
33
~
emails/translations/mesh-invite_tr.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
Merhaba [[[NAME]]],
4
~</area-name>
5
-[[[SERVERNAME]]] ([[[SERVERURL]]] /) sunucusundaki [[[USERNAME]]] uzaktan kontrol oturumunu başlatmak için yazılım yüklemenizi istiyor.
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
Mesaj: [[[MSG]]]
@@ -27,7 +27,7 @@ Linux için, aracıyı yüklemek için aşağıdakileri kesip bir terminale yap
27
~
28
~</area-linux>
29
~<area-link>
30
-Yazılımı kurmak için [[[SERVERURL]]][[[LINKURL]]] adresine gidin ve talimatları takip edin.
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın.
33
~
emails/translations/mesh-invite_zh-chs.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
您好[[[NAME]]]，
4
~</area-name>
5
-服务器[[[SERVERNAME]]]（[[[SERVERURL]]]/）上的用户[[[USERNAME]]]请求您安装软件以启动远程控制。
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
消息：[[[MSG]]]
@@ -27,7 +27,7 @@
27
~
28
~</area-linux>
29
~<area-link>
30
-要安装软件，请导航至[[[SERVERURL]]][[[LINKURL]]]，然后按照说明进行操作。
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
如果您没有发起此请求，请不理此邮件。
33
~
emails/translations/mesh-invite_zh-cht.txt
+2
-2
@@ -2,7 +2,7 @@
2
~<area-name>
3
你好[[[NAME]]]，
4
~</area-name>
5
-伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上的用戶[[[USERNAME]]]請求你安裝軟體以啟動遠程控制。
5
+User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.
6
~<area-msg>
7
~
8
訊息：[[[MSG]]]
@@ -27,7 +27,7 @@
27
~
28
~</area-linux>
29
~<area-link>
30
-要安裝軟體，請導航至[[[SERVERURL]]] [[[LINKURL]]]，然後按照說明進行操作。
30
+To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.
31
~</area-link>
32
如果你沒有發起此請求，請不理此電郵。
33
~
meshmail.js
+10
-5
@@ -148,7 +148,7 @@ module.exports.CreateMeshMail = function (parent) {
148
};
149
150
// Send account login mail / 2 factor token
151
- obj.sendAccountLoginMail = function (domain, email, token, language) {
151
+ obj.sendAccountLoginMail = function (domain, email, token, language, loginkey) {
152
obj.checkEmail(email, function (checked) {
153
if (checked) {
154
parent.debug('email', "Sending login token to " + email);
@@ -166,6 +166,7 @@ module.exports.CreateMeshMail = function (parent) {
166
167
// Set all the options.
168
var options = { email: email, servername: domain.title ? domain.title : 'MeshCentral', token: token };
169
+ if (loginkey != null) { options.urlargs1 = '?key=' + loginkey; options.urlargs2 = '&key=' + loginkey; } else { options.urlargs1 = ''; options.urlargs2 = ''; }
170
171
// Send the email
172
obj.pendingMails.push({ to: email, from: parent.config.smtp.from, subject: mailReplacements(template.htmlSubject, domain, options), text: mailReplacements(template.txt, domain, options), html: mailReplacements(template.html, domain, options) });
@@ -175,7 +176,7 @@ module.exports.CreateMeshMail = function (parent) {
176
};
177
178
// Send account invitation mail
178
- obj.sendAccountInviteMail = function (domain, username, accountname, email, password, language) {
179
+ obj.sendAccountInviteMail = function (domain, username, accountname, email, password, language, loginkey) {
180
obj.checkEmail(email, function (checked) {
181
if (checked) {
182
parent.debug('email', "Sending account invitation to " + email);
@@ -193,6 +194,7 @@ module.exports.CreateMeshMail = function (parent) {
194
195
// Set all the options.
196
var options = { username: username, accountname: accountname, email: email, servername: domain.title ? domain.title : 'MeshCentral', password: password };
197
+ if (loginkey != null) { options.urlargs1 = '?key=' + loginkey; options.urlargs2 = '&key=' + loginkey; } else { options.urlargs1 = ''; options.urlargs2 = ''; }
198
199
// Send the email
200
obj.pendingMails.push({ to: email, from: parent.config.smtp.from, subject: mailReplacements(template.htmlSubject, domain, options), text: mailReplacements(template.txt, domain, options), html: mailReplacements(template.html, domain, options) });
@@ -202,7 +204,7 @@ module.exports.CreateMeshMail = function (parent) {
204
};
205
206
// Send account check mail
205
- obj.sendAccountCheckMail = function (domain, username, email, language) {
207
+ obj.sendAccountCheckMail = function (domain, username, email, language, loginkey) {
208
obj.checkEmail(email, function (checked) {
209
if (checked) {
210
parent.debug('email', "Sending email verification to " + email);
@@ -220,6 +222,7 @@ module.exports.CreateMeshMail = function (parent) {
222
223
// Set all the options.
224
var options = { username: username, email: email, servername: domain.title ? domain.title : 'MeshCentral' };
225
+ if (loginkey != null) { options.urlargs1 = '?key=' + loginkey; options.urlargs2 = '&key=' + loginkey; } else { options.urlargs1 = ''; options.urlargs2 = ''; }
226
options.cookie = obj.parent.encodeCookie({ u: domain.id + '/' + username.toLowerCase(), e: email, a: 1 }, obj.mailCookieEncryptionKey);
227
228
// Send the email
@@ -230,7 +233,7 @@ module.exports.CreateMeshMail = function (parent) {
233
};
234
235
// Send account reset mail
233
- obj.sendAccountResetMail = function (domain, username, email, language) {
236
+ obj.sendAccountResetMail = function (domain, username, email, language, loginkey) {
237
obj.checkEmail(email, function (checked) {
238
if (checked) {
239
parent.debug('email', "Sending account password reset to " + email);
@@ -248,6 +251,7 @@ module.exports.CreateMeshMail = function (parent) {
251
252
// Set all the options.
253
var options = { username: username, email: email, servername: domain.title ? domain.title : 'MeshCentral' };
254
+ if (loginkey != null) { options.urlargs1 = '?key=' + loginkey; options.urlargs2 = '&key=' + loginkey; } else { options.urlargs1 = ''; options.urlargs2 = ''; }
255
options.cookie = obj.parent.encodeCookie({ u: domain.id + '/' + username, e: email, a: 2 }, obj.mailCookieEncryptionKey);
256
257
// Send the email
@@ -258,7 +262,7 @@ module.exports.CreateMeshMail = function (parent) {
262
};
263
264
// Send agent invite mail
261
- obj.sendAgentInviteMail = function (domain, username, email, meshid, name, os, msg, flags, expirehours, language) {
265
+ obj.sendAgentInviteMail = function (domain, username, email, meshid, name, os, msg, flags, expirehours, language, loginkey) {
266
obj.checkEmail(email, function (checked) {
267
if (checked) {
268
parent.debug('email', "Sending agent install invitation to " + email);
@@ -276,6 +280,7 @@ module.exports.CreateMeshMail = function (parent) {
280
281
// Set all the template replacement options and generate the final email text (both in txt and html formats).
282
var options = { username: username, name: name, email: email, installflags: flags, msg: msg, meshid: meshid, meshidhex: meshid.split('/')[2], servername: domain.title ? domain.title : 'MeshCentral' };
283
+ if (loginkey != null) { options.urlargs1 = '?key=' + loginkey; options.urlargs2 = '&key=' + loginkey; } else { options.urlargs1 = ''; options.urlargs2 = ''; }
284
options.windows = ((os == 0) || (os == 1)) ? 1 : 0;
285
options.linux = ((os == 0) || (os == 2)) ? 1 : 0;
286
options.osx = ((os == 0) || (os == 3)) ? 1 : 0;
public/scripts/common-0.0.1-min.js
+1
-1
@@ -1 +1 @@
1
-function Q(n){return document.getElementById(n)}function QS(n){try{return Q(n).style}catch(n){}}function QE(n,t){try{Q(n).disabled=!t}catch(n){}}function QV(n,t){try{QS(n).display=t?"":"none"}catch(n){}}function QA(n,t){Q(n).innerHTML+=t}function QH(n,t){Q(n).innerHTML=t}function QC(n){try{return Q(n).classList}catch(n){}}function inputBoxFocus(n){Q(n).focus();var t=Q(n).value;Q(n).value="",Q(n).value=t}function ReadShort(n,t){return(n.charCodeAt(t)<<8)+n.charCodeAt(t+1)}function ReadShortX(n,t){return(n.charCodeAt(t+1)<<8)+n.charCodeAt(t)}function ReadInt(n,t){return 16777216*n.charCodeAt(t)+(n.charCodeAt(t+1)<<16)+(n.charCodeAt(t+2)<<8)+n.charCodeAt(t+3)}function ReadSInt(n,t){return(n.charCodeAt(t)<<24)+(n.charCodeAt(t+1)<<16)+(n.charCodeAt(t+2)<<8)+n.charCodeAt(t+3)}function ReadIntX(n,t){return 16777216*n.charCodeAt(t+3)+(n.charCodeAt(t+2)<<16)+(n.charCodeAt(t+1)<<8)+n.charCodeAt(t)}function ShortToStr(n){return String.fromCharCode(n>>8&255,255&n)}function ShortToStrX(n){return String.fromCharCode(255&n,n>>8&255)}function IntToStr(n){return String.fromCharCode(n>>24&255,n>>16&255,n>>8&255,255&n)}function IntToStrX(n){return String.fromCharCode(255&n,n>>8&255,n>>16&255,n>>24&255)}function MakeToArray(n){return n&&null!=n&&"object"!=typeof n?[n]:n}function SplitArray(n){return n.split(",")}function Clone(n){return JSON.parse(JSON.stringify(n))}function EscapeHtml(n){return"string"==typeof n?n.replace(/&/g,"&").replace(/>/g,">").replace(/</g,"<").replace(/"/g,""").replace(/'/g,"'"):"boolean"==typeof n?n:"number"==typeof n?n:void 0}function EscapeHtmlBreaks(n){return"string"==typeof n?n.replace(/&/g,"&").replace(/>/g,">").replace(/</g,"<").replace(/"/g,""").replace(/'/g,"'").replace(/\r/g,"<br />").replace(/\n/g,"").replace(/\t/g," "):"boolean"==typeof n?n:"number"==typeof n?n:void 0}function ArrayElementMove(n,t,e){n.splice(e,0,n.splice(t,1)[0])}function ObjectToStringEx(n,t){var e="";if(0!=n&&(!n||null==n))return"(Null)";if(n instanceof Array)for(var r in n)e+="<br />"+gap(t)+"Item #"+r+": "+ObjectToStringEx(n[r],t+1);else if(n instanceof Object)for(var r in n)e+="<br />"+gap(t)+r+" = "+ObjectToStringEx(n[r],t+1);else e+=EscapeHtml(n);return e}function ObjectToStringEx2(n,t){var e="";if(0!=n&&(!n||null==n))return"(Null)";if(n instanceof Array)for(var r in n)e+="\r\n"+gap2(t)+"Item #"+r+": "+ObjectToStringEx2(n[r],t+1);else if(n instanceof Object)for(var r in n)e+="\r\n"+gap2(t)+r+" = "+ObjectToStringEx2(n[r],t+1);else e+=EscapeHtml(n);return e}function gap(n){for(var t="",e=0;e<4*n;e++)t+=" ";return t}function gap2(n){for(var t="",e=0;e<4*n;e++)t+=" ";return t}function ObjectToString(n){return ObjectToStringEx(n,0)}function ObjectToString2(n){return ObjectToStringEx2(n,0)}function hex2rstr(n){if("string"!=typeof n||0==n.length)return"";for(var t,e="",r=(""+n).match(/../g);t=r.shift();)e+=String.fromCharCode("0x"+t);return e}function char2hex(n){return(n+256).toString(16).substr(-2).toUpperCase()}function rstr2hex(n){var t,e="";for(t=0;t<n.length;t++)e+=char2hex(n.charCodeAt(t));return e}function encode_utf8(n){return unescape(encodeURIComponent(n))}function decode_utf8(n){return decodeURIComponent(escape(n))}function data2blob(n){for(var t=new Array(n.length),e=0;e<n.length;e++)t[e]=n.charCodeAt(e);return new Blob([new Uint8Array(t)])}function utf2blob(n){for(var t=[],e=unescape(encodeURIComponent(n)),r=0;r<e.length;r++)t.push(e.charCodeAt(r));return new Blob([new Uint8Array(t)])}function random(n){return Math.floor(Math.random()*n)}function trademarks(n){return n.replace(/\(R\)/g,"®").replace(/\(TM\)/g,"™")}function zeroPad(n,t){null==t&&(t=2);var e="00000000"+n;return e.substr(e.length-t)}function isAlphaNumeric(n){return"number"==typeof n||null!=n.match(/^[A-Za-z0-9]+$/)}function isSafeString(n){return"string"==typeof n&&-1==n.indexOf("<")&&-1==n.indexOf(">")&&-1==n.indexOf("&")&&-1==n.indexOf('"')&&-1==n.indexOf("'")&&-1==n.indexOf("+")&&-1==n.indexOf("(")&&-1==n.indexOf(")")&&-1==n.indexOf("#")&&-1==n.indexOf("%")&&-1==n.indexOf(":")}function isSafeString2(n){return"string"==typeof n&&-1==n.indexOf("<")&&-1==n.indexOf(">")&&-1==n.indexOf("&")&&-1==n.indexOf('"')&&-1==n.indexOf("'")&&-1==n.indexOf("+")&&-1==n.indexOf("(")&&-1==n.indexOf(")")&&-1==n.indexOf("#")&&-1==n.indexOf("%")}function parseUriArgs(){var n=window.document.location.href;n.endsWith("#")&&(n=n.substring(0,n.length-1));var t,e={},r=n.split(/[\?&|\=]/);for(o in r.splice(0,1),r)switch(o%2){case 0:t=decodeURIComponent(r[o]);break;case 1:if(e[t]=decodeURIComponent(r[o]),isSafeString2(e[t])){var o=parseInt(e[t]);o==e[t]&&(e[t]=o)}else delete e[t]}return e}String.prototype.startsWith||(String.prototype.startsWith=function(n){return 0===this.lastIndexOf(n,0)}),String.prototype.endsWith||(String.prototype.endsWith=function(n){return-1!==this.indexOf(n,this.length-n.length)})
\ No newline at end of file
1
+function Q(n){return document.getElementById(n)}function QS(n){try{return Q(n).style}catch(n){}}function QE(n,t){try{Q(n).disabled=!t}catch(n){}}function QV(n,t){try{QS(n).display=t?"":"none"}catch(n){}}function QA(n,t){Q(n).innerHTML+=t}function QH(n,t){Q(n).innerHTML=t}function QC(n){try{return Q(n).classList}catch(n){}}function inputBoxFocus(n){Q(n).focus();var t=Q(n).value;Q(n).value="",Q(n).value=t}function ReadShort(n,t){return(n.charCodeAt(t)<<8)+n.charCodeAt(t+1)}function ReadShortX(n,t){return(n.charCodeAt(t+1)<<8)+n.charCodeAt(t)}function ReadInt(n,t){return 16777216*n.charCodeAt(t)+(n.charCodeAt(t+1)<<16)+(n.charCodeAt(t+2)<<8)+n.charCodeAt(t+3)}function ReadSInt(n,t){return(n.charCodeAt(t)<<24)+(n.charCodeAt(t+1)<<16)+(n.charCodeAt(t+2)<<8)+n.charCodeAt(t+3)}function ReadIntX(n,t){return 16777216*n.charCodeAt(t+3)+(n.charCodeAt(t+2)<<16)+(n.charCodeAt(t+1)<<8)+n.charCodeAt(t)}function ShortToStr(n){return String.fromCharCode(n>>8&255,255&n)}function ShortToStrX(n){return String.fromCharCode(255&n,n>>8&255)}function IntToStr(n){return String.fromCharCode(n>>24&255,n>>16&255,n>>8&255,255&n)}function IntToStrX(n){return String.fromCharCode(255&n,n>>8&255,n>>16&255,n>>24&255)}function MakeToArray(n){return n&&null!=n&&"object"!=typeof n?[n]:n}function SplitArray(n){return n.split(",")}function Clone(n){return JSON.parse(JSON.stringify(n))}function EscapeHtml(n){return"string"==typeof n?n.replace(/&/g,"&").replace(/>/g,">").replace(/</g,"<").replace(/"/g,""").replace(/'/g,"'"):"boolean"==typeof n?n:"number"==typeof n?n:void 0}function EscapeHtmlBreaks(n){return"string"==typeof n?n.replace(/&/g,"&").replace(/>/g,">").replace(/</g,"<").replace(/"/g,""").replace(/'/g,"'").replace(/\r/g,"<br />").replace(/\n/g,"").replace(/\t/g," "):"boolean"==typeof n?n:"number"==typeof n?n:void 0}function ArrayElementMove(n,t,r){n.splice(r,0,n.splice(t,1)[0])}function ObjectToStringEx(n,t){var r="";if(0!=n&&(!n||null==n))return"(Null)";if(n instanceof Array)for(var e in n)r+="<br />"+gap(t)+"Item #"+e+": "+ObjectToStringEx(n[e],t+1);else if(n instanceof Object)for(var e in n)r+="<br />"+gap(t)+e+" = "+ObjectToStringEx(n[e],t+1);else r+=EscapeHtml(n);return r}function ObjectToStringEx2(n,t){var r="";if(0!=n&&(!n||null==n))return"(Null)";if(n instanceof Array)for(var e in n)r+="\r\n"+gap2(t)+"Item #"+e+": "+ObjectToStringEx2(n[e],t+1);else if(n instanceof Object)for(var e in n)r+="\r\n"+gap2(t)+e+" = "+ObjectToStringEx2(n[e],t+1);else r+=EscapeHtml(n);return r}function gap(n){for(var t="",r=0;r<4*n;r++)t+=" ";return t}function gap2(n){for(var t="",r=0;r<4*n;r++)t+=" ";return t}function ObjectToString(n){return ObjectToStringEx(n,0)}function ObjectToString2(n){return ObjectToStringEx2(n,0)}function hex2rstr(n){if("string"!=typeof n||0==n.length)return"";for(var t,r="",e=(""+n).match(/../g);t=e.shift();)r+=String.fromCharCode("0x"+t);return r}function char2hex(n){return(n+256).toString(16).substr(-2).toUpperCase()}function rstr2hex(n){var t,r="";for(t=0;t<n.length;t++)r+=char2hex(n.charCodeAt(t));return r}function encode_utf8(n){return unescape(encodeURIComponent(n))}function decode_utf8(n){return decodeURIComponent(escape(n))}function data2blob(n){for(var t=new Array(n.length),r=0;r<n.length;r++)t[r]=n.charCodeAt(r);return new Blob([new Uint8Array(t)])}function utf2blob(n){for(var t=[],r=unescape(encodeURIComponent(n)),e=0;e<r.length;e++)t.push(r.charCodeAt(e));return new Blob([new Uint8Array(t)])}function random(n){return Math.floor(Math.random()*n)}function trademarks(n){return n.replace(/\(R\)/g,"®").replace(/\(TM\)/g,"™")}function zeroPad(n,t){null==t&&(t=2);var r="00000000"+n;return r.substr(r.length-t)}function isAlphaNumeric(n){return"number"==typeof n||null!=n.match(/^[A-Za-z0-9]+$/)}function isSafeString(n){return"string"==typeof n&&-1==n.indexOf("<")&&-1==n.indexOf(">")&&-1==n.indexOf("&")&&-1==n.indexOf('"')&&-1==n.indexOf("'")&&-1==n.indexOf("+")&&-1==n.indexOf("(")&&-1==n.indexOf(")")&&-1==n.indexOf("#")&&-1==n.indexOf("%")&&-1==n.indexOf(":")}function isSafeString2(n){return"string"==typeof n&&-1==n.indexOf("<")&&-1==n.indexOf(">")&&-1==n.indexOf("&")&&-1==n.indexOf('"')&&-1==n.indexOf("'")&&-1==n.indexOf("+")&&-1==n.indexOf("(")&&-1==n.indexOf(")")&&-1==n.indexOf("#")&&-1==n.indexOf("%")}function parseUriArgs(){var n=window.document.location.href;n.endsWith("#")&&(n=n.substring(0,n.length-1));var t,r={},e=n.split(/[\?&|]/);for(var o in e.splice(0,1),e){var i=e[o],a=i.indexOf("=");if(r[t=i.substring(0,a)]=i.substring(a+1),isSafeString(r[t])){var c=parseInt(r[t]);c==r[t]&&(r[t]=c)}else delete r[t]}return r}String.prototype.startsWith||(String.prototype.startsWith=function(n){return 0===this.lastIndexOf(n,0)}),String.prototype.endsWith||(String.prototype.endsWith=function(n){return-1!==this.indexOf(n,this.length-n.length)})
\ No newline at end of file
public/scripts/common-0.0.1.js
+6
-10
@@ -118,17 +118,13 @@ function isSafeString2(str) { return ((typeof str == 'string') && (str.indexOf('
118
function parseUriArgs() {
119
var href = window.document.location.href;
120
if (href.endsWith('#')) { href = href.substring(0, href.length - 1); }
121
- var name, r = {}, parsedUri = href.split(/[\?&|\=]/);
121
+ var name, r = {}, parsedUri = href.split(/[\?&|]/);
122
parsedUri.splice(0, 1);
123
- for (x in parsedUri) {
124
- switch (x % 2) {
125
- case 0: { name = decodeURIComponent(parsedUri[x]); break; }
126
- case 1: {
127
- r[name] = decodeURIComponent(parsedUri[x]);
128
- if (!isSafeString2(r[name])) { delete r[name]; } else { var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } }
129
- break;
130
- } default: { break; }
131
- }
123
+ for (var j in parsedUri) {
124
+ var arg = parsedUri[j], i = arg.indexOf('=');
125
+ name = arg.substring(0, i);
126
+ r[name] = arg.substring(i + 1);
127
+ if (!isSafeString(r[name])) { delete r[name]; } else { var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } }
128
}
129
return r;
130
}
\ No newline at end of file
translate/translate.json
+26
-11
@@ -4688,10 +4688,7 @@
4688
"ru": "Учетная запись была создана для вас на сервере [[[SERVERNAME]]] ([[[SERVERURL]]] /), теперь вы можете получить к ней доступ с именем пользователя «[[[ACCOUNTNAME]]]» и паролем «[[[PASSWORD] ]] \".",
4689
"tr": "[[[SERVERNAME]]] ([[[SERVERURL]]] /) sunucusunda sizin için bir hesap oluşturuldu, şimdi \"[[[ACCOUNTNAME]]]\" kullanıcı adı ve \"[[[PASSWORD]]]\" ile bu hesaba erişebilirsiniz.",
4690
"zh-chs": "已在服务器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上为您创建了一个帐户，您现在可以使用用户名“ [[[ACCOUNTNAME]]]”和密码“ [[[PASSWORD] ]]”。",
4691
- "zh-cht": "在伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上為你創建了一個帳戶，你現在可以使用用戶名“ [[[ACCOUNTNAME]]]”和密碼“ [[[PASSWORD] ]]”。",
4692
- "xloc": [
4693
- "account-invite.txt"
4694
- ]
4691
+ "zh-cht": "在伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上為你創建了一個帳戶，你現在可以使用用戶名“ [[[ACCOUNTNAME]]]”和密碼“ [[[PASSWORD] ]]”。"
4692
},
4693
{
4694
"cs": "Účet byl pro vás vytvořen na serveru [[[SERVERNAME]]] ([[[SERVERURL]]]/), nyní k němu máte přístup pomocí uživatelského jména \\\"[[[ACCOUNTNAME]]]\\\" a hesla \\\"[[[PASSWORD]]]\\\".",
@@ -4710,6 +4707,12 @@
4707
"zh-chs": "已在服务器[[[SERVERNAME]]]（[[[SERVERURL]]]/ 上为您创建了一个帐户，您现在可以使用用户名“ [[[ACCOUNTNAME]]] 和密码 “[[[PASSWORD]]]”。",
4708
"zh-cht": "在伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /上為你創建了一個帳戶，你現在可以使用用戶名“ [[[ACCOUNTNAME]]] ” en wachtwoord “[[[PASSWORD]]]”。"
4709
},
4710
+ {
4711
+ "en": "An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username \"[[[ACCOUNTNAME]]]\" and password \"[[[PASSWORD]]]\".",
4712
+ "xloc": [
4713
+ "account-invite.txt"
4714
+ ]
4715
+ },
4716
{
4717
"cs": "Android APK",
4718
"de": "Android-APK",
@@ -16938,10 +16941,7 @@
16941
"ru": "Здравствуйте, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) выполняет проверку электронной почты. Для завершения процесса перейдите по следующей ссылке:",
16942
"tr": "Merhaba [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) bir e-posta doğrulaması yapıyor. İşlemi tamamlamak için aşağıdaki bağlantıya gidin:",
16943
"zh-chs": "嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在执行电邮验证。导航至以下连结以完成该过程：",
16941
- "zh-cht": "嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在執行電郵驗證。導航至以下鏈結以完成該過程：",
16942
- "xloc": [
16943
- "account-check.txt"
16944
- ]
16944
+ "zh-cht": "嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在執行電郵驗證。導航至以下鏈結以完成該過程："
16945
},
16946
{
16947
"cs": "Ahoj [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]])) požaduje obnovení hesla k účtu. Chcete-li proces dokončit, přejděte na následující odkaz:",
@@ -16958,7 +16958,16 @@
16958
"ru": "Здравствуйте, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) запрашивает сброс пароля учетной записи. Для завершения процесса перейдите по следующей ссылке:",
16959
"tr": "Merhaba [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) bir hesap şifresi sıfırlama istiyor. İşlemi tamamlamak için aşağıdaki bağlantıya gidin:",
16960
"zh-chs": "[[[USERNAME]]，您好：[[[SERVERNAME]]]（[[[SERVERURL]]]）正在请求重置帐户密码。导航至以下连结以完成该过程：",
16961
- "zh-cht": "[[[USERNAME]]，你好，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在請求重設帳戶密碼。導航至以下鏈結以完成該過程：",
16961
+ "zh-cht": "[[[USERNAME]]，你好，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在請求重設帳戶密碼。導航至以下鏈結以完成該過程："
16962
+ },
16963
+ {
16964
+ "en": "Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:",
16965
+ "xloc": [
16966
+ "account-check.txt"
16967
+ ]
16968
+ },
16969
+ {
16970
+ "en": "Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:",
16971
"xloc": [
16972
"account-reset.txt"
16973
]
@@ -35817,7 +35826,10 @@
35826
"ru": "Для установки программного обеспечения перейдите к [[[SERVERURL]]][[[LINKURL]]] и следуйте инструкциям.",
35827
"tr": "Yazılımı kurmak için [[[SERVERURL]]][[[LINKURL]]] adresine gidin ve talimatları takip edin.",
35828
"zh-chs": "要安装软件，请导航至[[[SERVERURL]]][[[LINKURL]]]，然后按照说明进行操作。",
35820
- "zh-cht": "要安裝軟體，請導航至[[[SERVERURL]]] [[[LINKURL]]]，然後按照說明進行操作。",
35829
+ "zh-cht": "要安裝軟體，請導航至[[[SERVERURL]]] [[[LINKURL]]]，然後按照說明進行操作。"
35830
+ },
35831
+ {
35832
+ "en": "To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.",
35833
"xloc": [
35834
"mesh-invite.txt"
35835
]
@@ -37885,7 +37897,10 @@
37897
"ru": "Пользователь [[[USERNAME]]] на сервере [[[SERVERNAME]]] ([[[SERVERURL]]]/) запрашивает установку программного обеспечения для запуска сеанса удаленного управления.",
37898
"tr": "[[[SERVERNAME]]] ([[[SERVERURL]]] /) sunucusundaki [[[USERNAME]]] uzaktan kontrol oturumunu başlatmak için yazılım yüklemenizi istiyor.",
37899
"zh-chs": "服务器[[[SERVERNAME]]]（[[[SERVERURL]]]/）上的用户[[[USERNAME]]]请求您安装软件以启动远程控制。",
37888
- "zh-cht": "伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上的用戶[[[USERNAME]]]請求你安裝軟體以啟動遠程控制。",
37900
+ "zh-cht": "伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上的用戶[[[USERNAME]]]請求你安裝軟體以啟動遠程控制。"
37901
+ },
37902
+ {
37903
+ "en": "User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.",
37904
"xloc": [
37905
"mesh-invite.txt"
37906
]
views/message.handlebars
+17
-1
@@ -47,6 +47,7 @@
47
var domainurl = decodeURIComponent('{{{domainurl}}}');
48
var arg1 = decodeURIComponent('{{{arg1}}}');
49
var arg2 = decodeURIComponent('{{{arg2}}}');
50
+ var urlargs = parseUriArgs();
51
52
var title = '';
53
if (titleid == 1) { title = "Account Verification"; }
@@ -70,10 +71,25 @@
71
case 9: { msg = "ERROR: Invalid account check."; break; }
72
case 10: { msg = "ERROR: Invalid account check, verification url is only valid for 30 minutes."; break; }
73
}
73
- QH('mainMessage', msg + ' <a href="' + domainurl + '">' + "Go to login page" + '</a>.');
74
+ QH('mainMessage', msg + ' <a href="' + domainurl + (urlargs.key ? ('?key=' + urlargs.key) : '') + '">' + "Go to login page" + '</a>.');
75
76
function format(format) { var args = Array.prototype.slice.call(arguments, 1); return format.replace(/{(\d+)}/g, function (match, number) { return typeof args[number] != 'undefined' ? args[number] : match; }); };
77
78
+ // Parse URL arguments, only keep safe values
79
+ function parseUriArgs() {
80
+ var href = window.document.location.href;
81
+ if (href.endsWith('#')) { href = href.substring(0, href.length - 1); }
82
+ var name, r = {}, parsedUri = href.split(/[\?&|]/);
83
+ parsedUri.splice(0, 1);
84
+ for (var j in parsedUri) {
85
+ var arg = parsedUri[j], i = arg.indexOf('=');
86
+ name = arg.substring(0, i);
87
+ r[name] = arg.substring(i + 1);
88
+ if (!isSafeString(r[name])) { delete r[name]; } else { var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } }
89
+ }
90
+ return r;
91
+ }
92
+
93
</script>
94
</body>
95
</html>
\ No newline at end of file
views/message2.handlebars
+18
-3
@@ -48,6 +48,7 @@
48
var domainurl = decodeURIComponent('{{{domainurl}}}');
49
var arg1 = decodeURIComponent('{{{arg1}}}');
50
var arg2 = decodeURIComponent('{{{arg2}}}');
51
+ var urlargs = parseUriArgs();
52
53
var title = '';
54
if (titleid == 1) { title = "Account Verification"; }
@@ -61,20 +62,34 @@
62
case 3: { msg = format("ERROR: Invalid e-mail \"{0}\" for user \"{1}\".", arg1, arg2); break; }
63
case 4: { msg = format("E-mail \"{0}\" for user \"{1}\" already verified.", arg1, arg2); break; }
64
case 5: { msg = format("E-mail \"{0}\" already in use on a different account. Change the email address and try again.", arg1); break; }
64
- case 6: { msg = format("Verified email {0} for user account {1}.", '<b>' + arg1 + '</b>', '<b>' + arg2 + '</b>'); break; }
65
+ case 6: { msg = format("Verified email {0} for user account {1}.", '<b style=color:white>' + arg1 + '</b>', '<b style=color:white>' + arg2 + '</b>'); break; }
66
case 7: { msg = format("E-mail \"{0}\" for user \"{1}\" not verified.", arg1, arg2); break; }
67
case 8: {
67
- msg = '<div>' + format("Password for account {0} has been reset to:", '<b>' + arg1 + '</b>') + '</div><div style=padding:14px;font-size:18px><b>' + arg2 + '</b></div>';
68
+ msg = '<div>' + format("Password for account {0} has been reset to:", '<b style=color:white>' + arg1 + '</b>') + '</div><div style=padding:14px;font-size:18px><b style=color:white>' + arg2 + '</b></div>';
69
msg += "Login and go to the \"My Account\" tab to update your password.";
70
break;
71
}
72
case 9: { msg = "ERROR: Invalid account check."; break; }
73
case 10: { msg = "ERROR: Invalid account check, verification url is only valid for 30 minutes."; break; }
74
}
74
- QH('mainMessage', msg + '<br /><br /><a href="' + domainurl + '">' + "Go to login page" + '</a>.');
75
+ QH('mainMessage', msg + '<br /><br /><a href="' + domainurl + (urlargs.key ? ('?key=' + urlargs.key) : '') + '">' + "Go to login page" + '</a>.');
76
77
function format(format) { var args = Array.prototype.slice.call(arguments, 1); return format.replace(/{(\d+)}/g, function (match, number) { return typeof args[number] != 'undefined' ? args[number] : match; }); };
78
79
+ // Parse URL arguments, only keep safe values
80
+ function parseUriArgs() {
81
+ var href = window.document.location.href;
82
+ if (href.endsWith('#')) { href = href.substring(0, href.length - 1); }
83
+ var name, r = {}, parsedUri = href.split(/[\?&|]/);
84
+ parsedUri.splice(0, 1);
85
+ for (var j in parsedUri) {
86
+ var arg = parsedUri[j], i = arg.indexOf('=');
87
+ name = arg.substring(0, i);
88
+ r[name] = arg.substring(i + 1);
89
+ if (!isSafeString(r[name])) { delete r[name]; } else { var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } }
90
+ }
91
+ return r;
92
+ }
93
</script>
94
</body>
95
</html>
webserver.js
+7
-7
@@ -914,7 +914,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
914
user.otpekey = { k: obj.common.zeroPad(getRandomEightDigitInteger(), 8), d: Date.now() };
915
obj.db.SetUser(user);
916
parent.debug('web', 'Sending 2FA email to: ' + user.email);
917
- parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req));
917
+ parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req), req.query.key);
918
req.session.messageid = 2; // "Email sent" message
919
req.session.loginmode = '4';
920
if (direct === true) { handleRootRequestEx(req, res, domain); } else { res.redirect(domain.url + getQueryPortion(req)); }
@@ -1239,7 +1239,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
1239
obj.db.SetUser(user);
1240
1241
// Send the verification email
1242
- if ((obj.parent.mailserver != null) && (domain.auth != 'sspi') && (domain.auth != 'ldap') && (obj.common.validateEmail(user.email, 1, 256) == true)) { obj.parent.mailserver.sendAccountCheckMail(domain, user.name, user.email, obj.getLanguageCodes(req)); }
1242
+ if ((obj.parent.mailserver != null) && (domain.auth != 'sspi') && (domain.auth != 'ldap') && (obj.common.validateEmail(user.email, 1, 256) == true)) { obj.parent.mailserver.sendAccountCheckMail(domain, user.name, user.email, obj.getLanguageCodes(req), req.query.key); }
1243
}, 0);
1244
var event = { etype: 'user', userid: user._id, username: user.name, account: obj.CloneSafeUser(user), action: 'accountcreate', msg: 'Account created, email is ' + req.body.email, domain: domain.id };
1245
if (obj.db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to create the user. Another event will come.
@@ -1413,7 +1413,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
1413
// Send email to perform recovery.
1414
delete req.session.tokenemail;
1415
if (obj.parent.mailserver != null) {
1416
- obj.parent.mailserver.sendAccountResetMail(domain, user.name, user.email, obj.getLanguageCodes(req));
1416
+ obj.parent.mailserver.sendAccountResetMail(domain, user.name, user.email, obj.getLanguageCodes(req), req.query.key);
1417
if (i == 0) {
1418
parent.debug('web', 'handleResetAccountRequest: Hold on, reset mail sent.');
1419
req.session.loginmode = '1';
@@ -1433,7 +1433,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
1433
} else {
1434
// No second factor, send email to perform recovery.
1435
if (obj.parent.mailserver != null) {
1436
- obj.parent.mailserver.sendAccountResetMail(domain, user.name, user.email, obj.getLanguageCodes(req));
1436
+ obj.parent.mailserver.sendAccountResetMail(domain, user.name, user.email, obj.getLanguageCodes(req), req.query.key);
1437
if (i == 0) {
1438
parent.debug('web', 'handleResetAccountRequest: Hold on, reset mail sent.');
1439
req.session.loginmode = '1';
@@ -1517,7 +1517,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
1517
}
1518
1519
// Send the verification email
1520
- obj.parent.mailserver.sendAccountCheckMail(domain, user.name, user.email, obj.getLanguageCodes(req));
1520
+ obj.parent.mailserver.sendAccountCheckMail(domain, user.name, user.email, obj.getLanguageCodes(req), req.query.key);
1521
1522
// Send the response
1523
req.session.messageid = 2; // Email sent.
@@ -5308,7 +5308,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
5308
user.otpekey = { k: obj.common.zeroPad(getRandomEightDigitInteger(), 8), d: Date.now() };
5309
obj.db.SetUser(user);
5310
parent.debug('web', 'Sending 2FA email to: ' + user.email);
5311
- parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req));
5311
+ parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req), req.query.key);
5312
// Ask for a login token & confirm email was sent
5313
try { ws.send(JSON.stringify({ action: 'close', cause: 'noauth', msg: 'tokenrequired', email2fa: email2fa, email2fasent: true, twoFactorCookieDays: twoFactorCookieDays })); ws.close(); } catch (e) { }
5314
} else if ((req.query.token == '**sms**') && (sms2fa == true)) {
@@ -5413,7 +5413,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
5413
user.otpekey = { k: obj.common.zeroPad(getRandomEightDigitInteger(), 8), d: Date.now() };
5414
obj.db.SetUser(user);
5415
parent.debug('web', 'Sending 2FA email to: ' + user.email);
5416
- parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req));
5416
+ parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req), req.query.key);
5417
// Ask for a login token & confirm email was sent
5418
try { ws.send(JSON.stringify({ action: 'close', cause: 'noauth', msg: 'tokenrequired', email2fa: email2fa, email2fasent: true, twoFactorCookieDays: twoFactorCookieDays })); ws.close(); } catch (e) { }
5419
} else if ((s[2] == '**sms**') && (sms2fa == true)) {